webapp-config: upgraded package to upstream
Upgraded app-admin/webapp-config to version 1.50.16-r4 on amd64
This package is required by Django. The CL was autogenerated by
cros_portage_upgrade.
BUG=chromium:236471
TEST=NONE
Change-Id: I5c5895e1989f7bb9e123cf61000fcbaebb1e0d25
Reviewed-on: https://gerrit.chromium.org/gerrit/50212
Tested-by: Aviv Keshet <akeshet@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Aviv Keshet <akeshet@chromium.org>
diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest
new file mode 100644
index 0000000..ab981b6
--- /dev/null
+++ b/app-admin/webapp-config/Manifest
@@ -0,0 +1 @@
+DIST webapp-config-1.50.16.tar.gz 103576 RMD160 d3ab1b27d9b279241d2c9ff3b764ac0b9699b0a0 SHA1 dae0b27bf731116516aed16fd10dc75c0146d332 SHA256 cd5cf95d0abc9b469b08e6fffa885df10d3651d558164d35efe8e45df1fc8a5f
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 0000000..c74fff9
--- /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-apache-move.patch b/app-admin/webapp-config/files/webapp-config-1.50.16-apache-move.patch
new file mode 100644
index 0000000..6f9a30e
--- /dev/null
+++ b/app-admin/webapp-config/files/webapp-config-1.50.16-apache-move.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
+@@ -300,7 +300,7 @@ class Apache(Basic):
+
+ name = 'Apache'
+ desc = 'supports installation on Apache 1 & 2'
+- dep = '>=net-www/apache-1.3'
++ dep = '>=www-servers/apache-1.3'
+
+ def set_server_user(self):
+ self.vhost_server_uid = get_user('apache')
diff --git a/app-admin/webapp-config/files/webapp-config-1.50.16-baselayout2.patch b/app-admin/webapp-config/files/webapp-config-1.50.16-baselayout2.patch
new file mode 100644
index 0000000..8627425
--- /dev/null
+++ b/app-admin/webapp-config/files/webapp-config-1.50.16-baselayout2.patch
@@ -0,0 +1,13 @@
+Index: webapp-config-1.50.16/sbin/webapp-cleaner
+===================================================================
+--- webapp-config-1.50.16.orig/sbin/webapp-cleaner
++++ webapp-config-1.50.16/sbin/webapp-cleaner
+@@ -11,7 +11,7 @@ CMD="emerge -Cav"
+ WEBAPP_DIR="/usr/share/webapps"
+ WEBAPP_CONFIG=
+
+-[[ -z ${RC_GOT_FUNCTIONS} ]] && source /sbin/functions.sh
++[[ -z ${RC_GOT_FUNCTIONS} ]] && source /etc/init.d/functions.sh
+
+ function help() {
+ echo "Remove obsolete and unused versions of web applications"
diff --git a/app-admin/webapp-config/files/webapp-config-1.50.16-fix-unicode-tests.patch b/app-admin/webapp-config/files/webapp-config-1.50.16-fix-unicode-tests.patch
new file mode 100644
index 0000000..cad75a2
--- /dev/null
+++ b/app-admin/webapp-config/files/webapp-config-1.50.16-fix-unicode-tests.patch
@@ -0,0 +1,39 @@
+Make strings unicode to fix test failures
+
+Python enables unicode by default. Various quoted strings used
+in tests were not declared as unicode and so caused false failures.
+This patch addresses this issue.
+
+Signed-off-by: Matthew Thode <prometheanfire@gentoo.org>
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+
+diff -rupN webapp-config-1.50.16/WebappConfig.orig/db.py webapp-config-1.50.16/WebappConfig/db.py
+--- webapp-config-1.50.16/WebappConfig.orig/db.py 2012-06-17 11:10:15.964264617 -0500
++++ webapp-config-1.50.16/WebappConfig/db.py 2012-06-17 11:11:05.364265831 -0500
+@@ -186,7 +186,7 @@ class WebappDB(AppHierarchy):
+ >>> sb = [i[1] for i in b.list_locations().items()]
+ >>> sb.sort(lambda x,y: cmp(x[0]+x[1],y[0]+y[1]))
+ >>> sb
+- [['gallery', '1.4.4_p6'], ['gallery', '2.0_rc2'], ['horde', '3.0.5'], ['phpldapadmin', '0.9.7_alpha4']]
++ [[u'gallery', u'1.4.4_p6'], [u'gallery', u'2.0_rc2'], [u'horde', u'3.0.5'], [u'phpldapadmin', u'0.9.7_alpha4']]
+
+ >>> c = WebappDB(here + '/tests/testfiles/webapps',
+ ... package = 'horde', version = '3.0.5')
+@@ -572,7 +572,7 @@ class WebappSource(AppHierarchy):
+ ... 'horde', '3.0.5')
+ >>> d = a.get_source_directories('htdocs')
+ >>> [i for i in d if i != '.svn']
+- ['dir1', 'dir2']
++ [u'dir1', u'dir2']
+ '''
+ dirs = []
+
+@@ -604,7 +604,7 @@ class WebappSource(AppHierarchy):
+ >>> a = WebappSource(here + '/tests/testfiles/share-webapps',
+ ... 'horde', '3.0.5')
+ >>> a.get_source_files('htdocs')
+- ['test1', 'test2']
++ [u'test1', u'test2']
+ '''
+
+ files = []
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 0000000..a7421b9
--- /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/files/webapp-config-1.50.16-update-servers.patch b/app-admin/webapp-config/files/webapp-config-1.50.16-update-servers.patch
new file mode 100644
index 0000000..f6e7bbd
--- /dev/null
+++ b/app-admin/webapp-config/files/webapp-config-1.50.16-update-servers.patch
@@ -0,0 +1,80 @@
+--- WebappConfig/config.py 2006-12-30 13:38:36.000000000 -0500
++++ config.py 2009-05-28 12:08:53.000000000 -0400
+@@ -1289,8 +1289,9 @@
+
+ allowed_servers = {'apache' : WebappConfig.server.Apache,
+ 'lighttpd' : WebappConfig.server.Lighttpd,
+- 'aolserver': WebappConfig.server.Aolserver,
+- 'cherokee' : WebappConfig.server.Cherokee}
++ 'cherokee' : WebappConfig.server.Cherokee,
++ 'nginx' : WebappConfig.server.Nginx,
++ 'gatling' : WebappConfig.server.Gatling}
+
+ server = self.config.get('USER', 'vhost_server')
+
+--- WebappConfig/server.py 2009-05-28 12:06:48.000000000 -0400
++++ server.py 2009-05-28 12:10:54.000000000 -0400
+@@ -316,16 +316,6 @@
+ self.vhost_server_uid = get_user('lighttpd')
+ self.vhost_server_gid = get_group('lighttpd')
+
+-class Aolserver(Basic):
+-
+- name = 'Aolserver'
+- desc = 'supports installation on Aolserver'
+- dep = 'www-servers/aolserver'
+-
+- def set_server_user(self):
+- self.vhost_server_uid = get_user('aolserver')
+- self.vhost_server_gid = get_group('aolserver')
+-
+ class Cherokee(Basic):
+
+ name = 'Cherokee'
+@@ -336,9 +326,30 @@
+ self.vhost_server_uid = get_user('cherokee')
+ self.vhost_server_gid = get_group('cherokee')
+
++class Nginx(Basic):
++
++ name = 'Nginx'
++ desc = 'supports installation on Nginx'
++ dep = 'www-servers/nginx'
++
++ def set_server_user(self):
++ self.vhost_server_uid = get_user('nginx')
++ self.vhost_server_gid = get_group('nginx')
++
++class Gatling(Basic):
++
++ name = 'Gatling'
++ desc = 'supports installation on Gatling'
++ dep = 'www-servers/gatling'
++
++ def set_server_user(self):
++ self.vhost_server_uid = get_user('gatling')
++ self.vhost_server_gid = get_group('gatling')
++
+ def listservers():
+
+ OUT.notice('\n'.join(['apache',
+- 'aolserver',
+ 'lighttpd',
+- 'cherokee']))
++ 'cherokee',
++ 'nginx',
++ 'gatling']))
+--- config/webapp-config 2006-12-30 13:39:13.000000000 -0500
++++ webapp-config 2009-05-28 12:11:24.000000000 -0400
+@@ -65,9 +65,10 @@
+ # your choices are:
+ #
+ # apache
+-# aolserver
+ # lighttpd
+ # cherokee
++# nginx
++# gatling
+ #
+ # you can override this setting by using the -s switch to webapp-config
+
diff --git a/app-admin/webapp-config/webapp-config-1.50.16-r4.ebuild b/app-admin/webapp-config/webapp-config-1.50.16-r4.ebuild
new file mode 100644
index 0000000..994d58e
--- /dev/null
+++ b/app-admin/webapp-config/webapp-config-1.50.16-r4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2012 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-r4.ebuild,v 1.10 2012/07/15 17:17:09 armin76 Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils eutils
+
+DESCRIPTION="Gentoo's installer for web-based applications"
+HOMEPAGE="http://sourceforge.net/projects/webapp-config/"
+SRC_URI="mirror://gentoo/${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=""
+RDEPEND=""
+RESTRICT_PYTHON_ABIS="3.*"
+
+PYTHON_MODNAME="WebappConfig"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-apache-move.patch"
+ epatch "${FILESDIR}/${P}-baselayout2.patch"
+ epatch "${FILESDIR}/${P}-htdocs-symlink.patch"
+ epatch "${FILESDIR}/${P}-absolute-paths.patch"
+ epatch "${FILESDIR}/${P}-update-servers.patch"
+ epatch "${FILESDIR}/${P}-fix-unicode-tests.patch"
+ # Do not build nor install eclass manual, bug 322759
+ rm -f doc/webapp.eclass.5*
+ sed -e '/MAN_PAGES/s/webapp.eclass.5//' \
+ -e '/HTML_PAGES/s/webapp.eclass.5.html//' \
+ -i doc/Makefile || die
+}
+
+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() {
+ testing() {
+ PYTHONPATH="." "$(PYTHON)" WebappConfig/tests/dtest.py
+ }
+ python_execute_function testing
+}
+
+pkg_postinst() {
+ distutils_pkg_postinst
+
+ 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."
+}
diff --git a/metadata/md5-cache/app-admin/webapp-config-1.50.16-r4 b/metadata/md5-cache/app-admin/webapp-config-1.50.16-r4
new file mode 100644
index 0000000..a31944d
--- /dev/null
+++ b/metadata/md5-cache/app-admin/webapp-config-1.50.16-r4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare test
+DEPEND=>=app-admin/eselect-python-20091230 =dev-lang/python-2*
+DESCRIPTION=Gentoo's installer for web-based applications
+EAPI=3
+HOMEPAGE=http://sourceforge.net/projects/webapp-config/
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-admin/eselect-python-20091230 =dev-lang/python-2*
+SLOT=0
+SRC_URI=mirror://gentoo/webapp-config-1.50.16.tar.gz
+_eclasses_=distutils b4c334e216d998c4ce4b750cb091e42e eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user 9e552f935106ff0bc92af16da64b4b29
+_md5_=2c4c1586b6bbd6463058103b4a4c3dab
