Force session use-flag for php, #235281. Remove vulnerable 1.4.17, #269567

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 15 insertions, 21 deletions

diff --git a/mail-client/squirrelmail/ChangeLog b/mail-client/squirrelmail/ChangeLog
index f549337d5e07..f1f20d187391 100644
--- a/mail-client/squirrelmail/ChangeLog
+++ b/mail-client/squirrelmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/squirrelmail
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.139 2009/05/15 17:03:37 tcunha Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.140 2009/05/15 17:09:36 dertobi123 Exp $
+
+*squirrelmail-1.4.18-r1 (15 May 2009)
+
+  15 May 2009; Tobias Scherbaum <dertobi123@gentoo.org>
+  -squirrelmail-1.4.17.ebuild, +squirrelmail-1.4.18-r1.ebuild:
+  Force session use-flag for php, #235281. Remove vulnerable 1.4.17, #269567
 
   15 May 2009; Tiago Cunha <tcunha@gentoo.org> squirrelmail-1.4.18.ebuild:
   stable sparc, security bug 269567
diff --git a/mail-client/squirrelmail/Manifest b/mail-client/squirrelmail/Manifest
index 63a54de4923e..0b45e668ce75 100644
--- a/mail-client/squirrelmail/Manifest
+++ b/mail-client/squirrelmail/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ldapuserdata-0.4-gentoo.patch 709 RMD160 a7b5fe1aba60530c193919ecb6b213cdd57dddf8 SHA1 99f5dd6f4e9666d6d3915c3e52c2694d1dc06a9e SHA256 bff9cf8e7518df983b03b3f4e7f10fcf31fb75f6d73afb21c8923f2a8312b4a3
 AUX postinstall-en.txt 698 RMD160 7f3b2cfad0cb7c0eef53ecd7ecb49553217d55e7 SHA1 550846016b3ae303e121f87d3cfae0a8ddc754cf SHA256 4e3702651bb5cce4cc517a2b2bed3e71b137167645138bc72c0cedab4ba98da3
 DIST admin_add.0.1-1.4.0.tar.gz 2388 RMD160 6847934c59ae73119a796c6fef251de26a2ea531 SHA1 9265289ac5b67549590e82d10560d05295a8a5e6 SHA256 25ec999eea098a509f7d49cfe368b0557b64c698f86b2a2c951617f67735dabc
@@ -11,17 +8,9 @@ DIST ldapuserdata-0.4.tar.gz 67439 RMD160 6f7fa3eab6eb2877057fc4d9d360da2e10858b
 DIST retrieveuserdata.0.9-1.4.0.tar.gz 10448 RMD160 942d073f86947295ed069ed04e4fc268857932af SHA1 f91b763293f7777799d46f161aace891ff6f612a SHA256 086796d858e781c518b538b37e9ec011d51a2aebd6d14aeba1aa330b58626b8d
 DIST secure_login-1.4-1.2.8.tar.gz 16993 RMD160 879f9e735434871f265e6039c3880419349e110d SHA1 52a4aef7f8bad7aff2882508260a572ec1b91418 SHA256 b6ede807a79c9b5300b43565c920570c583a1cc4d339bcea715c32196518837e
 DIST show_ssl_link-2.2-1.2.8.tar.gz 13193 RMD160 8e0669c674453cab31b0493ab1404e0a0097ad8d SHA1 39073e417ce28080f9206d068cbfa4161284be3e SHA256 70ecefc01003fd5dddc13e6dd7bf4e6ab4663426a9990c894e353fb96ebb4a1a
-DIST squirrelmail-1.4.17.tar.bz2 507158 RMD160 41ecb9367f72785ee402d239cd62b225f17e270c SHA1 da21a447ada4e120b82210e93a737bb4c4509c34 SHA256 b14d3ef3735f8c7b49b091533c567048b3a06eb633eccbfeddd7cd8fdd2ffe25
 DIST squirrelmail-1.4.18.tar.bz2 509216 RMD160 292d0f4123a8e8db84d9ff766a440848f1684b4b SHA1 18872d8ad72f3415672344318901beb9d4d8a860 SHA256 be7a8370b7937bfe7ad3a584d3416d4895986181e3aac5227f52e14279b100a0
 DIST squirrelmail-decode-1.2.tar.bz2 333942 RMD160 a217662f923a7e2129e293c6bf806dd0c21dab0b SHA1 90439c4644fd99b7ca4208b441ee0a2c2efa2308 SHA256 72750301b83ee23fffe32ae40a3dec33ad4f39abf81c5abdd38f235aab3fcb26
