Version bump - bug#309291. Respect LDFLAGS - bug #337355. EAPI bump. Remove old

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

4 files changed, 71 insertions, 20 deletions

diff --git a/net-mail/up-imapproxy/ChangeLog b/net-mail/up-imapproxy/ChangeLog
index deca027c418a..2377c4d7652d 100644
--- a/net-mail/up-imapproxy/ChangeLog
+++ b/net-mail/up-imapproxy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/up-imapproxy
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/up-imapproxy/ChangeLog,v 1.25 2009/09/12 14:12:56 vostorga Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/up-imapproxy/ChangeLog,v 1.26 2011/06/05 17:56:29 eras Exp $
+
+*up-imapproxy-1.2.7 (05 Jun 2011)
+
+  05 Jun 2011; Eray Aslan <eras@gentoo.org> -up-imapproxy-1.2.7_rc2.ebuild,
+  +up-imapproxy-1.2.7.ebuild, +files/up-imapproxy-1.2.7-ldflags.patch:
+  Version bump - bug#309291. Respect LDFLAGS - bug #337355. EAPI bump. Remove
+  old.
 
   12 Sep 2009; Víctor Ostorga <vostorga@gentoo.org> +files/imapproxyd.8,
   +files/pimpstat.8:
diff --git a/net-mail/up-imapproxy/Manifest b/net-mail/up-imapproxy/Manifest
index eb440a7eadd3..a2340c1c38fb 100644
--- a/net-mail/up-imapproxy/Manifest
+++ b/net-mail/up-imapproxy/Manifest
@@ -1,10 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX imapproxy.initd 514 RMD160 fbcc8967435697d6936d92ce61afea58e5de2eff SHA1 1b9fca150cb64611e7ac8299ce5d422eeaf3967a SHA256 8c64f726f44f80e655ad4bd1ff636acef3053f1a69516a1fc0073fba45d3b569
 AUX imapproxyd.8 1984 RMD160 e6b87afe4763e50759fa5de7619952744217034a SHA1 2441fd8a8560eae86a13e9b5522be66a8bf24d21 SHA256 b1fcedc62f40664c6e820b2cc0e967d45aefa8334cc373dcf206bceba84beba2
 AUX pimpstat.8 836 RMD160 463e59586cf2ab98978bd476d3b5b057d13e4815 SHA1 5a2e00a3ddb28a28fa465a2053776d4b4bcc5256 SHA256 3bd8bb0ed654eda55123b5fc7e4b1a1bac4dfd822e59a91805cd5eab652e4cd8
 AUX up-imapproxy-1.2.6-debian_patchset_5_and_security_fix.patch 3874 RMD160 bc0e51ea8ca2ec7388556fa320578740a45e314e SHA1 752d819130f2bb666609d2061c6c0c849132b52d SHA256 60c92d5106d176fd2808b1a93df7886187200fcbc66ac5984400fe6af5346531
+AUX up-imapproxy-1.2.7-ldflags.patch 521 RMD160 ab8089ecfb08d6e4564f7c8b423d09a26f7ccc29 SHA1 87ef029c24e41e29e1052f4ca53cb4988830bf9d SHA256 fb72b47b7c90c27fe07850a07cc51c2115c67b5973aa8b1f86419b4da3cd076a
+DIST squirrelmail-imap_proxy-1.2.7.tar.bz2 111651 RMD160 ddecd0b612423d6e9a512c7194e8caf66e91d7d5 SHA1 58fed946eb61b9a42ac7d9f16abe10278268d3ee SHA256 dd8ad40e3e457bd76fc9f19ef1c0d89911e3e3cc722415d1183f765dcac1ae48
 DIST up-imapproxy-1.2.6.tar.gz 134745 RMD160 4613acd3fcacdc40905ec8692afd3a4e9563258c SHA1 75f497e3fda44ff1526c46ac93e5c863bf6e0963 SHA256 2f5e841bc6c84799f890d24b984726efb7cce26c2ad95923864ddf0353fa3b01
