Subject: pkg/33493: databases/phpldapadmin: welcome.php is broken
To: None <pkg-manager@netbsd.org, gnats-admin@netbsd.org,>
From: None <ykomatsu@akaumigame.org>
List: pkgsrc-bugs
Date: 05/16/2006 14:15:00
>Number: 33493
>Category: pkg
>Synopsis: databases/phpldapadmin: welcome.php is broken
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: pkg-manager
>State: open
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Tue May 16 14:15:00 +0000 2006
>Originator: Yoshito Komatsu
>Release: NetBSD 3.99.19
>Organization:
>Environment:
System: NetBSD c8.ln.akaumigame.org 3.99.19 NetBSD 3.99.19 (XENU) #0: Wed May 10 01:50:55 JST 2006 root@c8.ln.akaumigame.org:/usr/obj/sys/arch/i386/compile/XENU i386
Architecture: i386
Machine: i386
>Description:
welcome.php in phpLDAPadmin is not displayed.
>How-To-Repeat:
Please install phpLDAPadmin and access it with a web browser.
>Fix:
patches/patch-ab breaks parenthesis matching in welcome.php.
I think that the following patch will fix this problem.
diff -uNr phpldapadmin.orig/distinfo phpldapadmin/distinfo
--- phpldapadmin.orig/distinfo 2006-05-16 22:49:20.000000000 +0900
+++ phpldapadmin/distinfo 2006-05-16 22:50:41.000000000 +0900
@@ -3,5 +3,5 @@
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) = fa37fe2172ec3d068fe3280fe1ecefa5a68d2dcf
-SHA1 (patch-ab) = f4981f2e8cb6858e9ff8a407667509c177a35b47
+SHA1 (patch-aa) = 0c6b70904b1713ada7be66a9f8e07534270d3305
+SHA1 (patch-ab) = b6ac54b417b7391e3468f7c50915373f06ccebff
diff -uNr phpldapadmin.orig/patches/patch-aa phpldapadmin/patches/patch-aa
--- phpldapadmin.orig/patches/patch-aa 2006-05-16 22:49:20.000000000 +0900
+++ phpldapadmin/patches/patch-aa 2006-05-16 22:50:25.000000000 +0900
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2005/09/03 17:00:07 adrianp Exp $
+$NetBSD$
---- login.php.orig 2005-04-15 14:16:59.000000000 +0100
+--- login.php.orig 2005-04-15 22:16:59.000000000 +0900
+++ login.php
@@ -30,7 +30,9 @@ $ldapserver = new LDAPServer($server_id)
$dn = isset( $_POST['login_dn'] ) ? $_POST['login_dn'] : null;
diff -uNr phpldapadmin.orig/patches/patch-ab phpldapadmin/patches/patch-ab
--- phpldapadmin.orig/patches/patch-ab 2006-05-16 22:49:20.000000000 +0900
+++ phpldapadmin/patches/patch-ab 2006-05-16 22:50:25.000000000 +0900
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1 2005/09/03 16:14:18 adrianp Exp $
+$NetBSD$
---- welcome.php.orig 2005-09-03 16:53:02.000000000 +0100
+--- welcome.php.orig 2005-02-25 22:44:06.000000000 +0900
+++ welcome.php
@@ -10,10 +10,6 @@
include './header.php';
@@ -13,3 +13,10 @@
// Close the session for faster page loading
pla_session_close();
?>
+@@ -43,6 +39,3 @@ if ( ! hide_configuration_management() )
+ </center>
+ </body>
+ </html>
+-
+-<?php }
+-?>