- Update to 5.1

PR:		ports/104842
Submitted by:	Ryan T. Dean <rtdean@cytherianage.net>
Approved by:	maintainer timeout (apache; 3 months)

6 files changed, 14 insertions, 66 deletions

diff --git a/www/mod_auth_kerb/Makefile b/www/mod_auth_kerb/Makefile
index 4c03da6334dd..e3f6a7619dad 100644
--- a/www/mod_auth_kerb/Makefile
+++ b/www/mod_auth_kerb/Makefile
@@ -8,12 +8,10 @@
 # Shamelessly stolen from will's mod_auth_any port.
 
 PORTNAME=	mod_auth_kerb
-PORTVERSION=	5.0.r6
-PORTREVISION=	1
+PORTVERSION=	5.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=modauthkerb
-DISTNAME=	mod_auth_kerb-5.0-rc6
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	An Apache module for authenticating users with Kerberos v5
@@ -24,7 +22,8 @@ COMMENT=	An Apache module for authenticating users with Kerberos v5
 # (i.e., HTTP over SSL/TLS).  Thus, we require as a dependency
 # a version of Apache which can do this.
 #
-USE_APACHE=	13
+USE_APACHE=	1.3+
+USE_GMAKE=	yes
 # Don't fsck with CFLAGS
 CFLAGS:=
 GNU_CONFIGURE=	yes
@@ -39,7 +38,7 @@ OPTIONS+=	off
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 700014
-BROKEN=		"Does not compile on FreeBSD >= 7.0"
+BROKEN=		Does not compile on FreeBSD >= 7.0
 .endif
 
 .if exists(${PREFIX}/sbin/apxs)
