Revbump to fix array_shift bug #108394.

Package-Manager: portage-2.0.53_rc5

5 files changed, 258 insertions, 7 deletions

diff --git a/mail-client/squirrelmail/ChangeLog b/mail-client/squirrelmail/ChangeLog
index 4eaa18553681..4fc8101b0e78 100644
--- a/mail-client/squirrelmail/ChangeLog
+++ b/mail-client/squirrelmail/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/squirrelmail
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.33 2005/09/17 14:54:18 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.34 2005/10/15 23:05:58 eradicator Exp $
+
+*squirrelmail-1.4.5-r1 (15 Oct 2005)
+
+  15 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/squirrelmail-1.4.5-array_shift.patch,
+  +squirrelmail-1.4.5-r1.ebuild:
+  Revbump to fix array_shift bug #108394.
 
   13 Sep 2005; Aron Griffis <agriffis@gentoo.org> squirrelmail-1.4.5.ebuild:
   Mark 1.4.5 stable on alpha
diff --git a/mail-client/squirrelmail/Manifest b/mail-client/squirrelmail/Manifest
index a0e9797f0101..d6e1c89a74e8 100644
--- a/mail-client/squirrelmail/Manifest
+++ b/mail-client/squirrelmail/Manifest
@@ -1,17 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 08cd5d6f4b8f101029a526ea0a1ea4b1 metadata.xml 258
-MD5 59d0dc97d48b7bc60b05c3992ad54e3d squirrelmail-1.4.5.ebuild 5475
-MD5 a529eab029aafd5fd0bc4ccfc0544080 ChangeLog 13047
+MD5 2d9ab56451194141086e1b7e6ddc0b17 ChangeLog 13269
 MD5 085691d2982e6d5f80f7ac0c44146042 files/digest-squirrelmail-1.4.5 634
+MD5 6c85807fb1aaa0903e3c928e18df6c88 files/digest-squirrelmail-1.4.5-r1 634
 MD5 1ebd5ce3ff0ce02fa62f3890b6a8f255 files/ldapuserdata-0.4-gentoo.patch 709
 MD5 a34a9335bafb3173bb60b373caae8c4e files/postinstall-en.txt 698
+MD5 3912efdebafbc71a7849cc1b34ef06be files/squirrelmail-1.4.5-array_shift.patch 1337
 MD5 ebb6924dba63e16023a37f0f4f5563e8 files/squirrelmail-fortune.patch 603
+MD5 08cd5d6f4b8f101029a526ea0a1ea4b1 metadata.xml 258
+MD5 1aba95a6f39649bfa37fd2fe71fe8a10 squirrelmail-1.4.5-r1.ebuild 5552
+MD5 59d0dc97d48b7bc60b05c3992ad54e3d squirrelmail-1.4.5.ebuild 5475
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDLC4yKf2g/qXtneoRAiwYAJ9hAQFgj9Yn49ZsIJ7VT/fvsYmd3gCfU368
-JvX6abmK45KVcsR73QJBzwg=
-=dNYh
+iD8DBQFDUYtqOpjtAl+gMRURAtrMAJ9xOLkZkfLFSfKl8b/Ag4cjXiLVSACgxzxC
+DNCSS1itOHc+zTsixEOVXy8=
+=EMDa
 -----END PGP SIGNATURE-----
