From owner-svn-ports-all@freebsd.org Thu May 3 13:26:27 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1ADC0FAB2C7; Thu, 3 May 2018 13:26:27 +0000 (UTC) (envelope-from girgen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C34B17E507; Thu, 3 May 2018 13:26:26 +0000 (UTC) (envelope-from girgen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BE30B20602; Thu, 3 May 2018 13:26:26 +0000 (UTC) (envelope-from girgen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w43DQQKM077305; Thu, 3 May 2018 13:26:26 GMT (envelope-from girgen@FreeBSD.org) Received: (from girgen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w43DQPoR077296; Thu, 3 May 2018 13:26:25 GMT (envelope-from girgen@FreeBSD.org) Message-Id: <201805031326.w43DQPoR077296@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: girgen set sender to girgen@FreeBSD.org using -f From: Palle Girgensohn Date: Thu, 3 May 2018 13:26:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468926 - in head: net net/py-ldap0 net/py-ldap0/files www/web2ldap www/web2ldap/files X-SVN-Group: ports-head X-SVN-Commit-Author: girgen X-SVN-Commit-Paths: in head: net net/py-ldap0 net/py-ldap0/files www/web2ldap www/web2ldap/files X-SVN-Commit-Revision: 468926 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 May 2018 13:26:27 -0000 Author: girgen Date: Thu May 3 13:26:25 2018 New Revision: 468926 URL: https://svnweb.freebsd.org/changeset/ports/468926 Log: Update web2ldap to verstion 1.3.16 Also welcome py-ldap0 to the ports tree as a dependency. This version adds a rc script to start the standalone mode. Taking maintainership as bsam@ offered to step down. Releasenotes: https://web2ldap.de/changes-1.3.html#r1.3.16 PR: 227459 Added: head/net/py-ldap0/ head/net/py-ldap0/Makefile (contents, props changed) head/net/py-ldap0/distinfo (contents, props changed) head/net/py-ldap0/files/ head/net/py-ldap0/files/patch-setup.py (contents, props changed) head/net/py-ldap0/pkg-descr (contents, props changed) head/www/web2ldap/files/web2ldap.in (contents, props changed) Modified: head/net/Makefile head/www/web2ldap/Makefile head/www/web2ldap/distinfo head/www/web2ldap/files/pkg-message.in Modified: head/net/Makefile ============================================================================== --- head/net/Makefile Thu May 3 12:59:49 2018 (r468925) +++ head/net/Makefile Thu May 3 13:26:25 2018 (r468926) @@ -1051,6 +1051,7 @@ SUBDIR += py-kafka-python SUBDIR += py-kombu SUBDIR += py-ldap + SUBDIR += py-ldap0 SUBDIR += py-ldap3 SUBDIR += py-ldaptor SUBDIR += py-libcloud Added: head/net/py-ldap0/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/py-ldap0/Makefile Thu May 3 13:26:25 2018 (r468926) @@ -0,0 +1,21 @@ +# $FreeBSD$ + +PORTNAME= ldap0 +PORTVERSION= 0.0.60 +CATEGORIES= net python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= girgen@FreeBSD.org +COMMENT= Python module package for implementing LDAP clients + +LICENSE= PSFL + +MAKE_ENV+= INCLUDES=${LOCALBASE}/include +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.2.1:devel/py-pyasn1-modules@${PY_FLAVOR} + +USES= python +USE_OPENLDAP= yes +USE_PYTHON= autoplist distutils + +.include Added: head/net/py-ldap0/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/py-ldap0/distinfo Thu May 3 13:26:25 2018 (r468926) @@ -0,0 +1,3 @@ +TIMESTAMP = 1525015315 +SHA256 (ldap0-0.0.60.tar.gz) = a6f02941dda63249e8c7c68947d0c7fb47efaa59ca085396a3ddedadb90a65fe +SIZE (ldap0-0.0.60.tar.gz) = 219348 Added: head/net/py-ldap0/files/patch-setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/py-ldap0/files/patch-setup.py Thu May 3 13:26:25 2018 (r468926) @@ -0,0 +1,11 @@ +--- setup.py.orig 2018-02-06 13:04:47 UTC ++++ setup.py +@@ -22,7 +22,7 @@ class OpenLDAP2BuildConfig: + + def __init__(self, meta_defines): + self.library_dirs = [] +- self.include_dirs = [] ++ self.include_dirs = [os.environ['INCLUDES']] + self.extra_compile_args = [] + self.extra_link_args = [] + self.extra_objects = [] Added: head/net/py-ldap0/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/py-ldap0/pkg-descr Thu May 3 13:26:25 2018 (r468926) @@ -0,0 +1,6 @@ +ldap3 is a pure Python LDAP 3 client library strictly conforming to RFC4511 +released under the LGPL v3 open source license. RFC4511 is the current LDAP +specification (June 2006) from IETF and obsoletes the previous LDAP RFCs +2251, 2830, 3771 (December 1997) + +WWW: https://github.com/cannatag/ldap3 Modified: head/www/web2ldap/Makefile ============================================================================== --- head/www/web2ldap/Makefile Thu May 3 12:59:49 2018 (r468925) +++ head/www/web2ldap/Makefile Thu May 3 13:26:25 2018 (r468926) @@ -2,57 +2,42 @@ # $FreeBSD$ PORTNAME= web2ldap -PORTVERSION= 1.2.94 -PORTREVISION= 1 -CATEGORIES= www -MASTER_SITES= http://www.web2ldap.de/download/ \ - http://www.sfr-fresh.com/unix/www/ +PORTVERSION= 1.3.16 +CATEGORIES= www python +MASTER_SITES= CHEESESHOP -MAINTAINER= bsam@FreeBSD.org +MAINTAINER= girgen@FreeBSD.org COMMENT= Python-based WWW gateway to LDAP servers -LICENSE= GPLv2 +LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=2.4.0:net/py-ldap@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${FLAVOR} \ + ${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@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xlwt>0:textproc/py-xlwt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${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} \ ${LOCALBASE}/etc/mime.types:misc/mime-support OPTIONS_DEFINE= DOCS -USES= cpe python:2.7 shebangfix -python_OLD_CMD= /usr/bin/python2.7 -SHEBANG_FILES= sbin/*.py fcgi/*.py -SUB_FILES= pkg-message +USES= cpe python:2.7 +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 -PORTDOCS= * -PORTDATA= * -PLIST_DIRS= %%DATADIR%%/var/log %%DATADIR%%/var/run +post-build: + ${TOUCH} ${WRKSRC}/etc/web2ldap/ssl/.placeholder -post-patch: - @${REINPLACE_CMD} -e 's|/opt/fcgi/bin/cgi-fcgi|${LOCALBASE}/bin/cgi-fcgi|g' \ - ${WRKSRC}/cgi-bin/web2ldap.cgi - @${REINPLACE_CMD} -e 's|/etc|${LOCALBASE}/etc|g' \ - -e 's|nobody|web2ldap|g' \ - ${WRKSRC}/etc/web2ldap/web2ldapcnf/standalone.py - @${FIND} ${WRKSRC} -name '*.orig' -delete -o -name '*.bak' -delete - -do-build: - ${PYTHON_CMD} -m compileall ${WRKSRC} - ${PYTHON_CMD} -O -m compileall ${WRKSRC} - -do-install: - @${ECHO_MSG} "==> Installing program files..." - @${MKDIR} ${STAGEDIR}${DATADIR} - @(cd ${WRKSRC}; \ - ${FIND} * -type d | ${GREP} -vE "^htdocs" | ${CPIO} -p ${STAGEDIR}${DATADIR}; \ - ${FIND} * -type f | ${GREP} -vE "^htdocs" | ${CPIO} -pd ${STAGEDIR}${DATADIR}) - -post-install-DOCS-on: - @${ECHO_MSG} "==> Installing document files..." - @${MKDIR} ${STAGEDIR}${DOCSDIR} - @(cd ${WRKSRC}; \ - ${FIND} * -type d | ${GREP} "^htdocs" | ${CPIO} -p ${STAGEDIR}${DOCSDIR}; \ - ${FIND} * -type f | ${GREP} "^htdocs" | ${CPIO} -pd ${STAGEDIR}${DOCSDIR}) +post-stage: + ${MKDIR} ${STAGEDIR}${DATADIR}/var/log + ${MKDIR} ${STAGEDIR}${DATADIR}/var/run + ${MKDIR} ${STAGEDIR}/var/log/web2ldap .include Modified: head/www/web2ldap/distinfo ============================================================================== --- head/www/web2ldap/distinfo Thu May 3 12:59:49 2018 (r468925) +++ head/www/web2ldap/distinfo Thu May 3 13:26:25 2018 (r468926) @@ -1,3 +1,3 @@ -TIMESTAMP = 1505137106 -SHA256 (web2ldap-1.2.94.tar.gz) = 1a8ed7b6449c8a4ee370b118082142bf419dd0e0db86e588eaf648cf2ec9898e -SIZE (web2ldap-1.2.94.tar.gz) = 619633 +TIMESTAMP = 1525272702 +SHA256 (web2ldap-1.3.16.tar.gz) = 0d4b2cac1e86f8c7fc7a904099dbb0f107a13abb9259e914ce1196400031bb0d +SIZE (web2ldap-1.3.16.tar.gz) = 569122 Modified: head/www/web2ldap/files/pkg-message.in ============================================================================== --- head/www/web2ldap/files/pkg-message.in Thu May 3 12:59:49 2018 (r468925) +++ head/www/web2ldap/files/pkg-message.in Thu May 3 13:26:25 2018 (r468926) @@ -1,15 +1,17 @@ =============================================================================== Run: - %%DATADIR%%/sbin/web2ldap.py + service web2ldap onestart to start the standalone version of web2ldap. By default it only accepts connections from localhost, but this can be modified in: %%DATADIR%%/etc/web2ldap/web2ldapcnf/standalone.py -For instructions on installing the CGI version of web2ldap, please look at the -enclosed documentation in: +For configuration suggestions on installing the WSGI version of web2ldap using +apache *instead of the standalone version*, please look at the enclosed +documentation in: - %%DOCSDIR%%/htdocs/ + https://fossies.org/linux/web2ldap/etc/apache2/sample-mod_wsgi.conf + =============================================================================== Added: head/www/web2ldap/files/web2ldap.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/web2ldap/files/web2ldap.in Thu May 3 13:26:25 2018 (r468926) @@ -0,0 +1,40 @@ +#!/bin/sh +# $FreeBSD$ + +# PROVIDE: web2ldap +# REQUIRE: DAEMON NETWORKING +# BEFORE: LOGIN +# KEYWORD: shutdown + +# Add the following lines to /etc/rc.conf to enable web2ldap: +# web2ldap_enable="NO" +# +# web2ldap_enable (bool): Set to YES to enable web2ldap +# Default: NO +# web2ldap_user (str): web2ldap daemon user +# Default: nobody +# web2ldap_group (str): web2ldap daemon group +# Default: nogroup +. /etc/rc.subr + +name="web2ldap" +rcvar=web2ldap_enable + +: ${web2ldap_enable:="NO"} +: ${web2ldap_user:="nobody"} +: ${web2ldap_group:="nogroup"} + +# daemon +pidfile="/var/run/${name}.pid" +command=/usr/sbin/daemon +procname="daemon" +command_args=" -c -f -P ${pidfile} %%PREFIX%%/bin/${name}" +start_precmd="web2ldap_precmd" + +web2ldap_precmd() +{ + install -o ${web2ldap_user} /dev/null ${pidfile} +} + +load_rc_config $name +run_rc_command "$1"