Non-maintainer commit: Version bump for security bug 285052. Removing

vulnerable versions. Adding USE condition on the patch in SRC_URI. Fixing
homepage, closes bug 257694.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 22 insertions, 92 deletions

diff --git a/www-apps/horde-webmail/ChangeLog b/www-apps/horde-webmail/ChangeLog
index bd6b3eb39513..11a3eb0bbf8e 100644
--- a/www-apps/horde-webmail/ChangeLog
+++ b/www-apps/horde-webmail/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-apps/horde-webmail
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-webmail/ChangeLog,v 1.17 2008/10/30 14:38:40 wrobel Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-webmail/ChangeLog,v 1.18 2009/09/16 15:00:44 a3li Exp $
+
+*horde-webmail-1.2.4 (16 Sep 2009)
+
+  16 Sep 2009; Alex Legler <a3li@gentoo.org> -horde-webmail-1.0.8.ebuild,
+  -horde-webmail-1.1.3.ebuild, -horde-webmail-1.2.ebuild,
+  +horde-webmail-1.2.4.ebuild:
+  Non-maintainer commit: Version bump for security bug 285052. Removing
+  vulnerable versions. Adding USE condition on the patch in SRC_URI. Fixing
+  homepage, closes bug 257694.
 
 *horde-webmail-1.2 (30 Oct 2008)
 
diff --git a/www-apps/horde-webmail/Manifest b/www-apps/horde-webmail/Manifest
index b94f49462928..a6a3fd1ff0c8 100644
--- a/www-apps/horde-webmail/Manifest
+++ b/www-apps/horde-webmail/Manifest
@@ -3,20 +3,15 @@ Hash: SHA1
 
 AUX postinstall-en.txt.kolab 457 RMD160 d7a8b6ef476e89d6259432d4721517e41d4235e9 SHA1 ce59319e2d6e9f1bcb1428cd94929465dc797c49 SHA256 5c9d22026316f7813f071e4e82bd22c7d8bb1258ad129c05a16aef5bc39b09d3
 AUX reconfig.kolab 345 RMD160 67166d00cd941287e5781e9a3a0f6a5473aad5b9 SHA1 86b8f05b853feef9b313dcf792f044e6472d3e50 SHA256 c039c61a590a5ebf57f88a27b38d94fb08bfc3d929d3f04b40b4338185be512c
-DIST horde-webmail-1.0.8.tar.gz 18816704 RMD160 07f052a5c36178f3b51fbcde137a0fbe1937f213 SHA1 4d0550e9a6281de24964ca0d0581a35e2f977d09 SHA256 656aaa2e8f8d2863e634edb90ef866121a61853822a442173c3c2d9fe23b60e1
-DIST horde-webmail-1.1.3.tar.gz 26043516 RMD160 d636cece6b9d9644503b728ea7c0264664c9004b SHA1 9c5ebeddfa0d94903888030aa3d2fb108f59f29d SHA256 1ac98173193b437e3fc30c60d5b2dd19efc0aae30559d002de7e7d83039df5c6
-DIST horde-webmail-1.2.tar.gz 27160844 RMD160 f259ff4da3822e0ec327cbc57c50c8f18511c033 SHA1 d46bc7a6231a1b598cd2809903dd0cf9e6e6b4e1 SHA256 2f26543228777bbeeb80341f39d7b23d446bbbfab5938752ff9b327ad8617997
-DIST horde-webmail-patches-1.1.3-r2.tar.bz2 34848 RMD160 9d80f8d4b5314de61fb8abe903098a945f98f88d SHA1 730ef1f06025d23b9c9e217e3f9c7dadc5ef2df4 SHA256 2416fd6db529b1338ca189c31de55f24d63582aaafa2369ad0b593109e21d661
+DIST horde-webmail-1.2.4.tar.gz 28247126 RMD160 d542aed4c05c10060f1543e5341b8175854566c9 SHA1 b78a5c736e2388d50ae3276ddb27eacf4d8fbf13 SHA256 20dc3e25faed240f4010fcaf9e086773b892f3dad90fa2b7fc493338f122b95a
 DIST horde-webmail-patches-1.2-r1.tar.bz2 49464 RMD160 4123046eaee780561459e6a5994865673dd72f64 SHA1 c243adb7632bee0b3e7e841db6e2d5891bcd00b6 SHA256 d0b7651a488fb9c7690b431418a9359649dc99e4d39b13f959df91091e5c49bd
