Added plugins to support gpg, ldap, virus scanning, and automatic retrieval of user data. Closes bug #38374.

5 files changed, 169 insertions, 4 deletions

diff --git a/net-mail/squirrelmail/ChangeLog b/net-mail/squirrelmail/ChangeLog
index 86e9319e1606..053419227338 100644
--- a/net-mail/squirrelmail/ChangeLog
+++ b/net-mail/squirrelmail/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/squirrelmail
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/squirrelmail/ChangeLog,v 1.31 2003/12/15 20:23:58 stuart Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/squirrelmail/ChangeLog,v 1.32 2004/02/04 04:54:21 eradicator Exp $
+
+*squirrelmail-1.4.2-r2 (03 Feb 2004)
+
+  03 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  squirrelmail-1.4.2-r2.ebuild, files/ldapuserdata-0.4-gentoo.patch:
+  Added plugins to support gpg, ldap, virus scanning, and automatic retrieval of
+  user data. Closes bug #38374.
 
   15 Dec 2003; Stuart Herbert <stuart@gentoo.org>
   squirrelmail-1.4.2-r1.ebuild:
diff --git a/net-mail/squirrelmail/Manifest b/net-mail/squirrelmail/Manifest
index c9791cb3c985..9a3908925e6d 100644
--- a/net-mail/squirrelmail/Manifest
+++ b/net-mail/squirrelmail/Manifest
@@ -1,7 +1,7 @@
 MD5 e3778be6bb18fbbed371e80713499bda squirrelmail-1.4.2-r1.ebuild 2030
-MD5 ce26ed2b32957a26ee6823aa6b70f8dc ChangeLog 5129
+MD5 e49e0940f14e06ad9ccfe97fbcc3a94b ChangeLog 5411
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 43e39ba343ddd9acc1a57013f5c2c2b7 squirrelmail-1.4.2-r2.ebuild 4310
+MD5 2aa1da4f084603dbcef1b47fbec15a40 squirrelmail-1.4.2-r2.ebuild 4386
 MD5 96aac58deae88b397543c2a244b252a3 files/digest-squirrelmail-1.4.2-r1 72
 MD5 6558965ca922cf1ddae90dc069456c8f files/digest-squirrelmail-1.4.2-r2 423
 MD5 1ebd5ce3ff0ce02fa62f3890b6a8f255 files/ldapuserdata-0.4-gentoo.patch 709
