From owner-svn-ports-all@FreeBSD.ORG Mon Apr 21 17:43:47 2014 Return-Path: Delivered-To: svn-ports-all@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 02BC5E74; Mon, 21 Apr 2014 17:43: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 D6CAD11F4; Mon, 21 Apr 2014 17:43:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3LHhk23048397; Mon, 21 Apr 2014 17:43:46 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3LHhkFW048393; Mon, 21 Apr 2014 17:43:46 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201404211743.s3LHhkFW048393@svn.freebsd.org> From: Olli Hauer Date: Mon, 21 Apr 2014 17:43:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351698 - in head/devel/apr1: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Apr 2014 17:43:47 -0000 Author: ohauer Date: Mon Apr 21 17:43:45 2014 New Revision: 351698 URL: http://svnweb.freebsd.org/changeset/ports/351698 QAT: https://qat.redports.org/buildarchive/r351698/ Log: - update apr to 1.5.1 - use OPTIONS_SUB instead PLIST_SUB - remove back ported patch - use POSIX instead SysV SHM - remove LDFLAGS from CONFIGURE_ENV (unbreak auto. testing) Changes for APR 1.5.1 *) apr_os_proc_mutex_get() on Unix: Avoid segfault for cross- process pthread mutexes. [Yann Ylavic ] *) When using shmget-based shared memory, the ID used for ftok is now an APR hash of the filename instead of the constant '1'. We do this to help avoid collisions. PR 53996 [Jim Jagielski] *) apr_socket_atreadeof(): Fix breakage on OS X. [Jim Jagielski] *) Fix POSIX shared memory (shm_open) use for named shared memory. Includes adding '--enable-posix-shm' to force POSIX shm if available, and OS X compatibility. PR 55928. [Jozef Hatala , Jim Jagielski] *) Fix race condition when calling apr_dir_make_recursive from multiple threads on Windows. [Bert Huijben] *) Fix apr_escape.c compilation errors on EBCDIC platforms. [Eric Covener] *) FreeBSD 10: Correct a regression in 1.5.0 which affected non- blocking sockets in some applications, including httpd. [Jeff Trawick] *) apr_skiplist: Add compatibility with C++ applications. [Jeff Trawick] *) Correct a regression in 1.5.0 which affected out-of-tree builds on Unix. [Rainer Jung] *) Improve platform detection for bundled expat by updating config.guess and config.sub. [Rainer Jung] with hat apache@ Deleted: head/devel/apr1/files/patch-apr-1.5.0__network_io__unix__sockets.c Modified: head/devel/apr1/Makefile head/devel/apr1/distinfo head/devel/apr1/files/patch-apr__configure head/devel/apr1/pkg-plist Modified: head/devel/apr1/Makefile ============================================================================== --- head/devel/apr1/Makefile Mon Apr 21 17:40:40 2014 (r351697) +++ head/devel/apr1/Makefile Mon Apr 21 17:43:45 2014 (r351698) @@ -13,7 +13,7 @@ COMMENT= Apache Portability Library LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 - +OPTIONS_SUB= yes OPTIONS_GROUP= APR APU OPTIONS_GROUP_APR= THREADS IPV6 DEVRANDOM OPTIONS_GROUP_APU= BDB GDBM LDAP MYSQL NDBM PGSQL SQLITE FREETDS @@ -26,7 +26,7 @@ NDBM_DESC= NDBM support SSL_DESC= OpenSSL crypto driver NSS_DESC= NSS crypto driver -APR_VERSION= 1.5.0 +APR_VERSION= 1.5.1 APU_VERSION= 1.5.3 USES= iconv pathfix @@ -41,7 +41,8 @@ PLIST_SUB+= SHLIB_APR_MAJOR="${SHLIB_APR SHLIB_APR_MAJOR= 5 SHLIB_APU_MAJOR= 5 -APR_CONF_ARGS= --with-installbuilddir=${DATADIR}/build-1 +APR_CONF_ARGS= --with-installbuilddir=${DATADIR}/build-1 \ + --enable-posix-shm APU_CONF_ARGS= --with-apr=${APR_WRKDIR} \ --with-expat=${LOCALBASE} \ --with-iconv=${ICONV_PREFIX} @@ -69,87 +70,71 @@ APR_CONF_ARGS+= --without-devrandom ######### APR-Util Options .if ${PORT_OPTIONS:MGDBM} -PLIST_SUB+= GDBM="" APU_EXTRAS= yes LIB_DEPENDS+= libgdbm.so:${PORTSDIR}/databases/gdbm APU_CONF_ARGS+= --with-gdbm=${LOCALBASE} .else -PLIST_SUB+= GDBM="@comment " APU_CONF_ARGS+= --without-gdbm .endif .if ${PORT_OPTIONS:MBDB} APU_EXTRAS= yes -PLIST_SUB+= BDB="" USE_BDB= 48+ APU_CONF_ARGS+= --with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR} .else -PLIST_SUB+= BDB="@comment " APU_CONF_ARGS+= --without-berkeley-db .endif .if ${PORT_OPTIONS:MNDBM} APU_EXTRAS= yes -PLIST_SUB+= NDBM="" APU_CONF_ARGS+= --with-ndbm=/usr .else -PLIST_SUB+= NDBM="@comment " APU_CONF_ARGS+= --without-ndbm .endif .if ${PORT_OPTIONS:MLDAP} APU_EXTRAS= yes -PLIST_SUB+= LDAP="" USE_OPENLDAP= yes APU_CONF_ARGS+= --with-ldap-include=${LOCALBASE}/include \ --with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap .else -PLIST_SUB+= LDAP="@comment " APU_CONF_ARGS+= --without-ldap .endif .if ${PORT_OPTIONS:MFREETDS} APU_EXTRAS= yes -PLIST_SUB+= FREETDS="" APU_CONF_ARGS+= --with-freetds=${LOCALBASE} LIB_DEPENDS+= libsybdb.so:${PORTSDIR}/databases/freetds .else -PLIST_SUB+= FREETDS="@comment " APU_CONF_ARGS+= --without-freetds .endif .if ${PORT_OPTIONS:MMYSQL} APU_EXTRAS= yes -PLIST_SUB+= MYSQL="" -USE_MYSQL= YES +USE_MYSQL= yes APU_CONF_ARGS+= --with-mysql=${LOCALBASE} CONFIGURE_ENV+= LIBS="${LIBS}" CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H LDFLAGS+= -L${LOCALBASE}/lib/mysql .else -PLIST_SUB+= MYSQL="@comment " APU_CONF_ARGS+= --without-mysql .endif .if ${PORT_OPTIONS:MPGSQL} APU_EXTRAS= yes -PLIST_SUB+= PGSQL="" -USE_PGSQL= YES +USE_PGSQL= yes APU_CONF_ARGS+= --with-pgsql=${LOCALBASE} CONFIGURE_ENV+= ac_cv_path_PGSQL_CONFIG="" .else -PLIST_SUB+= PGSQL="@comment " APU_CONF_ARGS+= --without-pgsql .endif .if ${PORT_OPTIONS:MSQLITE} APU_EXTRAS= yes -PLIST_SUB+= SQLITE3="" -USE_SQLITE= YES +USE_SQLITE= yes APU_CONF_ARGS+= --with-sqlite3=${LOCALBASE} .else APU_CONF_ARGS+= --without-sqlite3 -PLIST_SUB+= SQLITE3="@comment " .endif # crypto (apache24) @@ -160,28 +145,22 @@ APU_CONF_ARGS+= --with-crypto .if ${PORT_OPTIONS:MSSL} APU_EXTRAS= yes USE_OPENSSL= yes -PLIST_SUB+= SSL="" CPPFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} APU_CONF_ARGS+= --with-openssl=${OPENSSLBASE} .else -PLIST_SUB+= SSL="@comment " APU_CONF_ARGS+= --without-openssl .endif .if ${PORT_OPTIONS:MNSS} APU_EXTRAS= yes -PLIST_SUB+= NSS="" LIB_DEPENDS+= libnss3.so:${PORTSDIR}/security/nss CPPFLAGS+= -I${LOCALBASE}/include/nss LDFLAGS+= -L${LOCALBASE}/lib/nss APU_CONF_ARGS+= --with-nss=${LOCALBASE} -.else -PLIST_SUB+= NSS="@comment " .endif -CONFIGURE_ENV+= CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" +CONFIGURE_ENV+= CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" .if defined(APU_EXTRAS) PLIST_SUB+= APU_EXTRAS="" Modified: head/devel/apr1/distinfo ============================================================================== --- head/devel/apr1/distinfo Mon Apr 21 17:40:40 2014 (r351697) +++ head/devel/apr1/distinfo Mon Apr 21 17:43:45 2014 (r351698) @@ -1,4 +1,4 @@ -SHA256 (apr-1.5.0.tar.gz) = 9879f02054cb22e99f605f6fdbf47f4c028af4cd4f351cf64186a7ee447f35d7 -SIZE (apr-1.5.0.tar.gz) = 1016391 +SHA256 (apr-1.5.1.tar.gz) = 94b1c9d9835cc9e902838b95d62ecc9a39b698f23e3e706812ec65a78ba41af7 +SIZE (apr-1.5.1.tar.gz) = 1020833 SHA256 (apr-util-1.5.3.tar.gz) = 76db34cb508e346e3bf69347c29ed1500bf0b71bcc48d54271ad9d1c25703743 SIZE (apr-util-1.5.3.tar.gz) = 874462 Modified: head/devel/apr1/files/patch-apr__configure ============================================================================== --- head/devel/apr1/files/patch-apr__configure Mon Apr 21 17:40:40 2014 (r351697) +++ head/devel/apr1/files/patch-apr__configure Mon Apr 21 17:43:45 2014 (r351698) @@ -1,5 +1,5 @@ ---- ./apr-1.5.0/configure.orig 2014-03-22 18:52:57.000000000 +0100 -+++ ./apr-1.5.0/configure 2014-03-22 18:52:57.000000000 +0100 +--- ./apr-1.5.1/configure.orig 2014-03-22 18:52:57.000000000 +0100 ++++ ./apr-1.5.1/configure 2014-03-22 18:52:57.000000000 +0100 @@ -6622,11 +6622,7 @@ apr_lock_method="USE_FLOCK_SERIALIZE" fi Modified: head/devel/apr1/pkg-plist ============================================================================== --- head/devel/apr1/pkg-plist Mon Apr 21 17:40:40 2014 (r351697) +++ head/devel/apr1/pkg-plist Mon Apr 21 17:43:45 2014 (r351698) @@ -91,10 +91,10 @@ include/apr-1/apu_want.h %%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.a %%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.la %%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.so -%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3-1.so -%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.a -%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.la -%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.so +%%SQLITE%%lib/apr-util-1/apr_dbd_sqlite3-1.so +%%SQLITE%%lib/apr-util-1/apr_dbd_sqlite3.a +%%SQLITE%%lib/apr-util-1/apr_dbd_sqlite3.la +%%SQLITE%%lib/apr-util-1/apr_dbd_sqlite3.so %%BDB%%lib/apr-util-1/apr_dbm_db-1.so %%BDB%%lib/apr-util-1/apr_dbm_db.a %%BDB%%lib/apr-util-1/apr_dbm_db.la