-EBUILD horde-webmail-1.0.8.ebuild 882 RMD160 57ee83e3313552904313c9d82677b7c70a154ebc SHA1 5eb22d0962ed5806596d9eeb6c46c52ff9eaa34d SHA256 9994fb20306ae6ba5bb1acb3efe984b426586e0e92e5cd5267ebf99d31bfa59f
-EBUILD horde-webmail-1.1.3.ebuild 1265 RMD160 7f0400c0fc02887543d2cd82d568ab66f43187c1 SHA1 0b3f393a5f4421a6c104ff382687ad53c2203437 SHA256 b25d93988fbe9469ed9cc4bec42c8228a921222298f0a279a133593db336afba
-EBUILD horde-webmail-1.2.ebuild 1263 RMD160 fe65a2b3e1dc37725bac03008547ed4dc48cb852 SHA1 c2d3a97516d4f2ec2e14c2dde65a65055b07f4cb SHA256 d5dba9dfcaa92f0cbd29404db3a866709a9ba69e5c83e3e718987e8d06cf1ba9
-MISC ChangeLog 3155 RMD160 83a65b42bd3d4f24e13047ba9277b302f245f2f6 SHA1 ac1d187b8ebd4a0cb99843b86365328a7bc1e440 SHA256 56116756b40e1461d4f774fab943f4a17d6b686547b4e73bbd72ace1316345e7
+EBUILD horde-webmail-1.2.4.ebuild 1313 RMD160 71225dfc5d4daa097263fd28588b0bf605ccca38 SHA1 1a515511bd442d6c87efc1a11177e09f381d0d27 SHA256 0104685ceabfa2f7bca897767918ded115182fe47b54737828af8e2ce1b6c531
+MISC ChangeLog 3532 RMD160 0faef855295406da0722dacbb0b914fe3afe5410 SHA1 d7d7b5de330277cc7d03a0303b70ea6856a64746 SHA256 847b4981845ff40a0d31b3404b44048be358183fd057756e4cbe25aab65b58e1
 MISC metadata.xml 222 RMD160 d9c2c7755b485c0eaec7406a4cdfbcfba57e52c4 SHA1 4b3d1ec40a15e2afe95bab9ff788ce192709c795 SHA256 65c1cee3df8e3049df63ed62609eb177e26e0311bf358147651f7473ec5e0603
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkkJx74ACgkQEEcxCpcDQ74+BwCdFloQbWkFwysHLV55PVc+Fguo
-6y8An11B94mLO4PvMAda5d9yAh1+CkIP
-=9bwj
+iEYEARECAAYFAkqw/acACgkQaGsKqSU7eCTeGQCdEgcRXub8AZxFeAsq0QMDVyEj
+VxgAn1kSvrwNKNOmkQc9JwtKBVw0ZowT
+=ySx3
 -----END PGP SIGNATURE-----
