From owner-svn-ports-branches@FreeBSD.ORG Sun Oct 26 11:39:55 2014 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 23A02439; Sun, 26 Oct 2014 11: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 0F372D11; Sun, 26 Oct 2014 11: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 s9QBds0i048880; Sun, 26 Oct 2014 11:39:54 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9QBdsue048879; Sun, 26 Oct 2014 11:39:54 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201410261139.s9QBdsue048879@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sun, 26 Oct 2014 11:39:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r371501 - branches/2014Q4/security/tripwire/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, 26 Oct 2014 11:39:55 -0000 Author: antoine Date: Sun Oct 26 11:39:54 2014 New Revision: 371501 URL: https://svnweb.freebsd.org/changeset/ports/371501 QAT: https://qat.redports.org/buildarchive/r371501/ Log: MFH: r371500 Do not infinite loop on the package builders creating GB (or TB) of logs Modified: branches/2014Q4/security/tripwire/files/pkg-deinstall.in Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/security/tripwire/files/pkg-deinstall.in ============================================================================== --- branches/2014Q4/security/tripwire/files/pkg-deinstall.in Sun Oct 26 11:38:50 2014 (r371500) +++ branches/2014Q4/security/tripwire/files/pkg-deinstall.in Sun Oct 26 11:39:54 2014 (r371501) @@ -2,6 +2,9 @@ case $2 in POST-DEINSTALL) + if [ -n "${PACKAGE_BUILDING}" ]; then + return 0 + fi if [ -d %%TWCFG%% -o -d %%TWDB%% ]; then unset ANS echo From owner-svn-ports-branches@FreeBSD.ORG Tue Oct 28 12:23:37 2014 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 A806067B; Tue, 28 Oct 2014 12:23:37 +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 9420E1F2; Tue, 28 Oct 2014 12:23:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9SCNbNX023007; Tue, 28 Oct 2014 12:23:37 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9SCNbxG023001; Tue, 28 Oct 2014 12:23:37 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201410281223.s9SCNbxG023001@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 28 Oct 2014 12:23:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r371627 - in branches/2014Q4/games/uqm: . 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: Tue, 28 Oct 2014 12:23:37 -0000 Author: amdmi3 Date: Tue Oct 28 12:23:36 2014 New Revision: 371627 URL: https://svnweb.freebsd.org/changeset/ports/371627 QAT: https://qat.redports.org/buildarchive/r371627/ Log: MFH: r371608 - Fix installation wrt. staging Approved by: portmgr Modified: branches/2014Q4/games/uqm/Makefile branches/2014Q4/games/uqm/files/patch-build-unix-build_functions Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/games/uqm/Makefile ============================================================================== --- branches/2014Q4/games/uqm/Makefile Tue Oct 28 12:11:40 2014 (r371626) +++ branches/2014Q4/games/uqm/Makefile Tue Oct 28 12:23:36 2014 (r371627) @@ -3,7 +3,7 @@ PORTNAME= uqm PORTVERSION= 0.7.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= SF/sc2/UQM/${PORTVERSION:R} DISTFILES= ${PORTNAME}-${PORTVERSION}-source.tgz ${PORTNAME}-${DATAVERSION}-content.uqm @@ -86,7 +86,7 @@ do-configure: @${ECHO_CMD} CHOICE_accel_VALUE=\'plainc\' >> ${WRKSRC}/config.state .endif @${ECHO_CMD} CHOICE_threadlib_VALUE=\'sdl\' >> ${WRKSRC}/config.state - @${ECHO_CMD} INPUT_install_prefix_VALUE=\'${STAGEDIR}${PREFIX}\' >> ${WRKSRC}/config.state + @${ECHO_CMD} INPUT_install_prefix_VALUE=\'${PREFIX}\' >> ${WRKSRC}/config.state @${ECHO_CMD} INPUT_install_bindir_VALUE=\''$$prefix/bin'\' >> ${WRKSRC}/config.state @${ECHO_CMD} INPUT_install_libdir_VALUE=\''$$prefix/lib'\' >> ${WRKSRC}/config.state @${ECHO_CMD} INPUT_install_sharedir_VALUE=\''$$prefix/share'\' >> ${WRKSRC}/config.state @@ -96,7 +96,7 @@ do-build: @(cd ${WRKSRC} && ./build.sh uqm) do-install: - @(cd ${WRKSRC} && ./build.sh uqm install) + @(cd ${WRKSRC} && ${SETENV} STAGEDIR="${STAGEDIR}" ./build.sh uqm install) post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/uqm/uqm Modified: branches/2014Q4/games/uqm/files/patch-build-unix-build_functions ============================================================================== --- branches/2014Q4/games/uqm/files/patch-build-unix-build_functions Tue Oct 28 12:11:40 2014 (r371626) +++ branches/2014Q4/games/uqm/files/patch-build-unix-build_functions Tue Oct 28 12:23:36 2014 (r371627) @@ -1,5 +1,5 @@ --- build/unix/build_functions.orig 2011-05-20 23:25:22.000000000 +0400 -+++ build/unix/build_functions 2013-01-08 19:54:57.000000000 +0400 ++++ build/unix/build_functions 2014-09-11 17:04:15.000000000 +0400 @@ -56,7 +56,7 @@ eval "${TARGET}_requirements" eval "${TARGET}_prepare_config" @@ -9,3 +9,49 @@ eval "${TARGET}_save_config" } +@@ -264,39 +264,39 @@ + echo "Installing system-dependent data..." >&2 + eval LIBS="\${${BUILD_PROJECT}_INSTALL_LIBS}" + eval LIBDIR="\${${BUILD_PROJECT}_INSTALL_LIBDIR%/}/" +- mkdirhier "$LIBDIR" 0755 ++ mkdirhier "${STAGEDIR}$LIBDIR" 0755 + for LIB in $LIBS; do + eval SRC="\${${BUILD_PROJECT}_INSTALL_LIB_${LIB}_SRC%/}" + eval DEST="\$LIBDIR\${${BUILD_PROJECT}_INSTALL_LIB_${LIB}_DEST}" + eval MODE="\${${BUILD_PROJECT}_INSTALL_LIB_${LIB}_MODE}" + eval OWNER="\${${BUILD_PROJECT}_INSTALL_LIB_${LIB}_OWNER}" +- installsome "$SRC" "$DEST" "$MODE" "$OWNER" ++ installsome "$SRC" "${STAGEDIR}$DEST" "$MODE" "$OWNER" + done + + local SHARE SHARED SHAREDIR + echo "Installing system-independent data..." >&2 + eval SHARED="\${${BUILD_PROJECT}_INSTALL_SHARED}" + eval SHAREDIR="\${${BUILD_PROJECT}_INSTALL_SHAREDIR%/}/" +- mkdirhier "$SHAREDIR" 0755 ++ mkdirhier "${STAGEDIR}$SHAREDIR" 0755 + for SHARE in $SHARED; do + eval SRC="\${${BUILD_PROJECT}_INSTALL_SHARED_${SHARE}_SRC%/}" + eval DEST="\$SHAREDIR\${${BUILD_PROJECT}_INSTALL_SHARED_${SHARE}_DEST}" + eval MODE="\${${BUILD_PROJECT}_INSTALL_SHARED_${SHARE}_MODE}" + eval OWNER="\${${BUILD_PROJECT}_INSTALL_SHARED_${SHARE}_OWNER}" +- installsome "$SRC" "$DEST" "$MODE" "$OWNER" ++ installsome "$SRC" "${STAGEDIR}$DEST" "$MODE" "$OWNER" + done + + local BINS BINDIR + echo "Installing binaries..." >&2 + eval BINS="\${${BUILD_PROJECT}_INSTALL_BINS}" + eval BINDIR="\${${BUILD_PROJECT}_INSTALL_BINDIR%/}/" +- mkdirhier "$BINDIR" 0755 ++ mkdirhier "${STAGEDIR}$BINDIR" 0755 + for BIN in $BINS; do + eval SRC="\${${BUILD_PROJECT}_INSTALL_BIN_${BIN}_SRC%/}" + eval DEST="\$BINDIR\${${BUILD_PROJECT}_INSTALL_BIN_${BIN}_DEST}" + eval MODE="\${${BUILD_PROJECT}_INSTALL_BIN_${BIN}_MODE}" + eval OWNER="\${${BUILD_PROJECT}_INSTALL_BIN_${BIN}_OWNER}" +- installsome "$SRC" "$DEST" "$MODE" "$OWNER" ++ installsome "$SRC" "${STAGEDIR}$DEST" "$MODE" "$OWNER" + done + + eval "${TARGET}_post_install" From owner-svn-ports-branches@FreeBSD.ORG Tue Oct 28 12:24:55 2014 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 247D0772; Tue, 28 Oct 2014 12:24: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 EAC741FF; Tue, 28 Oct 2014 12:24:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9SCOsbd023345; Tue, 28 Oct 2014 12:24:54 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9SCOslP023343; Tue, 28 Oct 2014 12:24:54 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201410281224.s9SCOslP023343@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 28 Oct 2014 12:24:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r371628 - branches/2014Q4/multimedia/mythtv-frontend 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: Tue, 28 Oct 2014 12:24:55 -0000 Author: amdmi3 Date: Tue Oct 28 12:24:54 2014 New Revision: 371628 URL: https://svnweb.freebsd.org/changeset/ports/371628 QAT: https://qat.redports.org/buildarchive/r371628/ Log: MFH: r371612 - Fix plist Approved by: portmgr Modified: branches/2014Q4/multimedia/mythtv-frontend/Makefile branches/2014Q4/multimedia/mythtv-frontend/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/multimedia/mythtv-frontend/Makefile ============================================================================== --- branches/2014Q4/multimedia/mythtv-frontend/Makefile Tue Oct 28 12:23:36 2014 (r371627) +++ branches/2014Q4/multimedia/mythtv-frontend/Makefile Tue Oct 28 12:24:54 2014 (r371628) @@ -3,7 +3,7 @@ PORTNAME= mythtv-frontend PORTVERSION= 0.27.0.20140121 -PORTREVISION= 4 +PORTREVISION= 6 CATEGORIES= multimedia MASTER_SITES= http://people.freebsd.org/~decke/distfiles/ DISTNAME= mythtv-${PORTVERSION} Modified: branches/2014Q4/multimedia/mythtv-frontend/pkg-plist ============================================================================== --- branches/2014Q4/multimedia/mythtv-frontend/pkg-plist Tue Oct 28 12:23:36 2014 (r371627) +++ branches/2014Q4/multimedia/mythtv-frontend/pkg-plist Tue Oct 28 12:24:54 2014 (r371628) @@ -223,6 +223,7 @@ include/mythtv/libmythbase/mythobservabl include/mythtv/libmythbase/mythplugin.h include/mythtv/libmythbase/mythpluginapi.h include/mythtv/libmythbase/mythqtcompat.h +include/mythtv/libmythbase/mythsingledownload.h include/mythtv/libmythbase/mythsocket.h include/mythtv/libmythbase/mythsocket_cb.h include/mythtv/libmythbase/mythstorage.h @@ -297,6 +298,7 @@ include/mythtv/libmythui/mythmainwindow. include/mythtv/libmythui/mythnotification.h include/mythtv/libmythui/mythnotificationcenter.h include/mythtv/libmythui/mythpainter.h +include/mythtv/libmythui/mythpainter_ogl.h include/mythtv/libmythui/mythpainter_qt.h include/mythtv/libmythui/mythprogressdialog.h include/mythtv/libmythui/mythrect.h @@ -407,6 +409,7 @@ include/mythtv/mythplugin.h include/mythtv/mythpluginapi.h include/mythtv/mythqtcompat.h include/mythtv/mythrssmanager.h +include/mythtv/mythsingledownload.h include/mythtv/mythsocket.h include/mythtv/mythsocket_cb.h include/mythtv/mythstorage.h From owner-svn-ports-branches@FreeBSD.ORG Tue Oct 28 12:26:47 2014 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 436FF872; Tue, 28 Oct 2014 12:26:47 +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 2F69A212; Tue, 28 Oct 2014 12:26:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9SCQlBG023773; Tue, 28 Oct 2014 12:26:47 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9SCQlxO023772; Tue, 28 Oct 2014 12:26:47 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201410281226.s9SCQlxO023772@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 28 Oct 2014 12:26:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r371629 - branches/2014Q4/graphics/kphotoalbum-kde4 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: Tue, 28 Oct 2014 12:26:47 -0000 Author: amdmi3 Date: Tue Oct 28 12:26:46 2014 New Revision: 371629 URL: https://svnweb.freebsd.org/changeset/ports/371629 QAT: https://qat.redports.org/buildarchive/r371629/ Log: MFH: r371613 - Fix shebangs Approved by: portmgr Modified: branches/2014Q4/graphics/kphotoalbum-kde4/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/graphics/kphotoalbum-kde4/Makefile ============================================================================== --- branches/2014Q4/graphics/kphotoalbum-kde4/Makefile Tue Oct 28 12:24:54 2014 (r371628) +++ branches/2014Q4/graphics/kphotoalbum-kde4/Makefile Tue Oct 28 12:26:46 2014 (r371629) @@ -3,7 +3,7 @@ PORTNAME= kphotoalbum PORTVERSION= 4.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src DIST_SUBDIR= KDE @@ -14,7 +14,8 @@ COMMENT= Image viewer and organizer for LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ libexiv2.so:${PORTSDIR}/graphics/exiv2 -USES= cmake:outsource pkgconfig tar:bzip2 +USES= cmake:outsource pkgconfig shebangfix tar:bzip2 +SHEBANG_FILES= script/open-raw.pl script/kpa-backup.sh USE_KDE4= kdehier kdelibs kdeprefix libkdcraw libkipi automoc4 USE_QT4= phonon sql \ qmake_build moc_build rcc_build uic_build From owner-svn-ports-branches@FreeBSD.ORG Tue Oct 28 12:28:23 2014 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 EE41E9BC; Tue, 28 Oct 2014 12:28:23 +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 DAF48230; Tue, 28 Oct 2014 12:28:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9SCSNZh024167; Tue, 28 Oct 2014 12:28:23 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9SCSNWA024165; Tue, 28 Oct 2014 12:28:23 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201410281228.s9SCSNWA024165@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 28 Oct 2014 12:28:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r371630 - branches/2014Q4/audio/xmms2 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: Tue, 28 Oct 2014 12:28:24 -0000 Author: amdmi3 Date: Tue Oct 28 12:28:22 2014 New Revision: 371630 URL: https://svnweb.freebsd.org/changeset/ports/371630 QAT: https://qat.redports.org/buildarchive/r371630/ Log: MFH: r371614 - Fix plist for MDNS_AVAHI option Approved by: portmgr Modified: branches/2014Q4/audio/xmms2/Makefile branches/2014Q4/audio/xmms2/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/audio/xmms2/Makefile ============================================================================== --- branches/2014Q4/audio/xmms2/Makefile Tue Oct 28 12:26:46 2014 (r371629) +++ branches/2014Q4/audio/xmms2/Makefile Tue Oct 28 12:28:22 2014 (r371630) @@ -4,7 +4,7 @@ PORTNAME?= xmms2 PORTVERSION= 0.8 DISTVERSIONSUFFIX=DrO_o -PORTREVISION?= 12 +PORTREVISION?= 13 CATEGORIES?= audio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX} Modified: branches/2014Q4/audio/xmms2/pkg-plist ============================================================================== --- branches/2014Q4/audio/xmms2/pkg-plist Tue Oct 28 12:26:46 2014 (r371629) +++ branches/2014Q4/audio/xmms2/pkg-plist Tue Oct 28 12:28:22 2014 (r371630) @@ -136,6 +136,7 @@ libdata/pkgconfig/xmms2-client.pc libdata/pkgconfig/xmms2-plugin.pc %%ET%%man/man1/xmms2-et.1.gz man/man1/xmms2-launcher.1.gz +%%MDNS_AVAHI%%man/man1/xmms2-mdns-avahi.1.gz man/man1/xmms2.1.gz man/man1/xmms2d.1.gz share/pixmaps/xmms2-128.png From owner-svn-ports-branches@FreeBSD.ORG Tue Oct 28 12:58:31 2014 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 4A82E1A6; Tue, 28 Oct 2014 12:58:31 +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 3613C83D; Tue, 28 Oct 2014 12:58:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9SCwVGl038446; Tue, 28 Oct 2014 12:58:31 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9SCwU6d038444; Tue, 28 Oct 2014 12:58:30 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201410281258.s9SCwU6d038444@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 28 Oct 2014 12:58:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r371631 - branches/2014Q4/security/gnutls 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: Tue, 28 Oct 2014 12:58:31 -0000 Author: amdmi3 Date: Tue Oct 28 12:58:30 2014 New Revision: 371631 URL: https://svnweb.freebsd.org/changeset/ports/371631 QAT: https://qat.redports.org/buildarchive/r371631/ Log: MFH: r371615 - Fix plist for LIBDANE option Approved by: portmgr Modified: branches/2014Q4/security/gnutls/Makefile branches/2014Q4/security/gnutls/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/security/gnutls/Makefile ============================================================================== --- branches/2014Q4/security/gnutls/Makefile Tue Oct 28 12:28:22 2014 (r371630) +++ branches/2014Q4/security/gnutls/Makefile Tue Oct 28 12:58:30 2014 (r371631) @@ -2,7 +2,7 @@ PORTNAME= gnutls PORTVERSION= 3.2.16 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security net MASTER_SITES= GNUPG/gnutls/v3.2 Modified: branches/2014Q4/security/gnutls/pkg-plist ============================================================================== --- branches/2014Q4/security/gnutls/pkg-plist Tue Oct 28 12:28:22 2014 (r371630) +++ branches/2014Q4/security/gnutls/pkg-plist Tue Oct 28 12:58:30 2014 (r371631) @@ -11,6 +11,7 @@ bin/srptool include/gnutls/abstract.h include/gnutls/compat.h include/gnutls/crypto.h +%%LIBDANE%%include/gnutls/dane.h include/gnutls/dtls.h include/gnutls/gnutls.h include/gnutls/gnutlsxx.h @@ -53,7 +54,9 @@ lib/libgnutlsxx.so lib/libgnutlsxx.so.28 lib/libgnutlsxx.so.28.1.0 libdata/pkgconfig/gnutls.pc +%%LIBDANE%%libdata/pkgconfig/gnutls-dane.pc man/man1/certtool.1.gz +%%LIBDANE%%man/man1/danetool.1.gz man/man1/gnutls-cli-debug.1.gz man/man1/gnutls-cli.1.gz man/man1/gnutls-serv.1.gz From owner-svn-ports-branches@FreeBSD.ORG Tue Oct 28 13:26:50 2014 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 B6B926E6; Tue, 28 Oct 2014 13:26: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 A2B94B19; Tue, 28 Oct 2014 13:26: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 s9SDQo6l053638; Tue, 28 Oct 2014 13:26:50 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9SDQoq0053637; Tue, 28 Oct 2014 13:26:50 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201410281326.s9SDQoq0053637@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 28 Oct 2014 13:26:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r371633 - branches/2014Q4/graphics/graphviz 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: Tue, 28 Oct 2014 13:26:50 -0000 Author: amdmi3 Date: Tue Oct 28 13:26:49 2014 New Revision: 371633 URL: https://svnweb.freebsd.org/changeset/ports/371633 QAT: https://qat.redports.org/buildarchive/r371633/ Log: MFH: r371616 - Fix build for SMYRNA option Approved by: portmgr Modified: branches/2014Q4/graphics/graphviz/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/graphics/graphviz/Makefile ============================================================================== --- branches/2014Q4/graphics/graphviz/Makefile Tue Oct 28 13:26:40 2014 (r371632) +++ branches/2014Q4/graphics/graphviz/Makefile Tue Oct 28 13:26:49 2014 (r371633) @@ -88,7 +88,7 @@ PANGOCAIRO_USE= GNOME=pango XORG=xrender LIBRSVG2_USE= GNOME=librsvg2 GL=gl,glu,glut GTK2_USE= XORG=sm,ice,xext,xinerama,xi,xrandr,xcursor,xfixes GNOME=gtk20 GNOMEUI_USE= GNOME=libgnomeui -SMYRNA_USE= GNOME=libglade2 +SMYRNA_USE= GNOME=libglade2 GL=glut GVEDIT_USE= qt4=qmake_build,moc_build,rcc_build,uic_build \ qt4=linguist_build,corelib,gui GHOSTSCRIPT_USE=GHOSTSCRIPT=yes From owner-svn-ports-branches@FreeBSD.ORG Tue Oct 28 13:27:54 2014 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 1495F863; Tue, 28 Oct 2014 13:27:54 +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 002D1B3C; Tue, 28 Oct 2014 13:27:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9SDRrLc053904; Tue, 28 Oct 2014 13:27:53 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9SDRrQc053903; Tue, 28 Oct 2014 13:27:53 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201410281327.s9SDRrQc053903@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 28 Oct 2014 13:27:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r371634 - branches/2014Q4/games/arx-libertatis 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: Tue, 28 Oct 2014 13:27:54 -0000 Author: amdmi3 Date: Tue Oct 28 13:27:53 2014 New Revision: 371634 URL: https://svnweb.freebsd.org/changeset/ports/371634 QAT: https://qat.redports.org/buildarchive/r371634/ Log: MFH: r371617 - Add workaround for clang bug, seems like it's unlikely to be fixed before 10.1-RELEASE Approved by: portmgr Modified: branches/2014Q4/games/arx-libertatis/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/games/arx-libertatis/Makefile ============================================================================== --- branches/2014Q4/games/arx-libertatis/Makefile Tue Oct 28 13:26:49 2014 (r371633) +++ branches/2014Q4/games/arx-libertatis/Makefile Tue Oct 28 13:27:53 2014 (r371634) @@ -41,6 +41,13 @@ CMAKE_ARGS+= -DBUILD_CRASHREPORTER=OFF PLIST_SUB+= CRASHREPORTER="@comment " .endif +.if ${OSVERSION} >= 1000705 +# Workaround for clang 3.4 bug: it crashes when debug info is enabled +# See http://llvm.org/bugs/show_bug.cgi?id=19031, http://llvm.org/bugs/show_bug.cgi?id=20893 +post-patch: + @${REINPLACE_CMD} -e '/add_cxxflag.*-g2/ d' ${WRKSRC}/CMakeLists.txt +.endif + post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} From owner-svn-ports-branches@FreeBSD.ORG Wed Oct 29 08:06:18 2014 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 332645E8; Wed, 29 Oct 2014 08:06:18 +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 04F13116; Wed, 29 Oct 2014 08:06:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9T86H95085592; Wed, 29 Oct 2014 08:06:17 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9T86H0m085588; Wed, 29 Oct 2014 08:06:17 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201410290806.s9T86H0m085588@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Wed, 29 Oct 2014 08:06:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r371667 - branches/2014Q4/www/chromium 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: Wed, 29 Oct 2014 08:06:18 -0000 Author: rene Date: Wed Oct 29 08:06:17 2014 New Revision: 371667 URL: https://svnweb.freebsd.org/changeset/ports/371667 QAT: https://qat.redports.org/buildarchive/r371667/ Log: MFH: r371649 www/chromium: update to 38.0.2125.111 (bugfix release). Changelog: https://chromium.googlesource.com/chromium/src/+log/38.0.2125.104..38.0.2125.111?pretty=fuller&n=10000 Approved by: ports-secteam (rea) Modified: branches/2014Q4/www/chromium/Makefile branches/2014Q4/www/chromium/distinfo Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/www/chromium/Makefile ============================================================================== --- branches/2014Q4/www/chromium/Makefile Wed Oct 29 07:59:31 2014 (r371666) +++ branches/2014Q4/www/chromium/Makefile Wed Oct 29 08:06:17 2014 (r371667) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 38.0.2125.104 -PORTREVISION= 1 +PORTVERSION= 38.0.2125.111 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Modified: branches/2014Q4/www/chromium/distinfo ============================================================================== --- branches/2014Q4/www/chromium/distinfo Wed Oct 29 07:59:31 2014 (r371666) +++ branches/2014Q4/www/chromium/distinfo Wed Oct 29 08:06:17 2014 (r371667) @@ -1,4 +1,4 @@ -SHA256 (chromium-38.0.2125.104.tar.xz) = fcd35aef570d3304798a44f00751aa5724eba775596a8795df1a10a6db83d454 -SIZE (chromium-38.0.2125.104.tar.xz) = 248193372 -SHA256 (chromium-38.0.2125.104-testdata.tar.xz) = 742634a7a42141d0684ba153f525f7889309d9bf876cfc5cd554ac9015c8d8e5 -SIZE (chromium-38.0.2125.104-testdata.tar.xz) = 115335656 +SHA256 (chromium-38.0.2125.111.tar.xz) = e6b43c86c0dff8451c532d7411546f973aa94d755fc2ce6574d8eabe55d35a1f +SIZE (chromium-38.0.2125.111.tar.xz) = 248200356 +SHA256 (chromium-38.0.2125.111-testdata.tar.xz) = 157a7a3856fc6e92f5caa6fea87239497b7820acd217fac268f6769b6f243b0f +SIZE (chromium-38.0.2125.111-testdata.tar.xz) = 115344496 From owner-svn-ports-branches@FreeBSD.ORG Thu Oct 30 16:33:26 2014 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 79D53664; Thu, 30 Oct 2014 16:33:26 +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 5AB77F2; Thu, 30 Oct 2014 16:33:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9UGXQjk019032; Thu, 30 Oct 2014 16:33:26 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9UGXPSJ019027; Thu, 30 Oct 2014 16:33:25 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201410301633.s9UGXPSJ019027@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Thu, 30 Oct 2014 16:33:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r371760 - in branches/2014Q4/security/libssh: . 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: Thu, 30 Oct 2014 16:33:26 -0000 Author: rakuco Date: Thu Oct 30 16:33:25 2014 New Revision: 371760 URL: https://svnweb.freebsd.org/changeset/ports/371760 QAT: https://qat.redports.org/buildarchive/r371760/ Log: MFH: r371716 Update to 0.6.3 to fix CVE-2014-0017. While here, get rid of a lot of cruft: - Use an https in MASTER_SITES and stop using a snapshot URL for the tarballs. - Switch to an out-of-source CMake build with USES=cmake:outsource, and get rid of all the messing around with CMAKE_SOURCE_PATH and *_WRKSRC. - Move the LICENSE block to the right place to pet portlint. - Explicitly set CMAKE_ARGS with some options which we were already implicitly assuming to be set. - Disable examples and tests via CMAKE_ARGS instead of using an ugly sed call. - Do not pass WITH_OPENSSL=ON/OFF to CMake, this has no effect in the build system. - Stop gratuitously including bsd.port.options.mk. - Remove sed calls and patches related to the libssh_threads. I fixed some of the problems a few releases ago upstream, and the things I've removed now just look unnecessary. PR: 187595 Approved by: fluffy (implicit, and 230 days of timeout) Security: f8c88d50-5fb3-11e4-81bd-5453ed2e2b49 Approved by: ports-secteam (ray) Deleted: branches/2014Q4/security/libssh/files/ Modified: branches/2014Q4/security/libssh/Makefile branches/2014Q4/security/libssh/distinfo branches/2014Q4/security/libssh/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/security/libssh/Makefile ============================================================================== --- branches/2014Q4/security/libssh/Makefile Thu Oct 30 16:30:36 2014 (r371759) +++ branches/2014Q4/security/libssh/Makefile Thu Oct 30 16:33:25 2014 (r371760) @@ -2,38 +2,35 @@ # $FreeBSD$ PORTNAME= libssh -DISTVERSION= 0.6.1 -PORTREVISION= 1 +DISTVERSION= 0.6.3 CATEGORIES= security devel -MASTER_SITES= http://git.libssh.org/projects/libssh.git/snapshot/ \ - LOCAL/fluffy +MASTER_SITES= https://red.libssh.org/attachments/download/87/ MAINTAINER= fluffy@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 OPTIONS_SUB= yes -USES= cmake tar:bzip2 -CMAKE_SOURCE_PATH= ${WRKSRC} -CONFIGURE_WRKSRC= ${CMAKE_SOURCE_PATH}/build -BUILD_WRKSRC= ${CONFIGURE_WRKSRC} -INSTALL_WRKSRC?= ${BUILD_WRKSRC} +USES= cmake:outsource tar:xz USE_LDCONFIG= yes -LICENSE= LGPL21 -LICENSE_FILE= ${WRKSRC}/COPYING +CMAKE_ARGS= -DWITH_EXAMPLES:BOOL=OFF \ + -DWITH_GSSAPI:BOOL=ON \ + -DWITH_TESTING:BOOL=OFF \ + -DWITH_ZLIB:BOOL=ON GCRYPT_LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt GCRYPT_CMAKE_ON= -DWITH_GCRYPT:BOOL=ON GCRYPT_CMAKE_OFF= -DWITH_GCRYPT:BOOL=OFF OPENSSL_USE= openssl=yes -OPENSSL_CMAKE_ON= -DWITH_OPENSSL:BOOL=ON -OPENSSL_CMAKE_OFF= -DWITH_OPENSSL:BOOL=OFF SSH1_DESC= Build with SSH1 support SSH1_CMAKE_ON= -DWITH_SSH1:BOOL=ON @@ -42,19 +39,14 @@ SSH1_CMAKE_OFF= -DWITH_SSH1:BOOL=OFF STATIC_CMAKE_ON= -DWITH_STATIC_LIB:BOOL=ON STATIC_CMAKE_OFF= -DWITH_STATIC_LIB:BOOL=OFF -.include - post-patch: @${RM} ${PATCH_WRKSRC}/cmake/Modules/UseDoxygen.cmake - @${REINPLACE_CMD} -e '/add_subdirectory.*s)/d' \ + @${REINPLACE_CMD} \ -e 's|LIB_INSTALL_DIR}|CMAKE_INSTALL_PREFIX}/libdata|' \ -e 's|CMAKE_INSTALL_DIR}|CMAKE_INSTALL_DIR}/libssh|' \ - ${PATCH_WRKSRC}/CMakeLists.txt - @${REINPLACE_CMD} -e 's|CMAKE_HAVE_THREADS_LIBRARY|CMAKE_USE_PTHREADS_INIT|' \ - ${PATCH_WRKSRC}/src/threads/CMakeLists.txt \ - ${PATCH_WRKSRC}/src/CMakeLists.txt + ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e 's|-lssh_threads|-lssh_threads ${PTHREAD_LIBS}|' \ -e 's|$${INCLUDE_INSTALL_DIR}|$${INCLUDE_INSTALL_DIR} ${PTHREAD_CFLAGS}|' \ - ${PATCH_WRKSRC}/libssh_threads.pc.cmake + ${WRKSRC}/libssh_threads.pc.cmake .include Modified: branches/2014Q4/security/libssh/distinfo ============================================================================== --- branches/2014Q4/security/libssh/distinfo Thu Oct 30 16:30:36 2014 (r371759) +++ branches/2014Q4/security/libssh/distinfo Thu Oct 30 16:33:25 2014 (r371760) @@ -1,2 +1,2 @@ -SHA256 (libssh-0.6.1.tar.bz2) = dc48605f8d16f86199a74bfc1976e871c3201aec649b23167c8c3d683aa2117a -SIZE (libssh-0.6.1.tar.bz2) = 300257 +SHA256 (libssh-0.6.3.tar.xz) = 2bb5d7c595059f990a8915c190169257328ffa828ced0c05b09bbe186092cacb +SIZE (libssh-0.6.3.tar.xz) = 279492 Modified: branches/2014Q4/security/libssh/pkg-plist ============================================================================== --- branches/2014Q4/security/libssh/pkg-plist Thu Oct 30 16:30:36 2014 (r371759) +++ branches/2014Q4/security/libssh/pkg-plist Thu Oct 30 16:33:25 2014 (r371760) @@ -10,11 +10,11 @@ lib/cmake/libssh/libssh-config-version.c %%STATIC%%lib/libssh.a lib/libssh.so lib/libssh.so.4 -lib/libssh.so.4.4.0 +lib/libssh.so.4.4.1 %%STATIC%%lib/libssh_threads.a lib/libssh_threads.so lib/libssh_threads.so.4 -lib/libssh_threads.so.4.4.0 +lib/libssh_threads.so.4.4.1 libdata/pkgconfig/libssh.pc libdata/pkgconfig/libssh_threads.pc @dirrm lib/cmake/libssh From owner-svn-ports-branches@FreeBSD.ORG Thu Oct 30 16:34:59 2014 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 B7EFB77C; Thu, 30 Oct 2014 16:34:59 +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 A42AE114; Thu, 30 Oct 2014 16:34:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9UGYxQb019366; Thu, 30 Oct 2014 16:34:59 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9UGYxm7019365; Thu, 30 Oct 2014 16:34:59 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201410301634.s9UGYxm7019365@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Thu, 30 Oct 2014 16:34:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r371761 - branches/2014Q4/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: Thu, 30 Oct 2014 16:34:59 -0000 Author: rakuco Date: Thu Oct 30 16:34:58 2014 New Revision: 371761 URL: https://svnweb.freebsd.org/changeset/ports/371761 QAT: https://qat.redports.org/buildarchive/r371761/ Log: MFH: r371727 Add USES=cpe, as requested by des and rea. Approved by: ports-secteam (ray) Modified: branches/2014Q4/security/libssh/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/security/libssh/Makefile ============================================================================== --- branches/2014Q4/security/libssh/Makefile Thu Oct 30 16:33:25 2014 (r371760) +++ branches/2014Q4/security/libssh/Makefile Thu Oct 30 16:34:58 2014 (r371761) @@ -18,7 +18,7 @@ OPTIONS_RADIO_CRYPTO= GCRYPT OPENSSL OPTIONS_DEFAULT= OPENSSL STATIC OPTIONS_SUB= yes -USES= cmake:outsource tar:xz +USES= cmake:outsource cpe tar:xz USE_LDCONFIG= yes CMAKE_ARGS= -DWITH_EXAMPLES:BOOL=OFF \ From owner-svn-ports-branches@FreeBSD.ORG Fri Oct 31 11:11:28 2014 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 48539350; Fri, 31 Oct 2014 11:11:28 +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 34795FC; Fri, 31 Oct 2014 11:11:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9VBBSjf059968; Fri, 31 Oct 2014 11:11:28 GMT (envelope-from makc@FreeBSD.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9VBBR5i059966; Fri, 31 Oct 2014 11:11:27 GMT (envelope-from makc@FreeBSD.org) Message-Id: <201410311111.s9VBBR5i059966@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: makc set sender to makc@FreeBSD.org using -f From: Max Brazhnikov Date: Fri, 31 Oct 2014 11:11:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r371806 - branches/2014Q4/print/hplip-plugin 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: Fri, 31 Oct 2014 11:11:28 -0000 Author: makc Date: Fri Oct 31 11:11:27 2014 New Revision: 371806 URL: https://svnweb.freebsd.org/changeset/ports/371806 QAT: https://qat.redports.org/buildarchive/r371806/ Log: MFH: r371794 print/hplip-plugin: - Update MASTER_SITES to fix fetch - Clean up plist from @dirrm Reported by: pkg-fallout Approved by: ports-secteam (rea) Modified: branches/2014Q4/print/hplip-plugin/Makefile branches/2014Q4/print/hplip-plugin/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/print/hplip-plugin/Makefile ============================================================================== --- branches/2014Q4/print/hplip-plugin/Makefile Fri Oct 31 11:10:20 2014 (r371805) +++ branches/2014Q4/print/hplip-plugin/Makefile Fri Oct 31 11:11:27 2014 (r371806) @@ -5,7 +5,7 @@ PORTNAME= hplip-plugin PORTVERSION= 3.14.4 PORTREVISION= 1 CATEGORIES= print -MASTER_SITES= http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/ +MASTER_SITES= http://hplipopensource.com/hplip-web/plugin/ DISTNAME= hplip-${DISTVERSION}-plugin EXTRACT_SUFX= .run Modified: branches/2014Q4/print/hplip-plugin/pkg-plist ============================================================================== --- branches/2014Q4/print/hplip-plugin/pkg-plist Fri Oct 31 11:10:20 2014 (r371805) +++ branches/2014Q4/print/hplip-plugin/pkg-plist Fri Oct 31 11:11:27 2014 (r371806) @@ -25,10 +25,3 @@ share/hplip/scan/plugins/bb_soap-%%LINAR share/hplip/scan/plugins/bb_soap.so share/hplip/scan/plugins/bb_soapht-%%LINARCH%%.so share/hplip/scan/plugins/bb_soapht.so -@dirrm share/hplip/scan/plugins -@dirrmtry share/hplip/scan -@dirrm share/hplip/prnt/plugins -@dirrm share/hplip/fax/plugins -@dirrmtry share/hplip/fax -@dirrm share/hplip/data/plugins -@dirrm share/hplip/data/firmware From owner-svn-ports-branches@FreeBSD.ORG Fri Oct 31 11:55:52 2014 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 CB67ECDA; Fri, 31 Oct 2014 11:55:52 +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 B75EE771; Fri, 31 Oct 2014 11:55:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9VBtqrs079663; Fri, 31 Oct 2014 11:55:52 GMT (envelope-from rea@FreeBSD.org) Received: (from rea@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9VBtq0J079659; Fri, 31 Oct 2014 11:55:52 GMT (envelope-from rea@FreeBSD.org) Message-Id: <201410311155.s9VBtq0J079659@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rea set sender to rea@FreeBSD.org using -f From: Eygene Ryabinkin Date: Fri, 31 Oct 2014 11:55:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r371807 - in branches/2014Q4/devel: jenkins jenkins-lts 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: Fri, 31 Oct 2014 11:55:52 -0000 Author: rea Date: Fri Oct 31 11:55:51 2014 New Revision: 371807 URL: https://svnweb.freebsd.org/changeset/ports/371807 QAT: https://qat.redports.org/buildarchive/r371807/ Log: MFH: r371803 Jenkins: add CPE data Approved by: portmgr (bapt) Modified: branches/2014Q4/devel/jenkins-lts/Makefile branches/2014Q4/devel/jenkins/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/devel/jenkins-lts/Makefile ============================================================================== --- branches/2014Q4/devel/jenkins-lts/Makefile Fri Oct 31 11:11:27 2014 (r371806) +++ branches/2014Q4/devel/jenkins-lts/Makefile Fri Oct 31 11:55:51 2014 (r371807) @@ -24,6 +24,10 @@ NO_BUILD= yes USE_RC_SUBR= jenkins +USES+= cpe +CPE_VENDOR= cloudbees +CPE_EDITION= lts + JENKINS_HOME?= ${PREFIX}/jenkins JENKINS_USER?= jenkins JENKINS_GROUP?= jenkins Modified: branches/2014Q4/devel/jenkins/Makefile ============================================================================== --- branches/2014Q4/devel/jenkins/Makefile Fri Oct 31 11:11:27 2014 (r371806) +++ branches/2014Q4/devel/jenkins/Makefile Fri Oct 31 11:55:51 2014 (r371807) @@ -22,6 +22,9 @@ NO_BUILD= yes USE_RC_SUBR= jenkins +USES+= cpe +CPE_VENDOR= cloudbees + JENKINS_HOME?= ${PREFIX}/jenkins JENKINS_USER?= jenkins JENKINS_GROUP?= jenkins From owner-svn-ports-branches@FreeBSD.ORG Fri Oct 31 20:03:06 2014 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 27067AD5; Fri, 31 Oct 2014 20:03:06 +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 1298BA34; Fri, 31 Oct 2014 20:03:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9VK35bA031608; Fri, 31 Oct 2014 20:03:05 GMT (envelope-from danilo@FreeBSD.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9VK355e031606; Fri, 31 Oct 2014 20:03:05 GMT (envelope-from danilo@FreeBSD.org) Message-Id: <201410312003.s9VK355e031606@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: danilo set sender to danilo@FreeBSD.org using -f From: Danilo Egea Gondolfo Date: Fri, 31 Oct 2014 20:03:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r371931 - branches/2014Q4/ftp/tnftp 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: Fri, 31 Oct 2014 20:03:06 -0000 Author: danilo Date: Fri Oct 31 20:03:05 2014 New Revision: 371931 URL: https://svnweb.freebsd.org/changeset/ports/371931 QAT: https://qat.redports.org/buildarchive/r371931/ Log: MFH: r371898 Approved by: portmgr (erwin) - Update from 20130505 to 20141031 - Fix CVE-2014-8517 Modified: branches/2014Q4/ftp/tnftp/Makefile branches/2014Q4/ftp/tnftp/distinfo Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/ftp/tnftp/Makefile ============================================================================== --- branches/2014Q4/ftp/tnftp/Makefile Fri Oct 31 20:02:08 2014 (r371930) +++ branches/2014Q4/ftp/tnftp/Makefile Fri Oct 31 20:03:05 2014 (r371931) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tnftp -PORTVERSION= 20130505 +PORTVERSION= 20141031 CATEGORIES= ftp ipv6 MASTER_SITES= ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/ Modified: branches/2014Q4/ftp/tnftp/distinfo ============================================================================== --- branches/2014Q4/ftp/tnftp/distinfo Fri Oct 31 20:02:08 2014 (r371930) +++ branches/2014Q4/ftp/tnftp/distinfo Fri Oct 31 20:03:05 2014 (r371931) @@ -1,2 +1,2 @@ -SHA256 (tnftp-20130505.tar.gz) = 6f650e25f6fd51538f677b789b49379f367ae9f1dee74c94cfe24d92abc2cffb -SIZE (tnftp-20130505.tar.gz) = 612475 +SHA256 (tnftp-20141031.tar.gz) = 215fffac2ead46ac5b6b685827fb8daa6c84bbc29ec948e64441fab2ef00dca7 +SIZE (tnftp-20141031.tar.gz) = 612974 From owner-svn-ports-branches@FreeBSD.ORG Sat Nov 1 16:13:49 2014 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 BF15D7EC; Sat, 1 Nov 2014 16:13:49 +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 9FCBF844; Sat, 1 Nov 2014 16:13:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA1GDnHo006663; Sat, 1 Nov 2014 16:13:49 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA1GDnuu006662; Sat, 1 Nov 2014 16:13:49 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201411011613.sA1GDnuu006662@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 1 Nov 2014 16:13:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r372018 - branches/2014Q4/multimedia/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.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: Sat, 01 Nov 2014 16:13:50 -0000 Author: riggs Date: Sat Nov 1 16:13:48 2014 New Revision: 372018 URL: https://svnweb.freebsd.org/changeset/ports/372018 QAT: https://qat.redports.org/buildarchive/r372018/ Log: MFH: r372003 Fix build on armv6 - Merge patch to configure script from upstream r37258 PR: 194687 Submitted by: mikael.urankar@gmail.com Reviewed by: riggs Approved by: portmgr (rea) Modified: branches/2014Q4/multimedia/mplayer/files/patch-configure Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/multimedia/mplayer/files/patch-configure ============================================================================== --- branches/2014Q4/multimedia/mplayer/files/patch-configure Sat Nov 1 16:11:32 2014 (r372017) +++ branches/2014Q4/multimedia/mplayer/files/patch-configure Sat Nov 1 16:13:48 2014 (r372018) @@ -1,6 +1,12 @@ ---- configure.orig 2014-08-05 13:12:59.000000000 +0200 -+++ configure 2014-08-15 17:48:16.698117164 +0200 -@@ -649,7 +649,7 @@ +--- configure.orig 2014-08-23 15:59:32.000000000 +0200 ++++ configure 2014-11-01 11:03:04.283806013 +0100 +@@ -644,12 +644,13 @@ + _armv6t2=auto + _armvfp=auto + vfpv3=auto ++setend=auto + neon=auto + armthumb=auto _iwmmxt=auto _mtrr=auto _altivec=auto @@ -9,7 +15,7 @@ _ranlib=ranlib _windres=windres _cc=cc -@@ -999,7 +999,7 @@ +@@ -999,7 +1000,7 @@ ld_static='' ;; --enable-profile) @@ -18,7 +24,7 @@ ;; --disable-profile) _profile= -@@ -1474,7 +1474,6 @@ +@@ -1474,7 +1475,6 @@ *) echo "Unknown parameter: $ac_option" @@ -26,7 +32,7 @@ ;; esac -@@ -1727,7 +1726,7 @@ +@@ -1727,7 +1727,7 @@ case "$1" in x86_64|amd64|i[3-9]86*|i86pc|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;; ia64) host_arch=ia64 ;; @@ -35,7 +41,7 @@ alpha) host_arch=alpha ;; sun4*|sparc*) host_arch=sparc ;; parisc*|hppa*|9000*) host_arch=hppa ;; -@@ -1843,7 +1842,11 @@ +@@ -1843,7 +1843,11 @@ cflag_check "" || die "Compiler is not functioning correctly. Check your installation and custom CFLAGS $CFLAGS ." echo "yes" @@ -48,7 +54,38 @@ if test -z "$_target" ; then cat > $TMPC << EOF -@@ -3882,7 +3885,7 @@ +@@ -3152,6 +3156,13 @@ + fi + echores "$vfpv3" + ++ echocheck "ARM setend" ++ if test $setend = "auto" ; then ++ setend=no ++ inline_asm_check '"setend be"' && setend=yes ++ fi ++ echores "$setend" ++ + echocheck "softfloat ABI" + softfloat=yes + cpp_condition_check '' 'defined(__ARM_PCS_VFP) || (!defined(__ARM_PCS) && !defined(__SOFTFP__))' && softfloat=no +@@ -3190,7 +3201,7 @@ + echores "$_iwmmxt" + fi + +-cpuexts_all='ALTIVEC XOP AVX AVX2 FMA3 FMA4 MMX MMX2 MMXEXT AMD3DNOW AMD3DNOWEXT SSE SSE2 SSE3 SSSE3 SSE4 SSE42 FAST_CMOV I686 FAST_CLZ ARMV5TE ARMV6 ARMV6T2 VFP VFPV3 NEON IWMMXT MMI VIS MVI' ++cpuexts_all='ALTIVEC XOP AVX AVX2 FMA3 FMA4 MMX MMX2 MMXEXT AMD3DNOW AMD3DNOWEXT SSE SSE2 SSE3 SSSE3 SSE4 SSE42 FAST_CMOV I686 FAST_CLZ ARMV5TE ARMV6 ARMV6T2 VFP VFPV3 SETEND NEON IWMMXT MMI VIS MVI' + test "$_altivec" = yes && cpuexts="ALTIVEC $cpuexts" + test "$_mmx" = yes && cpuexts="MMX $cpuexts" + test "$_mmxext" = yes && cpuexts="MMX2 $cpuexts" +@@ -3216,6 +3227,7 @@ + test "$_armv6t2" = yes && cpuexts="ARMV6T2 $cpuexts" + test "$_armvfp" = yes && cpuexts="VFP $cpuexts" + test "$vfpv3" = yes && cpuexts="VFPV3 $cpuexts" ++test "$setend" = yes && cpuexts="SETEND $cpuexts" + test "$neon" = yes && cpuexts="NEON $cpuexts" + test "$_iwmmxt" = yes && cpuexts="IWMMXT $cpuexts" + test "$_vis" = yes && cpuexts="VIS $cpuexts" +@@ -3882,7 +3894,7 @@ if linux ; then THREAD_CFLAGS=-D_REENTRANT elif freebsd || netbsd || openbsd || bsdos ; then @@ -57,7 +94,7 @@ fi if test "$_pthreads" = auto ; then cat > $TMPC << EOF -@@ -3892,7 +3895,7 @@ +@@ -3892,7 +3904,7 @@ EOF _pthreads=no if ! hpux ; then @@ -66,7 +103,7 @@ # for crosscompilation, we cannot execute the program, be happy if we can link statically cc_check $THREAD_CFLAGS $ld_tmp && (tmp_run || test "$ld_static") && ld_pthread="$ld_tmp" && _pthreads=yes && break done -@@ -4044,7 +4047,7 @@ +@@ -4044,7 +4056,7 @@ # NOTE: -L/usr/lib is a hack to avoid issues due to a # broken libiconv that e.g. macports installs into /opt/local/lib # which might get addded to the search path later by e.g. SDL @@ -75,7 +112,7 @@ cc_check $ld_tmp && extra_ldflags="$extra_ldflags $ld_tmp" && ld_iconv="$ld_tmp" && _iconv=yes && break done -@@ -5996,7 +5999,7 @@ +@@ -5996,7 +6008,7 @@ elif dragonfly ; then default_cdrom_device="/dev/cd0" elif freebsd ; then @@ -84,7 +121,7 @@ elif openbsd ; then default_cdrom_device="/dev/rcd0c" elif sunos ; then -@@ -6009,7 +6012,7 @@ +@@ -6009,7 +6021,7 @@ default_cdrom_device="/dev/cdrom" fi @@ -93,7 +130,7 @@ default_dvd_device=$default_cdrom_device elif darwin ; then default_dvd_device="/dev/rdiskN" -@@ -6608,7 +6611,7 @@ +@@ -6609,7 +6621,7 @@ echocheck "libgsm" if test "$_libgsm" = auto ; then _libgsm=no @@ -102,7 +139,7 @@ fi if test "$_libgsm" = yes ; then def_libgsm='#define CONFIG_LIBGSM 1' -@@ -7093,6 +7096,16 @@ +@@ -7094,6 +7106,16 @@ nolibrtmp=no def_librtmp='#define CONFIG_LIBRTMP 1' inputmodules="librtmp $inputmodules" @@ -119,7 +156,7 @@ else nolibrtmp=yes _librtmp=no -@@ -7492,7 +7505,7 @@ +@@ -7493,7 +7515,7 @@ echocheck "mencoder" if test "$_mencoder" = no ; then # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint, @@ -128,7 +165,7 @@ fi echores "$_mencoder" -@@ -8421,7 +8434,7 @@ +@@ -8422,7 +8444,7 @@ EXESUF = $_exesuf EXESUFS_ALL = .exe From owner-svn-ports-branches@FreeBSD.ORG Sat Nov 1 19:42:58 2014 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 AF9CB875; Sat, 1 Nov 2014 19:42:58 +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 8198ED65; Sat, 1 Nov 2014 19:42:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA1Jgw7h006871; Sat, 1 Nov 2014 19:42:58 GMT (envelope-from rea@FreeBSD.org) Received: (from rea@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA1JgwuI006863; Sat, 1 Nov 2014 19:42:58 GMT (envelope-from rea@FreeBSD.org) Message-Id: <201411011942.sA1JgwuI006863@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rea set sender to rea@FreeBSD.org using -f From: Eygene Ryabinkin Date: Sat, 1 Nov 2014 19:42:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r372032 - in branches/2014Q4/www/twiki: . 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: Sat, 01 Nov 2014 19:42:58 -0000 Author: rea Date: Sat Nov 1 19:42:57 2014 New Revision: 372032 URL: https://svnweb.freebsd.org/changeset/ports/372032 QAT: https://qat.redports.org/buildarchive/r372032/ Log: MFH: r371858 TWiki: fix CVE-2014-7236 This is remote Perl code execution via crafted GET variable "debugenableplugins", http://twiki.org/cgi-bin/view/Codev/SecurityAlert-CVE-2014-7236 Security: 21ce1840-6107-11e4-9e84-0022156e8794 Approved by: ports-secteam (myself) Added: branches/2014Q4/www/twiki/files/patch-cve-2014-7236 - copied unchanged from r371858, head/www/twiki/files/patch-cve-2014-7236 Modified: branches/2014Q4/www/twiki/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/www/twiki/Makefile ============================================================================== --- branches/2014Q4/www/twiki/Makefile Sat Nov 1 19:36:38 2014 (r372031) +++ branches/2014Q4/www/twiki/Makefile Sat Nov 1 19:42:57 2014 (r372032) @@ -3,6 +3,7 @@ PORTNAME= twiki PORTVERSION= 5.1.4 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= SF/${PORTNAME}/TWiki%20for%20all%20Platforms/${DISTNAME} \ @@ -29,6 +30,8 @@ RUN_DEPENDS= \ USES= perl5 tar:tgz WRKSRC= ${WRKDIR}/twiki +USES+= cpe + post-extract: @${RM} -rf ${WRKSRC}/lib/CPAN @${CAT} ${.CURDIR}/../twiki-*/pkg-plist |\ Copied: branches/2014Q4/www/twiki/files/patch-cve-2014-7236 (from r371858, head/www/twiki/files/patch-cve-2014-7236) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/www/twiki/files/patch-cve-2014-7236 Sat Nov 1 19:42:57 2014 (r372032, copy of r371858, head/www/twiki/files/patch-cve-2014-7236) @@ -0,0 +1,17 @@ +Obtained-from: http://twiki.org/cgi-bin/view/Codev/SecurityAlert-CVE-2014-7236 +--- lib/TWiki/Plugins.pm.save1 2014-01-09 02:10:56.000000000 -0500 ++++ lib/TWiki/Plugins.pm 2014-10-01 20:30:36.000000000 -0400 +@@ -186,8 +186,11 @@ + + unless( $allDisabled ) { + if ( $query && defined( $query->param( 'debugenableplugins' ))) { +- @pluginList = split( /[,\s]+/, +- $query->param( 'debugenableplugins' )); ++ @pluginList = ++ grep { /Plugin$/ } ++ map { s/[^a-zA-Z0-9]//go; $_ } # Item7558: Sanitize parameter ++ split( /[,\s]+/, $query->param( 'debugenableplugins' )); ++ + } else { + if( $TWiki::cfg{PluginsOrder} ) { + foreach my $plugin( split( /[,\s]+/, From owner-svn-ports-branches@FreeBSD.ORG Sat Nov 1 20:17:46 2014 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 CBBD32CC; Sat, 1 Nov 2014 20:17:46 +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 ADC8BFDE; Sat, 1 Nov 2014 20:17:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA1KHk98022545; Sat, 1 Nov 2014 20:17:46 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA1KHktb022543; Sat, 1 Nov 2014 20:17:46 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201411012017.sA1KHktb022543@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Sat, 1 Nov 2014 20:17:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r372037 - in branches/2014Q4/textproc/libxml2: . 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: Sat, 01 Nov 2014 20:17:47 -0000 Author: kwm Date: Sat Nov 1 20:17:45 2014 New Revision: 372037 URL: https://svnweb.freebsd.org/changeset/ports/372037 QAT: https://qat.redports.org/buildarchive/r372037/ Log: MFH: r371693 Fix regression introduced in CVE-201403660 fix. Submitted by: gjb@ Obtained from: libxml2 upstream Approved by: portmgr (bapt@) Reminded to mfh by: gavin@ Modified: branches/2014Q4/textproc/libxml2/Makefile branches/2014Q4/textproc/libxml2/files/patch-parser.c Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/textproc/libxml2/Makefile ============================================================================== --- branches/2014Q4/textproc/libxml2/Makefile Sat Nov 1 20:17:39 2014 (r372036) +++ branches/2014Q4/textproc/libxml2/Makefile Sat Nov 1 20:17:45 2014 (r372037) @@ -4,7 +4,7 @@ PORTNAME= libxml2 PORTVERSION= 2.9.2 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= textproc gnome MASTER_SITES= ftp://xmlsoft.org/libxml2/ \ http://xmlsoft.org/sources/ \ Modified: branches/2014Q4/textproc/libxml2/files/patch-parser.c ============================================================================== --- branches/2014Q4/textproc/libxml2/files/patch-parser.c Sat Nov 1 20:17:39 2014 (r372036) +++ branches/2014Q4/textproc/libxml2/files/patch-parser.c Sat Nov 1 20:17:45 2014 (r372037) @@ -1,3 +1,16 @@ +From 72a46a519ce7326d9a00f0b6a7f2a8e958cd1675 Mon Sep 17 00:00:00 2001 +From: Daniel Veillard +Date: Thu, 23 Oct 2014 11:35:36 +0800 +Subject: Fix missing entities after CVE-2014-3660 fix + +For https://bugzilla.gnome.org/show_bug.cgi?id=738805 + +The fix for CVE-2014-3660 introduced a regression in some case +where entity substitution is required and the entity is used +first in anotther entity referenced from an attribute value + +--- + From 0e6659ec960734b0b01aad196d4bdb4a3800b493 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 16 Oct 2014 19:10:59 +0200 @@ -8,15 +21,19 @@ https://bugzilla.redhat.com/show_bug.cgi This reverts commit 054c716ea1bf001544127a4ab4f4346d1b9947e7. ---- - parser.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/parser.c b/parser.c -index 1d93967..67c9dfd 100644 ---- parser.c -+++ parser.c -@@ -14830,9 +14830,6 @@ xmlInitParser(void) { +--- parser.c.orig 2014-10-29 14:28:43.755327730 +0100 ++++ parser.c 2014-10-29 14:28:55.287325756 +0100 +@@ -7235,7 +7235,8 @@ + * far more secure as the parser will only process data coming from + * the document entity by default. + */ +- if ((ent->checked == 0) && ++ if (((ent->checked == 0) || ++ ((ent->children == NULL) && (ctxt->options & XML_PARSE_NOENT))) && + ((ent->etype != XML_EXTERNAL_GENERAL_PARSED_ENTITY) || + (ctxt->options & (XML_PARSE_NOENT | XML_PARSE_DTDVALID)))) { + unsigned long oldnbent = ctxt->nbentities; +@@ -14830,9 +14831,6 @@ #ifdef LIBXML_XPATH_ENABLED xmlXPathInit(); #endif @@ -26,6 +43,3 @@ index 1d93967..67c9dfd 100644 xmlParserInitialized = 1; #ifdef LIBXML_THREAD_ENABLED } --- -1.9.3 -