From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Feb 14 17:10:12 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 57A16106567B for ; Tue, 14 Feb 2012 17:10:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 177198FC16 for ; Tue, 14 Feb 2012 17:10:12 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q1EHABPA010595 for ; Tue, 14 Feb 2012 17:10:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q1EHABFT010594; Tue, 14 Feb 2012 17:10:11 GMT (envelope-from gnats) Resent-Date: Tue, 14 Feb 2012 17:10:11 GMT Resent-Message-Id: <201202141710.q1EHABFT010594@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Philip M. Gollucci" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C27B0106567F for ; Tue, 14 Feb 2012 17:06:15 +0000 (UTC) (envelope-from pgollucci@frieza.p6m7g8.net) Received: from frieza.p6m7g8.net (wsip-174-79-184-239.dc.dc.cox.net [174.79.184.239]) by mx1.freebsd.org (Postfix) with ESMTP id 83EBB8FC17 for ; Tue, 14 Feb 2012 17:06:15 +0000 (UTC) Received: from frieza.p6m7g8.net (localhost [127.0.0.1]) by frieza.p6m7g8.net (8.14.5/8.14.4) with ESMTP id q1EH6ECN001646; Tue, 14 Feb 2012 17:06:14 GMT (envelope-from pgollucci@frieza.p6m7g8.net) Received: (from pgollucci@localhost) by frieza.p6m7g8.net (8.14.5/8.14.5/Submit) id q1EH6EN7001645; Tue, 14 Feb 2012 17:06:14 GMT (envelope-from pgollucci) Message-Id: <201202141706.q1EH6EN7001645@frieza.p6m7g8.net> Date: Tue, 14 Feb 2012 17:06:14 GMT From: "Philip M. Gollucci" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: apache@FreeBSD.org Subject: ports/165143: [PATCH] devel/apr: CVE / Update / exp-run / shlib bump X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2012 17:10:12 -0000 >Number: 165143 >Category: ports >Synopsis: [PATCH] devel/apr: CVE / Update / exp-run / shlib bump >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Feb 14 17:10:11 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Philip M. Gollucci >Release: FreeBSD 9.0-RELEASE amd64 >Organization: RideCharge Inc / TaxiMagic >Environment: System: FreeBSD frieza.p6m7g8.net 9.0-RELEASE FreeBSD 9.0-RELEASE #1 r230510M: Wed Feb 27 17:41:35 UTC >Description: ldap patch is now upstream Removed file(s): - files/patch-apr_ldap_rebind.c Port maintainer (apache@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- apr-1.4.6.1.4.1_1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/devel/apr1/Makefile,v retrieving revision 1.118 diff -u -u -r1.118 Makefile --- Makefile 23 Jan 2012 22:48:54 -0000 1.118 +++ Makefile 14 Feb 2012 17:02:03 -0000 @@ -30,8 +30,8 @@ SQLITE "Enable SQLite3 support in apr-util" off \ DEVRANDOM "Use /dev/random or compatible in apr" on -APR_VERSION= 1.4.5 -APU_VERSION= 1.3.12 +APR_VERSION= 1.4.6 +APU_VERSION= 1.4.1 USE_ICONV= yes USE_AUTOTOOLS= automake autoconf libtool:env @@ -48,7 +48,7 @@ PLIST_SUB= SHLIB_APR_MAJOR="${SHLIB_APR_MAJOR}" SHLIB_APU_MAJOR="${SHLIB_APU_MAJOR}" SHLIB_APR_MAJOR= 4 -SHLIB_APU_MAJOR= 3 +SHLIB_APU_MAJOR= 4 APR_CONF_ARGS= --with-installbuilddir=${DATADIR}/build-1 APU_CONF_ARGS= --with-apr=${APR_WRKDIR} \ @@ -60,11 +60,6 @@ ########## APR Options .if defined(WITHOUT_THREADS) APR_CONF_ARGS+= --disable-threads -.if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-nothr -.else -PKGNAMESUFFIX= -nothr -.endif .else APR_CONF_ARGS+= --enable-threads .endif @@ -73,22 +68,12 @@ APR_CONF_ARGS+= --disable-ipv6 .else APR_CONF_ARGS+= --enable-ipv6 -.if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ipv6 -.else -PKGNAMESUFFIX= -ipv6 -.endif .endif .if defined(WITHOUT_DEVRANDOM) APR_CONF_ARGS+= --without-devrandom .else APR_CONF_ARGS+= --with-devrandom -.if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-devrandom -.else -PKGNAMESUFFIX= -devrandom -.endif .endif ######### APR-Util Options @@ -100,11 +85,6 @@ APU_EXTRAS= yes LIB_DEPENDS+= gdbm.4:${PORTSDIR}/databases/gdbm APU_CONF_ARGS+= --with-gdbm=${LOCALBASE} -.if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gdbm -.else -PKGNAMESUFFIX= -gdbm -.endif .endif .if defined(WITHOUT_BDB) @@ -115,22 +95,12 @@ PLIST_SUB+= BDB="" USE_BDB= 42+ APU_CONF_ARGS+= --with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR} -.if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,} -.else -PKGNAMESUFFIX= -${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,} -.endif .endif .if defined(WITH_NDBM) APU_EXTRAS= yes PLIST_SUB+= NDBM="" APU_CONF_ARGS+= --with-ndbm=/usr -.if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ndbm -.else -PKGNAMESUFFIX= -ndbm -.endif .else PLIST_SUB+= NDBM="@comment " APU_CONF_ARGS+= --without-ndbm @@ -142,11 +112,6 @@ USE_OPENLDAP= yes APU_CONF_ARGS+= --with-ldap-include=${LOCALBASE}/include \ --with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap -.if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ldap${OPENLDAP_VER} -.else -PKGNAMESUFFIX= -ldap -.endif .else PLIST_SUB+= LDAP="@comment " APU_CONF_ARGS+= --without-ldap @@ -160,11 +125,6 @@ CONFIGURE_ENV+= LIBS="${LIBS}" CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H LDFLAGS+= -L${LOCALBASE}/lib/mysql -.if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-mysql${MYSQL_VER} -.else -PKGNAMESUFFIX= -mysql -.endif .else PLIST_SUB+= MYSQL="@comment " APU_CONF_ARGS+= --without-mysql @@ -176,11 +136,6 @@ USE_PGSQL= YES APU_CONF_ARGS+= --with-pgsql=${LOCALBASE} CONFIGURE_ENV+= ac_cv_path_PGSQL_CONFIG="" -.if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-pgsql${PGSQL_VER} -.else -PKGNAMESUFFIX= -pgsql -.endif .else PLIST_SUB+= PGSQL="@comment " APU_CONF_ARGS+= --without-pgsql @@ -191,11 +146,6 @@ PLIST_SUB+= SQLITE3="" USE_SQLITE= YES APU_CONF_ARGS+= --with-sqlite3=${LOCALBASE} -.if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-sqlite3 -.else -PKGNAMESUFFIX= -sqlite3 -.endif .else APU_CONF_ARGS+= --without-sqlite3 PLIST_SUB+= SQLITE3="@comment " Index: distinfo =================================================================== RCS file: /home/ncvs/ports/devel/apr1/distinfo,v retrieving revision 1.29 diff -u -u -r1.29 distinfo --- distinfo 22 May 2011 21:31:16 -0000 1.29 +++ distinfo 14 Feb 2012 16:50:13 -0000 @@ -1,4 +1,4 @@ -SHA256 (apr-1.4.5.tar.gz) = 7323d5f72d6bddf7d1ecb63e4326df82a66210018bb2f1e8f6d97357e68302df -SIZE (apr-1.4.5.tar.gz) = 994320 -SHA256 (apr-util-1.3.12.tar.gz) = 815b6fc82950f61050a5e711a7f3c20fd9b6ffcc7a4cacfe9f291fb241210cd8 -SIZE (apr-util-1.3.12.tar.gz) = 769076 +SHA256 (apr-1.4.6.tar.gz) = 538d593d805c36985fc6d200d31bf6c1b5f90df2a50b917902743a13bbc10e05 +SIZE (apr-1.4.6.tar.gz) = 982243 +SHA256 (apr-util-1.4.1.tar.gz) = d636d9ef95c6e50e47fc338d532aa375edd11e5d7a3c30dee48beb38ddf4ab4c +SIZE (apr-util-1.4.1.tar.gz) = 774770 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/devel/apr1/pkg-plist,v retrieving revision 1.24 diff -u -u -r1.24 pkg-plist --- pkg-plist 18 May 2010 04:00:26 -0000 1.24 +++ pkg-plist 14 Feb 2012 17:02:41 -0000 @@ -11,6 +11,7 @@ include/apr-1/apr_atomic.h include/apr-1/apr_base64.h include/apr-1/apr_buckets.h +include/apr-1/apr_crypto.h include/apr-1/apr_date.h include/apr-1/apr_dbd.h include/apr-1/apr_dbm.h @@ -70,6 +71,7 @@ include/apr-1/apr_xlate.h include/apr-1/apr_xml.h include/apr-1/apu.h +include/apr-1/apu_errno.h include/apr-1/apu_version.h include/apr-1/apu_want.h libdata/pkgconfig/apr-1.pc Index: files/patch-apr_hints.m4 =================================================================== RCS file: /home/ncvs/ports/devel/apr1/files/patch-apr_hints.m4,v retrieving revision 1.23 diff -u -u -r1.23 patch-apr_hints.m4 --- files/patch-apr_hints.m4 22 May 2011 21:31:16 -0000 1.23 +++ files/patch-apr_hints.m4 14 Feb 2012 16:56:37 -0000 @@ -1,5 +1,5 @@ ---- apr-1.4.5/build/apr_hints.m4.orig Wed Oct 27 11:12:28 2004 -+++ apr-1.4.5/build/apr_hints.m4 Wed Oct 27 11:25:32 2004 +--- apr-1.4.6/build/apr_hints.m4.orig Wed Oct 27 11:12:28 2004 ++++ apr-1.4.6/build/apr_hints.m4 Wed Oct 27 11:25:32 2004 @@ -159,11 +159,7 @@ ;; *-freebsd*) Index: files/patch-apr_ldap_rebind.c =================================================================== RCS file: files/patch-apr_ldap_rebind.c diff -N files/patch-apr_ldap_rebind.c --- files/patch-apr_ldap_rebind.c 19 Jun 2011 10:27:11 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ ---- apr-util-1.3.12/ldap/apr_ldap_rebind.c.orig 2011-06-18 14:42:15.000000000 +0000 -+++ apr-util-1.3.12/ldap/apr_ldap_rebind.c 2011-06-18 14:42:28.000000000 +0000 -@@ -81,11 +81,11 @@ - get_apd - #endif - -+#if APR_HAS_THREADS - /* run after apr_thread_mutex_create cleanup */ - apr_pool_cleanup_register(pool, &apr_ldap_xref_lock, apr_ldap_pool_cleanup_set_null, - apr_pool_cleanup_null); - --#if APR_HAS_THREADS - if (apr_ldap_xref_lock == NULL) { - retcode = apr_thread_mutex_create(&apr_ldap_xref_lock, APR_THREAD_MUTEX_DEFAULT, pool); - } --- apr-1.4.6.1.4.1_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: