changing chown. See #23116.

3 files changed, 11 insertions, 10 deletions

diff --git a/net-mail/squirrelmail/ChangeLog b/net-mail/squirrelmail/ChangeLog
index 021196db5ffa..661598fb09bd 100644
--- a/net-mail/squirrelmail/ChangeLog
+++ b/net-mail/squirrelmail/ChangeLog
@@ -1,6 +1,10 @@
 # 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.28 2003/11/02 15:30:54 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/squirrelmail/ChangeLog,v 1.29 2003/11/24 09:52:43 mholzer Exp $
+
+  24 Nov 2003; Martin Holzer <mholzer@gentoo.org>
+  squirrelmail-1.4.2-r1.ebuild:
+  changing chown. See #23116.
 
 *squirrelmail-1.4.2-r1 (02 Nov 2003)
 
diff --git a/net-mail/squirrelmail/Manifest b/net-mail/squirrelmail/Manifest
index e9ff2b1ad48c..0bff9024bce8 100644
--- a/net-mail/squirrelmail/Manifest
+++ b/net-mail/squirrelmail/Manifest
@@ -1,8 +1,8 @@
-MD5 90de7137df54a34fe5ff3212d84ac540 ChangeLog 4777
-MD5 b056818f0b150e806edb75d8bae139d0 squirrelmail-1.4.1.ebuild 1634
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 d1575c6a57fb6ff51453d802c0a4ac97 ChangeLog 4890
 MD5 b0d4e1ec1bac1c5cb76cb743718f490e squirrelmail-1.4.2.ebuild 1639
-MD5 1c8bd818edc8c07ad0752da97cc09633 squirrelmail-1.4.2-r1.ebuild 2154
+MD5 def689619e1ae9704ed4c87118119890 squirrelmail-1.4.2-r1.ebuild 2057
+MD5 b056818f0b150e806edb75d8bae139d0 squirrelmail-1.4.1.ebuild 1634
 MD5 92831f98ddb4e63a5f42fb451f59518a files/digest-squirrelmail-1.4.1 72
 MD5 96aac58deae88b397543c2a244b252a3 files/digest-squirrelmail-1.4.2 72
 MD5 96aac58deae88b397543c2a244b252a3 files/digest-squirrelmail-1.4.2-r1 72
diff --git a/net-mail/squirrelmail/squirrelmail-1.4.2-r1.ebuild b/net-mail/squirrelmail/squirrelmail-1.4.2-r1.ebuild
index 55b9673b03d9..0af4452acf7a 100644
--- a/net-mail/squirrelmail/squirrelmail-1.4.2-r1.ebuild
+++ b/net-mail/squirrelmail/squirrelmail-1.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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-r1.ebuild,v 1.1 2003/11/02 15:30:54 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/squirrelmail/squirrelmail-1.4.2-r1.ebuild,v 1.2 2003/11/24 09:52:43 mholzer Exp $
 
 inherit webapp-apache
 
@@ -23,13 +23,13 @@ HTTPD_USER="apache"
 HTTPD_GROUP="apache"
 
 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
-	webapp-pkg_setup "${NO_WEBSERVER}"
 	einfo "Installing into ${ROOT}${HTTPD_ROOT}."
 }
 
@@ -44,7 +44,7 @@ src_install() {
 	dodir ${destdir}
 	cp -r . ${D}/${HTTPD_ROOT}/${PN}
 	cd ${D}/${HTTPD_ROOT}
-	chown -R ${HTTPD_USER}.${HTTPD_GROUP} ${PN}/data
+	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
@@ -54,9 +54,6 @@ pkg_postinst() {
 	local DocumentRoot=${HTTPD_ROOT}
 	local destdir=${DocumentRoot}/${PN}
 
-	einfo "Squirrelmail NO LONGER requires PHP to have"
-	einfo "'register_globals = On' !!!"
-	einfo
 	einfo "now copy ${destdir}/config/config_default.php to"
 	einfo "${destdir}/config/config.php"
 	einfo "and edit your settings"