Version bump

Package-Manager: portage-2.0.51.19

11 files changed, 32 insertions, 147 deletions

diff --git a/net-www/webapp-config/ChangeLog b/net-www/webapp-config/ChangeLog
index c68f35d9d761..7201758115da 100644
--- a/net-www/webapp-config/ChangeLog
+++ b/net-www/webapp-config/ChangeLog
@@ -1,6 +1,13 @@
 # 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.80 2005/05/18 15:06:45 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/webapp-config/ChangeLog,v 1.81 2005/05/30 19:54:20 stuart Exp $
+
+*webapp-config-1.11 (30 May 2005)
+
+  30 May 2005; Stuart Herbert <stuart@gentoo.org>
+  -webapp-config-1.10-r14.ebuild, +webapp-config-1.11.ebuild:
+  Removed 1.10-r14 (dangerously broken)
+  Added 1.11 (includes fixes for all known security problems, and most bugs)
 
   18 May 2005; Elfyn McBratney <beu@gentoo.org>
   -webapp-config-1.10-r15.ebuild:
diff --git a/net-www/webapp-config/Manifest b/net-www/webapp-config/Manifest
index a28bc9a73a0a..a205c3f6099d 100644
--- a/net-www/webapp-config/Manifest
+++ b/net-www/webapp-config/Manifest
@@ -1,26 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225
-MD5 d5beabb4dd32b8ec790a0eab811e7c51 ChangeLog 11552
-MD5 801b740d19b4a680780bc6c016a0eceb webapp-config-1.9-r2.ebuild 1145
-MD5 3aecf070ae2672567d75e58551b58557 webapp-config-1.10-r6.ebuild 1406
-MD5 88c4aa4e720a649751a8a32ec3d81d7b webapp-config-1.10-r14.ebuild 2062
-MD5 2c2641fbea8ae821af716c5ad547ab2b webapp-config-1.10-r11.ebuild 1438
+MD5 2d4935ddf3d678083b54d51017ca65b6 ChangeLog 11820
+MD5 5fa2a14e6a01fde1f4d9ef5c75319974 webapp-config-1.9-r2.ebuild 1143
+MD5 f6d518ef4ea229230b1bcf85d4ed9a4e webapp-config-1.10-r6.ebuild 1406
+MD5 0a227eed730e13eda60077d2ad92b79a webapp-config-1.10-r10.ebuild 1414
+MD5 832c7b1b4124880c77156ae93673934d 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 4ce58d748ebda3c89b14a37388b322e5 webapp-config-1.11.ebuild 1436
 MD5 72b2e4879ffabdc297ea4fd9ae4c3184 files/digest-webapp-config-1.10-r11 74
 MD5 0c1ae4fd2fcc6de80a24f04993a63d80 files/digest-webapp-config-1.9-r2 72
-MD5 ad4be087a0a4be0991e124d97fe377ac files/digest-webapp-config-1.10-r10 74
-MD5 e605a4d1868a4a3e17cd2ecd474f7076 files/webapp-config_fixperms.patch 2786
 MD5 675f730140fb4b7303082b203e27ba0b files/digest-webapp-config-1.10-r6 73
+MD5 ad4be087a0a4be0991e124d97fe377ac files/digest-webapp-config-1.10-r10 74
 MD5 72b2e4879ffabdc297ea4fd9ae4c3184 files/digest-webapp-config-1.10-r12 74
