Fix for #41160.

4 files changed, 44 insertions, 21 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index bed1c1fbdfdd..a8e2002dfc30 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.54 2004/02/22 16:13:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.55 2004/03/10 12:42:49 aliz Exp $
+
+  10 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> courier-imap-2.1.2-r1.ebuild,
+  files/courier-imap-2.1.2-res_query.patch:
+  Add patch for res_query to allow courier-imap to compile on amd64. Should close #41160.
 
   22 Feb 2004; Aron Griffis <agriffis@gentoo.org>
   courier-imap-1.7.3-r1.ebuild, courier-imap-2.1.2-r1.ebuild:
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 97762a470414..33570aee22eb 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,24 +1,25 @@
-MD5 aa7241de503ed2c5bfb4aac4d2db2339 ChangeLog 8905
-MD5 6b964abdc013cf2bb64040e8e33215ae metadata.xml 242
+MD5 6164037eefb5e9dde4f751abe05ca0db courier-imap-2.1.2-r1.ebuild 7652
 MD5 9934ee3f9b504af0b330c34393267b83 courier-imap-1.7.3-r1.ebuild 6884
-MD5 5c4e5144b6e3795c8f0ffdd8ff9e4d4f courier-imap-2.1.2-r1.ebuild 7579
-MD5 e2b026fe60176521e97df76389366955 files/authdaemond.conf 457
-MD5 9249739b006f7f0daa345dd8ac6e6b5b files/authdaemond.rc6 977
-MD5 c5993255c6be57914cb943789f59931e files/courier-imapd-ssl.rc6 1208
-MD5 fc75e6af35eeaecec10d7276e9b61747 files/courier-imapd.rc6 953
-MD5 32bc690ac270adbfe95dbbeaab37904b files/courier-pop3d-ssl.rc6 1216
-MD5 572530bc373ee70a6f524d554b1d139c files/courier-pop3d.rc6 961
-MD5 7f82274e3a25ba7ff6852f78d9eb2f69 files/digest-courier-imap-1.7.3-r1 72
-MD5 9626da27b0e11f495ea062e6166e11d3 files/gentoo-imapd-ssl.rc 1013
+MD5 84cee4f7144d1afb070896caf4fb2380 ChangeLog 9114
+MD5 6b964abdc013cf2bb64040e8e33215ae metadata.xml 242
+MD5 f959e38175d1fd8f8e7a977a14f7265f files/gentoo-pop3d-1.7.3-r1.rc 1018
+MD5 ff6234859377e6e830592de36bc84797 files/courier-imap-2.1.1-db40vs41.patch 559
 MD5 e448df5fdbc088132766b33d27f27073 files/gentoo-imapd.rc 1006
-MD5 a2d52d98e3f5b3241e1ed40943d5a4a8 files/gentoo-pop3d-ssl.rc 989
-MD5 70a999ccc2bc13e7df65b72959fa6f7d files/gentoo-pop3d.rc 997
+MD5 b25567c91ef97cc688213418886b3a7c files/courier-imapd-ssl.rc6 1198
+MD5 96be467d55313b97e9868d527684e1f3 files/courier-imapd.rc6 943
 MD5 40deca440b71ed8d78e39968fb5a30e9 files/mkimapdcert 996
-MD5 7b677e761c000af45fa7a37635b0c5c8 files/mkpop3dcert 996
-MD5 a949b3b821df42c3cfee300c25a53750 files/gentoo-imapd-1.7.3-r1.rc 1027
-MD5 58631496675a58dbb19ccd058088c6e1 files/gentoo-imapd-ssl-1.7.3-r1.rc 1034
-MD5 f959e38175d1fd8f8e7a977a14f7265f files/gentoo-pop3d-1.7.3-r1.rc 1018
 MD5 3dd72120d20476368b64811318e0b721 files/gentoo-pop3d-ssl-1.7.3-r1.rc 1010
