Fix linking against gold - bug 369783. EAPI bump.

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

4 files changed, 143 insertions, 8 deletions

diff --git a/net-mail/tpop3d/ChangeLog b/net-mail/tpop3d/ChangeLog
index bfa91436a3c3..5fd484dbdc57 100644
--- a/net-mail/tpop3d/ChangeLog
+++ b/net-mail/tpop3d/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/tpop3d
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/tpop3d/ChangeLog,v 1.30 2010/08/09 08:40:25 pva Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/tpop3d/ChangeLog,v 1.31 2011/06/03 14:39:00 eras Exp $
+
+*tpop3d-1.5.4-r3 (03 Jun 2011)
+
+  03 Jun 2011; Eray Aslan <eras@gentoo.org> +tpop3d-1.5.4-r3.ebuild,
+  +files/tpop3d-1.5.4-gold.patch:
+  Fix linking against gold - bug 369783. EAPI bump.
 
   09 Aug 2010; Peter Volkov <pva@gentoo.org> tpop3d-1.5.4-r2.ebuild,
   metadata.xml:
diff --git a/net-mail/tpop3d/Manifest b/net-mail/tpop3d/Manifest
index 75c3591c205f..08f241b03edd 100644
--- a/net-mail/tpop3d/Manifest
+++ b/net-mail/tpop3d/Manifest
@@ -1,20 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX tpop3d-1.5.3-invalid-user-message.patch 1098 RMD160 57d1cd6c82f2e132e3314fd15eb89f7872ee95d2 SHA1 f505ee60dd663f12208afb055f172b7ce6cba230 SHA256 4f66c0d4fb999250d7f4f0f7024fd081f11f36d13ecc0a729847824160594301
 AUX tpop3d-1.5.3-variable-name-clash.patch 2215 RMD160 7efd8f5dd3d2c2e9c522a171b9267ae32a7b347b SHA1 654a41147f3ff15dd5bb78019ec7dbfdff549df8 SHA256 a475318c968c32cd2c5dfed1ffed28c323802c01913412525496f9cadfdd8293
+AUX tpop3d-1.5.4-gold.patch 730 RMD160 b7c6310806f3a8933debcaefe6f14a627d68c5e8 SHA1 bb89b89c6fdd5f47d70e09a64dcad6b57693477c SHA256 5d143b97e61f2796d44363c710562c5dc6faeefc6ca4c54e59a6331d2d07710b
 AUX tpop3d-1.5.4.init 723 RMD160 cf0bae03c05be242644a4b3db8594eae1b4c2ed6 SHA1 12bdbcdc5745c47bbae42fd8a042cb6896b10208 SHA256 0ca07a32ee4e2a34b2ad050bd02fc88f55b0c3488aa0528957e6cdb7715317d6
 AUX tpop3d-init 688 RMD160 e6741cdfd4c6ade7647d6244d7501190826888c6 SHA1 7c044c5135497ff420d6efbd64eaabf49fd75fe5 SHA256 c4ac3aa1d96134c0bff88edd11afd6317f5fa95ba512b0cb5621f7069ba132ed
 DIST tpop3d-1.5.3.tar.gz 242294 RMD160 d4edadb2a73540672f5aca9642c4730226600841 SHA1 5ce2f9a7f2ea42cca8005bcc71677606f7f14e26 SHA256 48625d1cd65de3ff76eaca7f6bca08984bb84d3823ecfc3e4531db1a5a932bd8
 DIST tpop3d-1.5.4.tar.gz 283888 RMD160 9501138209046e7fdb0c4326fbbdb65afcd688df SHA1 869e673e07dae49b471f71d9217ca9841a3e3d6f SHA256 5ce3650b6f48565d671f4fe8a62e6915d03dc2971bc5e5b2620d8a48e96f3482
 EBUILD tpop3d-1.5.3.ebuild 2635 RMD160 069cbf73b85837c6281a6ec73b3d9947e4ea7e14 SHA1 aaa8ae4172f55300153000675f15f7839be72c7f SHA256 d52bcb1bc92a8467d5e0f8545a2a2ec331e12d6027879907c2418c515ef3a683
 EBUILD tpop3d-1.5.4-r2.ebuild 3218 RMD160 864e9520ac384e07efb581afb2620d126c4eee4a SHA1 9562cc79d2e4dccefe27306d2b3e14a64b20932d SHA256 12bdbb64cc65cf5c92808294ef59815448a2fb6fb6ad76bf81a5c0bfd3ab1998
