Bump imapsync and remove old version wrt #84186. Reported by Thomas Seifert <ts77@gmx.de>

(Portage version: 2.0.51-r15)

7 files changed, 83 insertions, 18 deletions

diff --git a/net-mail/imapsync/ChangeLog b/net-mail/imapsync/ChangeLog
index 4852a5e4ebdd..6061b8fecda2 100644
--- a/net-mail/imapsync/ChangeLog
+++ b/net-mail/imapsync/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/imapsync
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/imapsync/ChangeLog,v 1.1 2005/01/31 21:12:49 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/imapsync/ChangeLog,v 1.2 2005/03/06 00:41:19 ferdy Exp $
+
+*imapsync-1.121 (06 Mar 2005)
+
+  06 Mar 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/imapsync-gentoo.patch, +files/imapsync-ssl.patch,
+  -imapsync-1.118.ebuild, +imapsync-1.121.ebuild:
+  Bump imapsync and remove old version wrt #84186. Reported by Thomas Seifert
+  <ts77@gmx.de>
 
 *imapsync-1.118 (31 Jan 2005)
 
diff --git a/net-mail/imapsync/Manifest b/net-mail/imapsync/Manifest
index 225453a78bcd..a9223888f102 100644
--- a/net-mail/imapsync/Manifest
+++ b/net-mail/imapsync/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0a6beb341fd60c618ffeb730fe1ba6a4 imapsync-1.118.ebuild 1177
+MD5 4cf83b845d1f2049cf0f2f7cad7bf95c imapsync-1.121.ebuild 1178
 MD5 1362d9d4768241888598e789232a4ffc ChangeLog 420
 MD5 86c229fe394877d2c6a26aa5367bc697 metadata.xml 253
