[pkgsrc/pkgsrc-2006Q1]: pkgsrc/databases/phpldapadmin Pullup ticket 1643 - re...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/pkgsrc-2006Q1]: pkgsrc/databases/phpldapadmin Pullup ticket 1643 - re...
From: salo <salo%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 03:15:00 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/bf2581a3b68a
branches:  pkgsrc-2006Q1
changeset: 510287:bf2581a3b68a
user:      salo <salo%pkgsrc.org@localhost>
date:      Tue May 23 23:33:47 2006 +0000

description:
Pullup ticket 1643 - requested by adrianp
security update for phpldapadmin

Revisions pulled up:
- pkgsrc/databases/phpldapadmin/MESSAGE                 1.5, 1.6
- pkgsrc/databases/phpldapadmin/Makefile                1.19, 1.20, 1.21
- pkgsrc/databases/phpldapadmin/PLIST                   1.6, 1.7
- pkgsrc/databases/phpldapadmin/distinfo                1.8, 1.9
- pkgsrc/databases/phpldapadmin/patches/patch-aa        removed
- pkgsrc/databases/phpldapadmin/patches/patch-ab        removed

   Module Name:         pkgsrc
   Committed By:        adrianp
   Date:                Thu May 18 22:13:46 UTC 2006

   Modified Files:
        pkgsrc/databases/phpldapadmin: MESSAGE Makefile PLIST distinfo
   Removed Files:
        pkgsrc/databases/phpldapadmin/patches: patch-aa patch-ab

   Log Message:
   Updated phpldapadmin to 0.9.8.3
   Thanks to Yoshito Komatsu for feedback and testing

   A summary of changes include:
   This release fixes some minor bugs and some security alerts.
   Code syntax fixing tests
   HTML Validation fixes
   Added support for binary attrs in templates & HTML Validation fixes
   Few minor bug fixes.
   Changed default login attribute back to "dn".
---
   Module Name:         pkgsrc
   Committed By:        adrianp
   Date:                Thu May 18 22:22:37 UTC 2006

   Modified Files:
        pkgsrc/databases/phpldapadmin: Makefile

   Log Message:
   Add a missing DEPENDS from the package update
---
   Module Name:         pkgsrc
   Committed By:        adrianp
   Date:                Sun May 21 11:58:25 UTC 2006

   Modified Files:
        pkgsrc/databases/phpldapadmin: distinfo

   Log Message:
   Fix checksums
---
   Module Name:         pkgsrc
   Committed By:        adrianp
   Date:                Tue May 23 20:51:44 UTC 2006

   Modified Files:
        pkgsrc/databases/phpldapadmin: MESSAGE Makefile PLIST

   Log Message:
   Watch for non-empty config/ directory
   Use CONF_FILES_PERMS to install the conf.php file
   Don't use WWW_USER to set permissions as that assumes apache is always installed
   Bump PKGREVISION
   Fix binary packages (pointed out by salo@)

diffstat:

 databases/phpldapadmin/MESSAGE          |    9 +-
 databases/phpldapadmin/Makefile         |   70 +-
 databases/phpldapadmin/PLIST            |  916 ++++++++++++++++++-------------
 databases/phpldapadmin/distinfo         |   10 +-
 databases/phpldapadmin/patches/patch-aa |   25 -
 databases/phpldapadmin/patches/patch-ab |   15 -
 6 files changed, 578 insertions(+), 467 deletions(-)

diffs (truncated from 1117 to 300 lines):

diff -r 527ebc0c4b75 -r bf2581a3b68a databases/phpldapadmin/MESSAGE
--- a/databases/phpldapadmin/MESSAGE    Tue May 23 18:44:55 2006 +0000
+++ b/databases/phpldapadmin/MESSAGE    Tue May 23 23:33:47 2006 +0000
@@ -1,7 +1,7 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2005/09/06 21:47:46 adrianp Exp $
+$NetBSD: MESSAGE,v 1.4.6.1 2006/05/23 23:33:47 salo Exp $
 
