diff options
| author | adrianp <adrianp@pkgsrc.org> | 2005-09-03 16:14:18 +0000 |
|---|---|---|
| committer | adrianp <adrianp@pkgsrc.org> | 2005-09-03 16:14:18 +0000 |
| commit | db70c6120af8fd8a3817a1d233c1856cab277135 (patch) | |
| tree | 2609e7208a5dbc13626ec929030f5bbdb89a9d5b /databases | |
| parent | 53e5a644ff86570711959df1e7853a5e2551db83 (diff) | |
| download | pkgsrc-db70c6120af8fd8a3817a1d233c1856cab277135.tar.gz | |
Security fix for http://secunia.com/advisories/16617/
Bump to nb4
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/phpldapadmin/Makefile | 6 | ||||
| -rw-r--r-- | databases/phpldapadmin/distinfo | 3 | ||||
| -rw-r--r-- | databases/phpldapadmin/patches/patch-ab | 15 |
3 files changed, 20 insertions, 4 deletions
diff --git a/databases/phpldapadmin/Makefile b/databases/phpldapadmin/Makefile index 4b03f516391..4fdddca4d19 100644 --- a/databases/phpldapadmin/Makefile +++ b/databases/phpldapadmin/Makefile @@ -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 @@ APACHE_USER?= www 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 --git a/databases/phpldapadmin/distinfo b/databases/phpldapadmin/distinfo index 1acf9f752d1..09008416ef5 100644 --- a/databases/phpldapadmin/distinfo +++ b/databases/phpldapadmin/distinfo @@ -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 --git a/databases/phpldapadmin/patches/patch-ab b/databases/phpldapadmin/patches/patch-ab new file mode 100644 index 00000000000..c68c92b8615 --- /dev/null +++ b/databases/phpldapadmin/patches/patch-ab @@ -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(); + ?> |