(non maintainer commit) Version bump for security bug 329863

Package-Manager: portage-2.1.9.9/cvs/Linux x86_64

3 files changed, 213 insertions, 12 deletions

diff --git a/mail-client/squirrelmail/ChangeLog b/mail-client/squirrelmail/ChangeLog
index 858e3e519fb1..654d7eae47db 100644
--- a/mail-client/squirrelmail/ChangeLog
+++ b/mail-client/squirrelmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/squirrelmail
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.152 2010/05/15 13:21:01 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.153 2010/09/23 15:59:41 darkside Exp $
+
+*squirrelmail-1.4.21 (23 Sep 2010)
+
+  23 Sep 2010; Jeremy Olexa <darkside@gentoo.org>
+  +squirrelmail-1.4.21.ebuild:
+  (non maintainer commit) Version bump for security bug 329863
 
   15 May 2010; Markus Meier <maekke@gentoo.org> squirrelmail-1.4.20.ebuild:
   amd64 stable, bug #281580
diff --git a/mail-client/squirrelmail/Manifest b/mail-client/squirrelmail/Manifest
index d5eab44c954b..dfaaca8ecb77 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
@@ -15,15 +12,10 @@ DIST secure_login-1.4-1.2.8.tar.gz 16993 RMD160 879f9e735434871f265e6039c3880419
 DIST show_ssl_link-2.2-1.2.8.tar.gz 13193 RMD160 8e0669c674453cab31b0493ab1404e0a0097ad8d SHA1 39073e417ce28080f9206d068cbfa4161284be3e SHA256 70ecefc01003fd5dddc13e6dd7bf4e6ab4663426a9990c894e353fb96ebb4a1a
 DIST squirrelmail-1.4.19.tar.bz2 516956 RMD160 63a0447838e3c0aee1fca83ff8cd3f91599183d5 SHA1 14b66bd470a36750ed4d4a0c8bfc27523639dd5d SHA256 bcd5bf63d8f59ea7257eb6f2967b30afb5ad53ea2c19b054277b468bb9bed57c
 DIST squirrelmail-1.4.20.tar.bz2 521070 RMD160 aa4e7f97a0f9eddc207d0f390c6f25dd1e69c16a SHA1 ea1f8911961685393da2872739a060e0cf1f03f3 SHA256 dacb14b64a3452819fead63907ee06ddf8c205a0b9f3dc9ac52a98f670f57c75
+DIST squirrelmail-1.4.21.tar.bz2 526813 RMD160 f4eeb97d85c76a037e848217d06aa13a15bfac04 SHA1 8a125ceca939fd4dd957491d17263b1857ddff60 SHA256 09f3a6c6e80f28a8a97a19d6653e0a52e4ca2a1dc2a692c1e7013f0ad218cc38
 DIST squirrelmail-decode-1.2.tar.bz2 333942 RMD160 a217662f923a7e2129e293c6bf806dd0c21dab0b SHA1 90439c4644fd99b7ca4208b441ee0a2c2efa2308 SHA256 72750301b83ee23fffe32ae40a3dec33ad4f39abf81c5abdd38f235aab3fcb26
 EBUILD squirrelmail-1.4.19.ebuild 5596 RMD160 1c4e400685405520f9326fbbce567a1889bc9ee7 SHA1 189c5d0ac0c45cd893f2a295819a85c75c1fb25f SHA256 e12f2007e3de80f6c96006c09d4ac45980390803b488a2227d5554c98758c876
 EBUILD squirrelmail-1.4.20.ebuild 5604 RMD160 5c5cb3c656c6e8ad090503ef9d70361c67f26e3d SHA1 a744cc60ddb5254c785a93640a1a8e29e9400771 SHA256 8b44422f030e074d99a774c6346f284b04090b6ee3d2f5648c39c4099710c0bf
-MISC ChangeLog 31137 RMD160 5926b76cf7403f3724e034b58ae4184d125d612d SHA1 8210ed9dcf63bb12fc42860e2f21c6e63526dea3 SHA256 28e5aa9f4d201e0d3f7ad4776575a974c53f75274a5e842a1732be727d3da810
+EBUILD squirrelmail-1.4.21.ebuild 5612 RMD160 6150a1340cea2e20f0c91916e06beafe08affbde SHA1 82ba3f239d205c5f0a28a4f838ee27a67b501786 SHA256 694ec91d0ffa98ba574e724ab957faf43d6cb79368ba68567fc71d6c2aa2f35f
+MISC ChangeLog 31320 RMD160 656ffba1509ffe92f6b17947fd92c84459c01597 SHA1 5b19cd97fa63d607b68ecb1fc7a0c3ac79734b2b SHA256 060c85ea68e9187ab7e35b63d8ce707324b38712c26ce470d8989f8b885e7ade
 MISC metadata.xml 256 RMD160 1d17a8ea7a1b4d83b151287d3c55481493c2a820 SHA1 6e17c2f60251b728a4529b083f395ba812ff8887 SHA256 4c67b16c0ac2307fd0bb4ae307bddd5cc6fc6a9c7a41edc4cffb885e63edbb63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvun2oACgkQkKaRLQcq0GIAbACfXDZ5HSO75yCDZQ6ttBP8Jr2e
