[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/files/, app-admin/webapp-config/
commit: e0dec3d48e60d0f4d1e19a0da482933394639649
Author: Viorel Munteanu gentoo org>
AuthorDate: Mon Apr 15 17:28:06 2024 +
Commit: Viorel Munteanu gentoo org>
CommitDate: Mon Apr 15 17:43:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0dec3d4
app-admin/webapp-config: enable py3.12
Closes: https://bugs.gentoo.org/929277
Signed-off-by: Viorel Munteanu gentoo.org>
.../webapp-config-1.55-py3.122-invalid-escape-sequence.patch | 11 +++
...webapp-config-.ebuild => webapp-config-1.55-r4.ebuild} | 8 ++--
app-admin/webapp-config/webapp-config-.ebuild | 8 ++--
3 files changed, 23 insertions(+), 4 deletions(-)
diff --git
a/app-admin/webapp-config/files/webapp-config-1.55-py3.122-invalid-escape-sequence.patch
b/app-admin/webapp-config/files/webapp-config-1.55-py3.122-invalid-escape-sequence.patch
new file mode 100644
index ..cb1ba1a8593e
--- /dev/null
+++
b/app-admin/webapp-config/files/webapp-config-1.55-py3.122-invalid-escape-sequence.patch
@@ -0,0 +1,11 @@
+--- a/WebappConfig/protect.py
b/WebappConfig/protect.py
+@@ -78,7 +78,7 @@
+
+ numbers = []
+ prefix = self.protect_prefix
+-rep = re.compile(prefix.replace('.','\.') + '(\d{4})_')
++rep = re.compile(prefix.replace('.',r'\.') + r'(\d{4})_')
+
+ for i in entries:
+ rem = rep.match(i)
diff --git a/app-admin/webapp-config/webapp-config-.ebuild
b/app-admin/webapp-config/webapp-config-1.55-r4.ebuild
similarity index 93%
copy from app-admin/webapp-config/webapp-config-.ebuild
copy to app-admin/webapp-config/webapp-config-1.55-r4.ebuild
index 76caefb23e6d..cc2e8028b578 100644
--- a/app-admin/webapp-config/webapp-config-.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.55-r4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit distutils-r1 prefix
@@ -29,6 +29,10 @@ DEPEND="app-text/xmlto
RDEPEND="
portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
+PATCHES=(
+ "${FILESDIR}"/webapp-config-1.55-py3.122-invalid-escape-sequence.patch
+)
+
python_prepare_all() {
# make the source from svn mirror the one in the tarball
if [[ ${PV} == * ]]; then
diff --git a/app-admin/webapp-config/webapp-config-.ebuild
b/app-admin/webapp-config/webapp-config-.ebuild
index 76caefb23e6d..cc2e8028b578 100644
--- a/app-admin/webapp-config/webapp-config-.ebuild
+++ b/app-admin/webapp-config/webapp-config-.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit distutils-r1 prefix
@@ -29,6 +29,10 @@ DEPEND="app-text/xmlto
RDEPEND="
portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
+PATCHES=(
+ "${FILESDIR}"/webapp-config-1.55-py3.122-invalid-escape-sequence.patch
+)
+
python_prepare_all() {
# make the source from svn mirror the one in the tarball
if [[ ${PV} == * ]]; then
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/files/
commit: 8fb1450e251cb9e9600c0fa9fd0e19f99868d21f
Author: Michael Mair-Keimberger (asterix) gmail
com>
AuthorDate: Thu Jun 30 18:00:06 2016 +
Commit: Patrice Clement gentoo org>
CommitDate: Fri Jul 1 07:34:41 2016 +
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 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..000
--- 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..000
--- 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..000
--- 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..000
---
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/files/, app-admin/webapp-config/
commit: 9d904eac76ee1ac31db62713a71b0c5be3ee10d0
Author: PPed72 iol it>
AuthorDate: Tue May 3 09:33:30 2016 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Thu May 12 12:48:13 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d904eac
app-admin/webapp-config: fix bashism in tests, bug #561798
.../files/webapp-config-1.54-fix-bashism.patch | 12
.../webapp-config/webapp-config-1.54-r2.ebuild | 66 ++
2 files changed, 78 insertions(+)
diff --git a/app-admin/webapp-config/files/webapp-config-1.54-fix-bashism.patch
b/app-admin/webapp-config/files/webapp-config-1.54-fix-bashism.patch
new file mode 100644
index 000..9958c14
--- /dev/null
+++ b/app-admin/webapp-config/files/webapp-config-1.54-fix-bashism.patch
@@ -0,0 +1,12 @@
+diff -Naur WebappConfig.old/ebuild.py WebappConfig/ebuild.py
+--- WebappConfig/ebuild.py
WebappConfig/ebuild.py
+@@ -101,7 +101,7 @@
+
+ for i in post_instructions:
+ i = i.replace('"', '\\"')
+-post.append(os.popen('echo -n "' + i + '"\n').read()[:-1])
++post.append(os.popen('printf "' + i + '"\n').read()[:-1])
+
+ post = post + [
+ '',
diff --git a/app-admin/webapp-config/webapp-config-1.54-r2.ebuild
b/app-admin/webapp-config/webapp-config-1.54-r2.ebuild
new file mode 100644
index 000..3a0e46f
--- /dev/null
+++ b/app-admin/webapp-config/webapp-config-1.54-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2;
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~x86-fbsd"
+
+DESCRIPTION="Gentoo's installer for web-based applications"
+HOMEPAGE="http://sourceforge.net/projects/webapp-config/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+portage"
+
+DEPEND="app-text/xmlto
+ sys-apps/gentoo-functions"
+RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
+
+python_prepare() {
+ epatch "${FILESDIR}/${P}-pvr-check.patch"
+ epatch "${FILESDIR}/${P}-fix-bashism.patch"
+}
+python_compile_all() {
+ emake -C doc/
+}
+
+python_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-r1_python_install --install-scripts="/usr/sbin"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ insinto /etc/vhosts
+ doins config/webapp-config
+
+ keepdir /usr/share/webapps
+ keepdir /var/db/webapps
+
+ dodoc AUTHORS
+ doman doc/*.[58]
+ dohtml doc/*.[58].html
+}
+
+python_test() {
+ PYTHONPATH="." "${PYTHON}" WebappConfig/tests/external.py \
+ || die "Testing failed with ${EPYTHON}"
+}
+
+pkg_postinst() {
+ elog "webapp-config now requires that all -I/-U/-C commands be followed"
+ elog "by the package name and package version of the webapp"
+ elog "eg.) 'webapp-config -d drupal -I drupal 8.0.0_beta10'"
+ elog "See 'man 8 webapp-config' for more information"
+}