-MISC ChangeLog 5323 RMD160 578d5330e46e83df21f80bd2cf78dabd3de2d0a5 SHA1 6d32884d8e247ea0ca54e5fb5347c08a7767d8c2 SHA256 22f4196d337a1531ab05337a1a892fe357ff06a01bbce6bdf380124733fd6904
+EBUILD tpop3d-1.5.4-r3.ebuild 3125 RMD160 1412f202a219cc56061b6ff6e6cfdee0cdbdb1f0 SHA1 24c3c7cb7071f7e43afaea46c996e11b91524e7f SHA256 f7a82957fcd747a3407750db49133462249708a32987ab175304be2f33d0a8af
+MISC ChangeLog 5512 RMD160 70131fb536b721ae03c17438c79fbb059bd9e6d5 SHA1 d78d53e2c5c283922064693d161b453a87a0f567 SHA256 f424897bee4c470cd529325ae724b64f2659a7b8aa5dd944482454c155db7a0f
 MISC metadata.xml 639 RMD160 b145f2dda2bfabb0dd9d94bd585f8d147a07bb04 SHA1 63b1589549a5c5580b5a8ad64324c6dfd7ee75e5 SHA256 4c816618d731c7aa8b2902a99e55cabf732dfe55df99b4250b4b46ca97885d2c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkzRzjkACgkQ9/cejkQaxBBULgCeLX+wyFSTXIgkCxUq1a4f/rWy
-lY4An2RBV7pTHy9k4FGD99Xdm5DveoJi
-=92j1
+iQIcBAEBCAAGBQJN6PISAAoJEHfx8XVYajsfx5QQAKo4pr9mbtiVmQtiyztU4ANN
+ZRUJhAlr8EmlT4hD7Kp8aBBoeTmcvvIWic0ZUtPA77eE0r9C1/KMcFvEUKJEwFqQ
+84ttJQTk4/NSHWRM6IgfetCnY4XtIFXl60t6WvdTg5BVVrEyLEMLt+fkcczMdOzc
+yqOWvXboDi6Xv0ZeXEsvFG+jbnouQdnX/n+ebs/CVYpnEA3q0sg2iVRvWEueR+Go
+Bi4IWOq9uJiwrm4C3emKSgNRkzzPFLGyY/Bn+cuYi2TYec1R9i45W/NaHayUl0ub
+mxIDxFCR5C5nNjK6L3q+HfRg60OPpsr9MXCDRD8WGaBBccrQBJghQH2VErGNFxgQ
++5vQnt94MhQJCcbKX4hvnvet7e3AbRrePvWqRqLwMvQdKQ9rY8qmxMKdxlhKMiuy
+p943Mo3RfobFX1NqFS4hVEKfUbf/PUQ8vCQ42ziknpv2bEtlZ+SFoipkg0VCNvlm
+VgkFj499x96OghRY1YzmHgT1CXk28ugKR6KBGkFxg4gb3SW3j0DQ1EzoEDPQCq49
+VDgLLUCqle9mo+x6eVdzUfKgDdmusNDCDiyDdxdk392ZaKqEEgYpr9AG45tlmPrY
+hlqUVv2B6ugh8yh7NmperbnT5wnXDzIcVVQDbhJmnzx2L/mh39YrDRM615BBLcqO
+dbVa3i8/AQB1o+j8Q9vm
+=EgsO
 -----END PGP SIGNATURE-----
