Revision: 26277
http://sourceforge.net/p/gar/code/26277
Author: dmichelsen
Date: 2017-09-08 11:40:36 +0000 (Fri, 08 Sep 2017)
Log Message:
-----------
mod_auth_kerb/trunk: Add package for Apache 2.4
Modified Paths:
--------------
csw/mgar/pkg/mod_auth_kerb/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/mod_auth_kerb/trunk/files/0001-Forward-port-to-Apache-2.4.patch
Modified: csw/mgar/pkg/mod_auth_kerb/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mod_auth_kerb/trunk/Makefile 2017-09-05 11:50:21 UTC (rev
26276)
+++ csw/mgar/pkg/mod_auth_kerb/trunk/Makefile 2017-09-08 11:40:36 UTC (rev
26277)
@@ -17,33 +17,78 @@
#
https://sourceforge.net/tracker/?func=detail&atid=464524&aid=3172644&group_id=51775
PATCHFILES += 0001-Fix-install-destination.patch
+# Taken from https://sourceforge.net/p/modauthkerb/patches/32/ and recreated
the patch to suite patchlevel
+PATCHFILES-sapi-ap24 += 0001-Forward-port-to-Apache-2.4.patch
+PATCHFILES += $(PATCHFILES-sapi-$(SAPI))
+
VENDOR_URL = http://modauthkerb.sourceforge.net/
LICENSE = LICENSE
-PACKAGES = CSWap2modauthkerb
-CATALOGNAME = ap2_mod_auth_kerb
-CHECKPKG_OVERRIDES_CSWap2modauthkerb +=
catalogname-does-not-match-pkgname|pkgname=CSWap2modauthkerb|catalogname=ap2_mod_auth_kerb|expected-catalogname=ap2modauthkerb
-RUNTIME_DEP_PKGS_CSWap2modauthkerb += CSWlibcom-err3
-RUNTIME_DEP_PKGS_CSWap2modauthkerb += CSWlibkrb5-3
-RUNTIME_DEP_PKGS_CSWap2modauthkerb += CSWlibk5crypto3
-RUNTIME_DEP_PKGS_CSWap2modauthkerb += CSWlibgssapi-krb5-2
-RUNTIME_DEP_PKGS_CSWap2modauthkerb += CSWapache2
-CHECKPKG_OVERRIDES_CSWap2modauthkerb += surplus-dependency|CSWapache2
+BUILD64 = 1
+EXTRA_MODULATORS += SAPI
+MODULATIONS_SAPI += ap2
+MODULATIONS_SAPI += ap24
+MERGE_SCRIPTS_isa-default-sapi-ap2 = copy-all
+MERGE_SCRIPTS_isa-default-sapi-ap24 = copy-all
+MERGE_SCRIPTS_isa-default64-sapi-ap24 = copy-relocated-only
+MERGE_DIRS_isa-default64-sapi-ap24 = $(libdir)
+
+
+# Apache 2.2 is only available in 32 bit
+SKIP_MODULATIONS += isa-sparcv9-sapi-ap2
+SKIP_MODULATIONS += isa-amd64-sapi-ap2
+CHECKPKG_OVERRIDES_CSWap2-mod-auth-kerb += 64-bit-binaries-missing
+
+PACKAGES = CSWap2-mod-auth-kerb
+SPKG_DESC_CSWap2-mod-auth-kerb = Apache Kerberos authentication module for
Apache 2.2
+PKGFILES_CSWap2-mod-auth-kerb += $(prefix)/apache2/.*
+PKGFILES_CSWap2-mod-auth-kerb += $(docdir)/ap2_mod_auth_kerb/.*
+RUNTIME_DEP_PKGS_CSWap2-mod-auth-kerb += CSWlibintl9
+RUNTIME_DEP_PKGS_CSWap2-mod-auth-kerb += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWap2-mod-auth-kerb += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWap2-mod-auth-kerb += CSWapache2
+CHECKPKG_OVERRIDES_CSWap2-mod-auth-kerb += surplus-dependency|CSWapache2
+OBSOLETED_BY_CSWap2-mod-auth-kerb += CSWap2modauthkerb
+CATALOGNAME_CSWap2modauthkerb = ap2_mod_auth_kerb_stub
+
+PACKAGES += CSWap24-mod-auth-kerb
+SPKG_DESC_CSWap24-mod-auth-kerb = Apache Kerberos authentication module for
Apache 2.4
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWap24-mod-auth-kerb += CSWlibintl9
+RUNTIME_DEP_PKGS_CSWap24-mod-auth-kerb += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWap24-mod-auth-kerb += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWap24-mod-auth-kerb += CSWapache24
+CHECKPKG_OVERRIDES_CSWap24-mod-auth-kerb += surplus-dependency|CSWapache24
+
+
# Apache paths
-AP2_ROOT = $(prefix)/apache2
-AP2_LIBEXEC = $(DESTDIR)$(AP2_ROOT)/libexec
+AP2_MODULEDIR-sapi-ap2 = $(DESTDIR)$(prefix)/apache2/libexec
+AP2_MODULEDIR-sapi-ap24 = $(DESTDIR)$(libdir)/apache2/modules
+AP2_MODULEDIR = $(AP2_MODULEDIR-sapi-$(SAPI))
CONFIGURE_ARGS += $(DIRPATHS)
CONFIGURE_ARGS += --without-krb4
CONFIGURE_ARGS += --with-krb5=$(prefix)
-CONFIGURE_ARGS += --with-apache=$(prefix)/apache2
+# configure looks for apxs in $with_apache_dir/{bin,sbin}:$PATH, so do not use
that directive but make sure
+# we find the correct apxs in a directory early in the PATH.
+# $(bindir) is modulated and contains memorymodel-specific subdirs if required
+# CONFIGURE_ARGS += --with-apache=$(prefix)/apache2
+CONFIGURE_ENV_PATH-sapi-ap2 = $(prefix)/apache2/sbin:$(PATH)
+CONFIGURE_ENV_PATH-sapi-ap24 = $(bindir):$(PATH)
+CONFIGURE_ENV_PATH = $(CONFIGURE_ENV_PATH-sapi-$(SAPI))
+
+# CONFIGURE_ARGS = $(DIRPATHS)
+# CONFIGURE_ARGS-ap2 += --with-apxs=$(prefix)/apache2/sbin/apxs
+# CONFIGURE_ARGS-ap24 += --with-apxs=$(prefix)/bin/apxs
+# CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(SAPI))
+
# The package does not provide a check
TEST_SCRIPTS =
INSTALL_OVERRIDE_VARS = AP2_LIBEXEC
-INSTALL_OVERRIDE_VAR_AP2_LIBEXEC = $(AP2_LIBEXEC)
+INSTALL_OVERRIDE_VAR_AP2_LIBEXEC = $(AP2_MODULEDIR)
AP2_MODS = 1
AP2_MODFILES += \*auth_kerb\*so
@@ -51,7 +96,9 @@
include gar/category.mk
pre-install-modulated:
- ginstall -d $(AP2_LIBEXEC)
- ginstall -d $(DESTDIR)$(docdir)/$(CATALOGNAME)
- ginstall $(WORKSRC)/README $(WORKSRC)/INSTALL
$(DESTDIR)$(docdir)/$(CATALOGNAME)
+ ginstall -d $(AP2_MODULEDIR)
+ ginstall -d $(DESTDIR)$(docdir)/ap2_mod_auth_kerb
+ ginstall $(WORKSRC)/README $(WORKSRC)/INSTALL
$(DESTDIR)$(docdir)/ap2_mod_auth_kerb
+ ginstall -d $(DESTDIR)$(docdir)/ap24_mod_auth_kerb
+ ginstall $(WORKSRC)/README $(WORKSRC)/INSTALL
$(DESTDIR)$(docdir)/ap24_mod_auth_kerb
@$(MAKECOOKIE)
Added:
csw/mgar/pkg/mod_auth_kerb/trunk/files/0001-Forward-port-to-Apache-2.4.patch
===================================================================
---
csw/mgar/pkg/mod_auth_kerb/trunk/files/0001-Forward-port-to-Apache-2.4.patch
(rev 0)
+++
csw/mgar/pkg/mod_auth_kerb/trunk/files/0001-Forward-port-to-Apache-2.4.patch
2017-09-08 11:40:36 UTC (rev 26277)
@@ -0,0 +1,59 @@
+From 13ce2de81938ff3382dcb39cc6ae5b1e9eaeca27 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <d...@opencsw.org>
+Date: Fri, 8 Sep 2017 11:47:54 +0200
+Subject: [PATCH] Forward-port to Apache 2.4
+
+---
+ src/mod_auth_kerb.c | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/src/mod_auth_kerb.c b/src/mod_auth_kerb.c
+index d204a3e..207bc9d 100644
+--- a/src/mod_auth_kerb.c
++++ b/src/mod_auth_kerb.c
+@@ -62,6 +62,12 @@
+ #include <http_protocol.h>
+ #include <http_request.h>
+
++#ifdef APLOG_USE_MODULE
++APLOG_USE_MODULE(auth_kerb);
++#undef APLOG_MARK
++#define APLOG_MARK __FILE__, __LINE__
++#endif
++
+ #ifdef STANDARD20_MODULE_STUFF
+ #include <apr_strings.h>
+ #include <apr_base64.h>
+@@ -360,7 +366,11 @@ log_rerror(const char *file, int line, int level, int
status,
+
+
+ #ifdef STANDARD20_MODULE_STUFF
++#ifdef APLOG_USE_MODULE
++ ap_log_rerror(file, line, APLOG_MODULE_INDEX, level | APLOG_NOERRNO,
status, r, "%s", errstr);
++#else
+ ap_log_rerror(file, line, level | APLOG_NOERRNO, status, r, "%s", errstr);
++#endif
+ #else
+ ap_log_rerror(file, line, level | APLOG_NOERRNO, r, "%s", errstr);
+ #endif
+@@ -1555,7 +1565,7 @@ already_succeeded(request_rec *r, char *auth_line)
+ char keyname[1024];
+
+ snprintf(keyname, sizeof(keyname) - 1,
+- "mod_auth_kerb::connection::%s::%ld", r->connection->remote_ip,
++ "mod_auth_kerb::connection::%s::%ld", r->useragent_ip,
+ r->connection->id);
+
+ if (apr_pool_userdata_get((void**)&conn_data, keyname,
r->connection->pool) != 0)
+@@ -1709,7 +1719,7 @@ kerb_authenticate_user(request_rec *r)
+ prevauth->last_return = ret;
+ snprintf(keyname, sizeof(keyname) - 1,
+ "mod_auth_kerb::connection::%s::%ld",
+- r->connection->remote_ip, r->connection->id);
++ r->useragent_ip, r->connection->id);
+ apr_pool_userdata_set(prevauth, keyname, NULL, r->connection->pool);
+ }
+
+--
+2.4.0
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
