head	1.2;
access;
symbols
	OPENPKG_2_STABLE_MP:1.1
	OPENPKG_2_STABLE:1.1.0.2;
locks; strict;
comment	@# @;


1.2
date	2007.06.22.10.54.02;	author rse;	state dead;
branches;
next	1.1;
commitid	ZbFoU2hEtnBxHTms;

1.1
date	2007.01.20.14.18.04;	author rse;	state Exp;
branches
	1.1.2.1;
next	;
commitid	DsdViDlcrWTrKf3s;

1.1.2.1
date	2007.01.20.14.18.04;	author thl;	state dead;
branches;
next	1.1.2.2;
commitid	buiDpkvFRFCkgB5s;

1.1.2.2
date	2007.02.07.20.36.24;	author thl;	state Exp;
branches;
next	;
commitid	buiDpkvFRFCkgB5s;


desc
@@


1.2
log
@new OpenPKG world order: upgrade from Apache 1.3 to 2.2 (part 1/3: updated/new packages)
@
text
@Index: Makefile.libdir
--- /dev/null	2007-01-20 15:04:24 +0100
+++ Makefile.libdir	2007-01-20 15:03:31 +0100
@@@@ -0,0 +1 @@@@
+mod_auth_kerb
Index: Makefile.tmpl
--- /dev/null	2007-01-20 15:04:24 +0100
+++ Makefile.tmpl	2007-01-20 15:03:31 +0100
@@@@ -0,0 +1,46 @@@@
+
+LIB=libmod_auth_kerb.$(LIBEXT)
+
+OBJS=src/mod_auth_kerb.o \
+     spnegokrb5/asn1_MechType.o \
+     spnegokrb5/asn1_MechTypeList.o \
+     spnegokrb5/asn1_ContextFlags.o \
+     spnegokrb5/asn1_NegTokenInit.o \
+     spnegokrb5/asn1_NegTokenTarg.o \
+     spnegokrb5/der_get.o \
+     spnegokrb5/der_put.o \
+     spnegokrb5/der_free.o \
+     spnegokrb5/der_length.o \
+     spnegokrb5/der_copy.o \
+     spnegokrb5/timegm.o \
+     spnegokrb5/init_sec_context.o \
+     spnegokrb5/accept_sec_context.o \
+     spnegokrb5/encapsulate.o \
+     spnegokrb5/decapsulate.o \
+     spnegokrb5/external.o
+
+all: lib
+
+lib: $(LIB)
+
+libmod_auth_kerb.$(LIBEXT): $(OBJS)
+	rm -f $@@
+	ar cr $@@ $(OBJS)
+	$(RANLIB) $@@
+
+.SUFFIXES: .o
+
+.c.o:
+	$(CC) -c -I. -Ispnegokrb5 $(INCLUDES) $(CFLAGS) -o $@@ $<
+
+clean:
+	rm -f $(OBJS) $(LIB)
+
+distclean: clean
+	-rm -f Makefile
+
+#Dependencies
+
+$(OBJS): Makefile
+
+# DO NOT REMOVE
Index: libmod_auth_kerb.module
--- /dev/null	2007-01-20 15:04:24 +0100
+++ libmod_auth_kerb.module	2007-01-20 15:03:31 +0100
@@@@ -0,0 +1,8 @@@@
+Name: auth_kerb_module
+ConfigStart
+    echo "++ FUCK"
+    KERBEROS_CFLAGS="`krb5-config --cflags gssapi`"
+    KERBEROS_LIBS="`krb5-config --libs gssapi`"
+    CFLAGS="$KERBEROS_CFLAGS $CFLAGS"
+    LIBS="$KERBEROS_LIBS $LIBS"
+ConfigEnd
Index: src/mod_auth_kerb.c
--- src/mod_auth_kerb.c.orig	2006-11-22 11:32:58 +0100
+++ src/mod_auth_kerb.c	2007-01-20 15:07:51 +0100
@@@@ -745,7 +745,7 @@@@
    return ret;
 }
 
-static int
+static void
 krb5_cache_cleanup(void *data)
 {
    krb5_context context;
@@@@ -756,7 +756,7 @@@@
    problem = krb5_init_context(&context);
    if (problem) {
       /* ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, "krb5_init_context() failed"); */
-      return HTTP_INTERNAL_SERVER_ERROR;
+      return;
    }
 
    problem = krb5_cc_resolve(context, cache_name, &cache);
@@@@ -764,12 +764,12 @@@@
       /* log_error(APLOG_MARK, APLOG_ERR, 0, NULL, 
                 "krb5_cc_resolve() failed (%s: %s)",
 	        cache_name, krb5_get_err_text(context, problem)); */
-      return HTTP_INTERNAL_SERVER_ERROR;
+      return;
    }
 
    krb5_cc_destroy(context, cache);
    krb5_free_context(context);
