Date: Sat, 6 Jul 2013 08:43:49 +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: r322367 - in head: . devel/apr1 devel/apr1/files Message-ID: <201307060843.r668hngF088307@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Sat Jul 6 08:43:48 2013 New Revision: 322367 URL: http://svnweb.freebsd.org/changeset/ports/322367 Log: - update devel/apr1 apr-1.4.6 -> apr-1.4.8 apr-util-1.4.1 -> apr-util-1.5.2 - add support for NSS crypto driver (apr-util) Changes URL's: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/CHANGES?view=markup http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/CHANGES?view=markup http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/CHANGES?view=markup Thanks to tijl@ for sending patches to the apache@ list. http://lists.freebsd.org/pipermail/freebsd-apache/2013-June/003172.html with hat apache@ Added: head/devel/apr1/files/patch-apr__configure (contents, props changed) Deleted: head/devel/apr1/files/patch-apr_hints.m4 Modified: head/UPDATING head/devel/apr1/Makefile head/devel/apr1/distinfo head/devel/apr1/files/patch-apr-util__dbd__apr_dbd_freetds.c Modified: head/UPDATING ============================================================================== --- head/UPDATING Sat Jul 6 07:59:09 2013 (r322366) +++ head/UPDATING Sat Jul 6 08:43:48 2013 (r322367) @@ -5,6 +5,21 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20130706: + AFFECTS: users of devel/apr1 + AUTHOR: ohauer@FreeBSD.org + + APR was updated to 1.4.8 and APR-util was updated to 1.5.2. + + Please rebuild all ports which are using functions from + APR/APR-util such as apache, subversion ... + + # portmaster -r apr + or + # portupgrade -r devel/apr1 + or + # pkg install -fR devel/apr1 + 20130705: AFFECTS: users of x11/kdelibs4 AUTHOR: kde@FreeBSD.org Modified: head/devel/apr1/Makefile ============================================================================== --- head/devel/apr1/Makefile Sat Jul 6 07:59:09 2013 (r322366) +++ head/devel/apr1/Makefile Sat Jul 6 08:43:48 2013 (r322367) @@ -3,7 +3,6 @@ PORTNAME= apr PORTVERSION= ${APR_VERSION}.${APU_VERSION} -PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR= apr @@ -16,12 +15,11 @@ LIB_DEPENDS= expat:${PORTSDIR}/textproc/ MAKE_JOBS_SAFE= yes -NO_OPTIONS_SORT=yes OPTIONS_GROUP= APR APU OPTIONS_GROUP_APR= THREADS IPV6 DEVRANDOM OPTIONS_GROUP_APU= BDB GDBM LDAP MYSQL NDBM PGSQL SQLITE FREETDS OPTIONS_RADIO= CRYPTO -OPTIONS_RADIO_CRYPTO= SSL +OPTIONS_RADIO_CRYPTO= SSL NSS OPTIONS_DEFAULT= THREADS IPV6 DEVRANDOM BDB GDBM SSL DEVRANDOM_DESC= Use /dev/random or compatible @@ -29,18 +27,12 @@ NDBM_DESC= NDBM support SSL_DESC= OpenSSL crypto driver NSS_DESC= NSS crypto driver -.include <bsd.port.options.mk> - -APR_VERSION= 1.4.6 -APU_VERSION= 1.4.1 +APR_VERSION= 1.4.8 +APU_VERSION= 1.5.2 -USES= iconv -USE_AUTOTOOLS= automake autoconf libtool:env -USE_PYTHON_BUILD= -2.7 -USE_LDCONFIG= yes -GNU_CONFIGURE= yes - -CONFIGURE_ENV= CC="${CC}" +USES= iconv pathfix +USE_LDCONFIG= yes +GNU_CONFIGURE= yes NO_WRKSUBDIR= yes APR_WRKDIR= ${WRKDIR}/apr-${APR_VERSION} @@ -48,13 +40,15 @@ APU_WRKDIR= ${WRKDIR}/apr-util-${APU_VER PLIST_SUB= SHLIB_APR_MAJOR="${SHLIB_APR_MAJOR}" SHLIB_APU_MAJOR="${SHLIB_APU_MAJOR}" SHLIB_APR_MAJOR= 4 -SHLIB_APU_MAJOR= 4 +SHLIB_APU_MAJOR= 5 APR_CONF_ARGS= --with-installbuilddir=${DATADIR}/build-1 APU_CONF_ARGS= --with-apr=${APR_WRKDIR} \ --with-expat=${LOCALBASE} \ --with-iconv=${LOCALBASE} +.include <bsd.port.options.mk> + ########## APR Options .if ${PORT_OPTIONS:MTHREADS} APR_CONF_ARGS+= --enable-threads @@ -131,7 +125,7 @@ PLIST_SUB+= MYSQL="" USE_MYSQL= YES APU_CONF_ARGS+= --with-mysql=${LOCALBASE} CONFIGURE_ENV+= LIBS="${LIBS}" -CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H LDFLAGS+= -L${LOCALBASE}/lib/mysql .else PLIST_SUB+= MYSQL="@comment " @@ -168,7 +162,7 @@ APU_CONF_ARGS+= --with-crypto APU_EXTRAS= yes USE_OPENSSL= yes PLIST_SUB+= SSL="" -CFLAGS+= -I${OPENSSLINC} +CPPFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} APU_CONF_ARGS+= --with-openssl=${OPENSSLBASE} .else @@ -176,85 +170,55 @@ PLIST_SUB+= SSL="@comment " APU_CONF_ARGS+= --without-openssl .endif -# TODO figure out why nss flag is ignored if ssl is set -# this works on other OS as expected .if ${PORT_OPTIONS:MNSS} APU_EXTRAS= yes PLIST_SUB+= NSS="" LIB_DEPENDS+= nss3:${PORTSDIR}/security/nss -CFLAGS+= -I${LOCALBASE}/include/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}" + .if defined(APU_EXTRAS) PLIST_SUB+= APU_EXTRAS="" .else PLIST_SUB+= APU_EXTRAS="@comment " .endif -post-patch: .SILENT - ${REINPLACE_CMD} -e 's/OSVERSION/${OSVERSION}/g' \ - ${APR_WRKDIR}/build/apr_hints.m4 - ${FIND} ${APR_WRKDIR} ${APU_WRKDIR} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' - ${REINPLACE_CMD} -e '1 s/python/${PYTHON_VERSION}/' \ - ${APR_WRKDIR}/build/gen-build.py - ${REINPLACE_CMD} -e 's/void main/int main/' ${APR_WRKDIR}/build/apr_network.m4 +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}/build/apr_threads.m4 ${APR_WRKDIR}/build/apr_hints.m4 \ - ${APU_WRKDIR}/build/apu-conf.m4 - -run-autotools:: - cd ${APR_WRKDIR} ; \ - ${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf - cd ${APU_WRKDIR} ; \ - ${RM} -fr xml/expat - cd ${APU_WRKDIR} ; \ - ${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf \ - --with-apr=${APR_WRKDIR} - ${REINPLACE_CMD} -e 's/ gsed//g' \ - ${APR_WRKDIR}/build/libtool.m4 \ + @${REINPLACE_CMD} -e 's/-lpthread/-pthread/g' \ ${APR_WRKDIR}/configure - cd ${APR_WRKDIR}; \ - ${SETENV} ${CONFIGURE_ENV} ${SH} \ - ./configure ${CONFIGURE_ARGS} ${APR_CONF_ARGS} - cd ${APU_WRKDIR}; \ - ${SETENV} ${CONFIGURE_ENV} CFLAGS="${CFLAGS}" ${SH} \ - ./configure ${CONFIGURE_ARGS} ${APU_CONF_ARGS} do-configure: - ${DO_NADA} + @(cd ${APR_WRKDIR} && \ + ${SETENV} ${CONFIGURE_ENV} \ + ./configure ${CONFIGURE_ARGS} ${APR_CONF_ARGS}) + @(cd ${APU_WRKDIR} && \ + ${SETENV} ${CONFIGURE_ENV} \ + ./configure ${CONFIGURE_ARGS} ${APU_CONF_ARGS}) do-build: - cd ${APR_WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE} - cd ${APU_WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE} + @(cd ${APR_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS}) + @(cd ${APU_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS}) do-install: - cd ${APR_WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET} - cd ${APU_WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET} + @(cd ${APR_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET}) + @(cd ${APU_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET}) test: build - -@(cd ${APR_WRKDIR}; ${MAKE} test) - -@(cd ${APU_WRKDIR}; ${MAKE} test) + -@(cd ${APR_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} test) + -@(cd ${APU_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} test) #regression-test: test -debug_autoconf: - @${ECHO} "LIBTOOL: ${LIBTOOL_VERSION}" - @${ECHO} "AUTOCONF: dev ${dev_acver} cur ${cur_acver} use ${use_acver}" - @${ECHO} "AUTOMAKE: dev ${dev_amver} cur ${cur_amver} use ${use_amver}" - @${ECHO} "AUTOCONF_DIR: ${AUTOCONF_DIR}" - @${ECHO} "BUILD_DEPENDS: ${BUILD_DEPENDS}" - @${ECHO} "ACLOCAL_DIR: ${ACLOCAL_DIR}" - @${ECHO} "LIBTOOLFILES: ${LIBTOOLFILES}" - @${ECHO} "LIBTOOL_SHAREDIR: ${LIBTOOL_SHAREDIR}" - @${ECHO} "LIBTOOL_LIBEXECDIR: ${LIBTOOL_LIBEXECDIR}" - @${ECHO} "LIBTOOL_M4: ${LIBTOOL_M4}" - @${ECHO} "${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS} ${APR_CONF_ARGS}" - @${ECHO} "${SETENV} ${CONFIGURE_ENV} CFLAGS="${CFLAGS}" ${SH} ./configure ${CONFIGURE_ARGS} ${APR_UTIL_CONF_ARGS}" - .include <bsd.port.mk> Modified: head/devel/apr1/distinfo ============================================================================== --- head/devel/apr1/distinfo Sat Jul 6 07:59:09 2013 (r322366) +++ head/devel/apr1/distinfo Sat Jul 6 08:43:48 2013 (r322367) @@ -1,4 +1,4 @@ -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 +SHA256 (apr-1.4.8.tar.gz) = 1689e415bdfab6aaa41f07836b5dd9ed4901d22ddeb99feffdb2cee3124adf49 +SIZE (apr-1.4.8.tar.gz) = 979397 +SHA256 (apr-util-1.5.2.tar.gz) = a1ec5025373815795d2fa5bfac40c0984675feffc88e049be9a162c408c2f613 +SIZE (apr-util-1.5.2.tar.gz) = 867573 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 Sat Jul 6 07:59:09 2013 (r322366) +++ head/devel/apr1/files/patch-apr-util__dbd__apr_dbd_freetds.c Sat Jul 6 08:43:48 2013 (r322367) @@ -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.4.1/dbd/apr_dbd_freetds.c.orig 2009-02-13 07:04:00.000000000 +0100 -+++ ./apr-util-1.4.1/dbd/apr_dbd_freetds.c 2013-01-13 22:17:09.000000000 +0100 +--- ./apr-util-1.5.2/dbd/apr_dbd_freetds.c.orig 2012-08-05 23:09:15.000000000 +0200 ++++ ./apr-util-1.5.2/dbd/apr_dbd_freetds.c 2013-07-04 22:55:08.000000000 +0200 @@ -40,12 +40,12 @@ #include <freetds/sybdb.h> #endif @@ -196,7 +196,6 @@ case SUCCEED: return 0; case REG_ROW: return 0; case NO_MORE_ROWS: -- apr_pool_cleanup_run(pool, res->proc, clear_result); + if (dbisopt(res->proc, DBBUFFER, NULL) || sequential) { + sql->lasterror = apr_pstrcat(sql->pool, + "NO_MORE_ROWS (count: ", apr_itoa(sql->pool, DBCOUNT(res->proc)), @@ -208,7 +207,7 @@ + sql->lasterror = "NO_MORE_ROWS (DBBUFFER option must be on " + "for dbgetrow() to work)"; + } -+ apr_pool_cleanup_run(res->pool, res->proc, clear_result); + apr_pool_cleanup_run(res->pool, res->proc, clear_result); *rowp = NULL; return -1; - case FAIL: return 1; @@ -429,12 +428,7 @@ --key; ++klen; } -@@ -627,10 +568,11 @@ - if (process == NULL) { - return NULL; - } -- sql = apr_palloc (pool, sizeof (apr_dbd_t)); -+ sql = apr_pcalloc(pool, sizeof (apr_dbd_t)); +@@ -631,6 +572,7 @@ sql->pool = pool; sql->proc = process; sql->params = params; Added: head/devel/apr1/files/patch-apr__configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/apr1/files/patch-apr__configure Sat Jul 6 08:43:48 2013 (r322367) @@ -0,0 +1,28 @@ +--- ./apr-1.4.8/configure.orig 2013-06-30 12:29:38.000000000 +0200 ++++ ./apr-1.4.8/configure 2013-06-30 12:32:04.000000000 +0200 +@@ -6642,11 +6642,7 @@ + apr_lock_method="USE_FLOCK_SERIALIZE" + fi + +- if test -x /sbin/sysctl; then +- os_version=`/sbin/sysctl -n kern.osreldate` +- else +- os_version=000000 +- fi ++ os_version="OSVERSION" + # 502102 is when libc_r switched to libpthread (aka libkse). + if test $os_version -ge "502102"; then + apr_cv_pthreads_cflags="none" +@@ -18784,11 +18780,7 @@ + # comparisons. + case $host in + *freebsd*) +- if test -x /sbin/sysctl; then +- os_version=`/sbin/sysctl -n kern.osreldate` +- else +- os_version=000000 +- fi ++ os_version="OSVERSION" + ;; + *linux*) + os_version=`uname -r | sed -e 's/\(.\)\.\(.\)\.\(.\).*/\1\2\3/'`
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307060843.r668hngF088307>