Updating version. 1.4.10a addresses some security issues. See bug #177820. 1.5.1-r2 is still affected by these issues and an update will be coming soon for ~arch users.

(Portage version: 2.1.2.7)

6 files changed, 16 insertions, 206 deletions

diff --git a/mail-client/squirrelmail/ChangeLog b/mail-client/squirrelmail/ChangeLog
index f31e66d78d76..b97e02598594 100644
--- a/mail-client/squirrelmail/ChangeLog
+++ b/mail-client/squirrelmail/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-client/squirrelmail
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.81 2007/05/06 18:27:08 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.82 2007/05/19 02:23:20 eradicator Exp $
+
+*squirrelmail-1.4.10a (19 May 2007)
+
+  19 May 2007; Jeremy Huddleston <eradicator@gentoo.org>
+  -squirrelmail-1.4.9a-r1.ebuild, +squirrelmail-1.4.10a.ebuild,
+  -squirrelmail-1.5.1-r1.ebuild, squirrelmail-1.5.1-r2.ebuild:
+  Updating version. 1.4.10a addresses some security issues. See bug #177820.
+  1.5.1-r2 is still affected by these issues and an update will be coming soon
+  for ~arch users.
 
   06 May 2007; Andrej Kacian <ticho@gentoo.org>
   squirrelmail-1.4.9a-r1.ebuild:
diff --git a/mail-client/squirrelmail/files/digest-squirrelmail-1.4.9a-r1 b/mail-client/squirrelmail/files/digest-squirrelmail-1.4.10a
index aa6c11eeafc3..8b1a96437153 100644
--- a/mail-client/squirrelmail/files/digest-squirrelmail-1.4.9a-r1
+++ b/mail-client/squirrelmail/files/digest-squirrelmail-1.4.10a
@@ -25,6 +25,6 @@ SHA256 0c44112114e1d3f2b8615b5b586631fb50fb1877037a438c37f4b890f46b0ccc secure_l
 MD5 83b7abc3e903209802a772a4da1b7879 show_ssl_link-2.2-1.2.8.tar.gz 13193
 RMD160 8e0669c674453cab31b0493ab1404e0a0097ad8d show_ssl_link-2.2-1.2.8.tar.gz 13193
 SHA256 70ecefc01003fd5dddc13e6dd7bf4e6ab4663426a9990c894e353fb96ebb4a1a show_ssl_link-2.2-1.2.8.tar.gz 13193