-DIST up-imapproxy-1.2.7rc2.tar.gz 136832 RMD160 3269329f020d894cb492986d36458c0460eaab0f SHA1 b26f9823b4e7aeba74ce60538c4d517a92055c18 SHA256 e2f5e1631f337a2940a85690467a084de4205c029e8427d9aee4a8521b97169a
 EBUILD up-imapproxy-1.2.6.ebuild 1299 RMD160 4e9bf2f508afa4e5051de178a9b414b89201025b SHA1 14dd408bdd530190ef710d42fc0456a6f6510983 SHA256 2b9af8fcc18c47a11c2e419517023f4cd77dc5a47345a5a46b81a2effe49c48a
-EBUILD up-imapproxy-1.2.7_rc2.ebuild 1424 RMD160 4a658864be3ad8a4bd971fe0575de9a72b8b4150 SHA1 ce4aefabfdd6eb7dff12429e81121882e9a61711 SHA256 5bab8bbca7cc6f4e38f6f774d06754fe45e4e535e6ab6b1fdc2669768e2f297e
-MISC ChangeLog 3709 RMD160 ed37bf6ed6cfb47f70356f859761b01192ee48c0 SHA1 f4fb8b33699d74d7d56ff0735b1c5e3ce2e5b632 SHA256 cec7b7469540e99d4babb4d66d8b8f9b0327d9c384a62a53f2526fe351e50130
+EBUILD up-imapproxy-1.2.7.ebuild 1470 RMD160 d00dd858e2570c3fc56e9373dcca160bfe2fcc49 SHA1 4534234eedfa63c1de40b6ec9f3479280e31ba2d SHA256 648c132565c217a75ca68ec8f3ece9ecef81e67625d21da61e379829b6bf249b
+MISC ChangeLog 3973 RMD160 20a4513903d050fa50693668447f79fb0857bf8f SHA1 e0aa2dbf1da0aad226e96d1eae5a0638140f4551 SHA256 a7053a192f8ec8a24cc4658dd80b17d37a18caf31b1840113637eb82398b544f
 MISC metadata.xml 163 RMD160 9d7831690071ef6a890ce066c38c9c4e851a2107 SHA1 6dcd4fa8a9b5cfcc7c0ae80c09e43395fe8e71a7 SHA256 38427b537ef2f561a685876ae3a7799382a1bf7fabef6c2d8765ca9d05056aa2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJN68NcAAoJEHfx8XVYajsf2ykP/0U2cT5HnfxzVDrdHExO8+1p
+RipJuJagQSnccEuta3x1rEtIHoG74zML0rNms0kBl5yQ7Njrdhp0m0CrtXP5I4Lg
+BIF3z7Fa000cu0w/+m5nGrKkQmMZ96UNtdQvKu+ic55T7yeFPrKaEOEpOo0rOD9g
+kGs0w8vAHmp4yGjQsc8JJtzPXszAPejDJHszK+dExE+cSrQV6qts4UYowLZFRZ1n
+SxTbQUEWNnPlCrpIUUqrypkzwTOj1v1O0ilx1esUmoM15oHU62xnSyP8zIRhahI/
+fYb8HAUf8ogC+lpqkYBTN4xw8c6dejC4Lp9Tef9zaeG8JPkVssrZaO0wDrl1TojA
+TRU/i+/neY/ohH6lRzPxw3WxT986/8yPUIxWMqB6/xIln7qwupxqWaYwECb+VTNT
+vBt3saSR4dkmIKMywDvZpC+b1fp7xgmHednxMpcMxJBC4DsW9GYVAHH7k9RDBfNN
+CDLsWjS0cZVzi2eYFS2xK+Y+JDxs/fV4jXy7L+4Nx+qpNiXUbWA3UcoBcLCl6ltN
+i3aN/6jVjQjzOCP+EqjOMfBNfj9wd8qFlaAzL/MgleVIE6R67lvG1O5JULz0QxUm
+q8EPXO/5YcYg8oZoqMKbNEqY+Yqi7oaaclrDGzxA13t0/M/f/SnNUjBztNVTlEho
+8OgibpcCERcWfPXcu7kI
+=NrHn
+-----END PGP SIGNATURE-----
diff --git a/net-mail/up-imapproxy/files/up-imapproxy-1.2.7-ldflags.patch b/net-mail/up-imapproxy/files/up-imapproxy-1.2.7-ldflags.patch
new file mode 100644
index 000000000000..4ba1b6b725e5
--- /dev/null
+++ b/net-mail/up-imapproxy/files/up-imapproxy-1.2.7-ldflags.patch
@@ -0,0 +1,19 @@
+commit 98876519b581c0427b81d772f56b25ad3d0121df
+Author: Eray Aslan <eras@gentoo.org>
+Date:   Sun Jun 5 19:43:41 2011 +0300
+
+    respect LDFLAGS
+
+diff --git a/Makefile.in b/Makefile.in
+index 1b235b8..8ac1e4f 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -70,7 +70,7 @@ $(XYD_BIN): $(XYD_OBJ)
+ 	$(CC) -o $@ $(XYD_OBJ) $(LDFLAGS) $(XYD_LIB)
+ 
+ $(TAT_BIN): $(TAT_OBJ)
+-	$(CC) -o $@ $(TAT_OBJ) $(TAT_LIB)
++	$(CC) -o $@ $(TAT_OBJ) $(LDFLAGS) $(TAT_LIB)
+ 
+ clean:
+ 	rm -f ./src/core  $(XYD_OBJ) $(TAT_OBJ) $(XYD_BIN) $(TAT_BIN)
diff --git a/net-mail/up-imapproxy/up-imapproxy-1.2.7_rc2.ebuild b/net-mail/up-imapproxy/up-imapproxy-1.2.7.ebuild
index fafd20d4c731..c273306bc09e 100644
--- a/net-mail/up-imapproxy/up-imapproxy-1.2.7_rc2.ebuild
+++ b/net-mail/up-imapproxy/up-imapproxy-1.2.7.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/up-imapproxy/up-imapproxy-1.2.7_rc2.ebuild,v 1.3 2009/06/01 12:12:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/up-imapproxy/up-imapproxy-1.2.7.ebuild,v 1.1 2011/06/05 17:56:29 eras Exp $
 