diff --git a/www-apps/horde-webmail/horde-webmail-1.0.8.ebuild b/www-apps/horde-webmail/horde-webmail-1.0.8.ebuild
deleted file mode 100644
index 6d14b4b01969..000000000000
--- a/www-apps/horde-webmail/horde-webmail-1.0.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-webmail/horde-webmail-1.0.8.ebuild,v 1.1 2008/09/15 14:03:41 wrobel Exp $
-
-HORDE_PN=${PN}
-
-HORDE_APPLICATIONS="dimp imp ingo kronolith mimp mnemo nag turba"
-
-inherit horde
-
-DESCRIPTION="browser based communication suite"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="crypt mysql postgres ldap oracle"
-
-DEPEND=""
-RDEPEND="!www-apps/horde
-	crypt? ( app-crypt/gnupg )
-	virtual/php
-	>=www-apps/horde-pear-1.3
-	dev-php/PEAR-Log
-	dev-php/PEAR-Mail_Mime
-	dev-php/PEAR-DB"
-
-pkg_setup() {
-	HORDE_PHP_FEATURES="
-		imap ssl session xml nls iconv gd ftp
-		$(use ldap && echo ldap) $(use oracle && echo oci8)
-		$(use crypt && echo crypt) $(use mysql && echo mysql mysqli)
-		$(use postgres && echo postgres)
-	"
-	horde_pkg_setup
-}
diff --git a/www-apps/horde-webmail/horde-webmail-1.1.3.ebuild b/www-apps/horde-webmail/horde-webmail-1.1.3.ebuild
deleted file mode 100644
index a5b36a494201..000000000000
--- a/www-apps/horde-webmail/horde-webmail-1.1.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-webmail/horde-webmail-1.1.3.ebuild,v 1.1 2008/09/15 14:03:41 wrobel Exp $
-
-HORDE_PN=${PN}
-
-HORDE_APPLICATIONS="dimp imp ingo kronolith mimp mnemo nag turba"
-
-inherit horde
-
-DESCRIPTION="browser based communication suite"
-
-HORDE_PATCHSET_REV=2
-
-SRC_URI="${SRC_URI}
-	http://files.pardus.de/horde-webmail-patches-${PV}-r${HORDE_PATCHSET_REV}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="crypt mysql postgres ldap oracle kolab"
-
-DEPEND=""
-RDEPEND="!www-apps/horde
-	crypt? ( app-crypt/gnupg )
-	virtual/php
-	>=www-apps/horde-pear-1.3
-	dev-php/PEAR-Log
-	dev-php/PEAR-Mail_Mime
-	dev-php/PEAR-DB"
-
-EHORDE_PATCHES="$(use kolab && echo ${WORKDIR}/horde-webmail-kolab.patch)"
-HORDE_RECONFIG="$(use kolab && echo ${FILESDIR}/reconfig.kolab)"
-HORDE_POSTINST="$(use kolab && echo ${FILESDIR}/postinstall-en.txt.kolab)"
-
-pkg_setup() {
-	HORDE_PHP_FEATURES="
-		imap ssl session xml nls iconv gd ftp
-		$(use ldap && echo ldap) $(use oracle && echo oci8)
-		$(use crypt && echo crypt) $(use mysql && echo mysql mysqli)
-		$(use postgres && echo postgres) $(use kolab && echo kolab sqlite)
-	"
-	horde_pkg_setup
-}
diff --git a/www-apps/horde-webmail/horde-webmail-1.2.ebuild b/www-apps/horde-webmail/horde-webmail-1.2.4.ebuild
index ed346783214c..6ab1f065af0e 100644
--- a/www-apps/horde-webmail/horde-webmail-1.2.ebuild
+++ b/www-apps/horde-webmail/horde-webmail-1.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-webmail/horde-webmail-1.2.ebuild,v 1.1 2008/10/30 14:38:40 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-webmail/horde-webmail-1.2.4.ebuild,v 1.1 2009/09/16 15:00:44 a3li Exp $
 
 HORDE_PN=${PN}
 
@@ -9,11 +9,12 @@ HORDE_APPLICATIONS="dimp imp ingo kronolith mimp mnemo nag turba"
 inherit horde
 
 DESCRIPTION="browser based communication suite"
+HOMEPAGE="http://www.horde.org/webmail/"
 
 HORDE_PATCHSET_REV=1
 
 SRC_URI="${SRC_URI}
-	http://files.pardus.de/horde-webmail-patches-${PV}-r${HORDE_PATCHSET_REV}.tar.bz2"
+	kolab? ( http://files.pardus.de/horde-webmail-patches-1.2-r${HORDE_PATCHSET_REV}.tar.bz2 )"
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE="crypt mysql postgres ldap oracle kolab"