-MD5 72b2e4879ffabdc297ea4fd9ae4c3184 files/digest-webapp-config-1.10-r14 74
-MD5 b9efc67836c3d94009bea1f83cc92027 files/webapp-config_improved-tmpfile-handling.patch 973
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCi1pBjUHll2nfF60RAh1nAKDBycEHLtIJxCnmH+uC6InWmLC6IwCgytoE
-XHyF8PthX5JZMHbGjorY7BQ=
-=/vLr
------END PGP SIGNATURE-----
+MD5 6aad9c4cd4548cb948cd4035286d6ac7 files/digest-webapp-config-1.11 70
diff --git a/net-www/webapp-config/files/digest-webapp-config-1.10-r14 b/net-www/webapp-config/files/digest-webapp-config-1.10-r14
deleted file mode 100644
index 1c996dd65761..000000000000
--- a/net-www/webapp-config/files/digest-webapp-config-1.10-r14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bed846f79e779fe64a56568aefe22ed0 webapp-config-1.10-r11.tar.bz2 54094
diff --git a/net-www/webapp-config/files/digest-webapp-config-1.11 b/net-www/webapp-config/files/digest-webapp-config-1.11
new file mode 100644
index 000000000000..30ffc0afef32
--- /dev/null
+++ b/net-www/webapp-config/files/digest-webapp-config-1.11
@@ -0,0 +1 @@
+MD5 56f6709ebc07e43382f9ac07bed0cc63 webapp-config-1.11.tar.bz2 54859
diff --git a/net-www/webapp-config/files/webapp-config_fixperms.patch b/net-www/webapp-config/files/webapp-config_fixperms.patch
deleted file mode 100644
index b9afd2cd8bdc..000000000000
--- a/net-www/webapp-config/files/webapp-config_fixperms.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -Nup -Nrup webapp-config-1.10-r11.orig/config/webapp-config webapp-config-1.10-r11.patched-1/config/webapp-config
---- webapp-config-1.10-r11.orig/config/webapp-config	2003-07-21 15:52:49.000000000 +0100
-+++ webapp-config-1.10-r11.patched-1/config/webapp-config	2005-05-09 05:30:51.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.orig/sbin/webapp-config webapp-config-1.10-r11.patched-1/sbin/webapp-config
---- webapp-config-1.10-r11.orig/sbin/webapp-config	2003-07-21 15:52:49.000000000 +0100
-+++ webapp-config-1.10-r11.patched-1/sbin/webapp-config	2005-05-09 05:30:12.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}"
-@@ -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/files/webapp-config_improved-tmpfile-handling.patch b/net-www/webapp-config/files/webapp-config_improved-tmpfile-handling.patch
deleted file mode 100644
index 38211296044c..000000000000
--- a/net-www/webapp-config/files/webapp-config_improved-tmpfile-handling.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Nup -Nrup webapp-config-1.10-r11.orig/sbin/webapp-config webapp-config-1.10-r11.patched-2/sbin/webapp-config
---- webapp-config-1.10-r11.orig/sbin/webapp-config	2003-07-21 15:52:49.000000000 +0100
-+++ webapp-config-1.10-r11.patched-2/sbin/webapp-config	2005-05-09 05:36:20.000000000 +0100
-@@ -2444,9 +2444,15 @@ fn_remove_dir ()
- 
- fn_remove_emptylines ()
- {
--	egrep -v '^$' "$1" > /tmp/$$
--	cat /tmp/$$ > "$1"
--	rm -f /tmp/$$
-+	local tfile=`mktemp /tmp/webapp-config.XXXXXXXXXX`
-+	if [ $? -ne 0 ]; then
-+	  rm -f $tfile
-+	  libsh_edie "mktemp failed"
-+	fi
-+
-+	egrep -v '^$' "$1" > $tfile
-+	cat $tfile > "$1"
-+	rm -f $tfile
- }
- 
- # ------------------------------------------------------------------------
-@@ -2714,7 +2720,11 @@ fn_show_postinst ()
- 		return
- 	fi
- 
--	local my_file="/tmp/$$.postinst.txt"
-+	local my_file=`mktemp /tmp/webapp-config.postinstall.XXXXXXXXXX`
-+	if [ $? -ne 0 ]; then
-+	  rm -f $my_file
-+	  libsh_edie "mktemp failed"
-+	fi
- 
- 	fn_run_vars
- 
diff --git a/net-www/webapp-config/webapp-config-1.10-r10.ebuild b/net-www/webapp-config/webapp-config-1.10-r10.ebuild
index 7e502c4b8465..734ca8a19368 100644
--- a/net-www/webapp-config/webapp-config-1.10-r10.ebuild
+++ b/net-www/webapp-config/webapp-config-1.10-r10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-r10.ebuild,v 1.10 2004/09/07 22:57:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/webapp-config/webapp-config-1.10-r10.ebuild,v 1.11 2005/05/30 19:54:20 stuart Exp $
 
 inherit eutils
 
