Revision: 26278
http://sourceforge.net/p/gar/code/26278
Author: dmichelsen
Date: 2017-09-08 12:03:05 +0000 (Fri, 08 Sep 2017)
Log Message:
-----------
mod_auth_kerb/trunk: Make sure to find the right krb5-config
Modified Paths:
--------------
csw/mgar/pkg/mod_auth_kerb/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/mod_auth_kerb/trunk/files/0001-Hardcode-path-to-krb5-config.patch
Modified: csw/mgar/pkg/mod_auth_kerb/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mod_auth_kerb/trunk/Makefile 2017-09-08 11:40:36 UTC (rev
26277)
+++ csw/mgar/pkg/mod_auth_kerb/trunk/Makefile 2017-09-08 12:03:05 UTC (rev
26278)
@@ -17,6 +17,9 @@
#
https://sourceforge.net/tracker/?func=detail&atid=464524&aid=3172644&group_id=51775
PATCHFILES += 0001-Fix-install-destination.patch
+# MAke sure to use the correct krb5-config
+PATCHFILES += 0001-Hardcode-path-to-krb5-config.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))
@@ -44,10 +47,11 @@
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-sparc += 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
+RUNTIME_DEP_PKGS_CSWap2-mod-auth-kerb +=
$(RUNTIME_DEP_PKGS_CSWap2-mod-auth-kerb-$(GARCH))
CHECKPKG_OVERRIDES_CSWap2-mod-auth-kerb += surplus-dependency|CSWapache2
OBSOLETED_BY_CSWap2-mod-auth-kerb += CSWap2modauthkerb
CATALOGNAME_CSWap2modauthkerb = ap2_mod_auth_kerb_stub
@@ -55,10 +59,11 @@
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-sparc += 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
+RUNTIME_DEP_PKGS_CSWap24-mod-auth-kerb +=
$(RUNTIME_DEP_PKGS_CSWap2-mod-auth-kerb-$(GARCH))
CHECKPKG_OVERRIDES_CSWap24-mod-auth-kerb += surplus-dependency|CSWapache24
@@ -69,7 +74,7 @@
CONFIGURE_ARGS += $(DIRPATHS)
CONFIGURE_ARGS += --without-krb4
-CONFIGURE_ARGS += --with-krb5=$(prefix)
+CONFIGURE_ARGS += --with-krb5=$(bindir)/krb5-config
# 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.
Added:
csw/mgar/pkg/mod_auth_kerb/trunk/files/0001-Hardcode-path-to-krb5-config.patch
===================================================================
---
csw/mgar/pkg/mod_auth_kerb/trunk/files/0001-Hardcode-path-to-krb5-config.patch
(rev 0)
+++
csw/mgar/pkg/mod_auth_kerb/trunk/files/0001-Hardcode-path-to-krb5-config.patch
2017-09-08 12:03:05 UTC (rev 26278)
@@ -0,0 +1,27 @@
+From 1e57513143d279cb6cd5570187dcb5fed2f848a1 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <d...@opencsw.org>
+Date: Fri, 8 Sep 2017 13:56:55 +0200
+Subject: [PATCH] Hardcode path to krb5-config
+
+---
+ configure | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index ffd2da3..f6e396b 100755
+--- a/configure
++++ b/configure
+@@ -3809,8 +3809,8 @@ if test "x$with_krb5" != "xno" ; then
+ ac_save_LIBS="$LIBS"
+
+ if test -n "$with_krb5"; then
+- if test -x "$with_krb5/bin/krb5-config"; then
+- krb5_config_command="$with_krb5/bin/krb5-config"
++ if test -x "$with_krb5"; then
++ krb5_config_command="$with_krb5"
+ else
+ krb5_config_command=""
+ fi
+--
+2.4.0
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
