Index: head/devel/apr1/Makefile =================================================================== --- head/devel/apr1/Makefile (revision 483172) +++ head/devel/apr1/Makefile (revision 483173) @@ -1,173 +1,178 @@ # Created by: Garrett Rooney # $FreeBSD$ PORTNAME= apr PORTVERSION= ${APR_VERSION}.${APU_VERSION} -PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= APACHE/apr DISTFILES= apr-${APR_VERSION}.tar.gz \ apr-util-${APU_VERSION}.tar.gz MAINTAINER= apache@FreeBSD.org COMMENT= Apache Portability Library LICENSE= APACHE20 LIB_DEPENDS= libexpat.so:textproc/expat2 USES= iconv pathfix libtool cpe USE_LDCONFIG= yes GNU_CONFIGURE= yes -APR_VERSION= 1.6.3 +APR_VERSION= 1.6.5 APU_VERSION= 1.6.1 CPE_VENDOR= apache CPE_PRODUCT= apr-util CPE_VERSION= ${APU_VERSION} OPTIONS_SUB= yes OPTIONS_GROUP= APU OPTIONS_DEFINE= IPV6 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 SSL_DESC= OpenSSL crypto driver # APR-Util Options BDB_USES= bdb:5+ GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm LDAP_USE= OPENLDAP=yes MYSQL_USES= mysql NSS_LIB_DEPENDS= libnss3.so:security/nss ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC PGSQL_USES= pgsql SQLITE_USES= sqlite SSL_USES= ssl APR_WRKDIR= ${WRKDIR}/apr-${APR_VERSION} APU_WRKDIR= ${WRKDIR}/apr-util-${APU_VERSION} WRKSRC= ${APR_WRKDIR} PATCH_WRKSRC= ${WRKDIR} PATHFIX_WRKSRC= ${WRKDIR} SHLIB_APR_MAJOR=${APR_VERSION:C/^1/0/} SHLIB_APU_MAJOR=${APU_VERSION:C/^1/0/} PLIST_SUB+= SHLIB_APR_MAJOR="${SHLIB_APR_MAJOR}" \ SHLIB_APU_MAJOR="${SHLIB_APU_MAJOR}" APR_CONF_ARGS= --with-installbuilddir=${DATADIR}/build-1 \ --enable-threads \ --enable-posix-shm \ --with-devrandom APU_CONF_ARGS= --with-apr=${APR_WRKDIR} \ --with-expat=${LOCALBASE} ########## APR Options IPV6_VARS= APR_CONF_ARGS+=--enable-ipv6 IPV6_VARS_OFF= APR_CONF_ARGS+=--disable-ipv6 ######### 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 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 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_ARGS+=--with-sqlite3=${LOCALBASE} SQLITE_VARS_OFF= APU_CONF_ARGS+=--without-sqlite3 .for db in GDBM NDBM LDAP ODBC MYSQL NSS PGSQL ${db}_VARS_OFF= APU_CONF_ARGS+=--without-${db:tl} .endfor 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}" .include .if ${PORT_OPTIONS:MSSL} || ${PORT_OPTIONS:MNSS} APU_CONF_ARGS+= --with-crypto .else APU_CONF_ARGS+= --without-crypto .endif +.include + +.if ${PORT_OPTIONS:MMYSQL} && ${MYSQL_VER} == 80 +BROKEN= Does not build with MySQL 8.0, see https://bz.apache.org/bugzilla/show_bug.cgi?id=62631 +.endif + post-extract: # cleanup files not used on this platform @${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' \ ${APR_WRKDIR}/configure @${REINPLACE_CMD} -e '/recursive:/s/$$/ .MAKE/' \ ${APR_WRKDIR}/build/apr_rules.mk.in do-configure: @${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: @${ECHO_MSG} "# ===> ${.TARGET} apr-${APR_VERSION}" (cd ${APR_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS}) @${ECHO_MSG} "# ===> ${.TARGET} apr-util-${APU_VERSION}" (cd ${APU_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_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: @${ECHO_MSG} "# ===> ${.TARGET} apr-${APR_VERSION}" (cd ${APR_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET} ${MAKE_ARGS}) @${ECHO_MSG} "# ===> ${.TARGET} apr-util-${APU_VERSION}" (cd ${APU_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET} ${MAKE_ARGS}) -${FIND} ${STAGEDIR}${PREFIX}/lib/ -name \*.so | ${XARGS} ${STRIP_CMD} do-test: @${ECHO_MSG} "# ===> ${.TARGET} apr-${APR_VERSION}" -(cd ${APR_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} test) @${ECHO_MSG} "# ===> ${.TARGET} apr-util-${APU_VERSION}" -(cd ${APU_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} test) #regression-test: test rpfl: configure # 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 -.include +.include Index: head/devel/apr1/distinfo =================================================================== --- head/devel/apr1/distinfo (revision 483172) +++ head/devel/apr1/distinfo (revision 483173) @@ -1,5 +1,5 @@ -TIMESTAMP = 1509875572 -SHA256 (apr-1.6.3.tar.gz) = 8fdabcc0004216c3588b7dca0f23d104dfe012a47e2bb6f13827534a6ee73aa7 -SIZE (apr-1.6.3.tar.gz) = 1072661 +TIMESTAMP = 1540370746 +SHA256 (apr-1.6.5.tar.gz) = 70dcf9102066a2ff2ffc47e93c289c8e54c95d8dda23b503f9e61bb0cbd2d105 +SIZE (apr-1.6.5.tar.gz) = 1073556 SHA256 (apr-util-1.6.1.tar.gz) = b65e40713da57d004123b6319828be7f1273fbc6490e145874ee1177e112c459 SIZE (apr-util-1.6.1.tar.gz) = 554301 Index: head/devel/apr1/files/patch-apr__configure =================================================================== --- head/devel/apr1/files/patch-apr__configure (revision 483172) +++ head/devel/apr1/files/patch-apr__configure (revision 483173) @@ -1,28 +1,28 @@ ---- apr-1.6.3/configure.orig 2015-04-25 12:04:18 UTC -+++ apr-1.6.3/configure +--- apr-1.6.5/configure.orig 2015-04-25 12:04:18 UTC ++++ apr-1.6.5/configure @@ -6624,11 +6624,7 @@ if test "x$apr_preload_done" != "xyes" ; 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" @@ -18841,11 +18837,7 @@ fi # 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_major=`uname -r | sed -e 's/\([1-9][0-9]*\)\..*/\1/'` Index: head/devel/apr1/files/patch-apr_poll_unix_kqueue.c =================================================================== --- head/devel/apr1/files/patch-apr_poll_unix_kqueue.c (revision 483172) +++ head/devel/apr1/files/patch-apr_poll_unix_kqueue.c (revision 483173) @@ -1,77 +1,77 @@ # upstram PR: https://bz.apache.org/bugzilla/show_bug.cgi?id=59914 # FreeBSD PR: 211430 ======================================================================== ---- apr-1.6.3/poll/unix/kqueue.c.orig 2015-03-20 01:34:07 UTC -+++ apr-1.6.3/poll/unix/kqueue.c +--- apr-1.6.5/poll/unix/kqueue.c.orig 2015-03-20 01:34:07 UTC ++++ apr-1.6.5/poll/unix/kqueue.c @@ -25,21 +25,40 @@ #ifdef HAVE_KQUEUE -static apr_int16_t get_kqueue_revent(apr_int16_t event, apr_int16_t flags) +static apr_int16_t get_kqueue_revent(apr_int16_t event, apr_int16_t flags, + int fflags, intptr_t data) { apr_int16_t rv = 0; - if (event == EVFILT_READ) - rv |= APR_POLLIN; - else if (event == EVFILT_WRITE) - rv |= APR_POLLOUT; - if (flags & EV_EOF) - rv |= APR_POLLHUP; - /* APR_POLLPRI, APR_POLLERR, and APR_POLLNVAL are not handled by this - * implementation. + /* APR_POLLPRI and APR_POLLNVAL are not handled by this implementation. * TODO: See if EV_ERROR + certain system errors in the returned data field * should map to APR_POLLNVAL. */ + if (event == EVFILT_READ) { + if (data > 0 || fflags == 0) + rv |= APR_POLLIN; + else + rv |= APR_POLLERR; + /* + * Don't return POLLHUP if connect fails. Apparently Linux + * does not, and this is expected by serf in order for IPv6 to + * IPv4 or multihomed host fallback to work. + * + * ETIMEDOUT is ambiguous here since we don't know if a + * connection was established. We don't want to return + * POLLHUP here if the connection attempt timed out, but + * we do if the connection was successful but later dropped. + * For now, favor the latter. + */ + if ((flags & EV_EOF) != 0 && fflags != ECONNREFUSED && + fflags != ENETUNREACH && fflags != EHOSTUNREACH) + rv |= APR_POLLHUP; + } else if (event == EVFILT_WRITE) { + if (data > 0 || fflags == 0) + rv |= APR_POLLOUT; + else + rv |= APR_POLLERR; + } return rv; } @@ -290,7 +309,9 @@ static apr_status_t impl_pollset_poll(ap pollset->p->result_set[j] = fd; pollset->p->result_set[j].rtnevents = get_kqueue_revent(pollset->p->ke_set[i].filter, - pollset->p->ke_set[i].flags); + pollset->p->ke_set[i].flags, + pollset->p->ke_set[i].fflags, + pollset->p->ke_set[i].data); j++; } } @@ -471,7 +492,9 @@ static apr_status_t impl_pollcb_poll(apr apr_pollfd_t *pollfd = (apr_pollfd_t *)(pollcb->pollset.ke[i].udata); pollfd->rtnevents = get_kqueue_revent(pollcb->pollset.ke[i].filter, - pollcb->pollset.ke[i].flags); + pollcb->pollset.ke[i].flags, + pollcb->pollset.ke[i].fflags, + pollcb->pollset.ke[i].data); rv = func(baton, pollfd);