-MD5 3adf66bfe2e816ba8375cf811d8ef3f6 squirrelmail-1.4.9a.tar.bz2 481601
-RMD160 ccb4c0b4d74341862fecc4abe7f1fa63a4535984 squirrelmail-1.4.9a.tar.bz2 481601
-SHA256 0a33ef186ff898017f788f5a6783d3303a879ea4e20ccfc6e124ad38d9954f95 squirrelmail-1.4.9a.tar.bz2 481601
+MD5 298aaa1811b3fb40a803a6f57b22be20 squirrelmail-1.4.10a.tar.bz2 484523
+RMD160 4337f99575e1ada931cea461679b96acd5b4901d squirrelmail-1.4.10a.tar.bz2 484523
+SHA256 b5e047c0a32b758b67e15772dc9c467d0ee830372858f7b9442a9a6aa6caf854 squirrelmail-1.4.10a.tar.bz2 484523
diff --git a/mail-client/squirrelmail/files/digest-squirrelmail-1.5.1-r1 b/mail-client/squirrelmail/files/digest-squirrelmail-1.5.1-r1
deleted file mode 100644
index e4786932440c..000000000000
--- a/mail-client/squirrelmail/files/digest-squirrelmail-1.5.1-r1
+++ /dev/null
@@ -1,30 +0,0 @@
-MD5 c321d0f7efa624f6bc3f3a4d1bf08782 admin_add.0.1-1.4.0.tar.gz 2388
-RMD160 6847934c59ae73119a796c6fef251de26a2ea531 admin_add.0.1-1.4.0.tar.gz 2388
-SHA256 25ec999eea098a509f7d49cfe368b0557b64c698f86b2a2c951617f67735dabc admin_add.0.1-1.4.0.tar.gz 2388
-MD5 ea311416ba9a96352a0728f5a7611102 all_locales-1.5.1-20060219.tar.bz2 2616039
-RMD160 681ea1bcbfc5ae57ced11e33cb19731cefa2dd00 all_locales-1.5.1-20060219.tar.bz2 2616039
-SHA256 f27d7f1506607c8cf2651bb4384f5a840eb71f0d38cfae4d77b292c56e49d0a3 all_locales-1.5.1-20060219.tar.bz2 2616039
-MD5 4766f5f6706e086d5c9370bef9e7629f amavisnewsql-0.8.0-1.4.tar.gz 101008
-RMD160 72b796565f128354c51e8a04384e49621371cf16 amavisnewsql-0.8.0-1.4.tar.gz 101008
-SHA256 f9ef453f80e0a44a22c695712b44af935f6d1a505239bd0cb6470fc27608041c amavisnewsql-0.8.0-1.4.tar.gz 101008
-MD5 cfc3279a613b917fcba8200c596dadb0 compatibility-2.0.4.tar.gz 18703
-RMD160 f5b272fb1598c28be70e16ed4251eefa57f46f8e compatibility-2.0.4.tar.gz 18703
-SHA256 5aa1bbf871a131eeb3d64e9c89b239231927ebc9aee81a272a31d014ccae667e compatibility-2.0.4.tar.gz 18703
-MD5 88f80922e2a060f5277fd2192404efab gpg.2.0.1-1.4.2.tar.gz 383592
-RMD160 f8e53570494b84d61bb467e1fcb368decb9bbd2a gpg.2.0.1-1.4.2.tar.gz 383592
-SHA256 b4fa8f4112ef8b69d9b79fbc43c8bde3523de5487e1447445deee67b6c66091b gpg.2.0.1-1.4.2.tar.gz 383592
-MD5 c836661e8360358b94df4e153e449b2c ldapuserdata-0.4.tar.gz 67439
-RMD160 6f7fa3eab6eb2877057fc4d9d360da2e10858ba6 ldapuserdata-0.4.tar.gz 67439
-SHA256 ee10b97e99c35b0656e7e87f60785408f3d26a53ee2a0107d8aa04f7947c3ff7 ldapuserdata-0.4.tar.gz 67439
-MD5 dfe469f7ab473fd2292b30800e3141d5 retrieveuserdata.0.9-1.4.0.tar.gz 10448
-RMD160 942d073f86947295ed069ed04e4fc268857932af retrieveuserdata.0.9-1.4.0.tar.gz 10448
-SHA256 086796d858e781c518b538b37e9ec011d51a2aebd6d14aeba1aa330b58626b8d retrieveuserdata.0.9-1.4.0.tar.gz 10448
-MD5 73d2c111579e2fad17c289f62e0be855 secure_login-1.2-1.2.8.tar.gz 6361
-RMD160 e3e35d7acf5f427592915d541ca2aaad79d37b1d secure_login-1.2-1.2.8.tar.gz 6361
-SHA256 b3cf5fbf15206ca9f0e00b573408fc78b287fbb2e0d5fcbba93fe6e75ceb4a0b secure_login-1.2-1.2.8.tar.gz 6361
-MD5 a14a46388ed710a81c356d69276844c1 show_ssl_link-2.1-1.2.8.tar.gz 5950
-RMD160 58f202d7febcde55efdf8a6f312caebf3d4e0d45 show_ssl_link-2.1-1.2.8.tar.gz 5950
-SHA256 a5eb5c1eade9fb6fda5f0f9279a8bb186e9d249cae67a98eaf125845f4d177d2 show_ssl_link-2.1-1.2.8.tar.gz 5950
-MD5 2165f0da22180300372d7d2d0bc3d262 squirrelmail-1.5.1.tar.bz2 904370
-RMD160 a59df6a73e5694b54d2791d4c139941ef220d2d1 squirrelmail-1.5.1.tar.bz2 904370
-SHA256 3e7f370dd869fb57ed5b3c159d7450c1180309fffeda9dbf168b2d456f477909 squirrelmail-1.5.1.tar.bz2 904370
diff --git a/mail-client/squirrelmail/squirrelmail-1.4.9a-r1.ebuild b/mail-client/squirrelmail/squirrelmail-1.4.10a.ebuild
index 90a258a2c1b3..fe79c6fe7e2c 100644
--- a/mail-client/squirrelmail/squirrelmail-1.4.9a-r1.ebuild
+++ b/mail-client/squirrelmail/squirrelmail-1.4.10a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.9a-r1.ebuild,v 1.2 2007/05/06 18:27:08 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.10a.ebuild,v 1.1 2007/05/19 02:23:20 eradicator Exp $
 
 IUSE="crypt ldap spell ssl filter mysql postgres nls"
 
