fix #166853, #181938, #206669

Package-Manager: portage-2.1.4.1

5 files changed, 145 insertions, 3 deletions

diff --git a/app-admin/webapp-config/ChangeLog b/app-admin/webapp-config/ChangeLog
index 337659138137..276651c431f5 100644
--- a/app-admin/webapp-config/ChangeLog
+++ b/app-admin/webapp-config/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/webapp-config
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.61 2007/09/09 21:11:40 hollow Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.62 2008/02/17 18:06:02 hollow Exp $
+
+*webapp-config-1.50.16-r3 (17 Feb 2008)
+
+  17 Feb 2008; Benedikt Böhm <hollow@gentoo.org>
+  +files/webapp-config-1.50.16-absolute-paths.patch,
+  +files/webapp-config-1.50.16-htdocs-symlink.patch,
+  +webapp-config-1.50.16-r3.ebuild:
+  fix #166853, #181938, #206669
 
 *webapp-config-1.50.16-r2 (09 Sep 2007)
 
diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest
index 29b4bb14da80..0197acf35716 100644
--- a/app-admin/webapp-config/Manifest
+++ b/app-admin/webapp-config/Manifest
@@ -1,7 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX webapp-config-1.50.16-absolute-paths.patch 1707 RMD160 80f07c8b98c69e13d1c5f7714adeff5a1bc63ff3 SHA1 e3f6b479066b071d6c7d622cba158d9ccc93dcda SHA256 695583ae83a76f7b747cbd3da34a505df2bf0fbac11369d8b0b731b35ce67105
 AUX webapp-config-1.50.16-apache-move.patch 507 RMD160 f86f9a966c0848c36a4404a93e2974357b4e9d6a SHA1 b963fb9cc2b6f10e6dbcf5a3db1178be20268fd6 SHA256 9a78c618d750c79a16d216e00f0b8a9c4058e7ba3d23011d999206e9de825790
 AUX webapp-config-1.50.16-baselayout2.patch 511 RMD160 cfe440f27a29d0db4b536db5b3fe5655ccf1120b SHA1 1d69d0d88a750b05389b71771b371650eaa89913 SHA256 b94bbd0075f22b735189bd6af334ee68f563470632f96f53fa055a0655fb0360
+AUX webapp-config-1.50.16-htdocs-symlink.patch 509 RMD160 ad53b2107e5f51626f3996925c9562d77fc1fdb5 SHA1 0adaefe78f272f32a939f56f941634c7f3c8ed6a SHA256 24e48a42f2b08010ad25f5f83bf4f3f47686fbcd786c0547e95c054cf7021b75
 DIST webapp-config-1.50.16.tar.gz 103576 RMD160 d3ab1b27d9b279241d2c9ff3b764ac0b9699b0a0 SHA1 dae0b27bf731116516aed16fd10dc75c0146d332 SHA256 cd5cf95d0abc9b469b08e6fffa885df10d3651d558164d35efe8e45df1fc8a5f
 EBUILD webapp-config-1.50.16-r1.ebuild 1944 RMD160 8f419a2b5b2ed2025f1219c3d3977c818f3e09a3 SHA1 3701c901854ba8baf2a84e1cb1c3e567e32987bb SHA256 90a1400ec225dcd57c0e5fffab61c387fa0cc513feb4812e7eef2a0ca22c65c9
 EBUILD webapp-config-1.50.16-r2.ebuild 2001 RMD160 fccd162bb156d737cff33712321f8cfa9da6f329 SHA1 454eee2688299acdf144d52e63e6f4984593b00b SHA256 6537e9a4b99d5d843cbb0c8e77d969df15ddff455119a7cea060cf09a8cf6563
