[Midnightbsd-cvs] mports [24803] trunk/devel/apr1: update to 1.6.5
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Jan 17 14:35:07 EST 2019
Revision: 24803
http://svnweb.midnightbsd.org/mports/?rev=24803
Author: laffer1
Date: 2019-01-17 14:35:06 -0500 (Thu, 17 Jan 2019)
Log Message:
-----------
update to 1.6.5
Modified Paths:
--------------
trunk/devel/apr1/Makefile
trunk/devel/apr1/distinfo
trunk/devel/apr1/files/patch-apr__configure
trunk/devel/apr1/files/patch-apr_poll_unix_kqueue.c
trunk/devel/apr1/pkg-descr
Added Paths:
-----------
trunk/devel/apr1/files/patch-PR61517
Modified: trunk/devel/apr1/Makefile
===================================================================
--- trunk/devel/apr1/Makefile 2019-01-17 18:10:58 UTC (rev 24802)
+++ trunk/devel/apr1/Makefile 2019-01-17 19:35:06 UTC (rev 24803)
@@ -20,7 +20,7 @@
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --build=${ARCH}-midnightbsd-freebsd10.4
-APR_VERSION= 1.6.3
+APR_VERSION= 1.6.5
APU_VERSION= 1.6.1
CPE_VENDOR= apache
Modified: trunk/devel/apr1/distinfo
===================================================================
--- trunk/devel/apr1/distinfo 2019-01-17 18:10:58 UTC (rev 24802)
+++ trunk/devel/apr1/distinfo 2019-01-17 19:35:06 UTC (rev 24803)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1531669387
-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
Added: trunk/devel/apr1/files/patch-PR61517
===================================================================
--- trunk/devel/apr1/files/patch-PR61517 (rev 0)
+++ trunk/devel/apr1/files/patch-PR61517 2019-01-17 19:35:06 UTC (rev 24803)
@@ -0,0 +1,126 @@
+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 */
+
Property changes on: trunk/devel/apr1/files/patch-PR61517
___________________________________________________________________
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
Modified: trunk/devel/apr1/files/patch-apr__configure
===================================================================
--- trunk/devel/apr1/files/patch-apr__configure 2019-01-17 18:10:58 UTC (rev 24802)
+++ trunk/devel/apr1/files/patch-apr__configure 2019-01-17 19:35:06 UTC (rev 24803)
@@ -1,5 +1,5 @@
---- 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
Modified: trunk/devel/apr1/files/patch-apr_poll_unix_kqueue.c
===================================================================
--- trunk/devel/apr1/files/patch-apr_poll_unix_kqueue.c 2019-01-17 18:10:58 UTC (rev 24802)
+++ trunk/devel/apr1/files/patch-apr_poll_unix_kqueue.c 2019-01-17 19:35:06 UTC (rev 24803)
@@ -1,8 +1,8 @@
# 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
Modified: trunk/devel/apr1/pkg-descr
===================================================================
--- trunk/devel/apr1/pkg-descr 2019-01-17 18:10:58 UTC (rev 24802)
+++ trunk/devel/apr1/pkg-descr 2019-01-17 19:35:06 UTC (rev 24803)
@@ -1,8 +1,8 @@
-The Apache Portable Runtime is a library of C data structures and routines,
-forming a system portability layer that covers as many operating systems as
+The Apache Portable Runtime is a library of C data structures and routines,
+forming a system portability layer that covers as many operating systems as
possible, including Unices, Win32, BeOS, and OS/2.
-This port also includes the APR-Util package, which contains some useful
+This port also includes the APR-Util package, which contains some useful
utilities built on top of APR.
WWW: http://apr.apache.org/
More information about the Midnightbsd-cvs
mailing list