CVS commit: pkgsrc/www/ap-auth-kerb

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Wed Jul  2 04:01:41 UTC 2025

Modified Files:
        pkgsrc/www/ap-auth-kerb: Makefile distinfo
        pkgsrc/www/ap-auth-kerb/patches: patch-aa

Log Message:
ap-auth-kerb: fix build with recent mit krb


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/www/ap-auth-kerb/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/ap-auth-kerb/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/ap-auth-kerb/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/ap-auth-kerb/Makefile
diff -u pkgsrc/www/ap-auth-kerb/Makefile:1.19 pkgsrc/www/ap-auth-kerb/Makefile:1.20
--- pkgsrc/www/ap-auth-kerb/Makefile:1.19       Sat Apr 19 07:58:30 2025
+++ pkgsrc/www/ap-auth-kerb/Makefile    Wed Jul  2 04:01:41 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2025/04/19 07:58:30 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2025/07/02 04:01:41 markd Exp $
 
 DISTNAME=      mod_auth_kerb-5.4
 PKGNAME=       ${DISTNAME:S/mod/${APACHE_PKG_PREFIX}/:S/_/-/g}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=modauthkerb/}
 

Index: pkgsrc/www/ap-auth-kerb/distinfo
diff -u pkgsrc/www/ap-auth-kerb/distinfo:1.8 pkgsrc/www/ap-auth-kerb/distinfo:1.9
--- pkgsrc/www/ap-auth-kerb/distinfo:1.8        Tue Oct 26 11:29:17 2021
+++ pkgsrc/www/ap-auth-kerb/distinfo    Wed Jul  2 04:01:41 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 11:29:17 nia Exp $
+$NetBSD: distinfo,v 1.9 2025/07/02 04:01:41 markd Exp $
 
 BLAKE2s (mod_auth_kerb-5.4.tar.gz) = ec5333068c812701151febca7b7cd53035576d7510cc2fd800dd27fa010a88e0
 SHA512 (mod_auth_kerb-5.4.tar.gz) = 93fdf0e43af1c24e8c8204d09240b708747068ef99dd8d21b45cb4d132d31e6d582d49ea5e23b905f55cb0d4a20b1ecb58de1bcbfdad1d016e536fc622b63214
 Size (mod_auth_kerb-5.4.tar.gz) = 93033 bytes
-SHA1 (patch-aa) = 64c80c3fe355d114bdd590f7564725354c39567a
+SHA1 (patch-aa) = 69f785e8bee548baa46321b4112f220fcd14f61b

Index: pkgsrc/www/ap-auth-kerb/patches/patch-aa
diff -u pkgsrc/www/ap-auth-kerb/patches/patch-aa:1.2 pkgsrc/www/ap-auth-kerb/patches/patch-aa:1.3
--- pkgsrc/www/ap-auth-kerb/patches/patch-aa:1.2        Tue Aug  5 18:47:31 2014
+++ pkgsrc/www/ap-auth-kerb/patches/patch-aa    Wed Jul  2 04:01:41 2025
@@ -1,10 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2014/08/05 18:47:31 spz Exp $
+$NetBSD: patch-aa,v 1.3 2025/07/02 04:01:41 markd Exp $
 
 recent heimdal's dont implicitly include mech headers
 so include explicitly.
 
 Fixes for 2.4 API from https://github.com/pld-linux/apache-mod_auth_kerb/blob/master/mod_auth_kerb-apache24.patch
 
+Fix build with recent mit.  Was using an internal API.
+https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4c542201cff236f67aac6eaa0ca86863d34df80
+
 --- src/mod_auth_kerb.c.orig   2008-12-04 10:14:03.000000000 +0000
 +++ src/mod_auth_kerb.c        2014-07-18 07:11:17.000000000 +0000
 @@ -89,6 +89,7 @@
@@ -73,3 +76,50 @@ Fixes for 2.4 API from https://github.co
         apr_pool_userdata_set(prevauth, keyname, NULL, r->connection->pool);
     }
  
+@@ -1722,28 +1738,6 @@ kerb_authenticate_user(request_rec *r)
+    return ret;
+ }
+ 
+-int
+-have_rcache_type(const char *type)
+-{
+-   krb5_error_code ret;
+-   krb5_context context;
+-   krb5_rcache id = NULL;
+-   int found;
+-
+-   ret = krb5_init_context(&context);
+-   if (ret)
+-      return 0;
+-
+-   ret = krb5_rc_resolve_full(context, &id, "none:");
+-   found = (ret == 0);
+-
+-   if (ret == 0)
+-      krb5_rc_destroy(context, id);
+-   krb5_free_context(context);
+-
+-   return found;
+-}
+-
+ /*************************************************************************** 
+  Module Setup/Configuration
+  ***************************************************************************/
+@@ -1754,7 +1748,7 @@ kerb_module_init(server_rec *dummy, pool
+ #ifndef HEIMDAL
+    /* Suppress the MIT replay cache.  Requires MIT Kerberos 1.4.0 or later.
+       1.3.x are covered by the hack overiding the replay calls */
+-   if (getenv("KRB5RCACHETYPE") == NULL && have_rcache_type("none"))
++   if (getenv("KRB5RCACHETYPE") == NULL)
+       putenv(strdup("KRB5RCACHETYPE=none"));
+ #endif
+ }
+@@ -1795,7 +1789,7 @@ kerb_init_handler(apr_pool_t *p, apr_poo
+ #ifndef HEIMDAL
+    /* Suppress the MIT replay cache.  Requires MIT Kerberos 1.4.0 or later.
+       1.3.x are covered by the hack overiding the replay calls */
+-   if (getenv("KRB5RCACHETYPE") == NULL && have_rcache_type("none"))
++   if (getenv("KRB5RCACHETYPE") == NULL)
+       putenv(strdup("KRB5RCACHETYPE=none"));
+ #endif
+