Set default data dir to be in htocs - see bug #180796.

Package-Manager: portage-2.1.2.10

4 files changed, 260 insertions, 8 deletions

diff --git a/mail-client/squirrelmail/ChangeLog b/mail-client/squirrelmail/ChangeLog
index 2e1ac4a09f34..a428aa10a665 100644
--- a/mail-client/squirrelmail/ChangeLog
+++ b/mail-client/squirrelmail/ChangeLog
@@ -1,6 +1,12 @@
 # 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.93 2007/06/10 16:16:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.94 2007/06/10 16:26:47 eradicator Exp $
+
+*squirrelmail-1.4.10a-r1 (10 Jun 2007)
+
+  10 Jun 2007; Jeremy Huddleston <eradicator@gentoo.org>
+  +squirrelmail-1.4.10a-r1.ebuild:
+  Set default data dir to be in htocs - see bug #180796.
 
 *squirrelmail-1.5.1-r5 (10 Jun 2007)
 
diff --git a/mail-client/squirrelmail/Manifest b/mail-client/squirrelmail/Manifest
index 61501d573e66..5aa364e340b5 100644
--- a/mail-client/squirrelmail/Manifest
+++ b/mail-client/squirrelmail/Manifest
@@ -49,6 +49,10 @@ DIST secure_login-1.3-1.2.8.tar.gz 16075 RMD160 1c8ef7f0f02846f59c9088f4703748d9
 DIST show_ssl_link-2.2-1.2.8.tar.gz 13193 RMD160 8e0669c674453cab31b0493ab1404e0a0097ad8d SHA1 39073e417ce28080f9206d068cbfa4161284be3e SHA256 70ecefc01003fd5dddc13e6dd7bf4e6ab4663426a9990c894e353fb96ebb4a1a
 DIST squirrelmail-1.4.10a.tar.bz2 484523 RMD160 4337f99575e1ada931cea461679b96acd5b4901d SHA1 b8a84e1fb69b6922c6bf817015201d57a82aa843 SHA256 b5e047c0a32b758b67e15772dc9c467d0ee830372858f7b9442a9a6aa6caf854
 DIST squirrelmail-1.5.1.tar.bz2 904370 RMD160 a59df6a73e5694b54d2791d4c139941ef220d2d1 SHA1 e6aa8fe560b17a1205b3af288e31a2404397f44e SHA256 3e7f370dd869fb57ed5b3c159d7450c1180309fffeda9dbf168b2d456f477909
+EBUILD squirrelmail-1.4.10a-r1.ebuild 5756 RMD160 7f29d3a79a03d1c879550c6c8a007184e7a8098b SHA1 6e7b4a3b9fed02200f36ea971029ce47cb11ddf3 SHA256 99fbd8737910071512065b4812550f54b566215497d84682aee189ce997b2629
+MD5 213194b241da31700646742c3a4b4f9a squirrelmail-1.4.10a-r1.ebuild 5756
+RMD160 7f29d3a79a03d1c879550c6c8a007184e7a8098b squirrelmail-1.4.10a-r1.ebuild 5756
+SHA256 99fbd8737910071512065b4812550f54b566215497d84682aee189ce997b2629 squirrelmail-1.4.10a-r1.ebuild 5756
 EBUILD squirrelmail-1.4.10a.ebuild 5663 RMD160 e131fbb2d41d6cb38f2a1ef73d50b10337c66de4 SHA1 9364a2e7197f5cf31b389088bea3a90f6c86b857 SHA256 dedbb2775e6383728378e57d67e432f9107ed6f49b5ee04c1b36e9cd92ec4d93
 MD5 60ec940473d48ac247ffe8f0b788d9e2 squirrelmail-1.4.10a.ebuild 5663
 RMD160 e131fbb2d41d6cb38f2a1ef73d50b10337c66de4 squirrelmail-1.4.10a.ebuild 5663
@@ -57,10 +61,10 @@ EBUILD squirrelmail-1.5.1-r5.ebuild 5382 RMD160 b665c27629ee8c32b0fcdd2bd164cfca
 MD5 6a2ac91e56bd47f13f4af39383e19835 squirrelmail-1.5.1-r5.ebuild 5382
 RMD160 b665c27629ee8c32b0fcdd2bd164cfca9f00ceea squirrelmail-1.5.1-r5.ebuild 5382
 SHA256 25ea6d2bc90bbc3a09955bd5f82578cfa60cdb4c33b56ae17c9fb9cc3c7726a5 squirrelmail-1.5.1-r5.ebuild 5382
-MISC ChangeLog 22624 RMD160 bd89c9015fbca30f376082cfe8fc9ce84d1a1821 SHA1 4757aa797702593e8c8a3de818e95e5314bee817 SHA256 0ac294e47a540ed5068462b68207f893062448ee4760aa8bcbbd64bc8595f5e4
-MD5 7aa32d0d054964d6d5d021867450bc7b ChangeLog 22624
-RMD160 bd89c9015fbca30f376082cfe8fc9ce84d1a1821 ChangeLog 22624
-SHA256 0ac294e47a540ed5068462b68207f893062448ee4760aa8bcbbd64bc8595f5e4 ChangeLog 22624
+MISC ChangeLog 22814 RMD160 01ef6fb99a0d3257aff8c61f9281f6bf0ca9b0df SHA1 9c9763521eed512a5178865ff7f387ac5459e8fc SHA256 b7bfd1dea1118d3f7ca3a177d1a17f4b2eae43e4baeca75f1eb20ab5c358a65f
+MD5 f635c5bce1f54c6886c40477b4658c8c ChangeLog 22814
+RMD160 01ef6fb99a0d3257aff8c61f9281f6bf0ca9b0df ChangeLog 22814
+SHA256 b7bfd1dea1118d3f7ca3a177d1a17f4b2eae43e4baeca75f1eb20ab5c358a65f ChangeLog 22814
 MISC metadata.xml 258 RMD160 d2eb817fc980ecb7e48b90373e39e38538ddc060 SHA1 f969f9d21f42c6347a0509bacb7382b390c10ce8 SHA256 0c209e720f028e6e9b098d29eab884753668aea3f47b56e44f3271ae60750680
 MD5 08cd5d6f4b8f101029a526ea0a1ea4b1 metadata.xml 258
 RMD160 d2eb817fc980ecb7e48b90373e39e38538ddc060 metadata.xml 258