diff --git a/www/mod_auth_kerb/distinfo b/www/mod_auth_kerb/distinfo
index 4830cf881d62..f13846c37321 100644
--- a/www/mod_auth_kerb/distinfo
+++ b/www/mod_auth_kerb/distinfo
@@ -1,3 +1,3 @@
-MD5 (mod_auth_kerb-5.0-rc6.tar.gz) = 274edfb950af20ce6ef0ddcb7c20263a
-SHA256 (mod_auth_kerb-5.0-rc6.tar.gz) = ae33ab3ae5b419819725091d154add1a1d1a5d6d97e31e9f327f71a0b6370d3e
-SIZE (mod_auth_kerb-5.0-rc6.tar.gz) = 68761
+MD5 (mod_auth_kerb-5.1.tar.gz) = b6a0c44b572c6e67ea7191999844aff6
+SHA256 (mod_auth_kerb-5.1.tar.gz) = 0415ea2bf506dfe7ac35b77fe49f6c5ca76f432e55e32904432c4150cc63faf5
+SIZE (mod_auth_kerb-5.1.tar.gz) = 73731
diff --git a/www/mod_auth_kerb/files/patch-src__mod_auth_kerb.c b/www/mod_auth_kerb/files/patch-src__mod_auth_kerb.c
deleted file mode 100644
index 7c25d1a1004f..000000000000
--- a/www/mod_auth_kerb/files/patch-src__mod_auth_kerb.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/mod_auth_kerb.c.orig	Tue Aug 10 08:01:01 2004
-+++ src/mod_auth_kerb.c	Wed Oct  5 20:25:38 2005
-@@ -1108,6 +1108,7 @@
-   spnego_oid.elements = (void *)"\x2b\x06\x01\x05\x05\x02";
- 
-   if (conf->krb_5_keytab) {
-+#ifndef HEIMDAL
-      char *ktname;
-      /* we don't use the ap_* calls here, since the string passed to putenv()
-       * will become part of the enviroment and shouldn't be free()ed by apache
-@@ -1120,6 +1121,14 @@
-      }
-      sprintf(ktname, "KRB5_KTNAME=%s", conf->krb_5_keytab);
-      putenv(ktname);
-+#else
-+     ret = gsskrb5_register_acceptor_identity(conf->krb_5_keytab);
-+     if (ret) {
-+	log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "Setting KerberosV keytab failed: %s", strerror(errno));
-+	ret = HTTP_INTERNAL_SERVER_ERROR;
-+	goto end;
-+     }
-+#endif
-   }
- 
-   ret = get_gss_creds(r, conf, &server_creds);
diff --git a/www/mod_auth_kerb2/Makefile b/www/mod_auth_kerb2/Makefile
index 4c03da6334dd..e3f6a7619dad 100644
--- a/www/mod_auth_kerb2/Makefile
+++ b/www/mod_auth_kerb2/Makefile
@@ -8,12 +8,10 @@
 # Shamelessly stolen from will's mod_auth_any port.
 
 PORTNAME=	mod_auth_kerb
-PORTVERSION=	5.0.r6
-PORTREVISION=	1
+PORTVERSION=	5.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=modauthkerb
-DISTNAME=	mod_auth_kerb-5.0-rc6
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	An Apache module for authenticating users with Kerberos v5
@@ -24,7 +22,8 @@ COMMENT=	An Apache module for authenticating users with Kerberos v5
 # (i.e., HTTP over SSL/TLS).  Thus, we require as a dependency
 # a version of Apache which can do this.
 #
-USE_APACHE=	13
+USE_APACHE=	1.3+
+USE_GMAKE=	yes
 # Don't fsck with CFLAGS
 CFLAGS:=
 GNU_CONFIGURE=	yes
@@ -39,7 +38,7 @@ OPTIONS+=	off
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 700014
-BROKEN=		"Does not compile on FreeBSD >= 7.0"
+BROKEN=		Does not compile on FreeBSD >= 7.0
 .endif
 
 .if exists(${PREFIX}/sbin/apxs)
diff --git a/www/mod_auth_kerb2/distinfo b/www/mod_auth_kerb2/distinfo
index 4830cf881d62..f13846c37321 100644
--- a/www/mod_auth_kerb2/distinfo
+++ b/www/mod_auth_kerb2/distinfo
@@ -1,3 +1,3 @@
-MD5 (mod_auth_kerb-5.0-rc6.tar.gz) = 274edfb950af20ce6ef0ddcb7c20263a
-SHA256 (mod_auth_kerb-5.0-rc6.tar.gz) = ae33ab3ae5b419819725091d154add1a1d1a5d6d97e31e9f327f71a0b6370d3e
-SIZE (mod_auth_kerb-5.0-rc6.tar.gz) = 68761
+MD5 (mod_auth_kerb-5.1.tar.gz) = b6a0c44b572c6e67ea7191999844aff6
+SHA256 (mod_auth_kerb-5.1.tar.gz) = 0415ea2bf506dfe7ac35b77fe49f6c5ca76f432e55e32904432c4150cc63faf5
+SIZE (mod_auth_kerb-5.1.tar.gz) = 73731
diff --git a/www/mod_auth_kerb2/files/patch-src__mod_auth_kerb.c b/www/mod_auth_kerb2/files/patch-src__mod_auth_kerb.c
deleted file mode 100644
index 7c25d1a1004f..000000000000
--- a/www/mod_auth_kerb2/files/patch-src__mod_auth_kerb.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/mod_auth_kerb.c.orig	Tue Aug 10 08:01:01 2004
-+++ src/mod_auth_kerb.c	Wed Oct  5 20:25:38 2005
-@@ -1108,6 +1108,7 @@
-   spnego_oid.elements = (void *)"\x2b\x06\x01\x05\x05\x02";
- 
-   if (conf->krb_5_keytab) {
-+#ifndef HEIMDAL
-      char *ktname;
-      /* we don't use the ap_* calls here, since the string passed to putenv()
-       * will become part of the enviroment and shouldn't be free()ed by apache
-@@ -1120,6 +1121,14 @@
-      }
-      sprintf(ktname, "KRB5_KTNAME=%s", conf->krb_5_keytab);
-      putenv(ktname);
-+#else
-+     ret = gsskrb5_register_acceptor_identity(conf->krb_5_keytab);
-+     if (ret) {
-+	log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "Setting KerberosV keytab failed: %s", strerror(errno));
-+	ret = HTTP_INTERNAL_SERVER_ERROR;
-+	goto end;
-+     }
-+#endif
-   }
- 
-   ret = get_gss_creds(r, conf, &server_creds);