[Midnightbsd-cvs] mports [23609] trunk/devel/apr1: update apr
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Jul 15 15:55:02 EDT 2018
Revision: 23609
http://svnweb.midnightbsd.org/mports/?rev=23609
Author: laffer1
Date: 2018-07-15 15:55:01 -0400 (Sun, 15 Jul 2018)
Log Message:
-----------
update apr
Modified Paths:
--------------
trunk/devel/apr1/Makefile
trunk/devel/apr1/distinfo
trunk/devel/apr1/files/patch-apr__configure
Added Paths:
-----------
trunk/devel/apr1/files/patch-apr_poll_unix_kqueue.c
Modified: trunk/devel/apr1/Makefile
===================================================================
--- trunk/devel/apr1/Makefile 2018-07-04 20:29:28 UTC (rev 23608)
+++ trunk/devel/apr1/Makefile 2018-07-15 19:55:01 UTC (rev 23609)
@@ -2,7 +2,7 @@
PORTNAME= apr
PORTVERSION= ${APR_VERSION}.${APU_VERSION}
-PORTREVISION= 2
+PORTREVISION= 0
CATEGORIES= devel
MASTER_SITES= APACHE/apr
DISTFILES= apr-${APR_VERSION}.tar.gz \
@@ -13,15 +13,15 @@
LICENSE= apache2
-LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS= libexpat.so:textproc/expat2
-USES= iconv:wchar_t pathfix libtool cpe
+USES= iconv pathfix libtool cpe
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --build=${ARCH}-midnightbsd-freebsd9.1
+CONFIGURE_ARGS+= --build=${ARCH}-midnightbsd-freebsd10.4
-APR_VERSION= 1.6.2
-APU_VERSION= 1.6.0
+APR_VERSION= 1.6.3
+APU_VERSION= 1.6.1
CPE_VENDOR= apache
CPE_PRODUCT= apr-util
@@ -28,13 +28,15 @@
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
+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= IPV6 DEVRANDOM BDB GDBM SSL
+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
@@ -45,14 +47,17 @@
GDBM_LIB_DEPENDS= libgdbm.so:${PORTSDIR}/databases/gdbm
LDAP_USE= OPENLDAP=yes
MYSQL_USE= MYSQL=yes
-NSS_LIB_DEPENDS= libnss3.so:${PORTSDIR}/security/nss
+NSS_LIB_DEPENDS= libnss3.so:security/nss
+ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC
PGSQL_USES= pgsql
-SQLITE_USE= SQLITE=yes
-SSL_USE= OPENSSL=yes
+SQLITE_USES= sqlite
+SSL_USES= ssl
-NO_WRKSUBDIR= yes
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/}
@@ -68,72 +73,49 @@
--with-expat=${LOCALBASE} \
--with-iconv=${ICONV_PREFIX}
-.include <bsd.mport.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
+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
-.if ${PORT_OPTIONS:MBDB}
-APU_CONF_ARGS+= --with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR}
-.else
-APU_CONF_ARGS+= --without-berkeley-db
-.endif
+.for db in GDBM NDBM LDAP ODBC MYSQL NSS PGSQL
+${db}_VARS_OFF= APU_CONF_ARGS+=--without-${db:tl}
+.endfor
-.if ${PORT_OPTIONS:MNDBM}
-APU_CONF_ARGS+= --with-ndbm=/usr
-.else
-APU_CONF_ARGS+= --without-ndbm
-.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:MLDAP}
-APU_CONF_ARGS+= --with-ldap-include=${LOCALBASE}/include \
- --with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap
-.else
-APU_CONF_ARGS+= --without-ldap
-.endif
+.include <bsd.mport.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
@@ -141,29 +123,9 @@
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' \
@@ -191,8 +153,8 @@
${ECHO} "keep me" > ${STAGEDIR}${PREFIX}/lib/apr-util-1/.keep.me
do-install:
- @(cd ${APR_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${FAKE_MAKEARGS} ${INSTALL_TARGET})
- @(cd ${APU_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${FAKE_MAKEARGS} ${INSTALL_TARGET})
+ @(cd ${APR_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${FAKE_MAKEARGS} ${INSTALL_TARGET})
+ @(cd ${APU_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${FAKE_MAKEARGS} ${INSTALL_TARGET})
test: build
@${ECHO_MSG} "# ===> ${.TARGET} apr-${APR_VERSION}"
@@ -203,7 +165,7 @@
#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: trunk/devel/apr1/distinfo
===================================================================
--- trunk/devel/apr1/distinfo 2018-07-04 20:29:28 UTC (rev 23608)
+++ trunk/devel/apr1/distinfo 2018-07-15 19:55:01 UTC (rev 23609)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1518762761
-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
+TIMESTAMP = 1531669387
+SHA256 (apr-1.6.3.tar.gz) = 8fdabcc0004216c3588b7dca0f23d104dfe012a47e2bb6f13827534a6ee73aa7
+SIZE (apr-1.6.3.tar.gz) = 1072661
+SHA256 (apr-util-1.6.1.tar.gz) = b65e40713da57d004123b6319828be7f1273fbc6490e145874ee1177e112c459
+SIZE (apr-util-1.6.1.tar.gz) = 554301
Modified: trunk/devel/apr1/files/patch-apr__configure
===================================================================
--- trunk/devel/apr1/files/patch-apr__configure 2018-07-04 20:29:28 UTC (rev 23608)
+++ trunk/devel/apr1/files/patch-apr__configure 2018-07-15 19:55:01 UTC (rev 23609)
@@ -1,5 +1,5 @@
---- apr-1.6.2/configure.orig 2015-04-25 12:04:18 UTC
-+++ apr-1.6.2/configure
+--- apr-1.6.3/configure.orig 2015-04-25 12:04:18 UTC
++++ apr-1.6.3/configure
@@ -6624,11 +6624,7 @@ if test "x$apr_preload_done" != "xyes" ;
apr_lock_method="USE_FLOCK_SERIALIZE"
fi
@@ -9,7 +9,7 @@
- else
- os_version=000000
- fi
-+ os_version=901000
++ 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"
@@ -22,7 +22,7 @@
- else
- os_version=000000
- fi
-+ os_version=901000
++ os_version="OSVERSION"
;;
*linux*)
os_major=`uname -r | sed -e 's/\([1-9][0-9]*\)\..*/\1/'`
Added: trunk/devel/apr1/files/patch-apr_poll_unix_kqueue.c
===================================================================
--- trunk/devel/apr1/files/patch-apr_poll_unix_kqueue.c (rev 0)
+++ trunk/devel/apr1/files/patch-apr_poll_unix_kqueue.c 2018-07-15 19:55:01 UTC (rev 23609)
@@ -0,0 +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
+@@ -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);
+
Property changes on: trunk/devel/apr1/files/patch-apr_poll_unix_kqueue.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list