diff --git a/net-mail/tpop3d/files/tpop3d-1.5.4-gold.patch b/net-mail/tpop3d/files/tpop3d-1.5.4-gold.patch
new file mode 100644
index 000000000000..149dc9430dd0
--- /dev/null
+++ b/net-mail/tpop3d/files/tpop3d-1.5.4-gold.patch
@@ -0,0 +1,20 @@
+commit 8ed9a7721a406fea7dfc7f0a5eb6e68f3d63a99e
+Author: Eray Aslan <eras@gentoo.org>
+Date:   Fri Jun 3 13:52:55 2011 +0000
+
+    Fix linking against gold
+
+diff --git a/configure.in b/configure.in
+index ac16864..a260652 100644
+--- a/configure.in
++++ b/configure.in
+@@ -587,7 +587,8 @@ fi
+ # OpenSSL
+ if test x"$enable_tls" = x"yes" || test x"$enable_sha1_passwords" = x"yes"
+ then
+-    AC_CHECK_LIB2(ssl, SSL_new, [], AC_MSG_ERROR([[TLS/SHA1 passwords enabled, but can't find libssl]]), -lcrypto)
++    AC_CHECK_LIB(ssl, SSL_new, [], AC_MSG_ERROR([[TLS/SHA1 passwords enabled, but can't find libssl]]))
++    AC_CHECK_LIB(crypto, SHA1_Init, [], AC_MSG_ERROR([[TLS/SHA1 passwords enabled, but can't find libcrypto]]))
+ fi
+ 
+ # GNU dbm
diff --git a/net-mail/tpop3d/tpop3d-1.5.4-r3.ebuild b/net-mail/tpop3d/tpop3d-1.5.4-r3.ebuild
new file mode 100644
index 000000000000..f5295f134c8c
--- /dev/null
+++ b/net-mail/tpop3d/tpop3d-1.5.4-r3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/tpop3d/tpop3d-1.5.4-r3.ebuild,v 1.1 2011/06/03 14:39:01 eras Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="An extensible POP3 server with vmail-sql/MySQL support."
+HOMEPAGE="http://savannah.nongnu.org/projects/tpop3d/"
+SRC_URI="http://download.savannah.nongnu.org/releases/tpop3d/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="authexternal debug drac flatfile gdbm ldap maildir mbox mysql offensive
+	pam passwd perl postgres +sha1 shadow ssl tcpd"
+
+RDEPEND="sha1?		( >=dev-libs/openssl-0.9.6 )
+	ssl?		( >=dev-libs/openssl-0.9.6 )
+	ldap? 		( >=net-nds/openldap-2.0.7 )
+	mysql? 		( virtual/mysql )
+	postgres?	( dev-db/postgresql-server )
+	perl?		( >=dev-lang/perl-5.6.1 )
+	pam? 		( virtual/pam
+				  >=net-mail/mailbase-0.00-r8 )
+	tcpd?		( >=sys-apps/tcp-wrappers-7.6 )"
+
+DEPEND="${RDEPEND}
+	drac?		( mail-client/drac )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gold.patch"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+	local noauth=0
+
+	# Various authentication methods
+	use authexternal && myconf="${myconf} --enable-auth-other"
+	use flatfile	&& myconf="${myconf} --enable-auth-flatfile"
+	use gdbm		&& myconf="${myconf} --enable-auth-gdbm"
+	use ldap		&& myconf="${myconf} --enable-auth-ldap"
+	use mysql		&& myconf="${myconf} --enable-auth-mysql"
+	use pam			|| myconf="${myconf} --disable-auth-pam"
+	use passwd		&& myconf="${myconf} --enable-auth-passwd"
+	use perl		&& myconf="${myconf} --enable-auth-perl"
+	use postgres	&& myconf="${myconf} --enable-auth-pgsql"
+	use shadow		&& myconf="${myconf} --enable-auth-passwd --enable-shadow-passwords"
+
+	use authexternal || use flatfile || use gdbm || use ldap || use mysql ||
+		use	pam || use passwd || use perl || use postgres || use shadow ||
+		noauth=1
+
+	if [[ ${noauth} -eq 1 ]]; then
+		ewarn "None of tpop3d's authentication mechanism USE flags are set."
+		ewarn "As a result tpop3d will be built with /etc/passwd authentication only."
+		myconf="${myconf} --enable-auth-passwd"
+	fi
+
+	# Other optional features
+	use debug		&& myconf="${myconf} --enable-backtrace"
+	use maildir		&& myconf="${myconf} --enable-mbox-maildir"
+	use mbox		|| myconf="${myconf} --disable-mbox-bsd"
+	use offensive	|| myconf="${myconf} --disable-snide-comments"
+	use sha1		|| myconf="${myconf} --disable-sha1-passwords"
+	use ssl			&& myconf="${myconf} --enable-tls"
+	use tcpd		&& myconf="${myconf} --enable-tcp-wrappers"
+
+	# Install mail-client/drac for integration with tpop3d
+	use drac		&& myconf="${myconf} --enable-drac"
+
+	econf ${myconf}
+
+	# Causes crash with "stack smashing attack" on connect, because of bug in
+	# SSP (bug #115285)
+	filter-flags -fstack-protector
+}
+
+src_install() {
+	make DESTDIR="${D}" install
+	dodir /etc/tpop3d
+
+	if use pam ; then
+		dodir /etc/pam.d
+		dosym /etc/pam.d/pop3 /etc/pam.d/tpop3d
+	fi
+
+	newinitd "${FILESDIR}/${PN}-1.5.4.init" tpop3d
+}
+
+pkg_postinst() {
+	elog "Read the tpop3d.conf manpage"
+	elog "Please create /etc/tpop3d/tpop3d.conf to fit your configuration"
+}