@@ -68,13 +72,16 @@ SHA256 0c209e720f028e6e9b098d29eab884753668aea3f47b56e44f3271ae60750680 metadata
 MD5 7f2a8fb8b2364d0b9d7aa11a745ba06c files/digest-squirrelmail-1.4.10a 2644
 RMD160 acbabc902476bf5e30a8b42c01961bb08517a1c3 files/digest-squirrelmail-1.4.10a 2644
 SHA256 8903858a6e5dc2522f4bd4d9769dac4412a5938fed66610240c4461574922928 files/digest-squirrelmail-1.4.10a 2644
+MD5 7f2a8fb8b2364d0b9d7aa11a745ba06c files/digest-squirrelmail-1.4.10a-r1 2644
+RMD160 acbabc902476bf5e30a8b42c01961bb08517a1c3 files/digest-squirrelmail-1.4.10a-r1 2644
+SHA256 8903858a6e5dc2522f4bd4d9769dac4412a5938fed66610240c4461574922928 files/digest-squirrelmail-1.4.10a-r1 2644
 MD5 df34174cb0da3049a1a8f4097e868a97 files/digest-squirrelmail-1.5.1-r5 2638
 RMD160 54e2603d572f3edbe6cf18c6dfea5d5227e17474 files/digest-squirrelmail-1.5.1-r5 2638
 SHA256 674d0cca4250cd9f2ebe3f41e6627010dbe15ff8bf309edbf8bd10a743795a98 files/digest-squirrelmail-1.5.1-r5 2638
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGbCPzjC1Anjf1NmMRAnsJAJwKdXoHABUksabBZDbJgy/j164HkQCfbfoO
-YQhA1IfRgKXxFj5i6DTV5pA=
-=DsUk
+iD8DBQFGbCZTjC1Anjf1NmMRAhV8AJ9ZXTbkmkvApkTsTipXpsoehLJ/KgCcDXJi
+QOQZB5pg72AUJsuKSNsFsT8=
+=lQnN
 -----END PGP SIGNATURE-----
diff --git a/mail-client/squirrelmail/files/digest-squirrelmail-1.4.10a-r1 b/mail-client/squirrelmail/files/digest-squirrelmail-1.4.10a-r1
new file mode 100644
index 000000000000..8b1a96437153
--- /dev/null
+++ b/mail-client/squirrelmail/files/digest-squirrelmail-1.4.10a-r1
@@ -0,0 +1,30 @@
+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 eaa0e8835b8d7d451500aad907c22e24 all_locales-1.4.9-20070106.tar.bz2 2699569
+RMD160 9da0e3df1bc5a89b861f7dd9ac244a3885a45417 all_locales-1.4.9-20070106.tar.bz2 2699569
+SHA256 04ad3e37042deb8c5668946c3364cd53d9c30b2486f24deee4d71c05fa584423 all_locales-1.4.9-20070106.tar.bz2 2699569
+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 05cb2cb55ca288d5ed7d90cfc7da195c compatibility-2.0.7-1.0.tar.gz 29819
+RMD160 bffb4fa68338bfcd3fce8cff8f3d30c40d5e23f4 compatibility-2.0.7-1.0.tar.gz 29819
+SHA256 c72f8de558727adccec751d6a5bd6efbe5aa2b225f90256a15dfe0db8f73efde compatibility-2.0.7-1.0.tar.gz 29819
+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 3dcd0c5bca4053621226ba7df955e51f secure_login-1.3-1.2.8.tar.gz 16075
+RMD160 1c8ef7f0f02846f59c9088f4703748d99bcd4c77 secure_login-1.3-1.2.8.tar.gz 16075
+SHA256 0c44112114e1d3f2b8615b5b586631fb50fb1877037a438c37f4b890f46b0ccc secure_login-1.3-1.2.8.tar.gz 16075
+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 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/squirrelmail-1.4.10a-r1.ebuild b/mail-client/squirrelmail/squirrelmail-1.4.10a-r1.ebuild
new file mode 100644
index 000000000000..845322bd8436
--- /dev/null
+++ b/mail-client/squirrelmail/squirrelmail-1.4.10a-r1.ebuild
@@ -0,0 +1,209 @@
+# 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.10a-r1.ebuild,v 1.1 2007/06/10 16:26:47 eradicator Exp $
+
+IUSE="crypt ldap spell ssl filter mysql postgres nls"
+
+inherit webapp eutils
+
+DESCRIPTION="Webmail for nuts!"
+
+# Plugin Versions
+COMPATIBILITY_VER=2.0.7-1.0
+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.3-1.2.8
+SHOWSSL_VER=2.2-1.2.8
+LOCALES_VER=1.4.9-20070106
+
+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
+
+	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 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.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_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 filter; then
+		docinto amavisnewsql
+		for doc in plugins/amavisnewsql/{CHANGELOG,README,UPGRADE}; 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 filter && configs="${configs} plugins/amavisnewsql/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
+
+	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
+}