Date: Mon, 22 Sep 2014 18:48:55 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r368985 - in head/devel/apr1: . files Message-ID: <201409221848.s8MImt76050800@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Mon Sep 22 18:48:55 2014 New Revision: 368985 URL: http://svnweb.freebsd.org/changeset/ports/368985 QAT: https://qat.redports.org/buildarchive/r368985/ Log: - update to apr-util-1.5.4 - add LICENSE - add CPE support (reflect only apr-util) - s/libtool:keepla/libtool/ [1] - USE_BDB= s/48+/5+/ (db5 is already the default version in the ports tree) - build always with THREADS and remove the THREAD OPTION - use dedicated CONFIGURE_ENV for apr/apr-util [2] - always install lib/apr-util-1 directory - display apr/apr-util build steps with an ECHO_MSG for better buildlog analyzing Changes with APR-util 1.5.4 [3] *) MySQL driver: Fix incorrect handling of bad parameter in the driver support for apr_dbd_transaction_end(). PR 56330. *) apr_crypto_get_driver(): Fix invalid storage reference on error path. *) Fix compile failure for Android. PR 56627. *) Fix detection of Berkeley DB 6.0. PR 55277. *) Improve platform detection for bundled expat by updating config.guess and config.sub. [1] Quick test script snippet: grep apr-1.5 /usr/ports/INDEX* | cut -d\| -f 2 | sort -u | while read i; do grep -H libtool $i/Makefil* done [2] Use "-I${APR_WRKDIR}/include" as first CPPFLAGS value for apr-util (do not include old apr_version.h during the build) [3] http://www.apache.org/dist/apr/CHANGES-APR-1.5 with hat apache@ Modified: head/devel/apr1/Makefile head/devel/apr1/distinfo head/devel/apr1/files/patch-apr-util__dbd__apr_dbd_freetds.c head/devel/apr1/files/patch-apr__configure head/devel/apr1/pkg-plist Modified: head/devel/apr1/Makefile ============================================================================== --- head/devel/apr1/Makefile Mon Sep 22 18:25:55 2014 (r368984) +++ head/devel/apr1/Makefile Mon Sep 22 18:48:55 2014 (r368985) @@ -3,11 +3,11 @@ PORTNAME= apr PORTVERSION= ${APR_VERSION}.${APU_VERSION} -PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR= apr -DISTFILES= apr-${APR_VERSION}.tar.gz apr-util-${APU_VERSION}.tar.gz +DISTFILES= apr-${APR_VERSION}.tar.gz \ + apr-util-${APU_VERSION}.tar.gz MAINTAINER= apache@FreeBSD.org COMMENT= Apache Portability Library @@ -16,20 +16,24 @@ LICENSE= APACHE20 LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 -USES= iconv pathfix libtool:keepla +USES= iconv pathfix libtool cpe USE_LDCONFIG= yes GNU_CONFIGURE= yes APR_VERSION= 1.5.1 -APU_VERSION= 1.5.3 +APU_VERSION= 1.5.4 + +CPE_VENDOR= apache +CPE_PRODUCT= apr-util +CPE_VERSION= ${APU_VERSION} OPTIONS_SUB= yes OPTIONS_GROUP= APR APU -OPTIONS_GROUP_APR= THREADS IPV6 DEVRANDOM +OPTIONS_GROUP_APR= IPV6 DEVRANDOM OPTIONS_GROUP_APU= BDB GDBM LDAP MYSQL NDBM PGSQL SQLITE FREETDS OPTIONS_RADIO= CRYPTO OPTIONS_RADIO_CRYPTO= SSL NSS -OPTIONS_DEFAULT= THREADS IPV6 DEVRANDOM BDB GDBM SSL +OPTIONS_DEFAULT= IPV6 DEVRANDOM BDB GDBM SSL DEVRANDOM_DESC= Use /dev/random or compatible NDBM_DESC= NDBM support @@ -37,7 +41,7 @@ NSS_DESC= NSS crypto driver SSL_DESC= OpenSSL crypto driver # APR-Util Options -BDB_USE= BDB=48+ +BDB_USE= BDB=5+ FREETDS_LIB_DEPENDS= libsybdb.so:${PORTSDIR}/databases/freetds GDBM_LIB_DEPENDS= libgdbm.so:${PORTSDIR}/databases/gdbm LDAP_USE= OPENLDAP=yes @@ -58,6 +62,7 @@ PLIST_SUB+= SHLIB_APR_MAJOR="${SHLIB_APR SHLIB_APU_MAJOR="${SHLIB_APU_MAJOR}" APR_CONF_ARGS= --with-installbuilddir=${DATADIR}/build-1 \ + --enable-threads \ --enable-posix-shm APU_CONF_ARGS= --with-apr=${APR_WRKDIR} \ @@ -67,12 +72,6 @@ APU_CONF_ARGS= --with-apr=${APR_WRKDIR} .include <bsd.port.options.mk> ########## APR Options -.if ${PORT_OPTIONS:MTHREADS} -APR_CONF_ARGS+= --enable-threads -.else -APR_CONF_ARGS+= --disable-threads -.endif - .if ${PORT_OPTIONS:MIPV6} APR_CONF_ARGS+= --enable-ipv6 .else @@ -86,29 +85,29 @@ APR_CONF_ARGS+= --without-devrandom .endif ######### APR-Util Options +# make sure 1st include is "${APR_WRKDIR}/include" +# to avoid failures if previous apr_version.h is present +APU_CPPFLAGS= -I${APR_WRKDIR}/include + .if ${PORT_OPTIONS:MGDBM} -APU_EXTRAS= yes APU_CONF_ARGS+= --with-gdbm=${LOCALBASE} .else APU_CONF_ARGS+= --without-gdbm .endif .if ${PORT_OPTIONS:MBDB} -APU_EXTRAS= yes APU_CONF_ARGS+= --with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR} .else APU_CONF_ARGS+= --without-berkeley-db .endif .if ${PORT_OPTIONS:MNDBM} -APU_EXTRAS= yes APU_CONF_ARGS+= --with-ndbm=/usr .else APU_CONF_ARGS+= --without-ndbm .endif .if ${PORT_OPTIONS:MLDAP} -APU_EXTRAS= yes APU_CONF_ARGS+= --with-ldap-include=${LOCALBASE}/include \ --with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap .else @@ -116,31 +115,27 @@ APU_CONF_ARGS+= --without-ldap .endif .if ${PORT_OPTIONS:MFREETDS} -APU_EXTRAS= yes APU_CONF_ARGS+= --with-freetds=${LOCALBASE} .else APU_CONF_ARGS+= --without-freetds .endif .if ${PORT_OPTIONS:MMYSQL} -APU_EXTRAS= yes APU_CONF_ARGS+= --with-mysql=${LOCALBASE} -CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H +APU_CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H LIBS+= -L${LOCALBASE}/lib/mysql .else APU_CONF_ARGS+= --without-mysql .endif .if ${PORT_OPTIONS:MPGSQL} -APU_EXTRAS= yes APU_CONF_ARGS+= --with-pgsql=${LOCALBASE} -CONFIGURE_ENV+= ac_cv_path_PGSQL_CONFIG="" +APU_CONF_ENV+= ac_cv_path_PGSQL_CONFIG="" .else APU_CONF_ARGS+= --without-pgsql .endif .if ${PORT_OPTIONS:MSQLITE} -APU_EXTRAS= yes APU_CONF_ARGS+= --with-sqlite3=${LOCALBASE} .else APU_CONF_ARGS+= --without-sqlite3 @@ -149,11 +144,12 @@ APU_CONF_ARGS+= --without-sqlite3 # crypto (apache24) .if ${PORT_OPTIONS:MSSL} || ${PORT_OPTIONS:MNSS} APU_CONF_ARGS+= --with-crypto +.else +APU_CONF_ARGS+= --without-crypto .endif .if ${PORT_OPTIONS:MSSL} -APU_EXTRAS= yes -CPPFLAGS+= -I${OPENSSLINC} +APU_CPPFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} APU_CONF_ARGS+= --with-openssl=${OPENSSLBASE} .else @@ -161,53 +157,60 @@ APU_CONF_ARGS+= --without-openssl .endif .if ${PORT_OPTIONS:MNSS} -APU_EXTRAS= yes -CPPFLAGS+= -I${LOCALBASE}/include/nss +APU_CPPFLAGS+= -I${LOCALBASE}/include/nss LDFLAGS+= -L${LOCALBASE}/lib/nss APU_CONF_ARGS+= --with-nss=${LOCALBASE} +.else +APU_CONF_ARGS+= --without-nss .endif -CONFIGURE_ENV+= CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" +APR_CONF_ENV+= ${CONFIGURE_ENV:O:u} CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" +# include apu specific CPPFLAGS 1st! +APU_CONF_ENV+= ${CONFIGURE_ENV:O:u} CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${APU_CPPFLAGS} ${CPPFLAGS}" post-extract: # cleanup files not used on this platform @${FIND} ${WRKSRC} -type f \( -name 'NWGNU*' -o -name '*.ds?' -o -name '*.dep' -o -name '*.mak' -o -name '*.win' \) -delete -.if defined(APU_EXTRAS) -PLIST_SUB+= APU_EXTRAS="" -.else -PLIST_SUB+= APU_EXTRAS="@comment " -.endif - post-patch: @${REINPLACE_CMD} -e 's/OSVERSION/${OSVERSION}/g' \ ${APR_WRKDIR}/configure @${REINPLACE_CMD} -e '/recursive:/s/$$/ .MAKE/' \ ${APR_WRKDIR}/build/apr_rules.mk.in -# Fix pthread: Please do not remove, else apr-1-config returns wrong values - @${REINPLACE_CMD} -e 's/-lpthread/-pthread/g' \ - ${APR_WRKDIR}/configure do-configure: - @(cd ${APR_WRKDIR} && \ - ${SETENV} ${CONFIGURE_ENV} ./configure ${APR_CONF_ARGS} ${CONFIGURE_ARGS}) - @(cd ${APU_WRKDIR} && \ - ${SETENV} ${CONFIGURE_ENV} ./configure ${APU_CONF_ARGS} ${CONFIGURE_ARGS}) + @${ECHO_MSG} "# ===> ${.TARGET} apr-${APR_VERSION}" + (cd ${APR_WRKDIR} && \ + ${SETENV} ${APR_CONF_ENV} ./configure ${APR_CONF_ARGS} ${CONFIGURE_ARGS}) + @${ECHO_MSG} "# ===> ${.TARGET} apr-util-${APU_VERSION}" + (cd ${APU_WRKDIR} && \ + ${SETENV} ${APU_CONF_ENV} ./configure ${APU_CONF_ARGS} ${CONFIGURE_ARGS}) do-build: - @(cd ${APR_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS}) - @(cd ${APU_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS}) + @${ECHO_MSG} "# ===> ${.TARGET} apr-${APR_VERSION}" + (cd ${APR_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS}) + @${ECHO_MSG} "# ===> ${.TARGET} apr-util-${APU_VERSION}" + (cd ${APU_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS}) + +pre-install: +# always create the modules directory + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/apr-util-1 + ${ECHO} "keep me" > ${STAGEDIR}${PREFIX}/lib/apr-util-1/.keep.me do-install: - @(cd ${APR_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET} ${MAKE_ARGS}) - @(cd ${APU_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET} ${MAKE_ARGS}) + @${ECHO_MSG} "# ===> ${.TARGET} apr-${APR_VERSION}" + (cd ${APR_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET} ${MAKE_ARGS}) + @${ECHO_MSG} "# ===> ${.TARGET} apr-util-${APU_VERSION}" + (cd ${APU_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET} ${MAKE_ARGS}) post-install: - @${FIND} ${STAGEDIR}${PREFIX}/lib/ -name \*.so | ${XARGS} ${STRIP_CMD} + -${FIND} ${STAGEDIR}${PREFIX}/lib/ -name \*.so | ${XARGS} ${STRIP_CMD} test: build - -@(cd ${APR_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} test) - -@(cd ${APU_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} test) + @${ECHO_MSG} "# ===> ${.TARGET} apr-${APR_VERSION}" + -(cd ${APR_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} test) + @${ECHO_MSG} "# ===> ${.TARGET} apr-util-${APU_VERSION}" + -(cd ${APU_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} test) #regression-test: test Modified: head/devel/apr1/distinfo ============================================================================== --- head/devel/apr1/distinfo Mon Sep 22 18:25:55 2014 (r368984) +++ head/devel/apr1/distinfo Mon Sep 22 18:48:55 2014 (r368985) @@ -1,4 +1,4 @@ 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 +SHA256 (apr-util-1.5.4.tar.gz) = 976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19 +SIZE (apr-util-1.5.4.tar.gz) = 874044 Modified: head/devel/apr1/files/patch-apr-util__dbd__apr_dbd_freetds.c ============================================================================== --- head/devel/apr1/files/patch-apr-util__dbd__apr_dbd_freetds.c Mon Sep 22 18:25:55 2014 (r368984) +++ head/devel/apr1/files/patch-apr-util__dbd__apr_dbd_freetds.c Mon Sep 22 18:48:55 2014 (r368985) @@ -4,8 +4,8 @@ # I've made the FreeTDS-driver work again -- and submitted the patch to Apache: # https://issues.apache.org/bugzilla/show_bug.cgi?id=53666 =================================================================================== ---- ./apr-util-1.5.3/dbd/apr_dbd_freetds.c.orig 2012-08-05 23:09:15.000000000 +0200 -+++ ./apr-util-1.5.3/dbd/apr_dbd_freetds.c 2013-07-04 22:55:08.000000000 +0200 +--- apr-util-1.5.4/dbd/apr_dbd_freetds.c.orig 2012-08-05 21:09:15 UTC ++++ apr-util-1.5.4/dbd/apr_dbd_freetds.c @@ -40,12 +40,12 @@ #include <freetds/sybdb.h> #endif Modified: head/devel/apr1/files/patch-apr__configure ============================================================================== --- head/devel/apr1/files/patch-apr__configure Mon Sep 22 18:25:55 2014 (r368984) +++ head/devel/apr1/files/patch-apr__configure Mon Sep 22 18:48:55 2014 (r368985) @@ -1,6 +1,6 @@ ---- ./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-1.5.1/configure.orig 2014-09-21 15:03:21 UTC ++++ apr-1.5.1/configure +@@ -6624,11 +6624,7 @@ apr_lock_method="USE_FLOCK_SERIALIZE" fi @@ -13,7 +13,7 @@ # 502102 is when libc_r switched to libpthread (aka libkse). if test $os_version -ge "502102"; then apr_cv_pthreads_cflags="none" -@@ -18812,11 +18808,7 @@ +@@ -18814,11 +18810,7 @@ # comparisons. case $host in *freebsd*) Modified: head/devel/apr1/pkg-plist ============================================================================== --- head/devel/apr1/pkg-plist Mon Sep 22 18:25:55 2014 (r368984) +++ head/devel/apr1/pkg-plist Mon Sep 22 18:48:55 2014 (r368985) @@ -71,55 +71,44 @@ include/apr-1/apu.h include/apr-1/apu_errno.h include/apr-1/apu_version.h include/apr-1/apu_want.h +lib/apr-util-1/.keep.me %%NSS%%lib/apr-util-1/apr_crypto_nss-1.so %%NSS%%lib/apr-util-1/apr_crypto_nss.so -%%NSS%%lib/apr-util-1/apr_crypto_nss.la %%NSS%%lib/apr-util-1/apr_crypto_nss.a %%SSL%%lib/apr-util-1/apr_crypto_openssl-1.so %%SSL%%lib/apr-util-1/apr_crypto_openssl.a -%%SSL%%lib/apr-util-1/apr_crypto_openssl.la %%SSL%%lib/apr-util-1/apr_crypto_openssl.so %%FREETDS%%lib/apr-util-1/apr_dbd_freetds-1.so %%FREETDS%%lib/apr-util-1/apr_dbd_freetds.a -%%FREETDS%%lib/apr-util-1/apr_dbd_freetds.la %%FREETDS%%lib/apr-util-1/apr_dbd_freetds.so %%MYSQL%%lib/apr-util-1/apr_dbd_mysql-1.so %%MYSQL%%lib/apr-util-1/apr_dbd_mysql.a -%%MYSQL%%lib/apr-util-1/apr_dbd_mysql.la %%MYSQL%%lib/apr-util-1/apr_dbd_mysql.so %%PGSQL%%lib/apr-util-1/apr_dbd_pgsql-1.so %%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 %%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 %%BDB%%lib/apr-util-1/apr_dbm_db.so %%GDBM%%lib/apr-util-1/apr_dbm_gdbm-1.so %%GDBM%%lib/apr-util-1/apr_dbm_gdbm.a -%%GDBM%%lib/apr-util-1/apr_dbm_gdbm.la %%GDBM%%lib/apr-util-1/apr_dbm_gdbm.so %%NDBM%%lib/apr-util-1/apr_dbm_ndbm-1.so %%NDBM%%lib/apr-util-1/apr_dbm_ndbm.a -%%NDBM%%lib/apr-util-1/apr_dbm_ndbm.la %%NDBM%%lib/apr-util-1/apr_dbm_ndbm.so %%LDAP%%lib/apr-util-1/apr_ldap-1.so %%LDAP%%lib/apr-util-1/apr_ldap.a -%%LDAP%%lib/apr-util-1/apr_ldap.la %%LDAP%%lib/apr-util-1/apr_ldap.so lib/apr.exp lib/aprutil.exp lib/libapr-1.a -lib/libapr-1.la lib/libapr-1.so lib/libapr-1.so.0 lib/libapr-1.so.%%SHLIB_APR_MAJOR%% lib/libaprutil-1.a -lib/libaprutil-1.la lib/libaprutil-1.so lib/libaprutil-1.so.0 lib/libaprutil-1.so.%%SHLIB_APU_MAJOR%% @@ -130,7 +119,3 @@ libdata/pkgconfig/apr-util-1.pc %%DATADIR%%/build-1/make_exports.awk %%DATADIR%%/build-1/make_var_export.awk %%DATADIR%%/build-1/mkdir.sh -@dirrm include/apr-1 -%%APU_EXTRAS%%@dirrm lib/apr-util-1 -@dirrm %%DATADIR%%/build-1 -@dirrm %%DATADIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409221848.s8MImt76050800>