-EBUILD squirrelmail-1.4.17.ebuild 5583 RMD160 9976f62d49c865041ce8f4e48f81d84d25c05515 SHA1 575db4b301b9809658d23073592384970b02ae50 SHA256 59f151f81c574c79988ba1e0a9788070202aeb56be06cb1082f9e2f6eee91ba0
+EBUILD squirrelmail-1.4.18-r1.ebuild 5515 RMD160 554bdc7aa1fe45f2ada0b07506092652e44591d0 SHA1 d4ad061eda79ea3d6c1eeeb5c11f9dfa2ee816cb SHA256 c8af4385a8cd25860a1a117ae5848b30f6c38272e8a91ae9d0e2a13c8bcbaf69
 EBUILD squirrelmail-1.4.18.ebuild 5484 RMD160 a8c48440344646f5445fac85f5d97b28c940d5b3 SHA1 c92cb7e8cdcf1ba4d8b29838ae943582f05449b6 SHA256 030cfc3cf9138f4e6dc949bd587db2605c0c3445d994e7c93c5b89b3e9e5f27c
-MISC ChangeLog 29379 RMD160 60add4fe47560f97ed1c7b5ed3834e690aab061f SHA1 e5d9ef8a0128a40dfcc3e720e51d4a5cc3776528 SHA256 2cfe5f5e1b8a687ed7f1696cd46ebffe9cbab25e8fcd1ff5b54de160c33acd31
+MISC ChangeLog 29619 RMD160 d4a5fef314d80d6aa9c72350eed629c6623ff783 SHA1 c27855cfd2462b24c8f626b4229c7f701578bd58 SHA256 ce226793117e27f93861f624a75cefc1a681aba410c1e223fbc238dc5ec4a449
 MISC metadata.xml 256 RMD160 1d17a8ea7a1b4d83b151287d3c55481493c2a820 SHA1 6e17c2f60251b728a4529b083f395ba812ff8887 SHA256 4c67b16c0ac2307fd0bb4ae307bddd5cc6fc6a9c7a41edc4cffb885e63edbb63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoNn6AACgkQ/Kkm35zQzl5YfwCcDLUy82dHtiAgpVOPLXsxtc8b
-8ekAnjxH7BRk8DSDfneJpx+mvgA45Hfv
-=zhGU
------END PGP SIGNATURE-----
diff --git a/mail-client/squirrelmail/squirrelmail-1.4.17.ebuild b/mail-client/squirrelmail/squirrelmail-1.4.18-r1.ebuild
index e8fdb1523cb0..3a7411c36c19 100644
--- a/mail-client/squirrelmail/squirrelmail-1.4.17.ebuild
+++ b/mail-client/squirrelmail/squirrelmail-1.4.18-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.17.ebuild,v 1.6 2009/01/09 21:36:45 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.18-r1.ebuild,v 1.1 2009/05/15 17:09:36 dertobi123 Exp $
+
+EAPI=2
 
 IUSE="ldap spell ssl filter mysql postgres nls"
 
@@ -37,11 +39,11 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
 HOMEPAGE="http://www.squirrelmail.org/"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND=""
 
-RDEPEND="virtual/php
+RDEPEND="dev-lang/php[session]
 	virtual/perl-DB_File
 	ldap? ( net-nds/openldap )
 	spell? ( || ( app-text/aspell app-text/ispell ) )
@@ -103,10 +105,7 @@ src_install() {
 	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
 	# get installed per vhost!
 
-	for doc in AUTHORS COPYING ChangeLog INSTALL README ReleaseNotes UPGRADE; do
-		dodoc ${doc}
-		rm -f ${doc}
-	done
+	dodoc README
 
 	docinto compatibility
 	for doc in plugins/compatibility/INSTALL plugins/compatibility/README; do