Fix #107885, libresolv detection failed on amd64, see changelog for details.

Package-Manager: portage-2.0.51.22-r2

diff --git a/net-misc/partysip/ChangeLog b/net-misc/partysip/ChangeLog
index e1efea746b948d31b5ef492d162557e5a6637efd..7b7bafa4658dd6985d07f1e2c74629b6214832b5 100644 (file)
--- a/net-misc/partysip/ChangeLog
+++ b/net-misc/partysip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/partysip
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/partysip/ChangeLog,v 1.10 2005/07/18 11:51:31 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/partysip/ChangeLog,v 1.11 2005/10/02 18:00:09 stkn Exp $
+
+  02 Oct 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/partysip-2.2.3-libresolv-check.diff, partysip-2.2.3.ebuild:
+  Fix libresolv check in configure.in (#107885), search for the internal
+  function name instead of the alias name, because that one is not present in
+  the amd64 libresolv.so. Thanks to White_Angel@gmx.de for reporting this.
 
   18 Jul 2005; David Holm <dholm@gentoo.org> partysip-2.2.3.ebuild:
   Added to ~ppc.

diff --git a/net-misc/partysip/Manifest b/net-misc/partysip/Manifest
index 88e7e7c66becc342345c8332efdbfaf4c8e9588a..d07202f748f7aab398f87437a03cda102671352e 100644 (file)
--- a/net-misc/partysip/Manifest
+++ b/net-misc/partysip/Manifest
@@ -1,7 +1,8 @@
-MD5 aba58975655fb3559e40e299b631564a ChangeLog 1594
+MD5 16a355dc83c51b768ae95ef57377b2de partysip-2.2.3.ebuild 1960
 MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217
-MD5 09323a99c497c6c8c25c1fa5569a688d partysip-2.2.3.ebuild 1708
+MD5 33bfa4684595735fb8d30b23b2e4f60a ChangeLog 1938
 MD5 af1cd5cfc31c0ad22707ebfb4c5d4a42 files/partysip.confd 51
-MD5 3d8b82c59417e2b2174a12728fe8ce10 files/partysip.rc6 556
-MD5 28c1c4c474314301b9ae5a6df3bd96d8 files/digest-partysip-2.2.3 66
 MD5 683b0ac31fb45361c565e39861b10edb files/partysip-2.2.3-configure.diff 1121
+MD5 28c1c4c474314301b9ae5a6df3bd96d8 files/digest-partysip-2.2.3 66
+MD5 3d8b82c59417e2b2174a12728fe8ce10 files/partysip.rc6 556
+MD5 4ac096b43167b02709123c988ad7f54a files/partysip-2.2.3-libresolv-check.diff 612

diff --git a/net-misc/partysip/files/partysip-2.2.3-libresolv-check.diff b/net-misc/partysip/files/partysip-2.2.3-libresolv-check.diff
new file mode 100644 (file)
index 0000000..44208e0
--- /dev/null
+++ b/net-misc/partysip/files/partysip-2.2.3-libresolv-check.diff
@@ -0,0 +1,15 @@
+--- partysip-2.2.3/configure.in.orig   2005-10-02 19:37:55.000000000 +0000
++++ partysip-2.2.3/configure.in        2005-10-02 19:38:50.000000000 +0000
+@@ -209,8 +209,10 @@
+      ;;
+   *)
+      CHECK_INADDR_NONE
+-     AC_CHECK_LIB(resolv,res_query,[PARTYSIP_LIB="$PARTYSIP_LIB -lresolv"])
+-     AC_CHECK_LIB(resolv,res_query,[PPL_LIB="$PPL_LIB -lresolv"])
++     # check for the internal names here, because they are the only ones showing up
++     # on amd64
++     AC_CHECK_LIB(resolv,__res_query,[PARTYSIP_LIB="$PARTYSIP_LIB -lresolv"])
++     AC_CHECK_LIB(resolv,__res_query,[PPL_LIB="$PPL_LIB -lresolv"])
+      ;;
+ esac
+ 

diff --git a/net-misc/partysip/partysip-2.2.3.ebuild b/net-misc/partysip/partysip-2.2.3.ebuild
index f8802cb18d0ec909995eb8a406e8cb5d7ffea24d..6f76ef9c2524f1deb0301afe8bf02636b6c3c9d0 100644 (file)
--- a/net-misc/partysip/partysip-2.2.3.ebuild
+++ b/net-misc/partysip/partysip-2.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/partysip/partysip-2.2.3.ebuild,v 1.2 2005/07/18 11:51:31 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/partysip/partysip-2.2.3.ebuild,v 1.3 2005/10/02 18:00:09 stkn Exp $
 
 IUSE="berkdb debug syslog"
 
@@ -25,6 +25,12 @@ src_unpack() {
        cd ${S}
        epatch ${FILESDIR}/${P}-configure.diff
 
+       # fix libresolv check in configure.in (#107885)
+       # instead of res_query, we search for the real (internal)
+       # function name __res_query, because res_query isn't in the symbol
+       # list of libresolv on amd64
+       epatch ${FILESDIR}/${P}-libresolv-check.diff
+
        # put partysip  binary into /usr/sbin
        sed -i -e "s:^bin_PROGRAMS:sbin_PROGRAMS:" \
                src/Makefile.am tools/Makefile.am