-   return OK;
+   return;
 }
 
 static int
@


1.1
log
@add optional Kerberos authentication support via mod_auth_kerb
@
text
@@


1.1.2.1
log
@file apache.patch.modauthkerb was added on branch OPENPKG_2_STABLE on 2007-02-07 20:36:24 +0000
@
text
@d1 103
@


1.1.2.2
log
@MFC: make up leeway for 2_STABLE by virtue of build-time results
@
text
@a0 103
Index: Makefile.libdir
--- /dev/null	2007-01-20 15:04:24 +0100
+++ Makefile.libdir	2007-01-20 15:03:31 +0100
@@@@ -0,0 +1 @@@@
+mod_auth_kerb
Index: Makefile.tmpl
--- /dev/null	2007-01-20 15:04:24 +0100
+++ Makefile.tmpl	2007-01-20 15:03:31 +0100
@@@@ -0,0 +1,46 @@@@
+
+LIB=libmod_auth_kerb.$(LIBEXT)
+
+OBJS=src/mod_auth_kerb.o \
+     spnegokrb5/asn1_MechType.o \
+     spnegokrb5/asn1_MechTypeList.o \
+     spnegokrb5/asn1_ContextFlags.o \
+     spnegokrb5/asn1_NegTokenInit.o \
+     spnegokrb5/asn1_NegTokenTarg.o \
+     spnegokrb5/der_get.o \
+     spnegokrb5/der_put.o \
+     spnegokrb5/der_free.o \
+     spnegokrb5/der_length.o \
+     spnegokrb5/der_copy.o \
+     spnegokrb5/timegm.o \
+     spnegokrb5/init_sec_context.o \
+     spnegokrb5/accept_sec_context.o \
+     spnegokrb5/encapsulate.o \
+     spnegokrb5/decapsulate.o \
+     spnegokrb5/external.o
+
+all: lib
+
+lib: $(LIB)
+
+libmod_auth_kerb.$(LIBEXT): $(OBJS)
+	rm -f $@@
+	ar cr $@@ $(OBJS)
+	$(RANLIB) $@@
+
+.SUFFIXES: .o
+
+.c.o:
+	$(CC) -c -I. -Ispnegokrb5 $(INCLUDES) $(CFLAGS) -o $@@ $<
+
+clean:
+	rm -f $(OBJS) $(LIB)
+
+distclean: clean
+	-rm -f Makefile
+
+#Dependencies
+
+$(OBJS): Makefile
+
+# DO NOT REMOVE
Index: libmod_auth_kerb.module
--- /dev/null	2007-01-20 15:04:24 +0100
+++ libmod_auth_kerb.module	2007-01-20 15:03:31 +0100
@@@@ -0,0 +1,8 @@@@
+Name: auth_kerb_module
+ConfigStart
+    echo "++ FUCK"
+    KERBEROS_CFLAGS="`krb5-config --cflags gssapi`"
+    KERBEROS_LIBS="`krb5-config --libs gssapi`"
+    CFLAGS="$KERBEROS_CFLAGS $CFLAGS"
+    LIBS="$KERBEROS_LIBS $LIBS"
+ConfigEnd
Index: src/mod_auth_kerb.c
--- src/mod_auth_kerb.c.orig	2006-11-22 11:32:58 +0100
+++ src/mod_auth_kerb.c	2007-01-20 15:07:51 +0100
@@@@ -745,7 +745,7 @@@@
    return ret;
 }
 
-static int
+static void
 krb5_cache_cleanup(void *data)
 {
    krb5_context context;
@@@@ -756,7 +756,7 @@@@
    problem = krb5_init_context(&context);
    if (problem) {
       /* ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, "krb5_init_context() failed"); */
-      return HTTP_INTERNAL_SERVER_ERROR;
+      return;
    }
 
    problem = krb5_cc_resolve(context, cache_name, &cache);
@@@@ -764,12 +764,12 @@@@
       /* log_error(APLOG_MARK, APLOG_ERR, 0, NULL, 
                 "krb5_cc_resolve() failed (%s: %s)",
 	        cache_name, krb5_get_err_text(context, problem)); */
-      return HTTP_INTERNAL_SERVER_ERROR;
+      return;
    }
 
    krb5_cc_destroy(context, cache);
    krb5_free_context(context);
-   return OK;
+   return;
 }
 
 static int
@