Version bump for bug #107679 and fix for CAN-2005-2661.

(Portage version: 2.1_pre4-r1)

5 files changed, 114 insertions, 14 deletions

diff --git a/net-mail/up-imapproxy/ChangeLog b/net-mail/up-imapproxy/ChangeLog
index 271df9a920de..43d0fb87775d 100644
--- a/net-mail/up-imapproxy/ChangeLog
+++ b/net-mail/up-imapproxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/up-imapproxy
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/up-imapproxy/ChangeLog,v 1.9 2005/03/02 20:42:06 ticho Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/up-imapproxy/ChangeLog,v 1.10 2006/02/09 11:15:31 tove Exp $
+
+*up-imapproxy-1.2.4 (09 Feb 2006)
+
+  09 Feb 2006; Torsten Veller <tove@gentoo.org>
+  +files/1.2.4-string-format-fix.patch, +up-imapproxy-1.2.4.ebuild:
+  Version bump for bug #107679 and fix for CAN-2005-2661.
 
 *up-imapproxy-1.2.3 (02 Mar 2005)
 
diff --git a/net-mail/up-imapproxy/Manifest b/net-mail/up-imapproxy/Manifest
index 49a3c281c123..47e62abdeb44 100644
--- a/net-mail/up-imapproxy/Manifest
+++ b/net-mail/up-imapproxy/Manifest
@@ -1,21 +1,52 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5c26ca6b560baac034fb2675e0ceca18 ChangeLog 1406
-MD5 ea4ee0608cee6e1e29d270f0ecfe60e7 up-imapproxy-1.2.3_rc2.ebuild 1280
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 0186588dc3f575df04b591583398a48b up-imapproxy-1.2.2.ebuild 1268
-MD5 2276431ebabbbbf0f01871d6d598ea54 up-imapproxy-1.2.3.ebuild 1200
-MD5 38f4b0c2895270b628b67a4b39e4c169 up-imapproxy-1.2.1.ebuild 1262
+MD5 50353520250ec7e40f7006074d0d373c ChangeLog 1616
+RMD160 a560fd083383a839b8213c87acb8713c8dc3846e ChangeLog 1616
+SHA256 457e70e24a044bac11afd50354583713523939c896be3a4d1e1a043dd79a3c98 ChangeLog 1616
+MD5 41b1d37cf457ac257131d32a89292291 files/1.2.4-string-format-fix.patch 375
+RMD160 9c2a9cd5d70ddbf85fd3495666fc3e9cb0c6d772 files/1.2.4-string-format-fix.patch 375
+SHA256 20d200e39fb497bf98c459b4aa796ba236163b6abbd246ec578e8b0143f69c63 files/1.2.4-string-format-fix.patch 375
 MD5 ee2fd39ec911915225c61fdec088ad97 files/digest-up-imapproxy-1.2.1 70
-MD5 1c1d1a7fbe6d419855693f2f10d235c1 files/digest-up-imapproxy-1.2.3 70
+RMD160 de364ff7b1658c7e0f16b5c9405273e6332bf47f files/digest-up-imapproxy-1.2.1 70
+SHA256 17a0ed77f3164a1aeaeb6785cd5d7f75bc1ecdb35798025424f12af85b26573e files/digest-up-imapproxy-1.2.1 70
 MD5 8ee94f44751f64b541fc86fe406ac87f files/digest-up-imapproxy-1.2.2 70
-MD5 335caa9f1889ac28acefe57e99d6496b files/imapproxy.rc6 505
+RMD160 1fa6af2ca92865343432c10be6c8d0241676ed0b files/digest-up-imapproxy-1.2.2 70
+SHA256 ef53cef86b9d519d2f994484a27c7916a9778633b14eae19da1924c0c1f90597 files/digest-up-imapproxy-1.2.2 70
+MD5 1c1d1a7fbe6d419855693f2f10d235c1 files/digest-up-imapproxy-1.2.3 70
+RMD160 1f6b56d49c6195670be92089784e083d2c4d865a files/digest-up-imapproxy-1.2.3 70
+SHA256 f216a9753f59e2022efb2eb8b6ec354e56af4cd0fa3a2d6bc586b2a28565f2a3 files/digest-up-imapproxy-1.2.3 70
 MD5 c985d47254e62579a2ec7335e1882a54 files/digest-up-imapproxy-1.2.3_rc2 73
