From owner-svn-ports-branches@freebsd.org Mon May 9 18:44:49 2016 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 85DF1B340D0; Mon, 9 May 2016 18:44:49 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 624891D77; Mon, 9 May 2016 18:44:49 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u49Iimbv081362; Mon, 9 May 2016 18:44:48 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u49IimlN081360; Mon, 9 May 2016 18:44:48 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201605091844.u49IimlN081360@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 9 May 2016 18:44:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414881 - in branches/2016Q2/chinese/sunpinyin: . 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.22 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, 09 May 2016 18:44:49 -0000 Author: dim (src committer) Date: Mon May 9 18:44:48 2016 New Revision: 414881 URL: https://svnweb.freebsd.org/changeset/ports/414881 Log: MFH: r414787 During the exp-run in bug 208158, it was found that chinese/sunpinyin gives errors with libc++ 3.8.0: gmake[2]: Entering directory '/wrkdirs/usr/ports/chinese/sunpinyin/work' slmpack lm_sc.3gm.arpa dict.utf8 lm_sc.3gm Loading lexicon...done. Loading ARPA slm... Writing out...done! slmthread lm_sc.3gm lm_sc.t3g.orig Loading original slm... first pass... Compressing pr values...65536 float values ==> 65536 values Compressing bow values...16384 float values ==> 16384 values Threading the new model...Assertion failed: (prit != pr_map.end()), function main, file src/slm/thread/slmthread.cpp, line 364. /wrkdirs/usr/ports/chinese/sunpinyin/work/sunpinyin-a8bd811/src/sunpinyin-dictgen.mk:51: recipe for target 'lm_sc.t3g.orig' failed This is because the code mostly uses floats, but in some parts it uses log(), exp(), etc, which return doubles. During the parts where it does lookups in std::map constructs, this leads to it not being able to find the expected entries. Fix this by using logf(), expf() and similar, which explicitly return floats. Approved by: portmgr (junovitch) PR: 209369 Added: branches/2016Q2/chinese/sunpinyin/files/patch-src_slm_thread_slmthread.cpp - copied unchanged from r414787, head/chinese/sunpinyin/files/patch-src_slm_thread_slmthread.cpp Modified: branches/2016Q2/chinese/sunpinyin/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/chinese/sunpinyin/Makefile ============================================================================== --- branches/2016Q2/chinese/sunpinyin/Makefile Mon May 9 18:41:02 2016 (r414880) +++ branches/2016Q2/chinese/sunpinyin/Makefile Mon May 9 18:44:48 2016 (r414881) @@ -3,6 +3,7 @@ PORTNAME= sunpinyin DISTVERSION= 2.0.4rc3 +PORTREVISION= 1 CATEGORIES= chinese devel MASTER_SITES= GH:1 SF/open-gram:2 DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:1 \ Copied: branches/2016Q2/chinese/sunpinyin/files/patch-src_slm_thread_slmthread.cpp (from r414787, head/chinese/sunpinyin/files/patch-src_slm_thread_slmthread.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/chinese/sunpinyin/files/patch-src_slm_thread_slmthread.cpp Mon May 9 18:44:48 2016 (r414881, copy of r414787, head/chinese/sunpinyin/files/patch-src_slm_thread_slmthread.cpp) @@ -0,0 +1,17 @@ +--- src/slm/thread/slmthread.cpp.orig 2014-11-14 14:17:48 UTC ++++ src/slm/thread/slmthread.cpp +@@ -250,10 +250,10 @@ main(int argc, char* argv[]) + + bool usingLogPr = slm.isUseLogPr(); + +- #define EffectivePr(a) (float((usingLogPr) ? ((a) / log(2.0)) : (-log2((a))))) +- #define OriginalPr(b) (float((usingLogPr) ? ((b) * log(2.0)) : (exp2(-(b))))) +- #define EffectiveBow(a) (float((usingLogPr) ? (exp(-(a))) : ((a)))) +- #define OriginalBow(b) (float((usingLogPr) ? (-log((b))) : ((b)))) ++ #define EffectivePr(a) (float((usingLogPr) ? ((a) / logf(2.0f)) : (-log2f((a))))) ++ #define OriginalPr(b) (float((usingLogPr) ? ((b) * logf(2.0f)) : (exp2f(-(b))))) ++ #define EffectiveBow(a) (float((usingLogPr) ? (expf(-(a))) : ((a)))) ++ #define OriginalBow(b) (float((usingLogPr) ? (-logf((b))) : ((b)))) + + printf("\nfirst pass..."); fflush(stdout); + for (int lvl = 0; lvl <= slm.getN(); ++lvl) { From owner-svn-ports-branches@freebsd.org Mon May 9 19:02:09 2016 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 740C8B347F2; Mon, 9 May 2016 19:02:09 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 2C50B1FC0; Mon, 9 May 2016 19:02:09 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u49J286U087410; Mon, 9 May 2016 19:02:08 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u49J28oQ087408; Mon, 9 May 2016 19:02:08 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201605091902.u49J28oQ087408@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 9 May 2016 19:02:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414882 - in branches/2016Q2/deskutils/easystroke: . 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.22 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, 09 May 2016 19:02:09 -0000 Author: dim (src committer) Date: Mon May 9 19:02:08 2016 New Revision: 414882 URL: https://svnweb.freebsd.org/changeset/ports/414882 Log: MFH: r414807 During the exp-run in bug 208158, it was found that deskutils/easystroke gives errors with libc++ 3.8.0: handler.cc:536:21: error: static declaration of 'abs' follows non-static declaration static inline float abs(float x) { return x > 0 ? x : -x; } ^ /usr/include/c++/v1/math.h:646:1: note: previous definition is here abs(float __lcpp_x) _NOEXCEPT {return fabsf(__lcpp_x);} ^ This is because easystroke tries to roll its own version of abs(), which is already defined in math.h. Fix this by removing the custom abs(). Approved by: portmgr (feld) PR: 209372 Added: branches/2016Q2/deskutils/easystroke/files/patch-handler.cc - copied unchanged from r414807, head/deskutils/easystroke/files/patch-handler.cc Modified: branches/2016Q2/deskutils/easystroke/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/deskutils/easystroke/Makefile ============================================================================== --- branches/2016Q2/deskutils/easystroke/Makefile Mon May 9 18:44:48 2016 (r414881) +++ branches/2016Q2/deskutils/easystroke/Makefile Mon May 9 19:02:08 2016 (r414882) @@ -3,7 +3,7 @@ PORTNAME= easystroke PORTVERSION= 0.6.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} Copied: branches/2016Q2/deskutils/easystroke/files/patch-handler.cc (from r414807, head/deskutils/easystroke/files/patch-handler.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/deskutils/easystroke/files/patch-handler.cc Mon May 9 19:02:08 2016 (r414882, copy of r414807, head/deskutils/easystroke/files/patch-handler.cc) @@ -0,0 +1,11 @@ +--- handler.cc.orig 2013-03-27 15:52:38 UTC ++++ handler.cc +@@ -533,8 +533,6 @@ public: + virtual Grabber::State grab_mode() { return parent->grab_mode(); } + }; + +-static inline float abs(float x) { return x > 0 ? x : -x; } +- + class AbstractScrollHandler : public Handler { + bool have_x, have_y; + float last_x, last_y; From owner-svn-ports-branches@freebsd.org Mon May 9 19:35:37 2016 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 4FD8EB34869; Mon, 9 May 2016 19:35:37 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 13FF4106B; Mon, 9 May 2016 19:35:37 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u49JZaoP097954; Mon, 9 May 2016 19:35:36 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u49JZaTJ097951; Mon, 9 May 2016 19:35:36 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201605091935.u49JZaTJ097951@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Mon, 9 May 2016 19:35:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414890 - in branches/2016Q2/archivers/libarchive: . 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.22 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, 09 May 2016 19:35:37 -0000 Author: brnrd Date: Mon May 9 19:35:35 2016 New Revision: 414890 URL: https://svnweb.freebsd.org/changeset/ports/414890 Log: MFH: r414861 archivers/libarchive: Update to 2.3.0 - Update to version 2.3.0 - Including RCE vulnerability fix - Version includes previously added patches Security: CVE-2016-1541 Security: 2b4c8e1f-1609-11e6-b55e-b499baebfeaf Approved by: feld (mentor, ports-secteam) Approved by: ports-secteam (feld) Deleted: branches/2016Q2/archivers/libarchive/files/ Modified: branches/2016Q2/archivers/libarchive/Makefile branches/2016Q2/archivers/libarchive/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/archivers/libarchive/Makefile ============================================================================== --- branches/2016Q2/archivers/libarchive/Makefile Mon May 9 19:31:37 2016 (r414889) +++ branches/2016Q2/archivers/libarchive/Makefile Mon May 9 19:35:35 2016 (r414890) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= libarchive -PORTVERSION= 3.1.2 -PORTREVISION= 6 +PORTVERSION= 3.2.0 PORTEPOCH= 1 CATEGORIES= archivers MASTER_SITES= http://libarchive.org/downloads/ @@ -25,15 +24,17 @@ USE_LDCONFIG= yes CONFIGURE_ARGS= --without-xml2 -PLIST_FILES= bin/bsdcpio \ +PLIST_FILES= bin/bsdcat \ + bin/bsdcpio \ bin/bsdtar \ include/archive.h \ include/archive_entry.h \ lib/libarchive.a \ lib/libarchive.so \ lib/libarchive.so.13 \ - lib/libarchive.so.13.1.2 \ + lib/libarchive.so.13.2.0 \ libdata/pkgconfig/libarchive.pc \ + man/man1/bsdcat.1.gz \ man/man1/bsdcpio.1.gz \ man/man1/bsdtar.1.gz \ man/man3/archive_entry.3.gz \ @@ -44,6 +45,7 @@ PLIST_FILES= bin/bsdcpio \ man/man3/archive_entry_stat.3.gz \ man/man3/archive_entry_time.3.gz \ man/man3/archive_read.3.gz \ + man/man3/archive_read_add_passphrase.3.gz \ man/man3/archive_read_data.3.gz \ man/man3/archive_read_disk.3.gz \ man/man3/archive_read_extract.3.gz \ @@ -67,6 +69,7 @@ PLIST_FILES= bin/bsdcpio \ man/man3/archive_write_new.3.gz \ man/man3/archive_write_open.3.gz \ man/man3/archive_write_set_options.3.gz \ + man/man3/archive_write_set_passphrase.3.gz \ man/man3/libarchive.3.gz \ man/man3/libarchive_changes.3.gz \ man/man3/libarchive_internals.3.gz \ Modified: branches/2016Q2/archivers/libarchive/distinfo ============================================================================== --- branches/2016Q2/archivers/libarchive/distinfo Mon May 9 19:31:37 2016 (r414889) +++ branches/2016Q2/archivers/libarchive/distinfo Mon May 9 19:35:35 2016 (r414890) @@ -1,2 +1,2 @@ -SHA256 (libarchive-3.1.2.tar.gz) = eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e -SIZE (libarchive-3.1.2.tar.gz) = 4527540 +SHA256 (libarchive-3.2.0.tar.gz) = 7bce45fd71ff01dc20d19edd78322d4965583d81b8bed8e26cacb65d6f5baa87 +SIZE (libarchive-3.2.0.tar.gz) = 5448095 From owner-svn-ports-branches@freebsd.org Tue May 10 01:51:45 2016 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 3766FB355A8; Tue, 10 May 2016 01:51:45 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 093161532; Tue, 10 May 2016 01:51:44 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4A1pijD014802; Tue, 10 May 2016 01:51:44 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4A1piow014800; Tue, 10 May 2016 01:51:44 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201605100151.u4A1piow014800@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Tue, 10 May 2016 01:51:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414907 - branches/2016Q2/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.22 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, 10 May 2016 01:51:45 -0000 Author: junovitch Date: Tue May 10 01:51:43 2016 New Revision: 414907 URL: https://svnweb.freebsd.org/changeset/ports/414907 Log: MFH: r414903 www/wordpress: update 4.4.2 -> 4.5.2 Approved by: ports-secteam (with hat) Security: CVE-2016-4566 Security: CVE-2016-4567 Security: https://vuxml.FreeBSD.org/freebsd/3686917b-164d-11e6-94fa-002590263bf5.html Modified: branches/2016Q2/www/wordpress/Makefile branches/2016Q2/www/wordpress/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/www/wordpress/Makefile ============================================================================== --- branches/2016Q2/www/wordpress/Makefile Tue May 10 01:50:27 2016 (r414906) +++ branches/2016Q2/www/wordpress/Makefile Tue May 10 01:51:43 2016 (r414907) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.4.2 +PORTVERSION= 4.5.2 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= http://wordpress.org/ Modified: branches/2016Q2/www/wordpress/distinfo ============================================================================== --- branches/2016Q2/www/wordpress/distinfo Tue May 10 01:50:27 2016 (r414906) +++ branches/2016Q2/www/wordpress/distinfo Tue May 10 01:51:43 2016 (r414907) @@ -1,2 +1,2 @@ -SHA256 (wordpress-4.4.2.tar.gz) = c8a74c0f7cfc0d19989d235759e70cebd90f42aa0513bd9bc344230b0f79e08b -SIZE (wordpress-4.4.2.tar.gz) = 7099520 +SHA256 (wordpress-4.5.2.tar.gz) = 1a4d9f05142701e72413609cc30029f66af0f3b29d4ff051e888f48026d20ac9 +SIZE (wordpress-4.5.2.tar.gz) = 7770470 From owner-svn-ports-branches@freebsd.org Tue May 10 01:52:08 2016 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 16A74B355FF; Tue, 10 May 2016 01:52:08 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 DB54B1771; Tue, 10 May 2016 01:52:07 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4A1q7Mw015603; Tue, 10 May 2016 01:52:07 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4A1q6SX015601; Tue, 10 May 2016 01:52:06 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201605100152.u4A1q6SX015601@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Tue, 10 May 2016 01:52:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414908 - branches/2016Q2/german/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.22 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, 10 May 2016 01:52:08 -0000 Author: junovitch Date: Tue May 10 01:52:06 2016 New Revision: 414908 URL: https://svnweb.freebsd.org/changeset/ports/414908 Log: MFH: r414904 german/wordpress: update 4.4.2 -> 4.5.2 Approved by: ports-secteam (with hat) Security: CVE-2016-4566 Security: CVE-2016-4567 Security: https://vuxml.FreeBSD.org/freebsd/3686917b-164d-11e6-94fa-002590263bf5.html Modified: branches/2016Q2/german/wordpress/Makefile branches/2016Q2/german/wordpress/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/german/wordpress/Makefile ============================================================================== --- branches/2016Q2/german/wordpress/Makefile Tue May 10 01:51:43 2016 (r414907) +++ branches/2016Q2/german/wordpress/Makefile Tue May 10 01:52:06 2016 (r414908) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.4.2 +PORTVERSION= 4.5.2 DISTVERSIONSUFFIX= -de_DE CATEGORIES= german www MASTER_SITES= http://de.wordpress.org/ Modified: branches/2016Q2/german/wordpress/distinfo ============================================================================== --- branches/2016Q2/german/wordpress/distinfo Tue May 10 01:51:43 2016 (r414907) +++ branches/2016Q2/german/wordpress/distinfo Tue May 10 01:52:06 2016 (r414908) @@ -1,2 +1,2 @@ -SHA256 (wordpress-4.4.2-de_DE.tar.gz) = b12be8888aa422e99230fca2b0b0b5c5eb6825ee75f7a222c50a19c0f4933c70 -SIZE (wordpress-4.4.2-de_DE.tar.gz) = 7544759 +SHA256 (wordpress-4.5.2-de_DE.tar.gz) = cfbd56a2080080e9c854b0d175387b47bd5dd319928320c77f743c8d3e64ce95 +SIZE (wordpress-4.5.2-de_DE.tar.gz) = 8204699 From owner-svn-ports-branches@freebsd.org Tue May 10 01:52:30 2016 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 E6DDAB35631; Tue, 10 May 2016 01:52:30 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 B804118B7; Tue, 10 May 2016 01:52:30 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4A1qT0K015772; Tue, 10 May 2016 01:52:29 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4A1qTSl015770; Tue, 10 May 2016 01:52:29 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201605100152.u4A1qTSl015770@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Tue, 10 May 2016 01:52:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414909 - branches/2016Q2/chinese/wordpress-zh_TW 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.22 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, 10 May 2016 01:52:31 -0000 Author: junovitch Date: Tue May 10 01:52:29 2016 New Revision: 414909 URL: https://svnweb.freebsd.org/changeset/ports/414909 Log: MFH: r414905 chinese/wordpress-zh_TW: update 4.4.2 -> 4.5.2 Approved by: ports-secteam (with hat) Security: CVE-2016-4566 Security: CVE-2016-4567 Security: https://vuxml.FreeBSD.org/freebsd/3686917b-164d-11e6-94fa-002590263bf5.html Modified: branches/2016Q2/chinese/wordpress-zh_TW/Makefile branches/2016Q2/chinese/wordpress-zh_TW/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/chinese/wordpress-zh_TW/Makefile ============================================================================== --- branches/2016Q2/chinese/wordpress-zh_TW/Makefile Tue May 10 01:52:06 2016 (r414908) +++ branches/2016Q2/chinese/wordpress-zh_TW/Makefile Tue May 10 01:52:29 2016 (r414909) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.4.2 +PORTVERSION= 4.5.2 DISTVERSIONSUFFIX= -zh_TW CATEGORIES= chinese www MASTER_SITES= http://tw.wordpress.org/ Modified: branches/2016Q2/chinese/wordpress-zh_TW/distinfo ============================================================================== --- branches/2016Q2/chinese/wordpress-zh_TW/distinfo Tue May 10 01:52:06 2016 (r414908) +++ branches/2016Q2/chinese/wordpress-zh_TW/distinfo Tue May 10 01:52:29 2016 (r414909) @@ -1,2 +1,2 @@ -SHA256 (wordpress-4.4.2-zh_TW.tar.gz) = 11420a463e25b2c0b3ec6bc1fd9a1b5fa09d7e7f00f99b25684571e30c1eefdd -SIZE (wordpress-4.4.2-zh_TW.tar.gz) = 7527437 +SHA256 (wordpress-4.5.2-zh_TW.tar.gz) = 1ace50ffe91c987dd5722fb74557acf7c962ec5a2305553999b2f565d0ac0deb +SIZE (wordpress-4.5.2-zh_TW.tar.gz) = 8188796 From owner-svn-ports-branches@freebsd.org Tue May 10 01:53:05 2016 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 6E4EFB35686; Tue, 10 May 2016 01:53:05 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 4007919F0; Tue, 10 May 2016 01:53:05 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4A1r4KA015948; Tue, 10 May 2016 01:53:04 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4A1r4KF015946; Tue, 10 May 2016 01:53:04 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201605100153.u4A1r4KF015946@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Tue, 10 May 2016 01:53:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414910 - branches/2016Q2/japanese/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.22 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, 10 May 2016 01:53:05 -0000 Author: junovitch Date: Tue May 10 01:53:04 2016 New Revision: 414910 URL: https://svnweb.freebsd.org/changeset/ports/414910 Log: MFH: r414906 japanese/wordpress: update 4.4.2 -> 4.5.2 Approved by: ports-secteam (with hat) Security: CVE-2016-4566 Security: CVE-2016-4567 Security: https://vuxml.FreeBSD.org/freebsd/3686917b-164d-11e6-94fa-002590263bf5.html Modified: branches/2016Q2/japanese/wordpress/Makefile branches/2016Q2/japanese/wordpress/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/japanese/wordpress/Makefile ============================================================================== --- branches/2016Q2/japanese/wordpress/Makefile Tue May 10 01:52:29 2016 (r414909) +++ branches/2016Q2/japanese/wordpress/Makefile Tue May 10 01:53:04 2016 (r414910) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.4.2 -PORTREVISION= 1 +PORTVERSION= 4.5.2 DISTVERSIONSUFFIX= -ja CATEGORIES= japanese www MASTER_SITES= http://ja.wordpress.org/ Modified: branches/2016Q2/japanese/wordpress/distinfo ============================================================================== --- branches/2016Q2/japanese/wordpress/distinfo Tue May 10 01:52:29 2016 (r414909) +++ branches/2016Q2/japanese/wordpress/distinfo Tue May 10 01:53:04 2016 (r414910) @@ -1,2 +1,2 @@ -SHA256 (wordpress-4.4.2-ja.tar.gz) = 1d6e1f2558a6a0fa1856824a1caef1824a4ecf8a57b1435fd4946ce31454df59 -SIZE (wordpress-4.4.2-ja.tar.gz) = 7549339 +SHA256 (wordpress-4.5.2-ja.tar.gz) = 3c4bb522e3b32a080f7a10884381e43f2450bc3d166d1dfe3a93c600b33e4f3e +SIZE (wordpress-4.5.2-ja.tar.gz) = 8249839 From owner-svn-ports-branches@freebsd.org Tue May 10 02:12:22 2016 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 BF77AB35CB4; Tue, 10 May 2016 02:12:22 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 82044143F; Tue, 10 May 2016 02:12:22 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4A2CLax022392; Tue, 10 May 2016 02:12:21 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4A2CLk4022386; Tue, 10 May 2016 02:12:21 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201605100212.u4A2CLk4022386@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Tue, 10 May 2016 02:12:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414912 - in branches/2016Q2/databases: mysql56-client/files mysql56-server 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.22 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, 10 May 2016 02:12:22 -0000 Author: junovitch Date: Tue May 10 02:12:21 2016 New Revision: 414912 URL: https://svnweb.freebsd.org/changeset/ports/414912 Log: MFH: r413653 Update to 5.6.30 release. PR: 209344 Reported by: Fabiano Sidler Approved by: ports-secteam (with hat) Security: https://vuxml.FreeBSD.org/freebsd/8c2b2f11-0ebe-11e6-b55e-b499baebfeaf.html Modified: branches/2016Q2/databases/mysql56-client/files/patch-CMakeLists.txt branches/2016Q2/databases/mysql56-client/files/patch-client_CMakeLists.txt branches/2016Q2/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake branches/2016Q2/databases/mysql56-client/files/patch-extra_CMakeLists.txt branches/2016Q2/databases/mysql56-server/Makefile branches/2016Q2/databases/mysql56-server/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/databases/mysql56-client/files/patch-CMakeLists.txt ============================================================================== --- branches/2016Q2/databases/mysql56-client/files/patch-CMakeLists.txt Tue May 10 01:57:37 2016 (r414911) +++ branches/2016Q2/databases/mysql56-client/files/patch-CMakeLists.txt Tue May 10 02:12:21 2016 (r414912) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2014-07-18 15:48:39.000000000 +0000 -+++ CMakeLists.txt 2014-08-04 13:56:19.445692503 +0000 -@@ -492,8 +492,8 @@ +--- CMakeLists.txt.orig 2016-03-03 16:35:33.000000000 +0100 ++++ CMakeLists.txt 2016-04-19 17:30:13.343558770 +0200 +@@ -475,8 +475,8 @@ ENDIF() ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(client) @@ -10,7 +10,7 @@ IF(UNIX) ADD_SUBDIRECTORY(man) -@@ -560,18 +560,17 @@ +@@ -546,18 +546,17 @@ ELSE() SET(CPACK_GENERATOR "TGZ") ENDIF() ADD_SUBDIRECTORY(packaging/WiX) @@ -30,10 +30,11 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -597,5 +596,6 @@ +@@ -579,6 +578,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() +ENDIF() INCLUDE(CPack) + Modified: branches/2016Q2/databases/mysql56-client/files/patch-client_CMakeLists.txt ============================================================================== --- branches/2016Q2/databases/mysql56-client/files/patch-client_CMakeLists.txt Tue May 10 01:57:37 2016 (r414911) +++ branches/2016Q2/databases/mysql56-client/files/patch-client_CMakeLists.txt Tue May 10 02:12:21 2016 (r414912) @@ -1,7 +1,7 @@ ---- client/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 -+++ client/CMakeLists.txt 2013-02-13 10:36:50.000000000 +0100 -@@ -39,9 +39,11 @@ - TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY}) +--- client/CMakeLists.txt.orig 2016-03-03 16:35:33.000000000 +0100 ++++ client/CMakeLists.txt 2016-04-19 17:30:13.344558659 +0200 +@@ -37,9 +37,11 @@ IF(UNIX) + TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) ENDIF(UNIX) +IF(FALSE) @@ -12,8 +12,8 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) -@@ -53,15 +55,19 @@ - MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) +@@ -52,15 +54,19 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim + SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) +IF(FALSE) @@ -32,7 +32,7 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) -@@ -82,8 +88,6 @@ +@@ -81,8 +87,6 @@ IF(WIN32) ENDIF(WIN32) SET_TARGET_PROPERTIES ( Modified: branches/2016Q2/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake ============================================================================== --- branches/2016Q2/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake Tue May 10 01:57:37 2016 (r414911) +++ branches/2016Q2/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake Tue May 10 02:12:21 2016 (r414912) @@ -1,6 +1,6 @@ ---- cmake/build_configurations/compiler_options.cmake.orig 2014-12-05 10:49:17.394216277 +0000 -+++ cmake/build_configurations/compiler_options.cmake 2014-12-05 10:50:58.144209859 +0000 -@@ -25,7 +25,7 @@ +--- cmake/build_configurations/compiler_options.cmake.orig 2016-03-03 16:35:33.000000000 +0100 ++++ cmake/build_configurations/compiler_options.cmake 2016-04-19 17:30:13.345558666 +0200 +@@ -25,7 +25,7 @@ IF(UNIX) # Default GCC flags IF(CMAKE_COMPILER_IS_GNUCC) @@ -9,7 +9,7 @@ # Disable inline optimizations for valgrind testing to avoid false positives IF(WITH_VALGRIND) SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}") -@@ -34,7 +34,7 @@ +@@ -34,7 +34,7 @@ IF(UNIX) SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}") ENDIF() IF(CMAKE_COMPILER_IS_GNUCXX) Modified: branches/2016Q2/databases/mysql56-client/files/patch-extra_CMakeLists.txt ============================================================================== --- branches/2016Q2/databases/mysql56-client/files/patch-extra_CMakeLists.txt Tue May 10 01:57:37 2016 (r414911) +++ branches/2016Q2/databases/mysql56-client/files/patch-extra_CMakeLists.txt Tue May 10 02:12:21 2016 (r414912) @@ -1,6 +1,6 @@ ---- extra/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 -+++ extra/CMakeLists.txt 2013-02-13 11:02:40.000000000 +0100 -@@ -60,6 +60,7 @@ +--- extra/CMakeLists.txt.orig 2016-03-03 16:35:33.000000000 +0100 ++++ extra/CMakeLists.txt 2016-04-19 17:37:34.634528313 +0200 +@@ -60,6 +60,7 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY ENDIF() @@ -8,7 +8,7 @@ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl) SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX) -@@ -96,11 +97,14 @@ +@@ -96,10 +97,13 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES}) TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl) ENDIF() @@ -16,9 +16,8 @@ IF(UNIX) +IF(FALSE) - MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) + MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc) TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl) - SET_TARGET_PROPERTIES(resolve_stack_dump PROPERTIES LINKER_LANGUAGE CXX) +ENDIF() MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c) Modified: branches/2016Q2/databases/mysql56-server/Makefile ============================================================================== --- branches/2016Q2/databases/mysql56-server/Makefile Tue May 10 01:57:37 2016 (r414911) +++ branches/2016Q2/databases/mysql56-server/Makefile Tue May 10 02:12:21 2016 (r414912) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.6.27 +PORTVERSION= 5.6.30 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.6 Modified: branches/2016Q2/databases/mysql56-server/distinfo ============================================================================== --- branches/2016Q2/databases/mysql56-server/distinfo Tue May 10 01:57:37 2016 (r414911) +++ branches/2016Q2/databases/mysql56-server/distinfo Tue May 10 02:12:21 2016 (r414912) @@ -1,2 +1,2 @@ -SHA256 (mysql-5.6.27.tar.gz) = 8356bba23f3f6c0c2d4806110c41d1c4d6a4b9c50825e11c5be4bbee2b20b71d -SIZE (mysql-5.6.27.tar.gz) = 33327156 +SHA256 (mysql-5.6.30.tar.gz) = 48464df00aad9b9dfc26c903529ddad944a7562aa28e66e98e4f3f0c35179deb +SIZE (mysql-5.6.30.tar.gz) = 32223818 From owner-svn-ports-branches@freebsd.org Tue May 10 03:10:12 2016 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 45476B35438; Tue, 10 May 2016 03:10:12 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 E3D1711D0; Tue, 10 May 2016 03:10:11 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4A3ABlC039229; Tue, 10 May 2016 03:10:11 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4A3A9bn039213; Tue, 10 May 2016 03:10:09 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201605100310.u4A3A9bn039213@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Tue, 10 May 2016 03:10:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414914 - in branches/2016Q2/lang: perl5-devel perl5-devel/files perl5.18 perl5.18/files perl5.20 perl5.20/files perl5.22 perl5.22/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.22 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, 10 May 2016 03:10:12 -0000 Author: junovitch Date: Tue May 10 03:10:09 2016 New Revision: 414914 URL: https://svnweb.freebsd.org/changeset/ports/414914 Log: MFH r412502 r412503 r413010 r413019 r413036 r413249 r413567: Apply batch of Perl updates up to security issue fix. Fix a Perl security issue. PR: 208879 Reported by: Sevan Janiyan Security: CVE-2016-2381 Sponsored by: Absolight Approved by: ports-secteam (with hat) Added: branches/2016Q2/lang/perl5.18/files/patch-7098eff - copied unchanged from r413567, head/lang/perl5.18/files/patch-7098eff branches/2016Q2/lang/perl5.20/files/patch-7098eff - copied unchanged from r413567, head/lang/perl5.20/files/patch-7098eff branches/2016Q2/lang/perl5.22/files/patch-58eaa11 - copied unchanged from r413567, head/lang/perl5.22/files/patch-58eaa11 Modified: branches/2016Q2/lang/perl5-devel/Makefile branches/2016Q2/lang/perl5-devel/distinfo branches/2016Q2/lang/perl5-devel/files/patch-perl.c branches/2016Q2/lang/perl5-devel/files/patch-t_porting_customized.dat branches/2016Q2/lang/perl5-devel/pkg-plist branches/2016Q2/lang/perl5-devel/version.mk branches/2016Q2/lang/perl5.18/Makefile branches/2016Q2/lang/perl5.18/pkg-plist branches/2016Q2/lang/perl5.20/Makefile branches/2016Q2/lang/perl5.20/pkg-plist branches/2016Q2/lang/perl5.22/Makefile branches/2016Q2/lang/perl5.22/pkg-plist Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/lang/perl5-devel/Makefile ============================================================================== --- branches/2016Q2/lang/perl5-devel/Makefile Tue May 10 03:00:13 2016 (r414913) +++ branches/2016Q2/lang/perl5-devel/Makefile Tue May 10 03:10:09 2016 (r414914) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= perl -PORTREVISION= 0 +PORTREVISION= 2 # XXX Remove second line, uncomment first #DISTVERSION= ${PERL_VERSION} DISTVERSION= ${GH_TAGNAME:C/^v//:C/-g[0-9a-f]*$//} @@ -23,13 +23,14 @@ LICENSE_FILE_ART10= ${WRKSRC}/Artistic LICENSE_FILE_GPLv1= ${WRKSRC}/Copying TEST_TARGET= test_harness -TEST_ENV= ${MAKE_ENV} TEST_JOBS=${MAKE_JOBS_NUMBER} +TEST_ENV= ${MAKE_ENV} TEST_JOBS=${MAKE_JOBS_NUMBER} \ + LD_LIBRARY_PATH=${WRKSRC} COMPRESS_ZLIB_RUN_ALL=yes # XXX Remove github things. USE_GITHUB= yes GH_ACCOUNT= Perl GH_PROJECT= perl5 -GH_TAGNAME= v5.23.9-30-g4caf7d8 +GH_TAGNAME= v5.23.9-85-g9b1bcf2 OPTIONS_DEFINE= DEBUG GDBM PERL_64BITINT PTHREAD \ MULTIPLICITY SITECUSTOMIZE @@ -161,6 +162,7 @@ PLIST_SUB+= PERL_VERSION=${PERL_VERSION} SITE_PERL=${SITE_PERL_REL} \ SITE_ARCH=${SITE_ARCH_REL} \ PRIV_LIB=${_PRIV_LIB} \ + PKGNAMESUFFIX=${PKGNAMESUFFIX} \ ARCH_LIB=${_ARCH_LIB} PLIST_SUB+= PORTVERSION=${PORTVERSION} # XXX Remove @@ -271,6 +273,17 @@ post-patch-PTHREAD-off: ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%||g;' \ ${WRKSRC}/hints/freebsd.sh +post-build: + @${REINPLACE_CMD} -e '/^lddlflags/s|-L${WRKSRC} ||' \ + ${WRKSRC}/lib/Config_heavy.pl +.if ${CC} == /nxb-bin/usr/bin/cc + @${REINPLACE_CMD} -e 's=/nxb-bin==' \ + ${WRKSRC}/lib/Config.pm ${WRKSRC}/lib/Config_heavy.pl +# Restore Config.pm's timestamp so that Perl's build system does not think it +# needs to rebuild everything. + @${TOUCH} -r ${WRKSRC}/lib/Config.pm.bak ${WRKSRC}/lib/Config.pm +.endif + post-install: ${MKDIR} ${STAGEDIR}${SITE_MAN1} ${STAGEDIR}${SITE_MAN3} ${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto @@ -295,6 +308,6 @@ post-install: ${STRIP_CMD} $$f; \ ${CHMOD} 444 $$f; \ done - ${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf + ${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PKGNAMESUFFIX}.conf .include Modified: branches/2016Q2/lang/perl5-devel/distinfo ============================================================================== --- branches/2016Q2/lang/perl5-devel/distinfo Tue May 10 03:00:13 2016 (r414913) +++ branches/2016Q2/lang/perl5-devel/distinfo Tue May 10 03:10:09 2016 (r414914) @@ -1,2 +1,2 @@ -SHA256 (perl/perl-5.23.9-30_GH0.tar.gz) = c39da02236981dc5acaea469134836083907e393e836a4640d11b7d15bb048f3 -SIZE (perl/perl-5.23.9-30_GH0.tar.gz) = 17864815 +SHA256 (perl/perl-5.23.9-85_GH0.tar.gz) = d9cf37b24daf8054ee86f6ebcff11197b45b52dcc8281c6521b17eedc686ac1d +SIZE (perl/perl-5.23.9-85_GH0.tar.gz) = 17879774 Modified: branches/2016Q2/lang/perl5-devel/files/patch-perl.c ============================================================================== --- branches/2016Q2/lang/perl5-devel/files/patch-perl.c Tue May 10 03:00:13 2016 (r414913) +++ branches/2016Q2/lang/perl5-devel/files/patch-perl.c Tue May 10 03:10:09 2016 (r414914) @@ -1,6 +1,6 @@ ---- perl.c.orig 2016-03-20 17:57:16 UTC +--- perl.c.orig 2016-04-11 00:49:39 UTC +++ perl.c -@@ -1821,23 +1821,7 @@ S_Internals_V(pTHX_ CV *cv) +@@ -1825,23 +1825,7 @@ S_Internals_V(pTHX_ CV *cv) PUSHs(Perl_newSVpvn_flags(aTHX_ non_bincompat_options, sizeof(non_bincompat_options) - 1, SVs_TEMP)); Modified: branches/2016Q2/lang/perl5-devel/files/patch-t_porting_customized.dat ============================================================================== --- branches/2016Q2/lang/perl5-devel/files/patch-t_porting_customized.dat Tue May 10 03:00:13 2016 (r414913) +++ branches/2016Q2/lang/perl5-devel/files/patch-t_porting_customized.dat Tue May 10 03:10:09 2016 (r414914) @@ -1,4 +1,4 @@ ---- t/porting/customized.dat.orig 2016-03-14 01:56:49 UTC +--- t/porting/customized.dat.orig 2016-04-04 04:52:21 UTC +++ t/porting/customized.dat @@ -14,7 +14,7 @@ ExtUtils::MakeMaker cpan/ExtUtils-MakeMa ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm 23a4b33b974e036d59bf55aa02e025506a408048 @@ -9,7 +9,7 @@ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm a0ec076bedfa0c2e52fc2b735fbc75b4c2706bbf ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm 976b10ec76d1fe6f7ee9000b5596e8950434880b ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm bc4b33fa5296ab35bcb1be1c18759b93c4de2598 -@@ -42,7 +42,7 @@ IPC::SysV cpan/IPC-SysV/lib/IPC/SharedMe +@@ -44,7 +44,7 @@ IPC::SysV cpan/IPC-SysV/lib/IPC/SharedMe IPC::SysV cpan/IPC-SysV/lib/IPC/SysV.pm 9a0d1c3dcd67321ef1322f29102a1bc7eb91c61c IPC::SysV cpan/IPC-SysV/t/ipcsysv.t ee2c95e846ea201afe13c9ec53b09cef62c8ac68 Math::BigRat cpan/Math-BigRat/lib/Math/BigRat.pm 6eabc68e04f67694f6fe523e64eb013fc337ca5b Modified: branches/2016Q2/lang/perl5-devel/pkg-plist ============================================================================== --- branches/2016Q2/lang/perl5-devel/pkg-plist Tue May 10 03:00:13 2016 (r414913) +++ branches/2016Q2/lang/perl5-devel/pkg-plist Tue May 10 03:10:09 2016 (r414914) @@ -32,7 +32,7 @@ bin/shasum%%BINSUFFIX%% bin/splain%%BINSUFFIX%% bin/xsubpp%%BINSUFFIX%% bin/zipdetails%%BINSUFFIX%% -etc/man.d/perl%%PERL_VER%%.conf +etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%PRIV_LIB%%/AnyDBM_File.pm %%PRIV_LIB%%/App/Cpan.pm %%PRIV_LIB%%/App/Prove.pm @@ -1448,7 +1448,6 @@ etc/man.d/perl%%PERL_VER%%.conf %%PRIV_LIB%%/pod/perl5220delta.pod %%PRIV_LIB%%/pod/perl5221delta.pod %%PRIV_LIB%%/pod/perl5230delta.pod -%%PRIV_LIB%%/pod/perl52310delta.pod %%PRIV_LIB%%/pod/perl5231delta.pod %%PRIV_LIB%%/pod/perl5232delta.pod %%PRIV_LIB%%/pod/perl5233delta.pod @@ -1458,6 +1457,7 @@ etc/man.d/perl%%PERL_VER%%.conf %%PRIV_LIB%%/pod/perl5237delta.pod %%PRIV_LIB%%/pod/perl5238delta.pod %%PRIV_LIB%%/pod/perl5239delta.pod +%%PRIV_LIB%%/pod/perl5240delta.pod %%PRIV_LIB%%/pod/perl561delta.pod %%PRIV_LIB%%/pod/perl56delta.pod %%PRIV_LIB%%/pod/perl581delta.pod @@ -2126,7 +2126,6 @@ etc/man.d/perl%%PERL_VER%%.conf %%MAN1%%/perl5220delta.1.gz %%MAN1%%/perl5221delta.1.gz %%MAN1%%/perl5230delta.1.gz -%%MAN1%%/perl52310delta.1.gz %%MAN1%%/perl5231delta.1.gz %%MAN1%%/perl5232delta.1.gz %%MAN1%%/perl5233delta.1.gz @@ -2136,6 +2135,7 @@ etc/man.d/perl%%PERL_VER%%.conf %%MAN1%%/perl5237delta.1.gz %%MAN1%%/perl5238delta.1.gz %%MAN1%%/perl5239delta.1.gz +%%MAN1%%/perl5240delta.1.gz %%MAN1%%/perl561delta.1.gz %%MAN1%%/perl56delta.1.gz %%MAN1%%/perl581delta.1.gz Modified: branches/2016Q2/lang/perl5-devel/version.mk ============================================================================== --- branches/2016Q2/lang/perl5-devel/version.mk Tue May 10 03:00:13 2016 (r414913) +++ branches/2016Q2/lang/perl5-devel/version.mk Tue May 10 03:10:09 2016 (r414914) @@ -1,2 +1,2 @@ -PERL_VERSION= 5.23.10 +PERL_VERSION= 5.24.0 PERL5_DEPEND= perl5>=5.23<5.24 Modified: branches/2016Q2/lang/perl5.18/Makefile ============================================================================== --- branches/2016Q2/lang/perl5.18/Makefile Tue May 10 03:00:13 2016 (r414913) +++ branches/2016Q2/lang/perl5.18/Makefile Tue May 10 03:10:09 2016 (r414914) @@ -3,7 +3,7 @@ PORTNAME= perl PORTVERSION= ${PERL_VERSION} -PORTREVISION= 17 +PORTREVISION= 21 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN/../../src/5.0 DIST_SUBDIR= perl @@ -20,7 +20,8 @@ DEPRECATED= Unsupported, please upgrade EXPIRATION_DATE=2016-12-31 TEST_TARGET= test_harness -TEST_ENV= ${MAKE_ENV} TEST_JOBS=${MAKE_JOBS_NUMBER} +TEST_ENV= ${MAKE_ENV} TEST_JOBS=${MAKE_JOBS_NUMBER} \ + LD_LIBRARY_PATH=${WRKSRC} COMPRESS_ZLIB_RUN_ALL=yes OPTIONS_DEFINE= DEBUG GDBM PERL_64BITINT PTHREAD \ MULTIPLICITY SITECUSTOMIZE USE_PERL @@ -201,6 +202,7 @@ PLIST_SUB+= PERL_VERSION=${PERL_VERSION} SITE_PERL=${SITE_PERL_REL} \ SITE_ARCH=${SITE_ARCH_REL} \ PRIV_LIB=${_PRIV_LIB} \ + PKGNAMESUFFIX=${PKGNAMESUFFIX} \ ARCH_LIB=${_ARCH_LIB} # Put a symlink to the future libperl.so.x.yy so that -lperl works. @@ -238,6 +240,17 @@ post-patch-PTHREAD-off: ${WRKSRC}/hints/freebsd.sh .endif +post-build: + @${REINPLACE_CMD} -e '/^lddlflags/s|-L${WRKSRC} ||' \ + ${WRKSRC}/lib/Config_heavy.pl +.if ${CC} == /nxb-bin/usr/bin/cc + @${REINPLACE_CMD} -e 's=/nxb-bin==' \ + ${WRKSRC}/lib/Config.pm ${WRKSRC}/lib/Config_heavy.pl +# Restore Config.pm's timestamp so that Perl's build system does not think it +# needs to rebuild everything. + @${TOUCH} -r ${WRKSRC}/lib/Config.pm.bak ${WRKSRC}/lib/Config.pm +.endif + post-install: ${MKDIR} ${STAGEDIR}${SITE_MAN1} ${STAGEDIR}${SITE_MAN3} ${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto @@ -261,6 +274,6 @@ post-install: ${STRIP_CMD} $$f; \ ${CHMOD} 444 $$f; \ done - ${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf + ${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PKGNAMESUFFIX}.conf .include Copied: branches/2016Q2/lang/perl5.18/files/patch-7098eff (from r413567, head/lang/perl5.18/files/patch-7098eff) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/lang/perl5.18/files/patch-7098eff Tue May 10 03:10:09 2016 (r414914, copy of r413567, head/lang/perl5.18/files/patch-7098eff) @@ -0,0 +1,98 @@ +commit 7098efff946437a2db6013d12c4fc3193fc328ce +Author: Tony Cook +Date: 2016-01-27 11:52:15 +1100 + + remove duplicate environment variables from environ + + If we see duplicate environment variables while iterating over + environ[]: + + a) make sure we use the same value in %ENV that getenv() returns. + + Previously on a duplicate, %ENV would have the last entry for the name + from environ[], but a typical getenv() would return the first entry. + + Rather than assuming all getenv() implementations return the first entry + explicitly call getenv() to ensure they agree. + + b) remove duplicate entries from environ + + Previously if there was a duplicate definition for a name in environ[] + setting that name in %ENV could result in an unsafe value being passed + to a child process, so ensure environ[] has no duplicates. + +--- perl.c.orig 2014-10-01 01:33:00 UTC ++++ perl.c +@@ -4272,23 +4272,70 @@ S_init_postdump_symbols(pTHX_ int argc, + } + if (env) { + char *s, *old_var; ++ STRLEN nlen; + SV *sv; ++ HV *dups = newHV(); ++ + for (; *env; env++) { + old_var = *env; + + if (!(s = strchr(old_var,'=')) || s == old_var) + continue; ++ nlen = s - old_var; + + #if defined(MSDOS) && !defined(DJGPP) + *s = '\0'; + (void)strupr(old_var); + *s = '='; + #endif +- sv = newSVpv(s+1, 0); +- (void)hv_store(hv, old_var, s - old_var, sv, 0); ++ if (hv_exists(hv, old_var, nlen)) { ++ const char *name = savepvn(old_var, nlen); ++ ++ /* make sure we use the same value as getenv(), otherwise code that ++ uses getenv() (like setlocale()) might see a different value to %ENV ++ */ ++ sv = newSVpv(PerlEnv_getenv(name), 0); ++ ++ /* keep a count of the dups of this name so we can de-dup environ later */ ++ if (hv_exists(dups, name, nlen)) ++ ++SvIVX(*hv_fetch(dups, name, nlen, 0)); ++ else ++ (void)hv_store(dups, name, nlen, newSViv(1), 0); ++ ++ Safefree(name); ++ } ++ else { ++ sv = newSVpv(s+1, 0); ++ } ++ (void)hv_store(hv, old_var, nlen, sv, 0); + if (env_is_not_environ) + mg_set(sv); + } ++ if (HvKEYS(dups)) { ++ /* environ has some duplicate definitions, remove them */ ++ HE *entry; ++ hv_iterinit(dups); ++ while ((entry = hv_iternext_flags(dups, 0))) { ++ STRLEN nlen; ++ const char *name = HePV(entry, nlen); ++ IV count = SvIV(HeVAL(entry)); ++ IV i; ++ SV **valp = hv_fetch(hv, name, nlen, 0); ++ ++ assert(valp); ++ ++ /* try to remove any duplicate names, depending on the ++ * implementation used in my_setenv() the iteration might ++ * not be necessary, but let's be safe. ++ */ ++ for (i = 0; i < count; ++i) ++ my_setenv(name, 0); ++ ++ /* and set it back to the value we set $ENV{name} to */ ++ my_setenv(name, SvPV_nolen(*valp)); ++ } ++ } ++ SvREFCNT_dec_NN(dups); + } + #endif /* USE_ENVIRON_ARRAY */ + #endif /* !PERL_MICRO */ Modified: branches/2016Q2/lang/perl5.18/pkg-plist ============================================================================== --- branches/2016Q2/lang/perl5.18/pkg-plist Tue May 10 03:00:13 2016 (r414913) +++ branches/2016Q2/lang/perl5.18/pkg-plist Tue May 10 03:10:09 2016 (r414914) @@ -40,7 +40,7 @@ bin/shasum%%BINSUFFIX%% bin/splain%%BINSUFFIX%% bin/xsubpp%%BINSUFFIX%% bin/zipdetails%%BINSUFFIX%% -etc/man.d/perl%%PERL_VER%%.conf +etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%PRIV_LIB%%/AnyDBM_File.pm %%PRIV_LIB%%/App/Cpan.pm %%PRIV_LIB%%/App/Prove.pm Modified: branches/2016Q2/lang/perl5.20/Makefile ============================================================================== --- branches/2016Q2/lang/perl5.20/Makefile Tue May 10 03:00:13 2016 (r414913) +++ branches/2016Q2/lang/perl5.20/Makefile Tue May 10 03:10:09 2016 (r414914) @@ -3,7 +3,7 @@ PORTNAME= perl PORTVERSION= ${PERL_VERSION} -PORTREVISION= 8 +PORTREVISION= 12 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN/../../src/5.0 DIST_SUBDIR= perl @@ -17,7 +17,8 @@ LICENSE_FILE_ART10= ${WRKSRC}/Artistic LICENSE_FILE_GPLv1= ${WRKSRC}/Copying TEST_TARGET= test_harness -TEST_ENV= ${MAKE_ENV} TEST_JOBS=${MAKE_JOBS_NUMBER} +TEST_ENV= ${MAKE_ENV} TEST_JOBS=${MAKE_JOBS_NUMBER} \ + LD_LIBRARY_PATH=${WRKSRC} COMPRESS_ZLIB_RUN_ALL=yes OPTIONS_DEFINE= DEBUG GDBM PERL_64BITINT PTHREAD \ MULTIPLICITY SITECUSTOMIZE @@ -145,6 +146,7 @@ PLIST_SUB+= PERL_VERSION=${PERL_VERSION} SITE_PERL=${SITE_PERL_REL} \ SITE_ARCH=${SITE_ARCH_REL} \ PRIV_LIB=${_PRIV_LIB} \ + PKGNAMESUFFIX=${PKGNAMESUFFIX} \ ARCH_LIB=${_ARCH_LIB} _PERL5_DEFAULT_FILE= /tmp/PERL5_DEFAULT @@ -233,6 +235,17 @@ post-patch-PTHREAD-off: ${WRKSRC}/hints/freebsd.sh .endif +post-build: + @${REINPLACE_CMD} -e '/^lddlflags/s|-L${WRKSRC} ||' \ + ${WRKSRC}/lib/Config_heavy.pl +.if ${CC} == /nxb-bin/usr/bin/cc + @${REINPLACE_CMD} -e 's=/nxb-bin==' \ + ${WRKSRC}/lib/Config.pm ${WRKSRC}/lib/Config_heavy.pl +# Restore Config.pm's timestamp so that Perl's build system does not think it +# needs to rebuild everything. + @${TOUCH} -r ${WRKSRC}/lib/Config.pm.bak ${WRKSRC}/lib/Config.pm +.endif + post-install: ${MKDIR} ${STAGEDIR}${SITE_MAN1} ${STAGEDIR}${SITE_MAN3} ${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto @@ -255,6 +268,6 @@ post-install: ${STRIP_CMD} $$f; \ ${CHMOD} 444 $$f; \ done - ${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf + ${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PKGNAMESUFFIX}.conf .include Copied: branches/2016Q2/lang/perl5.20/files/patch-7098eff (from r413567, head/lang/perl5.20/files/patch-7098eff) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/lang/perl5.20/files/patch-7098eff Tue May 10 03:10:09 2016 (r414914, copy of r413567, head/lang/perl5.20/files/patch-7098eff) @@ -0,0 +1,100 @@ +commit 7098efff946437a2db6013d12c4fc3193fc328ce +Author: Tony Cook +Date: 2016-01-27 11:52:15 +1100 + + remove duplicate environment variables from environ + + If we see duplicate environment variables while iterating over + environ[]: + + a) make sure we use the same value in %ENV that getenv() returns. + + Previously on a duplicate, %ENV would have the last entry for the name + from environ[], but a typical getenv() would return the first entry. + + Rather than assuming all getenv() implementations return the first entry + explicitly call getenv() to ensure they agree. + + b) remove duplicate entries from environ + + Previously if there was a duplicate definition for a name in environ[] + setting that name in %ENV could result in an unsafe value being passed + to a child process, so ensure environ[] has no duplicates. + +diff --git perl.c perl.c +index d3e378f..25e2075 100644 +--- perl.c ++++ perl.c +@@ -4281,23 +4281,70 @@ S_init_postdump_symbols(pTHX_ int argc, char **argv, char **env) + } + if (env) { + char *s, *old_var; ++ STRLEN nlen; + SV *sv; ++ HV *dups = newHV(); ++ + for (; *env; env++) { + old_var = *env; + + if (!(s = strchr(old_var,'=')) || s == old_var) + continue; ++ nlen = s - old_var; + + #if defined(MSDOS) && !defined(DJGPP) + *s = '\0'; + (void)strupr(old_var); + *s = '='; + #endif +- sv = newSVpv(s+1, 0); +- (void)hv_store(hv, old_var, s - old_var, sv, 0); ++ if (hv_exists(hv, old_var, nlen)) { ++ const char *name = savepvn(old_var, nlen); ++ ++ /* make sure we use the same value as getenv(), otherwise code that ++ uses getenv() (like setlocale()) might see a different value to %ENV ++ */ ++ sv = newSVpv(PerlEnv_getenv(name), 0); ++ ++ /* keep a count of the dups of this name so we can de-dup environ later */ ++ if (hv_exists(dups, name, nlen)) ++ ++SvIVX(*hv_fetch(dups, name, nlen, 0)); ++ else ++ (void)hv_store(dups, name, nlen, newSViv(1), 0); ++ ++ Safefree(name); ++ } ++ else { ++ sv = newSVpv(s+1, 0); ++ } ++ (void)hv_store(hv, old_var, nlen, sv, 0); + if (env_is_not_environ) + mg_set(sv); + } ++ if (HvKEYS(dups)) { ++ /* environ has some duplicate definitions, remove them */ ++ HE *entry; ++ hv_iterinit(dups); ++ while ((entry = hv_iternext_flags(dups, 0))) { ++ STRLEN nlen; ++ const char *name = HePV(entry, nlen); ++ IV count = SvIV(HeVAL(entry)); ++ IV i; ++ SV **valp = hv_fetch(hv, name, nlen, 0); ++ ++ assert(valp); ++ ++ /* try to remove any duplicate names, depending on the ++ * implementation used in my_setenv() the iteration might ++ * not be necessary, but let's be safe. ++ */ ++ for (i = 0; i < count; ++i) ++ my_setenv(name, 0); ++ ++ /* and set it back to the value we set $ENV{name} to */ ++ my_setenv(name, SvPV_nolen(*valp)); ++ } ++ } ++ SvREFCNT_dec_NN(dups); + } + #endif /* USE_ENVIRON_ARRAY */ + #endif /* !PERL_MICRO */ Modified: branches/2016Q2/lang/perl5.20/pkg-plist ============================================================================== --- branches/2016Q2/lang/perl5.20/pkg-plist Tue May 10 03:00:13 2016 (r414913) +++ branches/2016Q2/lang/perl5.20/pkg-plist Tue May 10 03:10:09 2016 (r414914) @@ -36,7 +36,7 @@ bin/shasum%%BINSUFFIX%% bin/splain%%BINSUFFIX%% bin/xsubpp%%BINSUFFIX%% bin/zipdetails%%BINSUFFIX%% -etc/man.d/perl%%PERL_VER%%.conf +etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%PRIV_LIB%%/AnyDBM_File.pm %%PRIV_LIB%%/App/Cpan.pm %%PRIV_LIB%%/App/Prove.pm Modified: branches/2016Q2/lang/perl5.22/Makefile ============================================================================== --- branches/2016Q2/lang/perl5.22/Makefile Tue May 10 03:00:13 2016 (r414913) +++ branches/2016Q2/lang/perl5.22/Makefile Tue May 10 03:10:09 2016 (r414914) @@ -3,7 +3,7 @@ PORTNAME= perl DISTVERSION= ${PERL_VERSION} -PORTREVISION= 4 +PORTREVISION= 8 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN/../../src/5.0 CPAN/../by-authors/id/S/SH/SHAY DIST_SUBDIR= perl @@ -17,7 +17,8 @@ LICENSE_FILE_ART10= ${WRKSRC}/Artistic LICENSE_FILE_GPLv1= ${WRKSRC}/Copying TEST_TARGET= test_harness -TEST_ENV= ${MAKE_ENV} TEST_JOBS=${MAKE_JOBS_NUMBER} +TEST_ENV= ${MAKE_ENV} TEST_JOBS=${MAKE_JOBS_NUMBER} \ + LD_LIBRARY_PATH=${WRKSRC} COMPRESS_ZLIB_RUN_ALL=yes OPTIONS_DEFINE= DEBUG GDBM PERL_64BITINT PTHREAD \ MULTIPLICITY SITECUSTOMIZE @@ -143,6 +144,7 @@ PLIST_SUB+= PERL_VERSION=${PERL_VERSION} SITE_PERL=${SITE_PERL_REL} \ SITE_ARCH=${SITE_ARCH_REL} \ PRIV_LIB=${_PRIV_LIB} \ + PKGNAMESUFFIX=${PKGNAMESUFFIX} \ ARCH_LIB=${_ARCH_LIB} _PERL5_DEFAULT_FILE= /tmp/PERL5_DEFAULT @@ -231,6 +233,17 @@ post-patch-PTHREAD-off: ${WRKSRC}/hints/freebsd.sh .endif +post-build: + @${REINPLACE_CMD} -e '/^lddlflags/s|-L${WRKSRC} ||' \ + ${WRKSRC}/lib/Config_heavy.pl +.if ${CC} == /nxb-bin/usr/bin/cc + @${REINPLACE_CMD} -e 's=/nxb-bin==' \ + ${WRKSRC}/lib/Config.pm ${WRKSRC}/lib/Config_heavy.pl +# Restore Config.pm's timestamp so that Perl's build system does not think it +# needs to rebuild everything. + @${TOUCH} -r ${WRKSRC}/lib/Config.pm.bak ${WRKSRC}/lib/Config.pm +.endif + post-install: ${MKDIR} ${STAGEDIR}${SITE_MAN1} ${STAGEDIR}${SITE_MAN3} ${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto @@ -253,6 +266,6 @@ post-install: ${STRIP_CMD} $$f; \ ${CHMOD} 444 $$f; \ done - ${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf + ${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PKGNAMESUFFIX}.conf .include Copied: branches/2016Q2/lang/perl5.22/files/patch-58eaa11 (from r413567, head/lang/perl5.22/files/patch-58eaa11) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/lang/perl5.22/files/patch-58eaa11 Tue May 10 03:10:09 2016 (r414914, copy of r413567, head/lang/perl5.22/files/patch-58eaa11) @@ -0,0 +1,100 @@ +commit 58eaa1131a38c16ee4a66d0bc36288cfde1a39bf +Author: Tony Cook +Date: 2016-01-27 11:52:15 +1100 + + remove duplicate environment variables from environ + + If we see duplicate environment variables while iterating over + environ[]: + + a) make sure we use the same value in %ENV that getenv() returns. + + Previously on a duplicate, %ENV would have the last entry for the name + from environ[], but a typical getenv() would return the first entry. + + Rather than assuming all getenv() implementations return the first entry + explicitly call getenv() to ensure they agree. + + b) remove duplicate entries from environ + + Previously if there was a duplicate definition for a name in environ[] + setting that name in %ENV could result in an unsafe value being passed + to a child process, so ensure environ[] has no duplicates. + +diff --git perl.c perl.c +index 16a6ca4..8ef7474 100644 +--- perl.c ++++ perl.c +@@ -4298,23 +4298,70 @@ S_init_postdump_symbols(pTHX_ int argc, char **argv, char **env) + } + if (env) { + char *s, *old_var; ++ STRLEN nlen; + SV *sv; ++ HV *dups = newHV(); ++ + for (; *env; env++) { + old_var = *env; + + if (!(s = strchr(old_var,'=')) || s == old_var) + continue; ++ nlen = s - old_var; + + #if defined(MSDOS) && !defined(DJGPP) + *s = '\0'; + (void)strupr(old_var); + *s = '='; + #endif +- sv = newSVpv(s+1, 0); +- (void)hv_store(hv, old_var, s - old_var, sv, 0); ++ if (hv_exists(hv, old_var, nlen)) { ++ const char *name = savepvn(old_var, nlen); ++ ++ /* make sure we use the same value as getenv(), otherwise code that ++ uses getenv() (like setlocale()) might see a different value to %ENV ++ */ ++ sv = newSVpv(PerlEnv_getenv(name), 0); ++ ++ /* keep a count of the dups of this name so we can de-dup environ later */ ++ if (hv_exists(dups, name, nlen)) ++ ++SvIVX(*hv_fetch(dups, name, nlen, 0)); ++ else ++ (void)hv_store(dups, name, nlen, newSViv(1), 0); ++ ++ Safefree(name); ++ } ++ else { ++ sv = newSVpv(s+1, 0); ++ } ++ (void)hv_store(hv, old_var, nlen, sv, 0); + if (env_is_not_environ) + mg_set(sv); + } ++ if (HvKEYS(dups)) { ++ /* environ has some duplicate definitions, remove them */ ++ HE *entry; ++ hv_iterinit(dups); ++ while ((entry = hv_iternext_flags(dups, 0))) { ++ STRLEN nlen; ++ const char *name = HePV(entry, nlen); ++ IV count = SvIV(HeVAL(entry)); ++ IV i; ++ SV **valp = hv_fetch(hv, name, nlen, 0); ++ ++ assert(valp); ++ ++ /* try to remove any duplicate names, depending on the ++ * implementation used in my_setenv() the iteration might ++ * not be necessary, but let's be safe. ++ */ ++ for (i = 0; i < count; ++i) ++ my_setenv(name, 0); ++ ++ /* and set it back to the value we set $ENV{name} to */ ++ my_setenv(name, SvPV_nolen(*valp)); ++ } ++ } ++ SvREFCNT_dec_NN(dups); + } + #endif /* USE_ENVIRON_ARRAY */ + #endif /* !PERL_MICRO */ Modified: branches/2016Q2/lang/perl5.22/pkg-plist ============================================================================== --- branches/2016Q2/lang/perl5.22/pkg-plist Tue May 10 03:00:13 2016 (r414913) +++ branches/2016Q2/lang/perl5.22/pkg-plist Tue May 10 03:10:09 2016 (r414914) @@ -32,7 +32,7 @@ bin/shasum%%BINSUFFIX%% bin/splain%%BINSUFFIX%% bin/xsubpp%%BINSUFFIX%% bin/zipdetails%%BINSUFFIX%% -etc/man.d/perl%%PERL_VER%%.conf +etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%PRIV_LIB%%/AnyDBM_File.pm %%PRIV_LIB%%/App/Cpan.pm %%PRIV_LIB%%/App/Prove.pm From owner-svn-ports-branches@freebsd.org Tue May 10 11:02:43 2016 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 3F8DBB35F5C; Tue, 10 May 2016 11:02:43 +0000 (UTC) (envelope-from robak@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 10A171767; Tue, 10 May 2016 11:02:42 +0000 (UTC) (envelope-from robak@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4AB2gg2088459; Tue, 10 May 2016 11:02:42 GMT (envelope-from robak@FreeBSD.org) Received: (from robak@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4AB2gBo088457; Tue, 10 May 2016 11:02:42 GMT (envelope-from robak@FreeBSD.org) Message-Id: <201605101102.u4AB2gBo088457@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: robak set sender to robak@FreeBSD.org using -f From: Bartek Rutkowski Date: Tue, 10 May 2016 11:02:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414936 - branches/2016Q2/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.22 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, 10 May 2016 11:02:43 -0000 Author: robak Date: Tue May 10 11:02:41 2016 New Revision: 414936 URL: https://svnweb.freebsd.org/changeset/ports/414936 Log: MFH: r414809 russian/wordpress: update 4.5.1 -> 4.5.2 - Bugfix update PR: 209378 Submitted by: Mihail Timofeev <9267096@gmail.com> (maintainer) Approved by: ports-secteam Modified: branches/2016Q2/russian/wordpress/Makefile branches/2016Q2/russian/wordpress/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/russian/wordpress/Makefile ============================================================================== --- branches/2016Q2/russian/wordpress/Makefile Tue May 10 10:58:36 2016 (r414935) +++ branches/2016Q2/russian/wordpress/Makefile Tue May 10 11:02:41 2016 (r414936) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.4.2 +PORTVERSION= 4.5.2 DISTVERSIONSUFFIX= -ru_RU CATEGORIES= russian www MASTER_SITES= http://ru.wordpress.org/ Modified: branches/2016Q2/russian/wordpress/distinfo ============================================================================== --- branches/2016Q2/russian/wordpress/distinfo Tue May 10 10:58:36 2016 (r414935) +++ branches/2016Q2/russian/wordpress/distinfo Tue May 10 11:02:41 2016 (r414936) @@ -1,2 +1,2 @@ -SHA256 (wordpress-4.4.2-ru_RU.tar.gz) = 063151d8059a6f732883a497c941d54ddb98f733ab7f6d8a578df11fbce65273 -SIZE (wordpress-4.4.2-ru_RU.tar.gz) = 7579231 +SHA256 (wordpress-4.5.2-ru_RU.tar.gz) = 044bc403388a40e2e4a92cb2a4df8534d1a2fcab26dea02c1e6f5070f5353b46 +SIZE (wordpress-4.5.2-ru_RU.tar.gz) = 8239953 From owner-svn-ports-branches@freebsd.org Tue May 10 17:46:46 2016 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 E408AB363B4; Tue, 10 May 2016 17:46:46 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 B05C01CF8; Tue, 10 May 2016 17:46:46 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4AHkk6V010713; Tue, 10 May 2016 17:46:46 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4AHkhkA010685; Tue, 10 May 2016 17:46:43 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201605101746.u4AHkhkA010685@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Tue, 10 May 2016 17:46:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414949 - in branches/2016Q2/devel: p4 p4api p4d p4ftpd p4p 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.22 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, 10 May 2016 17:46:47 -0000 Author: gordon Date: Tue May 10 17:46:43 2016 New Revision: 414949 URL: https://svnweb.freebsd.org/changeset/ports/414949 Log: MFH: r414920 Update various Perforce ports to 2015.1/1384697 due to micropatching. Approved by: mat (mentor, implicit) Approved by: ports-secteam (feld) Modified: branches/2016Q2/devel/p4/Makefile branches/2016Q2/devel/p4/distinfo.freebsd100x86 branches/2016Q2/devel/p4/distinfo.freebsd100x86_64 branches/2016Q2/devel/p4/distinfo.freebsd70x86 branches/2016Q2/devel/p4/distinfo.freebsd70x86_64 branches/2016Q2/devel/p4api/Makefile branches/2016Q2/devel/p4api/distinfo.freebsd100x86 branches/2016Q2/devel/p4api/distinfo.freebsd100x86_64 branches/2016Q2/devel/p4api/distinfo.freebsd70x86 branches/2016Q2/devel/p4api/distinfo.freebsd70x86_64 branches/2016Q2/devel/p4d/Makefile branches/2016Q2/devel/p4d/distinfo.freebsd100x86 branches/2016Q2/devel/p4d/distinfo.freebsd100x86_64 branches/2016Q2/devel/p4d/distinfo.freebsd70x86 branches/2016Q2/devel/p4d/distinfo.freebsd70x86_64 branches/2016Q2/devel/p4ftpd/Makefile branches/2016Q2/devel/p4ftpd/distinfo.freebsd100x86 branches/2016Q2/devel/p4ftpd/distinfo.freebsd100x86_64 branches/2016Q2/devel/p4ftpd/distinfo.freebsd70x86 branches/2016Q2/devel/p4ftpd/distinfo.freebsd70x86_64 branches/2016Q2/devel/p4p/Makefile branches/2016Q2/devel/p4p/distinfo.freebsd100x86 branches/2016Q2/devel/p4p/distinfo.freebsd100x86_64 branches/2016Q2/devel/p4p/distinfo.freebsd70x86 branches/2016Q2/devel/p4p/distinfo.freebsd70x86_64 Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/devel/p4/Makefile ============================================================================== --- branches/2016Q2/devel/p4/Makefile Tue May 10 17:11:02 2016 (r414948) +++ branches/2016Q2/devel/p4/Makefile Tue May 10 17:46:43 2016 (r414949) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= p4 -PORTVERSION= 2015.1.1362963 +PORTVERSION= 2015.1.1384697 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ Modified: branches/2016Q2/devel/p4/distinfo.freebsd100x86 ============================================================================== --- branches/2016Q2/devel/p4/distinfo.freebsd100x86 Tue May 10 17:11:02 2016 (r414948) +++ branches/2016Q2/devel/p4/distinfo.freebsd100x86 Tue May 10 17:46:43 2016 (r414949) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1362963/bin.freebsd100x86/p4) = 4f06d63cbd56cc7ce2a0e927bc4390df74966149bd7f9aa1f206894e492d4d14 -SIZE (perforce/2015.1.1362963/bin.freebsd100x86/p4) = 2537176 +SHA256 (perforce/2015.1.1384697/bin.freebsd100x86/p4) = 4a6c85571f06b4ff9477dcb5258b3ba652e4e167566f04932ea54e53df23d9c9 +SIZE (perforce/2015.1.1384697/bin.freebsd100x86/p4) = 2537872 Modified: branches/2016Q2/devel/p4/distinfo.freebsd100x86_64 ============================================================================== --- branches/2016Q2/devel/p4/distinfo.freebsd100x86_64 Tue May 10 17:11:02 2016 (r414948) +++ branches/2016Q2/devel/p4/distinfo.freebsd100x86_64 Tue May 10 17:46:43 2016 (r414949) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1362963/bin.freebsd100x86_64/p4) = 83b4d67f32b5dbc580ffa6938773dca58addb02b9632ba8e0197628240d5c1d6 -SIZE (perforce/2015.1.1362963/bin.freebsd100x86_64/p4) = 2794288 +SHA256 (perforce/2015.1.1384697/bin.freebsd100x86_64/p4) = 9dedcaf430156679fc6d76c766f6db61434f3bad1ebce274a0397c8cc4c646e0 +SIZE (perforce/2015.1.1384697/bin.freebsd100x86_64/p4) = 2795184 Modified: branches/2016Q2/devel/p4/distinfo.freebsd70x86 ============================================================================== --- branches/2016Q2/devel/p4/distinfo.freebsd70x86 Tue May 10 17:11:02 2016 (r414948) +++ branches/2016Q2/devel/p4/distinfo.freebsd70x86 Tue May 10 17:46:43 2016 (r414949) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1362963/bin.freebsd70x86/p4) = bfda38380947b27241faec8a3214f40866fe780c44e16f812b8818e3ae5c3740 -SIZE (perforce/2015.1.1362963/bin.freebsd70x86/p4) = 2612124 +SHA256 (perforce/2015.1.1384697/bin.freebsd70x86/p4) = 2f2f1a4f7131ae01fc9f684ff4ecca2dbecc24e56d32de6927931d2b627ceb79 +SIZE (perforce/2015.1.1384697/bin.freebsd70x86/p4) = 2612156 Modified: branches/2016Q2/devel/p4/distinfo.freebsd70x86_64 ============================================================================== --- branches/2016Q2/devel/p4/distinfo.freebsd70x86_64 Tue May 10 17:11:02 2016 (r414948) +++ branches/2016Q2/devel/p4/distinfo.freebsd70x86_64 Tue May 10 17:46:43 2016 (r414949) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1362963/bin.freebsd70x86_64/p4) = acba9fcaef4ee055fb897961828e1811a058e1a0cc7f7560f790f9ea09a58163 -SIZE (perforce/2015.1.1362963/bin.freebsd70x86_64/p4) = 2778456 +SHA256 (perforce/2015.1.1384697/bin.freebsd70x86_64/p4) = c4617e864aae46d6b1f49e764160171dc13f65b54447c24c47d38b9b18359e0e +SIZE (perforce/2015.1.1384697/bin.freebsd70x86_64/p4) = 2778456 Modified: branches/2016Q2/devel/p4api/Makefile ============================================================================== --- branches/2016Q2/devel/p4api/Makefile Tue May 10 17:11:02 2016 (r414948) +++ branches/2016Q2/devel/p4api/Makefile Tue May 10 17:46:43 2016 (r414949) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= p4api -PORTVERSION= 2015.1.1341249 +PORTVERSION= 2015.1.1384697 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/:tar \ ftp://ftp.perforce.com/perforce/${P4VERSION}/doc/manuals/p4api/:pdf Modified: branches/2016Q2/devel/p4api/distinfo.freebsd100x86 ============================================================================== --- branches/2016Q2/devel/p4api/distinfo.freebsd100x86 Tue May 10 17:11:02 2016 (r414948) +++ branches/2016Q2/devel/p4api/distinfo.freebsd100x86 Tue May 10 17:46:43 2016 (r414949) @@ -1,4 +1,4 @@ -SHA256 (perforce/2015.1.1341249/bin.freebsd100x86/p4api.tgz) = 1a47cb21c5ab77b4e33e91e942321dada3b71a90ad5d7ff4943b03f70bf5ac2f -SIZE (perforce/2015.1.1341249/bin.freebsd100x86/p4api.tgz) = 1434605 -SHA256 (perforce/2015.1.1341249/bin.freebsd100x86/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd -SIZE (perforce/2015.1.1341249/bin.freebsd100x86/p4api.pdf) = 1623596 +SHA256 (perforce/2015.1.1384697/bin.freebsd100x86/p4api.tgz) = f070bf6501854316a81787dd125f4bbf349c1cd51ed6bd975b03da75d68b7c7b +SIZE (perforce/2015.1.1384697/bin.freebsd100x86/p4api.tgz) = 1434822 +SHA256 (perforce/2015.1.1384697/bin.freebsd100x86/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd +SIZE (perforce/2015.1.1384697/bin.freebsd100x86/p4api.pdf) = 1623596 Modified: branches/2016Q2/devel/p4api/distinfo.freebsd100x86_64 ============================================================================== --- branches/2016Q2/devel/p4api/distinfo.freebsd100x86_64 Tue May 10 17:11:02 2016 (r414948) +++ branches/2016Q2/devel/p4api/distinfo.freebsd100x86_64 Tue May 10 17:46:43 2016 (r414949) @@ -1,4 +1,4 @@ -SHA256 (perforce/2015.1.1341249/bin.freebsd100x86_64/p4api.tgz) = 48d4cc37d62feed669572ad5bb42861fb690fd3f497787ecd9cf81ae77f88bf7 -SIZE (perforce/2015.1.1341249/bin.freebsd100x86_64/p4api.tgz) = 1470002 -SHA256 (perforce/2015.1.1341249/bin.freebsd100x86_64/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd -SIZE (perforce/2015.1.1341249/bin.freebsd100x86_64/p4api.pdf) = 1623596 +SHA256 (perforce/2015.1.1384697/bin.freebsd100x86_64/p4api.tgz) = dcacdee2067848406e9a985ee7bce40910b91e285db5123ad1f1d45bf784fe4c +SIZE (perforce/2015.1.1384697/bin.freebsd100x86_64/p4api.tgz) = 1470120 +SHA256 (perforce/2015.1.1384697/bin.freebsd100x86_64/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd +SIZE (perforce/2015.1.1384697/bin.freebsd100x86_64/p4api.pdf) = 1623596 Modified: branches/2016Q2/devel/p4api/distinfo.freebsd70x86 ============================================================================== --- branches/2016Q2/devel/p4api/distinfo.freebsd70x86 Tue May 10 17:11:02 2016 (r414948) +++ branches/2016Q2/devel/p4api/distinfo.freebsd70x86 Tue May 10 17:46:43 2016 (r414949) @@ -1,4 +1,4 @@ -SHA256 (perforce/2015.1.1341249/bin.freebsd70x86/p4api.tgz) = cf02393cc5a37228161587c48248cf619efe79643034c67633f14cdcbeed3b6d -SIZE (perforce/2015.1.1341249/bin.freebsd70x86/p4api.tgz) = 1448608 -SHA256 (perforce/2015.1.1341249/bin.freebsd70x86/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd -SIZE (perforce/2015.1.1341249/bin.freebsd70x86/p4api.pdf) = 1623596 +SHA256 (perforce/2015.1.1384697/bin.freebsd70x86/p4api.tgz) = a3178e8de513decbd0289355f4fb7f53238f3220653960b1ad9c97059fefe746 +SIZE (perforce/2015.1.1384697/bin.freebsd70x86/p4api.tgz) = 1448361 +SHA256 (perforce/2015.1.1384697/bin.freebsd70x86/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd +SIZE (perforce/2015.1.1384697/bin.freebsd70x86/p4api.pdf) = 1623596 Modified: branches/2016Q2/devel/p4api/distinfo.freebsd70x86_64 ============================================================================== --- branches/2016Q2/devel/p4api/distinfo.freebsd70x86_64 Tue May 10 17:11:02 2016 (r414948) +++ branches/2016Q2/devel/p4api/distinfo.freebsd70x86_64 Tue May 10 17:46:43 2016 (r414949) @@ -1,4 +1,4 @@ -SHA256 (perforce/2015.1.1341249/bin.freebsd70x86_64/p4api.tgz) = 3d06fec98c079e42fe627681f867d7b5a11c5e759179f862285cadaa3a53ea9b -SIZE (perforce/2015.1.1341249/bin.freebsd70x86_64/p4api.tgz) = 1467916 -SHA256 (perforce/2015.1.1341249/bin.freebsd70x86_64/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd -SIZE (perforce/2015.1.1341249/bin.freebsd70x86_64/p4api.pdf) = 1623596 +SHA256 (perforce/2015.1.1384697/bin.freebsd70x86_64/p4api.tgz) = 2bb7ad7946cee01db2a8712092de71a9d1c480b17dfa971efd1ad3abc287e551 +SIZE (perforce/2015.1.1384697/bin.freebsd70x86_64/p4api.tgz) = 1468147 +SHA256 (perforce/2015.1.1384697/bin.freebsd70x86_64/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd +SIZE (perforce/2015.1.1384697/bin.freebsd70x86_64/p4api.pdf) = 1623596 Modified: branches/2016Q2/devel/p4d/Makefile ============================================================================== --- branches/2016Q2/devel/p4d/Makefile Tue May 10 17:11:02 2016 (r414948) +++ branches/2016Q2/devel/p4d/Makefile Tue May 10 17:46:43 2016 (r414949) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= p4d -PORTVERSION= 2015.1.1362963 +PORTVERSION= 2015.1.1384697 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ Modified: branches/2016Q2/devel/p4d/distinfo.freebsd100x86 ============================================================================== --- branches/2016Q2/devel/p4d/distinfo.freebsd100x86 Tue May 10 17:11:02 2016 (r414948) +++ branches/2016Q2/devel/p4d/distinfo.freebsd100x86 Tue May 10 17:46:43 2016 (r414949) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1362963/bin.freebsd100x86/p4d) = e324264e18195dac3230845d3d3f7b596536e9498c3c5bd58ce66af0a1f36595 -SIZE (perforce/2015.1.1362963/bin.freebsd100x86/p4d) = 5205568 +SHA256 (perforce/2015.1.1384697/bin.freebsd100x86/p4d) = db23a2c1ac3514a61a362aa08dc632695080a91d324504cd4f27fb662e3af1fe +SIZE (perforce/2015.1.1384697/bin.freebsd100x86/p4d) = 5208536 Modified: branches/2016Q2/devel/p4d/distinfo.freebsd100x86_64 ============================================================================== --- branches/2016Q2/devel/p4d/distinfo.freebsd100x86_64 Tue May 10 17:11:02 2016 (r414948) +++ branches/2016Q2/devel/p4d/distinfo.freebsd100x86_64 Tue May 10 17:46:43 2016 (r414949) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1362963/bin.freebsd100x86_64/p4d) = d6a6cf2585f1da2a998b92c4b5af8ac73bbd368be8660258830764475660182f -SIZE (perforce/2015.1.1362963/bin.freebsd100x86_64/p4d) = 5360992 +SHA256 (perforce/2015.1.1384697/bin.freebsd100x86_64/p4d) = 04b96019640a0934fe92ea0e3e699a8dd724278486168d3bda18051e06411e3d +SIZE (perforce/2015.1.1384697/bin.freebsd100x86_64/p4d) = 5361008 Modified: branches/2016Q2/devel/p4d/distinfo.freebsd70x86 ============================================================================== --- branches/2016Q2/devel/p4d/distinfo.freebsd70x86 Tue May 10 17:11:02 2016 (r414948) +++ branches/2016Q2/devel/p4d/distinfo.freebsd70x86 Tue May 10 17:46:43 2016 (r414949) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1362963/bin.freebsd70x86/p4d) = fee2f14b4e45c7eeab9d77de44d72e79215deb615e9d9689bbc35d77b2a26d99 -SIZE (perforce/2015.1.1362963/bin.freebsd70x86/p4d) = 5572380 +SHA256 (perforce/2015.1.1384697/bin.freebsd70x86/p4d) = c51acc46f7cb676294e8d094c1431321330427ce6a11384c1503f6767e87e237 +SIZE (perforce/2015.1.1384697/bin.freebsd70x86/p4d) = 5574716 Modified: branches/2016Q2/devel/p4d/distinfo.freebsd70x86_64 ============================================================================== --- branches/2016Q2/devel/p4d/distinfo.freebsd70x86_64 Tue May 10 17:11:02 2016 (r414948) +++ branches/2016Q2/devel/p4d/distinfo.freebsd70x86_64 Tue May 10 17:46:43 2016 (r414949) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1362963/bin.freebsd70x86_64/p4d) = bf2992a7fa09ac7387b8f2267c4356e2ea5aca7986af7521f782a79e714d029f -SIZE (perforce/2015.1.1362963/bin.freebsd70x86_64/p4d) = 5754712 +SHA256 (perforce/2015.1.1384697/bin.freebsd70x86_64/p4d) = 5ef6be917a1d7196be6503aae69b64e029b41a7e8c48d4f9d93af476f26e6d4a +SIZE (perforce/2015.1.1384697/bin.freebsd70x86_64/p4d) = 5754872 Modified: branches/2016Q2/devel/p4ftpd/Makefile ============================================================================== --- branches/2016Q2/devel/p4ftpd/Makefile Tue May 10 17:11:02 2016 (r414948) +++ branches/2016Q2/devel/p4ftpd/Makefile Tue May 10 17:46:43 2016 (r414949) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= p4ftpd -PORTVERSION= 2015.1.1341249 +PORTVERSION= 2015.1.1384697 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ Modified: branches/2016Q2/devel/p4ftpd/distinfo.freebsd100x86 ============================================================================== --- branches/2016Q2/devel/p4ftpd/distinfo.freebsd100x86 Tue May 10 17:11:02 2016 (r414948) +++ branches/2016Q2/devel/p4ftpd/distinfo.freebsd100x86 Tue May 10 17:46:43 2016 (r414949) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1341249/bin.freebsd100x86/p4ftpd) = 0b5b0fad62f54e5dbd150de7f47e8212d6e985f040750888980cd2b1c41ba793 -SIZE (perforce/2015.1.1341249/bin.freebsd100x86/p4ftpd) = 2608260 +SHA256 (perforce/2015.1.1384697/bin.freebsd100x86/p4ftpd) = ae68ed35dcce72afa2e50ae550c33d71b3afb792a803db1b585ed78f6db8024d +SIZE (perforce/2015.1.1384697/bin.freebsd100x86/p4ftpd) = 2582272 Modified: branches/2016Q2/devel/p4ftpd/distinfo.freebsd100x86_64 ============================================================================== --- branches/2016Q2/devel/p4ftpd/distinfo.freebsd100x86_64 Tue May 10 17:11:02 2016 (r414948) +++ branches/2016Q2/devel/p4ftpd/distinfo.freebsd100x86_64 Tue May 10 17:46:43 2016 (r414949) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1341249/bin.freebsd100x86_64/p4ftpd) = 0330b0737ca4737ab0ce2d84e7697896cdceae765fb8ab91af9de3d3bffb76ad -SIZE (perforce/2015.1.1341249/bin.freebsd100x86_64/p4ftpd) = 2864960 +SHA256 (perforce/2015.1.1384697/bin.freebsd100x86_64/p4ftpd) = 4fef3546a731e7f7b1c74bf8bb9c6c7c5afa7d3d74136af16c4151fc7237dbc5 +SIZE (perforce/2015.1.1384697/bin.freebsd100x86_64/p4ftpd) = 2840992 Modified: branches/2016Q2/devel/p4ftpd/distinfo.freebsd70x86 ============================================================================== --- branches/2016Q2/devel/p4ftpd/distinfo.freebsd70x86 Tue May 10 17:11:02 2016 (r414948) +++ branches/2016Q2/devel/p4ftpd/distinfo.freebsd70x86 Tue May 10 17:46:43 2016 (r414949) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1341249/bin.freebsd70x86/p4ftpd) = e564944605b0ba8ff8fe1e5e41d1a8a1ecaa09757982c3035c5ef53c75cab049 -SIZE (perforce/2015.1.1341249/bin.freebsd70x86/p4ftpd) = 2682900 +SHA256 (perforce/2015.1.1384697/bin.freebsd70x86/p4ftpd) = 5c32eb20b4c976805ba69a690f8ded3fe69f7d0782249fb808e222899735bb32 +SIZE (perforce/2015.1.1384697/bin.freebsd70x86/p4ftpd) = 2656688 Modified: branches/2016Q2/devel/p4ftpd/distinfo.freebsd70x86_64 ============================================================================== --- branches/2016Q2/devel/p4ftpd/distinfo.freebsd70x86_64 Tue May 10 17:11:02 2016 (r414948) +++ branches/2016Q2/devel/p4ftpd/distinfo.freebsd70x86_64 Tue May 10 17:46:43 2016 (r414949) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1341249/bin.freebsd70x86_64/p4ftpd) = 391b82747b67f30b7b62be9f56d5ff64ac5d97defddba35051a2236088cd5cee -SIZE (perforce/2015.1.1341249/bin.freebsd70x86_64/p4ftpd) = 2851664 +SHA256 (perforce/2015.1.1384697/bin.freebsd70x86_64/p4ftpd) = f5c56a9db0529c5612e423e55addaa7d6077916182760b4dc0ab72f999d3e39f +SIZE (perforce/2015.1.1384697/bin.freebsd70x86_64/p4ftpd) = 2827720 Modified: branches/2016Q2/devel/p4p/Makefile ============================================================================== --- branches/2016Q2/devel/p4p/Makefile Tue May 10 17:11:02 2016 (r414948) +++ branches/2016Q2/devel/p4p/Makefile Tue May 10 17:46:43 2016 (r414949) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= p4p -PORTVERSION= 2015.1.1341249 +PORTVERSION= 2015.1.1384697 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ Modified: branches/2016Q2/devel/p4p/distinfo.freebsd100x86 ============================================================================== --- branches/2016Q2/devel/p4p/distinfo.freebsd100x86 Tue May 10 17:11:02 2016 (r414948) +++ branches/2016Q2/devel/p4p/distinfo.freebsd100x86 Tue May 10 17:46:43 2016 (r414949) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1341249/bin.freebsd100x86/p4p) = 9914cdd21a46abded4c66ada5d276929b7bf2a6da1551e3f570f5d6cfa8865b0 -SIZE (perforce/2015.1.1341249/bin.freebsd100x86/p4p) = 2366920 +SHA256 (perforce/2015.1.1384697/bin.freebsd100x86/p4p) = 08ad15fcb958705c0f6c849971337732204ed0883151c93a5110be6074d9f2eb +SIZE (perforce/2015.1.1384697/bin.freebsd100x86/p4p) = 2338644 Modified: branches/2016Q2/devel/p4p/distinfo.freebsd100x86_64 ============================================================================== --- branches/2016Q2/devel/p4p/distinfo.freebsd100x86_64 Tue May 10 17:11:02 2016 (r414948) +++ branches/2016Q2/devel/p4p/distinfo.freebsd100x86_64 Tue May 10 17:46:43 2016 (r414949) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1341249/bin.freebsd100x86_64/p4p) = f761106f72d3f18411932db2ff4eb9265fd4ce289b2db9658701249bdce456c1 -SIZE (perforce/2015.1.1341249/bin.freebsd100x86_64/p4p) = 2630896 +SHA256 (perforce/2015.1.1384697/bin.freebsd100x86_64/p4p) = b80ec1ec6de65e62a3e0aec0805a8bba88e4c6203feac0bd938f2ae41e59f5f7 +SIZE (perforce/2015.1.1384697/bin.freebsd100x86_64/p4p) = 2607536 Modified: branches/2016Q2/devel/p4p/distinfo.freebsd70x86 ============================================================================== --- branches/2016Q2/devel/p4p/distinfo.freebsd70x86 Tue May 10 17:11:02 2016 (r414948) +++ branches/2016Q2/devel/p4p/distinfo.freebsd70x86 Tue May 10 17:46:43 2016 (r414949) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1341249/bin.freebsd70x86/p4p) = 927801fe2c4298bea836eb50c77a23a26a4863e6bedba766c57b0a9b3371127a -SIZE (perforce/2015.1.1341249/bin.freebsd70x86/p4p) = 2405888 +SHA256 (perforce/2015.1.1384697/bin.freebsd70x86/p4p) = 6f7f0b5ffdd319ee846a1fc098a8c89d459c947e87c813410019d8f0f7c661cd +SIZE (perforce/2015.1.1384697/bin.freebsd70x86/p4p) = 2381692 Modified: branches/2016Q2/devel/p4p/distinfo.freebsd70x86_64 ============================================================================== --- branches/2016Q2/devel/p4p/distinfo.freebsd70x86_64 Tue May 10 17:11:02 2016 (r414948) +++ branches/2016Q2/devel/p4p/distinfo.freebsd70x86_64 Tue May 10 17:46:43 2016 (r414949) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1341249/bin.freebsd70x86_64/p4p) = 6b7bd7355b673b6277d6729f816c7cbc710480ecae974eb50ea2eba449e48635 -SIZE (perforce/2015.1.1341249/bin.freebsd70x86_64/p4p) = 2605656 +SHA256 (perforce/2015.1.1384697/bin.freebsd70x86_64/p4p) = 64454192594ccab9ed3b11541e3c54b6013e18c30e2c7df782f2257353acbbaf +SIZE (perforce/2015.1.1384697/bin.freebsd70x86_64/p4p) = 2585176 From owner-svn-ports-branches@freebsd.org Wed May 11 15:07:27 2016 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 64B25B360A0; Wed, 11 May 2016 15:07:27 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 35B2711B2; Wed, 11 May 2016 15:07:27 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4BF7Qlu003257; Wed, 11 May 2016 15:07:26 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4BF7QSG003255; Wed, 11 May 2016 15:07:26 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201605111507.u4BF7QSG003255@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Wed, 11 May 2016 15:07:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r415007 - branches/2016Q2/www/squid 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.22 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, 11 May 2016 15:07:27 -0000 Author: matthew Date: Wed May 11 15:07:26 2016 New Revision: 415007 URL: https://svnweb.freebsd.org/changeset/ports/415007 Log: MFH: r414987 Security update to 3.5.19 PR: 209334 Submitted by: timp87@gmail.com (maintainer) Security: 25e5205b-1447-11e6-9ead-6805ca0b3d42 Approved by: ports-secteam (junovitch) Modified: branches/2016Q2/www/squid/Makefile branches/2016Q2/www/squid/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/www/squid/Makefile ============================================================================== --- branches/2016Q2/www/squid/Makefile Wed May 11 15:05:22 2016 (r415006) +++ branches/2016Q2/www/squid/Makefile Wed May 11 15:07:26 2016 (r415007) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= squid -PORTVERSION= 3.5.17 +PORTVERSION= 3.5.19 CATEGORIES= www ipv6 MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ Modified: branches/2016Q2/www/squid/distinfo ============================================================================== --- branches/2016Q2/www/squid/distinfo Wed May 11 15:05:22 2016 (r415006) +++ branches/2016Q2/www/squid/distinfo Wed May 11 15:07:26 2016 (r415007) @@ -1,2 +1,2 @@ -SHA256 (squid3.5/squid-3.5.17.tar.xz) = cb04e34f6ec80a5ae6caaef042703c841d3803c4c280e75eff12a5a6c84951a2 -SIZE (squid3.5/squid-3.5.17.tar.xz) = 2318216 +SHA256 (squid3.5/squid-3.5.19.tar.xz) = c4b8a2efb85acc600e506605f175298ce3324048e60f4708926d354fe4b5c7a0 +SIZE (squid3.5/squid-3.5.19.tar.xz) = 2318720 From owner-svn-ports-branches@freebsd.org Thu May 12 17:51:58 2016 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 DB927B38D9E; Thu, 12 May 2016 17:51:58 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 AD2D2172A; Thu, 12 May 2016 17:51:58 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4CHpvSQ096714; Thu, 12 May 2016 17:51:57 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4CHpvtS096712; Thu, 12 May 2016 17:51:57 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201605121751.u4CHpvtS096712@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Thu, 12 May 2016 17:51:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r415076 - branches/2016Q2/security/libressl 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.22 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, 12 May 2016 17:51:59 -0000 Author: brnrd Date: Thu May 12 17:51:57 2016 New Revision: 415076 URL: https://svnweb.freebsd.org/changeset/ports/415076 Log: security/libressl: Update to 2.2.7 - Update fixing recent vulnerabilities Security: 01d729ca-1143-11e6-b55e-b499baebfeaf Approved by: ports-secteam (feld) Modified: branches/2016Q2/security/libressl/Makefile branches/2016Q2/security/libressl/distinfo Modified: branches/2016Q2/security/libressl/Makefile ============================================================================== --- branches/2016Q2/security/libressl/Makefile Thu May 12 17:50:59 2016 (r415075) +++ branches/2016Q2/security/libressl/Makefile Thu May 12 17:51:57 2016 (r415076) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libressl -PORTVERSION= 2.2.6 +PORTVERSION= 2.2.7 CATEGORIES= security devel MASTER_SITES= OPENBSD/LibreSSL Modified: branches/2016Q2/security/libressl/distinfo ============================================================================== --- branches/2016Q2/security/libressl/distinfo Thu May 12 17:50:59 2016 (r415075) +++ branches/2016Q2/security/libressl/distinfo Thu May 12 17:51:57 2016 (r415076) @@ -1,2 +1,2 @@ -SHA256 (libressl-2.2.6.tar.gz) = 1ee19994cffd047d40f63ba149115dba18a681b0cc923beec301bf424b58d64f -SIZE (libressl-2.2.6.tar.gz) = 2965531 +SHA256 (libressl-2.2.7.tar.gz) = 7e2c68b383bba8efb7dce5ea1eccfda77048547d1d2a7355c072efd7ccd893cd +SIZE (libressl-2.2.7.tar.gz) = 2958862 From owner-svn-ports-branches@freebsd.org Thu May 12 19:25:08 2016 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 40977B3821C; Thu, 12 May 2016 19:25:08 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 0E0131344; Thu, 12 May 2016 19:25:07 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4CJP7JO025784; Thu, 12 May 2016 19:25:07 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4CJP7Iu025783; Thu, 12 May 2016 19:25:07 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201605121925.u4CJP7Iu025783@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Thu, 12 May 2016 19:25:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r415086 - branches/2016Q2/databases/mariadb100-server 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.22 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, 12 May 2016 19:25:08 -0000 Author: brnrd Date: Thu May 12 19:25:06 2016 New Revision: 415086 URL: https://svnweb.freebsd.org/changeset/ports/415086 Log: MFH: r415024 databases/mariadb100-server: Fix package builder failures - Add dependency on OpenSSL from ports - As per PR206998 this fixes the relocation error [1] [1] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=206998#c102 PR: 209419 Approved by: ports-secteam (junovitch) Modified: branches/2016Q2/databases/mariadb100-server/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/databases/mariadb100-server/Makefile ============================================================================== --- branches/2016Q2/databases/mariadb100-server/Makefile Thu May 12 19:19:43 2016 (r415085) +++ branches/2016Q2/databases/mariadb100-server/Makefile Thu May 12 19:25:06 2016 (r415086) @@ -90,6 +90,8 @@ TOKUDB_PORTDOCS= PATENTS README.md FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 USE_OPENSSL= yes +# See PR209419, MariaDB 10.0 fails to build with base SSL libs +WITH_OPENSSL_PORT= yes .if defined(CLIENT_ONLY) # MySQL-Client part From owner-svn-ports-branches@freebsd.org Sat May 14 07:54:45 2016 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 F2CA4B38546; Sat, 14 May 2016 07:54:44 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 A80A1170F; Sat, 14 May 2016 07:54:44 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4E7shOH000537; Sat, 14 May 2016 07:54:43 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4E7shPt000535; Sat, 14 May 2016 07:54:43 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201605140754.u4E7shPt000535@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 14 May 2016 07:54:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r415177 - in branches/2016Q2/devel/gdb: . 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.22 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: Sat, 14 May 2016 07:54:45 -0000 Author: riggs Date: Sat May 14 07:54:43 2016 New Revision: 415177 URL: https://svnweb.freebsd.org/changeset/ports/415177 Log: MFH: r415176 Fix build with libreadline from base system (via BASE_READLINE OPTION) PR: 209431 Submitted by: luca.pizzamiglio@gmail.com (maintainer) Approved by: ports-secteam (build fix blanket) Added: branches/2016Q2/devel/gdb/files/extrapatch-base-readline - copied unchanged from r415176, head/devel/gdb/files/extrapatch-base-readline Modified: branches/2016Q2/devel/gdb/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/devel/gdb/Makefile ============================================================================== --- branches/2016Q2/devel/gdb/Makefile Sat May 14 07:50:49 2016 (r415176) +++ branches/2016Q2/devel/gdb/Makefile Sat May 14 07:54:43 2016 (r415177) @@ -3,7 +3,7 @@ PORTNAME= gdb PORTVERSION= 7.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= GNU @@ -45,7 +45,7 @@ OPTIONS_SINGLE_READLINE= BASE_READLINE B GDB_LINK_DESC= Create ${PREFIX}/bin/gdb symlink KGDB_DESC= Kernel Debugging Support -BASE_READLINE_DESC= from base system (experimental) +BASE_READLINE_DESC= from base system BUNDLED_READLINE_DESC= from gdb distfile PORT_READLINE_DESC= from devel/readline port TUI_DESC= Text User Interface enabled @@ -54,6 +54,7 @@ OPTIONS_SUB= yes BASE_READLINE_USES= readline BASE_READLINE_CFLAGS= -D_rl_echoing_p=readline_echoing_p +BASE_READLINE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-base-readline BUNDLED_READLINE_CONFIGURE_OFF= --with-system-readline DEBUG_CFLAGS= -g EXPAT_CONFIGURE_WITH= expat Copied: branches/2016Q2/devel/gdb/files/extrapatch-base-readline (from r415176, head/devel/gdb/files/extrapatch-base-readline) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/devel/gdb/files/extrapatch-base-readline Sat May 14 07:54:43 2016 (r415177, copy of r415176, head/devel/gdb/files/extrapatch-base-readline) @@ -0,0 +1,11 @@ +--- gdb/completer.c.orig 2016-05-10 14:11:58.546188879 +0200 ++++ gdb/completer.c 2016-05-10 14:12:22.899187374 +0200 +@@ -1767,6 +1767,8 @@ + return displayer->width; + } + ++_rl_completion_prefix_display_length=0; ++rl_sort_completion_matches=1; + extern int _rl_completion_prefix_display_length; + extern int _rl_print_completions_horizontally; + From owner-svn-ports-branches@freebsd.org Sat May 14 13:33:15 2016 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 45C4DB39F82; Sat, 14 May 2016 13:33:15 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 032301279; Sat, 14 May 2016 13:33:14 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4EDXEbA004031; Sat, 14 May 2016 13:33:14 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4EDXD0r004027; Sat, 14 May 2016 13:33:13 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201605141333.u4EDXD0r004027@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Sat, 14 May 2016 13:33:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r415187 - in branches/2016Q2/security/openvpn: . 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.22 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: Sat, 14 May 2016 13:33:15 -0000 Author: mandree Date: Sat May 14 13:33:13 2016 New Revision: 415187 URL: https://svnweb.freebsd.org/changeset/ports/415187 Log: MFH: r412540 r412541 r415093 r415116 Work around 10.3-RELEASE's service(8) shortcomings (r412540) and to fix /usr/sbin/service -R (r412541). PR: 208534 Reported by: allan@saddi.com r415093 (2.3.11 upgrade) and r415116 (the polarssl fix-up) together: Security upgrade to OpenVPN 2.3.11. Quoting upstream maintainers' release notes: "This release fixes two vulnerabilities: a port-share bug with DoS potential and a buffer overflow by user supplied data when using pam authentication. In addition a number of small fixes and improvements are included." Changelog: https://community.openvpn.net/openvpn/wiki/ChangesInOpenvpn23 he upstream backported a change from the master branch that fixes the PolarSSL-based builds to go with the PolarSSL 1.3.X built-in defaults. Approved by: ports-secteam (junovich) PR: 209498 Security: 0dc8be9e-19af-11e6-8de0-080027ef73ec Added: branches/2016Q2/security/openvpn/files/patch-629baad8 - copied unchanged from r415116, head/security/openvpn/files/patch-629baad8 Modified: branches/2016Q2/security/openvpn/Makefile branches/2016Q2/security/openvpn/distinfo branches/2016Q2/security/openvpn/files/openvpn.in Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/security/openvpn/Makefile ============================================================================== --- branches/2016Q2/security/openvpn/Makefile Sat May 14 13:09:45 2016 (r415186) +++ branches/2016Q2/security/openvpn/Makefile Sat May 14 13:33:13 2016 (r415187) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= openvpn -DISTVERSION= 2.3.10 +DISTVERSION= 2.3.11 CATEGORIES= security net MASTER_SITES= http://swupdate.openvpn.net/community/releases/ \ http://build.openvpn.net/downloads/releases/ Modified: branches/2016Q2/security/openvpn/distinfo ============================================================================== --- branches/2016Q2/security/openvpn/distinfo Sat May 14 13:09:45 2016 (r415186) +++ branches/2016Q2/security/openvpn/distinfo Sat May 14 13:33:13 2016 (r415187) @@ -1,2 +1,2 @@ -SHA256 (openvpn-2.3.10.tar.xz) = c54dbf91d47b9533fac3b94d2b5719bdbe0d081fe8245184f91ef8a871d22003 -SIZE (openvpn-2.3.10.tar.xz) = 818152 +SHA256 (openvpn-2.3.11.tar.xz) = 0f5f1ca1dc5743fa166d93dd4ec952f014b5f33bafd88f0ea34b455cae1434a7 +SIZE (openvpn-2.3.11.tar.xz) = 833496 Modified: branches/2016Q2/security/openvpn/files/openvpn.in ============================================================================== --- branches/2016Q2/security/openvpn/files/openvpn.in Sat May 14 13:09:45 2016 (r415186) +++ branches/2016Q2/security/openvpn/files/openvpn.in Sat May 14 13:33:13 2016 (r415187) @@ -64,17 +64,29 @@ . /etc/rc.subr +# service(8) does not create an authentic environment, try to guess, +# and as of 10.3-RELEASE-p0, it will not find the indented name= +# assignments below. So give it a default. +# Trailing semicolon also for service(8)'s benefit: +name="$file" ; + case "$0" in /etc/rc*) # during boot (shutdown) $0 is /etc/rc (/etc/rc.shutdown), # so get the name of the script from $_file name="$_file" ;; +*/service) + # do not use this as $0 + ;; *) name="$0" ;; esac +# default name to "openvpn" if guessing failed +# Trailing semicolon also for service(8)'s benefit: +name="${name:-openvpn}" ; name="${name##*/}" rcvar=${name}_enable Copied: branches/2016Q2/security/openvpn/files/patch-629baad8 (from r415116, head/security/openvpn/files/patch-629baad8) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/security/openvpn/files/patch-629baad8 Sat May 14 13:33:13 2016 (r415187, copy of r415116, head/security/openvpn/files/patch-629baad8) @@ -0,0 +1,37 @@ +commit 629baad8f89af261445a2ace03694601f8e476f9 +Author: Steffan Karger +Date: Fri May 13 08:54:52 2016 +0200 + + Fix polarssl / mbedtls builds + + Commit 8a399cd3 hardened the OpenSSL default cipher list, + but also introduced a change in shared code that causes + polarssl / mbedtls builds to break when no --tls-cipher is + specified. + + This fix is backported code from the master branch. + + Signed-off-by: Steffan Karger + Acked-by: Gert Doering + Message-Id: <1463122492-701-1-git-send-email-steffan@karger.me> + URL: http://article.gmane.org/gmane.network.openvpn.devel/11647 + Signed-off-by: Gert Doering + +diff --git a/src/openvpn/ssl_polarssl.c b/src/openvpn/ssl_polarssl.c +index 1f58369..9263698 100644 +--- ./src/openvpn/ssl_polarssl.c ++++ ./src/openvpn/ssl_polarssl.c +@@ -176,7 +176,12 @@ tls_ctx_restrict_ciphers(struct tls_root_ctx *ctx, const char *ciphers) + { + char *tmp_ciphers, *tmp_ciphers_orig, *token; + int i, cipher_count; +- int ciphers_len = strlen (ciphers); ++ int ciphers_len; ++ ++ if (NULL == ciphers) ++ return; /* Nothing to do */ ++ ++ ciphers_len = strlen (ciphers); + + ASSERT (NULL != ctx); + ASSERT (0 != ciphers_len);