[pkgsrc/pkgsrc-2005Q2]: pkgsrc/databases/phpldapadmin Pullup ticket 725 - req...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/90fd2029d18c
branches:  pkgsrc-2005Q2
changeset: 496060:90fd2029d18c
user:      salo <salo%pkgsrc.org@localhost>
date:      Sat Sep 03 13:20:00 2005 +0000

description:
Pullup ticket 725 - requested by Adrian Portelli
security fixes for phpldapadmin

Revisions pulled up:
- pkgsrc/databases/phpldapadmin/Makefile                1.8, 1.9, 1.10
- pkgsrc/databases/phpldapadmin/distinfo                1.5
- pkgsrc/databases/phpldapadmin/patches/patch-aa        1.1

   Module Name:         pkgsrc
   Committed By:        adrianp
   Date:                Tue Aug 30 14:26:32 UTC 2005

   Modified Files:
        pkgsrc/databases/phpldapadmin: Makefile distinfo
   Added Files:
        pkgsrc/databases/phpldapadmin/patches: patch-aa

   Log Message:
   Patch via Debian for recent security issue
   Bump to nb2
---
   Module Name:         pkgsrc
   Committed By:        adrianp
   Date:                Tue Aug 30 15:28:48 UTC 2005

   Modified Files:
        pkgsrc/databases/phpldapadmin: Makefile

   Log Message:
   Remove .orig file in pre-install from patch-aa. Spotted by salo@.
---
   Module Name:         pkgsrc
   Committed By:        adrianp
   Date:                Thu Sep  1 19:56:57 UTC 2005

   Modified Files:
        pkgsrc/databases/phpldapadmin: Makefile

   Log Message:
   Add a depends on apache
   Fix up previous handling of new patch as suggested by salo@ in private
   email.
   Bump PKGREVISION

diffstat:

 databases/phpldapadmin/Makefile         |   6 ++++--
 databases/phpldapadmin/distinfo         |   3 ++-
 databases/phpldapadmin/patches/patch-aa |  15 +++++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diffs (52 lines):

diff -r b37e894c794e -r 90fd2029d18c databases/phpldapadmin/Makefile
--- a/databases/phpldapadmin/Makefile   Fri Sep 02 12:20:57 2005 +0000
+++ b/databases/phpldapadmin/Makefile   Sat Sep 03 13:20:00 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2005/05/23 22:01:42 adrianp Exp $
+# $NetBSD: Makefile,v 1.7.2.1 2005/09/03 13:20:00 salo Exp $
 
 DISTNAME=      phpldapadmin-${VERSION}
-PKGREVISION=   1
+PKGREVISION=   3
 CATEGORIES=    databases www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=phpldapadmin/}
 
@@ -43,6 +43,8 @@
        cd ${WRKSRC} && ${PAX}          \
                -s /\.#//               \
                -s /\.cvsignore//       \
+               -s /\.orig//            \
                -rwppm . ${PREFIX}/share/phpldapadmin
 
+.include "../../mk/apache.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r b37e894c794e -r 90fd2029d18c databases/phpldapadmin/distinfo
--- a/databases/phpldapadmin/distinfo   Fri Sep 02 12:20:57 2005 +0000
+++ b/databases/phpldapadmin/distinfo   Sat Sep 03 13:20:00 2005 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/05/19 23:12:17 seb Exp $
+$NetBSD: distinfo,v 1.4.2.1 2005/09/03 13:20:00 salo Exp $
 
 SHA1 (phpldapadmin-0.9.6c.tar.gz) = 52d094ec62892409d766629c42a32e076076bd97
 RMD160 (phpldapadmin-0.9.6c.tar.gz) = 29280777527af4531119ecfa5365cce7d899cd50
 Size (phpldapadmin-0.9.6c.tar.gz) = 707109 bytes
+SHA1 (patch-aa) = b921f4574b5613e0182456891eec7e5001ddc1a6
diff -r b37e894c794e -r 90fd2029d18c databases/phpldapadmin/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/phpldapadmin/patches/patch-aa   Sat Sep 03 13:20:00 2005 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1.2.2 2005/09/03 13:20:00 salo Exp $
+
+--- login.php.orig     2005-04-15 14:16:59.000000000 +0100
++++ login.php
+@@ -30,7 +30,9 @@ $ldapserver = new LDAPServer($server_id)
+ $dn = isset( $_POST['login_dn'] ) ? $_POST['login_dn'] : null;
+ $uid = isset( $_POST['uid'] ) ? $_POST['uid'] : null;
+ $pass = isset( $_POST['login_pass'] ) ? $_POST['login_pass'] : null;
+-$anon_bind = isset( $_POST['anonymous_bind'] ) && $_POST['anonymous_bind'] == 'on' ? true : false;
++$anon_bind = isset( $_POST['anonymous_bind'] ) && 
++                    $_POST['anonymous_bind'] == 'on' && 
++                    $ldapserver->isAnonBindAllowed() ? true : false;
+ 
+ if( ! $anon_bind )
+       strlen($pass) or pla_error( $lang['password_blank'] );