From 36ed5c3290fb63a7eb180b94f07dc7e310e892ff Mon Sep 17 00:00:00 2001 From: claudio Date: Mon, 11 May 2009 19:40:58 +0000 Subject: [PATCH] Define LDAP_DEPRECATED because OpenLDAP wants to make sure that every older app is subtly but totaly broken by removing API functions unless we use the magic button. Depending on the architecture the code may work or crash horribly without this. OK sthen@ (there are similar hacks in many other apps) --- www/mod_auth_ldap/Makefile | 4 ++-- www/mod_auth_ldap/patches/patch-Makefile_in | 8 ++++---- www/mod_auth_ldap/patches/patch-auth_ldap_c | 8 ++++---- www/mod_auth_ldap/patches/patch-auth_ldap_h | 11 +++++++++++ 4 files changed, 21 insertions(+), 10 deletions(-) create mode 100644 www/mod_auth_ldap/patches/patch-auth_ldap_h diff --git a/www/mod_auth_ldap/Makefile b/www/mod_auth_ldap/Makefile index 4806d7854b6..387cf31e6c5 100644 --- a/www/mod_auth_ldap/Makefile +++ b/www/mod_auth_ldap/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.10 2007/09/15 20:38:22 merdely Exp $ +# $OpenBSD: Makefile,v 1.11 2009/05/11 19:40:58 claudio Exp $ COMMENT= Apache LDAP authentication module VERSION= 1.6.0 DISTNAME= auth_ldap-${VERSION} -PKGNAME= mod_auth_ldap-${VERSION}p5 +PKGNAME= mod_auth_ldap-${VERSION}p6 CATEGORIES= www HOMEPAGE= http://www.rudedog.org/auth_ldap/ diff --git a/www/mod_auth_ldap/patches/patch-Makefile_in b/www/mod_auth_ldap/patches/patch-Makefile_in index d471039557e..b78c328486f 100644 --- a/www/mod_auth_ldap/patches/patch-Makefile_in +++ b/www/mod_auth_ldap/patches/patch-Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile_in,v 1.4 2004/06/12 15:39:08 pvalchev Exp $ ---- Makefile.in.orig 2001-07-04 08:37:55.000000000 -0600 -+++ Makefile.in 2004-06-12 00:55:16.000000000 -0600 -@@ -20,12 +20,14 @@ html: FAQ.html Changes.html auth_ldap.ht +$OpenBSD: patch-Makefile_in,v 1.5 2009/05/11 19:40:58 claudio Exp $ +--- Makefile.in.orig Wed Jul 4 16:37:55 2001 ++++ Makefile.in Sun May 10 12:37:14 2009 +@@ -20,12 +20,14 @@ html: FAQ.html Changes.html auth_ldap.html OBJS=auth_ldap.o auth_ldap_config.o auth_ldap_cache.o auth_ldap_cache_mgr.o diff --git a/www/mod_auth_ldap/patches/patch-auth_ldap_c b/www/mod_auth_ldap/patches/patch-auth_ldap_c index 723c3fda46d..f76193265cb 100644 --- a/www/mod_auth_ldap/patches/patch-auth_ldap_c +++ b/www/mod_auth_ldap/patches/patch-auth_ldap_c @@ -1,4 +1,4 @@ -$OpenBSD: patch-auth_ldap_c,v 1.2 2007/02/11 10:31:20 bernd Exp $ +$OpenBSD: patch-auth_ldap_c,v 1.3 2009/05/11 19:40:58 claudio Exp $ Fixes a security bug that could allow attacker to execute arbitrary commands as the apache user. @@ -6,9 +6,9 @@ commands as the apache user. This is fixed in auth_ldap-1.6.1 but that release is broken. So we just took the security fix. ---- auth_ldap.c.orig Thu Jan 18 14:25:28 2007 -+++ auth_ldap.c Thu Jan 18 14:31:45 2007 -@@ -87,7 +87,7 @@ void auth_ldap_log_reason(request_rec *r +--- auth_ldap.c.orig Wed Jul 4 16:38:03 2001 ++++ auth_ldap.c Sun May 10 12:37:14 2009 +@@ -87,7 +87,7 @@ void auth_ldap_log_reason(request_rec *r, const char * #if APACHE_RELEASE < 1030000 log_reason(buf, r->uri, r); #else diff --git a/www/mod_auth_ldap/patches/patch-auth_ldap_h b/www/mod_auth_ldap/patches/patch-auth_ldap_h new file mode 100644 index 00000000000..0b5c013ed2d --- /dev/null +++ b/www/mod_auth_ldap/patches/patch-auth_ldap_h @@ -0,0 +1,11 @@ +$OpenBSD: patch-auth_ldap_h,v 1.1 2009/05/11 19:40:58 claudio Exp $ +--- auth_ldap.h.orig Sun May 10 12:38:59 2009 ++++ auth_ldap.h Sun May 10 12:39:12 2009 +@@ -30,6 +30,7 @@ + #include + #include + ++#define LDAP_DEPRECATED 1 + #include + #include +