Don't call ar directly - bug #439460. Fix building with gnutls3

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 0x77F1F175586A3B1F)

3 files changed, 116 insertions, 1 deletions

diff --git a/mail-filter/anubis/ChangeLog b/mail-filter/anubis/ChangeLog
index 2ffe1945b5d4..ee5689b8ca56 100644
--- a/mail-filter/anubis/ChangeLog
+++ b/mail-filter/anubis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/anubis
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/anubis/ChangeLog,v 1.20 2012/06/04 23:34:40 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/anubis/ChangeLog,v 1.21 2012/10/30 09:46:15 eras Exp $
+
+*anubis-4.1.1-r1 (30 Oct 2012)
+
+  30 Oct 2012; Eray Aslan <eras@gentoo.org> +anubis-4.1.1-r1.ebuild,
+  +files/4.1.1-gnutls3.patch:
+  Don't call ar directly - bug #439460. Fix building with gnutls3
 
   04 Jun 2012; Zac Medico <zmedico@gentoo.org> anubis-4.1.1.ebuild:
   inherit user for enewuser
diff --git a/mail-filter/anubis/anubis-4.1.1-r1.ebuild b/mail-filter/anubis/anubis-4.1.1-r1.ebuild
new file mode 100644
index 000000000000..47908909efe8
--- /dev/null
+++ b/mail-filter/anubis/anubis-4.1.1-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/anubis/anubis-4.1.1-r1.ebuild,v 1.1 2012/10/30 09:46:15 eras Exp $
+
+EAPI=4
+inherit eutils autotools pam toolchain-funcs user
+
+DESCRIPTION="GNU Anubis is an outgoing mail processor."
+HOMEPAGE="http://www.gnu.org/software/anubis/"
+
+SRC_URI="mirror://gnu/anubis/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE="crypt guile mysql postgres nls pam pcre sasl socks5 +gnutls tcpd test"
+
+RDEPEND="sys-libs/gdbm
+	crypt? ( >=app-crypt/gpgme-0.9.0 )
+	guile? ( >=dev-scheme/guile-1.8 )
+	mysql? ( virtual/mysql )
+	pam?   ( virtual/pam )
+	postgres? ( dev-db/postgresql-server )
+	nls? ( sys-devel/gettext )
+	pcre? ( >=dev-libs/libpcre-3.9 )
+	sasl? ( virtual/gsasl )
+	gnutls?   ( net-libs/gnutls )
+	tcpd?  ( >=sys-apps/tcp-wrappers-7.6 )"
+DEPEND="${RDEPEND}
+	test? ( dev-util/dejagnu )"
+
+REQUIRED_USE="mysql? ( sasl )
+	postgres? ( sasl )"
+
+pkg_setup() {
+	enewuser anubis
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-gnutls.patch
+	epatch "${FILESDIR}"/${PV}-gpgme.patch
+	epatch "${FILESDIR}"/${PV}-testsuite.patch
+	epatch "${FILESDIR}"/${PV}-gnutls3.patch
+	sed -i -e "s/1024-bit ELG-E/1024-bit ELG/" \
+		testsuite/etc/{gpgcrypt.pat,gpgse.pat}
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use crypt ; then
+		myconf="--with-gpgme --with-gpgme-prefix=$(gpgme-config --prefix)"
+	else
+		myconf="--without-gpgme"
+	fi
+	econf --with-unprivileged-user=anubis \
+		--disable-rpath \
+		$(use_with mysql) \
+		$(use_with postgres) \
+		$(use_with pam) \
+		$(use_with pcre) \
+		$(use_enable nls) \
+		$(use_with guile) \
+		$(use_with sasl gsasl) \
+		$(use_with gnutls) \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_with socks5 socks-proxy) \
+		${myconf}
+}
+
+src_compile() {
+	# parallel make fails
+	emake AR=$(tc-getAR) -j1
+}
+
+src_test() {
+	cd "${S}/testsuite"
+	emake -j1 check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README* THANKS TODO
+	docinto examples
+	dodoc examples/*anubis*
+	docinto guile
+	dodoc guile/*.scm
+
+	if use pam ; then
+		pamd_mimic system-auth anubis auth account session
+	fi
+
+	rm -rf "${D}"/usr/share/anubis
+}
diff --git a/mail-filter/anubis/files/4.1.1-gnutls3.patch b/mail-filter/anubis/files/4.1.1-gnutls3.patch
new file mode 100644
index 000000000000..c9d9197a2184
--- /dev/null
+++ b/mail-filter/anubis/files/4.1.1-gnutls3.patch
@@ -0,0 +1,14 @@
+--- src/tls.c	2008-12-16 16:21:54.000000000 +0000
++++ src/tls.c	2012-10-30 09:06:37.387243098 +0000
+@@ -294,7 +294,10 @@
+ static void
+ verify_certificate (gnutls_session session)
+ {
+-  int status = gnutls_certificate_verify_peers (session);
++  int status, verify_ret;
++  verify_ret = gnutls_certificate_verify_peers2 (session, &status);
++  if (!verify_ret)
++    return status;
+ 
+   if (status == GNUTLS_E_NO_CERTIFICATE_FOUND)
+     {