From 70b82bb4438155f30bc01b27badfe51f2f2164ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Uhliarik?= Date: Fri, 3 Feb 2023 03:37:22 +0100 Subject: [PATCH] new version 1.6.3 --- .gitignore | 1 + apr-util-1.6.1-r1894933.patch | 15 ---- apr-util-configure-c99.patch | 39 ---------- apr-util-mariadb-upstream.patch | 128 -------------------------------- apr-util.spec | 17 ++--- sources | 2 +- 6 files changed, 9 insertions(+), 193 deletions(-) delete mode 100644 apr-util-1.6.1-r1894933.patch delete mode 100644 apr-util-configure-c99.patch delete mode 100644 apr-util-mariadb-upstream.patch diff --git a/.gitignore b/.gitignore index af2e1be..d83cdac 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ apr-util-1.3.9.tar.bz2 /apr-util-1.5.4.tar.bz2 /apr-util-1.6.0.tar.bz2 /apr-util-1.6.1.tar.bz2 +/apr-util-1.6.3.tar.bz2 diff --git a/apr-util-1.6.1-r1894933.patch b/apr-util-1.6.1-r1894933.patch deleted file mode 100644 index 435dd09..0000000 --- a/apr-util-1.6.1-r1894933.patch +++ /dev/null @@ -1,15 +0,0 @@ -# ./pullrev.sh 1894933 -http://svn.apache.org/viewvc?view=revision&revision=1894933 - ---- apr-1.6.1/xml/apr_xml.c -+++ apr-1.6.1/xml/apr_xml.c -@@ -457,8 +457,7 @@ - APU_DECLARE(apr_status_t) apr_xml_parser_done(apr_xml_parser *parser, - apr_xml_doc **pdoc) - { -- char end; -- apr_status_t status = do_parse(parser, &end, 0, 1 /* is_final */); -+ apr_status_t status = do_parse(parser, "", 0, 1 /* is_final */); - - /* get rid of the parser */ - (void) apr_pool_cleanup_run(parser->p, parser, cleanup_parser); diff --git a/apr-util-configure-c99.patch b/apr-util-configure-c99.patch deleted file mode 100644 index 2c0f2cf..0000000 --- a/apr-util-configure-c99.patch +++ /dev/null @@ -1,39 +0,0 @@ -Avoid implicit ints for improved C99 compatibility. - -Submitted upstream: - -diff --git a/build/apr_common.m4 b/build/apr_common.m4 -index 6b5c0f033b9e2aca..26607b8479d9be78 100644 ---- a/build/apr_common.m4 -+++ b/build/apr_common.m4 -@@ -473,7 +473,7 @@ $1 - #else - #define binmode - #endif --main() -+int main(void) - { - FILE *f=fopen("conftestval", "w" binmode); - if (!f) exit(1); -@@ -531,7 +531,7 @@ AC_TRY_RUN([ - #include - #include - #include --main() -+int main(void) - { - char buf[1024]; - if (strerror_r(ERANGE, buf, sizeof buf) < 1) { -diff --git a/build/dbm.m4 b/build/dbm.m4 -index 57bd131fc3b74099..e8c51b5dc2c92b68 100644 ---- a/build/dbm.m4 -+++ b/build/dbm.m4 -@@ -235,7 +235,7 @@ AC_DEFUN([APU_TRY_BERKELEY_DB], - #include - #include - #include <$apu_try_berkeley_db_header> --main () -+int main (void) - { - int major, minor, patch; - diff --git a/apr-util-mariadb-upstream.patch b/apr-util-mariadb-upstream.patch deleted file mode 100644 index dd1c5a3..0000000 --- a/apr-util-mariadb-upstream.patch +++ /dev/null @@ -1,128 +0,0 @@ -Upstream patch for building with mariadb: -Taken from https://bz.apache.org/bugzilla/show_bug.cgi?id=61517 -BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1494093 - ---- a/build/dbd.m4 2017-05-03 19:18:52.000000000 -0400 -+++ a/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 ]) -- 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 ]) -+ 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 ]) -- -- 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 ]) -+ 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) - ---- a/dbd/apr_dbd_mysql.c 2017-05-03 19:18:52.000000000 -0400 -+++ a/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/apr-util.spec b/apr-util.spec index 1cb0a2a..1d4ff22 100644 --- a/apr-util.spec +++ b/apr-util.spec @@ -24,16 +24,13 @@ Summary: Apache Portable Runtime Utility library Name: apr-util -Version: 1.6.1 -Release: 24%{?dist} +Version: 1.6.3 +Release: 1%{?dist} License: ASL 2.0 URL: https://apr.apache.org/ Source0: https://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2 Patch1: apr-util-1.2.7-pkgconf.patch -Patch2: apr-util-1.6.1-r1894933.patch -Patch4: apr-util-1.4.1-private.patch -Patch5: apr-util-mariadb-upstream.patch -Patch6: apr-util-configure-c99.patch +Patch2: apr-util-1.4.1-private.patch BuildRequires: gcc BuildRequires: autoconf, apr-devel >= 1.3.0 BuildRequires: %{dbdep}, expat-devel, libuuid-devel @@ -135,10 +132,7 @@ This package provides the NSS crypto support for the apr-util. %prep %setup -q %patch1 -p1 -b .pkgconf -%patch2 -p1 -b .r1894933 -%patch4 -p1 -b .private -%patch5 -p1 -b .maria -%patch6 -p1 +%patch2 -p1 -b .private : Configured for LDAP library: %{ldaplib} @@ -236,6 +230,9 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}/apr-util-%{apuver} %{_datadir}/aclocal/*.m4 %changelog +* Thu Feb 02 2023 Luboš Uhliarik - 1.6.3-1 +- new version 1.6.3 + * Wed Jan 18 2023 Fedora Release Engineering - 1.6.1-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 8ba82b6..8244037 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apr-util-1.6.1.tar.bz2) = 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d +SHA512 (apr-util-1.6.3.tar.bz2) = 8050a481eeda7532ef3751dbd8a5aa6c48354d52904a856ef9709484f4b0cc2e022661c49ddf55ec58253db22708ee0607dfa7705d9270e8fee117ae4f06a0fe