diff --git a/apr-util-1.6.1-sw.patch b/apr-util-1.6.1-sw.patch new file mode 100755 index 0000000000000000000000000000000000000000..9dd0883f297a47f69faeb77b796eb5eb4b8c9cd8 --- /dev/null +++ b/apr-util-1.6.1-sw.patch @@ -0,0 +1,12 @@ +diff -Nuar apr-util-1.6.1.org/crypto/crypt_blowfish.c apr-util-1.6.1.sw/crypto/crypt_blowfish.c +--- apr-util-1.6.1.org/crypto/crypt_blowfish.c 2022-02-27 01:36:40.770000000 +0000 ++++ apr-util-1.6.1.sw/crypto/crypt_blowfish.c 2022-02-27 01:37:28.940000000 +0000 +@@ -56,7 +56,7 @@ + #ifdef __i386__ + #define BF_ASM 0 + #define BF_SCALE 1 +-#elif defined(__x86_64__) || defined(__alpha__) || defined(__hppa__) ++#elif defined(__x86_64__) || defined(__alpha__) || defined(__hppa__) || defined(__sw_64__) + #define BF_ASM 0 + #define BF_SCALE 1 + #else diff --git a/apr-util.spec b/apr-util.spec index a0dca4e08c5aa1149fde114a477a5a9494ea167f..f26fe6ca738906d909902bf0f090771486d87d39 100644 --- a/apr-util.spec +++ b/apr-util.spec @@ -2,7 +2,7 @@ Name: apr-util Version: 1.6.1 -Release: 12 +Release: 13 Summary: apr-util provides a number of helpful abstractions on top of APR. License: ASL 2.0 URL: http://apr.apache.org @@ -13,6 +13,7 @@ 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 +Patch6005: apr-util-1.6.1-sw.patch BuildRequires: gcc autoconf apr-devel >= 1.6.0 gdbm-devel expat-devel libuuid-devel BuildRequires: mariadb-connector-c-devel sqlite-devel >= 3.1.0 openldap-devel openssl-devel @@ -123,6 +124,9 @@ make test %{_libdir}/%{name}-%{apuver}/apr_dbd_odbc* %changelog +* Thu Jul 28 2022 wuzx - 1.6.1-13 +- add sw64 patch + * Sat Jun 19 2021 panxiaohe - 1.6.1-12 - BuildRequires: replace libdb with gdbm - Add requires gdbm-devel