[pkgsrc/trunk]: pkgsrc/databases/phpldapadmin Security fix for http://secunia...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c46ed2e5b6d9
branches:  trunk
changeset: 498799:c46ed2e5b6d9
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Sat Sep 03 16:14:18 2005 +0000

description:
Security fix for http://secunia.com/advisories/16617/
Bump to nb4

diffstat:

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

diffs (53 lines):

diff -r 07e858c49c45 -r c46ed2e5b6d9 databases/phpldapadmin/Makefile
--- a/databases/phpldapadmin/Makefile   Sat Sep 03 16:07:38 2005 +0000
+++ b/databases/phpldapadmin/Makefile   Sat Sep 03 16:14:18 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2005/09/01 19:56:57 adrianp Exp $
+# $NetBSD: Makefile,v 1.11 2005/09/03 16:14:18 adrianp Exp $
 
 DISTNAME=      phpldapadmin-${VERSION}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    databases www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=phpldapadmin/}
 
@@ -19,7 +19,7 @@
 CONF_FILES=    ${PREFIX}/share/examples/phpldapadmin/config.php.example \
                ${PREFIX}/share/phpldapadmin/config.php
 CONF_FILES+=   ${PREFIX}/share/examples/phpldapadmin/phpldapadmin.conf \
-               ${PKG_SYSCONFDIR}/httpd/phpldapadmin.conf               
+               ${PKG_SYSCONFDIR}/httpd/phpldapadmin.conf
 SPECIAL_PERMS= ${PREFIX}/share/phpldapadmin/config.php \
                ${APACHE_USER} wheel 0600
 
diff -r 07e858c49c45 -r c46ed2e5b6d9 databases/phpldapadmin/distinfo
--- a/databases/phpldapadmin/distinfo   Sat Sep 03 16:07:38 2005 +0000
+++ b/databases/phpldapadmin/distinfo   Sat Sep 03 16:14:18 2005 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2005/08/30 14:26:32 adrianp Exp $
+$NetBSD: distinfo,v 1.6 2005/09/03 16:14:18 adrianp 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
+SHA1 (patch-ab) = f4981f2e8cb6858e9ff8a407667509c177a35b47
diff -r 07e858c49c45 -r c46ed2e5b6d9 databases/phpldapadmin/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/phpldapadmin/patches/patch-ab   Sat Sep 03 16:14:18 2005 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2005/09/03 16:14:18 adrianp Exp $
+
+--- welcome.php.orig   2005-09-03 16:53:02.000000000 +0100
++++ welcome.php
+@@ -10,10 +10,6 @@
+       include './header.php'; 
+ //    include './config.php'; 
+     
+-if ( isset($custom_welcome_page) && $custom_welcome_page ) {
+-    include_once $custom_welcome_page;
+-
+-} else {
+     // Close the session for faster page loading
+     pla_session_close();
+ ?>