Date: Wed, 12 Jul 2017 19:25:15 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r445601 - in head: . devel/apr1 devel/apr1/files Message-ID: <201707121925.v6CJPFMi037079@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Wed Jul 12 19:25:14 2017 New Revision: 445601 URL: https://svnweb.freebsd.org/changeset/ports/445601 Log: devel/apr1: Update to 1.6 branch - Update APR to 1.6.0 - Update APR-util to 1.6.2 - Add UPDATING entry - Ungroup APR - Add missing descriptions - Switch to using OPT_VARS - Add ODBC driver - Remove FreeTDS driver and patch - Remove Windows files from WRKDIR not WRKSRC - Cosmetic fixes - Update patches for new version Reviewed by: ohauer (maintainer) Approved by: ohauer (maintainer) Differential Revision: https://reviews.freebsd.org/D11285 Deleted: head/devel/apr1/files/patch-apr-util__dbd__apr_dbd_freetds.c Modified: head/UPDATING head/devel/apr1/Makefile head/devel/apr1/distinfo head/devel/apr1/files/patch-apr__configure head/devel/apr1/files/patch-apr_poll_unix_kqueue.c head/devel/apr1/pkg-plist Modified: head/UPDATING ============================================================================== --- head/UPDATING Wed Jul 12 19:07:59 2017 (r445600) +++ head/UPDATING Wed Jul 12 19:25:14 2017 (r445601) @@ -5,6 +5,33 @@ 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. +20170712: + AFFECTS: users of devel/apr1 + AUTHOR: brnrd@FreeBSD.org + + APR was updated to 1.6.0 and APR-util was updated to 1.6.2 + + The Apache Portable Runtime project removed support for FreeTDS from the + APR Utilities in version 1.6. Users of FreeTDS will have to migrate + configurations to use the newly added ODBC support in conjunction with + FreeTDS using FreeTDS' ODBC capabilities. + + Please rebuild all ports which are using functions from APR/APR-util + such as Apache, Subversion, etc. Normally, you can obtain the list of + dependent software by running the following command: + + # pkg info -r libressl + + Then you should rebuild all ports depending on APR(-util) to avoid + dangling shared library dependencies. Poudriere and pkg handle this + correctly, portmaster and portupgrade users can use the following to + rebuild all dependent ports. + + Portmaster users: + portmaster -r apr1 + Portupgrade users: + portupgrade -fr devel/apr1 + 20170710: AFFECTS: users of net-im/ejabberd AUTHOR: ashish@FreeBSD.org Modified: head/devel/apr1/Makefile ============================================================================== --- head/devel/apr1/Makefile Wed Jul 12 19:07:59 2017 (r445600) +++ head/devel/apr1/Makefile Wed Jul 12 19:25:14 2017 (r445601) @@ -3,7 +3,6 @@ PORTNAME= apr PORTVERSION= ${APR_VERSION}.${APU_VERSION} -PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= APACHE/apr DISTFILES= apr-${APR_VERSION}.tar.gz \ @@ -20,21 +19,23 @@ USES= iconv pathfix libtool cpe USE_LDCONFIG= yes GNU_CONFIGURE= yes -APR_VERSION= 1.5.2 -APU_VERSION= 1.5.4 +APR_VERSION= 1.6.2 +APU_VERSION= 1.6.0 CPE_VENDOR= apache CPE_PRODUCT= apr-util CPE_VERSION= ${APU_VERSION} OPTIONS_SUB= yes -OPTIONS_GROUP= APR APU -OPTIONS_GROUP_APR= IPV6 DEVRANDOM -OPTIONS_GROUP_APU= BDB GDBM LDAP MYSQL NDBM PGSQL SQLITE FREETDS +OPTIONS_GROUP= APU +OPTIONS_DEFINE= IPV6 DEVRANDOM +OPTIONS_GROUP_APU= BDB GDBM LDAP MYSQL NDBM ODBC PGSQL SQLITE OPTIONS_RADIO= CRYPTO OPTIONS_RADIO_CRYPTO= SSL NSS OPTIONS_DEFAULT= DEVRANDOM BDB GDBM SSL +APU_DESC= Database support +CRYPTO_DESC= Cryptography provider DEVRANDOM_DESC= Use /dev/random or compatible NDBM_DESC= NDBM support NSS_DESC= NSS crypto driver @@ -42,11 +43,11 @@ SSL_DESC= OpenSSL crypto driver # APR-Util Options BDB_USES= bdb:5+ -FREETDS_LIB_DEPENDS= libsybdb.so:databases/freetds GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm LDAP_USE= OPENLDAP=yes MYSQL_USE= MYSQL=yes NSS_LIB_DEPENDS= libnss3.so:security/nss +ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC PGSQL_USES= pgsql SQLITE_USES= sqlite SSL_USES= ssl @@ -71,78 +72,50 @@ APU_CONF_ARGS= --with-apr=${APR_WRKDIR} \ --with-expat=${LOCALBASE} \ --with-iconv=${ICONV_PREFIX} -.include <bsd.port.options.mk> - ########## APR Options -.if ${PORT_OPTIONS:MIPV6} -APR_CONF_ARGS+= --enable-ipv6 -.else -APR_CONF_ARGS+= --disable-ipv6 -.endif +IPV6_VARS= APR_CONF_ARGS+=--enable-ipv6 +IPV6_VARS_OFF= APR_CONF_ARGS+=--disable-ipv6 +DEVRANDOM_VARS= APR_CONF_ARGS+=--with-devrandom +DEVRANDOM_VARS_OFF= APR_CONF_ARGS+=--without-devrandom -.if ${PORT_OPTIONS:MDEVRANDOM} -APR_CONF_ARGS+= --with-devrandom -.else -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_CONF_ARGS+= --with-gdbm=${LOCALBASE} -.else -APU_CONF_ARGS+= --without-gdbm -.endif +BDB_VARS= APU_CONF_ARGS+=--with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR} +BDB_VARS_OFF= APU_CONF_ARGS+=--without-berkeley-db +GDBM_VARS= APU_CONF_ARGS+=--with-gdbm=${LOCALBASE} +LDAP_VARS= APU_CONF_ARGS+="--with-ldap-include=${LOCALBASE}/include \ + --with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap" +MYSQL_VARS= APU_CONF_ARGS+=--with-mysql=${LOCALBASE} \ + APU_CPPFLAGS+="-I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H" \ + LIBS+=-L${LOCALBASE}/lib/mysql -.if ${PORT_OPTIONS:MBDB} -APU_CONF_ARGS+= --with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR} -.else -APU_CONF_ARGS+= --without-berkeley-db -.endif +NDBM_VARS= APU_CONF_ARGS+=--with-ndbm=/usr +NSS_VARS= APU_CONF_ARGS+=--with-nss=${LOCALBASE} \ + APU_CPPFLAGS+=-I${LOCALBASE}/include/nss \ + LDFLAGS+=-L${LOCALBASE}/lib/nss +ODBC_VARS= APU_CONF_ARGS+=--with-odbc=${LOCALBASE} +SSL_VARS= APU_CONF_ARGS+=--with-openssl=${OPENSSLBASE} \ + APU_CPPFLAGS+=-I${OPENSSLINC} \ + LDFLAGS+=-L${OPENSSLLIB} +SSL_VARS_OFF= APU_CONF_ARGS+=--without-openssl +PGSQL_VARS= APU_CONF_ARGS+=--with-pgsql=${LOCALBASE} \ + APU_CONF_ENV+=ac_cv_path_PGSQL_CONFIG="" +SQLITE_VARS= APU_CONF_ENV+=--with-sqlite3=${LOCALBASE} +SQLITE_VARS_OFF= APU_CONF_ARGS+=--without-sqlite3 -.if ${PORT_OPTIONS:MNDBM} -APU_CONF_ARGS+= --with-ndbm=/usr -.else -APU_CONF_ARGS+= --without-ndbm -.endif +.for db in GDBM NDBM LDAP ODBC MYSQL NSS PGSQL +${db}_VARS_OFF= APU_CONF_ARGS+=--without-${db:tl} +.endfor -.if ${PORT_OPTIONS:MLDAP} -APU_CONF_ARGS+= --with-ldap-include=${LOCALBASE}/include \ - --with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap -.else -APU_CONF_ARGS+= --without-ldap -.endif +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}" -.if ${PORT_OPTIONS:MFREETDS} -APU_CONF_ARGS+= --with-freetds=${LOCALBASE} -.else -APU_CONF_ARGS+= --without-freetds -.endif +.include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MMYSQL} -APU_CONF_ARGS+= --with-mysql=${LOCALBASE} -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_CONF_ARGS+= --with-pgsql=${LOCALBASE} -APU_CONF_ENV+= ac_cv_path_PGSQL_CONFIG="" -.else -APU_CONF_ARGS+= --without-pgsql -.endif - -.if ${PORT_OPTIONS:MSQLITE} -APU_CONF_ARGS+= --with-sqlite3=${LOCALBASE} -.else -APU_CONF_ARGS+= --without-sqlite3 -.endif - # crypto (apache24) .if ${PORT_OPTIONS:MSSL} || ${PORT_OPTIONS:MNSS} APU_CONF_ARGS+= --with-crypto @@ -150,29 +123,9 @@ APU_CONF_ARGS+= --with-crypto APU_CONF_ARGS+= --without-crypto .endif -.if ${PORT_OPTIONS:MSSL} -APU_CPPFLAGS+= -I${OPENSSLINC} -LDFLAGS+= -L${OPENSSLLIB} -APU_CONF_ARGS+= --with-openssl=${OPENSSLBASE} -.else -APU_CONF_ARGS+= --without-openssl -.endif - -.if ${PORT_OPTIONS:MNSS} -APU_CPPFLAGS+= -I${LOCALBASE}/include/nss -LDFLAGS+= -L${LOCALBASE}/lib/nss -APU_CONF_ARGS+= --with-nss=${LOCALBASE} -.else -APU_CONF_ARGS+= --without-nss -.endif - -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 + @${FIND} ${WRKDIR} -type f \( -name 'NWGNU*' -o -name '*.ds?' -o -name '*.dep' -o -name '*.mak' -o -name '*.win' \) -delete post-patch: @${REINPLACE_CMD} -e 's/OSVERSION/${OSVERSION}/g' \ @@ -216,7 +169,7 @@ test: build #regression-test: test rpfl: configure -# maintainer only: strip PID from logs (better compair) +# maintainer only: strip PID from logs (better compare) ${SED} -i '' -E 's|^configure:[0-9]+:|configure:_pid_:|g' ${APR_WRKDIR}/config.log ${SED} -i '' -E 's|^configure:[0-9]+:|configure:_pid_:|g' ${APU_WRKDIR}/config.log Modified: head/devel/apr1/distinfo ============================================================================== --- head/devel/apr1/distinfo Wed Jul 12 19:07:59 2017 (r445600) +++ head/devel/apr1/distinfo Wed Jul 12 19:25:14 2017 (r445601) @@ -1,4 +1,5 @@ -SHA256 (apr-1.5.2.tar.gz) = 1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb -SIZE (apr-1.5.2.tar.gz) = 1031613 -SHA256 (apr-util-1.5.4.tar.gz) = 976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19 -SIZE (apr-util-1.5.4.tar.gz) = 874044 +TIMESTAMP = 1499711633 +SHA256 (apr-1.6.2.tar.gz) = 4fc24506c968c5faf57614f5d0aebe0e9d0b90afa47a883e1a1ca94f15f4a42e +SIZE (apr-1.6.2.tar.gz) = 1071074 +SHA256 (apr-util-1.6.0.tar.gz) = 483ef4d59e6ac9a36c7d3fd87ad7b9db7ad8ae29c06b9dd8ff22dda1cc416389 +SIZE (apr-util-1.6.0.tar.gz) = 565507 Modified: head/devel/apr1/files/patch-apr__configure ============================================================================== --- head/devel/apr1/files/patch-apr__configure Wed Jul 12 19:07:59 2017 (r445600) +++ head/devel/apr1/files/patch-apr__configure Wed Jul 12 19:25:14 2017 (r445601) @@ -1,5 +1,5 @@ ---- apr-1.5.2/configure.orig 2015-04-25 12:04:18 UTC -+++ apr-1.5.2/configure +--- apr-1.6.2/configure.orig 2015-04-25 12:04:18 UTC ++++ apr-1.6.2/configure @@ -6624,11 +6624,7 @@ if test "x$apr_preload_done" != "xyes" ; apr_lock_method="USE_FLOCK_SERIALIZE" fi Modified: head/devel/apr1/files/patch-apr_poll_unix_kqueue.c ============================================================================== --- head/devel/apr1/files/patch-apr_poll_unix_kqueue.c Wed Jul 12 19:07:59 2017 (r445600) +++ head/devel/apr1/files/patch-apr_poll_unix_kqueue.c Wed Jul 12 19:25:14 2017 (r445601) @@ -1,8 +1,8 @@ # upstram PR: https://bz.apache.org/bugzilla/show_bug.cgi?id=59914 # FreeBSD PR: 211430 ======================================================================== ---- apr-1.5.2/poll/unix/kqueue.c.orig 2015-03-20 01:34:07 UTC -+++ apr-1.5.2/poll/unix/kqueue.c +--- apr-1.6.2/poll/unix/kqueue.c.orig 2015-03-20 01:34:07 UTC ++++ apr-1.6.2/poll/unix/kqueue.c @@ -25,21 +25,40 @@ #ifdef HAVE_KQUEUE Modified: head/devel/apr1/pkg-plist ============================================================================== --- head/devel/apr1/pkg-plist Wed Jul 12 19:07:59 2017 (r445600) +++ head/devel/apr1/pkg-plist Wed Jul 12 19:25:14 2017 (r445601) @@ -7,6 +7,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_cstr.h include/apr-1/apr_date.h include/apr-1/apr_dbd.h include/apr-1/apr_dbm.h @@ -36,12 +37,14 @@ include/apr-1/apr_mmap.h include/apr-1/apr_network_io.h include/apr-1/apr_optional.h include/apr-1/apr_optional_hooks.h +include/apr-1/apr_perms_set.h include/apr-1/apr_poll.h include/apr-1/apr_pools.h include/apr-1/apr_portable.h include/apr-1/apr_proc_mutex.h include/apr-1/apr_queue.h include/apr-1/apr_random.h +include/apr-1/apr_redis.h include/apr-1/apr_reslist.h include/apr-1/apr_ring.h include/apr-1/apr_rmm.h @@ -49,6 +52,7 @@ include/apr-1/apr_sdbm.h include/apr-1/apr_sha1.h include/apr-1/apr_shm.h include/apr-1/apr_signal.h +include/apr-1/apr_siphash.h include/apr-1/apr_skiplist.h include/apr-1/apr_strings.h include/apr-1/apr_strmatch.h @@ -78,12 +82,12 @@ lib/apr-util-1/.keep.me %%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.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.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.so +%%ODBC%%lib/apr-util-1/apr_dbd_odbc-1.so +%%ODBC%%lib/apr-util-1/apr_dbd_odbc.a +%%ODBC%%lib/apr-util-1/apr_dbd_odbc.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.so @@ -114,7 +118,9 @@ lib/libaprutil-1.so.0 lib/libaprutil-1.so.%%SHLIB_APU_MAJOR%% libdata/pkgconfig/apr-1.pc libdata/pkgconfig/apr-util-1.pc +%%DATADIR%%/build-1/apr_common.m4 %%DATADIR%%/build-1/apr_rules.mk +%%DATADIR%%/build-1/find_apr.m4 %%DATADIR%%/build-1/libtool %%DATADIR%%/build-1/make_exports.awk %%DATADIR%%/build-1/make_var_export.awk
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707121925.v6CJPFMi037079>