Revision bump with a patch to finally kill bug #88831, and close bug #87708.

Package-Manager: portage-2.0.51.21-r1

5 files changed, 159 insertions, 11 deletions

diff --git a/net-www/webapp-config/ChangeLog b/net-www/webapp-config/ChangeLog
index e562d84c0c3d..0fd93cf88978 100644
--- a/net-www/webapp-config/ChangeLog
+++ b/net-www/webapp-config/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/webapp-config
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/webapp-config/ChangeLog,v 1.67 2005/04/25 13:50:28 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/webapp-config/ChangeLog,v 1.68 2005/05/07 14:35:00 beu Exp $
+
+*webapp-config-1.10-r13 (07 May 2005)
+
+  07 May 2005; Elfyn McBratney <beu@gentoo.org>
+  +files/webapp-config_unfeck-perms.patch, +webapp-config-1.10-r13.ebuild:
+  Revision bump with a patch to finally kill bug #88831, and close bug #87708.
 
 *webapp-config-1.10-r12 (25 Apr 2005)
 
diff --git a/net-www/webapp-config/Manifest b/net-www/webapp-config/Manifest
index 2a9b50d89446..840dec7cc051 100644
--- a/net-www/webapp-config/Manifest
+++ b/net-www/webapp-config/Manifest
@@ -1,22 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 2c2641fbea8ae821af716c5ad547ab2b webapp-config-1.10-r11.ebuild 1438
-MD5 801b740d19b4a680780bc6c016a0eceb webapp-config-1.9-r2.ebuild 1145
-MD5 396fd3dfd7a18fa33e569a53ae89fc8e webapp-config-1.10-r10.ebuild 1414
-MD5 1b3a7af5aab43121eee269209e3982c4 webapp-config-1.10-r12.ebuild 1647
-MD5 3915962ff490ee43a03622b693ce719c ChangeLog 9839
 MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225
+MD5 e2e8c612832eb0bc9b6e77c7177d88bb ChangeLog 10077
+MD5 801b740d19b4a680780bc6c016a0eceb webapp-config-1.9-r2.ebuild 1145
+MD5 6ddeb4ba719215bd5e134482d1cf69d0 webapp-config-1.10-r13.ebuild 1643
 MD5 3aecf070ae2672567d75e58551b58557 webapp-config-1.10-r6.ebuild 1406
-MD5 ad4be087a0a4be0991e124d97fe377ac files/digest-webapp-config-1.10-r10 74
+MD5 2c2641fbea8ae821af716c5ad547ab2b webapp-config-1.10-r11.ebuild 1438
+MD5 1b3a7af5aab43121eee269209e3982c4 webapp-config-1.10-r12.ebuild 1647
+MD5 396fd3dfd7a18fa33e569a53ae89fc8e webapp-config-1.10-r10.ebuild 1414
+MD5 72b2e4879ffabdc297ea4fd9ae4c3184 files/digest-webapp-config-1.10-r13 74
 MD5 72b2e4879ffabdc297ea4fd9ae4c3184 files/digest-webapp-config-1.10-r11 74
-MD5 72b2e4879ffabdc297ea4fd9ae4c3184 files/digest-webapp-config-1.10-r12 74
+MD5 cd2f731837f835a6ace35db76277012e files/webapp-config_unfeck-perms.patch 3608
 MD5 0c1ae4fd2fcc6de80a24f04993a63d80 files/digest-webapp-config-1.9-r2 72
+MD5 ad4be087a0a4be0991e124d97fe377ac files/digest-webapp-config-1.10-r10 74
 MD5 675f730140fb4b7303082b203e27ba0b files/digest-webapp-config-1.10-r6 73
+MD5 72b2e4879ffabdc297ea4fd9ae4c3184 files/digest-webapp-config-1.10-r12 74
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCbPW5EZCkKN40op4RAn9FAJ4o2W23++goUl6rqiuYJmXBKcaAYgCgoDHC
-qvJx4OgUntutwAONFQAKHH4=
-=u9W5
+iD8DBQFCfNJAjUHll2nfF60RAiD3AJ4zU5FmbhTLojDOrc0Iu4aOirZ6wgCeJwa3
+LiGrk1CJZD6OJ4wTOT/XbTo=
+=rVka
 -----END PGP SIGNATURE-----
