From owner-svn-ports-branches@FreeBSD.ORG Sun Apr 12 10:12:23 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E906DD20; Sun, 12 Apr 2015 10:12:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CB995C27; Sun, 12 Apr 2015 10:12:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3CACM3i005065; Sun, 12 Apr 2015 10:12:22 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3CACLIG005056; Sun, 12 Apr 2015 10:12:21 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201504121012.t3CACLIG005056@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 12 Apr 2015 10:12:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r383851 - in branches/2015Q2/multimedia/mkvalidator: . 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.18-1 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, 12 Apr 2015 10:12:23 -0000 Author: riggs Date: Sun Apr 12 10:12:20 2015 New Revision: 383851 URL: https://svnweb.freebsd.org/changeset/ports/383851 Log: MFH: r383820 - Update to upstream version 0.5.0 [1] - General port cleanup [1] - Fix sporadic build failures on SMP systems [2] - Un-break build on arm [2] PR: 199247 Submitted by: tkato432@yahoo.com [1] Reviewed by: riggs [2] Approved by: ports-secteam (delphij) Added: branches/2015Q2/multimedia/mkvalidator/files/patch-corec-tools-coremake-gcc_linux_arm.build - copied unchanged from r383820, head/multimedia/mkvalidator/files/patch-corec-tools-coremake-gcc_linux_arm.build Modified: branches/2015Q2/multimedia/mkvalidator/Makefile branches/2015Q2/multimedia/mkvalidator/distinfo branches/2015Q2/multimedia/mkvalidator/pkg-descr Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/multimedia/mkvalidator/Makefile ============================================================================== --- branches/2015Q2/multimedia/mkvalidator/Makefile Sun Apr 12 10:11:35 2015 (r383850) +++ branches/2015Q2/multimedia/mkvalidator/Makefile Sun Apr 12 10:12:20 2015 (r383851) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= mkvalidator -PORTVERSION= 0.4.2 +PORTVERSION= 0.5.0 CATEGORIES= multimedia MASTER_SITES= SF/matroska/${PORTNAME}/ @@ -11,23 +11,35 @@ COMMENT= Command line tool to verify Mat LICENSE= BSD3CLAUSE BSD4CLAUSE GPLv2 LICENSE_COMB= multi -HAS_CONFIGURE= yes +BUILD_WRKSRC= ${WRKSRC}/${PORTNAME} -USES= iconv gmake tar:bzip2 +USES= gmake iconv tar:bzip2 +HAS_CONFIGURE= yes +MAKE_ENV= V=1 +MAKEFILE= GNUmakefile -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} +CFLAGS+= -I${ICONV_PREFIX}/include +LIBS+= -L${ICONV_PREFIX}/lib ${ICONV_LIB} -MAKE_ENV+= "LFLAGS=${LDFLAGS}" -MAKEFILE= GNUmakefile -BUILD_WRKSRC= ${WRKSRC}/${PORTNAME} +PLIST_FILES= bin/mkvalidator bin/mkvtree -PLIST_FILES= bin/mkvalidator +BROKEN_sparc64= Build broken on big endian architectures -BROKEN_sparc64= Does not install on sparc64: gmake: GNUmakefile: No such file or directory +MAKE_JOBS_UNSAFE= yes -post-extract: - @${REINPLACE_CMD} -e 's,/usr/local,$$(DESTDIR)$$(PREFIX),g' ${WRKSRC}/corec/tools/coremake/gcc_mak.inc - @${RM} ${WRKSRC}/libmatroska2/test/test.proj +post-patch: + ${REINPLACE_CMD} -e \ + '/STRIP/s|strip|${STRIP_CMD:T}| ; \ + /CCFLAGS/s|-O3 .* -W|-W|' \ + ${WRKSRC}/corec/tools/coremake/gcc_linux*.build + ${REINPLACE_CMD} -e \ + 's|/usr/local|$$(DESTDIR)$$(PREFIX)|g' \ + ${WRKSRC}/corec/tools/coremake/gcc_mak.inc + ${REINPLACE_CMD} -e \ + 's|arm-none-linux-gnueabi-gcc|${CC}| ; \ + s|arm-none-linux-gnueabi-g++|${CXX}| ; \ + s|arm-none-linux-gnueabi-ar|${AR}| ; \ + s|arm-none-linux-gnueabi-strip|${STRIP_CMD}|' \ + ${WRKSRC}/corec/tools/coremake/gcc_linux_arm.build .include Modified: branches/2015Q2/multimedia/mkvalidator/distinfo ============================================================================== --- branches/2015Q2/multimedia/mkvalidator/distinfo Sun Apr 12 10:11:35 2015 (r383850) +++ branches/2015Q2/multimedia/mkvalidator/distinfo Sun Apr 12 10:12:20 2015 (r383851) @@ -1,2 +1,2 @@ -SHA256 (mkvalidator-0.4.2.tar.bz2) = 9f626b8ae790642d63533da00639c61ef9b0548f6e75cd17544acb352efab77f -SIZE (mkvalidator-0.4.2.tar.bz2) = 579080 +SHA256 (mkvalidator-0.5.0.tar.bz2) = c3e72e5b49d32174415b9273ea8d52380e09ac63c8dc7db684104021c711c104 +SIZE (mkvalidator-0.5.0.tar.bz2) = 587942 Copied: branches/2015Q2/multimedia/mkvalidator/files/patch-corec-tools-coremake-gcc_linux_arm.build (from r383820, head/multimedia/mkvalidator/files/patch-corec-tools-coremake-gcc_linux_arm.build) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/multimedia/mkvalidator/files/patch-corec-tools-coremake-gcc_linux_arm.build Sun Apr 12 10:12:20 2015 (r383851, copy of r383820, head/multimedia/mkvalidator/files/patch-corec-tools-coremake-gcc_linux_arm.build) @@ -0,0 +1,13 @@ +--- corec/tools/coremake/gcc_linux_arm.build.orig 2012-12-16 11:29:34.000000000 +0100 ++++ corec/tools/coremake/gcc_linux_arm.build 2015-04-11 19:30:30.119705652 +0200 +@@ -19,8 +19,8 @@ + + #define GLIBC + +-#define CCFLAGS -DARM -Wno-multichar -O3 -mno-apcs-frame -fomit-frame-pointer -fsigned-char -march=armv4t -mtune=xscale -fvisibility=hidden -DRESOURCE_COREC +-#define SFLAGS -DARM -Wno-multichar -O3 -mno-apcs-frame -fomit-frame-pointer -fsigned-char -mcpu=iwmmxt -mtune=xscale -D_HIDDEN ++#define CCFLAGS -DARM -Wno-multichar -O3 -fomit-frame-pointer -DRESOURCE_COREC ++#define SFLAGS -DARM -Wno-multichar -O3 -fomit-frame-pointer -D_HIDDEN + #define SHFLAGS -shared -Wl,--strip-all + + #include "gcc.inc" Modified: branches/2015Q2/multimedia/mkvalidator/pkg-descr ============================================================================== --- branches/2015Q2/multimedia/mkvalidator/pkg-descr Sun Apr 12 10:11:35 2015 (r383850) +++ branches/2015Q2/multimedia/mkvalidator/pkg-descr Sun Apr 12 10:12:20 2015 (r383851) @@ -1,6 +1,6 @@ -mkvalidator is a simple command line tool to verify Matroska and WebM files for -spec conformance. It checks the various bogus or missing key elements against -the EBML DocType version of the file and reports the errors/warnings in the -command line. +mkvalidator is a simple command line tool to verify Matroska and WebM +files for spec conformance. It checks the various bogus or missing key +elements against the EBML DocType version of the file and reports the +errors/warnings in the command line. WWW: http://www.matroska.org/downloads/mkvalidator.html From owner-svn-ports-branches@FreeBSD.ORG Sun Apr 12 12:01:29 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7B795658; Sun, 12 Apr 2015 12:01:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 662F1914; Sun, 12 Apr 2015 12:01:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3CC1TGK057810; Sun, 12 Apr 2015 12:01:29 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3CC1TOf057809; Sun, 12 Apr 2015 12:01:29 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201504121201.t3CC1TOf057809@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sun, 12 Apr 2015 12:01:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r383863 - branches/2015Q2/devel/libftdi1 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.18-1 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, 12 Apr 2015 12:01:29 -0000 Author: amdmi3 Date: Sun Apr 12 12:01:28 2015 New Revision: 383863 URL: https://svnweb.freebsd.org/changeset/ports/383863 Log: MFH: r383794 - Fix plist for disabled EXAMPLES case Approved by: portmgr blanket Approved by: ports-secteam (delphij) Modified: branches/2015Q2/devel/libftdi1/pkg-plist Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/devel/libftdi1/pkg-plist ============================================================================== --- branches/2015Q2/devel/libftdi1/pkg-plist Sun Apr 12 11:32:51 2015 (r383862) +++ branches/2015Q2/devel/libftdi1/pkg-plist Sun Apr 12 12:01:28 2015 (r383863) @@ -1,16 +1,16 @@ bin/ftdi_eeprom bin/libftdi1-config -bin/ftdi1_baud_test_example -bin/ftdi1_bitbang2_example -bin/ftdi1_bitbang_cbus_example -bin/ftdi1_bitbang_example -bin/ftdi1_bitbang_ft2232_example -bin/ftdi1_eeprom_example -bin/ftdi1_find_all_example -%%BOOST%%bin/ftdi1_find_all_pp_example -bin/ftdi1_serial_test_example -bin/ftdi1_simple_example -bin/ftdi1_stream_test_example +%%EXAMPLES%%bin/ftdi1_baud_test_example +%%EXAMPLES%%bin/ftdi1_bitbang2_example +%%EXAMPLES%%bin/ftdi1_bitbang_cbus_example +%%EXAMPLES%%bin/ftdi1_bitbang_example +%%EXAMPLES%%bin/ftdi1_bitbang_ft2232_example +%%EXAMPLES%%bin/ftdi1_eeprom_example +%%EXAMPLES%%bin/ftdi1_find_all_example +%%EXAMPLES%%%%BOOST%%bin/ftdi1_find_all_pp_example +%%EXAMPLES%%bin/ftdi1_serial_test_example +%%EXAMPLES%%bin/ftdi1_simple_example +%%EXAMPLES%%bin/ftdi1_stream_test_example libdata/pkgconfig/libftdi1.pc libdata/pkgconfig/libftdipp1.pc lib/cmake/libftdi1/LibFTDI1Config.cmake From owner-svn-ports-branches@FreeBSD.ORG Sun Apr 12 13:08:42 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E4B3238F; Sun, 12 Apr 2015 13:08:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CEBA9ED3; Sun, 12 Apr 2015 13:08:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3CD8g05087510; Sun, 12 Apr 2015 13:08:42 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3CD8gPR087506; Sun, 12 Apr 2015 13:08:42 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201504121308.t3CD8gPR087506@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 12 Apr 2015 13:08:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r383868 - branches/2015Q2/multimedia/openh264 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.18-1 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, 12 Apr 2015 13:08:43 -0000 Author: jbeich Date: Sun Apr 12 13:08:41 2015 New Revision: 383868 URL: https://svnweb.freebsd.org/changeset/ports/383868 Log: MFH: r383772 - Update to re-rolled 1.4.0 - Remove deprecated GH_COMMIT with a side effect of making it harder to track from where tag moves in future Changes: https://github.com/cisco/openh264/compare/3a75956...v1.4.0 PR: 199359 Reported by: marino Approved by: ports-secteam (delphij) Modified: branches/2015Q2/multimedia/openh264/Makefile branches/2015Q2/multimedia/openh264/distinfo Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/multimedia/openh264/Makefile ============================================================================== --- branches/2015Q2/multimedia/openh264/Makefile Sun Apr 12 13:06:48 2015 (r383867) +++ branches/2015Q2/multimedia/openh264/Makefile Sun Apr 12 13:08:41 2015 (r383868) @@ -2,7 +2,8 @@ PORTNAME= openh264 PORTVERSION= 1.4.0 -PORTREVISION= 1 +DISTVERSIONPREFIX=v +PORTREVISION= 2 CATEGORIES= multimedia MAINTAINER= gecko@FreeBSD.org @@ -12,9 +13,6 @@ LICENSE= BSD2CLAUSE USE_GITHUB= yes GH_ACCOUNT= cisco -GH_PROJECT= ${PORTNAME} -GH_TAGNAME= v${PORTVERSION} -GH_COMMIT= 3a75956 USES= gmake USE_LDCONFIG= yes Modified: branches/2015Q2/multimedia/openh264/distinfo ============================================================================== --- branches/2015Q2/multimedia/openh264/distinfo Sun Apr 12 13:06:48 2015 (r383867) +++ branches/2015Q2/multimedia/openh264/distinfo Sun Apr 12 13:08:41 2015 (r383868) @@ -1,2 +1,2 @@ -SHA256 (openh264-1.4.0.tar.gz) = 905ab019c9a734ef49e7da3e7846bfc1db3602ddb1ff6828f8442dd3e0375726 -SIZE (openh264-1.4.0.tar.gz) = 37682134 +SHA256 (openh264-v1.4.0_GH0.tar.gz) = a1b9a7a7f1ee204793c613789a505f0971bc2b03b3dbd8f05d9c4a3f3b900a22 +SIZE (openh264-v1.4.0_GH0.tar.gz) = 37681189 From owner-svn-ports-branches@FreeBSD.ORG Mon Apr 13 10:00:53 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4F15EFCF; Mon, 13 Apr 2015 10:00:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 30631E76; Mon, 13 Apr 2015 10:00:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3DA0rqG090589; Mon, 13 Apr 2015 10:00:53 GMT (envelope-from johans@FreeBSD.org) Received: (from johans@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3DA0qXT090583; Mon, 13 Apr 2015 10:00:52 GMT (envelope-from johans@FreeBSD.org) Message-Id: <201504131000.t3DA0qXT090583@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: johans set sender to johans@FreeBSD.org using -f From: Johan van Selst Date: Mon, 13 Apr 2015 10:00:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r383905 - branches/2015Q2/security/libssh 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.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Apr 2015 10:00:53 -0000 Author: johans Date: Mon Apr 13 10:00:51 2015 New Revision: 383905 URL: https://svnweb.freebsd.org/changeset/ports/383905 Log: MFH: r383813 - Update to libssh 0.6.4 (security and bugfix release) https://www.libssh.org/2014/12/19/libssh-0-6-4-security-and-bugfix-release/ - This version does not compile with gcrypt: force use of openssl - Adopt port Approved by: ports-secteam Modified: branches/2015Q2/security/libssh/Makefile branches/2015Q2/security/libssh/distinfo branches/2015Q2/security/libssh/pkg-plist Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/security/libssh/Makefile ============================================================================== --- branches/2015Q2/security/libssh/Makefile Mon Apr 13 08:11:42 2015 (r383904) +++ branches/2015Q2/security/libssh/Makefile Mon Apr 13 10:00:51 2015 (r383905) @@ -2,24 +2,24 @@ # $FreeBSD$ PORTNAME= libssh -DISTVERSION= 0.6.3 -PORTREVISION= 1 +DISTVERSION= 0.6.4 CATEGORIES= security devel -MASTER_SITES= https://red.libssh.org/attachments/download/87/ +MASTER_SITES= https://red.libssh.org/attachments/download/107/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= johans@FreeBSD.org COMMENT= Library implementing the SSH1 and SSH2 protocol LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING OPTIONS_DEFINE= SSH1 STATIC -OPTIONS_RADIO= CRYPTO -OPTIONS_RADIO_CRYPTO= GCRYPT OPENSSL -OPTIONS_DEFAULT= OPENSSL STATIC +# Version 0.6.4 does not build with GCRYPT +#OPTIONS_RADIO= CRYPTO +#OPTIONS_RADIO_CRYPTO= GCRYPT OPENSSL +#OPTIONS_DEFAULT= OPENSSL STATIC OPTIONS_SUB= yes -USES= cmake:outsource cpe tar:xz +USES= cmake:outsource cpe USE_LDCONFIG= yes CMAKE_ARGS= -DWITH_EXAMPLES:BOOL=OFF \ Modified: branches/2015Q2/security/libssh/distinfo ============================================================================== --- branches/2015Q2/security/libssh/distinfo Mon Apr 13 08:11:42 2015 (r383904) +++ branches/2015Q2/security/libssh/distinfo Mon Apr 13 10:00:51 2015 (r383905) @@ -1,2 +1,2 @@ -SHA256 (libssh-0.6.3.tar.xz) = 2bb5d7c595059f990a8915c190169257328ffa828ced0c05b09bbe186092cacb -SIZE (libssh-0.6.3.tar.xz) = 279492 +SHA256 (libssh-0.6.4.tar.gz) = 7e3205e2e95bf35b23b83a6485a7d59abe7c7546d01b728f691cf0c374216b52 +SIZE (libssh-0.6.4.tar.gz) = 381835 Modified: branches/2015Q2/security/libssh/pkg-plist ============================================================================== --- branches/2015Q2/security/libssh/pkg-plist Mon Apr 13 08:11:42 2015 (r383904) +++ branches/2015Q2/security/libssh/pkg-plist Mon Apr 13 10:00:51 2015 (r383905) @@ -5,15 +5,15 @@ include/libssh/server.h include/libssh/sftp.h %%SSH1%%include/libssh/ssh1.h include/libssh/ssh2.h -lib/cmake/libssh/libssh-config.cmake -lib/cmake/libssh/libssh-config-version.cmake +lib/cmake/libssh/libssh/libssh-config.cmake +lib/cmake/libssh/libssh/libssh-config-version.cmake %%STATIC%%lib/libssh.a lib/libssh.so lib/libssh.so.4 -lib/libssh.so.4.4.1 +lib/libssh.so.4.5.0 %%STATIC%%lib/libssh_threads.a lib/libssh_threads.so lib/libssh_threads.so.4 -lib/libssh_threads.so.4.4.1 +lib/libssh_threads.so.4.5.0 libdata/pkgconfig/libssh.pc libdata/pkgconfig/libssh_threads.pc From owner-svn-ports-branches@FreeBSD.ORG Tue Apr 14 13:01:11 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A4D5AE35; Tue, 14 Apr 2015 13:01:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 857F0D1F; Tue, 14 Apr 2015 13:01:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3ED1B6E070171; Tue, 14 Apr 2015 13:01:11 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3ED19lO070159; Tue, 14 Apr 2015 13:01:09 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201504141301.t3ED19lO070159@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Tue, 14 Apr 2015 13:01:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r383997 - in branches/2015Q2: Mk lang/ruby20 lang/ruby21 lang/ruby22 lang/ruby22/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Apr 2015 13:01:11 -0000 Author: swills Date: Tue Apr 14 13:01:08 2015 New Revision: 383997 URL: https://svnweb.freebsd.org/changeset/ports/383997 Log: MFH: r383966 Update Ruby to latest versions to address CVE-2015-1855. Security: d4379f59-3e9b-49eb-933b-61de4d0b0fdb Modified: branches/2015Q2/Mk/bsd.ruby.mk branches/2015Q2/lang/ruby20/distinfo branches/2015Q2/lang/ruby21/distinfo branches/2015Q2/lang/ruby21/pkg-plist branches/2015Q2/lang/ruby22/distinfo branches/2015Q2/lang/ruby22/files/patch-tool_rbinstall.rb Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/Mk/bsd.ruby.mk ============================================================================== --- branches/2015Q2/Mk/bsd.ruby.mk Tue Apr 14 12:44:40 2015 (r383996) +++ branches/2015Q2/Mk/bsd.ruby.mk Tue Apr 14 13:01:08 2015 (r383997) @@ -174,15 +174,15 @@ RUBY?= ${LOCALBASE}/bin/${RUBY_NAME} RUBY_RELVERSION= 2.0.0 RUBY_PORTREVISION= 0 RUBY_PORTEPOCH= 1 -RUBY_PATCHLEVEL= 643 +RUBY_PATCHLEVEL= 645 RUBY20= "" # PLIST_SUB helpers . elif ${RUBY_VER} == 2.1 # # Ruby 2.1 # -RUBY_RELVERSION= 2.1.5 -RUBY_PORTREVISION= 3 +RUBY_RELVERSION= 2.1.6 +RUBY_PORTREVISION= 0 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 0 RUBY21= "" # PLIST_SUB helpers @@ -191,7 +191,7 @@ RUBY21= "" # PLIST_SUB helpers # # Ruby 2.2 # -RUBY_RELVERSION= 2.2.1 +RUBY_RELVERSION= 2.2.2 RUBY_PORTREVISION= 0 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 0 Modified: branches/2015Q2/lang/ruby20/distinfo ============================================================================== --- branches/2015Q2/lang/ruby20/distinfo Tue Apr 14 12:44:40 2015 (r383996) +++ branches/2015Q2/lang/ruby20/distinfo Tue Apr 14 13:01:08 2015 (r383997) @@ -1,2 +1,2 @@ -SHA256 (ruby/ruby-2.0.0-p643.tar.bz2) = 1f626f20647693a215a8db3ea0d6ab5ab9cee7c1945cc441b9f8f7b9612b91a0 -SIZE (ruby/ruby-2.0.0-p643.tar.bz2) = 10772113 +SHA256 (ruby/ruby-2.0.0-p645.tar.bz2) = 2dcdcf9900cb923a16d3662d067bc8c801997ac3e4a774775e387e883b3683e9 +SIZE (ruby/ruby-2.0.0-p645.tar.bz2) = 10786492 Modified: branches/2015Q2/lang/ruby21/distinfo ============================================================================== --- branches/2015Q2/lang/ruby21/distinfo Tue Apr 14 12:44:40 2015 (r383996) +++ branches/2015Q2/lang/ruby21/distinfo Tue Apr 14 13:01:08 2015 (r383997) @@ -1,2 +1,2 @@ -SHA256 (ruby/ruby-2.1.5.tar.xz) = 22ba1eb8d475c9ed7e0541418d86044c1ea4c093ab79c300c38fc0f721afe9a3 -SIZE (ruby/ruby-2.1.5.tar.xz) = 9371780 +SHA256 (ruby/ruby-2.1.6.tar.xz) = 137b27bffefd795fd97c288fff539d135f42320f8a1afddde99a34e1fbe7314e +SIZE (ruby/ruby-2.1.6.tar.xz) = 9381724 Modified: branches/2015Q2/lang/ruby21/pkg-plist ============================================================================== --- branches/2015Q2/lang/ruby21/pkg-plist Tue Apr 14 12:44:40 2015 (r383996) +++ branches/2015Q2/lang/ruby21/pkg-plist Tue Apr 14 13:01:08 2015 (r383997) @@ -759,6 +759,8 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER% %%RUBY_LIBDIR%%/rubygems/source_specific_file.rb %%RUBY_LIBDIR%%/rubygems/spec_fetcher.rb %%RUBY_LIBDIR%%/rubygems/specification.rb +%%RUBY_LIBDIR%%/rubygems/ssl_certs/AddTrustExternalCARoot-2048.pem +%%RUBY_LIBDIR%%/rubygems/ssl_certs/AddTrustExternalCARoot.pem %%RUBY_LIBDIR%%/rubygems/ssl_certs/Class3PublicPrimaryCertificationAuthority.pem %%RUBY_LIBDIR%%/rubygems/ssl_certs/DigiCertHighAssuranceEVRootCA.pem %%RUBY_LIBDIR%%/rubygems/ssl_certs/EntrustnetSecureServerCertificationAuthority.pem Modified: branches/2015Q2/lang/ruby22/distinfo ============================================================================== --- branches/2015Q2/lang/ruby22/distinfo Tue Apr 14 12:44:40 2015 (r383996) +++ branches/2015Q2/lang/ruby22/distinfo Tue Apr 14 13:01:08 2015 (r383997) @@ -1,2 +1,2 @@ -SHA256 (ruby/ruby-2.2.1.tar.xz) = 3b2852c07fdc12d0ba2b5698c7587ae2b46141539a526d143da5860b55a626c0 -SIZE (ruby/ruby-2.2.1.tar.xz) = 10320352 +SHA256 (ruby/ruby-2.2.2.tar.xz) = f033b5d08ab57083e48c1d81bcd7399967578c370b664da90e12a32891424462 +SIZE (ruby/ruby-2.2.2.tar.xz) = 10463044 Modified: branches/2015Q2/lang/ruby22/files/patch-tool_rbinstall.rb ============================================================================== --- branches/2015Q2/lang/ruby22/files/patch-tool_rbinstall.rb Tue Apr 14 12:44:40 2015 (r383996) +++ branches/2015Q2/lang/ruby22/files/patch-tool_rbinstall.rb Tue Apr 14 13:01:08 2015 (r383997) @@ -1,5 +1,5 @@ ---- tool/rbinstall.rb.orig 2014-12-26 15:44:52.000000000 +0900 -+++ tool/rbinstall.rb 2015-03-06 07:28:12.508424655 +0900 +--- tool/rbinstall.rb.orig 2015-03-25 03:33:14.000000000 +0000 ++++ tool/rbinstall.rb 2015-04-13 18:16:00.160952000 +0000 @@ -311,6 +311,7 @@ libdir = CONFIG[CONFIG.fetch("libdirname", "libdir"), true] rubyhdrdir = CONFIG["rubyhdrdir", true] @@ -79,7 +79,7 @@ -install?(:ext, :comm, :gem) do - begin - require "zlib" -- rescue LoadErroe +- rescue LoadError - end - if defined?(Zlib) - require 'pathname' From owner-svn-ports-branches@FreeBSD.ORG Tue Apr 14 15:09:02 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1855023D; Tue, 14 Apr 2015 15:09:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 030D2E79; Tue, 14 Apr 2015 15:09:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3EF91T4028611; Tue, 14 Apr 2015 15:09:01 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3EF91BU028610; Tue, 14 Apr 2015 15:09:01 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201504141509.t3EF91BU028610@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 14 Apr 2015 15:09:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384003 - branches/2015Q2/lang/gcc49 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Apr 2015 15:09:02 -0000 Author: bdrewery Date: Tue Apr 14 15:09:01 2015 New Revision: 384003 URL: https://svnweb.freebsd.org/changeset/ports/384003 Log: MFH: r384002 The armv6 support added in r376350 requires USES=compiler. It works fine on 10 and head since bsd.own.mk includes bsd.compiler.mk. This is not the case on older releases though. Modified: branches/2015Q2/lang/gcc49/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/lang/gcc49/Makefile ============================================================================== --- branches/2015Q2/lang/gcc49/Makefile Tue Apr 14 15:03:53 2015 (r384002) +++ branches/2015Q2/lang/gcc49/Makefile Tue Apr 14 15:09:01 2015 (r384003) @@ -36,7 +36,7 @@ DISTVERSION= ${PORTVERSION:C/([0-9]+\.[0 GCC_VERSION= ${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/} SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/} ONLY_FOR_ARCHS= amd64 armv6 armv6hf i386 powerpc powerpc64 sparc64 -USES= cpe gmake iconv libtool makeinfo perl5 tar:bzip2 +USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2 USE_BINUTILS= yes USE_PERL5= build SSP_UNSAFE= yes From owner-svn-ports-branches@FreeBSD.ORG Tue Apr 14 19:25:07 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 819951F8; Tue, 14 Apr 2015 19:25:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 62E20283; Tue, 14 Apr 2015 19:25:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3EJP7sq054447; Tue, 14 Apr 2015 19:25:07 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3EJP4br054435; Tue, 14 Apr 2015 19:25:04 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201504141925.t3EJP4br054435@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Tue, 14 Apr 2015 19:25:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384022 - in branches/2015Q2/multimedia: mencoder mplayer mplayer/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Apr 2015 19:25:07 -0000 Author: riggs Date: Tue Apr 14 19:25:03 2015 New Revision: 384022 URL: https://svnweb.freebsd.org/changeset/ports/384022 Log: MFH: r383192 - Update to new upstream snapshot as of 2015-04-03 (included ffmpeg snapshot as of 2015-04-03) - Fix vulnerabilities CVE-2014-8544 and CVE-2014-9604 with bundled ffmpeg snapshot in the process Approved by: ports-secteam (delphij) Modified: branches/2015Q2/multimedia/mencoder/Makefile branches/2015Q2/multimedia/mencoder/distinfo branches/2015Q2/multimedia/mplayer/Makefile branches/2015Q2/multimedia/mplayer/Makefile.shared branches/2015Q2/multimedia/mplayer/distinfo branches/2015Q2/multimedia/mplayer/files/patch-libavcodec-Makefile branches/2015Q2/multimedia/mplayer/files/patch-libavformat-udp.c Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/multimedia/mencoder/Makefile ============================================================================== --- branches/2015Q2/multimedia/mencoder/Makefile Tue Apr 14 19:08:28 2015 (r384021) +++ branches/2015Q2/multimedia/mencoder/Makefile Tue Apr 14 19:25:03 2015 (r384022) @@ -3,7 +3,6 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 2 COMMENT= Convenient video file and movie encoder Modified: branches/2015Q2/multimedia/mencoder/distinfo ============================================================================== --- branches/2015Q2/multimedia/mencoder/distinfo Tue Apr 14 19:08:28 2015 (r384021) +++ branches/2015Q2/multimedia/mencoder/distinfo Tue Apr 14 19:25:03 2015 (r384022) @@ -1,2 +1,2 @@ -SHA256 (mplayer-1.1.20141223.tar.xz) = 8d5ae2b77cdb6b86670a3741ea024b0ba8f7e4515221b224a10b690ee841d909 -SIZE (mplayer-1.1.20141223.tar.xz) = 11408272 +SHA256 (mplayer-1.1.20150403.tar.xz) = 910c2c6fda92f5883e09f34c39ca314aa5a815fa1c224e5c072bde82339f6db3 +SIZE (mplayer-1.1.20150403.tar.xz) = 11552096 Modified: branches/2015Q2/multimedia/mplayer/Makefile ============================================================================== --- branches/2015Q2/multimedia/mplayer/Makefile Tue Apr 14 19:08:28 2015 (r384021) +++ branches/2015Q2/multimedia/mplayer/Makefile Tue Apr 14 19:25:03 2015 (r384022) @@ -3,7 +3,6 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 2 COMMENT= High performance media player supporting many formats Modified: branches/2015Q2/multimedia/mplayer/Makefile.shared ============================================================================== --- branches/2015Q2/multimedia/mplayer/Makefile.shared Tue Apr 14 19:08:28 2015 (r384021) +++ branches/2015Q2/multimedia/mplayer/Makefile.shared Tue Apr 14 19:25:03 2015 (r384022) @@ -4,7 +4,7 @@ # # $FreeBSD$ -MPLAYER_SNAPSHOT_DATE= 2014-12-23 +MPLAYER_SNAPSHOT_DATE= 2015-04-03 MPLAYER_PORT_VERSION= 1.1.r${MPLAYER_SNAPSHOT_DATE:S/-//g} CATEGORIES?= multimedia audio MASTER_SITES= ${MASTER_SITE_LOCAL} Modified: branches/2015Q2/multimedia/mplayer/distinfo ============================================================================== --- branches/2015Q2/multimedia/mplayer/distinfo Tue Apr 14 19:08:28 2015 (r384021) +++ branches/2015Q2/multimedia/mplayer/distinfo Tue Apr 14 19:25:03 2015 (r384022) @@ -1,2 +1,2 @@ -SHA256 (mplayer-1.1.20141223.tar.xz) = 8d5ae2b77cdb6b86670a3741ea024b0ba8f7e4515221b224a10b690ee841d909 -SIZE (mplayer-1.1.20141223.tar.xz) = 11408272 +SHA256 (mplayer-1.1.20150403.tar.xz) = 910c2c6fda92f5883e09f34c39ca314aa5a815fa1c224e5c072bde82339f6db3 +SIZE (mplayer-1.1.20150403.tar.xz) = 11552096 Modified: branches/2015Q2/multimedia/mplayer/files/patch-libavcodec-Makefile ============================================================================== --- branches/2015Q2/multimedia/mplayer/files/patch-libavcodec-Makefile Tue Apr 14 19:08:28 2015 (r384021) +++ branches/2015Q2/multimedia/mplayer/files/patch-libavcodec-Makefile Tue Apr 14 19:25:03 2015 (r384022) @@ -1,11 +1,11 @@ ---- ffmpeg/libavcodec/Makefile.orig 2012-07-20 19:20:04.000000000 +0200 -+++ ffmpeg/libavcodec/Makefile 2012-07-21 18:25:12.582670118 +0200 -@@ -788,7 +788,7 @@ - codec_names.h \ - fft-internal.h \ +--- ffmpeg/libavcodec/Makefile.orig 2015-04-02 19:20:07.000000000 +0200 ++++ ffmpeg/libavcodec/Makefile 2015-04-03 13:25:18.741269686 +0200 +@@ -865,7 +865,7 @@ + old_codec_ids.h \ tableprint.h \ + tableprint_vlc.h \ - $(ARCH)/vp56_arith.h \ -+ $(MPLAYER_ARCH)/vp56_arith.h \ ++ $(MPLAYER_ARCH)/vp56_arith.h \ SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h Modified: branches/2015Q2/multimedia/mplayer/files/patch-libavformat-udp.c ============================================================================== --- branches/2015Q2/multimedia/mplayer/files/patch-libavformat-udp.c Tue Apr 14 19:08:28 2015 (r384021) +++ branches/2015Q2/multimedia/mplayer/files/patch-libavformat-udp.c Tue Apr 14 19:25:03 2015 (r384022) @@ -1,11 +1,11 @@ ---- ffmpeg/libavformat/udp.c.orig 2011-03-16 13:49:21.000000000 +0100 -+++ ffmpeg/libavformat/udp.c 2011-03-18 17:18:12.884305376 +0100 -@@ -42,6 +42,8 @@ - #define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP - #endif +--- ffmpeg/libavformat/udp.c.orig 2015-03-30 19:20:06.000000000 +0200 ++++ ffmpeg/libavformat/udp.c 2015-04-03 13:29:34.228251670 +0200 +@@ -71,6 +71,8 @@ + #define UDP_MAX_PKT_SIZE 65536 + #define UDP_HEADER_SIZE 8 +#define IPPROTO_IPV6 41 + - typedef struct { + typedef struct UDPContext { + const AVClass *class; int udp_fd; - int ttl; From owner-svn-ports-branches@FreeBSD.ORG Tue Apr 14 19:28:15 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 72F3537E; Tue, 14 Apr 2015 19:28:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 544B82D2; Tue, 14 Apr 2015 19:28:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3EJSFJd055038; Tue, 14 Apr 2015 19:28:15 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3EJSDsE055027; Tue, 14 Apr 2015 19:28:13 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201504141928.t3EJSDsE055027@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Tue, 14 Apr 2015 19:28:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384023 - in branches/2015Q2/multimedia: mencoder mplayer mplayer/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Apr 2015 19:28:15 -0000 Author: riggs Date: Tue Apr 14 19:28:12 2015 New Revision: 384023 URL: https://svnweb.freebsd.org/changeset/ports/384023 Log: MFH: r383871 Fix runtime crash with certain MPEG2 files on pre-10 systems. PR: 199283 Approved by: ports-secteam (delphij) Added: branches/2015Q2/multimedia/mplayer/files/extra-patch-aligned_alloc - copied unchanged from r383871, head/multimedia/mplayer/files/extra-patch-aligned_alloc Modified: branches/2015Q2/multimedia/mencoder/Makefile branches/2015Q2/multimedia/mplayer/Makefile branches/2015Q2/multimedia/mplayer/Makefile.options branches/2015Q2/multimedia/mplayer/files/patch-configure Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/multimedia/mencoder/Makefile ============================================================================== --- branches/2015Q2/multimedia/mencoder/Makefile Tue Apr 14 19:25:03 2015 (r384022) +++ branches/2015Q2/multimedia/mencoder/Makefile Tue Apr 14 19:28:12 2015 (r384023) @@ -3,6 +3,7 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION} +PORTREVISION= 1 COMMENT= Convenient video file and movie encoder Modified: branches/2015Q2/multimedia/mplayer/Makefile ============================================================================== --- branches/2015Q2/multimedia/mplayer/Makefile Tue Apr 14 19:25:03 2015 (r384022) +++ branches/2015Q2/multimedia/mplayer/Makefile Tue Apr 14 19:28:12 2015 (r384023) @@ -3,6 +3,7 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION} +PORTREVISION= 1 COMMENT= High performance media player supporting many formats Modified: branches/2015Q2/multimedia/mplayer/Makefile.options ============================================================================== --- branches/2015Q2/multimedia/mplayer/Makefile.options Tue Apr 14 19:25:03 2015 (r384022) +++ branches/2015Q2/multimedia/mplayer/Makefile.options Tue Apr 14 19:28:12 2015 (r384023) @@ -84,6 +84,11 @@ CONFIGURE_ARGS+= --disable-tv-v4l1 \ # Build system handling (including OPTIONS) # ========================================= +# Support for aligned_alloc +.if ${OSVERSION} >= 1000000 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-aligned_alloc +.endif + # Supported architectures for runtime CPU detection .if ${ARCH} == "amd64" || ${ARCH} == "i386" || ${ARCH} == "ppc" MPLAYER_RTCPU_SUPPORTED_ARCH= yes Copied: branches/2015Q2/multimedia/mplayer/files/extra-patch-aligned_alloc (from r383871, head/multimedia/mplayer/files/extra-patch-aligned_alloc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/multimedia/mplayer/files/extra-patch-aligned_alloc Tue Apr 14 19:28:12 2015 (r384023, copy of r383871, head/multimedia/mplayer/files/extra-patch-aligned_alloc) @@ -0,0 +1,27 @@ +--- configure.orig 2014-12-17 22:02:44.000000000 +0100 ++++ configure 2015-03-28 13:56:41.340987552 +0100 +@@ -3798,17 +3808,17 @@ + echores "$aligned_malloc" + + +-echocheck "memalign()" ++echocheck "aligned_alloc()" + # XXX restrict to x86 ? extend to other CPUs/cacheline sizes ? +-def_memalign_hack='#define CONFIG_MEMALIGN_HACK 0' ++def_memalign='#define HAVE_MEMALIGN 0' + _memalign=no +-statement_check malloc.h 'memalign(64, sizeof(char))' && _memalign=yes ++statement_check stdlib.h 'aligned_alloc(32, 32*sizeof(char))' && _memalign=yes + if test "$_memalign" = yes ; then +- def_memalign='#define HAVE_MEMALIGN 1' ++ def_map_memalign='#define memalign(a, b) aligned_alloc(a, b)' ++ def_memalign_hack='#define CONFIG_MEMALIGN_HACK 0' + else +- def_memalign='#define HAVE_MEMALIGN 0' + def_map_memalign='#define memalign(a, b) malloc(b)' +- darwin || def_memalign_hack='#define CONFIG_MEMALIGN_HACK 1' ++ def_memalign_hack='#define CONFIG_MEMALIGN_HACK 1' + fi + echores "$_memalign" + + Modified: branches/2015Q2/multimedia/mplayer/files/patch-configure ============================================================================== --- branches/2015Q2/multimedia/mplayer/files/patch-configure Tue Apr 14 19:25:03 2015 (r384022) +++ branches/2015Q2/multimedia/mplayer/files/patch-configure Tue Apr 14 19:28:12 2015 (r384023) @@ -62,30 +62,6 @@ echocheck "softfloat ABI" softfloat=yes cpp_condition_check '' 'defined(__ARM_PCS_VFP) || (!defined(__ARM_PCS) && !defined(__SOFTFP__))' && softfloat=no -@@ -3798,17 +3808,17 @@ - echores "$aligned_malloc" - - --echocheck "memalign()" -+echocheck "aligned_alloc()" - # XXX restrict to x86 ? extend to other CPUs/cacheline sizes ? --def_memalign_hack='#define CONFIG_MEMALIGN_HACK 0' -+def_memalign='#define HAVE_MEMALIGN 0' - _memalign=no --statement_check malloc.h 'memalign(64, sizeof(char))' && _memalign=yes -+statement_check stdlib.h 'aligned_alloc(32, 32*sizeof(char))' && _memalign=yes - if test "$_memalign" = yes ; then -- def_memalign='#define HAVE_MEMALIGN 1' -+ def_map_memalign='#define memalign(a, b) aligned_alloc(a, b)' -+ def_memalign_hack='#define CONFIG_MEMALIGN_HACK 0' - else -- def_memalign='#define HAVE_MEMALIGN 0' - def_map_memalign='#define memalign(a, b) malloc(b)' -- darwin || def_memalign_hack='#define CONFIG_MEMALIGN_HACK 1' -+ def_memalign_hack='#define CONFIG_MEMALIGN_HACK 1' - fi - echores "$_memalign" - @@ -3914,7 +3924,7 @@ if linux ; then THREAD_CFLAGS=-D_REENTRANT From owner-svn-ports-branches@FreeBSD.ORG Wed Apr 15 18:17:20 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1B600CFC; Wed, 15 Apr 2015 18:17:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 02F33941; Wed, 15 Apr 2015 18:17:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3FIHJlZ011466; Wed, 15 Apr 2015 18:17:19 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3FIHHqe011448; Wed, 15 Apr 2015 18:17:17 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201504151817.t3FIHHqe011448@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Wed, 15 Apr 2015 18:17:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384065 - in branches/2015Q2: graphics/qt4-imageformats graphics/qt4-imageformats/files x11-toolkits/qt4-gui x11-toolkits/qt4-gui/files x11-toolkits/qt5-gui x11-toolkits/qt5-gui/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Apr 2015 18:17:20 -0000 Author: rakuco Date: Wed Apr 15 18:17:16 2015 New Revision: 384065 URL: https://svnweb.freebsd.org/changeset/ports/384065 Log: MFH: r383986 Add patches for CVE-2015-1858, CVE-2015-1859 and CVE-2015-1860. Multiple vulnerabilities in Qt image format handling. Security: 5713bfda-e27d-11e4-b2ce-5453ed2e2b49 Approved by: ports-secteam (delphij) Added: branches/2015Q2/graphics/qt4-imageformats/files/patch-CVE-2015-1858 - copied unchanged from r383986, head/graphics/qt4-imageformats/files/patch-CVE-2015-1858 branches/2015Q2/graphics/qt4-imageformats/files/patch-CVE-2015-1859 - copied unchanged from r383986, head/graphics/qt4-imageformats/files/patch-CVE-2015-1859 branches/2015Q2/x11-toolkits/qt4-gui/files/patch-CVE-2015-1859 - copied unchanged from r383986, head/x11-toolkits/qt4-gui/files/patch-CVE-2015-1859 branches/2015Q2/x11-toolkits/qt5-gui/files/patch-CVE-2015-1858 - copied unchanged from r383986, head/x11-toolkits/qt5-gui/files/patch-CVE-2015-1858 branches/2015Q2/x11-toolkits/qt5-gui/files/patch-CVE-2015-1859 - copied unchanged from r383986, head/x11-toolkits/qt5-gui/files/patch-CVE-2015-1859 Modified: branches/2015Q2/graphics/qt4-imageformats/Makefile branches/2015Q2/x11-toolkits/qt4-gui/Makefile branches/2015Q2/x11-toolkits/qt5-gui/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/graphics/qt4-imageformats/Makefile ============================================================================== --- branches/2015Q2/graphics/qt4-imageformats/Makefile Wed Apr 15 17:09:42 2015 (r384064) +++ branches/2015Q2/graphics/qt4-imageformats/Makefile Wed Apr 15 18:17:16 2015 (r384065) @@ -3,7 +3,7 @@ PORTNAME= imageformats DISTVERSION= ${QT4_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics PKGNAMEPREFIX= qt4- Copied: branches/2015Q2/graphics/qt4-imageformats/files/patch-CVE-2015-1858 (from r383986, head/graphics/qt4-imageformats/files/patch-CVE-2015-1858) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/graphics/qt4-imageformats/files/patch-CVE-2015-1858 Wed Apr 15 18:17:16 2015 (r384065, copy of r383986, head/graphics/qt4-imageformats/files/patch-CVE-2015-1858) @@ -0,0 +1,24 @@ +commit a1cf194c54be57d6ab55dfd26b9562a60532208e +Author: Eirik Aavitsland +Date: Wed Mar 11 09:00:41 2015 +0100 + + Fixes crash in gif image decoder + + Fuzzing test revealed that for certain malformed gif files, + qgifhandler would segfault. + + Change-Id: I5bb6f60e1c61849e0d8c735edc3869945e5331c1 + (cherry picked from qtbase/ea2c5417fcd374302f5019e67f72af5facbd29f6) + Reviewed-by: Richard J. Moore + +--- src/gui/image/qgifhandler.cpp ++++ src/gui/image/qgifhandler.cpp +@@ -944,6 +944,8 @@ void QGIFFormat::fillRect(QImage *image, int col, int row, int w, int h, QRgb co + + void QGIFFormat::nextY(unsigned char *bits, int bpl) + { ++ if (out_of_bounds) ++ return; + int my; + switch (interlace) { + case 0: // Non-interlaced Copied: branches/2015Q2/graphics/qt4-imageformats/files/patch-CVE-2015-1859 (from r383986, head/graphics/qt4-imageformats/files/patch-CVE-2015-1859) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/graphics/qt4-imageformats/files/patch-CVE-2015-1859 Wed Apr 15 18:17:16 2015 (r384065, copy of r383986, head/graphics/qt4-imageformats/files/patch-CVE-2015-1859) @@ -0,0 +1,53 @@ +commit 3e55cd6dc467303a3c35312e9fcb255c2c048b32 +Author: Eirik Aavitsland +Date: Wed Mar 11 13:34:01 2015 +0100 + + Fixes crash in bmp and ico image decoding + + Fuzzing test revealed that for certain malformed bmp and ico files, + the handler would segfault. + + Change-Id: I19d45145f31e7f808f7f6a1a1610270ea4159cbe + (cherry picked from qtbase/2adbbae5432aa9d8cc41c6fcf55c2e310d2d4078) + Reviewed-by: Richard J. Moore + +--- src/gui/image/qbmphandler.cpp ++++ src/gui/image/qbmphandler.cpp +@@ -478,12 +478,6 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int + p = data + (h-y-1)*bpl; + break; + case 2: // delta (jump) +- // Protection +- if ((uint)x >= (uint)w) +- x = w-1; +- if ((uint)y >= (uint)h) +- y = h-1; +- + { + quint8 tmp; + d->getChar((char *)&tmp); +@@ -491,6 +485,13 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int + d->getChar((char *)&tmp); + y += tmp; + } ++ ++ // Protection ++ if ((uint)x >= (uint)w) ++ x = w-1; ++ if ((uint)y >= (uint)h) ++ y = h-1; ++ + p = data + (h-y-1)*bpl + x; + break; + default: // absolute mode +--- src/plugins/imageformats/ico/qicohandler.cpp ++++ src/plugins/imageformats/ico/qicohandler.cpp +@@ -571,7 +571,7 @@ QImage ICOReader::iconAt(int index) + QImage::Format format = QImage::Format_ARGB32; + if (icoAttrib.nbits == 24) + format = QImage::Format_RGB32; +- else if (icoAttrib.ncolors == 2) ++ else if (icoAttrib.ncolors == 2 && icoAttrib.depth == 1) + format = QImage::Format_Mono; + else if (icoAttrib.ncolors > 0) + format = QImage::Format_Indexed8; Modified: branches/2015Q2/x11-toolkits/qt4-gui/Makefile ============================================================================== --- branches/2015Q2/x11-toolkits/qt4-gui/Makefile Wed Apr 15 17:09:42 2015 (r384064) +++ branches/2015Q2/x11-toolkits/qt4-gui/Makefile Wed Apr 15 18:17:16 2015 (r384065) @@ -3,7 +3,7 @@ PORTNAME= gui DISTVERSION= ${QT4_VERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt4- Copied: branches/2015Q2/x11-toolkits/qt4-gui/files/patch-CVE-2015-1859 (from r383986, head/x11-toolkits/qt4-gui/files/patch-CVE-2015-1859) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/x11-toolkits/qt4-gui/files/patch-CVE-2015-1859 Wed Apr 15 18:17:16 2015 (r384065, copy of r383986, head/x11-toolkits/qt4-gui/files/patch-CVE-2015-1859) @@ -0,0 +1,53 @@ +commit 3e55cd6dc467303a3c35312e9fcb255c2c048b32 +Author: Eirik Aavitsland +Date: Wed Mar 11 13:34:01 2015 +0100 + + Fixes crash in bmp and ico image decoding + + Fuzzing test revealed that for certain malformed bmp and ico files, + the handler would segfault. + + Change-Id: I19d45145f31e7f808f7f6a1a1610270ea4159cbe + (cherry picked from qtbase/2adbbae5432aa9d8cc41c6fcf55c2e310d2d4078) + Reviewed-by: Richard J. Moore + +--- src/gui/image/qbmphandler.cpp ++++ src/gui/image/qbmphandler.cpp +@@ -478,12 +478,6 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int + p = data + (h-y-1)*bpl; + break; + case 2: // delta (jump) +- // Protection +- if ((uint)x >= (uint)w) +- x = w-1; +- if ((uint)y >= (uint)h) +- y = h-1; +- + { + quint8 tmp; + d->getChar((char *)&tmp); +@@ -491,6 +485,13 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int + d->getChar((char *)&tmp); + y += tmp; + } ++ ++ // Protection ++ if ((uint)x >= (uint)w) ++ x = w-1; ++ if ((uint)y >= (uint)h) ++ y = h-1; ++ + p = data + (h-y-1)*bpl + x; + break; + default: // absolute mode +--- src/plugins/imageformats/ico/qicohandler.cpp ++++ src/plugins/imageformats/ico/qicohandler.cpp +@@ -571,7 +571,7 @@ QImage ICOReader::iconAt(int index) + QImage::Format format = QImage::Format_ARGB32; + if (icoAttrib.nbits == 24) + format = QImage::Format_RGB32; +- else if (icoAttrib.ncolors == 2) ++ else if (icoAttrib.ncolors == 2 && icoAttrib.depth == 1) + format = QImage::Format_Mono; + else if (icoAttrib.ncolors > 0) + format = QImage::Format_Indexed8; Modified: branches/2015Q2/x11-toolkits/qt5-gui/Makefile ============================================================================== --- branches/2015Q2/x11-toolkits/qt5-gui/Makefile Wed Apr 15 17:09:42 2015 (r384064) +++ branches/2015Q2/x11-toolkits/qt5-gui/Makefile Wed Apr 15 18:17:16 2015 (r384065) @@ -2,6 +2,7 @@ PORTNAME= gui DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits graphics PKGNAMEPREFIX= qt5- Copied: branches/2015Q2/x11-toolkits/qt5-gui/files/patch-CVE-2015-1858 (from r383986, head/x11-toolkits/qt5-gui/files/patch-CVE-2015-1858) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/x11-toolkits/qt5-gui/files/patch-CVE-2015-1858 Wed Apr 15 18:17:16 2015 (r384065, copy of r383986, head/x11-toolkits/qt5-gui/files/patch-CVE-2015-1858) @@ -0,0 +1,23 @@ +commit d3048a29797ee2d80d84bbda26bb3c954584f332 +Author: Eirik Aavitsland +Date: Wed Mar 11 09:00:41 2015 +0100 + + Fixes crash in gif image decoder + + Fuzzing test revealed that for certain malformed gif files, + qgifhandler would segfault. + + Change-Id: I5bb6f60e1c61849e0d8c735edc3869945e5331c1 + Reviewed-by: Richard J. Moore + +--- src/gui/image/qgifhandler.cpp ++++ src/gui/image/qgifhandler.cpp +@@ -936,6 +936,8 @@ void QGIFFormat::fillRect(QImage *image, int col, int row, int w, int h, QRgb co + + void QGIFFormat::nextY(unsigned char *bits, int bpl) + { ++ if (out_of_bounds) ++ return; + int my; + switch (interlace) { + case 0: // Non-interlaced Copied: branches/2015Q2/x11-toolkits/qt5-gui/files/patch-CVE-2015-1859 (from r383986, head/x11-toolkits/qt5-gui/files/patch-CVE-2015-1859) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/x11-toolkits/qt5-gui/files/patch-CVE-2015-1859 Wed Apr 15 18:17:16 2015 (r384065, copy of r383986, head/x11-toolkits/qt5-gui/files/patch-CVE-2015-1859) @@ -0,0 +1,52 @@ +commit 51ec7ebfe5f45d1c0a03d992e97053cac66e25fe +Author: Eirik Aavitsland +Date: Wed Mar 11 13:34:01 2015 +0100 + + Fixes crash in bmp and ico image decoding + + Fuzzing test revealed that for certain malformed bmp and ico files, + the handler would segfault. + + Change-Id: I19d45145f31e7f808f7f6a1a1610270ea4159cbe + Reviewed-by: Lars Knoll + +--- src/gui/image/qbmphandler.cpp ++++ src/gui/image/qbmphandler.cpp +@@ -484,12 +484,6 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int + p = data + (h-y-1)*bpl; + break; + case 2: // delta (jump) +- // Protection +- if ((uint)x >= (uint)w) +- x = w-1; +- if ((uint)y >= (uint)h) +- y = h-1; +- + { + quint8 tmp; + d->getChar((char *)&tmp); +@@ -497,6 +491,13 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int + d->getChar((char *)&tmp); + y += tmp; + } ++ ++ // Protection ++ if ((uint)x >= (uint)w) ++ x = w-1; ++ if ((uint)y >= (uint)h) ++ y = h-1; ++ + p = data + (h-y-1)*bpl + x; + break; + default: // absolute mode +--- src/plugins/imageformats/ico/qicohandler.cpp ++++ src/plugins/imageformats/ico/qicohandler.cpp +@@ -567,7 +567,7 @@ QImage ICOReader::iconAt(int index) + QImage::Format format = QImage::Format_ARGB32; + if (icoAttrib.nbits == 24) + format = QImage::Format_RGB32; +- else if (icoAttrib.ncolors == 2) ++ else if (icoAttrib.ncolors == 2 && icoAttrib.depth == 1) + format = QImage::Format_Mono; + else if (icoAttrib.ncolors > 0) + format = QImage::Format_Indexed8; From owner-svn-ports-branches@FreeBSD.ORG Wed Apr 15 22:39:55 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B08D28E6; Wed, 15 Apr 2015 22:39:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9C6ADED5; Wed, 15 Apr 2015 22:39:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3FMdt4T035248; Wed, 15 Apr 2015 22:39:55 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3FMdtUm035247; Wed, 15 Apr 2015 22:39:55 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201504152239.t3FMdtUm035247@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Wed, 15 Apr 2015 22:39:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384075 - branches/2015Q2/multimedia/mp4v2 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Apr 2015 22:39:55 -0000 Author: antoine Date: Wed Apr 15 22:39:54 2015 New Revision: 384075 URL: https://svnweb.freebsd.org/changeset/ports/384075 Log: MFH: r384074 Fix build with GCC on recent head kernel by disabling PCH for GCC With hat: portmgr Modified: branches/2015Q2/multimedia/mp4v2/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/multimedia/mp4v2/Makefile ============================================================================== --- branches/2015Q2/multimedia/mp4v2/Makefile Wed Apr 15 22:38:24 2015 (r384074) +++ branches/2015Q2/multimedia/mp4v2/Makefile Wed Apr 15 22:39:54 2015 (r384075) @@ -11,10 +11,17 @@ MAINTAINER= multimedia@FreeBSD.org COMMENT= Library and tools to read, create, and modify mp4 files CONFLICTS= mpeg4ip-libmp4v2-[0-9.]* -USES= gmake libtool tar:bzip2 +USES= compiler gmake libtool tar:bzip2 MAKEFILE= GNUmakefile GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ENV= "FOUND_HELP2MAN=no" -.include +.include + +# GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html +.if ${COMPILER_TYPE} == gcc +CONFIGURE_ARGS= --disable-gch +.endif + +.include From owner-svn-ports-branches@FreeBSD.ORG Wed Apr 15 22:42:07 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 57769ACD; Wed, 15 Apr 2015 22:42:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 429DBF8F; Wed, 15 Apr 2015 22:42:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3FMg7Ga039364; Wed, 15 Apr 2015 22:42:07 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3FMg7Cu039363; Wed, 15 Apr 2015 22:42:07 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201504152242.t3FMg7Cu039363@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Wed, 15 Apr 2015 22:42:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384077 - branches/2015Q2/x11-toolkits/wxgtk28 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Apr 2015 22:42:07 -0000 Author: antoine Date: Wed Apr 15 22:42:06 2015 New Revision: 384077 URL: https://svnweb.freebsd.org/changeset/ports/384077 Log: MFH: r384076 Fix build with GCC on recent head kernel by disabling PCH for GCC With hat: portmgr Modified: branches/2015Q2/x11-toolkits/wxgtk28/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/x11-toolkits/wxgtk28/Makefile ============================================================================== --- branches/2015Q2/x11-toolkits/wxgtk28/Makefile Wed Apr 15 22:41:15 2015 (r384076) +++ branches/2015Q2/x11-toolkits/wxgtk28/Makefile Wed Apr 15 22:42:06 2015 (r384077) @@ -17,7 +17,7 @@ LIB_DEPENDS+= libpng.so:${PORTSDIR}/grap libtiff.so:${PORTSDIR}/graphics/tiff\ libexpat.so:${PORTSDIR}/textproc/expat2 -USES= iconv gmake pkgconfig tar:bzip2 +USES= compiler iconv gmake pkgconfig tar:bzip2 USE_XORG= x11 sm xxf86vm xinerama USE_GL= glu USE_GNOME= gtk20 pangox-compat @@ -100,10 +100,17 @@ pre-configure: CONFIGURE_ARGS+=--enable-unicode .endif +.include + +# GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html +.if ${COMPILER_TYPE} == gcc +CONFIGURE_ARGS+= --disable-precomp-headers +.endif + post-patch: @${REINPLACE_CMD} -e 's|pkg_config_args --cflags|pkg_config_args pangox --cflags|g ; \ s|pkg_config_args --libs|pkg_config_args pangox --libs|g' \ -e 's|png_check_sig|png_sig_cmp|g' \ ${WRKSRC}/configure -.include +.include From owner-svn-ports-branches@FreeBSD.ORG Thu Apr 16 11:09:05 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A0F19F6C; Thu, 16 Apr 2015 11:09:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8BEC4915; Thu, 16 Apr 2015 11:09:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3GB959Z091883; Thu, 16 Apr 2015 11:09:05 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3GB95Lk091882; Thu, 16 Apr 2015 11:09:05 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201504161109.t3GB95Lk091882@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Thu, 16 Apr 2015 11:09:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384099 - branches/2015Q2/databases/flamerobin X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Apr 2015 11:09:05 -0000 Author: antoine Date: Thu Apr 16 11:09:04 2015 New Revision: 384099 URL: https://svnweb.freebsd.org/changeset/ports/384099 Log: MFH: r384098 Fix build with GCC on recent head kernel by disabling PCH for GCC With hat: portmgr Modified: branches/2015Q2/databases/flamerobin/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/databases/flamerobin/Makefile ============================================================================== --- branches/2015Q2/databases/flamerobin/Makefile Thu Apr 16 11:08:11 2015 (r384098) +++ branches/2015Q2/databases/flamerobin/Makefile Thu Apr 16 11:09:04 2015 (r384099) @@ -16,6 +16,7 @@ LICENSE_NAME= FlameRobin Expat LICENSE_FILE= ${WRKSRC}/docs/fr_license.html LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +USES= compiler USE_FIREBIRD= yes USE_WX= 2.8+ WX_COMPS= wx contrib @@ -28,4 +29,11 @@ LDFLAGS+= -L${LOCALBASE}/lib SUB_FILES= pkg-message -.include +.include + +# GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html +.if ${COMPILER_TYPE} == gcc +CONFIGURE_ARGS= --disable-precomp-headers +.endif + +.include From owner-svn-ports-branches@FreeBSD.ORG Thu Apr 16 11:40:04 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2878B6B7; Thu, 16 Apr 2015 11:40:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 12E5BC4A; Thu, 16 Apr 2015 11:40:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3GBe39m006705; Thu, 16 Apr 2015 11:40:03 GMT (envelope-from garga@FreeBSD.org) Received: (from garga@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3GBe3j2006703; Thu, 16 Apr 2015 11:40:03 GMT (envelope-from garga@FreeBSD.org) Message-Id: <201504161140.t3GBe3j2006703@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: garga set sender to garga@FreeBSD.org using -f From: Renato Botelho Date: Thu, 16 Apr 2015 11:40:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384102 - in branches/2015Q2/net/tcpdump: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Apr 2015 11:40:04 -0000 Author: garga Date: Thu Apr 16 11:40:03 2015 New Revision: 384102 URL: https://svnweb.freebsd.org/changeset/ports/384102 Log: MFH: r384101 - Add a patch to fix heap overflow - Bump PORTREVISION Obtained from: https://github.com/the-tcpdump-group/tcpdump/issues/446 Security: CVE-2015-3138 Approved by: portmgr (erwin) Added: branches/2015Q2/net/tcpdump/files/ - copied from r384101, head/net/tcpdump/files/ Modified: branches/2015Q2/net/tcpdump/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/net/tcpdump/Makefile ============================================================================== --- branches/2015Q2/net/tcpdump/Makefile Thu Apr 16 11:21:44 2015 (r384101) +++ branches/2015Q2/net/tcpdump/Makefile Thu Apr 16 11:40:03 2015 (r384102) @@ -3,6 +3,7 @@ PORTNAME= tcpdump PORTVERSION= 4.7.3 +PORTREVISION= 1 CATEGORIES= net ipv6 MASTER_SITES= http://www.tcpdump.org/release/ From owner-svn-ports-branches@FreeBSD.ORG Thu Apr 16 15:40:41 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 83866FC8; Thu, 16 Apr 2015 15:40:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6E29FD18; Thu, 16 Apr 2015 15:40:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3GFeftS023999; Thu, 16 Apr 2015 15:40:41 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3GFefm8023998; Thu, 16 Apr 2015 15:40:41 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201504161540.t3GFefm8023998@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Thu, 16 Apr 2015 15:40:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384117 - branches/2015Q2/lang/phantomjs X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Apr 2015 15:40:41 -0000 Author: antoine Date: Thu Apr 16 15:40:40 2015 New Revision: 384117 URL: https://svnweb.freebsd.org/changeset/ports/384117 Log: MFH: r384116 Fix build with GCC on recent head kernel by disabling PCH for GCC With hat: portmgr Modified: branches/2015Q2/lang/phantomjs/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/lang/phantomjs/Makefile ============================================================================== --- branches/2015Q2/lang/phantomjs/Makefile Thu Apr 16 15:39:43 2015 (r384116) +++ branches/2015Q2/lang/phantomjs/Makefile Thu Apr 16 15:40:40 2015 (r384117) @@ -25,7 +25,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVER PLIST_FILES= bin/phantomjs do-build: - cd ${WRKSRC} && ${SETENV} CC=${CC} CXX=${CXX} OSTYPE=freebsd MAKEFLAGS= PATH=${PATH} bash -x build.sh --jobs ${MAKE_JOBS_NUMBER} --confirm + cd ${WRKSRC} && ${SETENV} CC=${CC} CXX=${CXX} OSTYPE=freebsd MAKEFLAGS= PATH=${PATH} bash -x build.sh --jobs ${MAKE_JOBS_NUMBER} --confirm \ + --qt-config '-no-pch' do-install: cd ${WRKSRC} && ${INSTALL_PROGRAM} bin/phantomjs ${STAGEDIR}${PREFIX}/bin/ From owner-svn-ports-branches@FreeBSD.ORG Fri Apr 17 08:43:40 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BF6A7B31; Fri, 17 Apr 2015 08:43:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ADA04B1D; Fri, 17 Apr 2015 08:43:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3H8heN9036586; Fri, 17 Apr 2015 08:43:40 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3H8he7J036581; Fri, 17 Apr 2015 08:43:40 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201504170843.t3H8he7J036581@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 17 Apr 2015 08:43:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384143 - branches/2015Q2/games/wesnoth X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Apr 2015 08:43:40 -0000 Author: jbeich Date: Fri Apr 17 08:43:39 2015 New Revision: 384143 URL: https://svnweb.freebsd.org/changeset/ports/384143 Log: MFH: r384142 - Update to 1.12.2 Changes: http://forums.wesnoth.org/viewtopic.php?t=41870 PR: 199414 Submitted by: Torsten Zühlsdorff (maintainer) Security: https://vuxml.freebsd.org/freebsd/ba326a36-5f02-452d-a215-31e7b06d5edf.html Approved by: portmgr (erwin) Modified: branches/2015Q2/games/wesnoth/Makefile branches/2015Q2/games/wesnoth/distinfo Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/games/wesnoth/Makefile ============================================================================== --- branches/2015Q2/games/wesnoth/Makefile Fri Apr 17 08:05:57 2015 (r384142) +++ branches/2015Q2/games/wesnoth/Makefile Fri Apr 17 08:43:39 2015 (r384143) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= wesnoth -PORTVERSION= 1.12.1 +PORTVERSION= 1.12.2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \ http://files.wesnoth.org/ \ Modified: branches/2015Q2/games/wesnoth/distinfo ============================================================================== --- branches/2015Q2/games/wesnoth/distinfo Fri Apr 17 08:05:57 2015 (r384142) +++ branches/2015Q2/games/wesnoth/distinfo Fri Apr 17 08:43:39 2015 (r384143) @@ -1,2 +1,2 @@ -SHA256 (wesnoth-1.12.1.tar.bz2) = 70404764370db05e496a4e033e09c26cdc47fa6558271d803a44c4ebb7b6efe8 -SIZE (wesnoth-1.12.1.tar.bz2) = 384386961 +SHA256 (wesnoth-1.12.2.tar.bz2) = 1f4f76e5fd0ce175a3eb7b9855aff7a58dc75899c534d7653d97ac9fd4fe798b +SIZE (wesnoth-1.12.2.tar.bz2) = 392234446 From owner-svn-ports-branches@FreeBSD.ORG Fri Apr 17 17:16:00 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 768FD6D3; Fri, 17 Apr 2015 17:16:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4B30CFA7; Fri, 17 Apr 2015 17:16:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3HHG0lH079445; Fri, 17 Apr 2015 17:16:00 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3HHFxrq079437; Fri, 17 Apr 2015 17:15:59 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201504171715.t3HHFxrq079437@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Fri, 17 Apr 2015 17:15:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384168 - in branches/2015Q2/java: openjdk7 openjdk8 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Apr 2015 17:16:00 -0000 Author: antoine Date: Fri Apr 17 17:15:59 2015 New Revision: 384168 URL: https://svnweb.freebsd.org/changeset/ports/384168 Log: MFH: r384056 Fix build with GCC with recent head kernel by disabling PCH for GCC. The case for this is a recent head kernel building an older branch that uses GCC in a jail. This is discussed at https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html It may be possible to fix GCC to do the right thing with mmap(2) but it would not be simple to make ports use a fixed GCC on older releases and without needlessly building a ports compiler when the system one would otherwise be fine without PCH. With hat: portmgr Modified: branches/2015Q2/java/openjdk7/Makefile branches/2015Q2/java/openjdk8/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/java/openjdk7/Makefile ============================================================================== --- branches/2015Q2/java/openjdk7/Makefile Fri Apr 17 16:38:54 2015 (r384167) +++ branches/2015Q2/java/openjdk7/Makefile Fri Apr 17 17:15:59 2015 (r384168) @@ -26,7 +26,7 @@ LICENSE= GPLv2 WRKSRC= ${WRKDIR}/${PORTNAME} -USES= dos2unix iconv gmake zip +USES= compiler dos2unix iconv gmake zip USE_XORG+= x11 xext xi xrender xt xtst MAKE_ARGS= CC=${CC:Q} CXX=${CXX:Q} HOST_CC=${CC:Q} @@ -125,6 +125,11 @@ BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/ .include +# GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html +.if ${COMPILER_TYPE} == gcc +MAKE_ENV+= USE_PRECOMPILED_HEADER=0 +.endif + .if empty(ICONV_LIB) MAKE_ENV+= EXTRA_CFLAGS=-DLIBICONV_PLUG .endif Modified: branches/2015Q2/java/openjdk8/Makefile ============================================================================== --- branches/2015Q2/java/openjdk8/Makefile Fri Apr 17 16:38:54 2015 (r384167) +++ branches/2015Q2/java/openjdk8/Makefile Fri Apr 17 17:15:59 2015 (r384168) @@ -192,6 +192,11 @@ CONFIGURE_ENV= LIBCXX="-lc++" .endif .endif +# GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html +.if ${COMPILER_TYPE} == gcc +MAKE_ARGS+= USE_PRECOMPILED_HEADER=0 +.endif + .if empty(ICONV_LIB) ICONV_CPPFLAGS= -DLIBICONV_PLUG .else From owner-svn-ports-branches@FreeBSD.ORG Fri Apr 17 21:32:25 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8ED73649; Fri, 17 Apr 2015 21:32:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7C362CB; Fri, 17 Apr 2015 21:32:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3HLWPqP006349; Fri, 17 Apr 2015 21:32:25 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3HLWO6P006341; Fri, 17 Apr 2015 21:32:24 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201504172132.t3HLWO6P006341@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Fri, 17 Apr 2015 21:32:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384189 - in branches/2015Q2/net: ntp ntp-devel X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Apr 2015 21:32:25 -0000 Author: delphij Date: Fri Apr 17 21:32:23 2015 New Revision: 384189 URL: https://svnweb.freebsd.org/changeset/ports/384189 Log: MFH r383554: ntp 4.2.8p2 (security update). Approved by: ports-secteam (self) Modified: branches/2015Q2/net/ntp-devel/Makefile branches/2015Q2/net/ntp-devel/distinfo branches/2015Q2/net/ntp/Makefile branches/2015Q2/net/ntp/distinfo branches/2015Q2/net/ntp/pkg-plist Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/net/ntp-devel/Makefile ============================================================================== --- branches/2015Q2/net/ntp-devel/Makefile Fri Apr 17 21:02:31 2015 (r384188) +++ branches/2015Q2/net/ntp-devel/Makefile Fri Apr 17 21:32:23 2015 (r384189) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ntp -PORTVERSION= 4.3.11 +PORTVERSION= 4.3.14 CATEGORIES= net ipv6 MASTER_SITES= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-dev/ \ http://archive.ntp.org/ntp4/ntp-dev/ @@ -12,12 +12,14 @@ DISTNAME= ${PORTNAME}-dev-${PORTVERSION: MAINTAINER= cy@FreeBSD.org COMMENT= The Network Time Protocol Distribution +CONFLICTS= ntp-[0-9].* ntp-rc-* + GNU_CONFIGURE= yes OPTIONS_SUB= yes USES= pathfix shebangfix libtool LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 -NTP_SHEBANG_FILES= sbin/ntp-wait sbin/ntptrace +NTP_SHEBANG_FILES= sbin/ntp-wait sbin/ntptrace sbin/update-leap .include "Makefile.inc" Modified: branches/2015Q2/net/ntp-devel/distinfo ============================================================================== --- branches/2015Q2/net/ntp-devel/distinfo Fri Apr 17 21:02:31 2015 (r384188) +++ branches/2015Q2/net/ntp-devel/distinfo Fri Apr 17 21:32:23 2015 (r384189) @@ -1,2 +1,2 @@ -SHA256 (ntp-dev-4.3.11.tar.gz) = 6656bbf55a07b0cea460fd02d35ebec49548bde62ddf5ef408f155125b1b38e2 -SIZE (ntp-dev-4.3.11.tar.gz) = 6613141 +SHA256 (ntp-dev-4.3.14.tar.gz) = c7027bc024ab7d3706db60772e34d6240a21045fb19328d80f3446c278ee241d +SIZE (ntp-dev-4.3.14.tar.gz) = 6622328 Modified: branches/2015Q2/net/ntp/Makefile ============================================================================== --- branches/2015Q2/net/ntp/Makefile Fri Apr 17 21:02:31 2015 (r384188) +++ branches/2015Q2/net/ntp/Makefile Fri Apr 17 21:32:23 2015 (r384189) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ntp -PORTVERSION= 4.2.8p1 +PORTVERSION= 4.2.8p2 CATEGORIES= net ipv6 MASTER_SITES= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ \ http://archive.ntp.org/ntp4/ntp-4.2/ \ @@ -17,7 +17,7 @@ OPTIONS_SUB= yes USES= pathfix shebangfix libtool LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 -NTP_SHEBANG_FILES= sbin/ntp-wait sbin/ntptrace +NTP_SHEBANG_FILES= sbin/ntp-wait sbin/ntptrace sbin/update-leap .include "Makefile.inc" Modified: branches/2015Q2/net/ntp/distinfo ============================================================================== --- branches/2015Q2/net/ntp/distinfo Fri Apr 17 21:02:31 2015 (r384188) +++ branches/2015Q2/net/ntp/distinfo Fri Apr 17 21:32:23 2015 (r384189) @@ -1,2 +1,2 @@ -SHA256 (ntp-4.2.8p1.tar.gz) = 948274b88f1ed002d867ced6aaefdfd0999668b11285ac2b3a67ff2629d59d88 -SIZE (ntp-4.2.8p1.tar.gz) = 6791852 +SHA256 (ntp-4.2.8p2.tar.gz) = 0d69bc0e95caad43ea04fdad410e756bae1a71e67b1c2bd799b76b55e04c9b31 +SIZE (ntp-4.2.8p2.tar.gz) = 6820869 Modified: branches/2015Q2/net/ntp/pkg-plist ============================================================================== --- branches/2015Q2/net/ntp/pkg-plist Fri Apr 17 21:02:31 2015 (r384188) +++ branches/2015Q2/net/ntp/pkg-plist Fri Apr 17 21:32:23 2015 (r384189) @@ -8,6 +8,7 @@ man/man8/ntpq.8.gz %%PERL_UTILS%%man/man8/ntptrace.8.gz %%NTPSNMPD%%man/man8/ntpsnmpd.8.gz man/man8/sntp.8.gz +man/man8/update-leap.8.gz %%SSL%%sbin/ntp-keygen %%PERL_UTILS%%sbin/ntp-wait sbin/ntpd @@ -18,6 +19,7 @@ sbin/ntpq sbin/ntptime %%PERL_UTILS%%sbin/ntptrace sbin/sntp +sbin/update-leap %%PERL_UTILS%%share/ntp/lib/NTP/Util.pm %%PORTDOCS%%%%DOCSDIR%%/access.html %%PORTDOCS%%%%DOCSDIR%%/accopt.html @@ -484,6 +486,7 @@ sbin/sntp %%PORTDOCS%%%%DOCSDIR%%/sntp.html %%PORTDOCS%%%%DOCSDIR%%/stats.html %%PORTDOCS%%%%DOCSDIR%%/tickadj.html +%%PORTDOCS%%%%DOCSDIR%%/update-leap.html %%PORTDOCS%%%%DOCSDIR%%/warp.html %%PORTDOCS%%%%DOCSDIR%%/xleave.html %%PORTDOCS%%share/doc/sntp/sntp.html From owner-svn-ports-branches@FreeBSD.ORG Fri Apr 17 23:06:04 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B9137D4C; Fri, 17 Apr 2015 23:06:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9A36AC13; Fri, 17 Apr 2015 23:06:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3HN644l050984; Fri, 17 Apr 2015 23:06:04 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3HN630p050977; Fri, 17 Apr 2015 23:06:03 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201504172306.t3HN630p050977@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 17 Apr 2015 23:06:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384195 - in branches/2015Q2/devel/dulwich: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Apr 2015 23:06:04 -0000 Author: jbeich Date: Fri Apr 17 23:06:02 2015 New Revision: 384195 URL: https://svnweb.freebsd.org/changeset/ports/384195 Log: MFH: r384194 - Update to 0.10.1a PR: 199162 Submitted by: Marco Bröder (maintainer) Security: https://vuxml.freebsd.org/freebsd/e426eda9-dae1-11e4-8107-94de806b0af9.html Approved by: portmgr (erwin) Added: branches/2015Q2/devel/dulwich/files/patch-dulwich.egg-info_SOURCES.txt - copied unchanged from r384194, head/devel/dulwich/files/patch-dulwich.egg-info_SOURCES.txt Deleted: branches/2015Q2/devel/dulwich/files/patch-dulwich.egg-info__SOURCES.txt Modified: branches/2015Q2/devel/dulwich/Makefile branches/2015Q2/devel/dulwich/distinfo branches/2015Q2/devel/dulwich/files/patch-MANIFEST.in branches/2015Q2/devel/dulwich/files/patch-setup.py Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/devel/dulwich/Makefile ============================================================================== --- branches/2015Q2/devel/dulwich/Makefile Fri Apr 17 22:47:41 2015 (r384194) +++ branches/2015Q2/devel/dulwich/Makefile Fri Apr 17 23:06:02 2015 (r384195) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= dulwich -PORTVERSION= 0.9.7 +PORTVERSION= 0.10.1a CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: branches/2015Q2/devel/dulwich/distinfo ============================================================================== --- branches/2015Q2/devel/dulwich/distinfo Fri Apr 17 22:47:41 2015 (r384194) +++ branches/2015Q2/devel/dulwich/distinfo Fri Apr 17 23:06:02 2015 (r384195) @@ -1,2 +1,2 @@ -SHA256 (dulwich-0.9.7.tar.gz) = 12e77b0434a3bb3075e9c96e608ee9c3f85e49bc9c8335139aba8795de4000f3 -SIZE (dulwich-0.9.7.tar.gz) = 259335 +SHA256 (dulwich-0.10.1a.tar.gz) = 666600ab5eb0b6d531879ee0f65dfefd71bce2e21ab3910c28f7789e15b6330b +SIZE (dulwich-0.10.1a.tar.gz) = 272688 Modified: branches/2015Q2/devel/dulwich/files/patch-MANIFEST.in ============================================================================== --- branches/2015Q2/devel/dulwich/files/patch-MANIFEST.in Fri Apr 17 22:47:41 2015 (r384194) +++ branches/2015Q2/devel/dulwich/files/patch-MANIFEST.in Fri Apr 17 23:06:02 2015 (r384195) @@ -1,6 +1,6 @@ ---- ./MANIFEST.in.orig 2014-06-01 23:01:35.000000000 +0200 -+++ ./MANIFEST.in 2014-06-14 11:15:41.244692230 +0200 -@@ -7,4 +7,3 @@ +--- MANIFEST.in.orig 2015-03-25 01:53:21 UTC ++++ MANIFEST.in +@@ -8,4 +8,3 @@ include setup.cfg include dulwich/stdint.h recursive-include docs conf.py *.txt Makefile make.bat recursive-include examples *.py Copied: branches/2015Q2/devel/dulwich/files/patch-dulwich.egg-info_SOURCES.txt (from r384194, head/devel/dulwich/files/patch-dulwich.egg-info_SOURCES.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/devel/dulwich/files/patch-dulwich.egg-info_SOURCES.txt Fri Apr 17 23:06:02 2015 (r384195, copy of r384194, head/devel/dulwich/files/patch-dulwich.egg-info_SOURCES.txt) @@ -0,0 +1,121 @@ +--- dulwich.egg-info/SOURCES.txt.orig 2015-03-25 01:54:03 UTC ++++ dulwich.egg-info/SOURCES.txt +@@ -61,118 +61,6 @@ dulwich/contrib/__init__.py + dulwich/contrib/swift.py + dulwich/contrib/test_swift.py + dulwich/contrib/test_swift_smoke.py +-dulwich/tests/__init__.py +-dulwich/tests/test_blackbox.py +-dulwich/tests/test_client.py +-dulwich/tests/test_config.py +-dulwich/tests/test_diff_tree.py +-dulwich/tests/test_fastexport.py +-dulwich/tests/test_file.py +-dulwich/tests/test_grafts.py +-dulwich/tests/test_greenthreads.py +-dulwich/tests/test_hooks.py +-dulwich/tests/test_index.py +-dulwich/tests/test_lru_cache.py +-dulwich/tests/test_missing_obj_finder.py +-dulwich/tests/test_object_store.py +-dulwich/tests/test_objects.py +-dulwich/tests/test_objectspec.py +-dulwich/tests/test_pack.py +-dulwich/tests/test_patch.py +-dulwich/tests/test_porcelain.py +-dulwich/tests/test_protocol.py +-dulwich/tests/test_refs.py +-dulwich/tests/test_repository.py +-dulwich/tests/test_server.py +-dulwich/tests/test_utils.py +-dulwich/tests/test_walk.py +-dulwich/tests/test_web.py +-dulwich/tests/utils.py +-dulwich/tests/compat/__init__.py +-dulwich/tests/compat/server_utils.py +-dulwich/tests/compat/test_client.py +-dulwich/tests/compat/test_pack.py +-dulwich/tests/compat/test_repository.py +-dulwich/tests/compat/test_server.py +-dulwich/tests/compat/test_utils.py +-dulwich/tests/compat/test_web.py +-dulwich/tests/compat/utils.py +-dulwich/tests/data/blobs/11/11111111111111111111111111111111111111 +-dulwich/tests/data/blobs/6f/670c0fb53f9463760b7295fbb814e965fb20c8 +-dulwich/tests/data/blobs/95/4a536f7819d40e6f637f849ee187dd10066349 +-dulwich/tests/data/blobs/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 +-dulwich/tests/data/commits/0d/89f20333fbb1d2f3a94da77f4981373d8f4310 +-dulwich/tests/data/commits/5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc +-dulwich/tests/data/commits/60/dacdc733de308bb77bb76ce0fb0f9b44c9769e +-dulwich/tests/data/indexes/index +-dulwich/tests/data/packs/pack-bc63ddad95e7321ee734ea11a7a62d314e0d7481.idx +-dulwich/tests/data/packs/pack-bc63ddad95e7321ee734ea11a7a62d314e0d7481.pack +-dulwich/tests/data/repos/.gitattributes +-dulwich/tests/data/repos/server_new.export +-dulwich/tests/data/repos/server_old.export +-dulwich/tests/data/repos/a.git/HEAD +-dulwich/tests/data/repos/a.git/packed-refs +-dulwich/tests/data/repos/a.git/objects/28/237f4dc30d0d462658d6b937b08a0f0b6ef55a +-dulwich/tests/data/repos/a.git/objects/2a/72d929692c41d8554c07f6301757ba18a65d91 +-dulwich/tests/data/repos/a.git/objects/4e/f30bbfe26431a69c3820d3a683df54d688f2ec +-dulwich/tests/data/repos/a.git/objects/4f/2e6529203aa6d44b5af6e3292c837ceda003f9 +-dulwich/tests/data/repos/a.git/objects/7d/9a07d797595ef11344549b8d08198e48c15364 +-dulwich/tests/data/repos/a.git/objects/a2/96d0bb611188cabb256919f36bc30117cca005 +-dulwich/tests/data/repos/a.git/objects/a9/0fa2d900a17e99b433217e988c4eb4a2e9a097 +-dulwich/tests/data/repos/a.git/objects/b0/931cadc54336e78a1d980420e3268903b57a50 +-dulwich/tests/data/repos/a.git/objects/ff/d47d45845a8f6576491e1edb97e3fe6a850e7f +-dulwich/tests/data/repos/a.git/refs/heads/master +-dulwich/tests/data/repos/a.git/refs/tags/mytag +-dulwich/tests/data/repos/empty.git/HEAD +-dulwich/tests/data/repos/empty.git/config +-dulwich/tests/data/repos/empty.git/objects/info/.gitignore +-dulwich/tests/data/repos/empty.git/objects/pack/.gitignore +-dulwich/tests/data/repos/empty.git/refs/heads/.gitignore +-dulwich/tests/data/repos/empty.git/refs/tags/.gitignore +-dulwich/tests/data/repos/ooo_merge.git/HEAD +-dulwich/tests/data/repos/ooo_merge.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b +-dulwich/tests/data/repos/ooo_merge.git/objects/38/74e9c60a6d149c44c928140f250d81e6381520 +-dulwich/tests/data/repos/ooo_merge.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8 +-dulwich/tests/data/repos/ooo_merge.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 +-dulwich/tests/data/repos/ooo_merge.git/objects/76/01d7f6231db6a57f7bbb79ee52e4d462fd44d1 +-dulwich/tests/data/repos/ooo_merge.git/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870 +-dulwich/tests/data/repos/ooo_merge.git/objects/95/4a536f7819d40e6f637f849ee187dd10066349 +-dulwich/tests/data/repos/ooo_merge.git/objects/b2/a2766a2879c209ab1176e7e778b81ae422eeaa +-dulwich/tests/data/repos/ooo_merge.git/objects/f5/07291b64138b875c28e03469025b1ea20bc614 +-dulwich/tests/data/repos/ooo_merge.git/objects/f9/e39b120c68182a4ba35349f832d0e4e61f485c +-dulwich/tests/data/repos/ooo_merge.git/objects/fb/5b0425c7ce46959bec94d54b9a157645e114f5 +-dulwich/tests/data/repos/ooo_merge.git/refs/heads/master +-dulwich/tests/data/repos/refs.git/HEAD +-dulwich/tests/data/repos/refs.git/packed-refs +-dulwich/tests/data/repos/refs.git/objects/3b/9e5457140e738c2dcd39bf6d7acf88379b90d1 +-dulwich/tests/data/repos/refs.git/objects/3e/c9c43c84ff242e3ef4a9fc5bc111fd780a76a8 +-dulwich/tests/data/repos/refs.git/objects/42/d06bd4b77fed026b154d16493e5deab78f02ec +-dulwich/tests/data/repos/refs.git/objects/a1/8114c31713746a33a2e70d9914d1ef3e781425 +-dulwich/tests/data/repos/refs.git/objects/cd/a609072918d7b70057b6bef9f4c2537843fcfe +-dulwich/tests/data/repos/refs.git/objects/df/6800012397fb85c56e7418dd4eb9405dee075c +-dulwich/tests/data/repos/refs.git/refs/heads/40-char-ref-aaaaaaaaaaaaaaaaaa +-dulwich/tests/data/repos/refs.git/refs/heads/loop +-dulwich/tests/data/repos/refs.git/refs/heads/master +-dulwich/tests/data/repos/refs.git/refs/tags/refs-0.2 +-dulwich/tests/data/repos/simple_merge.git/HEAD +-dulwich/tests/data/repos/simple_merge.git/objects/0d/89f20333fbb1d2f3a94da77f4981373d8f4310 +-dulwich/tests/data/repos/simple_merge.git/objects/1b/6318f651a534b38f9c7aedeebbd56c1e896853 +-dulwich/tests/data/repos/simple_merge.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b +-dulwich/tests/data/repos/simple_merge.git/objects/4c/ffe90e0a41ad3f5190079d7c8f036bde29cbe6 +-dulwich/tests/data/repos/simple_merge.git/objects/5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc +-dulwich/tests/data/repos/simple_merge.git/objects/60/dacdc733de308bb77bb76ce0fb0f9b44c9769e +-dulwich/tests/data/repos/simple_merge.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8 +-dulwich/tests/data/repos/simple_merge.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 +-dulwich/tests/data/repos/simple_merge.git/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870 +-dulwich/tests/data/repos/simple_merge.git/objects/95/4a536f7819d40e6f637f849ee187dd10066349 +-dulwich/tests/data/repos/simple_merge.git/objects/ab/64bbdcc51b170d21588e5c5d391ee5c0c96dfd +-dulwich/tests/data/repos/simple_merge.git/objects/d4/bdad6549dfedf25d3b89d21f506aff575b28a7 +-dulwich/tests/data/repos/simple_merge.git/objects/d8/0c186a03f423a81b39df39dc87fd269736ca86 +-dulwich/tests/data/repos/simple_merge.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 +-dulwich/tests/data/repos/simple_merge.git/refs/heads/master +-dulwich/tests/data/repos/submodule/dotgit +-dulwich/tests/data/tags/71/033db03a03c6a36721efcf1968dd8f8e0cf023 +-dulwich/tests/data/trees/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 + examples/clone.py + examples/config.py + examples/diff.py Modified: branches/2015Q2/devel/dulwich/files/patch-setup.py ============================================================================== --- branches/2015Q2/devel/dulwich/files/patch-setup.py Fri Apr 17 22:47:41 2015 (r384194) +++ branches/2015Q2/devel/dulwich/files/patch-setup.py Fri Apr 17 23:06:02 2015 (r384195) @@ -1,20 +1,11 @@ ---- ./setup.py.orig 2014-06-07 04:12:55.000000000 +0200 -+++ ./setup.py 2014-06-14 11:16:37.182700482 +0200 -@@ -51,8 +51,6 @@ - - setup_kwargs = {} - --if has_setuptools: -- setup_kwargs['test_suite'] = 'dulwich.tests.test_suite' - - setup(name='dulwich', - description='Python Git Library', -@@ -72,7 +70,7 @@ +--- setup.py.orig 2015-03-25 01:54:01 UTC ++++ setup.py +@@ -75,7 +75,7 @@ setup(name='dulwich', The project is named after the part of London that Mr. and Mrs. Git live in in the particular Monty Python sketch. """, - packages=['dulwich', 'dulwich.tests', 'dulwich.tests.compat', 'dulwich.contrib'], + packages=['dulwich', 'dulwich.contrib'], - scripts=['bin/dulwich', 'bin/dul-web', 'bin/dul-receive-pack', 'bin/dul-upload-pack'], - ext_modules=[ - Extension('dulwich._objects', ['dulwich/_objects.c'], + package_data={'': ['../docs/tutorial/*.txt']}, + scripts=['bin/dulwich', 'bin/dul-receive-pack', 'bin/dul-upload-pack'], + classifiers=[ From owner-svn-ports-branches@FreeBSD.ORG Sat Apr 18 07:35:50 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8DB04278; Sat, 18 Apr 2015 07:35:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6380D823; Sat, 18 Apr 2015 07:35:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3I7Zofd051717; Sat, 18 Apr 2015 07:35:50 GMT (envelope-from xmj@FreeBSD.org) Received: (from xmj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3I7Znwi051712; Sat, 18 Apr 2015 07:35:49 GMT (envelope-from xmj@FreeBSD.org) Message-Id: <201504180735.t3I7Znwi051712@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: xmj set sender to xmj@FreeBSD.org using -f From: Johannes Jost Meixner Date: Sat, 18 Apr 2015 07:35:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384210 - branches/2015Q2/www/linux-c6-flashplugin11 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Apr 2015 07:35:50 -0000 Author: xmj Date: Sat Apr 18 07:35:49 2015 New Revision: 384210 URL: https://svnweb.freebsd.org/changeset/ports/384210 Log: MFH: r384150 www/linux-{c6,f10}-flashplugin11: Update to 11.2r202.457 - Update to 11.2r202.457 Spotted by: kwm Security: 3364d497-e4e6-11e4-a265-c485083ca99c Approved by: ports-secteam (erwin) Modified: branches/2015Q2/www/linux-c6-flashplugin11/Makefile branches/2015Q2/www/linux-c6-flashplugin11/distinfo Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/www/linux-c6-flashplugin11/Makefile ============================================================================== --- branches/2015Q2/www/linux-c6-flashplugin11/Makefile Sat Apr 18 06:53:24 2015 (r384209) +++ branches/2015Q2/www/linux-c6-flashplugin11/Makefile Sat Apr 18 07:35:49 2015 (r384210) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= flashplugin -PORTVERSION= 11.2r202.451 -PORTREVISION= 1 +PORTVERSION= 11.2r202.457 CATEGORIES= www multimedia linux MASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:S/r/./}/:plugin \ LOCAL/nox:suplib Modified: branches/2015Q2/www/linux-c6-flashplugin11/distinfo ============================================================================== --- branches/2015Q2/www/linux-c6-flashplugin11/distinfo Sat Apr 18 06:53:24 2015 (r384209) +++ branches/2015Q2/www/linux-c6-flashplugin11/distinfo Sat Apr 18 07:35:49 2015 (r384210) @@ -1,4 +1,4 @@ -SHA256 (flashplugin/11.2r202.451/install_flash_player_11_linux.i386.tar.gz) = ba4dfc6450a48941c440994580751da604e86502aef5a1a11caec1f19be9fbd2 -SIZE (flashplugin/11.2r202.451/install_flash_player_11_linux.i386.tar.gz) = 6931380 -SHA256 (flashplugin/11.2r202.451/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf -SIZE (flashplugin/11.2r202.451/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455 +SHA256 (flashplugin/11.2r202.457/install_flash_player_11_linux.i386.tar.gz) = 6c123f7ef61a8a3ae92ffe75ce635f47718193d8360c191d4076ae60562e3462 +SIZE (flashplugin/11.2r202.457/install_flash_player_11_linux.i386.tar.gz) = 6933677 +SHA256 (flashplugin/11.2r202.457/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf +SIZE (flashplugin/11.2r202.457/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455 From owner-svn-ports-branches@FreeBSD.ORG Sat Apr 18 15:22:21 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E1A9E7D9; Sat, 18 Apr 2015 15:22:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B70F2B5D; Sat, 18 Apr 2015 15:22:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3IFMLaO071890; Sat, 18 Apr 2015 15:22:21 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3IFML65071889; Sat, 18 Apr 2015 15:22:21 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201504181522.t3IFML65071889@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 18 Apr 2015 15:22:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384231 - branches/2015Q2/math/yacas X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Apr 2015 15:22:22 -0000 Author: riggs Date: Sat Apr 18 15:22:20 2015 New Revision: 384231 URL: https://svnweb.freebsd.org/changeset/ports/384231 Log: MFH: r384228 Un-break build on 8.x PR: 199244 Submitted by: tkato432@yahoo.com Approved by: portmgr (erwin) Modified: branches/2015Q2/math/yacas/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/math/yacas/Makefile ============================================================================== --- branches/2015Q2/math/yacas/Makefile Sat Apr 18 15:20:38 2015 (r384230) +++ branches/2015Q2/math/yacas/Makefile Sat Apr 18 15:22:20 2015 (r384231) @@ -13,39 +13,40 @@ COMMENT= Yet Another Computer Algebra Sy LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -OPTIONS_DEFINE= DOCS - +USES= compiler:c++11-lib libtool GNU_CONFIGURE= yes -USES= libtool +CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} INSTALL_TARGET= install-strip +USE_LDCONFIG= yes -.include +PORTDOCS= * -.if ${ARCH} == "sparc64" -BROKEN= Does not compile with GCC 4.2 -.endif +OPTIONS_DEFINE= DOCS -.if ${PORT_OPTIONS:MDOCS} -CONFIGURE_ARGS+=--enable-html-doc --with-html-dir=${DOCSDIR} -PORTDOCS= * -USES+= perl5 -USE_PERL5= build -.else -CONFIGURE_ARGS+=--disable-html-doc +DOCS_USES= perl5 +DOCS_USE= perl5=build +DOCS_CONFIGURE_ENABLE= html-doc + +.include + +.if ${CHOSEN_COMPILER_TYPE} == "gcc" +CPPFLAGS+= -D_GLIBCXX_USE_C99 .endif post-patch: + @${REINPLACE_CMD} -e \ + 's|"GNU strip"|"strip"|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + 's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/src/yacasmain.cpp # Can't use USES=shebangfix here, cause the path appears several # times in the file. - @${REINPLACE_CMD} -e 's| /bin/bash| ${LOCALBASE}/bin/bash|g' \ - ${WRKSRC}/tests/test-yacas - @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' \ - ${WRKSRC}/src/yacasmain.cpp + @${REINPLACE_CMD} -e \ + 's| /bin/bash| ${LOCALBASE}/bin/bash|g' \ + ${WRKSRC}/tests/test-yacas regression-test: build -# This requires bash. I don't add it as a dependency to the port, as it's -# not needed for the general use. - @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ - ${MAKEFILE} check ${MAKE_ARGS}) +# This requires bash. I don't add it as a dependency to the port, as +# it's not needed for the general use. + @(cd ${WRKSRC} && ${DO_MAKE_BUILD} check) -.include +.include From owner-svn-ports-branches@FreeBSD.ORG Sat Apr 18 16:12:50 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 178B08C4; Sat, 18 Apr 2015 16:12:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 050A5FDC; Sat, 18 Apr 2015 16:12:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3IGCnor018403; Sat, 18 Apr 2015 16:12:49 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3IGCmKb018387; Sat, 18 Apr 2015 16:12:48 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201504181612.t3IGCmKb018387@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Sat, 18 Apr 2015 16:12:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384238 - branches/2015Q2/devel/p4 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Apr 2015 16:12:50 -0000 Author: gordon Date: Sat Apr 18 16:12:48 2015 New Revision: 384238 URL: https://svnweb.freebsd.org/changeset/ports/384238 Log: MFH: r384236 Update to 2014.2/1033284 to fix checksum mismatch. Approved by: mentor (mat, implicit) Approved by: portmgr (erwin) Modified: branches/2015Q2/devel/p4/Makefile branches/2015Q2/devel/p4/distinfo.freebsd100x86 branches/2015Q2/devel/p4/distinfo.freebsd100x86_64 branches/2015Q2/devel/p4/distinfo.freebsd70x86 branches/2015Q2/devel/p4/distinfo.freebsd70x86_64 Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/devel/p4/Makefile ============================================================================== --- branches/2015Q2/devel/p4/Makefile Sat Apr 18 16:09:59 2015 (r384237) +++ branches/2015Q2/devel/p4/Makefile Sat Apr 18 16:12:48 2015 (r384238) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= p4 -PORTVERSION= 2014.2.978861 +PORTVERSION= 2014.2.1033284 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ @@ -13,8 +13,6 @@ EXTRACT_ONLY= # none MAINTAINER= gordon@FreeBSD.org COMMENT= Perforce client -BROKEN= Checksum mismatch - ONLY_FOR_ARCHS= amd64 i386 P4VERSION= r${PORTVERSION:S/^20//:C/\.[0-9]+$//} Modified: branches/2015Q2/devel/p4/distinfo.freebsd100x86 ============================================================================== --- branches/2015Q2/devel/p4/distinfo.freebsd100x86 Sat Apr 18 16:09:59 2015 (r384237) +++ branches/2015Q2/devel/p4/distinfo.freebsd100x86 Sat Apr 18 16:12:48 2015 (r384238) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.978861/bin.freebsd100x86/p4) = ca2bccfc1e3a447ddfba3472f922053c60a86745b0de91d8372bee14fef344ef -SIZE (perforce/2014.2.978861/bin.freebsd100x86/p4) = 2474416 +SHA256 (perforce/2014.2.1033284/bin.freebsd100x86/p4) = fdca0878416a9bec5ee2552e4b803883468c454fb8eb9ea7b9cdaa06b0f829a5 +SIZE (perforce/2014.2.1033284/bin.freebsd100x86/p4) = 2474416 Modified: branches/2015Q2/devel/p4/distinfo.freebsd100x86_64 ============================================================================== --- branches/2015Q2/devel/p4/distinfo.freebsd100x86_64 Sat Apr 18 16:09:59 2015 (r384237) +++ branches/2015Q2/devel/p4/distinfo.freebsd100x86_64 Sat Apr 18 16:12:48 2015 (r384238) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.978861/bin.freebsd100x86_64/p4) = 446aa0bbe89f08ea864f8d33ad473d9e58379ef0782e0c395a7597a4cb2aa9f6 -SIZE (perforce/2014.2.978861/bin.freebsd100x86_64/p4) = 2732720 +SHA256 (perforce/2014.2.1033284/bin.freebsd100x86_64/p4) = 2a0f1e290b3938a3dfc8d40129f635afb14eb98a6305b6da9192b534395d34bb +SIZE (perforce/2014.2.1033284/bin.freebsd100x86_64/p4) = 2732720 Modified: branches/2015Q2/devel/p4/distinfo.freebsd70x86 ============================================================================== --- branches/2015Q2/devel/p4/distinfo.freebsd70x86 Sat Apr 18 16:09:59 2015 (r384237) +++ branches/2015Q2/devel/p4/distinfo.freebsd70x86 Sat Apr 18 16:12:48 2015 (r384238) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.978861/bin.freebsd70x86/p4) = 4883ed408bbd00b3d23ea2691b9ca110a5723b077ff04284e6b06fa1c93ee2f3 -SIZE (perforce/2014.2.978861/bin.freebsd70x86/p4) = 2555504 +SHA256 (perforce/2014.2.1033284/bin.freebsd70x86/p4) = 5bcde41d8b74f0d04ef840e2006dfabd08ae1a68b9855492a4921d42f47993ed +SIZE (perforce/2014.2.1033284/bin.freebsd70x86/p4) = 2555504 Modified: branches/2015Q2/devel/p4/distinfo.freebsd70x86_64 ============================================================================== --- branches/2015Q2/devel/p4/distinfo.freebsd70x86_64 Sat Apr 18 16:09:59 2015 (r384237) +++ branches/2015Q2/devel/p4/distinfo.freebsd70x86_64 Sat Apr 18 16:12:48 2015 (r384238) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.978861/bin.freebsd70x86_64/p4) = 2565f2170b0b0018a11fc5756a0e880d7f65ec6e8dc7a140f93373a72ade494a -SIZE (perforce/2014.2.978861/bin.freebsd70x86_64/p4) = 2716456 +SHA256 (perforce/2014.2.1033284/bin.freebsd70x86_64/p4) = b93538622cfd4101526959c571b172843326771ef4fd200cd1c22bfe8ce672da +SIZE (perforce/2014.2.1033284/bin.freebsd70x86_64/p4) = 2716456 From owner-svn-ports-branches@FreeBSD.ORG Sat Apr 18 23:57:00 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CA35D71B; Sat, 18 Apr 2015 23:57:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B86BF3F6; Sat, 18 Apr 2015 23:57:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3INv0Xc009380; Sat, 18 Apr 2015 23:57:00 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3INuxs2009357; Sat, 18 Apr 2015 23:56:59 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201504182356.t3INuxs2009357@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Sat, 18 Apr 2015 23:56:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384259 - branches/2015Q2/devel/p4d X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Apr 2015 23:57:01 -0000 Author: gordon Date: Sat Apr 18 23:56:58 2015 New Revision: 384259 URL: https://svnweb.freebsd.org/changeset/ports/384259 Log: MFH: r384237 Update to 2014.2/1033284. Approved by: mentor (mat, implicit) Approved by: portmgr (erwin) Modified: branches/2015Q2/devel/p4d/Makefile branches/2015Q2/devel/p4d/distinfo.freebsd100x86 branches/2015Q2/devel/p4d/distinfo.freebsd100x86_64 branches/2015Q2/devel/p4d/distinfo.freebsd70x86 branches/2015Q2/devel/p4d/distinfo.freebsd70x86_64 Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/devel/p4d/Makefile ============================================================================== --- branches/2015Q2/devel/p4d/Makefile Sat Apr 18 23:46:09 2015 (r384258) +++ branches/2015Q2/devel/p4d/Makefile Sat Apr 18 23:56:58 2015 (r384259) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= p4d -PORTVERSION= 2014.2.1014956 +PORTVERSION= 2014.2.1033284 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ Modified: branches/2015Q2/devel/p4d/distinfo.freebsd100x86 ============================================================================== --- branches/2015Q2/devel/p4d/distinfo.freebsd100x86 Sat Apr 18 23:46:09 2015 (r384258) +++ branches/2015Q2/devel/p4d/distinfo.freebsd100x86 Sat Apr 18 23:56:58 2015 (r384259) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.1014956/bin.freebsd100x86/p4d) = da25e30025cb3669b9bcef679b55d570aeb96d9cea3acc550c176397afca10e7 -SIZE (perforce/2014.2.1014956/bin.freebsd100x86/p4d) = 4709072 +SHA256 (perforce/2014.2.1033284/bin.freebsd100x86/p4d) = 8d4866fa1aa640e5f1914d41d72f85226dd1620bdb2edc8057fff229c8906371 +SIZE (perforce/2014.2.1033284/bin.freebsd100x86/p4d) = 4715188 Modified: branches/2015Q2/devel/p4d/distinfo.freebsd100x86_64 ============================================================================== --- branches/2015Q2/devel/p4d/distinfo.freebsd100x86_64 Sat Apr 18 23:46:09 2015 (r384258) +++ branches/2015Q2/devel/p4d/distinfo.freebsd100x86_64 Sat Apr 18 23:56:58 2015 (r384259) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.1014956/bin.freebsd100x86_64/p4d) = 32388232ae7ba7ab702c3097e1834554c7f0f2ce8d9c59c3f2cd70e5449d227b -SIZE (perforce/2014.2.1014956/bin.freebsd100x86_64/p4d) = 4872720 +SHA256 (perforce/2014.2.1033284/bin.freebsd100x86_64/p4d) = 8ba490e1d65915dbe5a94ca65225a5b1aeca680468665fbbc6e643b7bb5b2a84 +SIZE (perforce/2014.2.1033284/bin.freebsd100x86_64/p4d) = 4878544 Modified: branches/2015Q2/devel/p4d/distinfo.freebsd70x86 ============================================================================== --- branches/2015Q2/devel/p4d/distinfo.freebsd70x86 Sat Apr 18 23:46:09 2015 (r384258) +++ branches/2015Q2/devel/p4d/distinfo.freebsd70x86 Sat Apr 18 23:56:58 2015 (r384259) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.1014956/bin.freebsd70x86/p4d) = 41d537a2f8e8d90ff0394906bc25bb13fd786e4cb7832f35dbf6a1438680724c -SIZE (perforce/2014.2.1014956/bin.freebsd70x86/p4d) = 5065984 +SHA256 (perforce/2014.2.1033284/bin.freebsd70x86/p4d) = 7f27cdf630d2fc94e7740944dee23f76893f2be344f6bd9ae4dcc29f724f8cf4 +SIZE (perforce/2014.2.1033284/bin.freebsd70x86/p4d) = 5071040 Modified: branches/2015Q2/devel/p4d/distinfo.freebsd70x86_64 ============================================================================== --- branches/2015Q2/devel/p4d/distinfo.freebsd70x86_64 Sat Apr 18 23:46:09 2015 (r384258) +++ branches/2015Q2/devel/p4d/distinfo.freebsd70x86_64 Sat Apr 18 23:56:58 2015 (r384259) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.1014956/bin.freebsd70x86_64/p4d) = ef38753af1d4deef74ee0b2796b932e6ef549fc9c76a4ed7df3fd585769a8dc7 -SIZE (perforce/2014.2.1014956/bin.freebsd70x86_64/p4d) = 5237696 +SHA256 (perforce/2014.2.1033284/bin.freebsd70x86_64/p4d) = 32d07370bf34f07a8e1d83dce66970ba2b6659e7b7eccc8b517456c48d8ca749 +SIZE (perforce/2014.2.1033284/bin.freebsd70x86_64/p4d) = 5243488