OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Dec-2007 14:27:43
Branch: HEAD Handle: 2007122213274300
Modified files:
openpkg-src/apache-kerberos
apache-kerberos.conf apache-kerberos.patch
apache-kerberos.spec
Log:
fix Apache config and port to HEIMDAL
Summary:
Revision Changes Path
1.2 +1 -1 openpkg-src/apache-kerberos/apache-kerberos.conf
1.2 +54 -1 openpkg-src/apache-kerberos/apache-kerberos.patch
1.3 +1 -1 openpkg-src/apache-kerberos/apache-kerberos.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache-kerberos/apache-kerberos.conf
============================================================================
$ cvs diff -u -r1.1 -r1.2 apache-kerberos.conf
--- openpkg-src/apache-kerberos/apache-kerberos.conf 9 Oct 2007 14:24:46
-0000 1.1
+++ openpkg-src/apache-kerberos/apache-kerberos.conf 22 Dec 2007 13:27:43
-0000 1.2
@@ -2,5 +2,5 @@
## apache-kerberos.conf -- Apache configuration for mod_auth_kerb
##
-LoadModule kerb_auth_module @l_prefix@/libexec/apache/mod_auth_kerb.so
+LoadModule auth_kerb_module @l_prefix@/libexec/apache/mod_auth_kerb.so
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache-kerberos/apache-kerberos.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 apache-kerberos.patch
--- openpkg-src/apache-kerberos/apache-kerberos.patch 9 Oct 2007 18:13:00
-0000 1.1
+++ openpkg-src/apache-kerberos/apache-kerberos.patch 22 Dec 2007 13:27:43
-0000 1.2
@@ -1,6 +1,6 @@
Index: configure
--- configure.orig 2006-11-22 11:33:58 +0100
-+++ configure 2007-10-09 20:11:22 +0200
++++ configure 2007-12-22 14:25:24 +0100
@@ -3933,7 +3933,6 @@
if test -z "$gssapi_supports_spnego"; then
if test -n "$have_heimdal"; then SPNEGO_SRCS="\
@@ -9,3 +9,56 @@
spnegokrb5/asn1_ContextFlags.c \
spnegokrb5/asn1_NegTokenInit.c \
spnegokrb5/asn1_NegTokenTarg.c \
+@@ -3941,6 +3940,11 @@
+ spnegokrb5/accept_sec_context.c \
+ spnegokrb5/encapsulate.c \
+ spnegokrb5/decapsulate.c \
++ spnegokrb5/der_get.c \
++ spnegokrb5/der_put.c \
++ spnegokrb5/der_free.c \
++ spnegokrb5/der_length.c \
++ spnegokrb5/der_copy.c \
+ spnegokrb5/external.c"
+ else SPNEGO_SRCS="\
+ spnegokrb5/asn1_MechType.c \
+Index: spnegokrb5/der_get.c
+--- spnegokrb5/der_get.c.orig 2006-11-22 11:27:17 +0100
++++ spnegokrb5/der_get.c 2007-12-22 14:24:51 +0100
+@@ -39,6 +39,17 @@
+ #include <version.h>
+ #endif
+
++#include "config.h"
++#ifdef HEIMDAL
++#define der_get_length my_der_get_length
++#define der_get_tag my_der_get_tag
++#define der_match_tag my_der_match_tag
++#define der_match_tag_and_length my_der_match_tag_and_length
++#define der_get_octet_string my_der_get_octet_string
++#define der_get_oid my_der_get_oid
++#define der_get_general_string my_der_get_general_string
++#endif
++
+ /*
+ * All decoding functions take a pointer `p' to first position in
+ * which to read, from the left, `len' which means the maximum number
+Index: spnegokrb5/der_put.c
+--- spnegokrb5/der_put.c.orig 2003-09-05 10:54:08 +0200
++++ spnegokrb5/der_put.c 2007-12-22 14:24:51 +0100
+@@ -37,6 +37,16 @@
+ RCSID("$Id: apache-kerberos.patch,v 1.2 2007/12/22 13:27:43 rse Exp $");
+ #endif
+
++#include "config.h"
++#ifdef HEIMDAL
++#define der_put_length my_der_put_length
++#define der_put_oid my_der_put_oid
++#define der_put_tag my_der_put_tag
++#define der_put_length_and_tag my_der_put_length_and_tag
++#define der_put_octet_string my_der_put_octet_string
++#define der_put_general_string my_der_put_general_string
++#endif
++
+ /*
+ * All encoding functions take a pointer `p' to first position in
+ * which to write, from the right, `len' which means the maximum
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache-kerberos/apache-kerberos.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 apache-kerberos.spec
--- openpkg-src/apache-kerberos/apache-kerberos.spec 9 Oct 2007 18:13:00
-0000 1.2
+++ openpkg-src/apache-kerberos/apache-kerberos.spec 22 Dec 2007 13:27:43
-0000 1.3
@@ -33,7 +33,7 @@
Group: Web
License: Open Source
Version: 5.3
-Release: 20071009
+Release: 20071222
# list of sources
Source0:
http://switch.dl.sourceforge.net/modauthkerb/mod_auth_kerb-%{version}.tar.gz
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