-You will need to edit ${PREFIX}/share/phpldapadmin/config.php to
+You will need to edit ${PREFIX}/share/phpldapadmin/config/config.php to
 initially setup your site.
 
 You will also need to make phpLDAPAdmin accessible through your HTTP server.
@@ -11,6 +11,9 @@
 
 to make phpLDAPAdmin accessible through:
 
-       http://www.domain.com/ldapadmin/
+       http://localhost/ldapadmin/
 
+In addition to this it is highly recommended that you check the permissions
+on the phpLDAPAdmin configuration file (config.php) as this can contain
+sensitive information.
 ===========================================================================
diff -r 527ebc0c4b75 -r bf2581a3b68a databases/phpldapadmin/Makefile
--- a/databases/phpldapadmin/Makefile   Tue May 23 18:44:55 2006 +0000
+++ b/databases/phpldapadmin/Makefile   Tue May 23 23:33:47 2006 +0000
@@ -1,55 +1,65 @@
-# $NetBSD: Makefile,v 1.18 2006/02/16 18:18:25 wiz Exp $
+# $NetBSD: Makefile,v 1.18.2.1 2006/05/23 23:33:47 salo Exp $
 
 DISTNAME=      phpldapadmin-${VERSION}
-PKGREVISION=   8
 CATEGORIES=    databases www
+PKGREVISION=   1
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=phpldapadmin/}
 
 MAINTAINER=    rasputnik%hellooperator.net@localhost
 HOMEPAGE=      http://phpldapadmin.sourceforge.net/
 COMMENT=       Set of PHP-scripts to administer an LDAP directory over the WWW
 
-DEPENDS+=      php-ldap>=4.1.2:../../databases/php-ldap
+.include "../../mk/bsd.prefs.mk"
+.include "../../lang/php/phpversion.mk"
 
-VERSION=       0.9.6c
+DEPENDS+=      php-ldap>=4.1.2:../../databases/php-ldap
+DEPENDS+=      php-gettext>=4.1.2:../../devel/php-gettext
+.if ${PKG_PHP_VERSION} == "4"
+DEPENDS+=      php-domxml>=4.1.2:../../textproc/php4-domxml
+.elif ${PKG_PHP_VERSION} == "5"
+DEPENDS+=      php-dom-[0-9]*:../../textproc/php5-dom
+.endif
+
+VERSION=       0.9.8.3
 NO_BUILD=      YES
-BUILD_DEFS+=   WWW_USER
 
-CONF_FILES=    ${PREFIX}/share/examples/phpldapadmin/config.php.example \
-               ${PREFIX}/share/phpldapadmin/config.php
+CONF_FILES_PERMS+=  ${PREFIX}/share/examples/phpldapadmin/config.php.example \
+               ${PREFIX}/share/phpldapadmin/config/config.php           \
+               ${ROOT_USER} ${ROOT_GROUP} 0644
 CONF_FILES+=   ${PREFIX}/share/examples/phpldapadmin/phpldapadmin.conf \
                ${PKG_SYSCONFDIR}/phpldapadmin.conf
-SPECIAL_PERMS= ${PREFIX}/share/phpldapadmin/config.php \
-               ${WWW_USER} ${ROOT_GROUP} 0600
-
-INSTALLATION_DIRS=     ${PREFIX}/share/phpldapadmin
-
-# NOTE: If you're running apache under an account other than www or
-# are running a different web server under a specific user account
-# you should set WWW_USER in your mk.conf.
-#
-.if !defined(WWW_USER)
-WWW_USER=      ${APACHE_USER}
-.endif
+PAX_DIRS=      config doc htdocs lib locale templates tools
 
 do-configure:
-       @${SED} -e "s|@LDAPADMINDIR@|${PREFIX}/share/phpldapadmin|g" \
+       ${SED} -e "s|@LDAPADMINDIR@|${PREFIX}/share/phpldapadmin/htdocs|g" \
                ${FILESDIR}/phpldapadmin.conf > ${WRKDIR}/phpldapadmin.conf
 
 do-install:
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/phpldapadmin
        ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/phpldapadmin
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/phpldapadmin
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/phpldapadmin/config
 
-       ${INSTALL_DATA} ${WRKSRC}/config.php.example \
-               ${PREFIX}/share/examples/phpldapadmin
+       ${INSTALL_DATA} ${WRKSRC}/config/config.php.example \
+               ${PREFIX}/share/examples/phpldapadmin/config.php.example
        ${INSTALL_DATA} ${WRKDIR}/phpldapadmin.conf \
-               ${PREFIX}/share/examples/phpldapadmin
+               ${PREFIX}/share/examples/phpldapadmin/phpldapadmin.conf
+
+       ${RM} ${WRKSRC}/.cvsignore
+       ${RM} ${WRKSRC}/config/.cvsignore
 
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/phpldapadmin
-       cd ${WRKSRC} && ${PAX}          \
-               -s /\.#//               \
-               -s /\.cvsignore//       \
-               -s /\.\*.orig//         \
-               -s /\.\*.example//      \
-               -rwppm . ${PREFIX}/share/phpldapadmin
+       ${INSTALL_DATA} ${WRKSRC}/index.php ${PREFIX}/share/phpldapadmin
+
+.for i in ${PAX_DIRS}
+               @cd ${WRKSRC}/${i:Q} && ${PAX} \
+                       -rwppm . ${PREFIX}/share/phpldapadmin/${i:Q}
+.endfor
+
+       ${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/phpldapadmin
+       ${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/phpldapadmin
+       ${INSTALL_DATA} ${WRKSRC}/VERSION ${PREFIX}/share/phpldapadmin
+
+       ${FIND} ${PREFIX}/share/doc/phpldapadmin -type d | \
+               ${XARGS} ${CHMOD} ${PKGDIRMODE}
 
 .include "../../mk/bsd.pkg.mk"
diff -r 527ebc0c4b75 -r bf2581a3b68a databases/phpldapadmin/PLIST
--- a/databases/phpldapadmin/PLIST      Tue May 23 18:44:55 2006 +0000
+++ b/databases/phpldapadmin/PLIST      Tue May 23 23:33:47 2006 +0000
@@ -1,399 +1,539 @@
-@comment $NetBSD: PLIST,v 1.5 2006/02/16 18:18:25 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5.2.1 2006/05/23 23:33:47 salo Exp $
+share/doc/phpldapadmin/INSTALL
+share/doc/phpldapadmin/LICENSE
 share/examples/phpldapadmin/config.php.example
 share/examples/phpldapadmin/phpldapadmin.conf
-share/phpldapadmin/INSTALL
-share/phpldapadmin/LICENSE
 share/phpldapadmin/VERSION
-share/phpldapadmin/add_attr.php
-share/phpldapadmin/add_attr_form.php
-share/phpldapadmin/add_oclass.php
-share/phpldapadmin/add_oclass_form.php
-share/phpldapadmin/add_value.php
-share/phpldapadmin/add_value_form.php
-share/phpldapadmin/blowfish.php
-share/phpldapadmin/check_lang_files.php
-share/phpldapadmin/collapse.php
-share/phpldapadmin/common.php
-share/phpldapadmin/compare.php
-share/phpldapadmin/compare_form.php
-share/phpldapadmin/copy.php
-share/phpldapadmin/copy_form.php
-share/phpldapadmin/create.php
-share/phpldapadmin/create_form.php
-share/phpldapadmin/creation_template.php
-share/phpldapadmin/custom_functions.php
-share/phpldapadmin/delete.php
-share/phpldapadmin/delete_attr.php
-share/phpldapadmin/delete_form.php
-share/phpldapadmin/doc/CREDITS
-share/phpldapadmin/doc/ChangeLog
-share/phpldapadmin/doc/INSTALL-de.txt
-share/phpldapadmin/doc/INSTALL-es.txt
-share/phpldapadmin/doc/INSTALL-fr.txt
+share/phpldapadmin/config/config.php.example
 share/phpldapadmin/doc/README-translation.txt
-share/phpldapadmin/doc/hooks.sgml
 share/phpldapadmin/doc/pla-test-i18n.ldif
-share/phpldapadmin/doc/test_encoding.sh
-share/phpldapadmin/documentation.php
-share/phpldapadmin/donate.php
-share/phpldapadmin/download_binary_attr.php
-share/phpldapadmin/edit.php
-share/phpldapadmin/emuhash_functions.php
-share/phpldapadmin/entry_chooser.js
-share/phpldapadmin/entry_chooser.php
-share/phpldapadmin/expand.php
-share/phpldapadmin/export.php
-share/phpldapadmin/export_form.php
-share/phpldapadmin/export_functions.php
-share/phpldapadmin/functions.php
-share/phpldapadmin/generic_utils.js
-share/phpldapadmin/header.php
-share/phpldapadmin/help.php
-share/phpldapadmin/hooks.php
-share/phpldapadmin/ie_png_work_around.js
-share/phpldapadmin/images/add.png
-share/phpldapadmin/images/bug.png
-share/phpldapadmin/images/catalog.png
-share/phpldapadmin/images/children.png
-share/phpldapadmin/images/compare.png
-share/phpldapadmin/images/countries/af.png
-share/phpldapadmin/images/countries/al.png
-share/phpldapadmin/images/countries/am.png
-share/phpldapadmin/images/countries/an.png
-share/phpldapadmin/images/countries/ao.png
-share/phpldapadmin/images/countries/ar.png
-share/phpldapadmin/images/countries/at.png
-share/phpldapadmin/images/countries/au.png
-share/phpldapadmin/images/countries/aw.png
-share/phpldapadmin/images/countries/az.png
-share/phpldapadmin/images/countries/ba.png
-share/phpldapadmin/images/countries/bb.png
-share/phpldapadmin/images/countries/bd.png
-share/phpldapadmin/images/countries/be.png
-share/phpldapadmin/images/countries/bf.png
-share/phpldapadmin/images/countries/bg.png
-share/phpldapadmin/images/countries/bh.png
-share/phpldapadmin/images/countries/bi.png
-share/phpldapadmin/images/countries/bj.png
-share/phpldapadmin/images/countries/bm.png
-share/phpldapadmin/images/countries/bn.png
-share/phpldapadmin/images/countries/bo.png
-share/phpldapadmin/images/countries/br.png
-share/phpldapadmin/images/countries/bs.png
-share/phpldapadmin/images/countries/bt.png
-share/phpldapadmin/images/countries/bw.png
-share/phpldapadmin/images/countries/by.png
-share/phpldapadmin/images/countries/bz.png
-share/phpldapadmin/images/countries/ca.png
-share/phpldapadmin/images/countries/cf.png
-share/phpldapadmin/images/countries/cg.png
-share/phpldapadmin/images/countries/ch.png
-share/phpldapadmin/images/countries/ci.png
-share/phpldapadmin/images/countries/ck.png
-share/phpldapadmin/images/countries/cl.png
-share/phpldapadmin/images/countries/cm.png
-share/phpldapadmin/images/countries/cn.png
-share/phpldapadmin/images/countries/co.png
-share/phpldapadmin/images/countries/cr.png
-share/phpldapadmin/images/countries/cu.png
-share/phpldapadmin/images/countries/cv.png
-share/phpldapadmin/images/countries/cy.png
-share/phpldapadmin/images/countries/cz.png
-share/phpldapadmin/images/countries/de.png
-share/phpldapadmin/images/countries/dk.png
-share/phpldapadmin/images/countries/dz.png
-share/phpldapadmin/images/countries/ec.png
-share/phpldapadmin/images/countries/ee.png
-share/phpldapadmin/images/countries/eg.png
-share/phpldapadmin/images/countries/er.png
-share/phpldapadmin/images/countries/es.png
-share/phpldapadmin/images/countries/et.png
-share/phpldapadmin/images/countries/fi.png
-share/phpldapadmin/images/countries/fj.png
-share/phpldapadmin/images/countries/fo.png
-share/phpldapadmin/images/countries/fr.png
-share/phpldapadmin/images/countries/ga.png
-share/phpldapadmin/images/countries/gb.png
-share/phpldapadmin/images/countries/ge.png
-share/phpldapadmin/images/countries/gi.png
-share/phpldapadmin/images/countries/gl.png
-share/phpldapadmin/images/countries/gp.png
-share/phpldapadmin/images/countries/gr.png
-share/phpldapadmin/images/countries/gt.png
-share/phpldapadmin/images/countries/gu.png
-share/phpldapadmin/images/countries/gy.png
-share/phpldapadmin/images/countries/hk.png
-share/phpldapadmin/images/countries/hr.png
-share/phpldapadmin/images/countries/ht.png
-share/phpldapadmin/images/countries/hu.png
-share/phpldapadmin/images/countries/id.png
-share/phpldapadmin/images/countries/ie.png
-share/phpldapadmin/images/countries/il.png
-share/phpldapadmin/images/countries/in.png
-share/phpldapadmin/images/countries/iq.png
-share/phpldapadmin/images/countries/ir.png
-share/phpldapadmin/images/countries/is.png
-share/phpldapadmin/images/countries/it.png
-share/phpldapadmin/images/countries/jm.png
-share/phpldapadmin/images/countries/jo.png
-share/phpldapadmin/images/countries/jp.png
-share/phpldapadmin/images/countries/ke.png
-share/phpldapadmin/images/countries/kg.png
-share/phpldapadmin/images/countries/kh.png
-share/phpldapadmin/images/countries/ki.png
-share/phpldapadmin/images/countries/kp.png
-share/phpldapadmin/images/countries/kr.png
-share/phpldapadmin/images/countries/ky.png
-share/phpldapadmin/images/countries/kz.png
-share/phpldapadmin/images/countries/lb.png
-share/phpldapadmin/images/countries/lc.png
-share/phpldapadmin/images/countries/lk.png
-share/phpldapadmin/images/countries/lt.png
-share/phpldapadmin/images/countries/lu.png
-share/phpldapadmin/images/countries/lv.png
-share/phpldapadmin/images/countries/ly.png
-share/phpldapadmin/images/countries/ma.png
-share/phpldapadmin/images/countries/mc.png
-share/phpldapadmin/images/countries/md.png
-share/phpldapadmin/images/countries/mg.png
-share/phpldapadmin/images/countries/mn.png
-share/phpldapadmin/images/countries/mo.png
-share/phpldapadmin/images/countries/mp.png
-share/phpldapadmin/images/countries/ms.png
-share/phpldapadmin/images/countries/mt.png
-share/phpldapadmin/images/countries/mx.png
-share/phpldapadmin/images/countries/my.png
-share/phpldapadmin/images/countries/mz.png
-share/phpldapadmin/images/countries/na.png
-share/phpldapadmin/images/countries/nc.png
-share/phpldapadmin/images/countries/nf.png
Prev by Date: [pkgsrc/pkgsrc-2006Q1]: pkgsrc/net/nagios-base Pullup ticket 1605 - requested...
Next by Date: [pkgsrc/pkgsrc-2006Q1]: pkgsrc/mail/dovecot Pullup ticket 1646 - requested by...
Previous by Thread: [pkgsrc/pkgsrc-2006Q1]: pkgsrc/net/nagios-base Pullup ticket 1605 - requested...
Next by Thread: [pkgsrc/pkgsrc-2006Q1]: pkgsrc/mail/dovecot Pullup ticket 1646 - requested by...
Indexes:
Home | Main Index | Thread Index | Old Index