From ced63c0f740e303e8ebb2d19cda314f2f05d9ce2 Mon Sep 17 00:00:00 2001 From: zhuchunyi Date: Wed, 6 Nov 2019 19:01:44 +0800 Subject: [PATCH] update code --- ...-compile-apr-util-against-mariadb-10.patch | 20 +++++----- apr-util.spec | 37 +++++++++++++------ 2 files changed, 35 insertions(+), 22 deletions(-) rename apr-util-mariadb-upstream.patch => Updated-patch-to-compile-apr-util-against-mariadb-10.patch (92%) diff --git a/apr-util-mariadb-upstream.patch b/Updated-patch-to-compile-apr-util-against-mariadb-10.patch similarity index 92% rename from apr-util-mariadb-upstream.patch rename to Updated-patch-to-compile-apr-util-against-mariadb-10.patch index dd1c5a3..6ba5664 100644 --- a/apr-util-mariadb-upstream.patch +++ b/Updated-patch-to-compile-apr-util-against-mariadb-10.patch @@ -1,10 +1,9 @@ -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 +This is an upstream patch from: https://bz.apache.org/bugzilla/show_bug.cgi?id=61517 +diff -ur a/build/dbd.m4 b/build/dbd.m4 --- 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 @@ ++++ b/build/dbd.m4 2017-09-13 16:58:07.369546391 -0400 +@@ -163,10 +163,15 @@ old_cppflags="$CPPFLAGS" old_ldflags="$LDFLAGS" @@ -20,7 +19,7 @@ BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1494093 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 @@ +@@ -174,32 +179,40 @@ APR_ADDTO(CPPFLAGS, [$mysql_CPPFLAGS]) APR_ADDTO(LIBS, [$mysql_LIBS]) @@ -77,7 +76,7 @@ BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1494093 fi APR_ADDTO(CPPFLAGS, [$mysql_CPPFLAGS]) -@@ -207,18 +220,15 @@ +@@ -207,18 +220,15 @@ APR_ADDTO(LIBS, [$mysql_LIBS]) AC_MSG_NOTICE(checking for mysql in $withval) @@ -104,7 +103,7 @@ BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1494093 APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS]) fi fi -@@ -229,7 +239,7 @@ +@@ -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 @@ -113,9 +112,10 @@ BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1494093 fi AC_SUBST(LDADD_dbd_mysql) +diff -ur a/dbd/apr_dbd_mysql.c b/dbd/apr_dbd_mysql.c --- 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 @@ ++++ b/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) { diff --git a/apr-util.spec b/apr-util.spec index 4d683d5..038b931 100644 --- a/apr-util.spec +++ b/apr-util.spec @@ -2,7 +2,7 @@ Name: apr-util Version: 1.6.1 -Release: 9 +Release: 10 Summary: apr-util provides a number of helpful abstractions on top of APR. License: ASL 2.0 URL: http://apr.apache.org @@ -10,24 +10,27 @@ Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2 Patch0: apr-util-1.2.7-pkgconf.patch Patch1: apr-util-1.4.1-private.patch -Patch2: apr-util-mariadb-upstream.patch -Patch6000: Merge-r1822315-from-trunk.patch -Patch6001: Fix-error-handling-in-gdbm.patch -Patch6002: Merge-r1834022-r1834023-r1834024-from-trunk.patch -Patch6003: Remove-dereference-of-null-pointer.patch +Patch6000: Updated-patch-to-compile-apr-util-against-mariadb-10.patch +Patch6001: Merge-r1822315-from-trunk.patch +Patch6002: Fix-error-handling-in-gdbm.patch +Patch6003: Merge-r1834022-r1834023-r1834024-from-trunk.patch +Patch6004: Remove-dereference-of-null-pointer.patch BuildRequires: gcc autoconf apr-devel >= 1.6.0 libdb-devel expat-devel libuuid-devel BuildRequires: mariadb-connector-c-devel sqlite-devel >= 3.1.0 openldap-devel openssl-devel + Requires: apr-util%{?_isa} = %{version}-%{release} + Recommends: apr-util-openssl%{_isa} = %{version}-%{release} Recommends: apr-util-bdb%{_isa} = %{version}-%{release} -Provides: apr-util-bdb = %{version}-%{release} apr-util-mysql = %{version}-%{release} -Provides: apr-util-sqlite = %{version}-%{release} apr-util-ldap = %{version}-%{release} -Provides: apr-util-openssl = %{version}-%{release} + Obsoletes: apr-util-bdb < %{version}-%{release} apr-util-mysql < %{version}-%{release} Obsoletes: apr-util-sqlite < %{version}-%{release} apr-util-ldap < %{version}-%{release} Obsoletes: apr-util-openssl < %{version}-%{release} +Provides: apr-util-bdb = %{version}-%{release} apr-util-mysql = %{version}-%{release} +Provides: apr-util-sqlite = %{version}-%{release} apr-util-ldap = %{version}-%{release} +Provides: apr-util-openssl = %{version}-%{release} %description The mission of the Apache Portable Runtime (APR) project is to create and maintain software @@ -70,7 +73,7 @@ export ac_cv_ldap_set_rebind_proc_style=three %configure --with-apr=%{_prefix} --includedir=%{_includedir}/apr-%{apuver} \ --with-ldap=ldap_r --without-gdbm --with-sqlite3 --with-pgsql --with-mysql --with-odbc \ --with-dbm=db5 --with-berkeley-db --without-sqlite2 --with-crypto --with-openssl -make %{?_smp_mflags} +%make_build %install rm -rf %{buildroot} @@ -87,9 +90,16 @@ rm -f %{buildroot}%{_libdir}/%{name}-%{apuver}/*.*a export MALLOC_CHECK_=2 MALLOC_PERTURB_=$(($RANDOM % 255 + 1)) export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}/%{name}-%{apuver} make test - %ldconfig_scriptlets +%pre + +%preun + +%post + +%postun + %files %doc CHANGES NOTICE %license LICENSE @@ -116,8 +126,11 @@ make test %{_libdir}/%{name}-%{apuver}/apr_dbd_odbc* %changelog +* Tue Oct 22 2019 openEuler Buildteam - 1.6.1-10 +- optimize spec file. + * Sat Sep 28 2019 openEuler Buildteam - 1.6.1-9 - Package rebuild. -* Thu Sep 5 2019 openEuler Buildteam - 1.6.1-8 +* Thu Sep 05 2019 openEuler Buildteam - 1.6.1-8 - Package init.