diff --git a/net-www/webapp-config/files/digest-webapp-config-1.10-r13 b/net-www/webapp-config/files/digest-webapp-config-1.10-r13
new file mode 100644
index 000000000000..1c996dd65761
--- /dev/null
+++ b/net-www/webapp-config/files/digest-webapp-config-1.10-r13
@@ -0,0 +1 @@
+MD5 bed846f79e779fe64a56568aefe22ed0 webapp-config-1.10-r11.tar.bz2 54094
diff --git a/net-www/webapp-config/files/webapp-config_unfeck-perms.patch b/net-www/webapp-config/files/webapp-config_unfeck-perms.patch
new file mode 100644
index 000000000000..9b97cc7d0189
--- /dev/null
+++ b/net-www/webapp-config/files/webapp-config_unfeck-perms.patch
@@ -0,0 +1,82 @@
+diff -Nup -Nrup webapp-config-1.10-r11.old/config/webapp-config webapp-config-1.10-r11.patched/config/webapp-config
+--- webapp-config-1.10-r11.old/config/webapp-config	2003-07-21 15:52:49.000000000 +0100
++++ webapp-config-1.10-r11.patched/config/webapp-config	2005-05-07 10:13:10.000000000 +0100
+@@ -94,7 +94,8 @@ VHOST_CONFIG_UID="`id -nu`"
+ #
+ # you can override this setting by using the -g switch to webapp-config
+ 
+-VHOST_CONFIG_GID="`id -ng`"
++#VHOST_CONFIG_GID="`id -ng`"
++VHOST_CONFIG_GID="apache"
+ 
+ # what type of shared directories should be created?
+ # the default is 'virtual', which means that each install of the app
+@@ -176,7 +177,7 @@ VHOST_PERMS_SERVEROWNED_DIR=775
+ VHOST_PERMS_SERVEROWNED_FILE=664
+ 
+ VHOST_PERMS_CONFIGOWNED_DIR=755
+-VHOST_PERMS_CONFIGOWNED_FILE=644
++VHOST_PERMS_CONFIGOWNED_FILE=640
+ 
+ VHOST_PERM_DEFAULTOWNED_DIR=755
+ 
+diff -Nup -Nrup webapp-config-1.10-r11.old/sbin/webapp-config webapp-config-1.10-r11.patched/sbin/webapp-config
+--- webapp-config-1.10-r11.old/sbin/webapp-config	2003-07-21 15:52:49.000000000 +0100
++++ webapp-config-1.10-r11.patched/sbin/webapp-config	2005-05-07 13:06:50.000000000 +0100
+@@ -77,7 +77,7 @@ G_PN=
+ G_PVR=
+ G_HOSTNAME="${VHOST_HOSTNAME:-localhost}"
+ G_CONFIG_UID="${VHOST_CONFIG_UID:-root}"
+-G_CONFIG_GID="${VHOST_CONFIG_GID:-root}"
++G_CONFIG_GID="${VHOST_CONFIG_GID:-apache}"
+ G_VIRTUAL_DIRS="${VHOST_CONFIG_VIRTUAL_DIRS:-virtual}"
+ G_VIRTUAL_FILES="${VHOST_CONFIG_VIRTUAL_FILES:-virtual}"
+ G_FORCE_VIRTUAL=0
+@@ -92,7 +92,7 @@ G_PERMS_SERVEROWNED_DIR="${VHOST_PERMS_S
+ G_PERMS_SERVEROWNED_FILE="${VHOST_PERMS_SERVEROWNED_FILE:-664}"
+ G_PERMS_DEFAULTOWNED_DIR="${VHOST_PERMS_DEFAULTOWNED_DIR:-755}"
+ G_PERMS_CONFIGOWNED_DIR="${VHOST_PERMS_CONFIGOWNED_DIR:-755}"
+-G_PERMS_CONFIGOWNED_FILE="${VHOST_PERMS_CONFIGOWNED_FILE:-644}"
++G_PERMS_CONFIGOWNED_FILE="${VHOST_PERMS_CONFIGOWNED_FILE:-640}"
+ G_PERMS_VIRTUAL_DIR="${VHOST_PERMS_VIRTUALOWNED_DIR:-755}"
+ G_PERMS_VIRTUAL_FILE="${VHOST_PERMS_VIRTUALOWNED_FILE:-o-w}"
+ G_PERMS_INSTALLDIR="${VHOST_PERMS_INSTALLDIR:-755}"
+@@ -1967,9 +1967,9 @@ fn_mkfile ()
+ 			# config-owned files are copied in, and then are
+ 			# owned by $G_CONFIG_UID:$G_CONFIG_GID
+ 
+-			libsh_erun cp "$MY_APPDIR/$1/$2" "$3/$my_file"
++			libsh_erun cp -a "$MY_APPDIR/$1/$2" "$3/$my_file"
+ 			libsh_erun chown "$G_CONFIG_UID:$G_CONFIG_GID" "$3/$my_file"
+-			libsh_erun chmod "$G_PERMS_CONFIGOWNED_FILE" "$3/$my_file"
++			#libsh_erun chmod "$G_PERMS_CONFIGOWNED_FILE" "$3/$my_file"
+ 			fn_add_contents "$MY_INSTALLCONTENTS" "file" "$my_type" "$3" "$2" "$4"
+ 			;;
+ 		virtual)
+@@ -1991,7 +1991,7 @@ fn_mkfile ()
+ 			my_contenttype="${G_LINK_TYPE}"
+ 			ln ${G_LINK_OPTIONS} "$MY_APPDIR/$1/$2" "$3/$my_file" 2> /dev/null
+ 			if [ "$?" != 0 ]; then
+-				libsh_erun cp "$MY_APPDIR/$1/$2" "$3/$my_file"
++				libsh_erun cp -a "$MY_APPDIR/$1/$2" "$3/$my_file"
+ 				my_contenttype="file"
+ 			fi
+ 
+@@ -3048,6 +3048,17 @@ main ()
+ 
+ #        echo $G_WORK
+ 	"fn_${G_WORK}"
++
++	# Due to a mild balls-up in earlier versions of webapp-config, some directories
++	# (notably /var/www/$site and /var/www/$site/htdocs) were created mode 777
++	# (a la world-writable).  Because of this, we run some checks after installing
++	# apps to find any such directories, remove the 'others write' bit from said
++	# directories mode, and warn the user that this has been done.  Ugh.
++	libsh_einfo "Checking permissions on web site and document root directories .."
++	find `dirname ${VHOST_ROOT}` -maxdepth 2 -type d -perm -o=w |while read d; do
++		libsh_ewarn "Removing 'others write' bit from directory ${d}"
++		chmod o-w "$d"
++	done
+ }
+ 
+ main "$@"
diff --git a/net-www/webapp-config/webapp-config-1.10-r13.ebuild b/net-www/webapp-config/webapp-config-1.10-r13.ebuild
new file mode 100644
index 000000000000..c935d2b71771
--- /dev/null
+++ b/net-www/webapp-config/webapp-config-1.10-r13.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/webapp-config/webapp-config-1.10-r13.ebuild,v 1.1 2005/05/07 14:35:00 beu Exp $
+
+inherit eutils
+
+DESCRIPTION="Gentoo's installer for web-based applications"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="http://dev.gentoo.org/~stuart/${PN}/${P}-r11.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~arm ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="sys-apps/grep
+	sys-apps/findutils
+	sys-apps/sed
+	sys-apps/gawk
+	sys-apps/coreutils
+	app-shells/bash
+	app-portage/gentoolkit"
+
+S=${WORKDIR}/${P}-r11
+
+src_compile() {
+	# do nothing
+	true
+}
+
+src_install() {
+	dosbin sbin/webapp-config
+	dodir /usr/$(get_libdir)/webapp-config
+	cp -R lib/* ${D}/usr/$(get_libdir)/webapp-config/
+	dodir /etc/vhosts
+	cp config/webapp-config ${D}/etc/vhosts/
+	dodir /usr/share/webapps
+	dodoc examples/phpmyadmin-2.5.4-r1.ebuild AUTHORS.txt README.txt TODO.txt CHANGES.txt examples/postinstall-en.txt
+	doman doc/webapp-config.5 doc/webapp-config.8 doc/webapp.eclass.5
+	dohtml doc/webapp-config.5.html doc/webapp-config.8.html doc/webapp.eclass.5.html
+
+	# use equery instead of deprecated qpkg - bug 73867
+	# Aaron Walker <ka0ttic@gentoo.org> 25 Apr 2005
+	dosed -i 's/qpkg -I -l -nc \($1-$2\)/equery --nocolor files =\1/' \
+		/usr/sbin/webapp-config
+}
+
+pkg_postinst() {
+	echo
+	einfo "Now that you have upgraded webapp-config, you **must** update your"
+	einfo "config files in /etc/vhosts/webapp-config before you emerge any"
+	einfo "packages that use webapp-config."
+	echo
+	epause 5
+}