commit: 8fb1450e251cb9e9600c0fa9fd0e19f99868d21f Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Thu Jun 30 18:00:06 2016 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Fri Jul 1 07:34:41 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fb1450e
app-admin/webapp-config: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/1806 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> .../webapp-config-1.50.16-absolute-paths.patch | 42 ------------ .../files/webapp-config-1.50.16-apache-move.patch | 13 ---- .../files/webapp-config-1.50.16-baselayout2.patch | 13 ---- .../webapp-config-1.50.16-fix-unicode-tests.patch | 39 ----------- .../webapp-config-1.50.16-htdocs-symlink.patch | 13 ---- .../webapp-config-1.50.16-update-servers.patch | 80 ---------------------- .../files/webapp-config-1.51-fix-indentation.patch | 25 ------- 7 files changed, 225 deletions(-) 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 deleted file mode 100644 index c74fff9..0000000 --- a/app-admin/webapp-config/files/webapp-config-1.50.16-absolute-paths.patch +++ /dev/null @@ -1,42 +0,0 @@ -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 deleted file mode 100644 index 6f9a30e..0000000 --- a/app-admin/webapp-config/files/webapp-config-1.50.16-apache-move.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 24f0004..0000000 --- a/app-admin/webapp-config/files/webapp-config-1.50.16-baselayout2.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 /lib/gentoo/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 deleted file mode 100644 index cad75a2..0000000 --- a/app-admin/webapp-config/files/webapp-config-1.50.16-fix-unicode-tests.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 <prometheanf...@gentoo.org> -Signed-off-by: Anthony G. Basile <bluen...@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 deleted file mode 100644 index a7421b9..0000000 --- a/app-admin/webapp-config/files/webapp-config-1.50.16-htdocs-symlink.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index f6e7bbd..0000000 --- a/app-admin/webapp-config/files/webapp-config-1.50.16-update-servers.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- 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/files/webapp-config-1.51-fix-indentation.patch b/app-admin/webapp-config/files/webapp-config-1.51-fix-indentation.patch deleted file mode 100644 index 27a11aa..0000000 --- a/app-admin/webapp-config/files/webapp-config-1.51-fix-indentation.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1bc28049300625a3b24a632e2aacb5776937c19b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Manuel=20R=C3=BCger?= <mr...@gentoo.org> -Date: Tue, 6 Aug 2013 03:59:31 +0200 -Subject: [PATCH] WebappConfig/config.py: fix indentation - ---- - WebappConfig/config.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/WebappConfig/config.py b/WebappConfig/config.py -index bf55d1e..bb86a55 100644 ---- a/WebappConfig/config.py -+++ b/WebappConfig/config.py -@@ -962,7 +962,7 @@ class Config: - OUT.die('You need to specify at least the application you' - ' would like to handle!') - else: -- return self.config.get('USER', 'pn') -+ return self.config.get('USER', 'pn') - - def check_version_set(self): - if not self.config.has_option('USER', 'pvr'): --- -1.8.1.5 -
