From owner-svn-ports-branches@FreeBSD.ORG Mon Aug 18 06:44:06 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 317BD572; Mon, 18 Aug 2014 06:44: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 034213172; Mon, 18 Aug 2014 06:44: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 s7I6i5AG095656; Mon, 18 Aug 2014 06:44:05 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7I6i5uu095654; Mon, 18 Aug 2014 06:44:05 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201408180644.s7I6i5uu095654@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Mon, 18 Aug 2014 06:44:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r365268 - branches/2014Q3/databases/phpmyadmin 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, 18 Aug 2014 06:44:06 -0000 Author: matthew Date: Mon Aug 18 06:44:04 2014 New Revision: 365268 URL: http://svnweb.freebsd.org/changeset/ports/365268 QAT: https://qat.redports.org/buildarchive/r365268/ Log: MFH: r365236 Security update to 4.2.7.1 XSS in view operations page. and Multiple XSS vulnerabilities in browse table, ENUM editor, monitor, query charts and table relations pages Release notes: http://sourceforge.net/projects/phpmyadmin/files/phpMyAdmin/4.2.7.1/phpMyAdmin-4.2.7.1-notes.html/download Security: fbb01289-2645-11e4-bc44-6805ca0b3d42 Approved by: portmgr (erwin) Modified: branches/2014Q3/databases/phpmyadmin/Makefile branches/2014Q3/databases/phpmyadmin/distinfo Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/databases/phpmyadmin/Makefile ============================================================================== --- branches/2014Q3/databases/phpmyadmin/Makefile Mon Aug 18 05:32:37 2014 (r365267) +++ branches/2014Q3/databases/phpmyadmin/Makefile Mon Aug 18 06:44:04 2014 (r365268) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= phpMyAdmin -DISTVERSION= 4.2.6 +DISTVERSION= 4.2.7.1 CATEGORIES= databases www MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME}/${DISTVERSION} DISTNAME= ${PORTNAME}-${DISTVERSION}-all-languages Modified: branches/2014Q3/databases/phpmyadmin/distinfo ============================================================================== --- branches/2014Q3/databases/phpmyadmin/distinfo Mon Aug 18 05:32:37 2014 (r365267) +++ branches/2014Q3/databases/phpmyadmin/distinfo Mon Aug 18 06:44:04 2014 (r365268) @@ -1,2 +1,2 @@ -SHA256 (phpMyAdmin-4.2.6-all-languages.tar.xz) = 6203e1fa7a1d7cb09a9f86d34f6dc5ea14df4ae5ebe51caa61666b8d3d57acef -SIZE (phpMyAdmin-4.2.6-all-languages.tar.xz) = 5134224 +SHA256 (phpMyAdmin-4.2.7.1-all-languages.tar.xz) = 99682eb43d3104f08e4c0a9b26bf5bc24bb93da6eeb59f9087ade156c837c708 +SIZE (phpMyAdmin-4.2.7.1-all-languages.tar.xz) = 5138420 From owner-svn-ports-branches@FreeBSD.ORG Mon Aug 18 19:42:26 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2158D4C1; Mon, 18 Aug 2014 19:42: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 00DDB3DCF; Mon, 18 Aug 2014 19:42: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 s7IJgPYM057961; Mon, 18 Aug 2014 19:42:25 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7IJgOcs057951; Mon, 18 Aug 2014 19:42:24 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201408181942.s7IJgOcs057951@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Mon, 18 Aug 2014 19:42:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r365350 - in branches/2014Q3/www/chromium: . 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: Mon, 18 Aug 2014 19:42:26 -0000 Author: rene Date: Mon Aug 18 19:42:24 2014 New Revision: 365350 URL: http://svnweb.freebsd.org/changeset/ports/365350 QAT: https://qat.redports.org/buildarchive/r365350/ Log: MFH: r365341 www/chromium: Enable build on FreeBSD < 10 and enable file chooser dialog [1]. - Spell out full path to /sbin/sysctl [2] - Build with OpenSSL from base to avoid a link conflict on FreeBSD < 10 - Fix build with libusb on FreeBSD < 10 [3] - Fix build with GCC 4.7 (for 8.4 / 9.1) - Bump PORTREVISION PR: 192742 [1] Submitted by: cmt@burggraben.net [1] Submitted by: J. R. Oldroyd [2] Submitted by: db@ [3] Approved by: portmgr (erwin) Added: branches/2014Q3/www/chromium/files/extra-patch-libusb-pc - copied unchanged from r365341, head/www/chromium/files/extra-patch-libusb-pc branches/2014Q3/www/chromium/files/patch-build__linux__unbundle__openssl.gyp - copied unchanged from r365341, head/www/chromium/files/patch-build__linux__unbundle__openssl.gyp branches/2014Q3/www/chromium/files/patch-ui__shell_dialogs__select_file_dialog.cc - copied unchanged from r365341, head/www/chromium/files/patch-ui__shell_dialogs__select_file_dialog.cc Modified: branches/2014Q3/www/chromium/Makefile branches/2014Q3/www/chromium/files/chrome.in branches/2014Q3/www/chromium/files/extra-patch-gcc branches/2014Q3/www/chromium/files/patch-components__usb_service__usb_device_handle.cc Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/www/chromium/Makefile ============================================================================== --- branches/2014Q3/www/chromium/Makefile Mon Aug 18 19:38:39 2014 (r365349) +++ branches/2014Q3/www/chromium/Makefile Mon Aug 18 19:42:24 2014 (r365350) @@ -3,6 +3,7 @@ PORTNAME= chromium PORTVERSION= 36.0.1985.143 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -20,7 +21,6 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${ yasm:${PORTSDIR}/devel/yasm \ flock:${PORTSDIR}/sysutils/flock \ ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat \ - protoc:${PORTSDIR}/devel/protobuf \ ${LOCALBASE}/share/usbids/usb.ids:${PORTSDIR}/misc/usbids LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ @@ -43,6 +43,7 @@ LIB_DEPENDS= libcairo.so:${PORTSDIR}/gra libjsoncpp.so:${PORTSDIR}/devel/jsoncpp \ libminizip.so:${PORTSDIR}/archivers/minizip \ libnspr4.so:${PORTSDIR}/devel/nspr \ + libprotobuf.so:${PORTSDIR}/devel/protobuf \ libpng.so:${PORTSDIR}/graphics/png \ libre2.so:${PORTSDIR}/devel/re2 \ libsnappy.so:${PORTSDIR}/archivers/snappy \ @@ -62,8 +63,7 @@ CPE_VENDOR= The Chromium Project USE_PERL5= build USE_XORG= scrnsaverproto x11 xproto xscrnsaver xtst USE_GNOME= glib20 gtk20 dconf libxslt -USE_OPENSSL= yes -WITH_OPENSSL_PORT= yes # simplify for pkg-config in configure phase +USE_OPENSSL= yes # must be from base to prevent a link failure against cups SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper ALL_TARGET= chrome INSTALLS_ICONS= yes @@ -165,6 +165,9 @@ GYP_DEFINES+= use_pulseaudio=0 GYP_DEFINES+= disable_sse2=1 .endif +.if !exists(/usr/libdata/pkgconfig/libusb-1.0.pc) +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libusb-pc +.endif .if ${OSVERSION} >= 1000052 && !exists(${LOCALBASE}/include/execinfo.h) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-fixup-execinfo .endif @@ -187,13 +190,15 @@ CONFIGURE_ENV+= CC="${CC}" \ GYP_DEFINES="${GYP_DEFINES}" MAKE_ENV+= BUILDTYPE=${BUILDTYPE} \ GPERF="${LOCALBASE}/bin/gperf" -MAKE_ARGS+= -C out/${BUILDTYPE} .include +#XXX redefine MAKE_ARGS after bsd.port.pre.mk to avoid OPENSSL flags +# leaking in which confuses ninja +MAKE_ARGS= -C out/${BUILDTYPE} + .if ${CHOSEN_COMPILER_TYPE} == gcc GYP_DEFINES+= gcc_version=${CXX:S/g++//} -CFLAGS+= -Wno-unknown-warning EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gcc .else GYP_DEFINES+= clang=1 Modified: branches/2014Q3/www/chromium/files/chrome.in ============================================================================== --- branches/2014Q3/www/chromium/files/chrome.in Mon Aug 18 19:38:39 2014 (r365349) +++ branches/2014Q3/www/chromium/files/chrome.in Mon Aug 18 19:42:24 2014 (r365350) @@ -1,7 +1,7 @@ #!/bin/sh SYSCTL=kern.ipc.shm_allow_removed -if [ `sysctl -n $SYSCTL` = 0 ] ; then +if [ "`/sbin/sysctl -n $SYSCTL`" = 0 ] ; then cat << EOMSG For correct operation, shared memory support has to be enabled in Chromium by performing the following command as root : Modified: branches/2014Q3/www/chromium/files/extra-patch-gcc ============================================================================== --- branches/2014Q3/www/chromium/files/extra-patch-gcc Mon Aug 18 19:38:39 2014 (r365349) +++ branches/2014Q3/www/chromium/files/extra-patch-gcc Mon Aug 18 19:42:24 2014 (r365350) @@ -86,3 +86,13 @@ #include "third_party/libjpeg_turbo/jpeglib.h" #else #include "third_party/libjpeg/jpeglib.h" +--- ui/gfx/codec/jpeg_codec.cc.orig 2014-08-12 21:02:29.000000000 +0200 ++++ ui/gfx/codec/jpeg_codec.cc 2014-08-17 19:32:18.000000000 +0200 +@@ -13,6 +13,7 @@ + + extern "C" { + #if defined(USE_SYSTEM_LIBJPEG) ++#include + #include + #elif defined(USE_LIBJPEG_TURBO) + #include "third_party/libjpeg_turbo/jpeglib.h" Copied: branches/2014Q3/www/chromium/files/extra-patch-libusb-pc (from r365341, head/www/chromium/files/extra-patch-libusb-pc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/www/chromium/files/extra-patch-libusb-pc Mon Aug 18 19:42:24 2014 (r365350, copy of r365341, head/www/chromium/files/extra-patch-libusb-pc) @@ -0,0 +1,20 @@ +--- build/linux/unbundle/libusb.gyp.orig 2014-08-12 21:02:52.000000000 +0200 ++++ build/linux/unbundle/libusb.gyp 2014-08-17 16:21:03.000000000 +0200 +@@ -18,14 +18,14 @@ + ], + 'direct_dependent_settings': { + 'cflags': [ +- 'CreateSelectFileDialog(listener, policy); From owner-svn-ports-branches@FreeBSD.ORG Tue Aug 19 09:33:05 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9A8457D4; Tue, 19 Aug 2014 09:33: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 8638635B9; Tue, 19 Aug 2014 09:33: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 s7J9X5r2033144; Tue, 19 Aug 2014 09:33:05 GMT (envelope-from makc@FreeBSD.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7J9X5WJ033143; Tue, 19 Aug 2014 09:33:05 GMT (envelope-from makc@FreeBSD.org) Message-Id: <201408190933.s7J9X5WJ033143@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: makc set sender to makc@FreeBSD.org using -f From: Max Brazhnikov Date: Tue, 19 Aug 2014 09:33:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r365368 - branches/2014Q3/devel/thrift-cpp 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, 19 Aug 2014 09:33:05 -0000 Author: makc Date: Tue Aug 19 09:33:04 2014 New Revision: 365368 URL: http://svnweb.freebsd.org/changeset/ports/365368 QAT: https://qat.redports.org/buildarchive/r365368/ Log: MFH: r364589 devel/thrift-cpp: - Unbreak Makefile when building with QT4 support. USE_QT4 cannot be set after bsd.port.pre.mk and requires inclusion of bsd.port.options.mk (when used with options). However converting to options helpers saves us from additional include. - Replace spaces with tab while here PR: 189127 Reported by: jrh29@alumni.cwru.edu Approved by: maintainer timeout (3 months from the date of report, I didn't wait approval for my patch) Approved by: portmgr (erwin) Modified: branches/2014Q3/devel/thrift-cpp/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/devel/thrift-cpp/Makefile ============================================================================== --- branches/2014Q3/devel/thrift-cpp/Makefile Tue Aug 19 09:02:30 2014 (r365367) +++ branches/2014Q3/devel/thrift-cpp/Makefile Tue Aug 19 09:33:04 2014 (r365368) @@ -34,10 +34,11 @@ INSTALL_WRKSRC= ${WRKSRC}/lib/cpp OPTIONS_DEFINE= QT4 QT4_CONFIGURE_WITH= qt4 +QT4_USE= QT4=network,moc_build,qmake_build,rcc_build,uic_build OPTIONS_SUB= yes -CONFIGURE_ARGS+= \ +CONFIGURE_ARGS+= \ --without-c_glib \ --with-cpp \ --without-csharp \ @@ -56,10 +57,6 @@ CONFIGURE_ARGS+= \ USE_CXXSTD= c++11 .endif -.if ${PORT_OPTIONS:MQT4} -USE_QT4= network moc_build qmake_build rcc_build uic_build -.endif - post-patch: @${REINPLACE_CMD} 's,^pkgconfigdir = .*,pkgconfigdir=$${prefix}/libdata/pkgconfig,' ${WRKSRC}/lib/cpp/Makefile.am From owner-svn-ports-branches@FreeBSD.ORG Tue Aug 19 09:40:44 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3AED4A47; Tue, 19 Aug 2014 09:40:44 +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 1AD743695; Tue, 19 Aug 2014 09:40:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7J9ehOm036190; Tue, 19 Aug 2014 09:40:43 GMT (envelope-from makc@FreeBSD.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7J9ehGY036189; Tue, 19 Aug 2014 09:40:43 GMT (envelope-from makc@FreeBSD.org) Message-Id: <201408190940.s7J9ehGY036189@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: makc set sender to makc@FreeBSD.org using -f From: Max Brazhnikov Date: Tue, 19 Aug 2014 09:40:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r365369 - branches/2014Q3/net-im/psi 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, 19 Aug 2014 09:40:44 -0000 Author: makc Date: Tue Aug 19 09:40:43 2014 New Revision: 365369 URL: http://svnweb.freebsd.org/changeset/ports/365369 QAT: https://qat.redports.org/buildarchive/r365369/ Log: MFH: r364945 net-im/psi: - Add dependence on archivers/minizip - Convert to options helpers - Reorder paths to always include internal socks.h [1] PR: 192270 [1] Reported by: Jordan Irwin Approved by: portmgr (erwin) Modified: branches/2014Q3/net-im/psi/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/net-im/psi/Makefile ============================================================================== --- branches/2014Q3/net-im/psi/Makefile Tue Aug 19 09:33:04 2014 (r365368) +++ branches/2014Q3/net-im/psi/Makefile Tue Aug 19 09:40:43 2014 (r365369) @@ -3,13 +3,15 @@ PORTNAME= psi PORTVERSION= 0.15 +PORTREVISION= 2 CATEGORIES= net-im MASTER_SITES= SF/${PORTNAME}/Psi/${PORTVERSION} MAINTAINER= makc@FreeBSD.org COMMENT= Qt 4 based Jabber client -LIB_DEPENDS= libqca.so:${PORTSDIR}/devel/qca +LIB_DEPENDS= libqca.so:${PORTSDIR}/devel/qca \ + libminizip.so:${PORTSDIR}/archivers/minizip RUN_DEPENDS= qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl \ qca-gnupg>=2.0.0.b3:${PORTSDIR}/security/qca-gnupg @@ -27,41 +29,29 @@ DESTDIRNAME= INSTALL_ROOT OPTIONS_DEFINE= ASPELL ENCHANT DBUS DEBUG OPTIONS_DEFAULT= ASPELL DBUS +OPTIONS_SUB= yes # DEBUG -ASPELL_DESC= Use aspell for spell checking -ENCHANT_DESC= Use Enchant for spell checking +DEBUG_CONFIGURE_ON= --debug +DEBUG_CONFIGURE_OFF= --release --no-separate-debug-info -.include +DBUS_USE= QT4=dbus +DBUS_CONFIGURE_OFF= --disable-qdbus -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+= --debug -PLIST_SUB+= DEBUG="" -.else -CONFIGURE_ARGS+= --release --no-separate-debug-info -PLIST_SUB+= DEBUG="@comment " -.endif - -.if ${PORT_OPTIONS:MDBUS} -USE_QT4+= dbus -.else -CONFIGURE_ARGS+= --disable-qdbus -.endif - -.if ${PORT_OPTIONS:MASPELL} -LIB_DEPENDS+= libaspell.so:${PORTSDIR}/textproc/aspell -CONFIGURE_ARGS+= --with-aspell-inc=${LOCALBASE}/include \ +ASPELL_DESC= Use aspell for spell checking +ASPELL_LIB_DEPENDS= libaspell.so:${PORTSDIR}/textproc/aspell +ASPELL_CONFIGURE_ON= --with-aspell-inc=${LOCALBASE}/include \ --with-aspell-lib=${LOCALBASE}/lib -.else -CONFIGURE_ARGS+= --disable-aspell -.endif - -.if ${PORT_OPTIONS:MENCHANT} -LIB_DEPENDS+= libenchant.so:${PORTSDIR}/textproc/enchant -.else -CONFIGURE_ARGS+= --disable-enchant -.endif +ASPELL_CONFIGURE_OFF= --disable-aspell + +ENCHANT_DESC= Use Enchant for spell checking +ENCHANT_LIB_DEPENDS= libenchant.so:${PORTSDIR}/textproc/enchant +ENCHANT_CONFIGURE_OFF= --disable-enchant -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/psi +post-configure: +# Reorder paths to always include internal socks.h (PR: 192270) + ${REINPLACE_CMD} -e '/^INCPATH/s,-I\.,-I\. -Icutestuff,' \ + ${WRKSRC}/iris/src/irisnet/noncore/Makefile + ${REINPLACE_CMD} -e '/^INCPATH/s,-I\.,-I\. -I../irisnet/noncore/cutestuff,' \ + ${WRKSRC}/iris/src/xmpp/Makefile .include From owner-svn-ports-branches@FreeBSD.ORG Wed Aug 20 03:13:44 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 247E6D10 for ; Wed, 20 Aug 2014 03:13:44 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 0897A30CA for ; Wed, 20 Aug 2014 03:13:44 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.9/8.14.9) with ESMTP id s7K3DhwX009600 for ; Wed, 20 Aug 2014 03:13:43 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.9/8.14.9/Submit) id s7K3DhJh009596 for svn-ports-branches@freebsd.org; Wed, 20 Aug 2014 03:13:43 GMT (envelope-from bdrewery) Received: (qmail 67767 invoked from network); 19 Aug 2014 22:13:38 -0500 Received: from unknown (HELO blah) (freebsd@shatow.net@10.10.1.90) by sweb.xzibition.com with ESMTPA; 19 Aug 2014 22:13:38 -0500 Message-ID: <53F41262.3040802@FreeBSD.org> Date: Tue, 19 Aug 2014 22:13:38 -0500 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: Rene Ladan , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: Re: svn commit: r365022 - in branches/2014Q3/www/chromium: . files References: <201408151901.s7FJ1BhE030000@svn.freebsd.org> In-Reply-To: <201408151901.s7FJ1BhE030000@svn.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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, 20 Aug 2014 03:13:44 -0000 On 8/15/14, 2:01 PM, Rene Ladan wrote: > - perl5 shebangfix ninja tar:xz > + perl5 shebangfix ninja tar:xz python:2,build execinfo This breaks the branch for package building: [00:00:42] ====>> Calculating ports order and dependencies make: "/usr/ports/Mk/bsd.port.mk" line 1521: Cannot open /usr/ports/Mk/Uses/python.mk make: "/usr/ports/Mk/bsd.port.mk" line 1521: Cannot open /usr/ports/Mk/Uses/execinfo.mk make: Fatal errors encountered -- cannot continue[00:05:16] ====>> Error: Error getting PKGNAME for www/chromium -- Regards, Bryan Drewery From owner-svn-ports-branches@FreeBSD.ORG Wed Aug 20 03:59:14 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E84D3345; Wed, 20 Aug 2014 03:59:14 +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 D212A3497; Wed, 20 Aug 2014 03:59:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7K3xEUO047333; Wed, 20 Aug 2014 03:59:14 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7K3xEBi047332; Wed, 20 Aug 2014 03:59:14 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201408200359.s7K3xEBi047332@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 20 Aug 2014 03:59:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r365431 - branches/2014Q3/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, 20 Aug 2014 03:59:15 -0000 Author: bdrewery Date: Wed Aug 20 03:59:14 2014 New Revision: 365431 URL: http://svnweb.freebsd.org/changeset/ports/365431 QAT: https://qat.redports.org/buildarchive/r365431/ Log: Attempt to fix build by reverting bits not planned to be MFC'd Modified: branches/2014Q3/www/chromium/Makefile Modified: branches/2014Q3/www/chromium/Makefile ============================================================================== --- branches/2014Q3/www/chromium/Makefile Wed Aug 20 00:25:18 2014 (r365430) +++ branches/2014Q3/www/chromium/Makefile Wed Aug 20 03:59:14 2014 (r365431) @@ -58,9 +58,10 @@ RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/l ONLY_FOR_ARCHS= i386 amd64 USES= bison compiler:c++11-lib cpe desktop-file-utils pkgconfig \ - perl5 shebangfix ninja tar:xz python:2,build execinfo + perl5 shebangfix ninja tar:xz CPE_VENDOR= The Chromium Project USE_PERL5= build +USE_PYTHON_BUILD= 2 USE_XORG= scrnsaverproto x11 xproto xscrnsaver xtst USE_GNOME= glib20 gtk20 dconf libxslt USE_OPENSSL= yes # must be from base to prevent a link failure against cups @@ -171,6 +172,9 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch- .if ${OSVERSION} >= 1000052 && !exists(${LOCALBASE}/include/execinfo.h) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-fixup-execinfo .endif +.if ${OSVERSION} < 1000052 +LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo +.endif .if ${PORT_OPTIONS:MTEST} .include "Makefile.tests" From owner-svn-ports-branches@FreeBSD.ORG Wed Aug 20 12:21: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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 20404148; Wed, 20 Aug 2014 12:21: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 0BA6037F7; Wed, 20 Aug 2014 12:21: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 s7KCLmQk076113; Wed, 20 Aug 2014 12:21:48 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7KCLmcc076112; Wed, 20 Aug 2014 12:21:48 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201408201221.s7KCLmcc076112@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Wed, 20 Aug 2014 12:21:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r365445 - branches/2014Q3/security/bsp_upektfmess 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, 20 Aug 2014 12:21:49 -0000 Author: antoine Date: Wed Aug 20 12:21:48 2014 New Revision: 365445 URL: http://svnweb.freebsd.org/changeset/ports/365445 QAT: https://qat.redports.org/buildarchive/r365445/ Log: MFH: r365258 Mark BROKEN: Unfetchable Reported by: pkg-fallout With hat: portmgr Modified: branches/2014Q3/security/bsp_upektfmess/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/security/bsp_upektfmess/Makefile ============================================================================== --- branches/2014Q3/security/bsp_upektfmess/Makefile Wed Aug 20 11:59:34 2014 (r365444) +++ branches/2014Q3/security/bsp_upektfmess/Makefile Wed Aug 20 12:21:48 2014 (r365445) @@ -12,7 +12,9 @@ DISTNAME= TFMESS_BSP_FreeBSD_1.1 MAINTAINER= ports@FreeBSD.org COMMENT= UPEK TouchChip TFM/ESS Fingerprint BSP -LIB_DEPENDS= bioapi100.0:${PORTSDIR}/security/bioapi +BROKEN= Unfetchable + +LIB_DEPENDS= libbioapi100.so:${PORTSDIR}/security/bioapi RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext PLIST_FILES= lib/libtfmessbsp.so From owner-svn-ports-branches@FreeBSD.ORG Wed Aug 20 12:24:24 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 27A9B2C9; Wed, 20 Aug 2014 12:24:24 +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 12B633845; Wed, 20 Aug 2014 12:24:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7KCONpw076558; Wed, 20 Aug 2014 12:24:23 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7KCONGB076557; Wed, 20 Aug 2014 12:24:23 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201408201224.s7KCONGB076557@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Wed, 20 Aug 2014 12:24:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r365446 - branches/2014Q3/graphics/xfpovray 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, 20 Aug 2014 12:24:24 -0000 Author: antoine Date: Wed Aug 20 12:24:23 2014 New Revision: 365446 URL: http://svnweb.freebsd.org/changeset/ports/365446 QAT: https://qat.redports.org/buildarchive/r365446/ Log: MFH: r364411 Mark BROKEN: fails to link cc -O2 -pipe -fno-strict-aliasing -I/usr/local/include -I../flx -I/usr/local/include -DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO -DHELP_DIR=\"/usr/local/lib/X11/xfpovray/help\" -c ./util.c rm -f xfpovray cc -o xfpovray -L/usr/local/lib ./build_pages.o ./callbacks.o ./show_image.o ./xfpovray.o ./tips.o ./state.o ./config.o ./run_program.o ./util.o ../flx/libflx.a -L/usr/local/lib -lforms -lXpm -lm -lXext -lX11 -Wl,-rpath,/usr/local/lib ../flx/libflx.a(flx_return_button.o): In function `draw_return_button': flx_return_button.c:(.text+0x178): undefined reference to `fl_drw_box' flx_return_button.c:(.text+0x1a9): undefined reference to `fl_drw_box' flx_return_button.c:(.text+0x1ff): undefined reference to `fl_drw_box' *** [xfpovray] Error code 1 Reported by: pkg-fallout Modified: branches/2014Q3/graphics/xfpovray/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/graphics/xfpovray/Makefile ============================================================================== --- branches/2014Q3/graphics/xfpovray/Makefile Wed Aug 20 12:21:48 2014 (r365445) +++ branches/2014Q3/graphics/xfpovray/Makefile Wed Aug 20 12:24:23 2014 (r365446) @@ -13,6 +13,8 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Graphical interface to POV-Ray +BROKEN= Fails to link + LIB_DEPENDS= libforms.so:${PORTSDIR}/x11-toolkits/xforms RUN_DEPENDS= povray:${PORTSDIR}/graphics/povray-meta From owner-svn-ports-branches@FreeBSD.ORG Wed Aug 20 13:31:12 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7E8BFDD0; Wed, 20 Aug 2014 13:31:12 +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 69CD63F86; Wed, 20 Aug 2014 13:31:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7KDVCK7009255; Wed, 20 Aug 2014 13:31:12 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7KDVCjM009253; Wed, 20 Aug 2014 13:31:12 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201408201331.s7KDVCjM009253@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 20 Aug 2014 13:31:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r365463 - branches/2014Q3/www/mod_log_sql2 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, 20 Aug 2014 13:31:12 -0000 Author: amdmi3 Date: Wed Aug 20 13:31:11 2014 New Revision: 365463 URL: http://svnweb.freebsd.org/changeset/ports/365463 QAT: https://qat.redports.org/buildarchive/r365463/ Log: MFH: r365378 - Fix plist for WITH_DBI case Approved by: portmgr Modified: branches/2014Q3/www/mod_log_sql2/Makefile branches/2014Q3/www/mod_log_sql2/pkg-plist Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/www/mod_log_sql2/Makefile ============================================================================== --- branches/2014Q3/www/mod_log_sql2/Makefile Wed Aug 20 13:25:02 2014 (r365462) +++ branches/2014Q3/www/mod_log_sql2/Makefile Wed Aug 20 13:31:11 2014 (r365463) @@ -28,6 +28,9 @@ LIBS+= -L${LOCALBASE}/lib -L${LOCALBASE .if defined(WITH_DBI) || exists(${LOCALBASE}/include/dbi/dbi.h) CONFIGURE_ARGS+= --with-dbi=${LOCALBASE} LIB_DEPENDS+= libdbi.so:${PORTSDIR}/databases/libdbi +PLIST_SUB+= DBI="" +.else +PLIST_SUB+= DBI="@comment " .endif .if defined(WITHOUT_SSL) Modified: branches/2014Q3/www/mod_log_sql2/pkg-plist ============================================================================== --- branches/2014Q3/www/mod_log_sql2/pkg-plist Wed Aug 20 13:25:02 2014 (r365462) +++ branches/2014Q3/www/mod_log_sql2/pkg-plist Wed Aug 20 13:31:11 2014 (r365463) @@ -1,6 +1,7 @@ %%APACHEMODDIR%%/%%AP_MODULE%% @exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F @unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F +%%DBI%%%%APACHEMODDIR%%/mod_log_sql_dbi.so %%APACHEMODDIR%%/mod_log_sql_mysql.so %%APACHE2X%%%%APACHEMODDIR%%/mod_log_sql_logio.so %%SSL%%%%APACHEMODDIR%%/mod_log_sql_ssl.so From owner-svn-ports-branches@FreeBSD.ORG Wed Aug 20 21:14:05 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A49B17A3; Wed, 20 Aug 2014 21:14: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 900B03748; Wed, 20 Aug 2014 21:14: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 s7KLE5TX027488; Wed, 20 Aug 2014 21:14:05 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7KLE5rQ027487; Wed, 20 Aug 2014 21:14:05 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201408202114.s7KLE5rQ027487@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 20 Aug 2014 21:14:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r365515 - branches/2014Q3/devel/p5-Test-OpenLDAP 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, 20 Aug 2014 21:14:05 -0000 Author: bdrewery Date: Wed Aug 20 21:14:05 2014 New Revision: 365515 URL: http://svnweb.freebsd.org/changeset/ports/365515 QAT: https://qat.redports.org/buildarchive/r365515/ Log: MFH: r364735 - Fix dependency line for p5-Net. This was causing needless rebuilding of p5-Test-OpenLDAP with poudriere as it always thought the dependencies were changed. This also correctly registers the p5-Net as a dependency for package use. With hat: portmgr Modified: branches/2014Q3/devel/p5-Test-OpenLDAP/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/devel/p5-Test-OpenLDAP/Makefile ============================================================================== --- branches/2014Q3/devel/p5-Test-OpenLDAP/Makefile Wed Aug 20 21:01:41 2014 (r365514) +++ branches/2014Q3/devel/p5-Test-OpenLDAP/Makefile Wed Aug 20 21:14:05 2014 (r365515) @@ -2,7 +2,7 @@ PORTNAME= Test-OpenLDAP PORTVERSION= 0.05 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -17,7 +17,7 @@ RUN_DEPENDS= \ p5-Data-UUID>0:${PORTSDIR}/devel/p5-Data-UUID \ p5-perl-ldap>0:${PORTSDIR}/net/p5-perl-ldap \ ${LOCALBASE}/libexec/slapd:${PORTSDIR}/net/openldap${OPENLDAP_VER}-server \ - p5-URI>0:${PORTSDIR}/net/p5-Net + p5-Net>0:${PORTSDIR}/net/p5-Net BUILD_DEPENDS= ${RUN_DEPENDS} USES= perl5 From owner-svn-ports-branches@FreeBSD.ORG Wed Aug 20 23:19:36 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 352AB87E; Wed, 20 Aug 2014 23:19:36 +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 20CCF3225; Wed, 20 Aug 2014 23:19:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7KNJZNE083027; Wed, 20 Aug 2014 23:19:35 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7KNJZaV083026; Wed, 20 Aug 2014 23:19:35 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201408202319.s7KNJZaV083026@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 20 Aug 2014 23:19:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r365519 - branches/2014Q3/net/turnserver 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, 20 Aug 2014 23:19:36 -0000 Author: bdrewery Date: Wed Aug 20 23:19:35 2014 New Revision: 365519 URL: http://svnweb.freebsd.org/changeset/ports/365519 QAT: https://qat.redports.org/buildarchive/r365519/ Log: Partial MFH of r363230 and r362796 to fix multiple databases being added to LIB_DEPENDS. This was causing needless rebuilding with poudriere. With hat: portmgr Modified: branches/2014Q3/net/turnserver/Makefile Modified: branches/2014Q3/net/turnserver/Makefile ============================================================================== --- branches/2014Q3/net/turnserver/Makefile Wed Aug 20 23:05:18 2014 (r365518) +++ branches/2014Q3/net/turnserver/Makefile Wed Aug 20 23:19:35 2014 (r365519) @@ -2,6 +2,7 @@ PORTNAME= turnserver PORTVERSION= 3.2.2.5 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://turnserver.open-sys.org/downloads/v${PORTVERSION}/ \ http://turnserver.open-sys.org/downloads/extradocs/ \ @@ -76,15 +77,13 @@ selfloadbalance/secure_relay.sh CONFIGURE_ENV+= PTHREAD_LIBS=-pthread TURN_DISABLE_RPATH=1 .if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes -LIB_DEPENDS+= libpq.so:${PORTSDIR}/databases/postgresql90-client +USES+= pgsql .else CONFIGURE_ENV+= TURN_NO_PQ=1 .endif .if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes -LIB_DEPENDS+= libmysqlclient.so:${PORTSDIR}/databases/mysql55-client .else CONFIGURE_ENV+= TURN_NO_MYSQL=1 .endif From owner-svn-ports-branches@FreeBSD.ORG Wed Aug 20 23:39:18 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2A6EB66C; Wed, 20 Aug 2014 23:39: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 F23283434; Wed, 20 Aug 2014 23:39:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7KNdHI1092306; Wed, 20 Aug 2014 23:39:17 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7KNdHed092305; Wed, 20 Aug 2014 23:39:17 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201408202339.s7KNdHed092305@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 20 Aug 2014 23:39:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r365521 - branches/2014Q3 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, 20 Aug 2014 23:39:18 -0000 Author: bdrewery Date: Wed Aug 20 23:39:17 2014 New Revision: 365521 URL: http://svnweb.freebsd.org/changeset/ports/365521 QAT: https://qat.redports.org/buildarchive/r365521/ Log: Record mergeinfo for r365519 Modified: Directory Properties: branches/2014Q3/ (props changed) From owner-svn-ports-branches@FreeBSD.ORG Thu Aug 21 00:13:53 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9F1A8415; Thu, 21 Aug 2014 00:13: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 8AEE0378B; Thu, 21 Aug 2014 00:13: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 s7L0DrWi011160; Thu, 21 Aug 2014 00:13:53 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7L0DrMr011159; Thu, 21 Aug 2014 00:13:53 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201408210013.s7L0DrMr011159@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 21 Aug 2014 00:13:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r365526 - branches/2014Q3/lang/ghc 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, 21 Aug 2014 00:13:53 -0000 Author: bdrewery Date: Thu Aug 21 00:13:53 2014 New Revision: 365526 URL: http://svnweb.freebsd.org/changeset/ports/365526 QAT: https://qat.redports.org/buildarchive/r365526/ Log: Fix devel/hs-haddock losing the HSCOLOUR option in the package it creates. This was causing poudriere to rebuild the package on every run even if the port was not updated. Direct commit as head did a major release to the Haskell ports in r364579 which covered this. With hat: portmgr Obtained from: https://github.com/freebsd-haskell/ports/commit/8a17f83af2b4793103f5ef6ffced95dfd6d831fe.patch Modified: branches/2014Q3/lang/ghc/bsd.cabal.options.mk Modified: branches/2014Q3/lang/ghc/bsd.cabal.options.mk ============================================================================== --- branches/2014Q3/lang/ghc/bsd.cabal.options.mk Thu Aug 21 00:05:58 2014 (r365525) +++ branches/2014Q3/lang/ghc/bsd.cabal.options.mk Thu Aug 21 00:13:53 2014 (r365526) @@ -37,7 +37,7 @@ OPTIONS_DEFINE+= PROFILE OPTIONS_DEFINE+= LLVM .endif -.if (!exists(${GHC_CMD}) || (exists(${HADDOCK_CMD}) && exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/html))) && !defined(NOPORTDOCS) +.if ((!exists(${GHC_CMD}) || exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/html)) || exists(${HADDOCK_CMD})) && !defined(NOPORTDOCS) OPTIONS_DEFINE+= DOCS OPTIONS_DEFAULT+= DOCS HADDOCK_AVAILABLE= yes From owner-svn-ports-branches@FreeBSD.ORG Thu Aug 21 03:06: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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3D09CEE2; Thu, 21 Aug 2014 03:06: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 2864837FE; Thu, 21 Aug 2014 03:06: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 s7L36NjI088849; Thu, 21 Aug 2014 03:06:23 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7L36NFJ088848; Thu, 21 Aug 2014 03:06:23 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201408210306.s7L36NFJ088848@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 21 Aug 2014 03:06:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r365529 - branches/2014Q3/audio/padevchooser 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, 21 Aug 2014 03:06:23 -0000 Author: bdrewery Date: Thu Aug 21 03:06:22 2014 New Revision: 365529 URL: http://svnweb.freebsd.org/changeset/ports/365529 QAT: https://qat.redports.org/buildarchive/r365529/ Log: MFH: r365528 - Remove unneeded LIB_DEPENDS for avahi. padevchooser does not link directly to avahi. Pulseaudio links directly to it and already depends on it. Pkg only considers library dependencies for DT_NEEDED links. Because avahi is not actually needed it is not registered as a dependency in the package. This causes poudriere to rebuild this port on every build because it sees avahi in LIB_DEPENDS but not registered in the package. ldd(1) shows the indirect dependency on avahi, however the direct deps can be seen with ldd -a or readelf -d. With hat: portmgr Modified: branches/2014Q3/audio/padevchooser/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/audio/padevchooser/Makefile ============================================================================== --- branches/2014Q3/audio/padevchooser/Makefile Thu Aug 21 03:05:52 2014 (r365528) +++ branches/2014Q3/audio/padevchooser/Makefile Thu Aug 21 03:06:22 2014 (r365529) @@ -3,7 +3,7 @@ PORTNAME= padevchooser PORTVERSION= 0.9.3 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= audio MASTER_SITES= http://0pointer.de/lennart/projects/${PORTNAME}/ @@ -12,8 +12,7 @@ COMMENT= GTK icon tray for PulseAudio LIB_DEPENDS= libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \ libpulse.so:${PORTSDIR}/audio/pulseaudio \ - libnotify.so:${PORTSDIR}/devel/libnotify \ - libavahi-core.so:${PORTSDIR}/net/avahi + libnotify.so:${PORTSDIR}/devel/libnotify RUN_DEPENDES= dbus-daemon:${PORTSDIR}/devel/dbus GNU_CONFIGURE= yes From owner-svn-ports-branches@FreeBSD.ORG Thu Aug 21 18:32:13 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4A2A74C0; Thu, 21 Aug 2014 18:32:13 +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 1C48E37A9; Thu, 21 Aug 2014 18:32:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7LIWCmo015279; Thu, 21 Aug 2014 18:32:12 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7LIWCNx015277; Thu, 21 Aug 2014 18:32:12 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201408211832.s7LIWCNx015277@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 21 Aug 2014 18:32:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r365577 - branches/2014Q3/Mk 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, 21 Aug 2014 18:32:13 -0000 Author: bdrewery Date: Thu Aug 21 18:32:12 2014 New Revision: 365577 URL: http://svnweb.freebsd.org/changeset/ports/365577 QAT: https://qat.redports.org/buildarchive/r365577/ Log: MFH: r365576 - Make 'clean-restricted' tell that it is deleting the package. Don't show this verbose output when calling delete-package on failures from do-package though. With hat: portmgr Modified: branches/2014Q3/Mk/bsd.pkgng.mk branches/2014Q3/Mk/bsd.port.mk Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/Mk/bsd.pkgng.mk ============================================================================== --- branches/2014Q3/Mk/bsd.pkgng.mk Thu Aug 21 18:30:36 2014 (r365576) +++ branches/2014Q3/Mk/bsd.pkgng.mk Thu Aug 21 18:32:12 2014 (r365577) @@ -265,7 +265,7 @@ do-package: ${TMPPLIST} fi; \ fi; \ else \ - cd ${.CURDIR} && eval ${MAKE} delete-package; \ + cd ${.CURDIR} && eval ${MAKE} delete-package >/dev/null; \ exit 1; \ fi .endif Modified: branches/2014Q3/Mk/bsd.port.mk ============================================================================== --- branches/2014Q3/Mk/bsd.port.mk Thu Aug 21 18:30:36 2014 (r365576) +++ branches/2014Q3/Mk/bsd.port.mk Thu Aug 21 18:32:12 2014 (r365577) @@ -3783,7 +3783,7 @@ do-package: ${TMPPLIST} cd ${.CURDIR} && eval ${MAKE} package-links; \ fi; \ else \ - cd ${.CURDIR} && eval ${MAKE} delete-package; \ + cd ${.CURDIR} && eval ${MAKE} delete-package >/dev/null; \ exit 1; \ fi .else @@ -3818,7 +3818,7 @@ do-package: ${TMPPLIST} fi; \ else \ [ -n "$${made_prefix}" ] && ${RMDIR} ${PREFIX}; \ - cd ${.CURDIR} && eval ${MAKE} delete-package; \ + cd ${.CURDIR} && eval ${MAKE} delete-package >/dev/null; \ exit 1; \ fi .endif @@ -3860,6 +3860,7 @@ delete-package-links: .if !target(delete-package) delete-package: delete-package-links + @${ECHO_MSG} "===> Deleting package for ${PKGNAME}" . if defined(NO_STAGE) @${RM} -f ${PKGFILE} . else From owner-svn-ports-branches@FreeBSD.ORG Thu Aug 21 20:23:13 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 758E6FAF; Thu, 21 Aug 2014 20:23:13 +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 5FB77333A; Thu, 21 Aug 2014 20:23:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7LKNDkW068715; Thu, 21 Aug 2014 20:23:13 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7LKNB7X068704; Thu, 21 Aug 2014 20:23:11 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201408212023.s7LKNB7X068704@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Thu, 21 Aug 2014 20:23:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r365594 - in branches/2014Q3/www: py-django py-django-devel py-django14 py-django15 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, 21 Aug 2014 20:23:13 -0000 Author: antoine Date: Thu Aug 21 20:23:11 2014 New Revision: 365594 URL: http://svnweb.freebsd.org/changeset/ports/365594 QAT: https://qat.redports.org/buildarchive/r365594/ Log: MFH: r365572 Update all Django ports to new security releases On August 20, the Django team issued new security releases addressing multiple vulnerabilities [1]. Update all of our Django ports accordingly: - www/py-django: Update to 1.6.6 - www/py-django14: Update to 1.4.14 - www/py-django15: Update to 1.5.9 - www/py-django-devel: Update to 1.7 release candidate 3 While I'm here: - Switch to USES=python and USE_PYTHON= - Deprecate OPTIONSFILE - Add CPE information - Add LICENSE_FILE - Tweak HTMLDOCS option description And for www/py-django-devel: - Switch to GITHUB for distribution files [1] https://www.djangoproject.com/weblog/2014/aug/20/security/ Approved by: lwhsu (maintainer) Security: 3c5579f7-294a-11e4-99f6-00e0814cab4e Modified: branches/2014Q3/www/py-django-devel/Makefile branches/2014Q3/www/py-django-devel/distinfo branches/2014Q3/www/py-django/Makefile branches/2014Q3/www/py-django/distinfo branches/2014Q3/www/py-django14/Makefile branches/2014Q3/www/py-django14/distinfo branches/2014Q3/www/py-django15/Makefile branches/2014Q3/www/py-django15/distinfo Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/www/py-django-devel/Makefile ============================================================================== --- branches/2014Q3/www/py-django-devel/Makefile Thu Aug 21 20:00:11 2014 (r365593) +++ branches/2014Q3/www/py-django-devel/Makefile Thu Aug 21 20:23:11 2014 (r365594) @@ -4,8 +4,6 @@ PORTNAME= django PORTVERSION= ${SNAPSHOTDATE} PORTEPOCH= 1 CATEGORIES= www python -MASTER_SITES= http://people.cs.nctu.edu.tw/~lwhsu/ports/distfiles/ -MASTER_SITE_SUBDIR= lwhsu/django PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMESUFFIX= -devel DISTNAME= Django-${SNAPSHOTDATE} @@ -16,25 +14,29 @@ COMMENT= High-level Python Web framework LICENSE= BSD3CLAUSE -SNAPSHOTDATE= 20140423 +SNAPSHOTDATE= 20140821 -USES= gettext tar:xz +USES= cpe gettext +USE_GITHUB= yes USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_AUTOPLIST= yes PYDISTUTILS_PKGVERSION= 1.7 +GH_ACCOUNT= ${PORTNAME} +GH_TAGNAME= ad96254 +GH_COMMIT= ${GH_TAGNAME} + CONFLICTS= py2[0-9]-django-[0-9]* +CPE_VENDOR= djangoproject DOCSDIR= ${PREFIX}/share/doc/py-django -# bypass infrastructure bug -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}-devel/options OPTIONS_DEFINE= FASTCGI HTMLDOCS OPTIONS_DEFAULT=SQLITE OPTIONS_GROUP= DATABASE OPTIONS_GROUP_DATABASE= PGSQL MYSQL SQLITE -HTMLDOCS_DESC= Install the HTML documentation (requires Sphinx) +HTMLDOCS_DESC= Install HTML documentation (requires Sphinx) PLIST_FILES= man/man1/django-admin.1.gz \ man/man1/gather_profile_stats.1.gz Modified: branches/2014Q3/www/py-django-devel/distinfo ============================================================================== --- branches/2014Q3/www/py-django-devel/distinfo Thu Aug 21 20:00:11 2014 (r365593) +++ branches/2014Q3/www/py-django-devel/distinfo Thu Aug 21 20:23:11 2014 (r365594) @@ -1,2 +1,2 @@ -SHA256 (python/Django-20140423.tar.xz) = d40b8d98cac40d40844c552953aa7a6d1faba10b21aebffd765684d54f85cc29 -SIZE (python/Django-20140423.tar.xz) = 4540492 +SHA256 (python/Django-20140821.tar.gz) = c93f6e71e46480f8fe63b015717f784d3f06bbfa7149f4677b67c608efec00ad +SIZE (python/Django-20140821.tar.gz) = 7536234 Modified: branches/2014Q3/www/py-django/Makefile ============================================================================== --- branches/2014Q3/www/py-django/Makefile Thu Aug 21 20:00:11 2014 (r365593) +++ branches/2014Q3/www/py-django/Makefile Thu Aug 21 20:23:11 2014 (r365594) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= django -PORTVERSION= 1.6.5 +PORTVERSION= 1.6.6 CATEGORIES= www python MASTER_SITES= https://www.djangoproject.com/m/releases/${PORTVERSION}/ \ CHEESESHOP @@ -14,22 +14,24 @@ MAINTAINER= lwhsu@FreeBSD.org COMMENT= High-level Python Web framework LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE +USES= cpe USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_AUTOPLIST= yes +CPE_VENDOR= djangoproject + CONFLICTS= py[23][0-9]-django-devel-[0-9]* py[23][0-9]-django-1.[0-57-9].* DOCSDIR= ${PREFIX}/share/doc/py-django -# bypass infrastructure bug -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= FASTCGI HTMLDOCS OPTIONS_DEFAULT=SQLITE OPTIONS_GROUP= DATABASE OPTIONS_GROUP_DATABASE= PGSQL MYSQL SQLITE -HTMLDOCS_DESC= Install the HTML documentation (requires Sphinx) +HTMLDOCS_DESC= Install HTML documentation (requires Sphinx) PLIST_FILES= man/man1/daily_cleanup.1.gz \ man/man1/django-admin.1.gz \ Modified: branches/2014Q3/www/py-django/distinfo ============================================================================== --- branches/2014Q3/www/py-django/distinfo Thu Aug 21 20:00:11 2014 (r365593) +++ branches/2014Q3/www/py-django/distinfo Thu Aug 21 20:23:11 2014 (r365594) @@ -1,2 +1,2 @@ -SHA256 (python/Django-1.6.5.tar.gz) = 36940268c087fede32d3f5887cce9af9e5d27962a0c405aacafc2a3cc1f755c5 -SIZE (python/Django-1.6.5.tar.gz) = 6633768 +SHA256 (python/Django-1.6.6.tar.gz) = 536cbd54e533ba3563d205f0c91988b24e7d74b8b253d7825e42214b50ba7e90 +SIZE (python/Django-1.6.6.tar.gz) = 6645456 Modified: branches/2014Q3/www/py-django14/Makefile ============================================================================== --- branches/2014Q3/www/py-django14/Makefile Thu Aug 21 20:00:11 2014 (r365593) +++ branches/2014Q3/www/py-django14/Makefile Thu Aug 21 20:23:11 2014 (r365594) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= django -PORTVERSION= 1.4.13 +PORTVERSION= 1.4.14 CATEGORIES= www python MASTER_SITES= https://www.djangoproject.com/m/releases/${PORTVERSION:R}/ \ CHEESESHOP @@ -15,22 +15,23 @@ MAINTAINER= lwhsu@FreeBSD.org COMMENT= High-level Python Web framework LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE +USES= cpe USE_PYTHON= 2 USE_PYDISTUTILS= yes PYDISTUTILS_AUTOPLIST= yes CONFLICTS= py[23][0-9]-django-devel-[0-9]* py[23][0-9]-django-1.[0-35-9].* +CPE_VENDOR= djangoproject DOCSDIR= ${PREFIX}/share/doc/py-django -# bypass infrastructure bug -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= FASTCGI HTMLDOCS OPTIONS_DEFAULT=SQLITE OPTIONS_GROUP= DATABASE OPTIONS_GROUP_DATABASE= PGSQL MYSQL SQLITE -HTMLDOCS_DESC= Install the HTML documentation (requires Sphinx) +HTMLDOCS_DESC= Install HTML documentation (requires Sphinx) PLIST_FILES= man/man1/daily_cleanup.1.gz \ man/man1/django-admin.1.gz \ Modified: branches/2014Q3/www/py-django14/distinfo ============================================================================== --- branches/2014Q3/www/py-django14/distinfo Thu Aug 21 20:00:11 2014 (r365593) +++ branches/2014Q3/www/py-django14/distinfo Thu Aug 21 20:23:11 2014 (r365594) @@ -1,2 +1,2 @@ -SHA256 (python/Django-1.4.13.tar.gz) = a8fede657378b6862744b19012e7071279b952ecd208fd83227723866068f2c0 -SIZE (python/Django-1.4.13.tar.gz) = 7753532 +SHA256 (python/Django-1.4.14.tar.gz) = 81edad81211fd515677a35ab2d40833557649dd650f150baf8416f416b8a6c9c +SIZE (python/Django-1.4.14.tar.gz) = 7754876 Modified: branches/2014Q3/www/py-django15/Makefile ============================================================================== --- branches/2014Q3/www/py-django15/Makefile Thu Aug 21 20:00:11 2014 (r365593) +++ branches/2014Q3/www/py-django15/Makefile Thu Aug 21 20:23:11 2014 (r365594) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= django -PORTVERSION= 1.5.8 +PORTVERSION= 1.5.9 CATEGORIES= www python MASTER_SITES= https://www.djangoproject.com/m/releases/${PORTVERSION:R}/ \ CHEESESHOP @@ -15,22 +15,23 @@ MAINTAINER= lwhsu@FreeBSD.org COMMENT= High-level Python Web framework LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE +USES= cpe USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_AUTOPLIST= yes CONFLICTS= py[23][0-9]-django-devel-[0-9]* py[23][0-9]-django-1.[0-46-9].* +CPE_VENDOR= djangoproject DOCSDIR= ${PREFIX}/share/doc/py-django -# bypass infrastructure bug -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= FASTCGI HTMLDOCS OPTIONS_DEFAULT=SQLITE OPTIONS_GROUP= DATABASE OPTIONS_GROUP_DATABASE= PGSQL MYSQL SQLITE -HTMLDOCS_DESC= Install the HTML documentation (requires Sphinx) +HTMLDOCS_DESC= Install HTML documentation (requires Sphinx) PLIST_FILES= man/man1/daily_cleanup.1.gz \ man/man1/django-admin.1.gz \ Modified: branches/2014Q3/www/py-django15/distinfo ============================================================================== --- branches/2014Q3/www/py-django15/distinfo Thu Aug 21 20:00:11 2014 (r365593) +++ branches/2014Q3/www/py-django15/distinfo Thu Aug 21 20:23:11 2014 (r365594) @@ -1,2 +1,2 @@ -SHA256 (python/Django-1.5.8.tar.gz) = 01db30f38a081241a9cbc7bef12cb599506b80727613350e427547bed12aaaa3 -SIZE (python/Django-1.5.8.tar.gz) = 8071329 +SHA256 (python/Django-1.5.9.tar.gz) = 47ce505c5046c38817828bee253b7256872f86c4340db1af698cb8548dbaa0d2 +SIZE (python/Django-1.5.9.tar.gz) = 8074400 From owner-svn-ports-branches@FreeBSD.ORG Sat Aug 23 12:50:21 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A3950412; Sat, 23 Aug 2014 12:50: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 855E13130; Sat, 23 Aug 2014 12:50: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 s7NCoLpb000873; Sat, 23 Aug 2014 12:50:21 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7NCoKtQ000869; Sat, 23 Aug 2014 12:50:20 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201408231250.s7NCoKtQ000869@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Sat, 23 Aug 2014 12:50:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r365727 - branches/2014Q3/security/nmap 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, 23 Aug 2014 12:50:21 -0000 Author: ohauer Date: Sat Aug 23 12:50:20 2014 New Revision: 365727 URL: http://svnweb.freebsd.org/changeset/ports/365727 QAT: https://qat.redports.org/buildarchive/r365727/ Log: MFH: r365724 - update to 6.4.7 - add CPE entry - sort pkg-plist Changelog (entries related to the command line tools) Nmap 6.47 [2014-08-20] o Integrated all of your IPv4 OS fingerprint submissions since June 2013 (2700+ of them). Added 366 fingerprints, bringing the new total to 4485. Additions include Linux 3.10 - 3.14, iOS 7, OpenBSD 5.4 - 5.5, FreeBSD 9.2, OS X 10.9, Android 4.3, and more. Many existing fingerprints were improved. Highlights: http://seclists.org/nmap-dev/2014/q3/325 [Daniel Miller] o Removed the External Entity Declaration from the DOCTYPE in Nmap's XML. This was added in 6.45, and resulted in trouble for Nmap XML parsers without network access, as well as increased traffic to Nmap's servers. The doctype is now: o [Ncat] Fixed SOCKS5 username/password authentication. The password length was being written in the wrong place, so authentication could not succeed. Reported with patch by Pierluigi Vittori. o Avoid formatting NULL as "%s" when running nmap --iflist. GNU libc converts this to the string "(null)", but it caused segfault on Solaris. [Daniel Miller] o Handle ICMP admin-prohibited messages when doing service version detection. Crash reported by Nathan Stocks was: Unexpected error in NSE_TYPE_READ callback. Error code: 101 (Network is unreachable) [David Fifield] o [NSE] Fix a bug causing http.head to not honor redirects. [Patrik Karlsson] Approved by: portmgr (zi) Modified: branches/2014Q3/security/nmap/Makefile branches/2014Q3/security/nmap/distinfo branches/2014Q3/security/nmap/pkg-plist Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/security/nmap/Makefile ============================================================================== --- branches/2014Q3/security/nmap/Makefile Sat Aug 23 12:36:01 2014 (r365726) +++ branches/2014Q3/security/nmap/Makefile Sat Aug 23 12:50:20 2014 (r365727) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nmap -DISTVERSION= 6.46 +DISTVERSION= 6.47 CATEGORIES= security ipv6 MASTER_SITES= http://nmap.org/dist/ \ LOCAL/ohauer @@ -10,7 +10,7 @@ MASTER_SITES= http://nmap.org/dist/ \ MAINTAINER= ohauer@FreeBSD.org COMMENT= Port scanning utility for large networks -# nmap-6.46 => r32840 +# nmap-6.47 => svn.nmap.org/nmap-releases/nmap-6.47 (r33605) # http://nmap.org/book/man-legal.html # Install the nmap modified license because of # http://insecure.org/news/download-com-fiasco.html @@ -19,7 +19,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre -USES= gmake tar:bzip2 +USES= tar:bzip2 gmake cpe GNU_CONFIGURE= yes OPTIONS_SUB= yes @@ -58,7 +58,7 @@ CONFIGURE_ARGS+=--without-localdirs \ .if ${CC} != "cc" && ${CC} !="clang" GCCLIBDIR_CMDS= ${CC} -print-file-name=libstdc++.so | ${SED} -e 's/libstdc++.so//' CONFIGURE_ARGS+=LDFLAGS="-L$$(${GCCLIBDIR_CMDS})" -NDCC= true +NOT_BASE_CC= true .endif # XXX limit results if we do a grep in the sources! @@ -77,7 +77,7 @@ post-install: ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} # gcc from ports is in use -.if defined(NDCC) +.if defined(NOT_BASE_CC) @${ECHO_MSG} do not forget to adjust libnmap.conf .endif Modified: branches/2014Q3/security/nmap/distinfo ============================================================================== --- branches/2014Q3/security/nmap/distinfo Sat Aug 23 12:36:01 2014 (r365726) +++ branches/2014Q3/security/nmap/distinfo Sat Aug 23 12:50:20 2014 (r365727) @@ -1,2 +1,2 @@ -SHA256 (nmap-6.46.tar.bz2) = 3f89d9053c69507fe9533c40188a6561d49607a37b1db6380aed9039d4883137 -SIZE (nmap-6.46.tar.bz2) = 7911353 +SHA256 (nmap-6.47.tar.bz2) = 8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1dd0018325a7112a51aa591 +SIZE (nmap-6.47.tar.bz2) = 7878122 Modified: branches/2014Q3/security/nmap/pkg-plist ============================================================================== --- branches/2014Q3/security/nmap/pkg-plist Sat Aug 23 12:36:01 2014 (r365726) +++ branches/2014Q3/security/nmap/pkg-plist Sat Aug 23 12:50:20 2014 (r365727) @@ -651,36 +651,36 @@ man/zh/man1/nmap.1.gz %%DATADIR%%/scripts/xdmcp-discover.nse %%DATADIR%%/scripts/xmpp-brute.nse %%DATADIR%%/scripts/xmpp-info.nse -@dirrm %%DATADIR%%/scripts -@dirrm %%DATADIR%%/nselib/data/psexec +@dirrmtry man/de/man1 +@dirrmtry man/de +@dirrmtry man/es/man1 +@dirrmtry man/es +@dirrmtry man/fr/man1 +@dirrmtry man/fr +@dirrmtry man/hr/man1 +@dirrmtry man/hr +@dirrmtry man/hu/man1 +@dirrmtry man/hu +@dirrmtry man/it/man1 +@dirrmtry man/it +@dirrmtry man/pl/man1 +@dirrmtry man/pl +@dirrmtry man/pt_BR/man1 +@dirrmtry man/pt_BR +@dirrmtry man/pt_PT/man1 +@dirrmtry man/pt_PT +@dirrmtry man/ro/man1 +@dirrmtry man/ro +@dirrmtry man/ru/man1 +@dirrmtry man/ru +@dirrmtry man/sk/man1 +@dirrmtry man/sk +@dirrmtry man/zh/man1 +@dirrmtry man/zh +%%SSL%%@dirrm share/ncat @dirrm %%DATADIR%%/nselib/data/jdwp-class +@dirrm %%DATADIR%%/nselib/data/psexec @dirrm %%DATADIR%%/nselib/data @dirrm %%DATADIR%%/nselib +@dirrm %%DATADIR%%/scripts @dirrm %%DATADIR%% -%%SSL%%@dirrm share/ncat -@dirrmtry man/zh/man1 -@dirrmtry man/zh -@dirrmtry man/sk/man1 -@dirrmtry man/sk -@dirrmtry man/ru/man1 -@dirrmtry man/ru -@dirrmtry man/ro/man1 -@dirrmtry man/ro -@dirrmtry man/pt_PT/man1 -@dirrmtry man/pt_PT -@dirrmtry man/pt_BR/man1 -@dirrmtry man/pt_BR -@dirrmtry man/pl/man1 -@dirrmtry man/pl -@dirrmtry man/it/man1 -@dirrmtry man/it -@dirrmtry man/hu/man1 -@dirrmtry man/hu -@dirrmtry man/hr/man1 -@dirrmtry man/hr -@dirrmtry man/fr/man1 -@dirrmtry man/fr -@dirrmtry man/es/man1 -@dirrmtry man/es -@dirrmtry man/de/man1 -@dirrmtry man/de