Index: head/devel/apr1/Makefile =================================================================== --- head/devel/apr1/Makefile +++ head/devel/apr1/Makefile @@ -3,7 +3,6 @@ PORTNAME= apr PORTVERSION= ${APR_VERSION}.${APU_VERSION} -PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= APACHE/apr DISTFILES= apr-${APR_VERSION}.tar.gz \ @@ -20,7 +19,7 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes -APR_VERSION= 1.6.5 +APR_VERSION= 1.7.0 APU_VERSION= 1.6.1 CPE_VENDOR= apache @@ -121,10 +120,6 @@ .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 Index: head/devel/apr1/distinfo =================================================================== --- head/devel/apr1/distinfo +++ head/devel/apr1/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1540370746 -SHA256 (apr-1.6.5.tar.gz) = 70dcf9102066a2ff2ffc47e93c289c8e54c95d8dda23b503f9e61bb0cbd2d105 -SIZE (apr-1.6.5.tar.gz) = 1073556 +TIMESTAMP = 1564990523 +SHA256 (apr-1.7.0.tar.gz) = 48e9dbf45ae3fdc7b491259ffb6ccf7d63049ffacbc1c0977cced095e4c2d5a2 +SIZE (apr-1.7.0.tar.gz) = 1093896 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-1.7.0_configure =================================================================== --- head/devel/apr1/files/patch-apr-1.7.0_configure +++ head/devel/apr1/files/patch-apr-1.7.0_configure @@ -0,0 +1,28 @@ +--- apr-1.7.0/configure.orig 2015-04-25 12:04:18 UTC ++++ apr-1.7.0/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-1.7.0_poll_unix_kqueue.c =================================================================== --- head/devel/apr1/files/patch-apr-1.7.0_poll_unix_kqueue.c +++ head/devel/apr1/files/patch-apr-1.7.0_poll_unix_kqueue.c @@ -0,0 +1,77 @@ +# upstram PR: https://bz.apache.org/bugzilla/show_bug.cgi?id=59914 +# FreeBSD PR: 211430 +======================================================================== +--- apr-1.7.0/poll/unix/kqueue.c.orig 2015-03-20 01:34:07 UTC ++++ apr-1.7.0/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); + Index: head/devel/apr1/files/patch-apr__configure =================================================================== --- head/devel/apr1/files/patch-apr__configure +++ head/devel/apr1/files/patch-apr__configure @@ -1,28 +0,0 @@ ---- 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 +++ head/devel/apr1/files/patch-apr_poll_unix_kqueue.c @@ -1,77 +0,0 @@ -# upstram PR: https://bz.apache.org/bugzilla/show_bug.cgi?id=59914 -# FreeBSD PR: 211430 -======================================================================== ---- 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); - Index: head/devel/apr1/pkg-plist =================================================================== --- head/devel/apr1/pkg-plist +++ head/devel/apr1/pkg-plist @@ -12,6 +12,7 @@ include/apr-1/apr_dbd.h include/apr-1/apr_dbm.h include/apr-1/apr_dso.h +include/apr-1/apr_encode.h include/apr-1/apr_env.h include/apr-1/apr_errno.h include/apr-1/apr_escape.h @@ -118,9 +119,7 @@ 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