From f6f36be196f3be50b6b320cb7099a54ed73f90a4 Mon Sep 17 00:00:00 2001 From: Alexey Dokuchaev Date: Fri, 29 Jan 2021 13:35:49 +0000 Subject: - Resurrect and update to version 1.5.112 - Actualize dependencies and pkg-message --- www/web2ldap/files/patch-web2ldap_app_core.py | 29 +++++++++++++++++++ www/web2ldap/files/pkg-message.in | 21 ++++++++++++++ www/web2ldap/files/web2ldap.in | 40 +++++++++++++++++++++++++++ 3 files changed, 90 insertions(+) create mode 100644 www/web2ldap/files/patch-web2ldap_app_core.py create mode 100644 www/web2ldap/files/pkg-message.in create mode 100644 www/web2ldap/files/web2ldap.in (limited to 'www/web2ldap/files') diff --git a/www/web2ldap/files/patch-web2ldap_app_core.py b/www/web2ldap/files/patch-web2ldap_app_core.py new file mode 100644 index 000000000000..128dc349ed74 --- /dev/null +++ b/www/web2ldap/files/patch-web2ldap_app_core.py @@ -0,0 +1,29 @@ +--- web2ldap/app/core.py.orig 2020-05-04 11:51:59 UTC ++++ web2ldap/app/core.py +@@ -19,12 +19,6 @@ import time + import web2ldap.__about__ + from web2ldap.log import logger + +-# prefixes considered to indicate system-wide installation outside a venv +-OS_SYS_PREFIXES = { +- '/usr', +- '/usr/local', +-} +- + logger.info('Starting web2ldap %s', web2ldap.__about__.__version__) + # this has to be done before import module package ldap0 + os.environ['LDAPNOINIT'] = '1' +@@ -39,11 +33,9 @@ check_inst() + if 'WEB2LDAP_HOME' in os.environ: + # env var points to web2ldap root directory + etc_dir = os.path.join(os.environ['WEB2LDAP_HOME'], 'etc', 'web2ldap') +-elif os.name == 'posix' and sys.prefix in OS_SYS_PREFIXES: +- # assume OS-wide installation on POSIX platform (Linux, BSD, etc.) +- etc_dir = '/etc/web2ldap' + else: +- # virtual env ++ # assume OS-wide installation on POSIX platform (Linux, BSD, etc.) ++ # or virtual env + etc_dir = os.path.join(sys.prefix, 'etc', 'web2ldap') + + # Default directory for [web2ldap]/etc/web2ldap/templates diff --git a/www/web2ldap/files/pkg-message.in b/www/web2ldap/files/pkg-message.in new file mode 100644 index 000000000000..85a83325de91 --- /dev/null +++ b/www/web2ldap/files/pkg-message.in @@ -0,0 +1,21 @@ +[ +{ type: install + message: <