diff --git a/mail-client/squirrelmail/squirrelmail-1.5.1-r1.ebuild b/mail-client/squirrelmail/squirrelmail-1.5.1-r1.ebuild
deleted file mode 100644
index a631fc432032..000000000000
--- a/mail-client/squirrelmail/squirrelmail-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.5.1-r1.ebuild,v 1.5 2006/12/01 13:54:52 mcummings Exp $
-
-IUSE="crypt ldap spell ssl filter mysql postgres nls"
-
-inherit webapp eutils
-
-DESCRIPTION="Webmail for nuts!"
-
-# Plugin Versions
-COMPATIBILITY_VER=2.0.4
-USERDATA_VER=0.9-1.4.0
-ADMINADD_VER=0.1-1.4.0
-AMAVIS_VER=0.8.0-1.4
-GPG_VER=2.0.1-1.4.2
-LDAP_USERDATA_VER=0.4
-SECURELOGIN_VER=1.2-1.2.8
-SHOWSSL_VER=2.1-1.2.8
-LOCALES_VER=1.5.1-20060219
-
-MY_P=${P/_rc/-RC}
-S="${WORKDIR}/${MY_P}"
-
-PLUGINS_LOC="http://www.squirrelmail.org/plugins"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-	mirror://sourceforge/retruserdata/retrieveuserdata.${USERDATA_VER}.tar.gz
-	${PLUGINS_LOC}/compatibility-${COMPATIBILITY_VER}.tar.gz
-	ssl? ( ${PLUGINS_LOC}/secure_login-${SECURELOGIN_VER}.tar.gz )
-	ssl? ( ${PLUGINS_LOC}/show_ssl_link-${SHOWSSL_VER}.tar.gz )
-	${PLUGINS_LOC}/admin_add.${ADMINADD_VER}.tar.gz
-	filter? ( ${PLUGINS_LOC}/amavisnewsql-0.8.0-1.4.tar.gz )
-	crypt? ( ${PLUGINS_LOC}/gpg.${GPG_VER}.tar.gz )
-	ldap? ( ${PLUGINS_LOC}/ldapuserdata-${LDAP_USERDATA_VER}.tar.gz )
-	nls? ( mirror://sourceforge/${PN}/all_locales-${LOCALES_VER}.tar.bz2 )"
-
-HOMEPAGE="http://www.squirrelmail.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=""
-
-RDEPEND="virtual/php
-	virtual/perl-DB_File
-	crypt? ( app-crypt/gnupg )
-	ldap? ( net-nds/openldap )
-	spell? ( || ( app-text/aspell app-text/ispell ) )
-	filter? ( mail-filter/amavisd-new dev-php/PEAR-Log dev-php/PEAR-DB dev-php/PEAR-Net_SMTP )
-	postgres? ( dev-php/PEAR-DB )
-	mysql? ( dev-php/PEAR-DB )"
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-
-	cd ${S}
-
-	mv config/config_default.php config/config.php
-
-	sed -i "s:'/var/local/squirrelmail/data':SM_PATH . 'data/':" config/config.php
-
-	# Now do the plugins
-	cd ${S}/plugins
-
-	mv fortune/config_default.php fortune/config.php
-	sed -i 's:/usr/games/fortune:/usr/bin/fortune:g' fortune/config.php
-
-	mv bug_report/config_default.php bug_report/config.php
-	mv change_password/config_default.php change_password/config.php
-	mv filters/config_default.php filters/config.php
-	mv mail_fetch/config_sample.php mail_fetch/config.php
-	mv newmail/config_default.php newmail/config.php
-	mv translate/config_default.php translate/config.php
-
-	rm newmail/config_sample.php
-	rm translate/config_sample.php
-
-	unpack compatibility-${COMPATIBILITY_VER}.tar.gz
-
-	unpack admin_add.${ADMINADD_VER}.tar.gz
-
-	unpack retrieveuserdata.${USERDATA_VER}.tar.gz
-
-	use filter &&
-		unpack amavisnewsql-${AMAVIS_VER}.tar.gz &&
-		mv amavisnewsql/config.php.dist amavisnewsql/config.php
-
-	use crypt &&
-		unpack gpg.${GPG_VER}.tar.gz
-
-	use ldap &&
-		unpack ldapuserdata-${LDAP_USERDATA_VER}.tar.gz &&
-		epatch ${FILESDIR}/ldapuserdata-${LDAP_USERDATA_VER}-gentoo.patch &&
-		mv ldapuserdata/config_sample.php ldapuserdata/config.php
-
-	use ssl &&
-		unpack secure_login-${SECURELOGIN_VER}.tar.gz &&
-		mv secure_login/config.php.sample secure_login/config.php &&
-		unpack show_ssl_link-${SHOWSSL_VER}.tar.gz &&
-		mv show_ssl_link/config.php.sample show_ssl_link/config.php
-
-	use nls &&
-		cd ${S} &&
-		unpack all_locales-${LOCALES_VER}.tar.bz2
-}
-
-src_compile() {
-	#we need to have this empty function ... default compile hangs
-	echo "Nothing to compile"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	# Copy the app's main files
-	einfo "Installing squirrelmail files."
-	cp -r . ${D}${MY_HTDOCSDIR}
-
-	keepdir ${MY_HTDOCSDIR}/data
-
-	# handle documentation files
-	#
-	# 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 ${D}${MY_HTDOCSDIR}/${doc}
-	done
-
-	for doc in plugins/{README.plugins,*/{INSTALL,README,COPYRIGHTS,CHANGELOG,API,UPGRADE,TODO,README.txt,INSTALL.txt,user_example.txt}} ; do
-		if [[ -f ${doc} ]] ; then
-			docinto $(dirname ${doc})
-			dodoc ${doc}
-			rm -f ${D}${MY_HTDOCSDIR}/${doc}
-		fi
-	done
-
-	# Identify the configuration files that this app uses
-	for file in config/config.php plugins/*/{config.php,sqspell_config.php,gpg_local_prefs.txt}; do
-		if [[ -f ${file} ]] ; then
-			webapp_configfile ${MY_HTDOCSDIR}/${file}
-		fi
-	done
-
-	# Identify any script files that need #! headers adding to run under
-	# a CGI script (such as PHP/CGI)
-	#
-	# for phpmyadmin, we *assume* that all .php files that don't end in
-	# .inc.php need to have CGI/BIN support added
-
-	#for x in `find . -name '*.php' -print | grep -v 'inc.php'` ; do
-	#	webapp_runbycgibin php ${MY_HTDOCSDIR}/$x
-	#done
-
-	local server_owned="data index.php"
-	for file in ${server_owned}; do
-		webapp_serverowned ${MY_HTDOCSDIR}/${file}
-	done
-
-	# add the post-installation instructions
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	# all done
-	#
-	# now we let the eclass strut its stuff ;-)
-
-	webapp_src_install
-}
diff --git a/mail-client/squirrelmail/squirrelmail-1.5.1-r2.ebuild b/mail-client/squirrelmail/squirrelmail-1.5.1-r2.ebuild
index 9117b7fdcbe5..6a18874e620d 100644
--- a/mail-client/squirrelmail/squirrelmail-1.5.1-r2.ebuild
+++ b/mail-client/squirrelmail/squirrelmail-1.5.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.5.1-r2.ebuild,v 1.1 2007/05/02 20:55:47 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.5.1-r2.ebuild,v 1.2 2007/05/19 02:23:20 eradicator Exp $
 
 IUSE="crypt ldap spell ssl filter mysql postgres nls"
 
@@ -95,7 +95,7 @@ src_unpack() {
 
 	use ssl &&
 		unpack secure_login-${SECURELOGIN_VER}.tar.gz &&
-		mv secure_login/config.php.sample secure_login/config.php &&
+		mv secure_login/config.sample.php secure_login/config.php &&
 		unpack show_ssl_link-${SHOWSSL_VER}.tar.gz &&
 		mv show_ssl_link/config.php.sample show_ssl_link/config.php