- rediff patches, rebuild with openssl 3.0.0, rel 4

diff --git a/apr-util-flags.patch b/apr-util-flags.patch
index c4c39edd5041b41dcf64f9a45acffa444ff7bdf7..9f7ffcfca9b3828355194476c9d9c80750bb0ac1 100644 (file)
--- a/apr-util-flags.patch
+++ b/apr-util-flags.patch
@@ -1,10 +1,11 @@
---- apr-util-1.3.9/configure.in~       2010-08-03 10:09:13.537864637 +0200
-+++ apr-util-1.3.9/configure.in        2010-08-03 10:17:48.184690019 +0200
-@@ -216,6 +216,7 @@
+diff -urNp -x '*.orig' apr-util-1.6.1.org/configure.in apr-util-1.6.1/configure.in
+--- apr-util-1.6.1.org/configure.in    2021-10-09 23:46:59.125014825 +0200
++++ apr-util-1.6.1/configure.in        2021-10-09 23:46:59.218348038 +0200
+@@ -277,6 +277,7 @@ APR_ADDTO(APRUTIL_LIBS, [$APR_LIBS])
  
  AC_SUBST(APRUTIL_EXPORT_LIBS)
  AC_SUBST(APRUTIL_PRIV_INCLUDES)
 +APRUTIL_INCLUDES="$APRUTIL_INCLUDES -I/usr/include/apr"
  AC_SUBST(APRUTIL_INCLUDES)
- AC_SUBST(APRUTIL_LDFLAGS)
- AC_SUBST(APRUTIL_LIBS)
+ 
+ APR_REMOVEFROM(APRUTIL_LDFLAGS,[-L/usr/lib])

diff --git a/apr-util-link.patch b/apr-util-link.patch
index d85fac44510db8bdea7809022845f170c891483e..057bc89a5bb5f26786d8e3632303886261d399dd 100644 (file)
--- a/apr-util-link.patch
+++ b/apr-util-link.patch
@@ -1,8 +1,9 @@
---- apr-util-0.9.4/configure.in.orig   2004-04-18 23:20:56.000000000 +0200
-+++ apr-util-0.9.4/configure.in        2004-04-18 23:25:35.447213680 +0200
-@@ -98,7 +98,12 @@
- APU_FIND_EXPAT
- APU_FIND_ICONV
+diff -urNp -x '*.orig' apr-util-1.6.1.org/configure.in apr-util-1.6.1/configure.in
+--- apr-util-1.6.1.org/configure.in    2017-04-02 19:57:23.000000000 +0200
++++ apr-util-1.6.1/configure.in        2021-10-09 23:46:58.615015473 +0200
+@@ -172,7 +172,12 @@ APU_FIND_ICONV
+ dnl Enable DSO build; must be last:
+ APU_CHECK_UTIL_DSO
  
 +save_LIBS="$LIBS"
 +LIBS=
@@ -13,11 +14,9 @@
  AC_MSG_CHECKING(if system crypt() function is threadsafe)
  if test "x$apu_crypt_threadsafe" = "x1"; then
    AC_DEFINE(APU_CRYPT_THREADSAFE, 1, [Define if the system crypt() function is threadsafe])
---- apr-util-1.5.4/configure.in~       2016-04-08 22:47:59.000000000 +0200
-+++ apr-util-1.5.4/configure.in        2016-04-08 22:50:43.902956204 +0200
-@@ -227,6 +227,11 @@ AC_SUBST(APRUTIL_EXPORT_LIBS)
+@@ -273,6 +278,11 @@ APR_ADDTO(APRUTIL_LIBS, [$APR_LIBS])
+ AC_SUBST(APRUTIL_EXPORT_LIBS)
  AC_SUBST(APRUTIL_PRIV_INCLUDES)
- APRUTIL_INCLUDES="$APRUTIL_INCLUDES -I/usr/include/apr"
  AC_SUBST(APRUTIL_INCLUDES)
 +
 +APR_REMOVEFROM(APRUTIL_LDFLAGS,[-L/usr/lib])

diff --git a/apr-util.spec b/apr-util.spec
index 4f95e5a8c5e21f7e7a396e4f7840dda1f71e2d07..0a3afe904f439b45ef3eb04b704b075f5cfc397b 100644 (file)
--- a/apr-util.spec
+++ b/apr-util.spec
@@ -27,7 +27,7 @@ Summary:      A companion library to Apache Portable Runtime
 Summary(pl.UTF-8):     Biblioteka towarzysząca Apache Portable Runtime
 Name:          apr-util
 Version:       1.6.1
-Release:       3
+Release:       4
 Epoch:         1
 License:       Apache v2.0
 Group:         Libraries