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

(Portage version: 2.1.9.50/cvs/Linux x86_64)

3 files changed, 47 insertions, 17 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/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."
-}