-MD5 ff6234859377e6e830592de36bc84797 files/courier-imap-2.1.1-db40vs41.patch 559
-MD5 de1f0b8685ecebe3d859167530f53e84 files/digest-courier-imap-2.1.2-r1 72
+MD5 60552b53a15c049f8f490d454764315d files/courier-imap-2.1.2-res_query.patch 610
+MD5 a2d52d98e3f5b3241e1ed40943d5a4a8 files/gentoo-pop3d-ssl.rc 989
 MD5 8518e782ded83266586160919806ec06 files/courier-imap-2.1.2-removerpm.patch 4308
+MD5 7f82274e3a25ba7ff6852f78d9eb2f69 files/digest-courier-imap-1.7.3-r1 72
+MD5 75f9598c5aca89a4aa533beb920c001c files/authdaemond.conf 448
+MD5 58631496675a58dbb19ccd058088c6e1 files/gentoo-imapd-ssl-1.7.3-r1.rc 1034
+MD5 8bf6d243f96ca03c38dc9c8717b54f9a files/courier-pop3d-ssl.rc6 1206
+MD5 a949b3b821df42c3cfee300c25a53750 files/gentoo-imapd-1.7.3-r1.rc 1027
+MD5 9626da27b0e11f495ea062e6166e11d3 files/gentoo-imapd-ssl.rc 1013
+MD5 70a999ccc2bc13e7df65b72959fa6f7d files/gentoo-pop3d.rc 997
+MD5 de1f0b8685ecebe3d859167530f53e84 files/digest-courier-imap-2.1.2-r1 72
+MD5 56cc308283ae98e263ed4ee6f4be9c58 files/authdaemond.rc6 965
+MD5 ea2e3632eedf811c200369e212ffd3a5 files/courier-pop3d.rc6 951
+MD5 7b677e761c000af45fa7a37635b0c5c8 files/mkpop3dcert 996
diff --git a/net-mail/courier-imap/courier-imap-2.1.2-r1.ebuild b/net-mail/courier-imap/courier-imap-2.1.2-r1.ebuild
index 1c1b1099b31e..51cb0165f376 100644
--- a/net-mail/courier-imap/courier-imap-2.1.2-r1.ebuild
+++ b/net-mail/courier-imap/courier-imap-2.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-2.1.2-r1.ebuild,v 1.12 2004/02/22 16:13:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-2.1.2-r1.ebuild,v 1.13 2004/03/10 12:42:49 aliz Exp $
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
@@ -54,6 +54,10 @@ src_unpack() {
 	sed -i -e 's,--with-authchangepwdir=/var/tmp/dev/null,--with-authchangepwdir=$libexecdir/authlib,' configure
 
 	epatch ${FILESDIR}/${PN}-2.1.2-removerpm.patch
+	epatch ${FILESDIR}/${P}-res_query.patch
+	cd ${S}/authlib
+	aclocal
+	autoconf
 }
 
 src_compile() {
diff --git a/net-mail/courier-imap/files/courier-imap-2.1.2-res_query.patch b/net-mail/courier-imap/files/courier-imap-2.1.2-res_query.patch
new file mode 100644
index 000000000000..df936e0fc5cf
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-2.1.2-res_query.patch
@@ -0,0 +1,14 @@
+--- authlib/configure.in	2004-03-10 12:08:15.917116233 +0000
++++ authlib/configure.in	2004-03-10 12:12:05.740024004 +0000
+@@ -391,7 +391,10 @@
+         	AC_TRY_LINK_FUNC(res_query,
+         		LDAPLIBS="-lresolv $LDAPLIBS" HAVE_LDAP=1
+         		AC_MSG_RESULT(yes),
+-        		AC_MSG_ERROR(Cannot find function res_query)))
++				AC_TRY_LINK_FUNC(__res_query,
++				LDAPLIBS="-lresolv $LDAPLIBS" HAVE_LDAP=1
++				AC_MSG_RESULT(yes),
++	        		AC_MSG_ERROR(Cannot find function res_query))))
+ 	AC_CHECK_LIB(lber, ber_scanf,
+ 		[ LDAPLIBS="-llber $LDAPLIBS" LIBS="-llber $LIBS" ])
+ 	AC_CHECK_LIB(ldap, ldap_open,