head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.34
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.32
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.30
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.28
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.26
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.24
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.22
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.20
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.18
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.16
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.14
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.12
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.10
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.8
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.6
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.4
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.2
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.1.0.8
	pkgsrc-2006Q1-base:1.1
	pkgsrc-2005Q4:1.1.0.6
	pkgsrc-2005Q4-base:1.1
	pkgsrc-2005Q3:1.1.0.4
	pkgsrc-2005Q3-base:1.1
	pkgsrc-2005Q2:1.1.0.2;
locks; strict;
comment	@# @;


1.2
date	2006.05.18.22.13.46;	author adrianp;	state dead;
branches;
next	1.1;

1.1
date	2005.09.03.16.14.18;	author adrianp;	state Exp;
branches
	1.1.2.1
	1.1.8.1;
next	;

1.1.2.1
date	2005.09.03.16.14.18;	author salo;	state dead;
branches;
next	1.1.2.2;

1.1.2.2
date	2005.09.04.13.40.40;	author salo;	state Exp;
branches;
next	;

1.1.8.1
date	2006.05.23.23.33.47;	author salo;	state dead;
branches;
next	;


desc
@@


1.2
log
@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".
@
text
@$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();
 ?>
@


1.1
log
@Security fix for http://secunia.com/advisories/16617/
Bump to nb4
@
text
@d1 1
a1 1
$NetBSD$
@


1.1.2.1
log
@file patch-ab was added on branch pkgsrc-2005Q2 on 2005-09-03 16:14:18 +0000
@
text
@d1 15
@


1.1.2.2
log
@Pullup ticket 737 - requested by Adrian Portelli
security fix for phpldapadmin

Revisions pulled up:
- pkgsrc/databases/phpldapadmin/Makefile		1.11, 1.12, 1.13
- pkgsrc/databases/phpldapadmin/distinfo		1.6, 1.7
- pkgsrc/databases/phpldapadmin/patches/patch-ab	1.1
- pkgsrc/databases/phpldapadmin/patches/patch-aa	1.2

   Module Name:		pkgsrc
   Committed By:	adrianp
   Date:		Sat Sep  3 16:14:18 UTC 2005

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

   Log Message:
   Security fix for http://secunia.com/advisories/16617/
   Bump to nb4
---
   Module Name:		pkgsrc
   Committed By:	adrianp
   Date:		Sat Sep  3 17:00:08 UTC 2005

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

   Log Message:
   Add updated patch-aa for a missed diff on login.php for the last
   security fix
   Re-do how .orig files are handled by pax as this wasn't working as
   expected
   Ride the previous package bump
---
   Module Name:		pkgsrc
   Committed By:	adrianp
   Date:		Sun Sep  4 10:08:14 UTC 2005

   Modified Files:
   	pkgsrc/databases/phpldapadmin: Makefile

   Log Message:
   Use PAX options instead of ${FIND} and ${RM} to kill files that we don't
    want to install.  Patch from salo@@ in private email.
   No functional change.
@
text
@a0 15
$NetBSD: patch-ab,v 1.1.2.1 2005/09/04 13:40:40 salo 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();
 ?>
@


1.1.8.1
log
@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@@)
@
text
@d1 1
a1 1
$NetBSD: patch-ab,v 1.1 2005/09/03 16:14:18 adrianp Exp $
@
