Version bump - bug #253193. Correct pam.d file - bug #210818. Do not abuse

ROOT - bug #258110.

(Portage version: 2.1.10.2/cvs/Linux x86_64)

5 files changed, 150 insertions, 2 deletions

diff --git a/mail-filter/anubis/ChangeLog b/mail-filter/anubis/ChangeLog
index 9753c2334125..93e1df08901d 100644
--- a/mail-filter/anubis/ChangeLog
+++ b/mail-filter/anubis/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-filter/anubis
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/anubis/ChangeLog,v 1.14 2010/06/17 21:35:44 patrick Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/anubis/ChangeLog,v 1.15 2011/06/13 18:07:56 eras Exp $
+
+*anubis-4.1.1 (13 Jun 2011)
+
+  13 Jun 2011; Eray Aslan <eras@gentoo.org> +files/4.1.1-gnutls.patch,
+  +files/4.1.1-gpgme.patch, +files/4.1.1-testsuite.patch, +anubis-4.1.1.ebuild:
+  Version bump - bug #253193. Correct pam.d file - bug #210818. Do not abuse
+  ROOT - bug #258110.
 
   17 Jun 2010; Patrick Lauer <patrick@gentoo.org> anubis-3.9.95.ebuild:
   Migrating away from deprecated postgres virtuals
diff --git a/mail-filter/anubis/anubis-4.1.1.ebuild b/mail-filter/anubis/anubis-4.1.1.ebuild
new file mode 100644
index 000000000000..8147d48b4112
--- /dev/null
+++ b/mail-filter/anubis/anubis-4.1.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2011 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.ebuild,v 1.1 2011/06/13 18:07:56 eras Exp $
+
+EAPI=4
+inherit eutils autotools pam
+
+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="~x86 ~ppc"
+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
+	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 -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-gnutls.patch b/mail-filter/anubis/files/4.1.1-gnutls.patch
new file mode 100644
index 000000000000..c4dd28bff693
--- /dev/null
+++ b/mail-filter/anubis/files/4.1.1-gnutls.patch
@@ -0,0 +1,11 @@
+--- configure.ac	2011-06-13 13:46:22.817856139 +0300
++++ configure.ac	2011-06-13 13:47:56.000000000 +0300
+@@ -277,7 +277,7 @@
+ if test $with_gnutls = yes; then
+   AC_CHECK_HEADERS(gnutls/gnutls.h)
+   if test $ac_cv_header_gnutls_gnutls_h != no; then
+-    AM_PATH_LIBGNUTLS("1.0.0",
++    PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.0,
+                       [M4_DEFS="$M4_DEFS -DWITH_SSL -DWITH_GNUTLS"
+                       AC_DEFINE(USE_GNUTLS, 1,
+                                 [Define to 1 if USE_GNUTLS is requested.])],
diff --git a/mail-filter/anubis/files/4.1.1-gpgme.patch b/mail-filter/anubis/files/4.1.1-gpgme.patch
new file mode 100644
index 000000000000..c72ffd437d94
--- /dev/null
+++ b/mail-filter/anubis/files/4.1.1-gpgme.patch
@@ -0,0 +1,22 @@
+--- configure.ac	2011-06-13 19:40:37.856822010 +0300
++++ configure.ac	2011-06-13 19:43:27.000000000 +0300
+@@ -149,10 +149,18 @@
+    AC_MSG_CHECKING(for $1/include/gpgme.h)
+    AC_MSG_RESULT([yes])
+    return 0
++  else
++   if test -f "$1/include/gpgme/gpgme.h"; then
++    gpgmedir=1
++    INCLUDES="$INCLUDES -I$1/include/gpgme"
++    AC_MSG_CHECKING(for $1/include/gpgme/gpgme.h)
++    AC_MSG_RESULT([yes])
++    return 0
++   fi
+   fi
+   return 1
+  }
+- for maindir in /usr/pkg /opt /sw; do
++ for maindir in /usr/pkg /opt /sw /usr; do
+   findgpgmedir $maindir && break 2
+  done
+  if test $gpgmedir; then
diff --git a/mail-filter/anubis/files/4.1.1-testsuite.patch b/mail-filter/anubis/files/4.1.1-testsuite.patch
new file mode 100644
index 000000000000..5b1c656fa0af
--- /dev/null
+++ b/mail-filter/anubis/files/4.1.1-testsuite.patch
@@ -0,0 +1,14 @@
+--- testsuite/data/Makefile.am	2011-06-13 14:29:38.843665225 +0300
++++ testsuite/data/Makefile.am	2011-06-13 14:31:16.000000000 +0300
+@@ -22,8 +22,10 @@
+ EXTRA_DIST = pubring.asc secring.asc anubis.pem append.txt users
+ CLEANFILES = *.gpg random_seed *~ text.db
+ 
+-pubring.gpg secring.gpg: $(srcdir)/pubring.asc $(srcdir)/secring.asc
++pubring.gpg: $(srcdir)/pubring.asc
+ 	$(GPG) --homedir . --import < $(srcdir)/pubring.asc
++
++secring.gpg: $(srcdir)/secring.asc
+ 	$(GPG) --homedir . --allow-secret-key-import --import < $(srcdir)/secring.asc
+ 
+ text.db: $(srcdir)/users