up to 2.14.9 (fixes CVE-2022-26491)

[packages/pidgin.git] / pidgin-nolibs.patch

diff --git a/pidgin-nolibs.patch b/pidgin-nolibs.patch
index c9100974f8e64490c581d8ca2cc9984fcecdf4c3..4fad0c7b88c52ae41bf496ce3cba19c6880d4fcf 100644 (file)
--- a/pidgin-nolibs.patch
+++ b/pidgin-nolibs.patch
@@ -1,11 +1,29 @@
---- gaim-0.64/configure.ac.orig        Mon Jul  7 15:37:56 2003
-+++ gaim-0.64/configure.ac     Mon Jul  7 15:57:41 2003
-@@ -44,7 +44,7 @@
+--- pidgin-2.7.0-orig/configure.ac     2010-05-14 10:50:13.801960582 +0200
++++ pidgin-2.7.0/configure.ac  2010-05-14 10:50:47.245498821 +0200
+@@ -143,8 +143,8 @@
  dnl Check for inet_aton
- AC_CHECK_FUNC(inet_aton, , [AC_CHECK_LIB(resolv, inet_aton, , 
-                                        [AC_ERROR(inet_aton not found)])])
+ AC_CHECK_FUNC(inet_aton, , [AC_CHECK_LIB(resolv, inet_aton, ,
+                                        [AC_MSG_ERROR([inet_aton not found])])])
+-AC_CHECK_LIB(resolv, __res_query)
 -AC_CHECK_LIB(nsl, gethostent)
++AC_CHECK_FUNC(resolv, ,[AC_CHECK_LIB(resolv, __res_query)])
 +AC_CHECK_FUNC(gethostent, , [AC_CHECK_LIB(nsl, gethostent)])
- AC_CHECK_FUNC(socket, , 
-               [AC_CHECK_LIB(socket, socket, , [AC_ERROR([socket not found])])])
+ AC_CHECK_FUNC(socket, ,
+       [AC_CHECK_LIB(socket, socket, , [AC_MSG_ERROR([socket not found])])])
  dnl If all goes well, by this point the previous two checks will have
+@@ -1098,6 +1098,7 @@
+ PKG_CHECK_MODULES(LIBGADU, [libgadu >= 1.12.0], [have_libgadu=yes], [have_libgadu=no])
+ 
+ if test "x$have_libgadu" = "xyes"; then
++      save_LIBS="$LIBS"
+       AC_CHECK_LIB(gadu, gg_is_gpl_compliant, , [
+               LIBGADU_LIBS=""
+               LIBGADU_CFLAGS=""
+@@ -1112,6 +1113,7 @@
+ Falling back to using our own copy of libgadu.
+               ])
+       ])
++      LIBS="$save_LIBS"
+ fi
+ 
+ AM_CONDITIONAL(HAVE_LIBGADU, test "x$have_libgadu" = "xyes")