-N7EAoJ3bk55zKiZeZbz8E5uOedSUrFg4
-=Wg1J
------END PGP SIGNATURE-----
diff --git a/mail-client/squirrelmail/squirrelmail-1.4.21.ebuild b/mail-client/squirrelmail/squirrelmail-1.4.21.ebuild
new file mode 100644
index 000000000000..f31d321125b6
--- /dev/null
+++ b/mail-client/squirrelmail/squirrelmail-1.4.21.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.21.ebuild,v 1.1 2010/09/23 15:59:41 darkside Exp $
+
+EAPI=2
+
+IUSE="ldap spell ssl filter mysql postgres nls"
+
+inherit webapp eutils
+
+DESCRIPTION="Webmail for nuts!"
+
+# Plugin Versions
+COMPATIBILITY_VER=2.0.16-1.0
+USERDATA_VER=0.9-1.4.0
+ADMINADD_VER=0.1-1.4.0
+AMAVIS_VER=0.8.0-1.4
+LDAP_USERDATA_VER=0.4
+SECURELOGIN_VER=1.4-1.2.8
+SHOWSSL_VER=2.2-1.2.8
+LOCALES_VER=1.4.18-20090526
+DECODING_VER=1.2
+
+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/${PN}/squirrelmail-decode-${DECODING_VER}.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 )
+	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="dev-lang/php[session]
+	virtual/perl-DB_File
+	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
+	unpack squirrelmail-decode-${DECODING_VER}.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"
+
+	sed -i 's:/usr/games/fortune:/usr/bin/fortune:g' fortune/setup.php || die "Unable to fix fortunes plugin."
+
+	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 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.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
+
+	use nls &&
+		cd "${S}" &&
+		unpack all_locales-${LOCALES_VER}.tar.bz2
+}
+
+src_configure() {
+	#we need to have this empty function ...
+	echo "Nothing to configure"
+}
+
+src_compile() {
+	#we need to have this empty function ... default compile hangs
+	echo "Nothing to compile"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	# handle documentation files
+	#
+	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
+	# get installed per vhost!
+
+	dodoc README
+
+	docinto compatibility
+	for doc in plugins/compatibility/docs/INSTALL plugins/compatibility/docs/README; do
+		dodoc ${doc}
+		rm -f ${doc}
+	done
+
+	docinto admin_add
+	for doc in plugins/admin_add/README; do
+		dodoc ${doc}
+		rm -f ${doc}
+	done
+
+	docinto retrieveuserdata
+	for doc in plugins/retrieveuserdata/INSTALL plugins/retrieveuserdata/changelog plugins/retrieveuserdata/users_example.txt; do
+		dodoc ${doc}
+		rm -f ${doc}
+	done
+
+	if use filter; then
+		docinto amavisnewsql
+		for doc in plugins/amavisnewsql/{CHANGELOG,README,UPGRADE}; do
+			dodoc ${doc}
+			rm -f ${doc}
+		done
+	fi
+
+	if use ldap; then
+		rm plugins/ldapuserdata/README
+		docinto ldapuserdata
+		for doc in plugins/ldapuserdata/doc/README; do
+			dodoc ${doc}
+			rm -f ${doc}
+		done
+	fi
+
+	if use ssl; then
+		docinto secure_login
+		for doc in plugins/secure_login/INSTALL plugins/secure_login/README; do
+			dodoc ${doc}
+			rm -f ${doc}
+		done
+
+		docinto show_ssl_link
+		for doc in plugins/show_ssl_link/INSTALL plugins/show_ssl_link/README; do
+			dodoc ${doc}
+			rm -f ${doc}
+		done
+	fi
+
+	# Copy the app's main files
+	einfo "Installing squirrelmail files."
+	cp -r . "${D}${MY_HTDOCSDIR}"
+
+	cp "${WORKDIR}"/squirrelmail-decode-${DECODING_VER}/*/*.php "${D}${MY_HTDOCSDIR}/functions/decode"
+
+	# Identify the configuration files that this app uses
+	local configs="config/config.php config/config_local.php plugins/retrieveuserdata/config.php"
+	use filter && configs="${configs} plugins/amavisnewsql/config.php"
+	use ldap && configs="${configs} plugins/ldapuserdata/config.php"
+	use ssl && configs="${configs} plugins/show_ssl_link/config.php plugins/secure_login/config.php"
+
+	for file in ${configs}; do
+		webapp_configfile ${MY_HTDOCSDIR}/${file}
+	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
+}