Up to 1.6.3; fixes CVE-2022-25147

[packages/apr-util.git] / apr-util-link.patch

diff --git a/apr-util-link.patch b/apr-util-link.patch
index 55d585f9bc6d3660b3a30475ed72c6396c649b53..4886975d33e3a187a62d709e2d9c3316daeba8b6 100644 (file)
--- a/apr-util-link.patch
+++ b/apr-util-link.patch
@@ -1,24 +1,36 @@
---- 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
+@@ -175,14 +175,19 @@ APU_FIND_ICONV
+ dnl Enable DSO build; must be last:
+ APU_CHECK_UTIL_DSO
  
 +save_LIBS="$LIBS"
 +LIBS=
  AC_SEARCH_LIBS(crypt, crypt ufc)
-+APR_ADDTO(APRUTIL_EXPORT_LIBS, [$LIBS])
-+APR_ADDTO(APRUTIL_LIBS, [$LIBS])
+ case "$ac_cv_search_crypt" in
+ "no"|"none required")
+     ;;
+ *)
+-    APR_ADDTO(APRUTIL_LIBS, [$ac_cv_search_crypt])
++    APR_ADDTO(APRUTIL_EXPORT_LIBS, [$LIBS])
++    APR_ADDTO(APRUTIL_LIBS, [$LIBS])
+     ;;
+ esac
 +LIBS="$save_LIBS $LIBS"
++
  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])
-@@ -130,7 +135,7 @@
-     dnl ### apr and expat libraries to the build or it'll die a truly horrible
-     dnl ### death. We now use the apr-config tool to determine the correct
-     dnl ### library to link against :)
--*AIX*|*Darwin*|*BeOS*)
-+*AIX*|*Darwin*|*BeOS*|*Linux*)
-     dnl need such stuff as -liconv to be specified when building libaprutil.la
-     EXTRA_OS_LINK='$(APRUTIL_LDFLAGS) $(APRUTIL_LIBS)'
-     ;;
+@@ -273,6 +278,11 @@ APR_ADDTO(APRUTIL_LIBS, [$APR_LIBS])
+ AC_SUBST(APRUTIL_EXPORT_LIBS)
+ AC_SUBST(APRUTIL_PRIV_INCLUDES)
+ AC_SUBST(APRUTIL_INCLUDES)
++
++APR_REMOVEFROM(APRUTIL_LDFLAGS,[-L/usr/lib])
++APR_REMOVEFROM(APRUTIL_LDFLAGS,[-L/usr/lib32])
++APR_REMOVEFROM(APRUTIL_LDFLAGS,[-L/usr/lib64])
++
+ AC_SUBST(APRUTIL_LDFLAGS)
+ AC_SUBST(APRUTIL_LIBS)
+ AC_SUBST(LDFLAGS)