-MISC ChangeLog 22447 RMD160 6207422854eaa5873dfd6de4435effb1d2ab81a0 SHA1 5245aee817209076daf0b162cb2f8e72165f3809 SHA256 6ba428b9fdb490e3f6ebfaa7843a73d4fb2e6c0e5e023e91e48e7c8b44b86a24
+EBUILD webapp-config-1.50.16-r3.ebuild 1960 RMD160 b4eff315c5138556c6515322f52f70d8e3bc73cb SHA1 f1c9861b1cb6d28b725849ec7f2c58399a216d37 SHA256 73253c29139dc4312b253615a6576151c8501a4b6ba60132b459bc3956ac4651
+MISC ChangeLog 22713 RMD160 56c670ec0fd0e36241ec06ff90b970a57967b149 SHA1 a97e074aae7674024ff54bd6c5e56fe4ae5922d2 SHA256 427a870dcc6e854a4f7a3ae4d115b9264a77c84ceb96346b9e821ee638f4b881
 MISC metadata.xml 225 RMD160 7081530104e84534030353cb15c4a541bb8d5e05 SHA1 af63626385169ab58c44695ebe4df705d455f94b SHA256 0986f8971072c8d055fccbc67cc59ac43eecd1f5592cd9c0ae729b23e550cc96
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAke4d5MACgkQmPFBzbX68WGjsQCgmgnksjugFKUw0Cv2iMtU6gfu
+DCYAnjEGEK4zYOiLPjaaY7ffA/vODhn7
+=sdev
+-----END PGP SIGNATURE-----
diff --git a/app-admin/webapp-config/files/webapp-config-1.50.16-absolute-paths.patch b/app-admin/webapp-config/files/webapp-config-1.50.16-absolute-paths.patch
new file mode 100644
index 000000000000..c74fff9b2079
--- /dev/null
+++ b/app-admin/webapp-config/files/webapp-config-1.50.16-absolute-paths.patch
@@ -0,0 +1,42 @@
+Index: webapp-config-1.50.16/WebappConfig/config.py
+===================================================================
+--- webapp-config-1.50.16.orig/WebappConfig/config.py
++++ webapp-config-1.50.16/WebappConfig/config.py
+@@ -204,6 +204,7 @@ class Config:
+             pass
+ 
+         self.__d = {
++            'allow_absolute'               : 'no',
+             'config_protect'               : wrapper.config_protect,
+             # Necessary to load the config file
+             'my_etcconfig'                 : '/etc/vhosts/webapp-config',
+@@ -870,8 +871,13 @@ class Config:
+         #
+         # this makes sure we don't write rubbish into the installs list
+ 
+-        installpath = self.config.get('USER', 'g_htdocsdir') + '/' +     \
+-                      self.config.get('USER', 'g_installdir')
++        g_installdir = self.config.get('USER', 'g_installdir')
++
++        if (os.path.isabs(g_installdir)
++            and self.config.get('USER', 'allow_absolute') == 'yes'):
++            installpath = g_installdir
++        else:
++            installpath = self.config.get('USER', 'g_htdocsdir') + '/' + g_installdir
+ 
+         installpath = re.compile('/+').sub('/', self.__root + installpath)
+ 
+Index: webapp-config-1.50.16/config/webapp-config
+===================================================================
+--- webapp-config-1.50.16.orig/config/webapp-config
++++ webapp-config-1.50.16/config/webapp-config
+@@ -183,6 +183,9 @@ vhost_perms_virtualowned_file="o-w"
+ 
+ vhost_perms_installdir="0755"
+ 
++# Allow specifying absolute path names using the -d option?
++allow_absolute="no"
++
+ 
+ # ========================================================================
+ # END OF USER-EDITABLE SETTINGS
diff --git a/app-admin/webapp-config/files/webapp-config-1.50.16-htdocs-symlink.patch b/app-admin/webapp-config/files/webapp-config-1.50.16-htdocs-symlink.patch
new file mode 100644
index 000000000000..a7421b9b2c21
--- /dev/null
+++ b/app-admin/webapp-config/files/webapp-config-1.50.16-htdocs-symlink.patch
@@ -0,0 +1,13 @@
+Index: webapp-config-1.50.16/WebappConfig/server.py
+===================================================================
+--- webapp-config-1.50.16.orig/WebappConfig/server.py
++++ webapp-config-1.50.16/WebappConfig/server.py
+@@ -158,7 +158,7 @@ class Basic:
+ 
+         # is the installation directory empty?
+ 
+-        if not os.listdir(self.__destd):
++        if not os.listdir(self.__destd) and os.path.isdir(self.__destd):
+             if not self.__p:
+                 os.rmdir(self.__destd)
+         else:
diff --git a/app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild b/app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild
new file mode 100644
index 000000000000..12eb57b92aa7
--- /dev/null
+++ b/app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild,v 1.1 2008/02/17 18:06:02 hollow Exp $
+
+inherit eutils distutils
+
+DESCRIPTION="Gentoo's installer for web-based applications"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="http://build.pardus.de/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-apache-move.patch
+	epatch "${FILESDIR}"/${P}-baselayout2.patch
+	epatch "${FILESDIR}"/${P}-htdocs-symlink.patch
+	epatch "${FILESDIR}"/${P}-absolute-paths.patch
+}
+
+src_install() {
+	# According to this discussion:
+	# http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html
+	# distutils does not provide for specifying two different script install
+	# locations. Since we only install one script here the following should
+	# be ok
+	distutils_src_install --install-scripts="/usr/sbin"
+
+	insinto /etc/vhosts
+	doins config/webapp-config
+
+	keepdir /usr/share/webapps
+	keepdir /var/db/webapps
+
+	dodoc examples/phpmyadmin-2.5.4-r1.ebuild AUTHORS.txt CHANGES.txt examples/postinstall-en.txt
+	doman doc/*.[58]
+	dohtml doc/*.[58].html
+}
+
+src_test() {
+	distutils_python_version
+	if [[ $PYVER_MAJOR -gt 1 ]] && [[ $PYVER_MINOR -gt 3 ]] ; then
+		elog "Running webapp-config doctests..."
+		if ! PYTHONPATH="." ${python} WebappConfig/tests/dtest.py; then
+			eerror "DocTests failed - please submit a bug report"
+			die "DocTesting failed!"
+		fi
+	else
+		elog "Python version below 2.4! Disabling tests."
+	fi
+}
+
+pkg_postinst() {
+	echo
+	elog "Now that you have upgraded webapp-config, you **must** update your"
+	elog "config files in /etc/vhosts/webapp-config before you emerge any"
+	elog "packages that use webapp-config."
+	echo
+	epause 5
+}