diff --git a/mail-client/squirrelmail/files/digest-squirrelmail-1.4.5-r1 b/mail-client/squirrelmail/files/digest-squirrelmail-1.4.5-r1
new file mode 100644
index 000000000000..1a6549caece4
--- /dev/null
+++ b/mail-client/squirrelmail/files/digest-squirrelmail-1.4.5-r1
@@ -0,0 +1,9 @@
+MD5 c321d0f7efa624f6bc3f3a4d1bf08782 admin_add.0.1-1.4.0.tar.gz 2388
+MD5 049c46507ef161ad4ba5f4d4a0b96d09 compatibility-1.3.tar.gz 5966
+MD5 88f80922e2a060f5277fd2192404efab gpg.2.0.1-1.4.2.tar.gz 383592
+MD5 c836661e8360358b94df4e153e449b2c ldapuserdata-0.4.tar.gz 67439
+MD5 dfe469f7ab473fd2292b30800e3141d5 retrieveuserdata.0.9-1.4.0.tar.gz 10448
+MD5 73d2c111579e2fad17c289f62e0be855 secure_login-1.2-1.2.8.tar.gz 6361
+MD5 a14a46388ed710a81c356d69276844c1 show_ssl_link-2.1-1.2.8.tar.gz 5950
+MD5 bcfe0c1d4049e9c26e0040b2fa3adb07 squirrelmail-1.4.5.tar.bz2 480226
+MD5 e68481acab96c17f02cb397762d8959e virus_scan.0.5-1.4.0.tar.gz 25179
diff --git a/mail-client/squirrelmail/files/squirrelmail-1.4.5-array_shift.patch b/mail-client/squirrelmail/files/squirrelmail-1.4.5-array_shift.patch
new file mode 100644
index 000000000000..8c3481f010b8
--- /dev/null
+++ b/mail-client/squirrelmail/files/squirrelmail-1.4.5-array_shift.patch
@@ -0,0 +1,28 @@
+diff -aurp old/squirrelmail/class/mime/Rfc822Header.class.php new/squirrelmail/class/mime/Rfc822Header.class.php
+--- old/squirrelmail/class/mime/Rfc822Header.class.php	2005-02-07 00:33:29.000000000 +0000
++++ new/squirrelmail/class/mime/Rfc822Header.class.php	2005-10-15 21:17:31.000000000 +0000
+@@ -506,7 +506,8 @@ class Rfc822Header {
+      * that function?
+      */
+-    function parsePriority($value) {
+-        $value = strtolower(array_shift(split('/\w/',trim($value))));
++    function parsePriority($sValue) {
++        $aValue = split('/\w/',trim($sValue));
++	$value = strtolower(array_shift($aValue));
+         if ( is_numeric($value) ) {
+             return $value;
+         }
+diff -aurp old/squirrelmail/functions/imap_messages.php new/squirrelmail/functions/imap_messages.php
+--- old/squirrelmail/functions/imap_messages.php	2005-04-16 17:45:38.000000000 +0000
++++ new/squirrelmail/functions/imap_messages.php	2005-10-15 22:14:09.000000000 +0000
+@@ -477,7 +477,8 @@ function parseArray($read,&$i) {
+  * class/mime/Rfc822Header.php.
+  */
+-function parsePriority($value) {
+-    $value = strtolower(array_shift(split('/\w/',trim($value))));
++function parsePriority($sValue) {
++    $aValue=split('/\w/',trim($sValue));
++    $value = strtolower(array_shift($aValue));
+     if ( is_numeric($value) ) {
+         return $value;
+     }
diff --git a/mail-client/squirrelmail/squirrelmail-1.4.5-r1.ebuild b/mail-client/squirrelmail/squirrelmail-1.4.5-r1.ebuild
new file mode 100644
index 000000000000..ffe751792546
--- /dev/null
+++ b/mail-client/squirrelmail/squirrelmail-1.4.5-r1.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.5-r1.ebuild,v 1.1 2005/10/15 23:05:58 eradicator Exp $
+
+IUSE="crypt ldap spell ssl virus-scan mysql postgres"
+
+inherit webapp eutils
+
+DESCRIPTION="Webmail for nuts!"
+
+# Plugin Versions
+COMPATIBILITY_VER=1.3
+USERDATA_VER=0.9-1.4.0
+ADMINADD_VER=0.1-1.4.0
+VSCAN_VER=0.5-1.4.0
+GPG_VER=2.0.1-1.4.2
+LDAP_VER=0.4
+SECURELOGIN_VER=1.2-1.2.8
+SHOWSSL_VER=2.1-1.2.8
+
+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
+	virus-scan? ( ${PLUGINS_LOC}/virus_scan.${VSCAN_VER}.tar.gz )
+	crypt? ( ${PLUGINS_LOC}/gpg.${GPG_VER}.tar.gz )
+	ldap? ( ${PLUGINS_LOC}/ldapuserdata-${LDAP_VER}.tar.gz )"
+
+HOMEPAGE="http://www.squirrelmail.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+DEPEND=""
+
+RDEPEND="virtual/php
+	perl-core/DB_File
+	crypt? ( app-crypt/gnupg )
+	ldap? ( net-nds/openldap )
+	spell? ( || ( app-text/aspell app-text/ispell ) )
+	postgres? ( dev-php/PEAR-DB )
+	mysql? ( dev-php/PEAR-DB )"
+
+src_unpack() {
+	unpack ${MY_P}.tar.bz2
+
+	cd ${S}
+
+	# Bug #108394
+	epatch ${FILESDIR}/${PN}-1.4.5-array_shift.patch
+
+	mv config/config_default.php config/config.php
+	epatch ${FILESDIR}/${PN}-fortune.patch
+
+	# Now do the plugins
+	cd ${S}/plugins
+
+	unpack compatibility-${COMPATIBILITY_VER}.tar.gz
+
+	unpack admin_add.${ADMINADD_VER}.tar.gz
+
+	unpack retrieveuserdata.${USERDATA_VER}.tar.gz
+
+	use virus-scan &&
+		unpack virus_scan.${VSCAN_VER}.tar.gz &&
+		mv virus_scan/config.php.sample virus_scan/config.php
+
+	use crypt &&
+		unpack gpg.${GPG_VER}.tar.gz
+
+	use ldap &&
+		unpack ldapuserdata-${LDAP_VER}.tar.gz &&
+		epatch ${FILESDIR}/ldapuserdata-${LDAP_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
+}
+
+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!
+
+	for doc in AUTHORS COPYING ChangeLog INSTALL README ReleaseNotes UPGRADE; do
+		dodoc ${doc}
+		rm -f ${doc}
+	done
+
+	docinto compatibility
+	for doc in plugins/compatibility/INSTALL plugins/compatibility/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 virus-scan; then
+		docinto virus-scan
+		for doc in plugins/virus_scan/README; do
+			dodoc ${doc}
+			rm -f ${doc}
+		done
+	fi
+
+	if use crypt; then
+		docinto gpg
+		for doc in plugins/gpg/README plugins/gpg/README.txt plugins/gpg/INSTALL plugins/gpg/INSTALL.txt plugins/gpg/TODO; 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}
+
+	# Identify the configuration files that this app uses
+	local configs="config/config.php config/config_local.php plugins/retrieveuserdata/config.php"
+	use virus-scan && configs="${configs} plugins/virus_scan/config.php"
+	use crypt && configs="${configs} plugins/gpg/gpg_local_prefs.txt"
+	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
+
+	# virus scanning signatures needs to be owned by the server so it can update them
+	local server_owned="data index.php"
+	use virus-scan && server_owned="${server_owned} plugins/virus_scan/includes/virussignatures.php plugins/virus_scan/config.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
+}