diff options
| author | adrianp <adrianp> | 2005-09-03 17:00:07 +0000 |
|---|---|---|
| committer | adrianp <adrianp> | 2005-09-03 17:00:07 +0000 |
| commit | 0d8b35a2746fd7bea43077acf1ba32be624a576b (patch) | |
| tree | 928ccc8ccb58c120dd4bf6d8e282eb4d3b53b5e5 /databases/phpldapadmin | |
| parent | 497a871e62f41ba284595fa9cedce4b4e7125b11 (diff) | |
| download | pkgsrc-0d8b35a2746fd7bea43077acf1ba32be624a576b.tar.gz | |
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
Diffstat (limited to 'databases/phpldapadmin')
| -rw-r--r-- | databases/phpldapadmin/Makefile | 4 | ||||
| -rw-r--r-- | databases/phpldapadmin/distinfo | 4 | ||||
| -rw-r--r-- | databases/phpldapadmin/patches/patch-aa | 12 |
3 files changed, 15 insertions, 5 deletions
diff --git a/databases/phpldapadmin/Makefile b/databases/phpldapadmin/Makefile index 4fdddca4d19..480651ea1d8 100644 --- a/databases/phpldapadmin/Makefile +++ b/databases/phpldapadmin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/09/03 16:14:18 adrianp Exp $ +# $NetBSD: Makefile,v 1.12 2005/09/03 17:00:07 adrianp Exp $ DISTNAME= phpldapadmin-${VERSION} PKGREVISION= 4 @@ -38,12 +38,12 @@ do-install: ${PREFIX}/share/examples/phpldapadmin @${RM} ${WRKSRC}/config.php.example + @${FIND} ${WRKSRC} -name \*.orig | ${XARGS} ${RM} ${INSTALL_DATA_DIR} ${PREFIX}/share/phpldapadmin cd ${WRKSRC} && ${PAX} \ -s /\.#// \ -s /\.cvsignore// \ - -s /\.orig// \ -rwppm . ${PREFIX}/share/phpldapadmin .include "../../mk/apache.mk" diff --git a/databases/phpldapadmin/distinfo b/databases/phpldapadmin/distinfo index 09008416ef5..f8db37619a3 100644 --- a/databases/phpldapadmin/distinfo +++ b/databases/phpldapadmin/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.6 2005/09/03 16:14:18 adrianp Exp $ +$NetBSD: distinfo,v 1.7 2005/09/03 17:00:07 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-aa) = fa37fe2172ec3d068fe3280fe1ecefa5a68d2dcf SHA1 (patch-ab) = f4981f2e8cb6858e9ff8a407667509c177a35b47 diff --git a/databases/phpldapadmin/patches/patch-aa b/databases/phpldapadmin/patches/patch-aa index 8b5927b496f..56096cd0b79 100644 --- a/databases/phpldapadmin/patches/patch-aa +++ b/databases/phpldapadmin/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1 2005/08/30 14:26:32 adrianp Exp $ +$NetBSD: patch-aa,v 1.2 2005/09/03 17:00:07 adrianp Exp $ --- login.php.orig 2005-04-15 14:16:59.000000000 +0100 +++ login.php @@ -13,3 +13,13 @@ $NetBSD: patch-aa,v 1.1 2005/08/30 14:26:32 adrianp Exp $ if( ! $anon_bind ) strlen($pass) or pla_error( $lang['password_blank'] ); +@@ -149,9 +151,6 @@ include realpath( 'header.php' ); + parent.left_frame.location.reload(); + <?php } ?> + +- <?php if ( isset($custom_welcome_page) and $custom_welcome_page ) { ?> +- parent.right_frame.location.href='welcome.php'; +- <?php } ?> + </script> + + <center> |