+RMD160 5dcbceda9da0e7277b55495af8efffa2c0cb2929 files/digest-up-imapproxy-1.2.3_rc2 73
+SHA256 1749a76210f9c43867fba6929f8edb0c8aaa54a631dbee79d3f1e09f6836d8d5 files/digest-up-imapproxy-1.2.3_rc2 73
+MD5 863fbf2306f1912d3dcf9c9af90381d4 files/digest-up-imapproxy-1.2.4 256
+RMD160 2e391f43001723aa76fd1c360fe6f7f6832e833b files/digest-up-imapproxy-1.2.4 256
+SHA256 d2bb59ecb04baf5f52bf70812c9fbba9b903c3452c48648e25ef72435f0a5b73 files/digest-up-imapproxy-1.2.4 256
+MD5 335caa9f1889ac28acefe57e99d6496b files/imapproxy.rc6 505
+RMD160 f217612eb25c3dab81ce6d206f2a0681169db18d files/imapproxy.rc6 505
+SHA256 b0d2369d4f311d37834145887e358c98e65451505985e2457dae9609f72579dd files/imapproxy.rc6 505
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
+SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
+MD5 38f4b0c2895270b628b67a4b39e4c169 up-imapproxy-1.2.1.ebuild 1262
+RMD160 243d13686b4b1c017388cc59607f7b270f3b61db up-imapproxy-1.2.1.ebuild 1262
+SHA256 fc210f31bbb5813b904449c0360356f1f279ede587f9ff2af9b064fb4237a1b6 up-imapproxy-1.2.1.ebuild 1262
+MD5 0186588dc3f575df04b591583398a48b up-imapproxy-1.2.2.ebuild 1268
+RMD160 193667adc54470a5515450b21d2f2a34062bb006 up-imapproxy-1.2.2.ebuild 1268
+SHA256 6f08668f1b9140334e84c945133ea6af5d45e64f66835d0e9624cec6c60f495f up-imapproxy-1.2.2.ebuild 1268
+MD5 2276431ebabbbbf0f01871d6d598ea54 up-imapproxy-1.2.3.ebuild 1200
+RMD160 4e95a8b4ca04beedf23c0d82784e2e91588796d5 up-imapproxy-1.2.3.ebuild 1200
+SHA256 c3e3cffee9261d82a36400c37d81f6ba7874efbf8ad99cee2f51dbdec5534d69 up-imapproxy-1.2.3.ebuild 1200
+MD5 ea4ee0608cee6e1e29d270f0ecfe60e7 up-imapproxy-1.2.3_rc2.ebuild 1280
+RMD160 18463e6fa084da908955eed7031c60cfcdc49a4e up-imapproxy-1.2.3_rc2.ebuild 1280
+SHA256 2239c1451cf0bda494e1166e929bfca73eeb77f6bd0a90beadbc979fd72ef3c9 up-imapproxy-1.2.3_rc2.ebuild 1280
+MD5 02bfbde6711495cc489869fa6c55e1a9 up-imapproxy-1.2.4.ebuild 1278
+RMD160 ea672a6811b93078b77c7b311b8595f3a0f0237a up-imapproxy-1.2.4.ebuild 1278
+SHA256 6b0f0ba6b331d10355cf9c1bd443db81cb7bc04c7a834bf3e0c4e148edb488b5 up-imapproxy-1.2.4.ebuild 1278
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFCJiUpQlM6RnzZP+IRAg0JAJ93P7qs2dTJV/3JU9J5v3VrGA730gCdFSeJ
-rVNqIkL7tPF4Wh6K8nqEknU=
-=I0DS
+iD8DBQFD6yQtV3J2n04EauwRAq8nAJ0Zi20wuBSceM8GCrjduv7BGbfl9wCeMsm4
+/XLRwrFqACOXPqWJ/hxn8KI=
+=e5cj
 -----END PGP SIGNATURE-----
diff --git a/net-mail/up-imapproxy/files/1.2.4-string-format-fix.patch b/net-mail/up-imapproxy/files/1.2.4-string-format-fix.patch
new file mode 100644
index 000000000000..53db2f61494b
--- /dev/null
+++ b/net-mail/up-imapproxy/files/1.2.4-string-format-fix.patch
@@ -0,0 +1,13 @@
+Fix for CAN-2005-2661, DSA 852-1
+http://lists.andrew.cmu.edu/pipermail/imapproxy-info/2005-October/000481.html
+--- up-imapproxy-1.2.4.orig/src/main.c
++++ up-imapproxy-1.2.4/src/main.c
+@@ -812,7 +812,7 @@
+ 	exit( 1 );
+     }
+     
+-    sprintf( DestBuf, CP );
++    sprintf( DestBuf, "%s", CP );
+     
+     /*
+      * initially assume that the server doesn't support UNSELECT.
diff --git a/net-mail/up-imapproxy/files/digest-up-imapproxy-1.2.4 b/net-mail/up-imapproxy/files/digest-up-imapproxy-1.2.4
new file mode 100644
index 000000000000..e103193f2dbe
--- /dev/null
+++ b/net-mail/up-imapproxy/files/digest-up-imapproxy-1.2.4
@@ -0,0 +1,3 @@
+MD5 ad68dd2258255ac6ef87165f518390e9 up-imapproxy-1.2.4.tar.gz 131331
+RMD160 f763af637c3988d01a3f67d7437516327962a4e3 up-imapproxy-1.2.4.tar.gz 131331
+SHA256 f109a9a9e195154be8c790f458779529e00175e4824a3686980e8bc3533f1d86 up-imapproxy-1.2.4.tar.gz 131331
diff --git a/net-mail/up-imapproxy/up-imapproxy-1.2.4.ebuild b/net-mail/up-imapproxy/up-imapproxy-1.2.4.ebuild
new file mode 100644
index 000000000000..8486da68df3b
--- /dev/null
+++ b/net-mail/up-imapproxy/up-imapproxy-1.2.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2006 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.4.ebuild,v 1.1 2006/02/09 11:15:31 tove Exp $
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="kerberos ssl tcpd"
+
+DEPEND=">=sys-libs/ncurses-5.1
+	kerberos? ( virtual/krb5 )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+	epatch "${FILESDIR}"/${PV}-string-format-fix.patch
+	sed -i -e 's:in\.imapproxyd:imapproxyd:g'  \
+		README Makefile.in include/imapproxy.h || die "sed failed"
+}
+
+src_compile() {
+	econf \
+		$(use_with kerberos krb5) \
+		$(use_with ssl openssl) \
+		$(use_with tcpd libwrap) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	dosbin bin/imapproxyd bin/pimpstat || die "dosbin failed"
+
+	insinto /etc
+	doins scripts/imapproxy.conf || die "doins failed"
+
+	newinitd "${FILESDIR}"/imapproxy.rc6 imapproxy || die "initd failed"
+
+	dodoc ChangeLog README README.known_issues README.ssl
+}