From 5cb7ea080752a8bccae5acffa120302b435932fd Mon Sep 17 00:00:00 2001
From: Thibaut Notteboom
Date: Mon, 28 Oct 2013 21:50:23 -0500
Subject: network/mod_auth_kerb: require krb5 instead of heimdal

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 network/mod_auth_kerb/README                   | 6 ++----
 network/mod_auth_kerb/doinst.sh                | 2 --
 network/mod_auth_kerb/mod_auth_kerb.SlackBuild | 5 ++---
 network/mod_auth_kerb/mod_auth_kerb.c.patch    | 8 --------
 network/mod_auth_kerb/mod_auth_kerb.info       | 2 +-
 5 files changed, 5 insertions(+), 18 deletions(-)

(limited to 'network')

diff --git a/network/mod_auth_kerb/README b/network/mod_auth_kerb/README
index 4a610644df..9c2df762ad 100644
--- a/network/mod_auth_kerb/README
+++ b/network/mod_auth_kerb/README
@@ -4,10 +4,8 @@ the Negotiate authentication method, which performs full Kerberos
 authentication based on ticket exchanges, and does not require
 users to insert their passwords to the browser.
 
-This requires heimdal.
-
 You will need to add the following line to /etc/httpd/httpd.conf:
   Include /etc/httpd/extra/mod_auth_kerb.conf
 
-Mod_auth_kerb can be further configured through the Apache configuration
-file; see the README in the package's documentation directory for details.
+Mod_auth_kerb can be further configured through the Apache configuration file;
+see the README in the package's documentation directory for details.
diff --git a/network/mod_auth_kerb/doinst.sh b/network/mod_auth_kerb/doinst.sh
index 114a9cd4bc..5df1d4acca 100644
--- a/network/mod_auth_kerb/doinst.sh
+++ b/network/mod_auth_kerb/doinst.sh
@@ -12,5 +12,3 @@ config() {
 }
 
 config etc/httpd/extra/mod_auth_kerb.conf.new
-
-
diff --git a/network/mod_auth_kerb/mod_auth_kerb.SlackBuild b/network/mod_auth_kerb/mod_auth_kerb.SlackBuild
index b9acd5baaf..075285c0f0 100644
--- a/network/mod_auth_kerb/mod_auth_kerb.SlackBuild
+++ b/network/mod_auth_kerb/mod_auth_kerb.SlackBuild
@@ -69,13 +69,14 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Fix compilation with httpd-2.4
 patch -p0 < $CWD/mod_auth_kerb.c.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --with-krb5=/usr/heimdal \
+  --with-krb5=/usr/kerberos \
   --without-krb4 \
   --build=$ARCH-slackware-linux
 
@@ -101,5 +102,3 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
-
-
diff --git a/network/mod_auth_kerb/mod_auth_kerb.c.patch b/network/mod_auth_kerb/mod_auth_kerb.c.patch
index cc466fd605..d31e451c17 100644
--- a/network/mod_auth_kerb/mod_auth_kerb.c.patch
+++ b/network/mod_auth_kerb/mod_auth_kerb.c.patch
@@ -1,13 +1,5 @@
 --- src/mod_auth_kerb.c.orig	2012-06-24 19:10:03.578437625 +0200
 +++ src/mod_auth_kerb.c	2012-06-24 19:12:42.043441805 +0200
-@@ -89,6 +89,7 @@
- #include <krb5.h>
- #ifdef HEIMDAL
- #  include <gssapi.h>
-+#  include <gssapi/gssapi_krb5.h>
- #else
- #  include <gssapi/gssapi.h>
- #  include <gssapi/gssapi_generic.h>
 @@ -179,6 +179,16 @@ static apr_global_mutex_t *s4u2proxy_loc
  #define PROXYREQ_PROXY STD_PROXY
  #endif
diff --git a/network/mod_auth_kerb/mod_auth_kerb.info b/network/mod_auth_kerb/mod_auth_kerb.info
index 6856e6c854..c9ad5f8e47 100644
--- a/network/mod_auth_kerb/mod_auth_kerb.info
+++ b/network/mod_auth_kerb/mod_auth_kerb.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://fossies.org/unix/www/apache_httpd_modules/mod_auth_kerb-5.4.tar
 MD5SUM="642b81763ad3ca81dba359cb952da5e3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="heimdal"
+REQUIRES="krb5"
 MAINTAINER="Thibaut Notteboom"
 EMAIL="tib@tibux.org"
-- 
cgit v1.2.3