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

ROOT - bug #258110.

Package-Manager: portage-2.1.10.2/cvs/Linux x86_64

6 files changed, 176 insertions, 3 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/Manifest b/mail-filter/anubis/Manifest
index 2826307f0b7b..efb75d8e15f6 100644
--- a/mail-filter/anubis/Manifest
+++ b/mail-filter/anubis/Manifest
@@ -1,6 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 3.9.95-authmode.c.patch 438 RMD160 1ba8222e597d9ccc17a73bf8531344f716e03c2c SHA1 b8d3be4f75b4252c4178d85287d2df5bd44b897b SHA256 57000febf719405d357ae68454648ff5b89c4270dbc290367ca44afd59d48814
 AUX 3.9.95-transmode.c.patch 321 RMD160 445653322bbab1fa67b7740444bcadb798f47dac SHA1 787314b94567fa95c28e6ba00ca6dffd5684b371 SHA256 4a03526792e2a5f9ed8d3e2e28b705c33863850dea9289195e51c9f5fedd5e07
+AUX 4.1.1-gnutls.patch 527 RMD160 016c2cdc9fbd053af67c9c9d284fc9e5cd2a2f44 SHA1 1560d668bd580d2c0e8a14cb5167c4742f683561 SHA256 0904384c8fe11222dcd5c868e34a2f5121a888a302b842a1eb9739d5628a2872
+AUX 4.1.1-gpgme.patch 599 RMD160 7a7b42b071f29fa5b49775e7b38b8ec5f2e2ce33 SHA1 da58762573c5ad59bf96acca339318fc2bf5576a SHA256 f23d113db8213aed6d52807a3f887b44c1596d5a17a8c0c61cd29361cadf049d
+AUX 4.1.1-testsuite.patch 570 RMD160 de6e1f3b1b9fe38c8ada38c577a97ad76d99bb3a SHA1 fbe3e02322d69e84f1f7adce89d0f4bb4d74a1da SHA256 f1579eb14f1d854daba284991c28486308660536cae2e2ec324f8d18ba35b39e
 DIST anubis-3.9.95.tar.gz 814555 RMD160 3bb0047b70e5ae8d531fd3792a0b2cbb074c5bb3 SHA1 d63c5368b3bf2dc28675f722d88c23a58d7aa3e5 SHA256 17ea53cac9b20ac722ac05baccbbc3809f1e548f1089e74692460be6b55230be
+DIST anubis-4.1.1.tar.gz 1104272 RMD160 4c21b871c4a8c486783184a4400dce8bfd6757a8 SHA1 d2960606bf8bda3438a75d668fc12a711f70d353 SHA256 93ef7a2d8bc3b50cd2e228cfe27e296ee14accadf8533bad9b2beee88a96e8fa
 EBUILD anubis-3.9.95.ebuild 1920 RMD160 d4df325789d8c9c3d60217601478d4df0a29d786 SHA1 4fcdf5ceb9d66b485928c738ba79d5e57b1dcdf7 SHA256 ba16b64444f3ba31e61aeec488e5b641f7b59d52526303520600f80f1c62305a
-MISC ChangeLog 2757 RMD160 bc983fce46608f0755cd00e2b7b481d6106deff1 SHA1 77ad7a7c2d50ef19dd16e743218a254c12547f9a SHA256 4a81c95fdd7d768e19b8e84f4ad3511417f98c501b3ddcb3ec6f75a900990ea1
+EBUILD anubis-4.1.1.ebuild 2136 RMD160 0d96f254b766e2445421fe7536eede370a3e80bc SHA1 bf92315cb39ff927252248fc255cdebfba34e864 SHA256 085226b326bdf928740a2e0d195a726dc5f39af36d6c94a0f6f908708e69efd2
+MISC ChangeLog 3034 RMD160 704c05fef15cbdb5da03d95738611989623d0f31 SHA1 91f219fe15ea8f47123e4c42dcc6cafaa8d41baf SHA256 e0a8bb0e7d2b778fb6cce72e88f5c67bd39b6daf0e4727c8adeca565cb83e26c
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJN9lIMAAoJEHfx8XVYajsfcKMP/RQX8f9x042uRE6hoGUbFRnT
+yLqYZ23xqe6jV1lpsPpY86mACBWxROncu/oCKma5HyVgXeT3Hzc4NKMGJEUU/VKS
+1zY0/T3s7le5gk2UoZqk7UGD5GoW21jKg5Z+fmy7u8RWn1NP2/Q0D2DwnYEn1YeM
+bID6lO2BUT08i2AI8+XXWZWA9Plh1aVPlAPNYGpqQ9TFOF+fyGxjO7qmfSysZOt3
+EIWisuNEmsS8Sf3WG6ncJWgLFsoaRsQU4qmySxWZtFmXR0yG4MXE4SfiwjiQV6WT
+5KHiah6IAFk3+sWSLOJsRp3W6EiPDX/Ux/vvnY5JVDAw8mNxb3XiGFSO3VgyW39j
+BRvSF8Bzzxhz2mIfW4szRDo2v6K5mFY36NuEjwMALUh5NQzWKWTkWA3N9cOqhv/N
+lSpzmh2YDw3thWFfv4YRFKqhsIT2VS3XqYXwgmEtRCAB7qfVgFrrdh13EPpqGXD8
+qlYmE1+vvf5o4Ljc7K9XHYCSTUXZECz44WM1wVN0ks3pnODHyt094TGOp+lFEaPE
+cDqPqXV2XSIvEsMU4XunV1JU+vQbAm3Cx7klvUhyxzuHXLipP4idDmoOTd/dfKMw
+9CuK68Y+n+z76TOYMONv5RpbqQCrqHe4wDX/rYCKEF2+cU6HvhImQmVN+B3GtnRj
+Ue5tG72tzishvL/fsDNa
+=LziF
+-----END PGP SIGNATURE-----
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