Date: Fri, 29 Jan 2021 13:35:49 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r563206 - in head: . www www/web2ldap www/web2ldap/files Message-ID: <202101291335.10TDZnga047517@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Fri Jan 29 13:35:49 2021 New Revision: 563206 URL: https://svnweb.freebsd.org/changeset/ports/563206 Log: - Resurrect and update to version 1.5.112 - Actualize dependencies and pkg-message Added: head/www/web2ldap/ - copied from r522858, head/www/web2ldap/ head/www/web2ldap/files/patch-web2ldap_app_core.py (contents, props changed) Modified: head/MOVED head/www/Makefile head/www/web2ldap/Makefile head/www/web2ldap/distinfo head/www/web2ldap/files/pkg-message.in Modified: head/MOVED ============================================================================== --- head/MOVED Fri Jan 29 12:02:27 2021 (r563205) +++ head/MOVED Fri Jan 29 13:35:49 2021 (r563206) @@ -13691,7 +13691,6 @@ sysutils/u-boot-zybo||2020-01-10|Has expired: Broken f x11-themes/kde-icons-kool-gorilla||2020-01-10|Has expired: Broken for more than 3 months, unmaintained sysutils/docker-freebsd||2020-01-11|Has expired: Broken for more than 9 months science/molden|biology/molden|2020-01-12|The duplicate port was removed in rev.505268 -www/web2ldap||2020-01-13|Broken: unfechable and missing dependencies net-mgmt/flow-extract||2020-01-14|Has expired: marked BROKEN for more than 6 months textproc/pootle||2020-01-14|Has expired: Unamaintained, marked BROKEN for more than 5 months cad/elmerfem|science/elmerfem|2020-01-15|Move to a proper category Modified: head/www/Makefile ============================================================================== --- head/www/Makefile Fri Jan 29 12:02:27 2021 (r563205) +++ head/www/Makefile Fri Jan 29 13:35:49 2021 (r563206) @@ -2269,6 +2269,7 @@ SUBDIR += w3m SUBDIR += w3m-img SUBDIR += w3mir + SUBDIR += web2ldap SUBDIR += webalizer SUBDIR += webbrowser SUBDIR += webcopy Modified: head/www/web2ldap/Makefile ============================================================================== --- head/www/web2ldap/Makefile Mon Jan 13 06:28:27 2020 (r522858) +++ head/www/web2ldap/Makefile Fri Jan 29 13:35:49 2021 (r563206) @@ -2,44 +2,33 @@ # $FreeBSD$ PORTNAME= web2ldap -PORTVERSION= 1.3.16 +PORTVERSION= 1.5.112 CATEGORIES= www python MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= girgen@FreeBSD.org COMMENT= Python-based WWW gateway to LDAP servers -BROKEN= unfetchable - LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR} \ +RUN_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}asn1crypto>=0.22.0:devel/py-asn1crypto@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dns>=0:dns/py-dns@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dnspython2>=2.0.0:dns/py-dnspython2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xlwt>0:textproc/py-xlwt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ldap0>=0.0.60:net/py-ldap0@${PY_FLAVOR} \ - ${PYTHON_SITELIBDIR}/pyweblib/__init__.py:www/py-pyweblib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ipaddr>0:devel/py-ipaddr@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ldap0>=1.0.1:net/py-ldap0@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}defusedxml>0:devel/py-defusedxml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prometheus-client>=0.7.1:net-mgmt/py-prometheus-client@${PY_FLAVOR} \ ${LOCALBASE}/etc/mime.types:misc/mime-support OPTIONS_DEFINE= DOCS -USES= cpe python:2.7 +USES= cpe python:3.6+ USE_PYTHON= distutils autoplist SUB_FILES= pkg-message ${PORTNAME} USE_RC_SUBR= ${PORTNAME} NO_ARCH= yes -PLIST_DIRS= ${DATADIR} ${DATADIR}/var ${DATADIR}/var/log ${DATADIR}/var/run /var/log/web2ldap - -post-build: - ${TOUCH} ${WRKSRC}/etc/web2ldap/ssl/.placeholder - -post-stage: - ${MKDIR} ${STAGEDIR}${DATADIR}/var/log - ${MKDIR} ${STAGEDIR}${DATADIR}/var/run - ${MKDIR} ${STAGEDIR}/var/log/web2ldap .include <bsd.port.mk> Modified: head/www/web2ldap/distinfo ============================================================================== --- head/www/web2ldap/distinfo Mon Jan 13 06:28:27 2020 (r522858) +++ head/www/web2ldap/distinfo Fri Jan 29 13:35:49 2021 (r563206) @@ -1,3 +1,3 @@ -TIMESTAMP = 1525272702 -SHA256 (web2ldap-1.3.16.tar.gz) = 0d4b2cac1e86f8c7fc7a904099dbb0f107a13abb9259e914ce1196400031bb0d -SIZE (web2ldap-1.3.16.tar.gz) = 569122 +TIMESTAMP = 1606422618 +SHA256 (web2ldap-1.5.112.tar.gz) = a8af312994d284b568bf4a4ca63d11b5ec5661245b2c94aafe1a221c3cd70644 +SIZE (web2ldap-1.5.112.tar.gz) = 523572 Added: head/www/web2ldap/files/patch-web2ldap_app_core.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/web2ldap/files/patch-web2ldap_app_core.py Fri Jan 29 13:35:49 2021 (r563206) @@ -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 Modified: head/www/web2ldap/files/pkg-message.in ============================================================================== --- head/www/web2ldap/files/pkg-message.in Mon Jan 13 06:28:27 2020 (r522858) +++ head/www/web2ldap/files/pkg-message.in Fri Jan 29 13:35:49 2021 (r563206) @@ -6,9 +6,10 @@ Run: service web2ldap onestart to start the standalone version of web2ldap. By default it only accepts -connections from localhost, but this can be modified in: +connections from localhost, this can be changed by editing configuration +option ``access_allowed'' in the file: - %%DATADIR%%/etc/web2ldap/web2ldapcnf/standalone.py + %%ETCDIR%%/web2ldapcnf/__init__.py For configuration suggestions on installing the WSGI version of web2ldap using apache *instead of the standalone version*, please look at the enclosed
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101291335.10TDZnga047517>