-EAPI=2
+EAPI=4
+
+inherit eutils
 
 DESCRIPTION="Proxy IMAP transactions between an IMAP client and an IMAP server."
 HOMEPAGE="http://www.imapproxy.org/"
-SRC_URI="http://www.imapproxy.org/downloads/${P/_}.tar.gz"
+SRC_URI="mirror://sourceforge/squirrelmail/squirrelmail-imap_proxy-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-# This version has issues, don't keyword wrt #272044, Comment #1, by Holger
-# Hoffstätte. But do so for next release candidate.
-KEYWORDS=""
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="kerberos ssl +tcpd"
 
 RDEPEND="sys-libs/ncurses
@@ -22,11 +22,19 @@ RDEPEND="sys-libs/ncurses
 DEPEND="${RDEPEND}
 	sys-apps/sed"
 
-S=${WORKDIR}/${P/_}
+S=${WORKDIR}/squirrelmail-imap_proxy-${PV}
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}"-ldflags.patch
 	sed -i -e 's:in\.imapproxyd:imapproxyd:g' \
 		README Makefile.in include/imapproxy.h || die "sed failed"
+
+	#buffer oveflow
+	#http://lists.andrew.cmu.edu/pipermail/imapproxy-info/2010-June/000874.html
+	sed -i \
+		-e "/define BUFSIZE/s/4096/8192/" \
+		-e "/define MAXPASSWDLEN/s/64/8192/" \
+		include/imapproxy.h
 }
 
 src_configure() {
@@ -37,19 +45,15 @@ src_configure() {
 }
 
 src_install() {
-	dosbin bin/imapproxyd bin/pimpstat || die "dosbin failed"
+	dosbin bin/imapproxyd bin/pimpstat
 
 	insinto /etc
-	doins scripts/imapproxy.conf || die "doins failed"
+	doins scripts/imapproxy.conf
 
-	newinitd "${FILESDIR}"/imapproxy.initd imapproxy || die "newinitd failed"
+	newinitd "${FILESDIR}"/imapproxy.initd imapproxy
 
 	dodoc ChangeLog README README.known_issues
 	use ssl && dodoc README.ssl
 
 	doman "${FILESDIR}"/*.8
 }
-
-pkg_postinst() {
-	einfo "Installed manpages are for version 1.2.6."
-}