From nobody Wed Mar 23 10:51:34 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3F66C1A22821; Wed, 23 Mar 2022 10:51:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KNlXR08Nrz3JtP; Wed, 23 Mar 2022 10:51:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648032695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SMU6mMtWa7kzgzBG5TTU6rrcW+/kDEN8T2KTUrb7rKk=; b=GSXmaW3V3hZ6PEX+4CyRoOP+WjKkTBkKzfIoU3oYIxGTb4IQTLnfSW7Rl//LsVVtEWVNn0 1/NuTp/3SlM2WlLnXp4L0GxbFlUd69IoR68+G2ZbWEkotr4tUtB7jVGcCHUz8p14aLr8LE 4FQCw/Jet2L82P/n/JUIzoLZaXgIUpwurkWDP2K0HGVPR+G/jyGzBdkHyDf1YP6dMmhD9y B40vutlgW6kUecbJtcq3/WWQy45MvFhwAWSKvuADMb/LphZua+dceIO5/rtIENVo4TXIZA ngf31vuclC4iSn1IYpG1zs6g4e4JYDajcEd6cWHC1cAOJb4n0wCcKJXqd4bmgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BAE752234B; Wed, 23 Mar 2022 10:51:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22NApYUQ089444; Wed, 23 Mar 2022 10:51:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22NApYp2089443; Wed, 23 Mar 2022 10:51:34 GMT (envelope-from git) Date: Wed, 23 Mar 2022 10:51:34 GMT Message-Id: <202203231051.22NApYp2089443@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando Apestegu=C3=ADa?= Subject: git: 618a8e8a6355 - main - sysutils/ldap-account-manager: Update to 7.9 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 618a8e8a63556a64c4e407db9a744ffd4f1af0eb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648032695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SMU6mMtWa7kzgzBG5TTU6rrcW+/kDEN8T2KTUrb7rKk=; b=w+F30KodczftJXoqntlBE3mfgiiiVPGGKeGGgFudPdxQcoQ+3TLylR0gWHzSXUIun/ZMWS 3px85f6FsiWsHKEaH/bPTzizUCqwg5cJCSRYPafiMBu99MTqOJeL67w0d7B6Rbc+JyhCpp OR8JtHwAJclhXQaP/F3R053ZevNVbiaSQj4EUfiLVnXe9KldnkxOHWMkuB8OhGPHG0znkb D7eNf3kAzKpeDdrY6VXN2dmAAOmKkCCWyMN0/+vgBquUh1Rqn6LAPh6D9F96kYXLCFyVK9 Io8TWmr2t6atH6cPg49g26ghQ8KqrF6ucju7fB82d5rQuFGz6LZG6Oc7r4NJtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648032695; a=rsa-sha256; cv=none; b=MCcqiiYSYr5/SZWBj4ahzdjhmqBw5hPD8gvyAmqXxq5KZy7BOHW9pRXIbV8zXQmE122qHu 8kux5akl5fUxPgr4dsD1mMbMNxxRx6oFPU+h9KRLKV/V2eenDV2thdP5vibzTaKCwoHbgp frbYfS0zytS8c6M+5ckTt2b7g8RTWbscNkNAZATvdv9LDA0ECuYI8EJRwP7vjMgrnhV8IQ 3tR0/+TI2qIdPGEo0WsVrAhNAwA4z4gxLJDXKEO13FjkBueoJu/mmcyEIOsSvncLRJLod5 sSfLppHH+a/Df0BNFNNqxSLwO/soZrTzuXYMVD0KCubmgjuEboUpDM4Z5Vu/2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=618a8e8a63556a64c4e407db9a744ffd4f1af0eb commit 618a8e8a63556a64c4e407db9a744ffd4f1af0eb Author: Fernando Apesteguía AuthorDate: 2022-03-23 08:55:28 +0000 Commit: Fernando Apesteguía CommitDate: 2022-03-23 10:49:37 +0000 sysutils/ldap-account-manager: Update to 7.9 While here, pet linters PR: 262722 Reported by: basil@vpm.net.ua (maintainer) --- sysutils/ldap-account-manager/Makefile | 37 ++++++++++++++++++------------- sysutils/ldap-account-manager/distinfo | 6 ++--- sysutils/ldap-account-manager/pkg-message | 22 ++++++++++++++++++ 3 files changed, 46 insertions(+), 19 deletions(-) diff --git a/sysutils/ldap-account-manager/Makefile b/sysutils/ldap-account-manager/Makefile index edab32d438ed..d11fb4675c3f 100644 --- a/sysutils/ldap-account-manager/Makefile +++ b/sysutils/ldap-account-manager/Makefile @@ -1,5 +1,5 @@ PORTNAME= ldap-account-manager -PORTVERSION= 7.3 +PORTVERSION= 7.9 CATEGORIES= sysutils www MASTER_SITES= SF/${SHORTNAME}/LAM/${PORTVERSION} @@ -9,33 +9,37 @@ COMMENT= Webfrontend for managing accounts stored in an OpenLDAP server LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= p5-Quota>=0:sysutils/p5-Quota \ - p5-perl-ldap>=0:net/p5-perl-ldap +RUN_DEPENDS= p5-Quota>=0:sysutils/p5-Quota p5-perl-ldap>=0:net/p5-perl-ldap USES= perl5 php:web tar:bzip2 -USE_PHP= curl gd gettext gmp hash iconv json ldap openssl pcre \ - session simplexml xml xmlreader xmlwriter zip +USE_PHP= curl gd filter gettext gmp hash iconv json ldap mbstring openssl \ + pcre session simplexml xml xmlreader xmlwriter zip -NO_BUILD= yes +WWWDIR= ${PREFIX}/www/${SHORTNAME} NO_ARCH= yes +NO_BUILD= yes SHORTNAME= lam -PORTDOCS= docs HISTORY README copyright -LAMDATA= config graphics help lib locale sess style templates tmp VERSION index.html .htaccess -WWWDIR= ${PREFIX}/www/${SHORTNAME} -CONFIGS= config.cfg addressbook.conf samba3.conf unix.conf windows_samba4.conf +PORTDOCS= docs COPYING HISTORY README copyright +LAMDATA= config graphics help lib locale sess style templates tmp VERSION index.html pwa_worker.js .htaccess WRITEABLES= config sess tmp -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE+=DOCS +OPTIONS_DEFAULT=DOCS + +DOCS_DESC= Install documentation and dhcp.schema + +.include do-install: @${ECHO_CMD} '@preexec if [ -f %D/${WWWDIR_REL}/config/shells ]; then ${RM} %D/${WWWDIR_REL}/config/shells; fi' >> ${TMPPLIST} -.for CONFIG in ${CONFIGS} - @${ECHO_CMD} '@sample ${WWWDIR_REL}/config/${CONFIG}.sample' >> ${TMPPLIST} - @${ECHO_CMD} '@postexec if [ -f %D/${WWWDIR_REL}/config/${CONFIG}_sample ]; then ${RM} %D/${WWWDIR_REL}/config/${CONFIG}_sample; fi' >> ${TMPPLIST} -.endfor + @${ECHO_CMD} '@sample ${WWWDIR_REL}/config/addressbook.sample.conf ${WWWDIR_REL}/config/addressbook.conf' >> ${TMPPLIST} + @${ECHO_CMD} '@sample ${WWWDIR_REL}/config/config.cfg.sample ${WWWDIR_REL}/config/config.cfg' >> ${TMPPLIST} + @${ECHO_CMD} '@sample ${WWWDIR_REL}/config/samba3.sample.conf ${WWWDIR_REL}/config/samba3.conf' >> ${TMPPLIST} + @${ECHO_CMD} '@sample ${WWWDIR_REL}/config/unix.sample.conf ${WWWDIR_REL}/config/lam.conf' >> ${TMPPLIST} + @${ECHO_CMD} '@sample ${WWWDIR_REL}/config/windows_samba4.sample.conf ${WWWDIR_REL}/config/windows_samba4.conf' >> ${TMPPLIST} .for I in ${LAMDATA} - @${FIND} -s ${WRKSRC}/${I} -type f -not -name '*.sample' | ${SED} -e 's,^${WRKSRC},${WWWDIR_REL},' >> ${TMPPLIST} + @${FIND} -s ${WRKSRC}/${I} -type f -not -name 'config.cfg.sample' -not -name '*.sample.conf' | ${SED} -e 's,^${WRKSRC},${WWWDIR_REL},' >> ${TMPPLIST} @${FIND} -ds ${WRKSRC}/${I} -type d | ${SED} -e 's,^${WRKSRC},@dir ${WWWDIR_REL},' >> ${TMPPLIST} .endfor @${ECHO_CMD} '@dir ${WWWDIR_REL}' >> ${TMPPLIST} @@ -44,6 +48,7 @@ do-install: @${ECHO_CMD} '@postexec ${CHOWN} -R ${WWWOWN} %D/${WWWDIR_REL}/${DIR}' >> ${TMPPLIST} @${ECHO_CMD} '@postexec ${CHMOD} -R u+w %D/${WWWDIR_REL}/${DIR}' >> ${TMPPLIST} .endfor + @${SED} -i '' 's|usr/bin/perl|usr/local/bin/perl|g' ${WRKSRC}/lib/lamdaemon.pl @${ECHO_CMD} '@postexec ${CHOWN} ${WWWOWN} %D/${WWWDIR_REL}/${DIR}/lib/lamdaemon.pl' >> ${TMPPLIST} @${ECHO_CMD} '@postexec ${CHMOD} u+x %D/${WWWDIR_REL}/${DIR}/lib/lamdaemon.pl' >> ${TMPPLIST} diff --git a/sysutils/ldap-account-manager/distinfo b/sysutils/ldap-account-manager/distinfo index 8417fe1eb11b..1cf8232347c3 100644 --- a/sysutils/ldap-account-manager/distinfo +++ b/sysutils/ldap-account-manager/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1601512583 -SHA256 (ldap-account-manager-7.3.tar.bz2) = db6b9f5f1eeaa1915c562efdaee26c8fb1b0bf206d52dcce24fda428d290f4c4 -SIZE (ldap-account-manager-7.3.tar.bz2) = 22181406 +TIMESTAMP = 1647931232 +SHA256 (ldap-account-manager-7.9.tar.bz2) = 1bb368a788ca54df5bf5f8cf0c33c30a204811d621410c5b0ef98372f89bdb2f +SIZE (ldap-account-manager-7.9.tar.bz2) = 27264502 diff --git a/sysutils/ldap-account-manager/pkg-message b/sysutils/ldap-account-manager/pkg-message new file mode 100644 index 000000000000..72daeaa0e4f1 --- /dev/null +++ b/sysutils/ldap-account-manager/pkg-message @@ -0,0 +1,22 @@ +[ +{ type: install + message: < + Options +FollowSymLinks + AllowOverride All + Require all granted + DirectoryIndex index.html + + +****************************************************************************** + +EOM +} +]