Date: Sat, 1 Apr 2023 15:45:54 GMT From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f473a726dba2 - main - devel/apr1: Update to 1.7.3 Message-ID: <202304011545.331FjsQ3036275@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=f473a726dba249ec936d340b8b1167ce5996bd30 commit f473a726dba249ec936d340b8b1167ce5996bd30 Author: Bernard Spil <brnrd@FreeBSD.org> AuthorDate: 2023-04-01 15:42:03 +0000 Commit: Bernard Spil <brnrd@FreeBSD.org> CommitDate: 2023-04-01 15:42:03 +0000 devel/apr1: Update to 1.7.3 * Update APR-util to 1.6.3 * Fix build with MySQL 8 [2] * databases/db5 is depreacated since 2022-06-30 [3] * Switch default BDB to 18 PR: 269857, 230538 [2], 261523 [3] Submitted by: ngie With hat: apache --- devel/apr1/Makefile | 15 ++- devel/apr1/distinfo | 10 +- devel/apr1/files/patch-PR59332 | 18 +++ devel/apr1/files/patch-PR61517 | 126 --------------------- ...r-1.7.0_configure => patch-apr-1.7.3_configure} | 4 +- ...kqueue.c => patch-apr-1.7.3_poll_unix_kqueue.c} | 14 +-- devel/apr1/files/patch-bdb18 | 4 +- 7 files changed, 43 insertions(+), 148 deletions(-) diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index d3ba4db4a51e..0665d9648f41 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/Makefile @@ -1,6 +1,5 @@ PORTNAME= apr PORTVERSION= ${APR_VERSION}.${APU_VERSION} -PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= APACHE/apr DISTFILES= apr-${APR_VERSION}.tar.gz \ @@ -19,8 +18,8 @@ USES= iconv pathfix libtool cpe USE_LDCONFIG= yes GNU_CONFIGURE= yes -APR_VERSION= 1.7.0 -APU_VERSION= 1.6.1 +APR_VERSION= 1.7.3 +APU_VERSION= 1.6.3 CPE_VENDOR= apache CPE_PRODUCT= apr-util @@ -29,19 +28,23 @@ 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_GROUP_APU= GDBM LDAP MYSQL NDBM ODBC PGSQL SQLITE +OPTIONS_RADIO= BERKLEYDB CRYPTO +OPTIONS_RADIO_BERKLEYDB=BDB BDB5 OPTIONS_RADIO_CRYPTO= SSL NSS OPTIONS_DEFAULT= BDB GDBM SSL APU_DESC= Database support +BDB5_DESC= Berkeley DB v5 support (deprecated) +BERKLEYDB_DESC= Berkley DB provider CRYPTO_DESC= Cryptography provider NDBM_DESC= NDBM support NSS_DESC= NSS crypto driver SSL_DESC= OpenSSL crypto driver # APR-Util Options -BDB_USES= bdb:5+ +BDB_USES= bdb:18 +BDB5_USES= bdb:5 GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm LDAP_USES= ldap MYSQL_USES= mysql diff --git a/devel/apr1/distinfo b/devel/apr1/distinfo index 0f7ca55d459d..24e66396aade 100644 --- a/devel/apr1/distinfo +++ b/devel/apr1/distinfo @@ -1,5 +1,5 @@ -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 +TIMESTAMP = 1680344440 +SHA256 (apr-1.7.3.tar.gz) = af9bfd5b8a04425d6b419673f3e0a7656fade226aae78180d93f8a6f2d3d1c09 +SIZE (apr-1.7.3.tar.gz) = 1097690 +SHA256 (apr-util-1.6.3.tar.gz) = 2b74d8932703826862ca305b094eef2983c27b39d5c9414442e9976a9acf1983 +SIZE (apr-util-1.6.3.tar.gz) = 556623 diff --git a/devel/apr1/files/patch-PR59332 b/devel/apr1/files/patch-PR59332 new file mode 100644 index 000000000000..781d41e852dd --- /dev/null +++ b/devel/apr1/files/patch-PR59332 @@ -0,0 +1,18 @@ +See https://bz.apache.org/bugzilla/show_bug.cgi?id=59332 + +Also reported in PR230538 devel/apr1 fails with mysql80-client + +--- apr-util-1.6.3/dbd/apr_dbd_mysql.c.orig 2023-01-27 13:32:52 UTC ++++ apr-util-1.6.3/dbd/apr_dbd_mysql.c +@@ -44,6 +44,11 @@ + #include <errmsg.h> + #endif + ++#if !defined(HAVE_TYPE_MY_BOOL) && !defined(LIBMARIADB) ++#include <stdbool.h> ++typedef bool my_bool; ++#endif ++ + #include "apr_strings.h" + #include "apr_lib.h" + #include "apr_buckets.h" diff --git a/devel/apr1/files/patch-PR61517 b/devel/apr1/files/patch-PR61517 deleted file mode 100644 index 1e729094a298..000000000000 --- a/devel/apr1/files/patch-PR61517 +++ /dev/null @@ -1,126 +0,0 @@ -diff -ur a/build/dbd.m4 b/build/dbd.m4 ---- apr-util-1.6.1/build/dbd.m4.orig 2017-05-03 19:18:52.000000000 -0400 -+++ apr-util-1.6.1/build/dbd.m4 2017-09-13 16:58:07.369546391 -0400 -@@ -163,10 +163,15 @@ - old_cppflags="$CPPFLAGS" - old_ldflags="$LDFLAGS" - -+ my_library="mysqlclient" -+ - AC_ARG_WITH([mysql], APR_HELP_STRING([--with-mysql=DIR], [enable MySQL DBD driver]), - [ - if test "$withval" = "yes"; then - AC_PATH_PROG([MYSQL_CONFIG],[mysql_config]) -+ if test "x$MYSQL_CONFIG" = "x"; then -+ AC_PATH_PROG([MYSQL_CONFIG],[mariadb_config]) -+ fi - if test "x$MYSQL_CONFIG" != 'x'; then - mysql_CPPFLAGS="`$MYSQL_CONFIG --include`" - mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[[^ ]]\+//g'`" -@@ -174,32 +179,40 @@ - - APR_ADDTO(CPPFLAGS, [$mysql_CPPFLAGS]) - APR_ADDTO(LIBS, [$mysql_LIBS]) -+ -+ if $MYSQL_CONFIG --libs_r | grep -q mariadb; then -+ my_library="mariadb" -+ fi - fi - -- AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h], -- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), -- [apu_have_mysql=0; break], -- [#include <my_global.h>]) -- if test "$apu_have_mysql" = "0"; then -- AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h], -- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), -- [apu_have_mysql=0; break], -- [#include <mysql/my_global.h>]) -+ AC_CHECK_HEADERS([mysql.h errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break]) -+ if test "$apr_have_mysql" = "0"; then -+ AC_CHECK_HEADERS([mysql/mysql.h mysql/errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break]) - fi -- if test "$apu_have_mysql" != "0" && test "x$MYSQL_CONFIG" != 'x'; then -- APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS]) -+ if test "$apr_have_mysql" = "1"; then -+ AC_CHECK_HEADERS([my_global.h my_sys.h mysql/my_global.h mysql/my_sys.h]) -+ AC_CHECK_LIB($my_library, mysql_init,, [apu_have_mysql=0]) -+ fi -+ if test "$apu_have_mysql" = "1" && test "x$MYSQL_CONFIG" != 'x'; then -+ APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS]) - fi - elif test "$withval" = "no"; then - : - else - AC_PATH_PROG([MYSQL_CONFIG],[mysql_config],,[$withval/bin]) -+ if test "x$MYSQL_CONFIG" = "x"; then -+ AC_PATH_PROG([MYSQL_CONFIG],[mariadb_config],,[$withval/bin]) -+ fi - if test "x$MYSQL_CONFIG" != 'x'; then -- mysql_CPPFLAGS="`$MYSQL_CONFIG --include`" -- mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[[^ ]]\+//g'`" -- mysql_LIBS="`$MYSQL_CONFIG --libs_r`" -+ mysql_CPPFLAGS="`$MYSQL_CONFIG --include`" -+ mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[[^ ]]\+//g'`" -+ mysql_LIBS="`$MYSQL_CONFIG --libs_r`" -+ if $MYSQL_CONFIG --libs_r | grep -q mariadb; then -+ my_library="mariadb" -+ fi - else -- mysql_CPPFLAGS="-I$withval/include" -- mysql_LDFLAGS="-L$withval/lib " -+ mysql_CPPFLAGS="-I$withval/include" -+ mysql_LDFLAGS="-L$withval/lib " - fi - - APR_ADDTO(CPPFLAGS, [$mysql_CPPFLAGS]) -@@ -207,18 +220,15 @@ - APR_ADDTO(LIBS, [$mysql_LIBS]) - - AC_MSG_NOTICE(checking for mysql in $withval) -- AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h], -- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), -- [apu_have_mysql=0; break], -- [#include <my_global.h>]) -- -- if test "$apu_have_mysql" != "1"; then -- AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h], -- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), -- [apu_have_mysql=0; break], -- [#include <mysql/my_global.h>]) -+ AC_CHECK_HEADERS([mysql.h errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break]) -+ if test "$apr_have_mysql" = "0"; then -+ AC_CHECK_HEADERS([mysql/mysql.h mysql/errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break]) -+ fi -+ if test "$apr_have_mysql" = "1"; then -+ AC_CHECK_HEADERS([my_global.h my_sys.h mysql/my_global.h mysql/my_sys.h]) -+ AC_CHECK_LIB($my_library, mysql_init,, [apu_have_mysql=0]) - fi -- if test "$apu_have_mysql" != "0"; then -+ if test "$apu_have_mysql" = "1"; then - APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS]) - fi - fi -@@ -229,7 +239,7 @@ - dnl Since we have already done the AC_CHECK_LIB tests, if we have it, - dnl we know the library is there. - if test "$apu_have_mysql" = "1"; then -- APR_ADDTO(LDADD_dbd_mysql, [$mysql_LDFLAGS -lmysqlclient $mysql_LIBS]) -+ APR_ADDTO(LDADD_dbd_mysql, [$mysql_LDFLAGS -l$my_library $mysql_LIBS]) - fi - AC_SUBST(LDADD_dbd_mysql) - -diff -ur a/dbd/apr_dbd_mysql.c b/dbd/apr_dbd_mysql.c ---- apr-util-1.6.1/dbd/apr_dbd_mysql.c.orig 2017-05-03 19:18:52.000000000 -0400 -+++ apr-util-1.6.1/dbd/apr_dbd_mysql.c 2017-09-13 19:15:20.894368809 -0400 -@@ -1262,7 +1262,9 @@ - - static void dbd_mysql_init(apr_pool_t *pool) - { -+#if MYSQL_VERSION_ID < 100000 - my_init(); -+#endif - mysql_thread_init(); - - /* FIXME: this is a guess; find out what it really does */ - diff --git a/devel/apr1/files/patch-apr-1.7.0_configure b/devel/apr1/files/patch-apr-1.7.3_configure similarity index 91% rename from devel/apr1/files/patch-apr-1.7.0_configure rename to devel/apr1/files/patch-apr-1.7.3_configure index c31f12dd0ab0..927e44d9c5db 100644 --- a/devel/apr1/files/patch-apr-1.7.0_configure +++ b/devel/apr1/files/patch-apr-1.7.3_configure @@ -1,5 +1,5 @@ ---- apr-1.7.0/configure.orig 2015-04-25 12:04:18 UTC -+++ apr-1.7.0/configure +--- apr-1.7.3/configure.orig 2015-04-25 12:04:18 UTC ++++ apr-1.7.3/configure @@ -6624,11 +6624,7 @@ if test "x$apr_preload_done" != "xyes" ; apr_lock_method="USE_FLOCK_SERIALIZE" fi diff --git a/devel/apr1/files/patch-apr-1.7.0_poll_unix_kqueue.c b/devel/apr1/files/patch-apr-1.7.3_poll_unix_kqueue.c similarity index 88% rename from devel/apr1/files/patch-apr-1.7.0_poll_unix_kqueue.c rename to devel/apr1/files/patch-apr-1.7.3_poll_unix_kqueue.c index e93abccf3fb1..1a31398d40c5 100644 --- a/devel/apr1/files/patch-apr-1.7.0_poll_unix_kqueue.c +++ b/devel/apr1/files/patch-apr-1.7.3_poll_unix_kqueue.c @@ -1,8 +1,8 @@ # 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 +--- apr-1.7.3/poll/unix/kqueue.c.orig 2022-01-19 23:17:18 UTC ++++ apr-1.7.3/poll/unix/kqueue.c @@ -25,21 +25,40 @@ #ifdef HAVE_KQUEUE @@ -53,8 +53,8 @@ return rv; } -@@ -290,7 +309,9 @@ static apr_status_t impl_pollset_poll(ap - pollset->p->result_set[j] = fd; +@@ -293,7 +312,9 @@ static apr_status_t impl_pollset_poll(apr_pollset_t *p + 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); @@ -64,9 +64,9 @@ 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); - +@@ -478,7 +499,9 @@ static apr_status_t impl_pollcb_poll(apr_pollcb_t *pol + } + pollfd->rtnevents = get_kqueue_revent(pollcb->pollset.ke[i].filter, - pollcb->pollset.ke[i].flags); + pollcb->pollset.ke[i].flags, diff --git a/devel/apr1/files/patch-bdb18 b/devel/apr1/files/patch-bdb18 index 302dfca4d6ac..6bb9ed5e8343 100644 --- a/devel/apr1/files/patch-bdb18 +++ b/devel/apr1/files/patch-bdb18 @@ -1,7 +1,7 @@ diff --git apr-util-1.6.1/build/dbm.m4 apr-util-1.6.1/build/dbm.m4 index 57bd131f..5cbee4b3 100644 ---- apr-util-1.6.1/build/dbm.m4 -+++ apr-util-1.6.1/build/dbm.m4 +--- apr-util-1.6.3/build/dbm.m4 ++++ apr-util-1.6.3/build/dbm.m4 @@ -112,7 +112,7 @@ AC_DEFUN([APU_CHECK_BERKELEY_DB], [ changequote([,]) unset $cache_id
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304011545.331FjsQ3036275>