Changed post-install message - wrong path of config file displayed in message. (bug #35275). Also modified the ebuild to update the configuration file /etc/wwwoffle to use a non-root user and update to the latest configuration.

3 files changed, 38 insertions, 25 deletions

diff --git a/net-www/wwwoffle/ChangeLog b/net-www/wwwoffle/ChangeLog
index be0b57872312..97064f7226d9 100644
--- a/net-www/wwwoffle/ChangeLog
+++ b/net-www/wwwoffle/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/wwwoffle
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/ChangeLog,v 1.24 2004/07/27 13:20:04 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/ChangeLog,v 1.25 2004/07/28 01:44:21 dragonheart Exp $
+
+  28 Jul 2004; Daniel Black <dragonheart@gentoo.org> wwwoffle-2.8b.ebuild:
+  Changed post-install message - wrong path of config file displayed in message.
+  Thanks to Antonio <netbix@tiscali.it> in bug #58315. Also modified the
+  ebuild to make wwwoffled run as the user wwwoffle. Used a config convert
+  script to update the user's previous configuration.
 
   27 Jul 2004; Daniel Black <dragonheart@gentoo.org> -wwwoffle-2.7g.ebuild,
   wwwoffle-2.8b.ebuild:
diff --git a/net-www/wwwoffle/Manifest b/net-www/wwwoffle/Manifest
index b6be8a43310e..81f2bff75bf1 100644
--- a/net-www/wwwoffle/Manifest
+++ b/net-www/wwwoffle/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ef0d36f296d6eec8be478fcad0dba5ad ChangeLog 3709
+MD5 b403b31be93a4407a2e48e9fba565a99 ChangeLog 4068
 MD5 b9f9491ced5882f6eeb01b8298c8cf12 wwwoffle-2.7h.ebuild 1853
-MD5 a79350ec1144d47abe0aa675b88f019e wwwoffle-2.8b.ebuild 4206
+MD5 2e4b46ecde2ad33d6da74c054c508e3d wwwoffle-2.8b.ebuild 4536
 MD5 1d58b504a9415220f2ee8c3b62e27aa9 metadata.xml 500
 MD5 6d83ded8196e666519a23307700946a8 files/wwwoffled-online-2.8b 524
 MD5 a6914435a2f1de064fcdc7c784a2b85f files/digest-wwwoffle-2.7h 62
@@ -13,7 +13,7 @@ MD5 009de7420924ad30ca9611df2d1d6299 files/digest-wwwoffle-2.8b 62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFBBlYVmdTrptrqvGERApY0AKCXkG0Zov3om9mHv82Ek0RCJ+X49gCeKMMK
-g2IDJpcjquwr6n8TNcKspvs=
-=aook
+iD8DBQFBBwOfmdTrptrqvGERAj8xAKCIWNik8QJof4gr9beXJUapkTQ7TACeLH8Z
+8B0YGxqUYZAh++dyH9sOYMo=
+=A5LK
 -----END PGP SIGNATURE-----
diff --git a/net-www/wwwoffle/wwwoffle-2.8b.ebuild b/net-www/wwwoffle/wwwoffle-2.8b.ebuild
index 8f390c40f3e9..f6887b7a1dd7 100644
--- a/net-www/wwwoffle/wwwoffle-2.8b.ebuild
+++ b/net-www/wwwoffle/wwwoffle-2.8b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/wwwoffle-2.8b.ebuild,v 1.8 2004/07/27 13:20:04 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/wwwoffle-2.8b.ebuild,v 1.9 2004/07/28 01:44:21 dragonheart Exp $
 
 inherit eutils
 
@@ -28,20 +28,12 @@ DEPEND=">=sys-apps/sed-4
 RDEPEND="sys-libs/zlib
 	virtual/libc"
 
-pkg_setup() {
-	# Add a wwwoffle user
-	enewgroup wwwoffle
-	enewuser wwwoffle -1 /bin/false /var/spool/wwwoffle wwwoffle
-}
-
 src_unpack(){
 	unpack ${A}
 	cd ${S}
 	sed -i -e 's#$(TAR) xpf #$(TAR) --no-same-owner -xpf #' cache/Makefile.in
 	sed -i -e "s#^docdir=.*#docdir=\$(DESTDIR)\${prefix}/share/doc/${P}#" doc/Makefile.in
-	# change to user wwwoffle
-	sed -i -e 's/\(run-[gu]id\)[ \t]*=[ \t]*[a-zA-Z0-9]*[ \t]*$/\1 = wwwoffle/g' \
-		conf/wwwoffle.conf
+
 
 	### adjust path for htdig - /usr/share/webapps/${PF}/cgi-bin/ 
 	## (as per http://www.gentoo.org/proj/en/glep/glep-0011.html)
@@ -53,19 +45,35 @@ src_unpack(){
 }
 
 src_compile() {
+
 	local myconf
 	myconf="`use_with ipv6`"
 	econf --with-confdir=/etc ${myconf} || die
 	emake || die
+
+	local conffile=conf/wwwoffle.conf.template
+	if [ -f ${ROOT}/etc/wwwoffle.conf ]
+	then
+		einfo "Upgrading current configuration file"
+		cp ${ROOT}/etc/wwwoffle.conf conf/wwwoffle.conf
+		conf/upgrade-config.pl conf/wwwoffle.conf
+		# Hack to stop regeneration of config file
+		touch conf/conf-file
+		conffile=conf/wwwoffle.conf
+	fi
+	# change to user wwwoffle
+	einfo "Changing the default user (and group) to wwwoffle"
+	sed -i -e 's/\(run-[gu]id\)[ \t]*=[ \t]*[a-zA-Z0-9]*[ \t]*$/\1 = wwwoffle/g' \
+		${conffile}
 }
 
 pkg_preinst() {
 
-	# Add a wwwoffle user - duplicated for binary packages
+	# Add a wwwoffle user - required here for binary packages
 	enewgroup wwwoffle
 	enewuser wwwoffle -1 /bin/false /var/spool/wwwoffle wwwoffle
 
-	# TODO rootjail ${ROOT}
+	# TODO maybe rootjail ${ROOT}
 	source /etc/init.d/functions.sh
 	if [ -L ${svcdir}/started/wwwoffled ]; then
 		einfo "The wwwoffled init script is running. I'll stop it, merge the new files and
@@ -108,11 +116,6 @@ src_install() {
 	echo -e "\n# IMPORTANT: Be sure to run depscan.sh after modifiying IFACE" >>  ${config}
 	echo "IFACE=ppp0" >> ${config}
 
-	# for those upgrading...(removed)
-	#[ -f ${ROOT}/etc/wwwoffle.conf ] && \
-	#	sed -e 's/\(run-[gu]id\)[ \t]*=[ \t]*[a-zA-Z0-9]*[ \t]*$/\1 = wwwoffle/g' \
-	#		${ROOT}/etc/wwwoffle.conf > ${D}/etc/wwwoffle/wwwoffle.conf
-
 }
 
 pkg_postinst() {
@@ -126,7 +129,11 @@ pkg_postinst() {
 		ewarn "wwwoffled was stopped. /etc/init.d/wwwoffled start to restart AFTER etc-update"
 
 
-	einfo "wwwoffled should run as an ordinary user now. Please change run-uid and run-gid to wwwoffle in"
-	einfo "your /etc/wwwoffle/wwwoffle.conf"
+	einfo "wwwoffled should run as an ordinary user now. The run-uid and run-gid should be set"
+	einfo "to \"wwwoffle\" in your /etc/wwwoffle.conf. Please uncomment this if it hasn't been already"
+
+	einfo "This is for your own security. Otherwise wwwoffle is run as root which is relay bad if"
+	einfo "there is an exploit in this program that allows remote/local users to execute arbitary"
+	einfo "commands as the root user."
 
 }