From owner-svn-ports-branches@freebsd.org Mon Sep 14 17:45:11 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 07D00A045DB; Mon, 14 Sep 2015 17:45:11 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D381917C8; Mon, 14 Sep 2015 17:45:10 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8EHjAst087773; Mon, 14 Sep 2015 17:45:10 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8EHjAhC087771; Mon, 14 Sep 2015 17:45:10 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201509141745.t8EHjAhC087771@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 14 Sep 2015 17:45:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r396917 - branches/2015Q3/www/R-cran-Rpad X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Sep 2015 17:45:11 -0000 Author: amdmi3 Date: Mon Sep 14 17:45:09 2015 New Revision: 396917 URL: https://svnweb.freebsd.org/changeset/ports/396917 Log: MFH: r396915 - Fix shebangs Approved by: portmgr blanket Approved by: ports-secteam shebang fix blanket Modified: branches/2015Q3/www/R-cran-Rpad/Makefile branches/2015Q3/www/R-cran-Rpad/pkg-descr Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/www/R-cran-Rpad/Makefile ============================================================================== --- branches/2015Q3/www/R-cran-Rpad/Makefile Mon Sep 14 17:44:50 2015 (r396916) +++ branches/2015Q3/www/R-cran-Rpad/Makefile Mon Sep 14 17:45:09 2015 (r396917) @@ -3,7 +3,7 @@ PORTNAME= Rpad PORTVERSION= 1.3.0 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= www DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -12,6 +12,15 @@ COMMENT= Workbook-style, web-based inter LICENSE= GPLv2 -USES= cran:auto-plist +USES= cran:auto-plist shebangfix +SHEBANG_FILES= inst/basehtml/editor/htmlarea/examples/*.cgi \ + inst/basehtml/editor/htmlarea/plugins/SpellChecker/spell-check-logic.cgi \ + inst/basehtml/server/*.pl \ + inst/serverversion/Statistics-R_perl_interface/script/*.pl + +post-patch: + @${REINPLACE_CMD} -i '' -e 's|c:/apps/perl/bin/perl.exe|${perl_CMD}|' \ + ${WRKSRC}/inst/basehtml/server/fileupload.pl + @${RMDIR} ${WRKSRC}/inst/basehtml/editor/htmlarea/examples/test .include Modified: branches/2015Q3/www/R-cran-Rpad/pkg-descr ============================================================================== --- branches/2015Q3/www/R-cran-Rpad/pkg-descr Mon Sep 14 17:44:50 2015 (r396916) +++ branches/2015Q3/www/R-cran-Rpad/pkg-descr Mon Sep 14 17:45:09 2015 (r396917) @@ -6,4 +6,4 @@ it easy to develop powerful data analysi shared with others (most likely on an intranet). The user doesn't have to install anything--everything's done through a browser. -WWW: http://cran.r-project.org/web/packages/Rpad/ +WWW: http://cran.r-project.org/web/packages/Rpad/ From owner-svn-ports-branches@freebsd.org Mon Sep 14 18:25:01 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C49E1A03870; Mon, 14 Sep 2015 18:25:01 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B51AD102B; Mon, 14 Sep 2015 18:25:01 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8EIP1sr004674; Mon, 14 Sep 2015 18:25:01 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8EIP1xi004673; Mon, 14 Sep 2015 18:25:01 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201509141825.t8EIP1xi004673@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 14 Sep 2015 18:25:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r396921 - branches/2015Q3/net-im/tkabber X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Sep 2015 18:25:01 -0000 Author: amdmi3 Date: Mon Sep 14 18:25:00 2015 New Revision: 396921 URL: https://svnweb.freebsd.org/changeset/ports/396921 Log: MFH: r396920 - Fix shebangs - Add LICENSE_FILE - Add NO_ARCH Approved by: portmgr blanket Approved by: ports-secteam shebang fix blanket Modified: branches/2015Q3/net-im/tkabber/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/net-im/tkabber/Makefile ============================================================================== --- branches/2015Q3/net-im/tkabber/Makefile Mon Sep 14 18:23:02 2015 (r396920) +++ branches/2015Q3/net-im/tkabber/Makefile Mon Sep 14 18:25:00 2015 (r396921) @@ -3,6 +3,7 @@ PORTNAME= tkabber PORTVERSION= 1.1.2 +PORTREVISION= 1 CATEGORIES= net-im ipv6 tcl tk MASTER_SITES= http://files.jabber.ru/tkabber/ @@ -10,6 +11,7 @@ MAINTAINER= mp39590@gmail.com COMMENT= Tcl/Tk based jabber client LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= tcllib>=1.2:${PORTSDIR}/devel/tcllib \ bwidget>=1.4:${PORTSDIR}/x11-toolkits/bwidget @@ -19,7 +21,8 @@ OPTIONS_DEFAULT= TLS CONFLICTS= tkabber-devel-[0-9]* -USES= tar:xz +USES= shebangfix tar:xz +SHEBANG_FILES= contrib/extract-translations/extract.tcl IPV6_USES= tk:86+ IPV6_USES_OFF= tk:85+ @@ -34,6 +37,7 @@ TLS_RUN_DEPENDS= tcltls>=1.4.1:${PORTSDI WRKSRC= ${WRKDIR}/${DISTNAME} NO_BUILD= yes +NO_ARCH= yes SUBDIRS= contrib emoticons ifacetk mclistbox \ msgs pixmaps plugins sounds tclxmpp trans From owner-svn-ports-branches@freebsd.org Tue Sep 15 20:05:02 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C4964A05BE2; Tue, 15 Sep 2015 20:05:02 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B50E61E8A; Tue, 15 Sep 2015 20:05:02 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8FK52B2070035; Tue, 15 Sep 2015 20:05:02 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8FK52R9070033; Tue, 15 Sep 2015 20:05:02 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201509152005.t8FK52R9070033@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Tue, 15 Sep 2015 20:05:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r397020 - branches/2015Q3/www/wordpress X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Sep 2015 20:05:02 -0000 Author: delphij Date: Tue Sep 15 20:05:01 2015 New Revision: 397020 URL: https://svnweb.freebsd.org/changeset/ports/397020 Log: MFH r397019: Security update to 4.3.1. Further details are available at WordPress website at https://wordpress.org/news/2015/09/wordpress-4-3-1/ . Security: f4ce64c2-5bd4-11e5-9040-3c970e169bc2 Security: CVE-2015-5714 Security: CVE-2015-5715 Approved by: ports-secteam Modified: branches/2015Q3/www/wordpress/Makefile branches/2015Q3/www/wordpress/distinfo Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/www/wordpress/Makefile ============================================================================== --- branches/2015Q3/www/wordpress/Makefile Tue Sep 15 19:53:40 2015 (r397019) +++ branches/2015Q3/www/wordpress/Makefile Tue Sep 15 20:05:01 2015 (r397020) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.2.4 +PORTVERSION= 4.3.1 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= http://wordpress.org/ Modified: branches/2015Q3/www/wordpress/distinfo ============================================================================== --- branches/2015Q3/www/wordpress/distinfo Tue Sep 15 19:53:40 2015 (r397019) +++ branches/2015Q3/www/wordpress/distinfo Tue Sep 15 20:05:01 2015 (r397020) @@ -1,2 +1,2 @@ -SHA256 (wordpress-4.2.4.tar.gz) = 42ca594afc709cbef8528a6096f5a1efe96dcf3164e7ce321e87d57ae015cc82 -SIZE (wordpress-4.2.4.tar.gz) = 6313249 +SHA256 (wordpress-4.3.1.tar.gz) = df5a5bfa28c916e11e8a636297c8eeb68816fff1d1bc2564c1d73c0063f0027c +SIZE (wordpress-4.3.1.tar.gz) = 6526208 From owner-svn-ports-branches@freebsd.org Tue Sep 15 20:13:06 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B20B2A05F75; Tue, 15 Sep 2015 20:13:06 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A215E1321; Tue, 15 Sep 2015 20:13:06 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8FKD6Ag074143; Tue, 15 Sep 2015 20:13:06 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8FKD5Wv074140; Tue, 15 Sep 2015 20:13:05 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201509152013.t8FKD5Wv074140@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Tue, 15 Sep 2015 20:13:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r397021 - in branches/2015Q3/net/openldap24-server: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Sep 2015 20:13:06 -0000 Author: delphij Date: Tue Sep 15 20:13:05 2015 New Revision: 397021 URL: https://svnweb.freebsd.org/changeset/ports/397021 Log: MFH r391124,395815,396354,396731: Update to 2.4.42 and apply upstream fix for CVE-2015-6908. Obtained from: OpenLDAP git 6fe51a9ab04fd28bbc171da3cf12f1c1040d6629 Security: CVE-2015-6908 Approved by: ports-secteam Added: branches/2015Q3/net/openldap24-server/files/patch-CVE-2015-6908 - copied unchanged from r396731, head/net/openldap24-server/files/patch-CVE-2015-6908 Deleted: branches/2015Q3/net/openldap24-server/files/patch-ITS8027 branches/2015Q3/net/openldap24-server/files/patch-ITS8046 Modified: branches/2015Q3/net/openldap24-server/Makefile branches/2015Q3/net/openldap24-server/distinfo Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/net/openldap24-server/Makefile ============================================================================== --- branches/2015Q3/net/openldap24-server/Makefile Tue Sep 15 20:05:01 2015 (r397020) +++ branches/2015Q3/net/openldap24-server/Makefile Tue Sep 15 20:13:05 2015 (r397021) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= openldap -DISTVERSION= 2.4.40 +DISTVERSION= 2.4.42 PORTREVISION= ${OPENLDAP_PORTREVISION} CATEGORIES= net databases MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \ @@ -59,9 +59,9 @@ BROKEN= incompatible OpenLDAP version: .endif PORTREVISION_CLIENT= 1 -PORTREVISION_SERVER= 4 +PORTREVISION_SERVER= 1 OPENLDAP_SHLIB_MAJOR= 2 -OPENLDAP_SHLIB_MINOR= 10.3 +OPENLDAP_SHLIB_MINOR= 10.5 OPENLDAP_MAJOR= ${DISTVERSION:R} OPTIONS_DEFINE= DEBUG FETCH GSSAPI @@ -560,6 +560,10 @@ post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR}/$${dir}; \ ${INSTALL_DATA} ${WRKSRC}/doc/$${dir}/* ${STAGEDIR}${DOCSDIR}/$${dir}; \ done + @for prog in ldapcompare ldapdelete ldapexop ldapmodify ldapmodrdn ldappasswd ldapsearch ldapurl ldapwhoami; do\ + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/$${prog}; \ + done + @for library in lber ldap ldap_r; do \ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib$${library}-${OPENLDAP_MAJOR}.so.${OPENLDAP_SHLIB_MAJOR}; \ done Modified: branches/2015Q3/net/openldap24-server/distinfo ============================================================================== --- branches/2015Q3/net/openldap24-server/distinfo Tue Sep 15 20:05:01 2015 (r397020) +++ branches/2015Q3/net/openldap24-server/distinfo Tue Sep 15 20:13:05 2015 (r397021) @@ -1,2 +1,2 @@ -SHA256 (openldap-2.4.40.tgz) = d12611a5c25b6499293c2bb7b435dc2b174db73e83f5a8cb7e34f2ce5fa6dadb -SIZE (openldap-2.4.40.tgz) = 5641865 +SHA256 (openldap-2.4.42.tgz) = eeb7b0e2c5852bfd2650e83909bb6152835c0b862fab10b63954dc1bcbba8e63 +SIZE (openldap-2.4.42.tgz) = 5645925 Copied: branches/2015Q3/net/openldap24-server/files/patch-CVE-2015-6908 (from r396731, head/net/openldap24-server/files/patch-CVE-2015-6908) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/net/openldap24-server/files/patch-CVE-2015-6908 Tue Sep 15 20:13:05 2015 (r397021, copy of r396731, head/net/openldap24-server/files/patch-CVE-2015-6908) @@ -0,0 +1,11 @@ +--- libraries/liblber/io.c.orig 2015-08-14 15:25:28 UTC ++++ libraries/liblber/io.c +@@ -679,7 +679,7 @@ done: + return (ber->ber_tag); + } + +- assert( 0 ); /* ber structure is messed up ?*/ ++ /* invalid input */ + return LBER_DEFAULT; + } + From owner-svn-ports-branches@freebsd.org Tue Sep 15 20:55:31 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5AD479C37E9; Tue, 15 Sep 2015 20:55:31 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4AF3D1CBB; Tue, 15 Sep 2015 20:55:31 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8FKtVWv090887; Tue, 15 Sep 2015 20:55:31 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8FKtU1J090885; Tue, 15 Sep 2015 20:55:30 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201509152055.t8FKtU1J090885@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Tue, 15 Sep 2015 20:55:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r397025 - branches/2015Q3/russian/wordpress X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Sep 2015 20:55:31 -0000 Author: delphij Date: Tue Sep 15 20:55:30 2015 New Revision: 397025 URL: https://svnweb.freebsd.org/changeset/ports/397025 Log: MFH r394824,r397023: Security update to 4.3.1. Further details are available at WordPress website at https://wordpress.org/news/2015/09/wordpress-4-3-1/ . Security: f4ce64c2-5bd4-11e5-9040-3c970e169bc2 Security: CVE-2015-5714 Security: CVE-2015-5715 Approved by: ports-secteam Modified: branches/2015Q3/russian/wordpress/Makefile branches/2015Q3/russian/wordpress/distinfo Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/russian/wordpress/Makefile ============================================================================== --- branches/2015Q3/russian/wordpress/Makefile Tue Sep 15 20:39:28 2015 (r397024) +++ branches/2015Q3/russian/wordpress/Makefile Tue Sep 15 20:55:30 2015 (r397025) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.2.4 +PORTVERSION= 4.3.1 DISTVERSIONSUFFIX= -ru_RU CATEGORIES= russian www MASTER_SITES= http://ru.wordpress.org/ Modified: branches/2015Q3/russian/wordpress/distinfo ============================================================================== --- branches/2015Q3/russian/wordpress/distinfo Tue Sep 15 20:39:28 2015 (r397024) +++ branches/2015Q3/russian/wordpress/distinfo Tue Sep 15 20:55:30 2015 (r397025) @@ -1,2 +1,2 @@ -SHA256 (wordpress-4.2.4-ru_RU.tar.gz) = b8a20a6e8097f072bd8e75f7695a14bb3c646a69d62f627c67ec00d925c8be7e -SIZE (wordpress-4.2.4-ru_RU.tar.gz) = 6768021 +SHA256 (wordpress-4.3.1-ru_RU.tar.gz) = edba2de48419d647db32c19e0a4ba6417bb2b40e8532d55b6e8c3cc6085624e7 +SIZE (wordpress-4.3.1-ru_RU.tar.gz) = 6998901 From owner-svn-ports-branches@freebsd.org Wed Sep 16 20:28:31 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F3E229CDC02; Wed, 16 Sep 2015 20:28:30 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E2CB31CB9; Wed, 16 Sep 2015 20:28:30 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8GKSUvv078012; Wed, 16 Sep 2015 20:28:30 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8GKSSuG078005; Wed, 16 Sep 2015 20:28:28 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201509162028.t8GKSSuG078005@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Wed, 16 Sep 2015 20:28:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r397080 - in branches/2015Q3: archivers/p7zip audio/liba52 devel/libmsocket graphics/freeimage irc/irssi-xmpp multimedia/openquicktime security/lockdown X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Sep 2015 20:28:31 -0000 Author: feld Date: Wed Sep 16 20:28:28 2015 New Revision: 397080 URL: https://svnweb.freebsd.org/changeset/ports/397080 Log: MFH: r393831 Adds -fPIC to CFLAGS_aarch64 to a number of ports that already have it in the amd64 CFLAGS and are failing to build. Approved by: bapt Differential Revision: https://reviews.freebsd.org/D3321 Approved by: ports-secteam (with hat) Modified: branches/2015Q3/archivers/p7zip/Makefile branches/2015Q3/audio/liba52/Makefile branches/2015Q3/devel/libmsocket/Makefile branches/2015Q3/graphics/freeimage/Makefile branches/2015Q3/irc/irssi-xmpp/Makefile branches/2015Q3/multimedia/openquicktime/Makefile branches/2015Q3/security/lockdown/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/archivers/p7zip/Makefile ============================================================================== --- branches/2015Q3/archivers/p7zip/Makefile Wed Sep 16 20:23:24 2015 (r397079) +++ branches/2015Q3/archivers/p7zip/Makefile Wed Sep 16 20:28:28 2015 (r397080) @@ -20,6 +20,7 @@ MAKEFILE= makefile MAKE_ARGS= OPTFLAGS="${CXXFLAGS}" WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION} +CFLAGS_aarch64= -fPIC CFLAGS_amd64= -fPIC CFLAGS_ia64= -fPIC Modified: branches/2015Q3/audio/liba52/Makefile ============================================================================== --- branches/2015Q3/audio/liba52/Makefile Wed Sep 16 20:23:24 2015 (r397079) +++ branches/2015Q3/audio/liba52/Makefile Wed Sep 16 20:28:28 2015 (r397080) @@ -30,6 +30,7 @@ DJBFFT_CONFIGURE_ON= --enable-djbfft .include +CFLAGS_aarch64= -fPIC CFLAGS_amd64= -fPIC CFLAGS_powerpc= -fPIC Modified: branches/2015Q3/devel/libmsocket/Makefile ============================================================================== --- branches/2015Q3/devel/libmsocket/Makefile Wed Sep 16 20:23:24 2015 (r397079) +++ branches/2015Q3/devel/libmsocket/Makefile Wed Sep 16 20:28:28 2015 (r397080) @@ -26,6 +26,7 @@ PLIST_FILES= lib/libmsocket.so \ include/msocket.h \ include/msocketutils.h +CFLAGS_aarch64+=-fPIC -DPIC CFLAGS_amd64+= -fPIC -DPIC CFLAGS_iad64+= -fPIC -DPIC Modified: branches/2015Q3/graphics/freeimage/Makefile ============================================================================== --- branches/2015Q3/graphics/freeimage/Makefile Wed Sep 16 20:23:24 2015 (r397079) +++ branches/2015Q3/graphics/freeimage/Makefile Wed Sep 16 20:28:28 2015 (r397080) @@ -17,6 +17,7 @@ WRKSRC= ${WRKDIR}/FreeImage MAKE_ARGS= CC="${CC}" CPP="${CPP}" CXX="${CXX}" CFLAGS+= -fexceptions -fvisibility=hidden +CFLAGS_aarch64= -fPIC CFLAGS_amd64= -fPIC PLIST_FILES= include/FreeImage.h \ Modified: branches/2015Q3/irc/irssi-xmpp/Makefile ============================================================================== --- branches/2015Q3/irc/irssi-xmpp/Makefile Wed Sep 16 20:23:24 2015 (r397079) +++ branches/2015Q3/irc/irssi-xmpp/Makefile Wed Sep 16 20:28:28 2015 (r397080) @@ -21,6 +21,7 @@ USE_LDCONFIG= yes MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" DATADIR= ${PREFIX}/share/irssi DOCSDIR= ${PREFIX}/share/doc/irssi +CFLAGS_aarch64= -fPIC CFLAGS_amd64= -fPIC OPTIONS_DEFINE= DOCS Modified: branches/2015Q3/multimedia/openquicktime/Makefile ============================================================================== --- branches/2015Q3/multimedia/openquicktime/Makefile Wed Sep 16 20:23:24 2015 (r397079) +++ branches/2015Q3/multimedia/openquicktime/Makefile Wed Sep 16 20:28:28 2015 (r397080) @@ -20,6 +20,7 @@ USES= gmake jpeg tar:tgz USE_LDCONFIG= yes PKGDEINSTALL= ${PKGINSTALL} +CFLAGS_aarch64= -fPIC CFLAGS_amd64= -fPIC OPTIONS_DEFINE= DEBUG Modified: branches/2015Q3/security/lockdown/Makefile ============================================================================== --- branches/2015Q3/security/lockdown/Makefile Wed Sep 16 20:23:24 2015 (r397079) +++ branches/2015Q3/security/lockdown/Makefile Wed Sep 16 20:28:28 2015 (r397080) @@ -14,6 +14,7 @@ USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/lockdown +CFLAGS_aarch64+=-fPIC CFLAGS_amd64+= -fPIC do-install: From owner-svn-ports-branches@freebsd.org Wed Sep 16 20:29:07 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 93B889CDC90; Wed, 16 Sep 2015 20:29:07 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 83C631DAD; Wed, 16 Sep 2015 20:29:07 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8GKT7ku078186; Wed, 16 Sep 2015 20:29:07 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8GKT7mC078185; Wed, 16 Sep 2015 20:29:07 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201509162029.t8GKT7mC078185@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Wed, 16 Sep 2015 20:29:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r397081 - branches/2015Q3/archivers/p7zip X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Sep 2015 20:29:07 -0000 Author: feld Date: Wed Sep 16 20:29:06 2015 New Revision: 397081 URL: https://svnweb.freebsd.org/changeset/ports/397081 Log: MFH: r396457 Compile with -fPIC on PowerPC, otherwise resulting binaries are broken: Can't load '/usr/local/bin/../libexec/p7zip/7z.dll' (/usr/local/bin/../libexec/p7zip/7z.so: Unsupported relocation type 10 in non-PLT relocations) Approved by: ports-secteam (with hat) Modified: branches/2015Q3/archivers/p7zip/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/archivers/p7zip/Makefile ============================================================================== --- branches/2015Q3/archivers/p7zip/Makefile Wed Sep 16 20:28:28 2015 (r397080) +++ branches/2015Q3/archivers/p7zip/Makefile Wed Sep 16 20:29:06 2015 (r397081) @@ -3,7 +3,7 @@ PORTNAME= p7zip PORTVERSION= 9.38.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= archivers MASTER_SITES= SF DISTNAME= ${PORTNAME}_${DISTVERSION}_src_all @@ -23,6 +23,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVER CFLAGS_aarch64= -fPIC CFLAGS_amd64= -fPIC CFLAGS_ia64= -fPIC +CFLAGS_powerpc= -fPIC OPTIONS_DEFINE= DOCS From owner-svn-ports-branches@freebsd.org Wed Sep 16 20:29:40 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C426B9CDD9C; Wed, 16 Sep 2015 20:29:40 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B451F1EC2; Wed, 16 Sep 2015 20:29:40 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8GKTeYV078356; Wed, 16 Sep 2015 20:29:40 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8GKTePE078355; Wed, 16 Sep 2015 20:29:40 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201509162029.t8GKTePE078355@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Wed, 16 Sep 2015 20:29:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r397082 - branches/2015Q3/archivers/p7zip X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Sep 2015 20:29:40 -0000 Author: feld Date: Wed Sep 16 20:29:39 2015 New Revision: 397082 URL: https://svnweb.freebsd.org/changeset/ports/397082 Log: MFH: r396461 It turned out -fPIC is required on sparc64 as well: it dumps core without it on extraction, which turn breaks e.g. `sysutils/namefix' port. Do not bump port revision again as it was bumped just couple of hours ago, which is just too small in Tier-2 land for which we do not produce any packages anyways. Tested on: flame Approved by: ports-secteam (with hat) Modified: branches/2015Q3/archivers/p7zip/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/archivers/p7zip/Makefile ============================================================================== --- branches/2015Q3/archivers/p7zip/Makefile Wed Sep 16 20:29:06 2015 (r397081) +++ branches/2015Q3/archivers/p7zip/Makefile Wed Sep 16 20:29:39 2015 (r397082) @@ -24,6 +24,7 @@ CFLAGS_aarch64= -fPIC CFLAGS_amd64= -fPIC CFLAGS_ia64= -fPIC CFLAGS_powerpc= -fPIC +CFLAGS_sparc64= -fPIC OPTIONS_DEFINE= DOCS From owner-svn-ports-branches@freebsd.org Wed Sep 16 20:30:19 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F2EA69CDE22; Wed, 16 Sep 2015 20:30:19 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D6AC81FE1; Wed, 16 Sep 2015 20:30:19 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8GKUJn8079242; Wed, 16 Sep 2015 20:30:19 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8GKUJt3079240; Wed, 16 Sep 2015 20:30:19 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201509162030.t8GKUJt3079240@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Wed, 16 Sep 2015 20:30:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r397083 - in branches/2015Q3/archivers/p7zip: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Sep 2015 20:30:20 -0000 Author: feld Date: Wed Sep 16 20:30:18 2015 New Revision: 397083 URL: https://svnweb.freebsd.org/changeset/ports/397083 Log: MFH: r397079 Apply patch to fix directory traversal vulnerability Submitted by: ohauer Security: CVE-2015-1038 Security: 8f5c9dd6-5cac-11e5-9ad8-14dae9d210b8 Approved by: ports-secteam (with hat) Added: branches/2015Q3/archivers/p7zip/files/patch-CVE-2015-1038 - copied unchanged from r397079, head/archivers/p7zip/files/patch-CVE-2015-1038 Modified: branches/2015Q3/archivers/p7zip/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/archivers/p7zip/Makefile ============================================================================== --- branches/2015Q3/archivers/p7zip/Makefile Wed Sep 16 20:29:39 2015 (r397082) +++ branches/2015Q3/archivers/p7zip/Makefile Wed Sep 16 20:30:18 2015 (r397083) @@ -3,7 +3,7 @@ PORTNAME= p7zip PORTVERSION= 9.38.1 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= archivers MASTER_SITES= SF DISTNAME= ${PORTNAME}_${DISTVERSION}_src_all Copied: branches/2015Q3/archivers/p7zip/files/patch-CVE-2015-1038 (from r397079, head/archivers/p7zip/files/patch-CVE-2015-1038) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/archivers/p7zip/files/patch-CVE-2015-1038 Wed Sep 16 20:30:18 2015 (r397083, copy of r397079, head/archivers/p7zip/files/patch-CVE-2015-1038) @@ -0,0 +1,283 @@ +Author: Ben Hutchings +Date: Tue, 19 May 2015 02:38:40 +0100 +Description: Delay creation of symlinks to prevent arbitrary file writes (CVE-2015-1038) +Bug: http://sourceforge.net/p/p7zip/bugs/147/ +Bug-Debian: https://bugs.debian.org/774660 + +Alexander Cherepanov discovered that 7zip is susceptible to a +directory traversal vulnerability. While extracting an archive, it +will extract symlinks and then follow them if they are referenced in +further entries. This can be exploited by a rogue archive to write +files outside the current directory. + +We have to create placeholder files (which we already do) and delay +creating symlinks until the end of extraction. + +Due to the possibility of anti-items (deletions) in the archive, it is +possible for placeholders to be deleted and replaced before we create +the symlinks. It's not clear that this can be used for mischief, but +GNU tar guards against similar problems by checking that the placeholder +still exists and is the same inode. XXX It also checks 'birth time' but +this isn't portable. We can probably get away with comparing ctime +since we don't support hard links. + +--- CPP/7zip/UI/Agent/Agent.cpp ++++ CPP/7zip/UI/Agent/Agent.cpp +@@ -1215,7 +1215,7 @@ STDMETHODIMP CAgentFolder::Extract(const + HRESULT result = _agentSpec->GetArchive()->Extract(&realIndices.Front(), + realIndices.Size(), testMode, extractCallback); + if (result == S_OK) +- result = extractCallbackSpec->SetDirsTimes(); ++ result = extractCallbackSpec->SetFinalAttribs(); + return result; + COM_TRY_END + } +--- CPP/7zip/UI/Client7z/Client7z.cpp ++++ CPP/7zip/UI/Client7z/Client7z.cpp +@@ -222,8 +222,11 @@ private: + COutFileStream *_outFileStreamSpec; + CMyComPtr _outFileStream; + ++ CObjectVector _delayedSymLinks; ++ + public: + void Init(IInArchive *archiveHandler, const FString &directoryPath); ++ HRESULT SetFinalAttribs(); + + UInt64 NumErrors; + bool PasswordIsDefined; +@@ -441,11 +444,23 @@ STDMETHODIMP CArchiveExtractCallback::Se + } + _outFileStream.Release(); + if (_extractMode && _processedFileInfo.AttribDefined) +- SetFileAttrib(_diskFilePath, _processedFileInfo.Attrib); ++ SetFileAttrib(_diskFilePath, _processedFileInfo.Attrib, &_delayedSymLinks); + PrintNewLine(); + return S_OK; + } + ++HRESULT CArchiveExtractCallback::SetFinalAttribs() ++{ ++ HRESULT result = S_OK; ++ ++ for (int i = 0; i != _delayedSymLinks.Size(); ++i) ++ if (!_delayedSymLinks[i].Create()) ++ result = E_FAIL; ++ ++ _delayedSymLinks.Clear(); ++ ++ return result; ++} + + STDMETHODIMP CArchiveExtractCallback::CryptoGetTextPassword(BSTR *password) + { +@@ -912,6 +927,8 @@ int MY_CDECL main(int numArgs, const cha + // extractCallbackSpec->PasswordIsDefined = true; + // extractCallbackSpec->Password = L"1"; + HRESULT result = archive->Extract(NULL, (UInt32)(Int32)(-1), false, extractCallback); ++ if (result == S_OK) ++ result = extractCallbackSpec->SetFinalAttribs(); + if (result != S_OK) + { + PrintError("Extract Error"); +--- CPP/7zip/UI/Common/ArchiveExtractCallback.cpp ++++ CPP/7zip/UI/Common/ArchiveExtractCallback.cpp +@@ -1083,7 +1083,7 @@ STDMETHODIMP CArchiveExtractCallback::Se + NumFiles++; + + if (_extractMode && _fi.AttribDefined) +- SetFileAttrib(_diskFilePath, _fi.Attrib); ++ SetFileAttrib(_diskFilePath, _fi.Attrib, &_delayedSymLinks); + RINOK(_extractCallback2->SetOperationResult(operationResult, _encrypted)); + return S_OK; + COM_TRY_END +@@ -1149,8 +1149,9 @@ static int GetNumSlashes(const FChar *s) + } + } + +-HRESULT CArchiveExtractCallback::SetDirsTimes() ++HRESULT CArchiveExtractCallback::SetFinalAttribs() + { ++ HRESULT result = S_OK; + CRecordVector pairs; + pairs.ClearAndSetSize(_extractedFolderPaths.Size()); + unsigned i; +@@ -1187,5 +1188,12 @@ HRESULT CArchiveExtractCallback::SetDirs + (WriteATime && ATimeDefined) ? &ATime : NULL, + (WriteMTime && MTimeDefined) ? &MTime : (_arc->MTimeDefined ? &_arc->MTime : NULL)); + } +- return S_OK; ++ ++ for (int i = 0; i != _delayedSymLinks.Size(); ++i) ++ if (!_delayedSymLinks[i].Create()) ++ result = E_FAIL; ++ ++ _delayedSymLinks.Clear(); ++ ++ return result; + } +--- CPP/7zip/UI/Common/ArchiveExtractCallback.h ++++ CPP/7zip/UI/Common/ArchiveExtractCallback.h +@@ -6,6 +6,8 @@ + #include "../../../Common/MyCom.h" + #include "../../../Common/Wildcard.h" + ++#include "../../../Windows/FileDir.h" ++ + #include "../../IPassword.h" + + #include "../../Common/FileStreams.h" +@@ -213,6 +215,8 @@ class CArchiveExtractCallback: + bool _saclEnabled; + #endif + ++ CObjectVector _delayedSymLinks; ++ + void CreateComplexDirectory(const UStringVector &dirPathParts, FString &fullPath); + HRESULT GetTime(int index, PROPID propID, FILETIME &filetime, bool &filetimeIsDefined); + HRESULT GetUnpackSize(); +@@ -293,7 +297,7 @@ public: + _baseParentFolder = indexInArc; + } + +- HRESULT SetDirsTimes(); ++ HRESULT SetFinalAttribs(); + }; + + #endif +--- CPP/7zip/UI/Common/Extract.cpp ++++ CPP/7zip/UI/Common/Extract.cpp +@@ -170,7 +170,7 @@ static HRESULT DecompressArchive( + else + result = archive->Extract(&realIndices.Front(), realIndices.Size(), testMode, ecs); + if (result == S_OK && !options.StdInMode) +- result = ecs->SetDirsTimes(); ++ result = ecs->SetFinalAttribs(); + return callback->ExtractResult(result); + } + +--- CPP/Windows/FileDir.cpp ++++ CPP/Windows/FileDir.cpp +@@ -343,7 +343,8 @@ static int convert_to_symlink(const char + return -1; + } + +-bool SetFileAttrib(CFSTR fileName, DWORD fileAttributes) ++bool SetFileAttrib(CFSTR fileName, DWORD fileAttributes, ++ CObjectVector *delayedSymLinks) + { + if (!fileName) { + SetLastError(ERROR_PATH_NOT_FOUND); +@@ -375,7 +376,9 @@ bool SetFileAttrib(CFSTR fileName, DWORD + stat_info.st_mode = fileAttributes >> 16; + #ifdef ENV_HAVE_LSTAT + if (S_ISLNK(stat_info.st_mode)) { +- if ( convert_to_symlink(name) != 0) { ++ if (delayedSymLinks) ++ delayedSymLinks->Add(CDelayedSymLink(name)); ++ else if ( convert_to_symlink(name) != 0) { + TRACEN((printf("SetFileAttrib(%s,%d) : false-3\n",(const char *)name,fileAttributes))) + return false; + } +@@ -885,6 +888,43 @@ bool CTempDir::Remove() + return !_mustBeDeleted; + } + ++#ifdef ENV_UNIX ++ ++CDelayedSymLink::CDelayedSymLink(const char * source) ++ : _source(source) ++{ ++ struct stat st; ++ ++ if (lstat(_source, &st) == 0) { ++ _dev = st.st_dev; ++ _ino = st.st_ino; ++ } else { ++ _dev = 0; ++ } ++} ++ ++bool CDelayedSymLink::Create() ++{ ++ struct stat st; ++ ++ if (_dev == 0) { ++ errno = EPERM; ++ return false; ++ } ++ if (lstat(_source, &st) != 0) ++ return false; ++ if (_dev != st.st_dev || _ino != st.st_ino) { ++ // Placeholder file has been overwritten or moved by another ++ // symbolic link creation ++ errno = EPERM; ++ return false; ++ } ++ ++ return convert_to_symlink(_source) == 0; ++} ++ ++#endif // ENV_UNIX ++ + }}} + + +--- CPP/Windows/FileDir.h ++++ CPP/Windows/FileDir.h +@@ -4,6 +4,7 @@ + #define __WINDOWS_FILE_DIR_H + + #include "../Common/MyString.h" ++#include "../Common/MyVector.h" + + #include "FileIO.h" + +@@ -11,11 +12,14 @@ namespace NWindows { + namespace NFile { + namespace NDir { + ++class CDelayedSymLink; ++ + bool GetWindowsDir(FString &path); + bool GetSystemDir(FString &path); + + bool SetDirTime(CFSTR path, const FILETIME *cTime, const FILETIME *aTime, const FILETIME *mTime); +-bool SetFileAttrib(CFSTR path, DWORD attrib); ++bool SetFileAttrib(CFSTR path, DWORD attrib, ++ CObjectVector *delayedSymLinks = 0); + bool MyMoveFile(CFSTR existFileName, CFSTR newFileName); + + #ifndef UNDER_CE +@@ -69,6 +73,31 @@ public: + bool Remove(); + }; + ++// Symbolic links must be created last so that they can't be used to ++// create or overwrite files above the extraction directory. ++class CDelayedSymLink ++{ ++#ifdef ENV_UNIX ++ // Where the symlink should be created. The target is specified in ++ // the placeholder file. ++ AString _source; ++ ++ // Device and inode of the placeholder file. Before creating the ++ // symlink, we must check that these haven't been changed by creation ++ // of another symlink. ++ dev_t _dev; ++ ino_t _ino; ++ ++public: ++ explicit CDelayedSymLink(const char * source); ++ bool Create(); ++#else // !ENV_UNIX ++public: ++ CDelayedSymLink(const char * source) {} ++ bool Create() { return true; } ++#endif // ENV_UNIX ++}; ++ + #if !defined(UNDER_CE) + class CCurrentDirRestorer + { From owner-svn-ports-branches@freebsd.org Thu Sep 17 13:55:49 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AAF159CE9EF; Thu, 17 Sep 2015 13:55:49 +0000 (UTC) (envelope-from danilo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7E1F61A5B; Thu, 17 Sep 2015 13:55:49 +0000 (UTC) (envelope-from danilo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8HDtnaV012693; Thu, 17 Sep 2015 13:55:49 GMT (envelope-from danilo@FreeBSD.org) Received: (from danilo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8HDtnN6012692; Thu, 17 Sep 2015 13:55:49 GMT (envelope-from danilo@FreeBSD.org) Message-Id: <201509171355.t8HDtnN6012692@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danilo set sender to danilo@FreeBSD.org using -f From: Danilo Egea Gondolfo Date: Thu, 17 Sep 2015 13:55:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r397113 - in branches/2015Q3/archivers/xarchiver: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Sep 2015 13:55:49 -0000 Author: danilo Date: Thu Sep 17 13:55:48 2015 New Revision: 397113 URL: https://svnweb.freebsd.org/changeset/ports/397113 Log: MFH: r397093 - Replace '--touch' option with '-m' - Fix '--use-compress-program' usage with bsdtar where needed - Improve LZMA detection - Add missing dependency to zipinfo (required to view contents of ZIP archives) - Add ARJ and LZO options - Sort USES while here - Add RAR option PR: 203103 Submitted by: Andriy Voskoboinyk Approved by: ports-secteam (feld) Added: branches/2015Q3/archivers/xarchiver/files/ - copied from r397093, head/archivers/xarchiver/files/ Modified: branches/2015Q3/archivers/xarchiver/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/archivers/xarchiver/Makefile ============================================================================== --- branches/2015Q3/archivers/xarchiver/Makefile Thu Sep 17 13:48:54 2015 (r397112) +++ branches/2015Q3/archivers/xarchiver/Makefile Thu Sep 17 13:55:48 2015 (r397113) @@ -3,6 +3,7 @@ PORTNAME= xarchiver PORTVERSION= 0.5.4 +PORTREVISION= 1 CATEGORIES= archivers MASTER_SITES= SF/${PORTNAME:tl} @@ -13,16 +14,29 @@ LICENSE= GPLv2 RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils \ 7zr:${PORTSDIR}/archivers/p7zip \ - zip:${PORTSDIR}/archivers/zip + zip:${PORTSDIR}/archivers/zip \ + zipinfo:${PORTSDIR}/archivers/unzip -USES= tar:bzip2 gmake pkgconfig desktop-file-utils +USES= desktop-file-utils gmake pkgconfig tar:bzip2 USE_GNOME= glib20 gtk20 intltool GNU_CONFIGURE= yes INSTALLS_ICONS= yes OPTIONS_DEFINE= DOCS NLS +OPTIONS_GROUP= FORMATS +OPTIONS_GROUP_FORMATS= ARJ LZO RAR OPTIONS_SUB= yes +FORMATS_DESC= Additional compression formats support +ARJ_DESC= ARJ compression support +LZO_DESC= LZO compression support +RAR_DESC= RAR compression support + +ARJ_RUN_DEPENDS= arj:${PORTSDIR}/archivers/arj +LZO_RUN_DEPENDS= lzop:${PORTSDIR}/archivers/lzop +RAR_RUN_DEPENDS= unrar:${PORTSDIR}/archivers/unrar \ + rar:${PORTSDIR}/archivers/rar + NLS_USES= gettext NLS_CPPFLAGS+= -I${LOCALBASE}/include NLS_LDFLAGS+= -L${LOCALBASE}/lib From owner-svn-ports-branches@freebsd.org Thu Sep 17 16:19:50 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 76C079CE54B; Thu, 17 Sep 2015 16:19:50 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 679E21CC1; Thu, 17 Sep 2015 16:19:50 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8HGJoTp071210; Thu, 17 Sep 2015 16:19:50 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8HGJoUI071209; Thu, 17 Sep 2015 16:19:50 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201509171619.t8HGJoUI071209@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Thu, 17 Sep 2015 16:19:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r397125 - in branches/2015Q3/deskutils/shutter: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Sep 2015 16:19:50 -0000 Author: feld Date: Thu Sep 17 16:19:49 2015 New Revision: 397125 URL: https://svnweb.freebsd.org/changeset/ports/397125 Log: MFH: r397124 Fix arbitrary code execution vulnerability Security: CVE-2015-0854 Security: d45ad7ae-5d56-11e5-9ad8-14dae9d210b8 Approved by: ports-secteam (with hat) Added: branches/2015Q3/deskutils/shutter/files/ - copied from r397124, head/deskutils/shutter/files/ Modified: branches/2015Q3/deskutils/shutter/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/deskutils/shutter/Makefile ============================================================================== --- branches/2015Q3/deskutils/shutter/Makefile Thu Sep 17 16:17:55 2015 (r397124) +++ branches/2015Q3/deskutils/shutter/Makefile Thu Sep 17 16:19:49 2015 (r397125) @@ -3,7 +3,7 @@ PORTNAME= shutter PORTVERSION= 0.93.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils MASTER_SITES= http://shutter-project.org/wp-content/uploads/releases/tars/ From owner-svn-ports-branches@freebsd.org Fri Sep 18 09:56:31 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 786E89CE239; Fri, 18 Sep 2015 09:56:31 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5D18B1FAE; Fri, 18 Sep 2015 09:56:31 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8I9uV7H061215; Fri, 18 Sep 2015 09:56:31 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8I9uTI2061207; Fri, 18 Sep 2015 09:56:29 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201509180956.t8I9uTI2061207@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Fri, 18 Sep 2015 09:56:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r397229 - in branches/2015Q3/www/h2o: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Sep 2015 09:56:31 -0000 Author: junovitch Date: Fri Sep 18 09:56:28 2015 New Revision: 397229 URL: https://svnweb.freebsd.org/changeset/ports/397229 Log: MFH r393066,r396229,r396629,r397062: r393066 www/h2o: 1.2.0 -> 1.4.2 ChangeLog: https://github.com/h2o/h2o/releases PR: 200998 Submitted by: sean@x-n.su Approved by: Dave Cottlehuber (maintainer) r396229 - Update to 1.4.4 [1] - Drop 8.x support [2] PR: 202818 [1] Submitted by: Dave Cottlehuber (dch skunkwerks at) [1] Approved by: portmgr blanket [2] r396629 - Fix rc.d script - Bump PORTVERSION PR: 202937 Submitted by: gblach Approved by: Dave Cottlehuber (dch skunkwerks at) r397062 - Fix rc.d issues introduced with recent perl changes [1] - Update to 1.4.5 [2] PR: 203147 [1], 203096 [2] Submitted by: Dave Cottlehuber (maintainer) Security: 31ea7f73-5c55-11e5-8607-74d02b9a84d5 Security: CVE-2015-5638 Approved by: ports-secteam (feld) Added: branches/2015Q3/www/h2o/files/patch-CMakeLists.txt - copied, changed from r393066, head/www/h2o/files/patch-CMakeLists.txt Modified: branches/2015Q3/www/h2o/Makefile branches/2015Q3/www/h2o/distinfo branches/2015Q3/www/h2o/files/h2o.conf.sample branches/2015Q3/www/h2o/files/h2o.in branches/2015Q3/www/h2o/pkg-plist Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/www/h2o/Makefile ============================================================================== --- branches/2015Q3/www/h2o/Makefile Fri Sep 18 09:00:11 2015 (r397228) +++ branches/2015Q3/www/h2o/Makefile Fri Sep 18 09:56:28 2015 (r397229) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= h2o -PORTVERSION= 1.2.0 -PORTREVISION= 1 +PORTVERSION= 1.4.5 DISTVERSIONPREFIX= v CATEGORIES= www @@ -14,7 +13,8 @@ LICENSE= MIT USE_GITHUB= yes -USES= cmake compiler:c11 shebangfix +USES= cmake compiler:c11 perl5 shebangfix +USE_PERL5= run SHEBANG_FILES= share/h2o/start_server PORTDOCS= README.md @@ -22,35 +22,34 @@ PORTDOCS= README.md SUB_FILES= ${PORTNAME} SUB_LIST+= H2O_USER=${H2O_USER} \ H2O_GROUP=${H2O_GROUP} \ - H2O_PIDDIR=${H2O_PIDDIR} \ H2O_LOGDIR=${H2O_LOGDIR} PLIST_SUB= H2O_USER=${H2O_USER} \ H2O_GROUP=${H2O_GROUP} \ - H2O_PIDDIR=${H2O_PIDDIR} \ H2O_LOGDIR=${H2O_LOGDIR} H2O_USER?= www H2O_GROUP?= www H2O_LOGDIR= /var/log/${PORTNAME}/ -H2O_PIDDIR= /var/run/${PORTNAME}/ USE_RC_SUBR= ${PORTNAME} .include -.if ${OSVERSION} < 900000 -BROKEN= fails to compile on 8.x -.endif - -CMAKE_ARGS+= -DWITH_BUNDLED_SSL=OFF +CMAKE_ARGS+= -DWITH_BUNDLED_SSL=OFF -DEXTRA_LIBRARIES=OFF USE_OPENSSL_PORT= yes +post-patch: + @${REINPLACE_CMD} -e 's|exec perl|exec ${LOCALBASE}/bin/perl|' \ + ${WRKSRC}/share/h2o/annotate-backtrace-symbols \ + ${WRKSRC}/share/h2o/fetch-ocsp-response \ + ${WRKSRC}/share/h2o/kill-on-close \ + ${WRKSRC}/share/h2o/start_server + post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} \ ${STAGEDIR}${ETCDIR} \ - ${STAGEDIR}${H2O_PIDDIR} \ ${STAGEDIR}${H2O_LOGDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} \ Modified: branches/2015Q3/www/h2o/distinfo ============================================================================== --- branches/2015Q3/www/h2o/distinfo Fri Sep 18 09:00:11 2015 (r397228) +++ branches/2015Q3/www/h2o/distinfo Fri Sep 18 09:56:28 2015 (r397229) @@ -1,2 +1,2 @@ -SHA256 (h2o-h2o-v1.2.0_GH0.tar.gz) = 09aacd84ea0a53eaffdc8e0c2a2cf1108bea5db81d5859a136221fd67f07833f -SIZE (h2o-h2o-v1.2.0_GH0.tar.gz) = 4155709 +SHA256 (h2o-h2o-v1.4.5_GH0.tar.gz) = 0f60e8d35afad61afc284a7abfa9c9a3b976e8f9faed3f0966fb34056e2e138d +SIZE (h2o-h2o-v1.4.5_GH0.tar.gz) = 4736984 Modified: branches/2015Q3/www/h2o/files/h2o.conf.sample ============================================================================== --- branches/2015Q3/www/h2o/files/h2o.conf.sample Fri Sep 18 09:00:11 2015 (r397228) +++ branches/2015Q3/www/h2o/files/h2o.conf.sample Fri Sep 18 09:56:28 2015 (r397229) @@ -1,5 +1,9 @@ # vi: ft=yaml # to find out the configuration commands, run: h2o --help +user: www +pid-file: /var/run/h2o.pid +access-log: /var/log/h2o/h2o-access.log +error-log: /var/log/h2o/h2o-error.log listen: 80 listen: port: 443 @@ -8,7 +12,6 @@ listen: # generate your own certificates certificate-file: /usr/local/etc/h2o/server.crt key-file: /usr/local/etc/h2o/server.key -access-log: /var/log/h2o/h2o.log file.dirlisting: on # per-host configuration hosts: Modified: branches/2015Q3/www/h2o/files/h2o.in ============================================================================== --- branches/2015Q3/www/h2o/files/h2o.in Fri Sep 18 09:00:11 2015 (r397228) +++ branches/2015Q3/www/h2o/files/h2o.in Fri Sep 18 09:56:28 2015 (r397229) @@ -14,7 +14,6 @@ # Set it to YES to enable h2o. # # h2o_config (string): Optional full path for h2o config file -# h2o_user (user): Set to h2o by default. . /etc/rc.subr @@ -23,22 +22,13 @@ rcvar=h2o_enable # defaults : ${h2o_enable:="NO"} -: ${h2o_user:="%%H2O_USER%%"} : ${h2o_config:="%%PREFIX%%/etc/${name}/${name}.conf"} -: ${h2o_options:=" --conf ${h2o_config}"} # daemon -h2o_pidfile="%%H2O_PIDDIR%%${name}.pid" -procname="%%PREFIX%%/bin/${name}" -command=/usr/sbin/daemon -command_args=" -f -c -p ${h2o_pidfile} ${procname} ${h2o_options}" -start_precmd="h2o_precmd" - -h2o_precmd() -{ - # create empty pidfile with correct permissions - install -o ${h2o_user} /dev/null ${h2o_pidfile} -} +pidfile=`grep pid-file ${h2o_config} | cut -d' ' -f2` +command="%%PREFIX%%/bin/${name}" +command_args="-m daemon -c ${h2o_config}" +procname="%%LOCALBASE%%/bin/perl" load_rc_config $name run_rc_command "$1" Copied and modified: branches/2015Q3/www/h2o/files/patch-CMakeLists.txt (from r393066, head/www/h2o/files/patch-CMakeLists.txt) ============================================================================== --- head/www/h2o/files/patch-CMakeLists.txt Tue Jul 28 11:21:25 2015 (r393066, copy source) +++ branches/2015Q3/www/h2o/files/patch-CMakeLists.txt Fri Sep 18 09:56:28 2015 (r397229) @@ -1,6 +1,14 @@ ---- CMakeLists.txt.orig 2015-07-22 11:57:16 UTC +--- CMakeLists.txt.orig 2015-09-01 19:56:02 UTC +++ CMakeLists.txt -@@ -344,14 +344,12 @@ ENDIF (WITH_BUNDLED_SSL) +@@ -285,7 +285,6 @@ IF (OPENSSL_FOUND) + ELSE (LIBUV_FOUND) + SET_TARGET_PROPERTIES(libh2o PROPERTIES EXCLUDE_FROM_ALL 1) + ENDIF (LIBUV_FOUND) +- INSTALL(TARGETS libh2o-evloop DESTINATION lib) + ELSE (OPENSSL_FOUND) + SET_TARGET_PROPERTIES(libh2o PROPERTIES EXCLUDE_FROM_ALL 1) + SET_TARGET_PROPERTIES(libh2o-evloop PROPERTIES EXCLUDE_FROM_ALL 1) +@@ -353,16 +352,15 @@ ENDIF (WITH_BUNDLED_SSL) TARGET_LINK_LIBRARIES(h2o ${EXTRA_LIBRARIES}) INSTALL(TARGETS h2o @@ -12,13 +20,8 @@ INSTALL(TARGETS setuidgid RUNTIME DESTINATION share/h2o) -INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h") --INSTALL(TARGETS libh2o-evloop DESTINATION lib) -+INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h" EXCLUDE PATTERN "h2o" EXCLUDE PATTERN "h2o/socket") - # only install libh2o if libuv is found - IF (LIBUV_FOUND) - INSTALL(TARGETS libh2o DESTINATION lib) -@@ -360,7 +358,6 @@ ELSE (LIBUV_FOUND) - ENDIF (LIBUV_FOUND) ++INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h" ++ EXCLUDE PATTERN "h2o" EXCLUDE PATTERN "h2o/socket") INSTALL(PROGRAMS share/h2o/annotate-backtrace-symbols share/h2o/fetch-ocsp-response share/h2o/kill-on-close share/h2o/start_server DESTINATION share/h2o) -INSTALL(DIRECTORY doc/ DESTINATION share/doc/h2o PATTERN "Makefile" EXCLUDE PATTERN "README.md" EXCLUDE) Modified: branches/2015Q3/www/h2o/pkg-plist ============================================================================== --- branches/2015Q3/www/h2o/pkg-plist Fri Sep 18 09:00:11 2015 (r397228) +++ branches/2015Q3/www/h2o/pkg-plist Fri Sep 18 09:56:28 2015 (r397229) @@ -1,6 +1,8 @@ bin/h2o +share/h2o/annotate-backtrace-symbols share/h2o/fetch-ocsp-response +share/h2o/kill-on-close share/h2o/start_server +%%DATADIR%%/setuidgid @dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%% -@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_PIDDIR%% @sample %%ETCDIR%%/h2o.conf.sample From owner-svn-ports-branches@freebsd.org Fri Sep 18 22:56:32 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 531CE9CF2B8; Fri, 18 Sep 2015 22:56:32 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 42CE71FDE; Fri, 18 Sep 2015 22:56:32 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8IMuWRW024757; Fri, 18 Sep 2015 22:56:32 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8IMuVlk024755; Fri, 18 Sep 2015 22:56:31 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201509182256.t8IMuVlk024755@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Fri, 18 Sep 2015 22:56:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r397303 - in branches/2015Q3/deskutils/remind: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Sep 2015 22:56:32 -0000 Author: junovitch Date: Fri Sep 18 22:56:31 2015 New Revision: 397303 URL: https://svnweb.freebsd.org/changeset/ports/397303 Log: MFH: r397302 deskutils/remind: security update 3.1.13 -> 3.1.15 PR: 202942 Approved by: ports-secteam (feld) Security: b55ecf12-5d98-11e5-9909-002590263bf5 Security: CVE-2015-5957 Deleted: branches/2015Q3/deskutils/remind/files/patch-src_md5.c Modified: branches/2015Q3/deskutils/remind/Makefile branches/2015Q3/deskutils/remind/distinfo Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/deskutils/remind/Makefile ============================================================================== --- branches/2015Q3/deskutils/remind/Makefile Fri Sep 18 22:55:20 2015 (r397302) +++ branches/2015Q3/deskutils/remind/Makefile Fri Sep 18 22:56:31 2015 (r397303) @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= remind -PORTVERSION= 3.1.13 +PORTVERSION= 3.1.15 CATEGORIES= deskutils MASTER_SITES= http://www.roaringpenguin.com/files/download/ \ http://freebsd.unixfreunde.de/sources/ -DISTNAME= ${PORTNAME}-03.01.13 +DISTNAME= ${PORTNAME}-03.01.15 MAINTAINER= jadawin@FreeBSD.org COMMENT= Sophisticated calendar and alarm program Modified: branches/2015Q3/deskutils/remind/distinfo ============================================================================== --- branches/2015Q3/deskutils/remind/distinfo Fri Sep 18 22:55:20 2015 (r397302) +++ branches/2015Q3/deskutils/remind/distinfo Fri Sep 18 22:56:31 2015 (r397303) @@ -1,2 +1,2 @@ -SHA256 (remind-03.01.13.tar.gz) = cf2663d5eb41863fc98da7c8db31ae0a86fbe7137aada81d0649523b4a0bfc4f -SIZE (remind-03.01.13.tar.gz) = 361650 +SHA256 (remind-03.01.15.tar.gz) = 8adab4c0b30a556c34223094c5c74779164d5f3b8be66b8039f44b577e678ec1 +SIZE (remind-03.01.15.tar.gz) = 363101