diff --git a/net-mail/squirrelmail/files/digest-squirrelmail-1.4.2-r2 b/net-mail/squirrelmail/files/digest-squirrelmail-1.4.2-r2
new file mode 100644
index 000000000000..63e4214708a2
--- /dev/null
+++ b/net-mail/squirrelmail/files/digest-squirrelmail-1.4.2-r2
@@ -0,0 +1,6 @@
+MD5 8d8271c704a9f23d53138a4ceea38fb4 squirrelmail-1.4.2.tar.bz2 1888703
+MD5 dfe469f7ab473fd2292b30800e3141d5 retrieveuserdata.0.9-1.4.0.tar.gz 10448
+MD5 c321d0f7efa624f6bc3f3a4d1bf08782 admin_add.0.1-1.4.0.tar.gz 2388
+MD5 856a1268b5417f8b1644db92cb82258a virus_scan.0.4-1.4.0.tar.gz 20040
+MD5 88f80922e2a060f5277fd2192404efab gpg.2.0.1-1.4.2.tar.gz 383592
+MD5 c836661e8360358b94df4e153e449b2c ldapuserdata-0.4.tar.gz 67439
diff --git a/net-mail/squirrelmail/files/ldapuserdata-0.4-gentoo.patch b/net-mail/squirrelmail/files/ldapuserdata-0.4-gentoo.patch
new file mode 100644
index 000000000000..46ebc04cff51
--- /dev/null
+++ b/net-mail/squirrelmail/files/ldapuserdata-0.4-gentoo.patch
@@ -0,0 +1,20 @@
+--- plugins/ldapuserdata/setup.php.orig	2004-01-15 23:40:41.000000000 -0800
++++ plugins/ldapuserdata/setup.php	2004-01-15 23:40:52.000000000 -0800
+@@ -92,7 +92,7 @@
+ 	global $ldap_bind_dn, $ldap_host;
+ 
+ 	/* fill $ldap_prefs_cache with data from LDAP. */
+-	$ldap_prefs_cache = retrieve_data($login_username);
++	$ldap_prefs_cache = ldap_retrieve_data($login_username);
+ 
+ 	/*
+ 	print "<pre>";
+@@ -121,7 +121,7 @@
+ }
+ 
+ 
+-function retrieve_data ($uid) {
++function ldap_retrieve_data ($uid) {
+ 	global $ldap_host, $username, $ldap_base_dn, $ldap_bind_dn, $ldap_bind_pw;
+ 	global $ldap_manager_dn, $ldap_manager_pw;
+ 	global $ldap_objectclass, $prefs_default, $ldap_attributes, $boolean_attrs, $multivalue_attrs;
diff --git a/net-mail/squirrelmail/squirrelmail-1.4.2-r2.ebuild b/net-mail/squirrelmail/squirrelmail-1.4.2-r2.ebuild
new file mode 100644
index 000000000000..750066794e13
--- /dev/null
+++ b/net-mail/squirrelmail/squirrelmail-1.4.2-r2.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/squirrelmail/squirrelmail-1.4.2-r2.ebuild,v 1.1 2004/02/04 04:54:21 eradicator Exp $
+
+inherit webapp-apache
+
+DESCRIPTION="Webmail for nuts!"
+
+# Plugin Versions
+USERDATA_VER=0.9-1.4.0
+ADMINADD_VER=0.1-1.4.0
+VSCAN_VER=0.4-1.4.0
+GPG_VER=2.0.1-1.4.2
+LDAP_VER=0.4
+
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	mirror://sourceforge/retruserdata/retrieveuserdata.${USERDATA_VER}.tar.gz
+	http://www.squirrelmail.org/plugins/admin_add.${ADMINADD_VER}.tar.gz
+	http://www.squirrelmail.org/plugins/virus_scan.${VSCAN_VER}.tar.gz
+	http://www.squirrelmail.org/plugins/gpg.${GPG_VER}.tar.gz
+	http://www.squirrelmail.org/plugins/ldapuserdata-${LDAP_VER}.tar.gz"
+
+RESTRICT="nomirror"
+HOMEPAGE="http://www.squirrelmail.org/"
+
+IUSE="crypt virus-scan ldap"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+
+RDEPEND=">=mod_php-4.1
+	dev-perl/DB_File
+	crypt? ( app-crypt/gnupg )
+	ldap? ( net-nds/openldap )"
+
+DEPEND="${RDEPEND}"
+
+webapp-detect || NO_WEBSERVER=1
+
+pkg_setup() {
+	webapp-pkg_setup "${NO_WEBSERVER}"
+	if [ -L ${HTTPD_ROOT}/${PN} ] ; then
+		ewarn "You need to unmerge your old SquirrelMail version first."
+		ewarn "SquirrelMail will be installed into ${HTTPD_ROOT}/${PN}"
+		ewarn "directly instead of a version-dependant directory."
+		die "need to unmerge old version first"
+	fi
+	einfo "Installing into ${ROOT}${HTTPD_ROOT}."
+}
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+
+	# Now do the plugins
+	cd ${S}/plugins
+
+	unpack admin_add.${ADMINADD_VER}.tar.gz
+
+	unpack retrieveuserdata.${USERDATA_VER}.tar.gz &&
+		mv retrieveuserdata/config.php retrieveuserdata/config_default.php
+
+	use virus-scan &&
+		unpack virus_scan.${VSCAN_VER}.tar.gz &&
+		mv virus_scan/config.php virus_scan/config_default.php
+
+	use crypt &&
+		unpack gpg.${GPG_VER}.tar.gz &&
+		mv gpg/gpg_local_prefs.txt gpg/gpg_local_prefs_default.txt
+
+	use ldap &&
+		unpack ldapuserdata-${LDAP_VER}.tar.gz &&
+		epatch ${FILESDIR}/ldapuserdata-${LDAP_VER}-gentoo.patch
+}
+
+src_compile() {
+	#we need to have this empty function ... default compile hangs
+	echo "Nothing to compile"
+}
+
+src_install() {
+	webapp-mkdirs
+
+	local DocumentRoot=${HTTPD_ROOT}
+	local destdir=${DocumentRoot}/${PN}
+	dodir ${destdir}
+	cp -r . ${D}/${HTTPD_ROOT}/${PN}
+	cd ${D}/${HTTPD_ROOT}
+	chown -R ${HTTPD_USER}:${HTTPD_GROUP} ${PN}/data
+	# Fix permissions
+	find ${D}${destdir} -type d | xargs chmod 755
+	find ${D}${destdir} -type f | xargs chmod 644
+
+	use virus-scan && chown -R ${HTTPD_USER}:${HTTPD_GROUP} ${PN}/plugins/virus_scan/includes/virussignatures.php ${PN}/plugins/virus_scan/config_default.php
+	./plugins/virus_scan/includes/virussignatures.php
+}
+
+pkg_postinst() {
+	local DocumentRoot=${HTTPD_ROOT}
+	local destdir=${DocumentRoot}/${PN}
+
+	einfo "Now copy these following configuration files to their destinations and"
+	einfo "edit them to configure your settings.  This is not done automatically so"
+	einfo "that your old settings are not disturbed."
+
+	einfo
+	einfo "${destdir}/config/config_default.php -> ${destdir}/config/config.php"
+	einfo "${destdir}/plugins/retrieveuserdata/config_default.php -> ${destdir}/plugins/retrieveuserdata/config.php"
+	use virus-scan && einfo "${destdir}/plugins/virus_scan/config_default.php -> ${destdir}/plugins/virus_scan/config.php"
+	use crypt && einfo  "${destdir}/plugins/gpg/gpg_local_prefs_default.txt -> ${destdir}/plugins/gpg/gpg_local_prefs.txt"
+	use ldap && einfo  "${destdir}/plugins/ldapuserdata/config_sample.php -> ${destdir}/plugins/ldapuserdata/config.php"
+
+	einfo
+	einfo "You should also create the file '${destdir}/config/admins' containing the users who should have access to administrative options."
+	einfo "Put each login on its own line, and be sure to leave a newline at the end of the file."
+
+	einfo
+	einfo "You can use the console based configuration tool by executing:"
+	einfo "cd ${destdir}/config; perl conf.pl"
+
+	old_ver=`ls ${HTTPD_ROOT}/${PN}-[0-9]* 2>/dev/null`
+	if [ ! -z "${old_ver}" ]; then
+		einfo ""
+		einfo "You will also want to move old SquirrelMail data to"
+		einfo "the new location:"
+		einfo ""
+		einfo "\tmv ${HTTPD_ROOT}/${PN}-OLDVERSION/data/* \\"
+		einfo "\t\t${HTTPD_ROOT}/${PN}/data"
+		einfo "\tmv ${HTTPD_ROOT}/${PN}-OLDVERSION/config/config.php \\"
+		einfo "\t\t${HTTPD_ROOT}/${PN}/config"
+	fi
+}