-MD5 3cd0015414e2d6306c52c1cead48581c files/digest-imapsync-1.118 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB/qBm5FrxP71izLARAuxSAKCo8BQvNOh1r6lNjbE9S6V2wlQumgCg0+J3
-wr9dqXXu8ObUfi+wGCJ505I=
-=y521
------END PGP SIGNATURE-----
+MD5 bcadd4a531fb4724efca8fcf954cbb24 files/imapsync-gentoo.patch 933
+MD5 162952d278fd23763fa7810cad178625 files/digest-imapsync-1.121 62
+MD5 f747562d20fec4049e3a428b63adc982 files/imapsync-ssl.patch 991
diff --git a/net-mail/imapsync/files/digest-imapsync-1.118 b/net-mail/imapsync/files/digest-imapsync-1.118
deleted file mode 100644
index 3d702e3615f8..000000000000
--- a/net-mail/imapsync/files/digest-imapsync-1.118
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4eebd7da774f95706655a89788c1ec83 imapsync-1.118.tgz 40959
diff --git a/net-mail/imapsync/files/digest-imapsync-1.121 b/net-mail/imapsync/files/digest-imapsync-1.121
new file mode 100644
index 000000000000..0f5810138327
--- /dev/null
+++ b/net-mail/imapsync/files/digest-imapsync-1.121
@@ -0,0 +1 @@
+MD5 1d0551bc6987204621d467e1e455e969 imapsync-1.121.tgz 41591
diff --git a/net-mail/imapsync/files/imapsync-gentoo.patch b/net-mail/imapsync/files/imapsync-gentoo.patch
new file mode 100644
index 000000000000..245cf1d869ef
--- /dev/null
+++ b/net-mail/imapsync/files/imapsync-gentoo.patch
@@ -0,0 +1,39 @@
+diff -Naur imapsync-1.118/Makefile imapsync-1.76_gentoo/Makefile
+--- imapsync-1.118/Makefile	2004-02-23 01:09:49.000000000 +0000
++++ imapsync-1.76_gentoo/Makefile	2004-02-24 03:51:03.000000000 +0000
+@@ -2,6 +2,10 @@
+ # $Id: imapsync-gentoo.patch,v 1.1 2005/03/06 00:41:19 ferdy Exp $	
+ 
+ TARGET=imapsync
++ifdef $(DESTDIR)
++else
++	DESTDIR=/usr/bin/
++endif
+ 
+ .PHONY: help usage all
+ 
+@@ -54,8 +58,8 @@
+ .PHONY: install dist
+ 
+ install: testp
+-	cp $(TARGET) /usr/bin/$(TARGET)
+-	chmod 755 /usr/bin/$(TARGET)
++	cp $(TARGET) $(DESTDIR)$(TARGET)
++	chmod 755 $(DESTDIR)$(TARGET)
+ 
+ DIST_NAME=$(TARGET)-$(VERSION)
+ DIST_FILE=$(DIST_NAME).tgz
+@@ -80,6 +84,13 @@
+ clean_dist:
+ 	rm -f dist/*
+ 
++dep:
++	perl -MCPAN -e "install 'Getopt::Long';"
++	perl -MCPAN -e "install 'Parse::RecDescent';"
++	perl -MCPAN -e "install 'Mail::IMAPClient';"
++	perl -MCPAN -e "install 'Digest::MD5';"
++	perl -MCPAN -e "install 'Digest::HMAC';"
++
+ # Local goals
+ 
+ .PHONY: lfo
diff --git a/net-mail/imapsync/files/imapsync-ssl.patch b/net-mail/imapsync/files/imapsync-ssl.patch
new file mode 100644
index 000000000000..30d697a5f56c
--- /dev/null
+++ b/net-mail/imapsync/files/imapsync-ssl.patch
@@ -0,0 +1,27 @@
+--- patches/imapsync-ssl.orig.diff	2005-01-28 11:52:47.307847624 -0800
++++ patches/imapsync-ssl.diff	2005-01-28 11:58:18.738462512 -0800
+@@ -1,4 +1,4 @@
+---- imapsync	Fri Jul  9 11:08:43 2004
++--- imapsync-ssl	Fri Jul  9 11:08:43 2004
+ +++ imapsync-ssl	Tue Aug 31 12:13:06 2004
+ @@ -33,9 +33,9 @@ $Revision: 1.1 $
+    imapsync --help
+@@ -45,8 +45,8 @@
+  $user2 || missing_option("--user2");
+  $password2 || $passfile2 || missing_option("--passfile2 or --password2");
+  $password2 = (defined($passfile2)) ? firstline ($passfile2) : $password2;
+-@@ -402,38 +404,56 @@ unless ($md5_supported) {
+- $timestart = time();
++@@ -402,39 +404,57 @@ unless ($md5_supported) {
++ $timebefore = $timestart;
+  
+  $debugimap and print "From connection\n";
+ -$from = login_imap($host1, $port1, $user1, $password1, $debugimap, $timeout);
+@@ -86,6 +86,7 @@
+ +	$imap->State($imap->Connected());
+ +
+  	$imap->Fast_io(1);
++ 	$imap->Buffer(65536);
+  	$imap->Uid(1);
+  	$imap->Peek(1);
+  	$imap->Debug($debugimap);
diff --git a/net-mail/imapsync/imapsync-1.118.ebuild b/net-mail/imapsync/imapsync-1.121.ebuild
index 3278353beeef..cc2a1c4ad75c 100644
--- a/net-mail/imapsync/imapsync-1.118.ebuild
+++ b/net-mail/imapsync/imapsync-1.121.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/imapsync/imapsync-1.118.ebuild,v 1.1 2005/01/31 21:12:49 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/imapsync/imapsync-1.121.ebuild,v 1.1 2005/03/06 00:41:19 ferdy Exp $
 
 inherit eutils
 
@@ -22,20 +22,19 @@ RDEPEND="${DEPEND}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.patch || \
+	epatch ${FILESDIR}/${PN}-gentoo.patch || \
 		die "failed to patch ${P}-gentoo.patch"
 
 	if use ssl; then
 		echo $PWD
 		cp imapsync imapsync-ssl
-		epatch ${FILESDIR}/${P}-ssl.patch || die "patch failed"
+		epatch ${FILESDIR}/${PN}-ssl.patch || die "patch failed"
 		epatch ${S}/patches/imapsync-ssl.diff || \
 			die "failed to patch imapsync-ssl.diff"
 	fi
 }
 
 src_install() {
-
 	make install DESTDIR=${D} || die "make failed"
 	#into /usr
 	dobin imapsync imapsync-ssl