diff --git a/net-www/webapp-config/webapp-config-1.10-r11.ebuild b/net-www/webapp-config/webapp-config-1.10-r11.ebuild
index 6c8ac975c31d..438736f2f8bf 100644
--- a/net-www/webapp-config/webapp-config-1.10-r11.ebuild
+++ b/net-www/webapp-config/webapp-config-1.10-r11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-r11.ebuild,v 1.2 2004/09/21 23:39:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/webapp-config/webapp-config-1.10-r11.ebuild,v 1.3 2005/05/30 19:54:20 stuart Exp $
 
 inherit eutils
 
diff --git a/net-www/webapp-config/webapp-config-1.10-r6.ebuild b/net-www/webapp-config/webapp-config-1.10-r6.ebuild
index 32cf27c0051e..8c2c4064288f 100644
--- a/net-www/webapp-config/webapp-config-1.10-r6.ebuild
+++ b/net-www/webapp-config/webapp-config-1.10-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-r6.ebuild,v 1.7 2004/09/07 22:57:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/webapp-config/webapp-config-1.10-r6.ebuild,v 1.8 2005/05/30 19:54:20 stuart Exp $
 
 inherit eutils
 
diff --git a/net-www/webapp-config/webapp-config-1.10-r14.ebuild b/net-www/webapp-config/webapp-config-1.11.ebuild
index ad5f91d00569..9cd980528b3b 100644
--- a/net-www/webapp-config/webapp-config-1.10-r14.ebuild
+++ b/net-www/webapp-config/webapp-config-1.11.ebuild
@@ -1,16 +1,16 @@
 # 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-r14.ebuild,v 1.9 2005/05/10 22:51:58 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/webapp-config/webapp-config-1.11.ebuild,v 1.1 2005/05/30 19:54:20 stuart 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"
+SRC_URI="http://dev.gentoo.org/~stuart/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~arm ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
@@ -22,20 +22,11 @@ RDEPEND="sys-apps/grep
 	app-shells/bash
 	app-portage/gentoolkit"
 
-S=${WORKDIR}/${P}-r11
+S=${WORKDIR}/${P}
 
-src_unpack() {
-	unpack ${A} || die "unpack failed"
-	cd "${S}" || die "cd '${S}' failed"
-
-	# Have webapp-config fixup permissions on site and document root directories
-	# that are/have previously been installed with mode 777 (word-writable).
-	# Bugs #88831 and #87708.
-	epatch ${FILESDIR}/webapp-config_fixperms.patch
-
-	# Improve temporary file handling code with the use of mktemp(1), bug
-	# #91785.
-	epatch ${FILESDIR}/webapp-config_improved-tmpfile-handling.patch
+src_compile() {
+	# do nothing
+	true
 }
 
 src_install() {
@@ -48,11 +39,6 @@ src_install() {
 	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() {
diff --git a/net-www/webapp-config/webapp-config-1.9-r2.ebuild b/net-www/webapp-config/webapp-config-1.9-r2.ebuild
index f0978fccea00..1a371c146f96 100644
--- a/net-www/webapp-config/webapp-config-1.9-r2.ebuild
+++ b/net-www/webapp-config/webapp-config-1.9-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.9-r2.ebuild,v 1.6 2004/07/07 02:39:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/webapp-config/webapp-config-1.9-r2.ebuild,v 1.7 2005/05/30 19:54:20 stuart Exp $
 
 DESCRIPTION="Gentoo's installer for web-based applications"
 HOMEPAGE="http://www.gentoo.org/"