From owner-svn-ports-branches@freebsd.org Sun May 28 07:10:56 2017 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 9362BD854E7; Sun, 28 May 2017 07:10:56 +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 4B5951341; Sun, 28 May 2017 07:10:56 +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 v4S7AtWX057509; Sun, 28 May 2017 07:10:55 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4S7AtPJ057507; Sun, 28 May 2017 07:10:55 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201705280710.v4S7AtPJ057507@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 28 May 2017 07:10:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r441896 - branches/2017Q2/multimedia/vlc 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.23 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: Sun, 28 May 2017 07:10:56 -0000 Author: riggs Date: Sun May 28 07:10:55 2017 New Revision: 441896 URL: https://svnweb.freebsd.org/changeset/ports/441896 Log: MFH: r441756 Update to upstream version 2.2.6 Details: This is a bugfix release for the recently discovered subtitle remote vulnerability, see http://blog.checkpoint.com/2017/05/23/hacked-in-translation/ In addition to the statements in this blog post, the VLC devs added bounds checks and string termination in multiple places in the subtitle demuxer. It is hence possible that, contrary to the blog post, this issue was not fixed completely in version 2.2.5.1 Approved by: portmgr (miwi) Modified: branches/2017Q2/multimedia/vlc/Makefile branches/2017Q2/multimedia/vlc/distinfo Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/multimedia/vlc/Makefile ============================================================================== --- branches/2017Q2/multimedia/vlc/Makefile Sun May 28 03:53:36 2017 (r441895) +++ branches/2017Q2/multimedia/vlc/Makefile Sun May 28 07:10:55 2017 (r441896) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= vlc -DISTVERSION= 2.2.5.1 +DISTVERSION= 2.2.6 PORTEPOCH= 4 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ Modified: branches/2017Q2/multimedia/vlc/distinfo ============================================================================== --- branches/2017Q2/multimedia/vlc/distinfo Sun May 28 03:53:36 2017 (r441895) +++ branches/2017Q2/multimedia/vlc/distinfo Sun May 28 07:10:55 2017 (r441896) @@ -1,3 +1,3 @@ -TIMESTAMP = 1494659367 -SHA256 (vlc-2.2.5.1.tar.xz) = b28b8a28f578c0c6cb1ebed293aca2a3cd368906cf777d1ab599e2784ddda1cc -SIZE (vlc-2.2.5.1.tar.xz) = 21946020 +TIMESTAMP = 1495777516 +SHA256 (vlc-2.2.6.tar.xz) = c403d3accd9a400eb2181c958f3e7bc5524fe5738425f4253d42883b425a42a8 +SIZE (vlc-2.2.6.tar.xz) = 22198720 From owner-svn-ports-branches@freebsd.org Sun May 28 08:49:36 2017 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 344E6D7B42B; Sun, 28 May 2017 08:49:36 +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 114C2EA9; Sun, 28 May 2017 08:49:36 +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 v4S8nZ5e096643; Sun, 28 May 2017 08:49:35 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4S8nYvM096639; Sun, 28 May 2017 08:49:34 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201705280849.v4S8nYvM096639@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 28 May 2017 08:49:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r441902 - in branches/2017Q2/databases: mariadb100-client/files mariadb100-server mariadb100-server/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 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: Sun, 28 May 2017 08:49:36 -0000 Author: brnrd Date: Sun May 28 08:49:34 2017 New Revision: 441902 URL: https://svnweb.freebsd.org/changeset/ports/441902 Log: MFH: r441551 databases/mariadb100-server: Update to 10.0.31 - Security and bug-fix update - Remove build fix (included upstream) - Fix-up CMakeLists patches Security: d9e01c35-2531-11e7-b291-b499baebfeaf Approved by: ports-secteam (miwi) Deleted: branches/2017Q2/databases/mariadb100-client/files/patch-build-fail-MDEV-12261 Modified: branches/2017Q2/databases/mariadb100-client/files/patch-CMakeLists.txt branches/2017Q2/databases/mariadb100-server/Makefile branches/2017Q2/databases/mariadb100-server/distinfo branches/2017Q2/databases/mariadb100-server/files/patch-CMakeLists.txt Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/databases/mariadb100-client/files/patch-CMakeLists.txt ============================================================================== --- branches/2017Q2/databases/mariadb100-client/files/patch-CMakeLists.txt Sun May 28 08:28:36 2017 (r441901) +++ branches/2017Q2/databases/mariadb100-client/files/patch-CMakeLists.txt Sun May 28 08:49:34 2017 (r441902) @@ -1,5 +1,5 @@ ---- CMakeLists.txt.orig 2017-01-12 01:45:16 UTC -+++ CMakeLists.txt +--- CMakeLists.txt.orig 2017-05-20 01:04:09.000000000 +0200 ++++ CMakeLists.txt 2017-05-23 20:47:01.403482000 +0200 @@ -405,9 +405,9 @@ ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(libservices) @@ -24,10 +24,10 @@ ) +IF(FALSE) - INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER EXCEPTIONS-CLIENT - COMPONENT Readme) + INSTALL_DOCUMENTATION(README CREDITS COPYING EXCEPTIONS-CLIENT COMPONENT Readme) -@@ -490,6 +492,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP + # MDEV-6526 these files are not installed anymore +@@ -489,6 +491,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP IF(UNIX) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) ENDIF() Modified: branches/2017Q2/databases/mariadb100-server/Makefile ============================================================================== --- branches/2017Q2/databases/mariadb100-server/Makefile Sun May 28 08:28:36 2017 (r441901) +++ branches/2017Q2/databases/mariadb100-server/Makefile Sun May 28 08:49:34 2017 (r441902) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.0.30 -PORTREVISION?= 1 +PORTVERSION= 10.0.31 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \ Modified: branches/2017Q2/databases/mariadb100-server/distinfo ============================================================================== --- branches/2017Q2/databases/mariadb100-server/distinfo Sun May 28 08:28:36 2017 (r441901) +++ branches/2017Q2/databases/mariadb100-server/distinfo Sun May 28 08:49:34 2017 (r441902) @@ -1,3 +1,3 @@ -TIMESTAMP = 1489029439 -SHA256 (mariadb-10.0.30.tar.gz) = 9a2cb7f06ecce1bb64dddc70c484e36507b50b756c110c1d37fa145a13a796bb -SIZE (mariadb-10.0.30.tar.gz) = 63433598 +TIMESTAMP = 1495565124 +SHA256 (mariadb-10.0.31.tar.gz) = 371f2dae0b9e1a92939fba1efca77ac83ba15b6b6dcfd389ca5cbf79eb8b842a +SIZE (mariadb-10.0.31.tar.gz) = 63461177 Modified: branches/2017Q2/databases/mariadb100-server/files/patch-CMakeLists.txt ============================================================================== --- branches/2017Q2/databases/mariadb100-server/files/patch-CMakeLists.txt Sun May 28 08:28:36 2017 (r441901) +++ branches/2017Q2/databases/mariadb100-server/files/patch-CMakeLists.txt Sun May 28 08:49:34 2017 (r441902) @@ -1,14 +1,14 @@ ---- CMakeLists.txt.orig 2015-08-05 18:11:27 UTC -+++ CMakeLists.txt +--- CMakeLists.txt.orig 2017-05-20 01:04:09.000000000 +0200 ++++ CMakeLists.txt 2017-05-23 20:53:22.017238000 +0200 @@ -480,6 +480,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) +IF(FALSE) - INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER EXCEPTIONS-CLIENT - COMPONENT Readme) + INSTALL_DOCUMENTATION(README CREDITS COPYING EXCEPTIONS-CLIENT COMPONENT Readme) -@@ -490,6 +491,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP + # MDEV-6526 these files are not installed anymore +@@ -489,6 +490,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP IF(UNIX) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) ENDIF() From owner-svn-ports-branches@freebsd.org Sun May 28 09:15:55 2017 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 88133D851F6; Sun, 28 May 2017 09:15:55 +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 356701381; Sun, 28 May 2017 09:15:55 +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 v4S9FsZa009378; Sun, 28 May 2017 09:15:54 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4S9Fr4T009368; Sun, 28 May 2017 09:15:53 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201705280915.v4S9Fr4T009368@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 28 May 2017 09:15:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r441904 - in branches/2017Q2/databases: mariadb101-client mariadb101-client/files mariadb101-server mariadb101-server/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 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: Sun, 28 May 2017 09:15:55 -0000 Author: brnrd Date: Sun May 28 09:15:53 2017 New Revision: 441904 URL: https://svnweb.freebsd.org/changeset/ports/441904 Log: MFH: r440094 databases/mariadb101-server: Update to 10.1.23 - Security and bugfix update to 10.1.23 - Add upstream patch for InnoDB crash - Update CMakeLists.txt patch - Remove MDEV-12261 patch (included upstream) - Fix plist issues PR: 219045 Submitted by: Dani Security: d9e01c35-2531-11e7-b291-b499baebfeaf Approved by: ports-secteam (woodsb02) Added: branches/2017Q2/databases/mariadb101-server/files/patch-MDEV-12281 - copied unchanged from r440094, head/databases/mariadb101-server/files/patch-MDEV-12281 Deleted: branches/2017Q2/databases/mariadb101-client/files/patch-build-fail-MDEV-12261 Modified: branches/2017Q2/databases/mariadb101-client/files/patch-CMakeLists.txt branches/2017Q2/databases/mariadb101-client/pkg-plist branches/2017Q2/databases/mariadb101-server/Makefile branches/2017Q2/databases/mariadb101-server/distinfo branches/2017Q2/databases/mariadb101-server/files/patch-CMakeLists.txt branches/2017Q2/databases/mariadb101-server/pkg-plist Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/databases/mariadb101-client/files/patch-CMakeLists.txt ============================================================================== --- branches/2017Q2/databases/mariadb101-client/files/patch-CMakeLists.txt Sun May 28 09:01:09 2017 (r441903) +++ branches/2017Q2/databases/mariadb101-client/files/patch-CMakeLists.txt Sun May 28 09:15:53 2017 (r441904) @@ -1,22 +1,23 @@ ---- CMakeLists.txt.orig 2016-03-24 09:12:10 UTC +--- CMakeLists.txt.orig 2017-05-02 05:13:38 UTC +++ CMakeLists.txt -@@ -380,7 +380,6 @@ ADD_SUBDIRECTORY(libmysql) +@@ -385,7 +385,7 @@ ADD_SUBDIRECTORY(libmysql) ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(libservices) -ADD_SUBDIRECTORY(sql/share) ++#ADD_SUBDIRECTORY(sql/share) IF(NOT WITHOUT_SERVER) ADD_SUBDIRECTORY(tests) -@@ -460,6 +459,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL +@@ -465,6 +465,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) +IF(FALSE) - INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER COPYING.thirdparty + INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.thirdparty EXCEPTIONS-CLIENT COMPONENT Readme) - # MDEV-6526 these files are not installed anymore -@@ -470,6 +470,7 @@ IF(UNIX) + +@@ -476,6 +477,7 @@ IF(UNIX) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme) ENDIF() Modified: branches/2017Q2/databases/mariadb101-client/pkg-plist ============================================================================== --- branches/2017Q2/databases/mariadb101-client/pkg-plist Sun May 28 09:01:09 2017 (r441903) +++ branches/2017Q2/databases/mariadb101-client/pkg-plist Sun May 28 09:15:53 2017 (r441904) @@ -71,6 +71,8 @@ include/mysql/service_encryption_scheme. include/mysql/service_kill_statement.h include/mysql/service_logger.h include/mysql/service_md5.h +include/mysql/service_my_crypt.h +include/mysql/service_my_print_error.h include/mysql/service_my_snprintf.h include/mysql/service_progress_report.h include/mysql/service_sha1.h Modified: branches/2017Q2/databases/mariadb101-server/Makefile ============================================================================== --- branches/2017Q2/databases/mariadb101-server/Makefile Sun May 28 09:01:09 2017 (r441903) +++ branches/2017Q2/databases/mariadb101-server/Makefile Sun May 28 09:15:53 2017 (r441904) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.1.22 -PORTREVISION?= 1 +PORTVERSION= 10.1.23 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \ Modified: branches/2017Q2/databases/mariadb101-server/distinfo ============================================================================== --- branches/2017Q2/databases/mariadb101-server/distinfo Sun May 28 09:01:09 2017 (r441903) +++ branches/2017Q2/databases/mariadb101-server/distinfo Sun May 28 09:15:53 2017 (r441904) @@ -1,3 +1,3 @@ -TIMESTAMP = 1489523834 -SHA256 (mariadb-10.1.22.tar.gz) = bcb0572e7ad32cea9740a21e9255f733bdf60a5561ffbda317c22dd12b3966ce -SIZE (mariadb-10.1.22.tar.gz) = 61542321 +TIMESTAMP = 1493839895 +SHA256 (mariadb-10.1.23.tar.gz) = 54d8114e24bfa5e3ebdc7d69e071ad1471912847ea481b227d204f9d644300bf +SIZE (mariadb-10.1.23.tar.gz) = 61772244 Modified: branches/2017Q2/databases/mariadb101-server/files/patch-CMakeLists.txt ============================================================================== --- branches/2017Q2/databases/mariadb101-server/files/patch-CMakeLists.txt Sun May 28 09:01:09 2017 (r441903) +++ branches/2017Q2/databases/mariadb101-server/files/patch-CMakeLists.txt Sun May 28 09:15:53 2017 (r441904) @@ -1,16 +1,14 @@ -Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options - ---- CMakeLists.txt.orig 2016-03-24 09:12:10 UTC +--- CMakeLists.txt.orig 2017-05-02 05:13:38 UTC +++ CMakeLists.txt -@@ -460,6 +460,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL +@@ -465,6 +465,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) +IF(FALSE) - INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER COPYING.thirdparty + INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.thirdparty EXCEPTIONS-CLIENT COMPONENT Readme) - # MDEV-6526 these files are not installed anymore -@@ -470,6 +471,7 @@ IF(UNIX) + +@@ -476,6 +477,7 @@ IF(UNIX) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme) ENDIF() Copied: branches/2017Q2/databases/mariadb101-server/files/patch-MDEV-12281 (from r440094, head/databases/mariadb101-server/files/patch-MDEV-12281) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/databases/mariadb101-server/files/patch-MDEV-12281 Sun May 28 09:15:53 2017 (r441904, copy of r440094, head/databases/mariadb101-server/files/patch-MDEV-12281) @@ -0,0 +1,15 @@ +--- storage/innobase/dict/dict0stats.cc.orig 2017-05-02 07:13:44.000000000 +0200 ++++ storage/innobase/dict/dict0stats.cc 2017-05-03 17:26:34.159233678 +0200 +@@ -1168,10 +1168,10 @@ + leaf-level delete marks because delete marks on + non-leaf level do not make sense. */ + +- if (level == 0 && srv_stats_include_delete_marked? 0: ++ if (level == 0 && (srv_stats_include_delete_marked ? 0: + rec_get_deleted_flag( + rec, +- page_is_comp(btr_pcur_get_page(&pcur)))) { ++ page_is_comp(btr_pcur_get_page(&pcur))))) { + + if (rec_is_last_on_page + && !prev_rec_is_copied Modified: branches/2017Q2/databases/mariadb101-server/pkg-plist ============================================================================== --- branches/2017Q2/databases/mariadb101-server/pkg-plist Sun May 28 09:01:09 2017 (r441903) +++ branches/2017Q2/databases/mariadb101-server/pkg-plist Sun May 28 09:15:53 2017 (r441904) @@ -4,6 +4,8 @@ bin/aria_ftdump bin/aria_pack bin/aria_read_log bin/innochecksum +bin/mariabackup +bin/mbstream bin/my_print_defaults bin/myisam_ftdump bin/myisamchk @@ -37,6 +39,7 @@ bin/resolveip %%TOKUDB%%bin/tokuft_logprint %%TOKUDB%%bin/tokuftdump bin/wsrep_sst_common +bin/wsrep_sst_mariabackup bin/wsrep_sst_mysqldump bin/wsrep_sst_rsync bin/wsrep_sst_xtrabackup @@ -150,7 +153,10 @@ man/man1/aria_dump_log.1.gz man/man1/aria_ftdump.1.gz man/man1/aria_pack.1.gz man/man1/aria_read_log.1.gz +man/man1/galera_new_cluster.1.gz +man/man1/galera_recovery.1.gz man/man1/innochecksum.1.gz +man/man1/mariadb-service-convert.1.gz man/man1/my_print_defaults.1.gz man/man1/myisam_ftdump.1.gz man/man1/myisamchk.1.gz @@ -168,6 +174,7 @@ man/man1/mysql_zap.1.gz man/man1/mysqlbug.1.gz man/man1/mysqld_multi.1.gz man/man1/mysqld_safe.1.gz +man/man1/mysqld_safe_helper.1.gz man/man1/mysqldumpslow.1.gz man/man1/mysqlhotcopy.1.gz man/man1/mysqltest.1.gz @@ -175,6 +182,13 @@ man/man1/perror.1.gz man/man1/replace.1.gz man/man1/resolve_stack_dump.1.gz man/man1/resolveip.1.gz +%%TOKUDB%%man/man1/tokuft_logdump.1.gz +%%TOKUDB%%man/man1/tokuftdump.1.gz +man/man1/wsrep_sst_common.1.gz +man/man1/wsrep_sst_mysqldump.1.gz +man/man1/wsrep_sst_rsync.1.gz +man/man1/wsrep_sst_xtrabackup-v2.1.gz +man/man1/wsrep_sst_xtrabackup.1.gz man/man8/mysqld.8.gz %%DATADIR%%/binary-configure %%DATADIR%%/charsets/Index.xml From owner-svn-ports-branches@freebsd.org Sun May 28 11:02:26 2017 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 870D9D8548D; Sun, 28 May 2017 11:02:26 +0000 (UTC) (envelope-from sunpoet@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 56E00EC6; Sun, 28 May 2017 11:02:26 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4SB2P5E051933; Sun, 28 May 2017 11:02:25 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4SB2Pwf051931; Sun, 28 May 2017 11:02:25 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201705281102.v4SB2Pwf051931@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sun, 28 May 2017 11:02:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r441908 - branches/2017Q2/www/aria2 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.23 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: Sun, 28 May 2017 11:02:26 -0000 Author: sunpoet Date: Sun May 28 11:02:25 2017 New Revision: 441908 URL: https://svnweb.freebsd.org/changeset/ports/441908 Log: MFH: r441579 Update to 1.32.0 Changes: https://github.com/aria2/aria2/releases Approved by: ports-secteam Modified: branches/2017Q2/www/aria2/Makefile branches/2017Q2/www/aria2/distinfo Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/www/aria2/Makefile ============================================================================== --- branches/2017Q2/www/aria2/Makefile Sun May 28 10:58:00 2017 (r441907) +++ branches/2017Q2/www/aria2/Makefile Sun May 28 11:02:25 2017 (r441908) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= aria2 -PORTVERSION= 1.31.0 -PORTREVISION= 2 +PORTVERSION= 1.32.0 CATEGORIES= www MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/release-${PORTVERSION}/ \ LOCAL/sunpoet Modified: branches/2017Q2/www/aria2/distinfo ============================================================================== --- branches/2017Q2/www/aria2/distinfo Sun May 28 10:58:00 2017 (r441907) +++ branches/2017Q2/www/aria2/distinfo Sun May 28 11:02:25 2017 (r441908) @@ -1,3 +1,3 @@ -TIMESTAMP = 1485033823 -SHA256 (aria2-1.31.0.tar.xz) = 7b85619048b23406f241e38a5b1b8b0bc2cae9e80fd117810c2a71ecca813f8c -SIZE (aria2-1.31.0.tar.xz) = 1501388 +TIMESTAMP = 1495553316 +SHA256 (aria2-1.32.0.tar.xz) = 546e9194a9135d665fce572cb93c88f30fb5601d113bfa19951107ced682dc50 +SIZE (aria2-1.32.0.tar.xz) = 1502192 From owner-svn-ports-branches@freebsd.org Sun May 28 11:09:44 2017 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 E74BFD85590; Sun, 28 May 2017 11:09:44 +0000 (UTC) (envelope-from sunpoet@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 B3113101E; Sun, 28 May 2017 11:09:44 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4SB9hrL054603; Sun, 28 May 2017 11:09:43 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4SB9hKK054601; Sun, 28 May 2017 11:09:43 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201705281109.v4SB9hKK054601@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sun, 28 May 2017 11:09:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r441909 - branches/2017Q2/graphics/imageworsener 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.23 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: Sun, 28 May 2017 11:09:45 -0000 Author: sunpoet Date: Sun May 28 11:09:43 2017 New Revision: 441909 URL: https://svnweb.freebsd.org/changeset/ports/441909 Log: MFH: r441801 Update to 1.3.2 Changes: https://github.com/jsummers/imageworsener/blob/master/changelog.txt Approved by: ports-secteam Modified: branches/2017Q2/graphics/imageworsener/Makefile branches/2017Q2/graphics/imageworsener/distinfo Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/graphics/imageworsener/Makefile ============================================================================== --- branches/2017Q2/graphics/imageworsener/Makefile Sun May 28 11:02:25 2017 (r441908) +++ branches/2017Q2/graphics/imageworsener/Makefile Sun May 28 11:09:43 2017 (r441909) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= imageworsener -PORTVERSION= 1.3.0 -PORTREVISION= 1 +PORTVERSION= 1.3.2 CATEGORIES= graphics MASTER_SITES= http://entropymine.com/imageworsener/ \ LOCAL/sunpoet Modified: branches/2017Q2/graphics/imageworsener/distinfo ============================================================================== --- branches/2017Q2/graphics/imageworsener/distinfo Sun May 28 11:02:25 2017 (r441908) +++ branches/2017Q2/graphics/imageworsener/distinfo Sun May 28 11:09:43 2017 (r441909) @@ -1,2 +1,3 @@ -SHA256 (imageworsener-1.3.0.tar.gz) = 2d4e40463658a577056ee17f204aac2a626b291f187f5f6e42b0c4140408d125 -SIZE (imageworsener-1.3.0.tar.gz) = 660594 +TIMESTAMP = 1495818481 +SHA256 (imageworsener-1.3.2.tar.gz) = 0946f8e82eaf4c51b7f3f2624eef89bfdf73b7c5b04d23aae8d3fbe01cca3ea2 +SIZE (imageworsener-1.3.2.tar.gz) = 661710 From owner-svn-ports-branches@freebsd.org Sun May 28 19:17:18 2017 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 69414D854BA; Sun, 28 May 2017 19:17:18 +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 3B06D1E15; Sun, 28 May 2017 19:17:18 +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 v4SJHHsM053171; Sun, 28 May 2017 19:17:17 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4SJHHeC053170; Sun, 28 May 2017 19:17:17 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201705281917.v4SJHHeC053170@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 28 May 2017 19:17:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r441922 - branches/2017Q2/audio/musicpd/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.23 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: Sun, 28 May 2017 19:17:18 -0000 Author: riggs Date: Sun May 28 19:17:17 2017 New Revision: 441922 URL: https://svnweb.freebsd.org/changeset/ports/441922 Log: MFH: r441921 Fix build on aarch64 (endian detection) Submitted by: theraven (via mail) Approved by: ports-secteam (build fix blanket) Added: branches/2017Q2/audio/musicpd/files/patch-src_system_ByteOrder.hxx - copied unchanged from r441921, head/audio/musicpd/files/patch-src_system_ByteOrder.hxx Modified: Directory Properties: branches/2017Q2/ (props changed) Copied: branches/2017Q2/audio/musicpd/files/patch-src_system_ByteOrder.hxx (from r441921, head/audio/musicpd/files/patch-src_system_ByteOrder.hxx) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/audio/musicpd/files/patch-src_system_ByteOrder.hxx Sun May 28 19:17:17 2017 (r441922, copy of r441921, head/audio/musicpd/files/patch-src_system_ByteOrder.hxx) @@ -0,0 +1,19 @@ +--- src/system/ByteOrder.hxx.orig 2017-05-26 09:10:52 UTC ++++ src/system/ByteOrder.hxx +@@ -34,7 +34,15 @@ + + #include + +-#if defined(__i386__) || defined(__x86_64__) || defined(__ARMEL__) ++#if defined(__BYTE_ORDER__) ++# if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ ++# define IS_LITTLE_ENDIAN true ++# define IS_BIG_ENDIAN false ++# else ++# define IS_LITTLE_ENDIAN false ++# define IS_BIG_ENDIAN true ++# endif ++#elif defined(__i386__) || defined(__x86_64__) || defined(__ARMEL__) + /* well-known little-endian */ + # define IS_LITTLE_ENDIAN true + # define IS_BIG_ENDIAN false From owner-svn-ports-branches@freebsd.org Tue May 30 07:56:32 2017 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 F1E24AFEFC2; Tue, 30 May 2017 07:56:31 +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 BF9187C429; Tue, 30 May 2017 07:56:31 +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 v4U7uUZc078134; Tue, 30 May 2017 07:56:30 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4U7uUia078132; Tue, 30 May 2017 07:56:30 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201705300756.v4U7uUia078132@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Tue, 30 May 2017 07:56:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442052 - in branches/2017Q2/databases/mariadb101-server: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 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, 30 May 2017 07:56:32 -0000 Author: brnrd Date: Tue May 30 07:56:30 2017 New Revision: 442052 URL: https://svnweb.freebsd.org/changeset/ports/442052 Log: MFH: r441333 databases/mariadb101-server: Fix crash in XtraDB - Apply crash patch to XtraDB (not only InnoDB) - Bump port-revision PR: 219235 Submitted by: Dani Approved by: ports-secteam (woodsb02) Modified: branches/2017Q2/databases/mariadb101-server/Makefile branches/2017Q2/databases/mariadb101-server/files/patch-MDEV-12281 Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/databases/mariadb101-server/Makefile ============================================================================== --- branches/2017Q2/databases/mariadb101-server/Makefile Tue May 30 07:34:06 2017 (r442051) +++ branches/2017Q2/databases/mariadb101-server/Makefile Tue May 30 07:56:30 2017 (r442052) @@ -2,7 +2,7 @@ PORTNAME?= mariadb PORTVERSION= 10.1.23 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \ Modified: branches/2017Q2/databases/mariadb101-server/files/patch-MDEV-12281 ============================================================================== --- branches/2017Q2/databases/mariadb101-server/files/patch-MDEV-12281 Tue May 30 07:34:06 2017 (r442051) +++ branches/2017Q2/databases/mariadb101-server/files/patch-MDEV-12281 Tue May 30 07:56:30 2017 (r442052) @@ -13,3 +13,18 @@ if (rec_is_last_on_page && !prev_rec_is_copied +--- storage/xtradb/dict/dict0stats.cc.orig 2017-05-02 07:13:52.000000000 +0200 ++++ storage/xtradb/dict/dict0stats.cc 2017-05-08 18:37:24.659231976 +0200 +@@ -1168,10 +1168,10 @@ + leaf-level delete marks because delete marks on + non-leaf level do not make sense. */ + +- if (level == 0 && srv_stats_include_delete_marked? 0: ++ if (level == 0 && (srv_stats_include_delete_marked ? 0: + rec_get_deleted_flag( + rec, +- page_is_comp(btr_pcur_get_page(&pcur)))) { ++ page_is_comp(btr_pcur_get_page(&pcur))))) { + + if (rec_is_last_on_page + && !prev_rec_is_copied From owner-svn-ports-branches@freebsd.org Tue May 30 13:18:39 2017 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 3E67AB7CB4B; Tue, 30 May 2017 13:18:39 +0000 (UTC) (envelope-from feld@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 19F07B36; Tue, 30 May 2017 13:18:39 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4UDIcri008752; Tue, 30 May 2017 13:18:38 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4UDIb02008744; Tue, 30 May 2017 13:18:37 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201705301318.v4UDIb02008744@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 30 May 2017 13:18:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442060 - in branches/2017Q2/net: samba44 samba45 samba46 samba46/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.23 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, 30 May 2017 13:18:39 -0000 Author: feld Date: Tue May 30 13:18:37 2017 New Revision: 442060 URL: https://svnweb.freebsd.org/changeset/ports/442060 Log: MFH: r441602 Urgent upgrade of the Samba 4.[4-6] ports to address RCE in the Samba code(CVE-2017-7494). All versions starting from 3.5+ are affected. Security: CVE-2017-7494 Approved by: ports-secteam (with hat) PR: 219514 Added: branches/2017Q2/net/samba46/files/patch-source3__librpc__crypto__gse.c - copied unchanged from r441602, head/net/samba46/files/patch-source3__librpc__crypto__gse.c Modified: branches/2017Q2/net/samba44/Makefile branches/2017Q2/net/samba44/distinfo branches/2017Q2/net/samba45/Makefile branches/2017Q2/net/samba45/distinfo branches/2017Q2/net/samba46/Makefile branches/2017Q2/net/samba46/distinfo branches/2017Q2/net/samba46/pkg-plist Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/net/samba44/Makefile ============================================================================== --- branches/2017Q2/net/samba44/Makefile Tue May 30 11:20:53 2017 (r442059) +++ branches/2017Q2/net/samba44/Makefile Tue May 30 13:18:37 2017 (r442060) @@ -19,7 +19,7 @@ CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba4[1-35 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.4.13 +SAMBA4_VERSION= 4.4.14 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} Modified: branches/2017Q2/net/samba44/distinfo ============================================================================== --- branches/2017Q2/net/samba44/distinfo Tue May 30 11:20:53 2017 (r442059) +++ branches/2017Q2/net/samba44/distinfo Tue May 30 13:18:37 2017 (r442060) @@ -1,3 +1,3 @@ -TIMESTAMP = 1490980593 -SHA256 (samba-4.4.13.tar.gz) = 61558009408e4f37d79c2b5f9c49cf7633908e12a14141e1c075c67011fa0d2d -SIZE (samba-4.4.13.tar.gz) = 20766658 +TIMESTAMP = 1495629061 +SHA256 (samba-4.4.14.tar.gz) = b0a564af71536f12f01aae2e1d93a04c588dd53b81a3f3eaf9bb73ba4f6f57dd +SIZE (samba-4.4.14.tar.gz) = 20766497 Modified: branches/2017Q2/net/samba45/Makefile ============================================================================== --- branches/2017Q2/net/samba45/Makefile Tue May 30 11:20:53 2017 (r442059) +++ branches/2017Q2/net/samba45/Makefile Tue May 30 13:18:37 2017 (r442060) @@ -19,7 +19,7 @@ CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba4[1-4 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.5.8 +SAMBA4_VERSION= 4.5.10 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} Modified: branches/2017Q2/net/samba45/distinfo ============================================================================== --- branches/2017Q2/net/samba45/distinfo Tue May 30 11:20:53 2017 (r442059) +++ branches/2017Q2/net/samba45/distinfo Tue May 30 13:18:37 2017 (r442060) @@ -1,3 +1,3 @@ -TIMESTAMP = 1490981258 -SHA256 (samba-4.5.8.tar.gz) = f63b656d8823a280c50c9dbd6b692816cd7a88adfe9b47997ce697fd75bf81f0 -SIZE (samba-4.5.8.tar.gz) = 20979104 +TIMESTAMP = 1495629026 +SHA256 (samba-4.5.10.tar.gz) = 7cb753f5f6d5527ef40d4c1f47dacafb7c876cb304b4906ccb390c6a18477714 +SIZE (samba-4.5.10.tar.gz) = 20989431 Modified: branches/2017Q2/net/samba46/Makefile ============================================================================== --- branches/2017Q2/net/samba46/Makefile Tue May 30 11:20:53 2017 (r442059) +++ branches/2017Q2/net/samba46/Makefile Tue May 30 13:18:37 2017 (r442060) @@ -19,7 +19,7 @@ CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba4[1-5 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.6.2 +SAMBA4_VERSION= 4.6.4 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} Modified: branches/2017Q2/net/samba46/distinfo ============================================================================== --- branches/2017Q2/net/samba46/distinfo Tue May 30 11:20:53 2017 (r442059) +++ branches/2017Q2/net/samba46/distinfo Tue May 30 13:18:37 2017 (r442060) @@ -1,3 +1,3 @@ -TIMESTAMP = 1490962372 -SHA256 (samba-4.6.2.tar.gz) = 927afcc16e444718985e3952de92d34e7b776b9ca0238179d866da18a6441c35 -SIZE (samba-4.6.2.tar.gz) = 21097045 +TIMESTAMP = 1495628999 +SHA256 (samba-4.6.4.tar.gz) = 4ac67329d18e5586dc75db50e23b81c1f6c45a2d5bb9752ea6d90dcca08d9a61 +SIZE (samba-4.6.4.tar.gz) = 21108045 Copied: branches/2017Q2/net/samba46/files/patch-source3__librpc__crypto__gse.c (from r441602, head/net/samba46/files/patch-source3__librpc__crypto__gse.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/net/samba46/files/patch-source3__librpc__crypto__gse.c Tue May 30 13:18:37 2017 (r442060, copy of r441602, head/net/samba46/files/patch-source3__librpc__crypto__gse.c) @@ -0,0 +1,16 @@ +--- source3/librpc/crypto/gse.c.orig 2017-05-24 13:22:06.188197000 +0000 ++++ source3/librpc/crypto/gse.c 2017-05-24 13:31:22.933150000 +0000 +@@ -334,11 +334,12 @@ + struct gse_context *gse_ctx = + talloc_get_type_abort(gensec_security->private_data, + struct gse_context); +- OM_uint32 gss_maj, gss_min; ++ OM_uint32 gss_min; + gss_buffer_desc in_data; + gss_buffer_desc out_data; + DATA_BLOB blob = data_blob_null; + NTSTATUS status; ++ OM_uint32 gss_maj = -1; + OM_uint32 time_rec = 0; + struct timeval tv; + struct cli_credentials *cli_creds = gensec_get_credentials(gensec_security); Modified: branches/2017Q2/net/samba46/pkg-plist ============================================================================== --- branches/2017Q2/net/samba46/pkg-plist Tue May 30 11:20:53 2017 (r442059) +++ branches/2017Q2/net/samba46/pkg-plist Tue May 30 13:18:37 2017 (r442060) @@ -434,6 +434,7 @@ lib/shared-modules/vfs/zfsacl.so %%PYTHON_SITELIBDIR%%/samba/com.so %%PYTHON_SITELIBDIR%%/samba/common.py %%PYTHON_SITELIBDIR%%/samba/credentials.so +%%PYTHON_SITELIBDIR%%/samba/crypto.so %%PYTHON_SITELIBDIR%%/samba/dbchecker.py %%PYTHON_SITELIBDIR%%/samba/dcerpc/__init__.py %%PYTHON_SITELIBDIR%%/samba/dcerpc/atsvc.so From owner-svn-ports-branches@freebsd.org Tue May 30 13:20:15 2017 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 204E2B7CBC1; Tue, 30 May 2017 13:20:15 +0000 (UTC) (envelope-from feld@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 E3224C73; Tue, 30 May 2017 13:20:14 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4UDKDg8009025; Tue, 30 May 2017 13:20:13 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4UDKDti009023; Tue, 30 May 2017 13:20:13 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201705301320.v4UDKDti009023@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 30 May 2017 13:20:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442061 - in branches/2017Q2/net: samba42 samba43 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.23 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, 30 May 2017 13:20:15 -0000 Author: feld Date: Tue May 30 13:20:13 2017 New Revision: 442061 URL: https://svnweb.freebsd.org/changeset/ports/442061 Log: MFH: r441680 net/samba43: Mark 4.2 and 4.3 deprecated - Add deprecation date and message - Update/simplify conflicts PR: 219514 Approved by: timur (maintainer) Security: 6f4d96c0-4062-11e7-b291-b499baebfeaf Approved by: ports-secteam (with hat) Modified: branches/2017Q2/net/samba42/Makefile branches/2017Q2/net/samba43/Makefile Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/net/samba42/Makefile ============================================================================== --- branches/2017Q2/net/samba42/Makefile Tue May 30 13:18:37 2017 (r442060) +++ branches/2017Q2/net/samba42/Makefile Tue May 30 13:20:13 2017 (r442061) @@ -13,7 +13,10 @@ COMMENT?= Free SMB/CIFS and AD/DC server and client f LICENSE= GPLv3 -CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba41-4.1.* samba43-4.3.* samba44-4.4.* +CONFLICTS?= samba4[3-9]-4.* + +DEPRECATED= not supported upstream https://wiki.samba.org/index.php/Samba_Release_Planning +EXPIRATION_DATE= 2016-09-07 EXTRA_PATCHES= ${PATCHDIR}/extra-patch-progress:-p1 Modified: branches/2017Q2/net/samba43/Makefile ============================================================================== --- branches/2017Q2/net/samba43/Makefile Tue May 30 13:18:37 2017 (r442060) +++ branches/2017Q2/net/samba43/Makefile Tue May 30 13:20:13 2017 (r442061) @@ -13,7 +13,10 @@ COMMENT?= Free SMB/CIFS and AD/DC server and client f LICENSE= GPLv3 -CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba41-4.1.* samba42-4.2.* samba44-4.4.* +CONFLICTS?= samba4[24-9]-4.* + +DEPRECATED= not supported upstream https://wiki.samba.org/index.php/Samba_Release_Planning +EXPIRATION_DATE= 2017-03-07 #EXTRA_PATCHES= ${PATCHDIR}/extra-patch-progress:-p1 From owner-svn-ports-branches@freebsd.org Tue May 30 20:30:51 2017 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 7DCB0BEBCFF; Tue, 30 May 2017 20:30:51 +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 576DA78526; Tue, 30 May 2017 20:30:51 +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 v4UKUoxT017420; Tue, 30 May 2017 20:30:50 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4UKUoB8017417; Tue, 30 May 2017 20:30:50 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201705302030.v4UKUoB8017417@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Tue, 30 May 2017 20:30:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442119 - in branches/2017Q2/audio/musicpd: . 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.23 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, 30 May 2017 20:30:51 -0000 Author: riggs Date: Tue May 30 20:30:50 2017 New Revision: 442119 URL: https://svnweb.freebsd.org/changeset/ports/442119 Log: MFH: r440334 r441969 Fix library updating Details: Apparently, clang optimises exceptions with __attribute__((pure)) more aggressively than gcc, causing mpd to not notice files removed from the library. This patch causes mpd to be built without the pure attribute. PR: 219048 Reported by: hideo@lastamericanempire.com Update to upstream version 0.20.8 Approved by: ports-secteam (feld) Added: branches/2017Q2/audio/musicpd/files/patch-src_Compiler.h - copied unchanged from r440334, head/audio/musicpd/files/patch-src_Compiler.h Modified: branches/2017Q2/audio/musicpd/Makefile branches/2017Q2/audio/musicpd/distinfo Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/audio/musicpd/Makefile ============================================================================== --- branches/2017Q2/audio/musicpd/Makefile Tue May 30 20:13:50 2017 (r442118) +++ branches/2017Q2/audio/musicpd/Makefile Tue May 30 20:30:50 2017 (r442119) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= musicpd -PORTVERSION= 0.20.6 -PORTREVISION= 3 +PORTVERSION= 0.20.8 CATEGORIES= audio ipv6 MASTER_SITES= http://www.musicpd.org/download/mpd/${PORTVERSION:R}/ DISTNAME= mpd-${PORTVERSION} Modified: branches/2017Q2/audio/musicpd/distinfo ============================================================================== --- branches/2017Q2/audio/musicpd/distinfo Tue May 30 20:13:50 2017 (r442118) +++ branches/2017Q2/audio/musicpd/distinfo Tue May 30 20:30:50 2017 (r442119) @@ -1,3 +1,3 @@ -TIMESTAMP = 1489218787 -SHA256 (mpd-0.20.6.tar.xz) = f4055e1189e5cc00e83706b2e0b5ead924ced0303e073d7802ee9f9a8eba4b47 -SIZE (mpd-0.20.6.tar.xz) = 772140 +TIMESTAMP = 1495999052 +SHA256 (mpd-0.20.8.tar.xz) = 7d177f29663c4a0997413401e52bbf11d2bb472773bbcf9294f839c4b8751e35 +SIZE (mpd-0.20.8.tar.xz) = 773128 Copied: branches/2017Q2/audio/musicpd/files/patch-src_Compiler.h (from r440334, head/audio/musicpd/files/patch-src_Compiler.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/audio/musicpd/files/patch-src_Compiler.h Tue May 30 20:30:50 2017 (r442119, copy of r440334, head/audio/musicpd/files/patch-src_Compiler.h) @@ -0,0 +1,11 @@ +--- src/Compiler.h.orig 2017-01-27 07:46:51 UTC ++++ src/Compiler.h +@@ -86,7 +86,7 @@ + #define gcc_noreturn __attribute__((noreturn)) + #define gcc_packed __attribute__((packed)) + #define gcc_printf(a,b) __attribute__((format(printf, a, b))) +-#define gcc_pure __attribute__((pure)) ++#define gcc_pure + #define gcc_sentinel __attribute__((sentinel)) + #define gcc_unused __attribute__((unused)) + #define gcc_warn_unused_result __attribute__((warn_unused_result)) From owner-svn-ports-branches@freebsd.org Wed May 31 09:00:34 2017 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 93594AFADFC; Wed, 31 May 2017 09:00:34 +0000 (UTC) (envelope-from kwm@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 304356F99F; Wed, 31 May 2017 09:00:34 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4V90Xqn028553; Wed, 31 May 2017 09:00:33 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4V90VCd028530; Wed, 31 May 2017 09:00:31 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201705310900.v4V90VCd028530@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Wed, 31 May 2017 09:00:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442142 - in branches/2017Q2/graphics/ImageMagick: . 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.23 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, 31 May 2017 09:00:34 -0000 Author: kwm Date: Wed May 31 09:00:30 2017 New Revision: 442142 URL: https://svnweb.freebsd.org/changeset/ports/442142 Log: Manualy backport CVE patches, due to shared library bump in ImageMagick. PR: 219497 Approved by: ports-secteam@ (feld@) Security: 50776801-4183-11e7-b291-b499baebfeaf Added: branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-5506 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-5507 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-5508 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-5509 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-5510 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-5511 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-6497 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-6498 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-6499 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-6500 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-6501 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-6502 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-7275 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-7606 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-7619 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-7941 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-7942 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-7943 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-8343 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-8344 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-8345 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-8346 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-8347 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-8348 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-8349 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-8350 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-8351 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-8352 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-8353 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-8354 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-8355 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-8356 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-8357 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-8765 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-8830 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-9141 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-9142 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-9143 (contents, props changed) branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-9144 (contents, props changed) Modified: branches/2017Q2/graphics/ImageMagick/Makefile Modified: branches/2017Q2/graphics/ImageMagick/Makefile ============================================================================== --- branches/2017Q2/graphics/ImageMagick/Makefile Wed May 31 08:22:54 2017 (r442141) +++ branches/2017Q2/graphics/ImageMagick/Makefile Wed May 31 09:00:30 2017 (r442142) @@ -2,7 +2,7 @@ PORTNAME= ImageMagick DISTVERSION= 6.9.6-4 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= graphics perl5 MASTER_SITES= http://www.imagemagick.org/download/ \ Added: branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-5506 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-5506 Wed May 31 09:00:30 2017 (r442142) @@ -0,0 +1,27 @@ +From 6235f1f7a9f7b0f83b197f6cd0073dbb6602d0fb Mon Sep 17 00:00:00 2001 +From: Cristy +Date: Thu, 12 Jan 2017 12:51:14 -0500 +Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/354 + +--- + magick/profile.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/magick/profile.c b/magick/profile.c +index 7c12a1c933..6313388a2b 100644 +--- magick/profile.c ++++ magick/profile.c +@@ -2071,10 +2071,10 @@ static MagickBooleanType SyncExifProfile(Image *image, StringInfo *profile) + The directory entry contains an offset. + */ + offset=(ssize_t) ReadProfileLong(endian,q+8); +- if ((ssize_t) (offset+number_bytes) < offset) +- continue; /* prevent overflow */ +- if ((size_t) (offset+number_bytes) > length) ++ if ((offset < 0) || ((size_t) (offset+number_bytes) > length)) + continue; ++ if (~length < number_bytes) ++ continue; /* prevent overflow */ + p=(unsigned char *) (exif+offset); + } + switch (tag_value) Added: branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-5507 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-5507 Wed May 31 09:00:30 2017 (r442142) @@ -0,0 +1,49 @@ +From 4493d9ca1124564da17f9b628ef9d0f1a6be9738 Mon Sep 17 00:00:00 2001 +From: Cristy +Date: Tue, 10 Jan 2017 20:14:38 -0500 +Subject: [PATCH] ... + + * Recognize XML policy closing tags (reference + https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=31182). + * Fix memory leak in MPC image format. + + +diff --git a/coders/mpc.c b/coders/mpc.c +index eda0c36cb2..89fead527f 100644 +--- coders/mpc.c ++++ coders/mpc.c +@@ -67,6 +67,7 @@ + #include "magick/profile.h" + #include "magick/property.h" + #include "magick/quantum-private.h" ++#include "magick/resource_.h" + #include "magick/static.h" + #include "magick/statistic.h" + #include "magick/string_.h" +@@ -841,7 +842,9 @@ static Image *ReadMPCImage(const ImageInfo *image_info,ExceptionInfo *exception) + /* + Create image colormap. + */ +- if (AcquireImageColormap(image,image->colors) == MagickFalse) ++ image->colormap=(PixelPacket *) AcquireQuantumMemory(image->colors+1, ++ sizeof(*image->colormap)); ++ if (image->colormap == (PixelPacket *) NULL) + ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); + if (image->colors != 0) + { +@@ -930,12 +933,9 @@ static Image *ReadMPCImage(const ImageInfo *image_info,ExceptionInfo *exception) + if ((image_info->ping != MagickFalse) && (image_info->number_scenes != 0)) + if (image->scene >= (image_info->scene+image_info->number_scenes-1)) + break; +- status=SetImageExtent(image,image->columns,image->rows); +- if (status == MagickFalse) +- { +- InheritException(exception,&image->exception); +- return(DestroyImageList(image)); +- } ++ if ((AcquireMagickResource(WidthResource,image->columns) == MagickFalse) || ++ (AcquireMagickResource(HeightResource,image->rows) == MagickFalse)) ++ ThrowReaderException(ImageError,"WidthOrHeightExceedsLimit"); + /* + Attach persistent pixel cache. + */ Added: branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-5508 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-5508 Wed May 31 09:00:30 2017 (r442142) @@ -0,0 +1,230 @@ +From e5dc6d628a1c6049dc95adcea5e49aaa7ef2c778 Mon Sep 17 00:00:00 2001 +From: Cristy +Date: Fri, 2 Dec 2016 11:07:56 -0500 +Subject: [PATCH] Fix possible buffer overflow when writing compressed TIFFS + +--- + coders/tiff.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/coders/tiff.c b/coders/tiff.c +index f18e210127..c6c6f60afb 100644 +--- coders/tiff.c ++++ coders/tiff.c +@@ -1581,9 +1581,9 @@ RestoreMSCWarning + rows_per_strip); + (void) SetImageProperty(image,"tiff:rows-per-strip",value); + } +- if ((samples_per_pixel >= 2) && (interlace == PLANARCONFIG_CONTIG)) ++ if ((samples_per_pixel >= 3) && (interlace == PLANARCONFIG_CONTIG)) + method=ReadRGBAMethod; +- if ((samples_per_pixel >= 2) && (interlace == PLANARCONFIG_SEPARATE)) ++ if ((samples_per_pixel >= 4) && (interlace == PLANARCONFIG_SEPARATE)) + method=ReadCMYKAMethod; + if ((photometric != PHOTOMETRIC_RGB) && + (photometric != PHOTOMETRIC_CIELAB) && + + +From fde5f55af94f189f16958535a9c22b439d71ac93 Mon Sep 17 00:00:00 2001 +From: Cristy +Date: Thu, 1 Dec 2016 20:05:59 -0500 +Subject: [PATCH] Fix possible buffer overflow when writing compressed TIFFS + +--- + ChangeLog | 4 ++++ + coders/tiff.c | 38 +++++++++++++++++++++----------------- + 2 files changed, 25 insertions(+), 17 deletions(-) + +2016-12-02 6.9.6-7 Cristy + * Fix possible buffer overflow when writing compressed TIFFS (vulnerability + report from Cisco Talos, CVE-2016-8707). + +diff --git a/coders/tiff.c b/coders/tiff.c +index 35a14b6882..f18e210127 100644 +--- coders/tiff.c ++++ coders/tiff.c +@@ -1154,7 +1154,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info, + width; + + unsigned char +- *pixels; ++ *tiff_pixels; + + /* + Open image. +@@ -1606,7 +1606,13 @@ RestoreMSCWarning + method=ReadTileMethod; + quantum_info->endian=LSBEndian; + quantum_type=RGBQuantum; +- pixels=GetQuantumPixels(quantum_info); ++ tiff_pixels=(unsigned char *) AcquireMagickMemory(TIFFScanlineSize(tiff)+ ++ sizeof(uint32)); ++ if (tiff_pixels == (unsigned char *) NULL) ++ { ++ TIFFClose(tiff); ++ ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); ++ } + switch (method) + { + case ReadSingleSampleMethod: +@@ -1643,7 +1649,6 @@ RestoreMSCWarning + TIFFClose(tiff); + ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); + } +- pixels=GetQuantumPixels(quantum_info); + for (y=0; y < (ssize_t) image->rows; y++) + { + int +@@ -1652,14 +1657,14 @@ RestoreMSCWarning + register PixelPacket + *magick_restrict q; + +- status=TIFFReadPixels(tiff,bits_per_sample,0,y,(char *) pixels); ++ status=TIFFReadPixels(tiff,bits_per_sample,0,y,(char *) tiff_pixels); + if (status == -1) + break; + q=QueueAuthenticPixels(image,0,y,image->columns,1,exception); + if (q == (PixelPacket *) NULL) + break; + (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info, +- quantum_type,pixels,exception); ++ quantum_type,tiff_pixels,exception); + if (SyncAuthenticPixels(image,exception) == MagickFalse) + break; + if (image->previous == (Image *) NULL) +@@ -1700,7 +1705,6 @@ RestoreMSCWarning + TIFFClose(tiff); + ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); + } +- pixels=GetQuantumPixels(quantum_info); + for (y=0; y < (ssize_t) image->rows; y++) + { + int +@@ -1709,14 +1713,14 @@ RestoreMSCWarning + register PixelPacket + *magick_restrict q; + +- status=TIFFReadPixels(tiff,bits_per_sample,0,y,(char *) pixels); ++ status=TIFFReadPixels(tiff,bits_per_sample,0,y,(char *) tiff_pixels); + if (status == -1) + break; + q=QueueAuthenticPixels(image,0,y,image->columns,1,exception); + if (q == (PixelPacket *) NULL) + break; + (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info, +- quantum_type,pixels,exception); ++ quantum_type,tiff_pixels,exception); + if (SyncAuthenticPixels(image,exception) == MagickFalse) + break; + if (image->previous == (Image *) NULL) +@@ -1745,7 +1749,7 @@ RestoreMSCWarning + status; + + status=TIFFReadPixels(tiff,bits_per_sample,(tsample_t) i,y,(char *) +- pixels); ++ tiff_pixels); + if (status == -1) + break; + q=GetAuthenticPixels(image,0,y,image->columns,1,exception); +@@ -1771,7 +1775,7 @@ RestoreMSCWarning + default: quantum_type=UndefinedQuantum; break; + } + (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info, +- quantum_type,pixels,exception); ++ quantum_type,tiff_pixels,exception); + if (SyncAuthenticPixels(image,exception) == MagickFalse) + break; + } +@@ -1787,7 +1791,6 @@ RestoreMSCWarning + } + case ReadYCCKMethod: + { +- pixels=GetQuantumPixels(quantum_info); + for (y=0; y < (ssize_t) image->rows; y++) + { + int +@@ -1805,14 +1808,14 @@ RestoreMSCWarning + unsigned char + *p; + +- status=TIFFReadPixels(tiff,bits_per_sample,0,y,(char *) pixels); ++ status=TIFFReadPixels(tiff,bits_per_sample,0,y,(char *) tiff_pixels); + if (status == -1) + break; + q=QueueAuthenticPixels(image,0,y,image->columns,1,exception); + if (q == (PixelPacket *) NULL) + break; + indexes=GetAuthenticIndexQueue(image); +- p=pixels; ++ p=tiff_pixels; + for (x=0; x < (ssize_t) image->columns; x++) + { + SetPixelCyan(q,ScaleCharToQuantum(ClampYCC((double) *p+ +@@ -1861,13 +1864,13 @@ RestoreMSCWarning + break; + if (i == 0) + { +- if (TIFFReadRGBAStrip(tiff,(tstrip_t) y,(uint32 *) pixels) == 0) ++ if (TIFFReadRGBAStrip(tiff,(tstrip_t) y,(uint32 *) tiff_pixels) == 0) + break; + i=(ssize_t) MagickMin((ssize_t) rows_per_strip,(ssize_t) + image->rows-y); + } + i--; +- p=((uint32 *) pixels)+image->columns*i; ++ p=((uint32 *) tiff_pixels)+image->columns*i; + for (x=0; x < (ssize_t) image->columns; x++) + { + SetPixelRed(q,ScaleCharToQuantum((unsigned char) +@@ -1920,8 +1923,8 @@ RestoreMSCWarning + TIFFClose(tiff); + ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); + } +- tile_pixels=(uint32 *) AcquireQuantumMemory(columns, +- rows*sizeof(*tile_pixels)); ++ tile_pixels=(uint32 *) AcquireQuantumMemory(columns,rows* ++ sizeof(*tile_pixels)); + if (tile_pixels == (uint32 *) NULL) + { + TIFFClose(tiff); +@@ -2078,6 +2081,7 @@ RestoreMSCWarning + break; + } + } ++ tiff_pixels=(unsigned char *) RelinquishMagickMemory(tiff_pixels); + SetQuantumImageType(image,quantum_type); + next_tiff_frame: + if (quantum_info != (QuantumInfo *) NULL) + + +From c073a7712d82476b5fbee74856c46b88af9c3175 Mon Sep 17 00:00:00 2001 +From: Cristy +Date: Thu, 5 Jan 2017 12:07:59 -0500 +Subject: [PATCH] + https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=31161 + +--- + ChangeLog | 4 ++++ + coders/tiff.c | 5 +++-- + 2 files changed, 7 insertions(+), 2 deletions(-) + +2017-01-04 6.9.7-3 Cristy + * Increase memory allocation for TIFF pixels (reference + https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=31161). + +diff --git a/coders/tiff.c b/coders/tiff.c +index 55a6683f71..6304b397fe 100644 +--- coders/tiff.c ++++ coders/tiff.c +@@ -1606,8 +1606,9 @@ RestoreMSCWarning + method=ReadTileMethod; + quantum_info->endian=LSBEndian; + quantum_type=RGBQuantum; +- tiff_pixels=(unsigned char *) AcquireMagickMemory(TIFFScanlineSize(tiff)+ +- sizeof(uint32)); ++ tiff_pixels=(unsigned char *) AcquireMagickMemory(MagickMax( ++ TIFFScanlineSize(tiff),(size_t) (image->columns*samples_per_pixel* ++ pow(2.0,ceil(log(bits_per_sample)/log(2.0)))))); + if (tiff_pixels == (unsigned char *) NULL) + { + TIFFClose(tiff); Added: branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-5509 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-5509 Wed May 31 09:00:30 2017 (r442142) @@ -0,0 +1,22 @@ +From 37a1710e2dab6ed91128ea648d654a22fbe2a6af Mon Sep 17 00:00:00 2001 +From: Cristy +Date: Tue, 10 Jan 2017 09:04:04 -0500 +Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/350 + +--- + coders/psd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/coders/psd.c b/coders/psd.c +index 58496fd96d..14e375b9ed 100644 +--- coders/psd.c ++++ coders/psd.c +@@ -2606,7 +2606,7 @@ static ssize_t WritePSDChannels(const PSDInfo *psd_info, + compact_pixels=(unsigned char *) NULL; + if (next_image->compression == RLECompression) + { +- compact_pixels=AcquireCompactPixels(image); ++ compact_pixels=AcquireCompactPixels(next_image); + if (compact_pixels == (unsigned char *) NULL) + return(0); + } Added: branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-5510 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-5510 Wed May 31 09:00:30 2017 (r442142) @@ -0,0 +1,22 @@ +From e87af64b1ff1635a32d9b6162f1b0e260fb54ed9 Mon Sep 17 00:00:00 2001 +From: Cristy +Date: Sun, 8 Jan 2017 08:40:43 -0500 +Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/348 + +--- + coders/psd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/coders/psd.c b/coders/psd.c +index a6f7ec4b0b..58496fd96d 100644 +--- coders/psd.c ++++ coders/psd.c +@@ -2486,7 +2486,7 @@ static size_t WritePSDChannel(const PSDInfo *psd_info, + next_image->depth=16; + monochrome=IsMonochromeImage(image,&image->exception) && (image->depth == 1) + ? MagickTrue : MagickFalse; +- quantum_info=AcquireQuantumInfo(image_info,image); ++ quantum_info=AcquireQuantumInfo(image_info,next_image); + if (quantum_info == (QuantumInfo *) NULL) + return(0); + pixels=GetQuantumPixels(quantum_info); Added: branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-5511 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-5511 Wed May 31 09:00:30 2017 (r442142) @@ -0,0 +1,23 @@ +From 7d65a814ac76bd04760072c33e452371692ee790 Mon Sep 17 00:00:00 2001 +From: Dirk Lemstra +Date: Sat, 7 Jan 2017 16:56:30 +0100 +Subject: [PATCH] Fix improper cast that could cause an overflow as + demonstrated in #347. + +--- + coders/psd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/coders/psd.c b/coders/psd.c +index 1f15d65b1b..a6f7ec4b0b 100644 +--- coders/psd.c ++++ coders/psd.c +@@ -1671,7 +1671,7 @@ ModuleExport MagickBooleanType ReadPSDLayers(Image *image, + /* + Layer name. + */ +- length=(MagickSizeType) ReadBlobByte(image); ++ length=(MagickSizeType) (unsigned char) ReadBlobByte(image); + combined_length+=length+1; + if (length > 0) + (void) ReadBlob(image,(size_t) length++,layer_info[i].name); Added: branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-6497 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-6497 Wed May 31 09:00:30 2017 (r442142) @@ -0,0 +1,27 @@ +From 7f2dc7a1afc067d0c89f12c82bcdec0445fb1b94 Mon Sep 17 00:00:00 2001 +From: Dirk Lemstra +Date: Sat, 11 Feb 2017 10:31:39 +0100 +Subject: [PATCH] Added missing null check. + +--- + coders/psd.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/coders/psd.c b/coders/psd.c +index 14e375b9ed..fb93c57dd1 100644 +--- coders/psd.c ++++ coders/psd.c +@@ -1284,8 +1284,11 @@ static MagickBooleanType ReadPSDChannel(Image *image, + } + mask=CloneImage(image,layer_info->mask.page.width, + layer_info->mask.page.height,MagickFalse,exception); +- mask->matte=MagickFalse; +- channel_image=mask; ++ if (mask != (Image *) NULL) ++ { ++ mask->matte=MagickFalse; ++ channel_image=mask; ++ } + } + + offset=TellBlob(image); Added: branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-6498 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-6498 Wed May 31 09:00:30 2017 (r442142) @@ -0,0 +1,43 @@ +From 65f75a32a93ae4044c528a987a68366ecd4b46b9 Mon Sep 17 00:00:00 2001 +From: Cristy +Date: Thu, 19 Jan 2017 19:30:48 -0500 +Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/pull/359 + +--- + coders/tga.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/coders/tga.c b/coders/tga.c +index d8adc52f7b..7b87278ef5 100644 +--- coders/tga.c ++++ coders/tga.c +@@ -710,6 +710,7 @@ static MagickBooleanType WriteTGAImage(const ImageInfo *image_info,Image *image) + compression; + + const char ++ *comment, + *value; + + const double +@@ -766,9 +767,9 @@ static MagickBooleanType WriteTGAImage(const ImageInfo *image_info,Image *image) + compression=image_info->compression; + range=GetQuantumRange(5UL); + tga_info.id_length=0; +- value=GetImageProperty(image,"comment"); +- if (value != (const char *) NULL) +- tga_info.id_length=(unsigned char) MagickMin(strlen(value),255); ++ comment=GetImageProperty(image,"comment"); ++ if (comment != (const char *) NULL) ++ tga_info.id_length=(unsigned char) MagickMin(strlen(comment),255); + tga_info.colormap_type=0; + tga_info.colormap_index=0; + tga_info.colormap_length=0; +@@ -852,7 +853,7 @@ static MagickBooleanType WriteTGAImage(const ImageInfo *image_info,Image *image) + (void) WriteBlobByte(image,tga_info.bits_per_pixel); + (void) WriteBlobByte(image,tga_info.attributes); + if (tga_info.id_length != 0) +- (void) WriteBlob(image,tga_info.id_length,(unsigned char *) value); ++ (void) WriteBlob(image,tga_info.id_length,(unsigned char *) comment); + if (tga_info.colormap_type != 0) + { + unsigned char Added: branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-6499 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-6499 Wed May 31 09:00:30 2017 (r442142) @@ -0,0 +1,37 @@ +From 3358f060fc182551822576b2c0a8850faab5d543 Mon Sep 17 00:00:00 2001 +From: Dirk Lemstra +Date: Thu, 9 Feb 2017 21:53:23 +0100 +Subject: [PATCH] Fixed memory leak when creating nested exceptions in + Magick++. + + 2017-02-09 6.9.7-8 Dirk Lemstra + * Fixed memory leak when creating nested exceptions in Magick++ (reference + https://www.imagemagick.org/discourse-server/viewtopic.php?f=23&p=142634) + +diff --git a/Magick++/lib/Exception.cpp b/Magick++/lib/Exception.cpp +index 92ca629707..8ef34bc0a0 100644 +--- Magick++/lib/Exception.cpp ++++ Magick++/lib/Exception.cpp +@@ -852,12 +852,18 @@ MagickPPExport void Magick::throwException(ExceptionInfo *exception_, + exception_->description) != 0)) + { + if (nestedException == (Exception *) NULL) +- nestedException=createException(p); ++ { ++ nestedException=createException(p); ++ q=nestedException; ++ } + else + { +- q=createException(p); +- nestedException->nested(q); +- nestedException=q; ++ Exception ++ *r; ++ ++ r=createException(p); ++ q->nested(r); ++ q=r; + } + } + } Added: branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-6500 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-6500 Wed May 31 09:00:30 2017 (r442142) @@ -0,0 +1,23 @@ +From 3007531bfd326c5c1e29cd41d2cd80c166de8528 Mon Sep 17 00:00:00 2001 +From: Cristy +Date: Wed, 8 Feb 2017 13:38:04 -0500 +Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/375 + https://github.com/ImageMagick/ImageMagick/issues/376 + +--- + coders/sun.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/coders/sun.c b/coders/sun.c +index 150f3357fd..c11a33c62b 100644 +--- coders/sun.c ++++ coders/sun.c +@@ -458,7 +458,7 @@ static Image *ReadSUNImage(const ImageInfo *image_info,ExceptionInfo *exception) + ThrowReaderException(ResourceLimitError,"ImproperImageHeader"); + } + pixels_length=height*bytes_per_line; +- sun_pixels=(unsigned char *) AcquireQuantumMemory(pixels_length, ++ sun_pixels=(unsigned char *) AcquireQuantumMemory(pixels_length+image->rows, + sizeof(*sun_pixels)); + if (sun_pixels == (unsigned char *) NULL) + { Added: branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-6501 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-6501 Wed May 31 09:00:30 2017 (r442142) @@ -0,0 +1,29 @@ +From d31fec57e9dfb0516deead2053a856e3c71e9751 Mon Sep 17 00:00:00 2001 +From: Cristy +Date: Thu, 9 Feb 2017 18:13:47 -0500 +Subject: [PATCH] =?UTF-8?q?Check=20for=20image=20list=20before=20we=20dest?= + =?UTF-8?q?roy=20the=20last=20image=20in=20XCF=20coder=20(patch=20sent=20p?= + =?UTF-8?q?rivately=20by=20=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=A7?= + =?UTF-8?q?=D0=B5=D1=80=D0=BD=D1=8B=D0=B9)?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + coders/xcf.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/coders/xcf.c b/coders/xcf.c +index 083f217ca0..2feef82ff1 100644 +--- coders/xcf.c ++++ coders/xcf.c +@@ -1445,7 +1445,8 @@ static Image *ReadXCFImage(const ImageInfo *image_info,ExceptionInfo *exception) + } + + (void) CloseBlob(image); +- DestroyImage(RemoveFirstImageFromList(&image)); ++ if (GetNextImageInList(image) != (Image *) NULL) ++ DestroyImage(RemoveFirstImageFromList(&image)); + if (image_type == GIMP_GRAY) + image->type=GrayscaleType; + return(GetFirstImageInList(image)); Added: branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-6502 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-6502 Wed May 31 09:00:30 2017 (r442142) @@ -0,0 +1,25 @@ +From 126c7c98ea788241922c30df4a5633ea692cf8df Mon Sep 17 00:00:00 2001 +From: Dirk Lemstra +Date: Sat, 18 Feb 2017 11:24:41 +0100 +Subject: [PATCH] Fixed fd leak for webp coder (patch from #382) + +--- + ChangeLog | 4 ++++ + coders/webp.c | 1 + + 2 files changed, 5 insertions(+) + + 2017-02-18 6.9.7-9 Dirk Lemstra + * Fixed fd leak for webp coder (reference + https://github.com/ImageMagick/ImageMagick/pull/382) +diff --git a/coders/webp.c b/coders/webp.c +index 811b3d4336..11703f85af 100644 +--- coders/webp.c ++++ coders/webp.c +@@ -368,6 +368,7 @@ static Image *ReadWEBPImage(const ImageInfo *image_info, + } + WebPFreeDecBuffer(webp_image); + stream=(unsigned char*) RelinquishMagickMemory(stream); ++ (void) CloseBlob(image); + return(image); + } + #endif Added: branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-7275 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-7275 Wed May 31 09:00:30 2017 (r442142) @@ -0,0 +1,22 @@ +From d94d85622f120f82240921ae7a83a72afcb79ddf Mon Sep 17 00:00:00 2001 +From: Dirk Lemstra +Date: Mon, 21 Nov 2016 20:54:14 +0100 +Subject: [PATCH] Lowered max map_length to prevent an overflow (#271). + +--- + coders/rle.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/coders/rle.c b/coders/rle.c +index 117bde8d51..a14fafa6c1 100644 +--- coders/rle.c ++++ coders/rle.c +@@ -227,7 +227,7 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception) + bits_per_pixel=(size_t) ReadBlobByte(image); + number_colormaps=(size_t) ReadBlobByte(image); + map_length=(unsigned char) ReadBlobByte(image); +- if (map_length >= 32) ++ if (map_length >= 22) + ThrowReaderException(CorruptImageError,"ImproperImageHeader"); + one=1; + map_length=one << map_length; Added: branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-7606 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-7606 Wed May 31 09:00:30 2017 (r442142) @@ -0,0 +1,23 @@ +From b2b0aa6bb0d110f8560fe2091671a27d78877f22 Mon Sep 17 00:00:00 2001 +From: Cristy +Date: Fri, 31 Mar 2017 15:23:42 -0400 +Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/415 + +--- + coders/rle.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/coders/rle.c b/coders/rle.c +index 18a3ef5c60..d1ccffd7dc 100644 +--- coders/rle.c ++++ coders/rle.c +@@ -274,7 +274,8 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception) + p=colormap; + for (i=0; i < (ssize_t) number_colormaps; i++) + for (x=0; x < (ssize_t) map_length; x++) +- *p++=(unsigned char) ScaleShortToQuantum(ReadBlobLSBShort(image)); ++ *p++=(unsigned char) ScaleQuantumToChar(ScaleShortToQuantum( ++ ReadBlobLSBShort(image))); + } + if ((flags & 0x08) != 0) + { Added: branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-7619 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-7619 Wed May 31 09:00:30 2017 (r442142) @@ -0,0 +1,121 @@ +diff --git a/magick/enhance.c b/magick/enhance.c +index bbcbd85..010fba7 100644 +--- magick/enhance.c ++++ magick/enhance.c +@@ -3474,11 +3474,7 @@ static inline void ModulateHCL(const double percent_hue, + Increase or decrease color luma, chroma, or hue. + */ + ConvertRGBToHCL(*red,*green,*blue,&hue,&chroma,&luma); +- hue+=0.5*(0.01*percent_hue-1.0); +- while (hue < 0.0) +- hue+=1.0; +- while (hue > 1.0) +- hue-=1.0; ++ hue+=fmod((percent_hue-100.0),200.0)/200.0; + chroma*=0.01*percent_chroma; + luma*=0.01*percent_luma; + ConvertHCLToRGB(hue,chroma,luma,red,green,blue); +@@ -3497,11 +3493,7 @@ static inline void ModulateHCLp(const double percent_hue, + Increase or decrease color luma, chroma, or hue. + */ + ConvertRGBToHCLp(*red,*green,*blue,&hue,&chroma,&luma); +- hue+=0.5*(0.01*percent_hue-1.0); +- while (hue < 0.0) +- hue+=1.0; +- while (hue > 1.0) +- hue-=1.0; ++ hue+=fmod((percent_hue-100.0),200.0)/200.0; + chroma*=0.01*percent_chroma; + luma*=0.01*percent_luma; + ConvertHCLpToRGB(hue,chroma,luma,red,green,blue); +@@ -3520,11 +3512,7 @@ static inline void ModulateHSB(const double percent_hue, + Increase or decrease color brightness, saturation, or hue. + */ + ConvertRGBToHSB(*red,*green,*blue,&hue,&saturation,&brightness); +- hue+=0.5*(0.01*percent_hue-1.0); +- while (hue < 0.0) +- hue+=1.0; +- while (hue > 1.0) +- hue-=1.0; ++ hue+=fmod((percent_hue-100.0),200.0)/200.0; + saturation*=0.01*percent_saturation; + brightness*=0.01*percent_brightness; + ConvertHSBToRGB(hue,saturation,brightness,red,green,blue); +@@ -3543,11 +3531,7 @@ static inline void ModulateHSI(const double percent_hue, + Increase or decrease color intensity, saturation, or hue. + */ + ConvertRGBToHSI(*red,*green,*blue,&hue,&saturation,&intensity); +- hue+=0.5*(0.01*percent_hue-1.0); +- while (hue < 0.0) +- hue+=1.0; +- while (hue > 1.0) +- hue-=1.0; ++ hue+=fmod((percent_hue-100.0),200.0)/200.0; + saturation*=0.01*percent_saturation; + intensity*=0.01*percent_intensity; + ConvertHSIToRGB(hue,saturation,intensity,red,green,blue); +@@ -3566,11 +3550,7 @@ static inline void ModulateHSL(const double percent_hue, + Increase or decrease color lightness, saturation, or hue. + */ + ConvertRGBToHSL(*red,*green,*blue,&hue,&saturation,&lightness); +- hue+=0.5*(0.01*percent_hue-1.0); +- while (hue < 0.0) +- hue+=1.0; +- while (hue >= 1.0) +- hue-=1.0; ++ hue+=fmod((percent_hue-100.0),200.0)/200.0; + saturation*=0.01*percent_saturation; + lightness*=0.01*percent_lightness; + ConvertHSLToRGB(hue,saturation,lightness,red,green,blue); +@@ -3589,11 +3569,7 @@ static inline void ModulateHSV(const double percent_hue, + Increase or decrease color value, saturation, or hue. + */ + ConvertRGBToHSV(*red,*green,*blue,&hue,&saturation,&value); +- hue+=0.5*(0.01*percent_hue-1.0); +- while (hue < 0.0) +- hue+=1.0; +- while (hue >= 1.0) +- hue-=1.0; ++ hue+=fmod((percent_hue-100.0),200.0)/200.0; + saturation*=0.01*percent_saturation; + value*=0.01*percent_value; + ConvertHSVToRGB(hue,saturation,value,red,green,blue); +@@ -3612,11 +3588,7 @@ static inline void ModulateHWB(const double percent_hue, + Increase or decrease color blackness, whiteness, or hue. + */ + ConvertRGBToHWB(*red,*green,*blue,&hue,&whiteness,&blackness); +- hue+=0.5*(0.01*percent_hue-1.0); +- while (hue < 0.0) +- hue+=1.0; +- while (hue >= 1.0) +- hue-=1.0; ++ hue+=fmod((percent_hue-100.0),200.0)/200.0; + blackness*=0.01*percent_blackness; + whiteness*=0.01*percent_whiteness; + ConvertHWBToRGB(hue,whiteness,blackness,red,green,blue); +@@ -3637,11 +3609,7 @@ static inline void ModulateLCHab(const double percent_luma, + ConvertRGBToLCHab(*red,*green,*blue,&luma,&chroma,&hue); + luma*=0.01*percent_luma; + chroma*=0.01*percent_chroma; +- hue+=0.5*(0.01*percent_hue-1.0); +- while (hue < 0.0) +- hue+=1.0; +- while (hue >= 1.0) +- hue-=1.0; ++ hue+=fmod((percent_hue-100.0),200.0)/200.0; + ConvertLCHabToRGB(luma,chroma,hue,red,green,blue); + } + +@@ -3660,11 +3628,7 @@ static inline void ModulateLCHuv(const double percent_luma, + ConvertRGBToLCHuv(*red,*green,*blue,&luma,&chroma,&hue); + luma*=0.01*percent_luma; + chroma*=0.01*percent_chroma; +- hue+=0.5*(0.01*percent_hue-1.0); +- while (hue < 0.0) +- hue+=1.0; +- while (hue >= 1.0) +- hue-=1.0; ++ hue+=fmod((percent_hue-100.0),200.0)/200.0; + ConvertLCHuvToRGB(luma,chroma,hue,red,green,blue); + } + Added: branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-7941 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-7941 Wed May 31 09:00:30 2017 (r442142) @@ -0,0 +1,89 @@ +From 721dc1305b2bfff92e5ca605dc1a47c61ce90b9f Mon Sep 17 00:00:00 2001 +From: Dirk Lemstra +Date: Mon, 17 Apr 2017 19:03:46 +0200 +Subject: [PATCH] Fixed memory leak reported in #428. + +--- + coders/sgi.c | 40 +++++++++++++++++++++++++++++++--------- + 1 file changed, 31 insertions(+), 9 deletions(-) + +diff --git a/coders/sgi.c b/coders/sgi.c +index 57932e8713..82f511415d 100644 +--- coders/sgi.c ++++ coders/sgi.c +@@ -403,7 +403,10 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception) + scanline=(unsigned char *) AcquireQuantumMemory(iris_info.columns, + bytes_per_pixel*sizeof(*scanline)); + if (scanline == (unsigned char *) NULL) +- ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); ++ { ++ pixel_info=RelinquishVirtualMemory(pixel_info); ++ ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); ++ } + for (z=0; z < (ssize_t) iris_info.depth; z++) + { + p=pixels+bytes_per_pixel*z; +@@ -460,12 +463,11 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception) + (runlength == (size_t *) NULL) || + (packet_info == (MemoryInfo *) NULL)) + { +- if (offsets == (ssize_t *) NULL) +- offsets=(ssize_t *) RelinquishMagickMemory(offsets); +- if (runlength == (size_t *) NULL) +- runlength=(size_t *) RelinquishMagickMemory(runlength); +- if (packet_info == (MemoryInfo *) NULL) ++ offsets=(ssize_t *) RelinquishMagickMemory(offsets); ++ runlength=(size_t *) RelinquishMagickMemory(runlength); ++ if (packet_info != (MemoryInfo *) NULL) + packet_info=RelinquishVirtualMemory(packet_info); ++ pixel_info=RelinquishVirtualMemory(pixel_info); + ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); + } + packets=(unsigned char *) GetVirtualMemoryBlob(packet_info); +@@ -475,7 +477,13 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception) + { + runlength[i]=ReadBlobMSBLong(image); + if (runlength[i] > (4*(size_t) iris_info.columns+10)) +- ThrowReaderException(CorruptImageError,"ImproperImageHeader"); ++ { ++ offsets=(ssize_t *) RelinquishMagickMemory(offsets); ++ runlength=(size_t *) RelinquishMagickMemory(runlength); ++ packet_info=RelinquishVirtualMemory(packet_info); ++ pixel_info=RelinquishVirtualMemory(pixel_info); ++ ThrowReaderException(CorruptImageError,"ImproperImageHeader"); ++ } + } + /* + Check data order. +@@ -512,7 +520,14 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception) + (runlength[y+z*iris_info.rows]/bytes_per_pixel),packets, + (ssize_t) iris_info.columns,p+bytes_per_pixel*z); + if (status == MagickFalse) +- ThrowReaderException(CorruptImageError,"ImproperImageHeader"); ++ { ++ offsets=(ssize_t *) RelinquishMagickMemory(offsets); ++ runlength=(size_t *) RelinquishMagickMemory(runlength); ++ packet_info=RelinquishVirtualMemory(packet_info); ++ pixel_info=RelinquishVirtualMemory(pixel_info); ++ ThrowReaderException(CorruptImageError, ++ "ImproperImageHeader"); ++ } + p+=(iris_info.columns*4*bytes_per_pixel); + } + } +@@ -543,7 +558,14 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception) + (runlength[y+z*iris_info.rows]/bytes_per_pixel),packets, + (ssize_t) iris_info.columns,p+bytes_per_pixel*z); + if (status == MagickFalse) +- ThrowReaderException(CorruptImageError,"ImproperImageHeader"); ++ { ++ offsets=(ssize_t *) RelinquishMagickMemory(offsets); ++ runlength=(size_t *) RelinquishMagickMemory(runlength); ++ packet_info=RelinquishVirtualMemory(packet_info); ++ pixel_info=RelinquishVirtualMemory(pixel_info); ++ ThrowReaderException(CorruptImageError, ++ "ImproperImageHeader"); ++ } + } + p+=(iris_info.columns*4*bytes_per_pixel); + } Added: branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-7942 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-7942 Wed May 31 09:00:30 2017 (r442142) @@ -0,0 +1,25 @@ +From fd84a5e8028778fd88772775361a2ee2b4bb6c47 Mon Sep 17 00:00:00 2001 +From: Dirk Lemstra +Date: Mon, 17 Apr 2017 18:52:51 +0200 +Subject: [PATCH] Fixed memory leak reported in #429 + +--- + coders/avs.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/coders/avs.c b/coders/avs.c +index a368732ff7..50cf05f18a 100644 +--- coders/avs.c ++++ coders/avs.c +@@ -178,7 +178,10 @@ static Image *ReadAVSImage(const ImageInfo *image_info,ExceptionInfo *exception) + { + count=ReadBlob(image,length,pixels); + if (count != length) +- ThrowReaderException(CorruptImageError,"UnableToReadImageData"); ++ { ++ pixel_info=RelinquishVirtualMemory(pixel_info); ++ ThrowReaderException(CorruptImageError,"UnableToReadImageData"); ++ } + p=pixels; + q=QueueAuthenticPixels(image,0,y,image->columns,1,exception); + if (q == (PixelPacket *) NULL) Added: branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-7943 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-7943 Wed May 31 09:00:30 2017 (r442142) @@ -0,0 +1,22 @@ +From 2e3410d0a07c3e30a42c9626c00e180870907a6b Mon Sep 17 00:00:00 2001 +From: Dirk Lemstra +Date: Mon, 17 Apr 2017 18:08:02 +0200 +Subject: [PATCH] Fixed leak reported in: #427. + +--- + coders/svg.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/coders/svg.c b/coders/svg.c +index bfa60db3d7..5c74114d62 100644 +--- coders/svg.c ++++ coders/svg.c +@@ -3265,6 +3265,8 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception) + image->rows=svg_info->height; + if (exception->severity >= ErrorException) + { ++ svg_info=DestroySVGInfo(svg_info); ++ (void) RelinquishUniqueFileResource(filename); + image=DestroyImage(image); + return((Image *) NULL); + } Added: branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-8343 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-8343 Wed May 31 09:00:30 2017 (r442142) @@ -0,0 +1,25 @@ +From c52b177e0cb11c896b8cc9525a3184c5c0f322c3 Mon Sep 17 00:00:00 2001 +From: Cristy +Date: Wed, 26 Apr 2017 16:21:23 -0400 +Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/444 + +--- + coders/aai.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/coders/aai.c b/coders/aai.c +index 5384064154..d3e5b69460 100644 +--- coders/aai.c ++++ coders/aai.c +@@ -173,7 +173,10 @@ static Image *ReadAAIImage(const ImageInfo *image_info,ExceptionInfo *exception) + { + count=ReadBlob(image,length,pixels); + if ((size_t) count != length) +- ThrowReaderException(CorruptImageError,"UnableToReadImageData"); ++ { ++ pixels=(unsigned char *) RelinquishMagickMemory(pixels); ++ ThrowReaderException(CorruptImageError,"UnableToReadImageData"); ++ } + p=pixels; + q=QueueAuthenticPixels(image,0,y,image->columns,1,exception); + if (q == (PixelPacket *) NULL) Added: branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-8344 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/graphics/ImageMagick/files/patch-CVE-2017-8344 Wed May 31 09:00:30 2017 (r442142) @@ -0,0 +1,144 @@ +From 4c6289b2f39a47a430ce27b61d3e3967201e77e8 Mon Sep 17 00:00:00 2001 +From: Cristy +Date: Wed, 26 Apr 2017 16:58:26 -0400 +Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/446 + +--- + coders/pcx.c | 42 ++++++++++++++++++++++++------------------ + 1 file changed, 24 insertions(+), 18 deletions(-) + +--- coders/pcx.c.orig 2016-11-08 13:30:03.000000000 +0100 ++++ coders/pcx.c 2017-05-29 14:14:11.583378000 +0200 +@@ -203,11 +203,15 @@ static MagickBooleanType IsPCX(const unsigned char *ma + static Image *ReadPCXImage(const ImageInfo *image_info,ExceptionInfo *exception) + { + #define ThrowPCXException(severity,tag) \ +- { \ ++{ \ ++ if (scanline != (unsigned char *) NULL) \ + scanline=(unsigned char *) RelinquishMagickMemory(scanline); \ ++ if (pixel_info != (MemoryInfo *) NULL) \ + pixel_info=RelinquishVirtualMemory(pixel_info); \ +- ThrowReaderException(severity,tag); \ +- } ++ if (page_table != (MagickOffsetType *) NULL) \ ++ page_table=(MagickOffsetType *) RelinquishMagickMemory(page_table); \ ++ ThrowReaderException(severity,tag); \ ++} + + Image + *image; +@@ -281,6 +285,8 @@ static Image *ReadPCXImage(const ImageInfo *image_info + Determine if this a PCX file. + */ + page_table=(MagickOffsetType *) NULL; ++ scanline=(unsigned char *) NULL; ++ pixel_info=(MemoryInfo *) NULL; + if (LocaleCompare(image_info->magick,"DCX") == 0) + { + size_t +@@ -291,11 +297,11 @@ static Image *ReadPCXImage(const ImageInfo *image_info + */ + magic=ReadBlobLSBLong(image); + if (magic != 987654321) +- ThrowReaderException(CorruptImageError,"ImproperImageHeader"); ++ ThrowPCXException(CorruptImageError,"ImproperImageHeader"); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Wed May 31 09:10:35 2017 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 3CDEBAFB1B2; Wed, 31 May 2017 09:10:35 +0000 (UTC) (envelope-from kwm@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 170D170093; Wed, 31 May 2017 09:10:35 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4V9AYu4033147; Wed, 31 May 2017 09:10:34 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4V9AXv0033142; Wed, 31 May 2017 09:10:33 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201705310910.v4V9AXv0033142@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Wed, 31 May 2017 09:10:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442145 - in branches/2017Q2/graphics: ImageMagick7 ImageMagick7-nox11 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.23 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, 31 May 2017 09:10:35 -0000 Author: kwm Date: Wed May 31 09:10:33 2017 New Revision: 442145 URL: https://svnweb.freebsd.org/changeset/ports/442145 Log: This update contains a shared library bump, but this is not a problem since nothing in ports uses IM7 yet. MFH: r441080 r441596 r441987 Update ImageMagick7 to 7.0.5-6. PR: 216930 Update ImageMagick7 to 7.0.5-7. Update ImageMagick to 7.0.5-9. PR: 219627 Approved by: ports-secteam@ (feld@) Modified: branches/2017Q2/graphics/ImageMagick7-nox11/Makefile branches/2017Q2/graphics/ImageMagick7/Makefile branches/2017Q2/graphics/ImageMagick7/distinfo branches/2017Q2/graphics/ImageMagick7/pkg-plist Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/graphics/ImageMagick7-nox11/Makefile ============================================================================== --- branches/2017Q2/graphics/ImageMagick7-nox11/Makefile Wed May 31 09:02:11 2017 (r442144) +++ branches/2017Q2/graphics/ImageMagick7-nox11/Makefile Wed May 31 09:10:33 2017 (r442145) @@ -1,7 +1,7 @@ # Created by: mm@FreeBSD.org # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 # the SVG and PANGO plugins need X11 OPTIONS_EXCLUDE= X11 SVG PANGO Modified: branches/2017Q2/graphics/ImageMagick7/Makefile ============================================================================== --- branches/2017Q2/graphics/ImageMagick7/Makefile Wed May 31 09:02:11 2017 (r442144) +++ branches/2017Q2/graphics/ImageMagick7/Makefile Wed May 31 09:10:33 2017 (r442145) @@ -1,14 +1,12 @@ # $FreeBSD$ PORTNAME= ImageMagick -DISTVERSION= 7.0.3-7 -PORTREVISION= 1 +DISTVERSION= 7.0.5-9 CATEGORIES= graphics perl5 MASTER_SITES= http://www.imagemagick.org/download/ \ http://www.imagemagick.org/download/legacy/ \ http://servingzone.com/mirrors/ImageMagick/ \ http://mirror.checkdomain.de/imagemagick/ \ - http://image_magick.veidrodis.com/image_magick/ \ http://imagemagick.spd.co.il/ \ http://www.champground.com/imagemagick/ \ http://ftp.surfnet.nl/pub/ImageMagick/ \ Modified: branches/2017Q2/graphics/ImageMagick7/distinfo ============================================================================== --- branches/2017Q2/graphics/ImageMagick7/distinfo Wed May 31 09:02:11 2017 (r442144) +++ branches/2017Q2/graphics/ImageMagick7/distinfo Wed May 31 09:10:33 2017 (r442145) @@ -1,3 +1,3 @@ -TIMESTAMP = 1479675593 -SHA256 (ImageMagick-7.0.3-7.tar.xz) = 140b99f33a3326aed92132a7cd054ee962a6e2562064c68495640411aa4571d7 -SIZE (ImageMagick-7.0.3-7.tar.xz) = 8290176 +TIMESTAMP = 1496067866 +SHA256 (ImageMagick-7.0.5-9.tar.xz) = b774c3a69fea4432a120a8c0c231bd011710166c71a7b7e0fbb89b108d29ac6c +SIZE (ImageMagick-7.0.5-9.tar.xz) = 8269008 Modified: branches/2017Q2/graphics/ImageMagick7/pkg-plist ============================================================================== --- branches/2017Q2/graphics/ImageMagick7/pkg-plist Wed May 31 09:02:11 2017 (r442144) +++ branches/2017Q2/graphics/ImageMagick7/pkg-plist Wed May 31 09:10:33 2017 (r442145) @@ -299,6 +299,8 @@ lib/ImageMagick-%%PORTVERSION%%/config-%%QBIT%%%%HDRI% %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/pdf.so %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/pes.la %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/pes.so +%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/pgx.la +%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/pgx.so %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/pict.la %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/pict.so %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/pix.la @@ -412,13 +414,13 @@ lib/ImageMagick-%%PORTVERSION%%/config-%%QBIT%%%%HDRI% lib/libMagick++-7.a lib/libMagick++-7.la lib/libMagick++-7.so -lib/libMagick++-7.so.0 -lib/libMagick++-7.so.0.0.0 +lib/libMagick++-7.so.2 +lib/libMagick++-7.so.2.0.0 lib/libMagickCore-7.a lib/libMagickCore-7.la lib/libMagickCore-7.so -lib/libMagickCore-7.so.0 -lib/libMagickCore-7.so.0.0.0 +lib/libMagickCore-7.so.2 +lib/libMagickCore-7.so.2.0.0 lib/libMagickWand-7.a lib/libMagickWand-7.la lib/libMagickWand-7.so @@ -426,10 +428,8 @@ lib/libMagickWand-7.so.0 lib/libMagickWand-7.so.0.0.0 %%WITH_PERL%%%%SITE_ARCH%%/Image/Magick.pm %%WITH_PERL%%%%SITE_ARCH%%/Image/Magick/%%QBIT%%%%HDRI%%.pm -%%WITH_PERL%%%%SITE_ARCH%%/auto/Image/Magick/Magick.so %%WITH_PERL%%%%SITE_ARCH%%/auto/Image/Magick/%%QBIT%%%%HDRI%%/%%QBIT%%%%HDRI%%.so %%WITH_PERL%%%%SITE_ARCH%%/auto/Image/Magick/%%QBIT%%%%HDRI%%/autosplit.ix -%%WITH_PERL%%%%SITE_ARCH%%/auto/Image/Magick/autosplit.ix %%WITH_PERL%%%%PERL5_MAN3%%/Image::Magick.3.gz %%WITH_PERL%%%%PERL5_MAN3%%/Image::Magick::%%QBIT%%%%HDRI%%.3.gz libdata/pkgconfig/ImageMagick-7.pc @@ -1467,6 +1467,7 @@ man/man1/stream.1.gz %%PORTDOCS%%%%DOCSDIR%%-7/www/convert.html %%PORTDOCS%%%%DOCSDIR%%-7/www/css/README.txt %%PORTDOCS%%%%DOCSDIR%%-7/www/css/magick.css +%%PORTDOCS%%%%DOCSDIR%%-7/www/develop.html %%PORTDOCS%%%%DOCSDIR%%-7/www/display.html %%PORTDOCS%%%%DOCSDIR%%-7/www/distribute-pixel-cache.html %%PORTDOCS%%%%DOCSDIR%%-7/www/download.html @@ -1496,6 +1497,7 @@ man/man1/stream.1.gz %%PORTDOCS%%%%DOCSDIR%%-7/www/magick-wand.html %%PORTDOCS%%%%DOCSDIR%%-7/www/magick.html %%PORTDOCS%%%%DOCSDIR%%-7/www/miff.html +%%PORTDOCS%%%%DOCSDIR%%-7/www/mirror.html %%PORTDOCS%%%%DOCSDIR%%-7/www/mogrify.html %%PORTDOCS%%%%DOCSDIR%%-7/www/montage.html %%PORTDOCS%%%%DOCSDIR%%-7/www/motion-picture.html @@ -1532,7 +1534,6 @@ man/man1/stream.1.gz %%PORTDOCS%%%%DOCSDIR%%-7/www/source/type-windows.xml %%PORTDOCS%%%%DOCSDIR%%-7/www/source/type.xml %%PORTDOCS%%%%DOCSDIR%%-7/www/source/wand.c -%%PORTDOCS%%%%DOCSDIR%%-7/www/sponsors.html %%PORTDOCS%%%%DOCSDIR%%-7/www/stream.html %%PORTDOCS%%%%DOCSDIR%%-7/www/subversion.html %%PORTDOCS%%%%DOCSDIR%%-7/www/support.html From owner-svn-ports-branches@freebsd.org Wed May 31 11:46:46 2017 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 B2E04AFE785; Wed, 31 May 2017 11:46:46 +0000 (UTC) (envelope-from sunpoet@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 7D1D77513A; Wed, 31 May 2017 11:46:46 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4VBkjQs098967; Wed, 31 May 2017 11:46:45 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4VBkjIC098965; Wed, 31 May 2017 11:46:45 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201705311146.v4VBkjIC098965@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Wed, 31 May 2017 11:46:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442152 - branches/2017Q2/graphics/imageworsener 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.23 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, 31 May 2017 11:46:46 -0000 Author: sunpoet Date: Wed May 31 11:46:45 2017 New Revision: 442152 URL: https://svnweb.freebsd.org/changeset/ports/442152 Log: MFH: r439473 Update to 1.3.1 Changes: https://github.com/jsummers/imageworsener/blob/master/changelog.txt Approved by: ports-secteam Modified: branches/2017Q2/graphics/imageworsener/Makefile branches/2017Q2/graphics/imageworsener/pkg-plist Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/graphics/imageworsener/Makefile ============================================================================== --- branches/2017Q2/graphics/imageworsener/Makefile Wed May 31 11:44:51 2017 (r442151) +++ branches/2017Q2/graphics/imageworsener/Makefile Wed May 31 11:46:45 2017 (r442152) @@ -23,6 +23,8 @@ INSTALL_TARGET= install-strip USE_LDCONFIG= yes USES= libtool +PLIST_SUB= PORTVERSION=${PORTVERSION} + JPEG_CONFIGURE_WITH= jpeg JPEG_USES= jpeg PNG_CONFIGURE_WITH= png Modified: branches/2017Q2/graphics/imageworsener/pkg-plist ============================================================================== --- branches/2017Q2/graphics/imageworsener/pkg-plist Wed May 31 11:44:51 2017 (r442151) +++ branches/2017Q2/graphics/imageworsener/pkg-plist Wed May 31 11:46:45 2017 (r442152) @@ -1,5 +1,5 @@ bin/imagew include/imagew.h -lib/libimageworsener-1.2.0.so +lib/libimageworsener-%%PORTVERSION%%.so lib/libimageworsener.a lib/libimageworsener.so From owner-svn-ports-branches@freebsd.org Wed May 31 14:38:01 2017 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 33E89B7B906; Wed, 31 May 2017 14:38:01 +0000 (UTC) (envelope-from feld@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 042777CD20; Wed, 31 May 2017 14:38:00 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4VEc0cM073924; Wed, 31 May 2017 14:38:00 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4VEc0Sn073922; Wed, 31 May 2017 14:38:00 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201705311438.v4VEc0Sn073922@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Wed, 31 May 2017 14:38:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442186 - branches/2017Q2/devel/ruby-gems 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.23 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, 31 May 2017 14:38:01 -0000 Author: feld Date: Wed May 31 14:37:59 2017 New Revision: 442186 URL: https://svnweb.freebsd.org/changeset/ports/442186 Log: MFH: r439892 Update to 2.6.12 Changes: https://github.com/rubygems/rubygems/blob/master/History.txt Approved by: ports-secteam (with hat) Modified: branches/2017Q2/devel/ruby-gems/Makefile branches/2017Q2/devel/ruby-gems/distinfo Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/devel/ruby-gems/Makefile ============================================================================== --- branches/2017Q2/devel/ruby-gems/Makefile Wed May 31 14:36:02 2017 (r442185) +++ branches/2017Q2/devel/ruby-gems/Makefile Wed May 31 14:37:59 2017 (r442186) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gems -PORTVERSION= 2.6.11 +PORTVERSION= 2.6.12 CATEGORIES= devel ruby MASTER_SITES= http://production.cf.rubygems.org/rubygems/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} Modified: branches/2017Q2/devel/ruby-gems/distinfo ============================================================================== --- branches/2017Q2/devel/ruby-gems/distinfo Wed May 31 14:36:02 2017 (r442185) +++ branches/2017Q2/devel/ruby-gems/distinfo Wed May 31 14:37:59 2017 (r442186) @@ -1,3 +1,3 @@ -TIMESTAMP = 1489765786 -SHA256 (ruby/rubygems-2.6.11.tgz) = aebec768c9010c97830d5ee7f55fa068ea470327fa073a1044f63cd4a341ae55 -SIZE (ruby/rubygems-2.6.11.tgz) = 766785 +TIMESTAMP = 1493631786 +SHA256 (ruby/rubygems-2.6.12.tgz) = 37b745cc1f957170cff4f698f473531e607827b1a6407d12c55c338257990d8d +SIZE (ruby/rubygems-2.6.12.tgz) = 767895 From owner-svn-ports-branches@freebsd.org Wed May 31 14:38:47 2017 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 EFA91B7B943; Wed, 31 May 2017 14:38:47 +0000 (UTC) (envelope-from feld@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 BF5127CDF1; Wed, 31 May 2017 14:38:47 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4VEck0E074133; Wed, 31 May 2017 14:38:46 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4VEckFb074130; Wed, 31 May 2017 14:38:46 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201705311438.v4VEckFb074130@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Wed, 31 May 2017 14:38:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442187 - in branches/2017Q2/lang: ruby22 ruby23 ruby24 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.23 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, 31 May 2017 14:38:48 -0000 Author: feld Date: Wed May 31 14:38:46 2017 New Revision: 442187 URL: https://svnweb.freebsd.org/changeset/ports/442187 Log: MFH: r439900 Always use latest doxygen Approved by: ports-secteam (with hat) Modified: branches/2017Q2/lang/ruby22/Makefile branches/2017Q2/lang/ruby23/Makefile branches/2017Q2/lang/ruby24/Makefile Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/lang/ruby22/Makefile ============================================================================== --- branches/2017Q2/lang/ruby22/Makefile Wed May 31 14:37:59 2017 (r442186) +++ branches/2017Q2/lang/ruby22/Makefile Wed May 31 14:38:46 2017 (r442187) @@ -57,7 +57,7 @@ RDOC_DESC= Build and install Rdoc indexes EDIT_DESC= Which line editing lib to use LIBEDIT_DESC= Use libedit READLINE_DESC= Use libreadline -CAPIDOCS_BUILD_DEPENDS= doxygen>=1.8.12,2:devel/doxygen \ +CAPIDOCS_BUILD_DEPENDS= doxygen>=1.8.13,2:devel/doxygen \ dot:graphics/graphviz CAPIDOCS_CONFIGURE_ENABLE= install-capi GMP_CONFIGURE_WITH= gmp Modified: branches/2017Q2/lang/ruby23/Makefile ============================================================================== --- branches/2017Q2/lang/ruby23/Makefile Wed May 31 14:37:59 2017 (r442186) +++ branches/2017Q2/lang/ruby23/Makefile Wed May 31 14:38:46 2017 (r442187) @@ -55,7 +55,7 @@ RDOC_DESC= Build and install Rdoc indexes EDIT_DESC= Which line editing lib to use LIBEDIT_DESC= Use libedit READLINE_DESC= Use libreadline -CAPIDOCS_BUILD_DEPENDS= doxygen>=1.8.12,2:devel/doxygen \ +CAPIDOCS_BUILD_DEPENDS= doxygen>=1.8.13,2:devel/doxygen \ dot:graphics/graphviz CAPIDOCS_CONFIGURE_ENABLE= install-capi GMP_CONFIGURE_WITH= gmp Modified: branches/2017Q2/lang/ruby24/Makefile ============================================================================== --- branches/2017Q2/lang/ruby24/Makefile Wed May 31 14:37:59 2017 (r442186) +++ branches/2017Q2/lang/ruby24/Makefile Wed May 31 14:38:46 2017 (r442187) @@ -59,7 +59,7 @@ RDOC_DESC= Build and install Rdoc indexes EDIT_DESC= Which line editing lib to use LIBEDIT_DESC= Use libedit READLINE_DESC= Use libreadline -CAPIDOCS_BUILD_DEPENDS= doxygen>=1.8.12,2:devel/doxygen \ +CAPIDOCS_BUILD_DEPENDS= doxygen>=1.8.13,2:devel/doxygen \ dot:graphics/graphviz CAPIDOCS_CONFIGURE_ENABLE= install-capi GMP_CONFIGURE_WITH= gmp From owner-svn-ports-branches@freebsd.org Wed May 31 15:16:50 2017 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 5B580B7CA4B; Wed, 31 May 2017 15:16:50 +0000 (UTC) (envelope-from feld@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 11D947FBA4; Wed, 31 May 2017 15:16:50 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4VFGnKG094228; Wed, 31 May 2017 15:16:49 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4VFGnPo094226; Wed, 31 May 2017 15:16:49 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201705311516.v4VFGnPo094226@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Wed, 31 May 2017 15:16:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442217 - in branches/2017Q2: devel/git www/mediawiki123 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.23 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, 31 May 2017 15:16:50 -0000 Author: feld Date: Wed May 31 15:16:48 2017 New Revision: 442217 URL: https://svnweb.freebsd.org/changeset/ports/442217 Log: MFH: r439139 - Fix shebangs Approved by: ports-secteam (with hat) Modified: branches/2017Q2/devel/git/Makefile branches/2017Q2/www/mediawiki123/Makefile Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/devel/git/Makefile ============================================================================== --- branches/2017Q2/devel/git/Makefile Wed May 31 15:10:25 2017 (r442216) +++ branches/2017Q2/devel/git/Makefile Wed May 31 15:16:48 2017 (r442217) @@ -3,6 +3,7 @@ PORTNAME= git DISTVERSION= 2.12.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= KERNEL_ORG/software/scm/git DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -32,7 +33,15 @@ MAKE_ENV+= V=1 USE_RC_SUBR= git_daemon SHEBANG_FILES= *.perl */*.perl */*/*.perl */*.pl */*/*.pl */*/*/*.pl \ t/*/*/pre t/*/*/post t/Git-SVN/Utils/*.t \ + git-p4.py \ + contrib/hg-to-git/hg-to-git.py \ contrib/hooks/update-paranoid \ + contrib/hooks/multimail/post-receive.example \ + contrib/hooks/multimail/git_multimail.py \ + contrib/hooks/multimail/migrate-mailhook-config \ + contrib/fast-import/import-zips.py \ + contrib/remote-helpers/git-remote-bzr \ + contrib/remote-helpers/git-remote-hg \ contrib/credential/netrc/git-credential-netrc \ contrib/diff-highlight/diff-highlight \ contrib/buildsystems/generate contrib/contacts/git-contacts \ Modified: branches/2017Q2/www/mediawiki123/Makefile ============================================================================== --- branches/2017Q2/www/mediawiki123/Makefile Wed May 31 15:10:25 2017 (r442216) +++ branches/2017Q2/www/mediawiki123/Makefile Wed May 31 15:16:48 2017 (r442217) @@ -3,6 +3,7 @@ PORTNAME= mediawiki PORTVERSION= 1.23.17 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://releases.wikimedia.org/mediawiki/${PORTVERSION:R}/ PKGNAMESUFFIX= 123 @@ -14,9 +15,10 @@ LICENSE= GPLv2 CONFLICTS= mediawiki12[678]-[0-9]* -USES= shebangfix +USES= python:run shebangfix SHEBANG_FILES= maintenance/dev/*.sh \ - maintenance/hiphop/run-server + maintenance/hiphop/run-server \ + maintenance/language/zhtable/Makefile.py SHEBANG_LANG= hhvm hhvm_OLD_CMD= /usr/bin/hhvm hhvm_CMD= ${LOCALBASE}/bin/hhvm # not installed by anything yet From owner-svn-ports-branches@freebsd.org Wed May 31 15:17:45 2017 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 2032FB7CA95; Wed, 31 May 2017 15:17:45 +0000 (UTC) (envelope-from feld@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 EF4C47FC95; Wed, 31 May 2017 15:17:44 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4VFHigB094443; Wed, 31 May 2017 15:17:44 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4VFHhXQ094439; Wed, 31 May 2017 15:17:43 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201705311517.v4VFHhXQ094439@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Wed, 31 May 2017 15:17:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442218 - branches/2017Q2/devel/git 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.23 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, 31 May 2017 15:17:45 -0000 Author: feld Date: Wed May 31 15:17:43 2017 New Revision: 442218 URL: https://svnweb.freebsd.org/changeset/ports/442218 Log: MFH: r440558 devel/git: Update to 2.13.0 Security: CVE-2017-8386 Sponsored by: Rubicon Communications (Netgate) Approved by: ports-secteam (with hat) Modified: branches/2017Q2/devel/git/Makefile branches/2017Q2/devel/git/distinfo branches/2017Q2/devel/git/pkg-plist Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/devel/git/Makefile ============================================================================== --- branches/2017Q2/devel/git/Makefile Wed May 31 15:16:48 2017 (r442217) +++ branches/2017Q2/devel/git/Makefile Wed May 31 15:17:43 2017 (r442218) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= git -DISTVERSION= 2.12.1 -PORTREVISION= 1 +DISTVERSION= 2.13.0 CATEGORIES= devel MASTER_SITES= KERNEL_ORG/software/scm/git DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ Modified: branches/2017Q2/devel/git/distinfo ============================================================================== --- branches/2017Q2/devel/git/distinfo Wed May 31 15:16:48 2017 (r442217) +++ branches/2017Q2/devel/git/distinfo Wed May 31 15:17:43 2017 (r442218) @@ -1,7 +1,7 @@ -TIMESTAMP = 1490090877 -SHA256 (git-2.12.1.tar.xz) = db11674364b764e101966d829a2e271c9b9d2a8bd4d8ecb4221a1dcdc9a3ada2 -SIZE (git-2.12.1.tar.xz) = 4271828 -SHA256 (git-manpages-2.12.1.tar.xz) = fbf5c34dde4385b04a0266444cda6834a97e6a589fc0a510c220da87f3d2a0ce -SIZE (git-manpages-2.12.1.tar.xz) = 402644 -SHA256 (git-htmldocs-2.12.1.tar.xz) = 10598f2f2693e066b58e8d269c3d682595a99340f29e8e7a66dda5e226fd181e -SIZE (git-htmldocs-2.12.1.tar.xz) = 1091792 +TIMESTAMP = 1494416223 +SHA256 (git-2.13.0.tar.xz) = 4bbf2ab6f2341253a38f95306ec7936833eb1c42572da5c1fa61f0abb2191258 +SIZE (git-2.13.0.tar.xz) = 4744388 +SHA256 (git-manpages-2.13.0.tar.xz) = 8414f9c62e2b099cd0ea2ca22c55fb6538b13fc7a3ed1508fb9881aae42a97c9 +SIZE (git-manpages-2.13.0.tar.xz) = 407460 +SHA256 (git-htmldocs-2.13.0.tar.xz) = d5ddfb8eedd5a53c0e46e183ed1513dbdd4f5d5e7ef6624040ba0b7381221e3a +SIZE (git-htmldocs-2.13.0.tar.xz) = 1107480 Modified: branches/2017Q2/devel/git/pkg-plist ============================================================================== --- branches/2017Q2/devel/git/pkg-plist Wed May 31 15:16:48 2017 (r442217) +++ branches/2017Q2/devel/git/pkg-plist Wed May 31 15:17:43 2017 (r442218) @@ -129,6 +129,7 @@ libexec/git-core/git-quiltimport libexec/git-core/git-read-tree libexec/git-core/git-rebase libexec/git-core/git-rebase--am +libexec/git-core/git-rebase--helper libexec/git-core/git-rebase--interactive libexec/git-core/git-rebase--merge libexec/git-core/git-receive-pack @@ -627,8 +628,12 @@ man/man7/gitworkflows.7.gz %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.10.3.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.11.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.11.1.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.11.2.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.12.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.12.1.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.12.2.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.12.3.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.13.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.txt @@ -648,6 +653,7 @@ man/man7/gitworkflows.7.gz %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.10.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.11.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.12.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.2.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.3.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.4.txt @@ -662,6 +668,7 @@ man/man7/gitworkflows.7.gz %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.5.3.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.5.4.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.5.5.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.5.6.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.6.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.6.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.6.2.txt @@ -669,16 +676,19 @@ man/man7/gitworkflows.7.gz %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.6.4.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.6.5.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.6.6.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.6.7.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.7.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.7.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.7.2.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.7.3.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.7.4.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.7.5.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.8.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.8.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.8.2.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.8.3.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.8.4.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.8.5.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.9.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.9.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.9.2.txt @@ -1130,6 +1140,8 @@ man/man7/gitworkflows.7.gz %%HTMLDOCS%%%%DOCSDIR%%/technical/api-merge.txt %%HTMLDOCS%%%%DOCSDIR%%/technical/api-object-access.html %%HTMLDOCS%%%%DOCSDIR%%/technical/api-object-access.txt +%%HTMLDOCS%%%%DOCSDIR%%/technical/api-oid-array.html +%%HTMLDOCS%%%%DOCSDIR%%/technical/api-oid-array.txt %%HTMLDOCS%%%%DOCSDIR%%/technical/api-parse-options.html %%HTMLDOCS%%%%DOCSDIR%%/technical/api-parse-options.txt %%HTMLDOCS%%%%DOCSDIR%%/technical/api-quote.html @@ -1144,8 +1156,6 @@ man/man7/gitworkflows.7.gz %%HTMLDOCS%%%%DOCSDIR%%/technical/api-run-command.txt %%HTMLDOCS%%%%DOCSDIR%%/technical/api-setup.html %%HTMLDOCS%%%%DOCSDIR%%/technical/api-setup.txt -%%HTMLDOCS%%%%DOCSDIR%%/technical/api-sha1-array.html -%%HTMLDOCS%%%%DOCSDIR%%/technical/api-sha1-array.txt %%HTMLDOCS%%%%DOCSDIR%%/technical/api-sigchain.html %%HTMLDOCS%%%%DOCSDIR%%/technical/api-sigchain.txt %%HTMLDOCS%%%%DOCSDIR%%/technical/api-string-list.html From owner-svn-ports-branches@freebsd.org Wed May 31 15:18:39 2017 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 5D346B7CAD8; Wed, 31 May 2017 15:18:39 +0000 (UTC) (envelope-from feld@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 2D81B7FEF5; Wed, 31 May 2017 15:18:39 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4VFIcQE094643; Wed, 31 May 2017 15:18:38 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4VFIc4F094640; Wed, 31 May 2017 15:18:38 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201705311518.v4VFIc4F094640@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Wed, 31 May 2017 15:18:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442219 - branches/2017Q2/devel/git-cinnabar 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.23 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, 31 May 2017 15:18:39 -0000 Author: feld Date: Wed May 31 15:18:38 2017 New Revision: 442219 URL: https://svnweb.freebsd.org/changeset/ports/442219 Log: MFH: r440564 devel/git-cinnabar: update to 0.4.0.13 to unbreak with git 2.13 ../cinnabar-helper.c:859:4: warning: implicit declaration of function 'sha1_array_append' is invalid in C99 [-Wimplicit-function-declaration] sha1_array_append(array, sha1); ^ ../cinnabar-helper.c:866:20: error: variable has incomplete type 'struct sha1_array' struct sha1_array nodes = SHA1_ARRAY_INIT; ^ Changes: https://github.com/glandium/git-cinnabar/compare/cd0e1bb...a93db61 Approved by: ports-secteam (with hat) Modified: branches/2017Q2/devel/git-cinnabar/Makefile branches/2017Q2/devel/git-cinnabar/distinfo Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/devel/git-cinnabar/Makefile ============================================================================== --- branches/2017Q2/devel/git-cinnabar/Makefile Wed May 31 15:17:43 2017 (r442218) +++ branches/2017Q2/devel/git-cinnabar/Makefile Wed May 31 15:18:38 2017 (r442219) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= git-cinnabar -DISTVERSION= 0.4.0-5 -DISTVERSIONSUFFIX= -gb07881f +DISTVERSION= 0.4.0-13 +DISTVERSIONSUFFIX= -ga93db61 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org Modified: branches/2017Q2/devel/git-cinnabar/distinfo ============================================================================== --- branches/2017Q2/devel/git-cinnabar/distinfo Wed May 31 15:17:43 2017 (r442218) +++ branches/2017Q2/devel/git-cinnabar/distinfo Wed May 31 15:18:38 2017 (r442219) @@ -1,3 +1,3 @@ -TIMESTAMP = 1488356456 -SHA256 (glandium-git-cinnabar-0.4.0-5-gb07881f_GH0.tar.gz) = 8e08a6795ca8fe22666c5e5b3fd1410d2d90256a4130e1590f5b2c67d07e5f58 -SIZE (glandium-git-cinnabar-0.4.0-5-gb07881f_GH0.tar.gz) = 90682 +TIMESTAMP = 1494425108 +SHA256 (glandium-git-cinnabar-0.4.0-13-ga93db61_GH0.tar.gz) = b9411b30ce5288d1a91b060c8afd4976668fd999f9b86bbbea9693014c5106b2 +SIZE (glandium-git-cinnabar-0.4.0-13-ga93db61_GH0.tar.gz) = 91138 From owner-svn-ports-branches@freebsd.org Wed May 31 20:49:16 2017 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 964B6B9446E; Wed, 31 May 2017 20:49:16 +0000 (UTC) (envelope-from feld@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 6B1B167C17; Wed, 31 May 2017 20:49:16 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4VKnFWa036219; Wed, 31 May 2017 20:49:15 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4VKnFWY036215; Wed, 31 May 2017 20:49:15 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201705312049.v4VKnFWY036215@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Wed, 31 May 2017 20:49:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442266 - in branches/2017Q2/security/sudo: . 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.23 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, 31 May 2017 20:49:16 -0000 Author: feld Date: Wed May 31 20:49:14 2017 New Revision: 442266 URL: https://svnweb.freebsd.org/changeset/ports/442266 Log: Update to 1.8.20p1 This release fixes a potential security issue that may allow a user to bypass the "tty_ticket" constraints or overwrite an arbitrary file. The issue is reported to only be present on Linux systems but I don't think it hurts to update the FreeBSD port at this time. Approved by: ports-secteam (with hat) Deleted: branches/2017Q2/security/sudo/files/patch-lib__util__strtoid.c Modified: branches/2017Q2/security/sudo/Makefile branches/2017Q2/security/sudo/distinfo branches/2017Q2/security/sudo/files/patch-install-sh branches/2017Q2/security/sudo/files/patch-plugins__sudoers__sudoers.in branches/2017Q2/security/sudo/pkg-plist Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/security/sudo/Makefile ============================================================================== --- branches/2017Q2/security/sudo/Makefile Wed May 31 20:48:06 2017 (r442265) +++ branches/2017Q2/security/sudo/Makefile Wed May 31 20:49:14 2017 (r442266) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sudo -PORTVERSION= 1.8.19p2 +PORTVERSION= 1.8.20p1 CATEGORIES= security MASTER_SITES= SUDO Modified: branches/2017Q2/security/sudo/distinfo ============================================================================== --- branches/2017Q2/security/sudo/distinfo Wed May 31 20:48:06 2017 (r442265) +++ branches/2017Q2/security/sudo/distinfo Wed May 31 20:49:14 2017 (r442266) @@ -1,3 +1,3 @@ -TIMESTAMP = 1484415267 -SHA256 (sudo-1.8.19p2.tar.gz) = 237e18e67c2ad59ecacfa4b7707198b09fcf84914621585a9bc670dcc31a52e0 -SIZE (sudo-1.8.19p2.tar.gz) = 2861855 +TIMESTAMP = 1496171509 +SHA256 (sudo-1.8.20p1.tar.gz) = 9e980eb23a60dd11f0f452e672e705d7a386882bc230c6e8483050e03182db1d +SIZE (sudo-1.8.20p1.tar.gz) = 2930394 Modified: branches/2017Q2/security/sudo/files/patch-install-sh ============================================================================== --- branches/2017Q2/security/sudo/files/patch-install-sh Wed May 31 20:48:06 2017 (r442265) +++ branches/2017Q2/security/sudo/files/patch-install-sh Wed May 31 20:49:14 2017 (r442266) @@ -1,4 +1,4 @@ ---- install-sh.orig 2015-07-15 18:38:05 UTC +--- install-sh.orig 2017-01-14 04:30:15 UTC +++ install-sh @@ -171,12 +171,6 @@ if ${DIRMODE} ; then if [ ! -d "${DEST}" ] ; then @@ -13,16 +13,16 @@ if ${CHMODIT} ; then ${CHMOD} "${MODE}" "${DEST}" || exit 1 fi -@@ -227,12 +221,6 @@ fi +@@ -226,12 +220,6 @@ fi + ## Strip and set the owner/mode. if ${STRIPIT} ; then ${STRIP} "${DEST}" || exit 1 - fi +-fi -if ${CHOWNIT} ; then - ${CHOWN} "${OWNER}" "${DEST}" || exit 1 -fi -if ${CHGROUPIT} ; then - ${CHGRP} "${GROUP}" "${DEST}" || exit 1 --fi + fi if ${CHMODIT} ; then ${CHMOD} "${MODE}" "${DEST}" || exit 1 - fi Modified: branches/2017Q2/security/sudo/files/patch-plugins__sudoers__sudoers.in ============================================================================== --- branches/2017Q2/security/sudo/files/patch-plugins__sudoers__sudoers.in Wed May 31 20:48:06 2017 (r442265) +++ branches/2017Q2/security/sudo/files/patch-plugins__sudoers__sudoers.in Wed May 31 20:49:14 2017 (r442266) @@ -1,4 +1,4 @@ ---- plugins/sudoers/sudoers.in.orig 2015-07-15 18:44:07 UTC +--- plugins/sudoers/sudoers.in.orig 2017-01-14 04:30:15 UTC +++ plugins/sudoers/sudoers.in @@ -32,6 +32,14 @@ ## Modified: branches/2017Q2/security/sudo/pkg-plist ============================================================================== --- branches/2017Q2/security/sudo/pkg-plist Wed May 31 20:48:06 2017 (r442265) +++ branches/2017Q2/security/sudo/pkg-plist Wed May 31 20:49:14 2017 (r442266) @@ -1,6 +1,7 @@ bin/sudo bin/sudoedit bin/sudoreplay +etc/sudoers.dist @sample etc/sudoers.sample @sample etc/pam.d/sudo.default etc/pam.d/sudo include/sudo_plugin.h From owner-svn-ports-branches@freebsd.org Thu Jun 1 10:45:25 2017 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 0FA24AF9BCC; Thu, 1 Jun 2017 10:45:25 +0000 (UTC) (envelope-from pi@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 D274274F59; Thu, 1 Jun 2017 10:45:24 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v51AjORE079814; Thu, 1 Jun 2017 10:45:24 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v51AjN0V079812; Thu, 1 Jun 2017 10:45:23 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201706011045.v51AjN0V079812@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Thu, 1 Jun 2017 10:45:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442279 - branches/2017Q2/devel/p5-File-Path 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.23 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, 01 Jun 2017 10:45:25 -0000 Author: pi Date: Thu Jun 1 10:45:23 2017 New Revision: 442279 URL: https://svnweb.freebsd.org/changeset/ports/442279 Log: devel/p5-File-Path: update 2.12 -> 2.13 - See also: https://rt.cpan.org/Ticket/Display.html?id=121951 MFH: r442273 Reported by: James E Keenan Changes: http://cpansearch.perl.org/src/JKEENAN/File-Path-2.13/Changes Security: CVE-2017-6512 Approved by: portmgr (miwi) Modified: branches/2017Q2/devel/p5-File-Path/Makefile branches/2017Q2/devel/p5-File-Path/distinfo Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/devel/p5-File-Path/Makefile ============================================================================== --- branches/2017Q2/devel/p5-File-Path/Makefile Thu Jun 1 09:01:21 2017 (r442278) +++ branches/2017Q2/devel/p5-File-Path/Makefile Thu Jun 1 10:45:23 2017 (r442279) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= File-Path -PORTVERSION= 2.12 +PORTVERSION= 2.13 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- Modified: branches/2017Q2/devel/p5-File-Path/distinfo ============================================================================== --- branches/2017Q2/devel/p5-File-Path/distinfo Thu Jun 1 09:01:21 2017 (r442278) +++ branches/2017Q2/devel/p5-File-Path/distinfo Thu Jun 1 10:45:23 2017 (r442279) @@ -1,2 +1,3 @@ -SHA256 (File-Path-2.12.tar.gz) = bbf61a0d37c135c694e80f4ea344932bdc5474c213025ae307ea52cb6886d17e -SIZE (File-Path-2.12.tar.gz) = 27469 +TIMESTAMP = 1496287160 +SHA256 (File-Path-2.13.tar.gz) = 926339064554d2adbdbdea56aef8af8df1e97d49a12389688bb52d5622602f0d +SIZE (File-Path-2.13.tar.gz) = 31094 From owner-svn-ports-branches@freebsd.org Thu Jun 1 14:03:41 2017 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 25F33AFDAED; Thu, 1 Jun 2017 14:03:41 +0000 (UTC) (envelope-from zi@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 F410B7AE9D; Thu, 1 Jun 2017 14:03:40 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v51E3eM6061730; Thu, 1 Jun 2017 14:03:40 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v51E3dw5061727; Thu, 1 Jun 2017 14:03:39 GMT (envelope-from zi@FreeBSD.org) Message-Id: <201706011403.v51E3dw5061727@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Thu, 1 Jun 2017 14:03:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442288 - branches/2017Q2/net/freeradius3 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.23 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, 01 Jun 2017 14:03:41 -0000 Author: zi Date: Thu Jun 1 14:03:39 2017 New Revision: 442288 URL: https://svnweb.freebsd.org/changeset/ports/442288 Log: MFH: r442287 - Update to 3.0.14 PR: 219662 Requested by: ohartmann@walstatt.org Security: 673dce46-46d0-11e7-a539-0050569f7e80 Approved by: ports-secteam (with hat) Modified: branches/2017Q2/net/freeradius3/Makefile branches/2017Q2/net/freeradius3/distinfo branches/2017Q2/net/freeradius3/pkg-plist Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/net/freeradius3/Makefile ============================================================================== --- branches/2017Q2/net/freeradius3/Makefile Thu Jun 1 14:02:30 2017 (r442287) +++ branches/2017Q2/net/freeradius3/Makefile Thu Jun 1 14:03:39 2017 (r442288) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= freeradius -DISTVERSION= 3.0.13 +DISTVERSION= 3.0.14 CATEGORIES= net MASTER_SITES= ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \ ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \ Modified: branches/2017Q2/net/freeradius3/distinfo ============================================================================== --- branches/2017Q2/net/freeradius3/distinfo Thu Jun 1 14:02:30 2017 (r442287) +++ branches/2017Q2/net/freeradius3/distinfo Thu Jun 1 14:03:39 2017 (r442288) @@ -1,3 +1,3 @@ -TIMESTAMP = 1490100918 -SHA256 (freeradius-server-3.0.13.tar.bz2) = b3be0d8849878c31af0a5375d20b7b20c9d1c1572e89dc3f22992824cefffb84 -SIZE (freeradius-server-3.0.13.tar.bz2) = 3031744 +TIMESTAMP = 1496324608 +SHA256 (freeradius-server-3.0.14.tar.bz2) = 2771f6ecd6c816ac4d52b66bb8ae6781ca20e1e4984c5804fc4e67de3a807c59 +SIZE (freeradius-server-3.0.14.tar.bz2) = 3037721 Modified: branches/2017Q2/net/freeradius3/pkg-plist ============================================================================== --- branches/2017Q2/net/freeradius3/pkg-plist Thu Jun 1 14:02:30 2017 (r442287) +++ branches/2017Q2/net/freeradius3/pkg-plist Thu Jun 1 14:03:39 2017 (r442288) @@ -551,6 +551,7 @@ sbin/radmin %%EXAMPLESDIR%%/raddb/mods-available/mac2ip %%EXAMPLESDIR%%/raddb/mods-available/mac2vlan %%EXAMPLESDIR%%/raddb/mods-available/mschap +%%EXAMPLESDIR%%/raddb/mods-available/moonshot-targeted-ids %%EXAMPLESDIR%%/raddb/mods-available/ntlm_auth %%EXAMPLESDIR%%/raddb/mods-available/opendirectory %%EXAMPLESDIR%%/raddb/mods-available/otp @@ -647,6 +648,12 @@ sbin/radmin %%EXAMPLESDIR%%/raddb/mods-config/sql/main/postgresql/setup.sql %%EXAMPLESDIR%%/raddb/mods-config/sql/main/sqlite/queries.conf %%EXAMPLESDIR%%/raddb/mods-config/sql/main/sqlite/schema.sql +%%EXAMPLESDIR%%/raddb/mods-config/sql/moonshot-targeted-ids/mysql/queries.conf +%%EXAMPLESDIR%%/raddb/mods-config/sql/moonshot-targeted-ids/mysql/schema.sql +%%EXAMPLESDIR%%/raddb/mods-config/sql/moonshot-targeted-ids/postgresql/queries.conf +%%EXAMPLESDIR%%/raddb/mods-config/sql/moonshot-targeted-ids/postgresql/schema.sql +%%EXAMPLESDIR%%/raddb/mods-config/sql/moonshot-targeted-ids/sqlite/queries.conf +%%EXAMPLESDIR%%/raddb/mods-config/sql/moonshot-targeted-ids/sqlite/schema.sql %%EXAMPLESDIR%%/raddb/mods-config/unbound/default.conf %%EXAMPLESDIR%%/raddb/mods-enabled/always %%EXAMPLESDIR%%/raddb/mods-enabled/attr_filter @@ -781,6 +788,7 @@ sbin/radmin %%DATADIR%%/dictionary.compatible %%DATADIR%%/dictionary.cosine %%DATADIR%%/dictionary.dante +%%DATADIR%%/dictionary.dellemc %%DATADIR%%/dictionary.dhcp %%DATADIR%%/dictionary.digium %%DATADIR%%/dictionary.dlink From owner-svn-ports-branches@freebsd.org Thu Jun 1 15:28:49 2017 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 C1EC4AFF6C7; Thu, 1 Jun 2017 15:28:49 +0000 (UTC) (envelope-from zi@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 921447E972; Thu, 1 Jun 2017 15:28:49 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v51FSmcJ095998; Thu, 1 Jun 2017 15:28:48 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v51FSmKL095996; Thu, 1 Jun 2017 15:28:48 GMT (envelope-from zi@FreeBSD.org) Message-Id: <201706011528.v51FSmKL095996@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Thu, 1 Jun 2017 15:28:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442297 - branches/2017Q2/security/duo 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.23 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, 01 Jun 2017 15:28:49 -0000 Author: zi Date: Thu Jun 1 15:28:48 2017 New Revision: 442297 URL: https://svnweb.freebsd.org/changeset/ports/442297 Log: MFH: r442296 - Update to 1.9.21 Security: 738e8ae1-46dd-11e7-a539-0050569f7e80 Approved by: ports-secteam (with hat) Modified: branches/2017Q2/security/duo/Makefile branches/2017Q2/security/duo/distinfo Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/security/duo/Makefile ============================================================================== --- branches/2017Q2/security/duo/Makefile Thu Jun 1 15:28:03 2017 (r442296) +++ branches/2017Q2/security/duo/Makefile Thu Jun 1 15:28:48 2017 (r442297) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= duo -PORTVERSION= 1.9.20 +PORTVERSION= 1.9.21 CATEGORIES= security MASTER_SITES= https://dl.duosecurity.com/ \ http://mirrors.rit.edu/zi/ Modified: branches/2017Q2/security/duo/distinfo ============================================================================== --- branches/2017Q2/security/duo/distinfo Thu Jun 1 15:28:03 2017 (r442296) +++ branches/2017Q2/security/duo/distinfo Thu Jun 1 15:28:48 2017 (r442297) @@ -1,3 +1,3 @@ -TIMESTAMP = 1493852286 -SHA256 (duo_unix-1.9.20.tar.gz) = 1297ddfa62fa6f8ae9589cbe9bd0bc337d0ad6d8b2fbf2f09268a2f856bbb97f -SIZE (duo_unix-1.9.20.tar.gz) = 470354 +TIMESTAMP = 1496330220 +SHA256 (duo_unix-1.9.21.tar.gz) = 582ea3b533dea7b95c9be24c2be2e879288e2f315f956228d504b9a9315c8b50 +SIZE (duo_unix-1.9.21.tar.gz) = 470168 From owner-svn-ports-branches@freebsd.org Sat Jun 3 19:26:13 2017 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 C37C3BF7C8A; Sat, 3 Jun 2017 19:26:13 +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 8EE347B755; Sat, 3 Jun 2017 19:26:13 +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 v53JQCeL083184; Sat, 3 Jun 2017 19:26:12 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v53JQCHR083182; Sat, 3 Jun 2017 19:26:12 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201706031926.v53JQCHR083182@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 3 Jun 2017 19:26:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442516 - branches/2017Q2/multimedia/mkvtoolnix 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.23 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, 03 Jun 2017 19:26:13 -0000 Author: riggs Date: Sat Jun 3 19:26:12 2017 New Revision: 442516 URL: https://svnweb.freebsd.org/changeset/ports/442516 Log: MFH: r442469 Update to upstream version 12.0.0 Approved by: portmgr (miwi) Modified: branches/2017Q2/multimedia/mkvtoolnix/Makefile branches/2017Q2/multimedia/mkvtoolnix/distinfo Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/multimedia/mkvtoolnix/Makefile ============================================================================== --- branches/2017Q2/multimedia/mkvtoolnix/Makefile Sat Jun 3 19:26:05 2017 (r442515) +++ branches/2017Q2/multimedia/mkvtoolnix/Makefile Sat Jun 3 19:26:12 2017 (r442516) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mkvtoolnix -PORTVERSION= 11.0.0 +PORTVERSION= 12.0.0 CATEGORIES= multimedia audio MASTER_SITES= http://www.bunkus.org/videotools/mkvtoolnix/sources/ \ https://mkvtoolnix.download/sources/ Modified: branches/2017Q2/multimedia/mkvtoolnix/distinfo ============================================================================== --- branches/2017Q2/multimedia/mkvtoolnix/distinfo Sat Jun 3 19:26:05 2017 (r442515) +++ branches/2017Q2/multimedia/mkvtoolnix/distinfo Sat Jun 3 19:26:12 2017 (r442516) @@ -1,3 +1,3 @@ -TIMESTAMP = 1492947573 -SHA256 (mkvtoolnix-11.0.0.tar.xz) = bb642e1eb2c402c4f93a962f41a1832c99ee5b782f1596dc20f996e9a4aa426d -SIZE (mkvtoolnix-11.0.0.tar.xz) = 4471692 +TIMESTAMP = 1496475376 +SHA256 (mkvtoolnix-12.0.0.tar.xz) = 5c2401d1cc36d8a2d57cb791a5a22f3cda69cb0824c6cee35326b35e7f94b536 +SIZE (mkvtoolnix-12.0.0.tar.xz) = 4480308