rpms/mod_auth_kerb/devel mod_auth_kerb-5.0-apr1x.patch, NONE, 1.1 mod_auth_kerb.spec, 1.7, 1.8

[fedora-cvs-commits at redhat.com]

Author: jorton

Update of /cvs/dist/rpms/mod_auth_kerb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29509

Modified Files:
	mod_auth_kerb.spec 
Added Files:
	mod_auth_kerb-5.0-apr1x.patch 
Log Message:
* Mon Dec  5 2005 Joe Orton <jorton at redhat.com> 5.0-8
- rebuild for httpd 2.2


mod_auth_kerb-5.0-apr1x.patch:
 mod_auth_kerb.c |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletion(-)

--- NEW FILE mod_auth_kerb-5.0-apr1x.patch ---
--- mod_auth_kerb-5.0-rc6/src/mod_auth_kerb.c.apr1x	2005-12-02 12:33:49.000000000 +0000
+++ mod_auth_kerb-5.0-rc6/src/mod_auth_kerb.c	2005-12-02 12:36:59.000000000 +0000
@@ -56,7 +56,7 @@
 #include <http_request.h>
 
 #ifdef STANDARD20_MODULE_STUFF
-#include <ap_compat.h>
+#include <ap_mmn.h>
 #include <apr_strings.h>
 #include <apr_base64.h>
 #endif
@@ -105,6 +105,24 @@
 #define MK_TABLE_GET apr_table_get
 #define MK_USER r->user
 #define MK_AUTH_TYPE r->ap_auth_type
+
+#if AP_MODULE_MAGIC_AT_LEAST(20051115, 0)
+/* APR 1.x compatibility */
+#define ap_pstrdup apr_pstrdup
+#define ap_psprintf apr_psprintf
+#define ap_pcalloc apr_pcalloc
+#define ap_table_setn apr_table_setn
+#define ap_register_cleanup apr_pool_cleanup_register
+#define APR_XtOffsetOf APR_OFFSETOF
+#define ap_pstrcat apr_pstrcat
+#define ap_null_cleanup apr_pool_cleanup_null
+#define ap_base64decode apr_base64_decode
+#define ap_base64decode_len apr_base64_decode_len
+#define ap_base64encode apr_base64_encode
+#define ap_base64encode_len apr_base64_encode_len
+#define ap_table_add apr_table_add
+#endif
+
 #else
 #define MK_POOL pool
 #define MK_TABLE_GET ap_table_get


Index: mod_auth_kerb.spec
===================================================================
RCS file: /cvs/dist/rpms/mod_auth_kerb/devel/mod_auth_kerb.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mod_auth_kerb.spec	21 Sep 2005 12:53:18 -0000	1.7
+++ mod_auth_kerb.spec	5 Dec 2005 11:09:46 -0000	1.8
@@ -4,7 +4,7 @@
 Summary: Kerberos authentication module for HTTP
 Name: mod_auth_kerb
 Version: 5.0
-Release: 7
+Release: 8
 License: Apache
 Group: System Environment/Daemons
 URL: http://modauthkerb.sourceforge.net/
@@ -13,6 +13,7 @@
 Patch2: mod_auth_kerb-5.0-cache.patch
 Patch4: mod_auth_kerb-5.0-gcc4.patch
 Patch5: mod_auth_kerb-5.0-exports.patch
+Patch6: mod_auth_kerb-5.0-apr1x.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: httpd-devel, krb5-devel
 Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing)
@@ -28,6 +29,7 @@
 %patch2 -p1 -b .cache
 %patch4 -p1 -b .gcc4
 %patch5 -p1 -b .exports
+%patch6 -p1 -b .apr1x
 
 %build
 %configure --without-krb4 --with-krb5=/usr/kerberos --with-apxs=/usr
@@ -52,6 +54,9 @@
 %{_libdir}/httpd/modules/*.so
 
 %changelog
+* Mon Dec  5 2005 Joe Orton <jorton at redhat.com> 5.0-8
+- rebuild for httpd 2.2
+
 * Wed Sep 21 2005 Joe Orton <jorton at redhat.com> 5.0-7
 - fix build without /usr/sbin in $PATH (Roozbeh Pournader, #168212)