Update 1.2.1 -> 1.2.2

16 files changed, 8 insertions, 280 deletions

diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile
index 0c6bf3069e5d..91f5743bba17 100644
--- a/security/krb5-16/Makefile
+++ b/security/krb5-16/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=		krb5
-PORTVERSION=		1.2.1
-PORTREVISION=		1
+PORTVERSION=		1.2.2
 CATEGORIES=		security
 MASTER_SITES=		# manual download
-EXTRACT_SUFX=		.tar
 
 MAINTAINER=		nectar@FreeBSD.org
 
@@ -72,25 +70,6 @@ do-fetch:
 	${FALSE};							\
 	fi
 
-# the distfile is actually a tar of three compressed tars and their
-# signatures
-do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR}
-	@(cd ${WRKDIR} && ${TAR} -xf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-	@for f in crypto doc src; do					\
-	cd ${WRKDIR} &&							\
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTNAME}.$$f.tar.gz    \
-		${EXTRACT_AFTER_ARGS} &&				\
-	${RM} ${DISTNAME}.$$f.tar.gz ${DISTNAME}.$$f.tar.gz.asc;	\
-	done
-.if !defined(EXTRACT_PRESERVE_OWNERSHIP)
-	@if [ `id -u` = 0 ]; then \
-		${CHMOD} -R ug-s ${WRKDIR}; \
-		${CHOWN} -R 0:0 ${WRKDIR}; \
-	fi
-.endif
-
 pre-build:
 .if !defined(KRB5_KRB4_COMPAT)
 	@${ECHO} "------------------------------------------------------"
diff --git a/security/krb5-16/distinfo b/security/krb5-16/distinfo
index 8481b7b72b4a..e8159e50a95c 100644
--- a/security/krb5-16/distinfo
+++ b/security/krb5-16/distinfo
@@ -1 +1 @@
-MD5 (krb5-1.2.1.tar) = a20d10cd42e0fdd0a3c825e0a1e2e08a
+MD5 (krb5-1.2.2.tar.gz) = 57d1bf3a3c68ee8af64e31a46799551c
diff --git a/security/krb5-16/files/patch-au b/security/krb5-16/files/patch-au
deleted file mode 100644
index b408c4a3750d..000000000000
--- a/security/krb5-16/files/patch-au
+++ /dev/null
@@ -1,19 +0,0 @@
-*** appl/bsd/forward.c.ORIG	Fri Feb  6 19:41:16 1998
---- appl/bsd/forward.c	Tue Jun 30 19:46:01 1998
-***************
-*** 51,57 ****
-       */
-    
-      sprintf(ccname, "FILE:/tmp/krb5cc_p%d", getpid());
-!     setenv("KRB5CCNAME", ccname, 0);
-    
-      if (retval = krb5_cc_resolve(context, ccname, ccache)) 
-  	goto cleanup;
---- 51,57 ----
-       */
-    
-      sprintf(ccname, "FILE:/tmp/krb5cc_p%d", getpid());
-!     setenv("KRB5CCNAME", ccname, 1);
-    
-      if (retval = krb5_cc_resolve(context, ccname, ccache)) 
-  	goto cleanup;
diff --git a/security/krb5-16/files/patch-bc b/security/krb5-16/files/patch-bc
deleted file mode 100644
index c80d9411629b..000000000000
--- a/security/krb5-16/files/patch-bc
+++ /dev/null
@@ -1,28 +0,0 @@
---- appl/bsd/krshd.c~	Thu Jun 29 22:27:05 2000
-+++ appl/bsd/krshd.c	Sat Jan  6 12:57:23 2001
-@@ -160,6 +160,16 @@
- Key_schedule v4_schedule;
- #endif
- 
-+#ifdef HAVE_PATHS_H
-+#include <paths.h>
-+#endif
-+
-+#if defined(_PATH_NOLOGIN)
-+#define NOLOGIN		_PATH_NOLOGIN
-+#else
-+#define NOLOGIN		"/etc/nologin"
-+#endif
-+
- #include "defines.h"
- 
- #if HAVE_ARPA_NAMESER_H
-@@ -1119,7 +1129,7 @@
- 	goto signout_please;
-     }
-     
--    if (pwd->pw_uid && !access("/etc/nologin", F_OK)) {
-+    if (pwd->pw_uid && !access(NOLOGIN, F_OK)) {
- 	error("Logins currently disabled.\n");
- 	goto signout_please;
-     }
diff --git a/security/krb5-17/Makefile b/security/krb5-17/Makefile
index 0c6bf3069e5d..91f5743bba17 100644
--- a/security/krb5-17/Makefile
+++ b/security/krb5-17/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=		krb5
-PORTVERSION=		1.2.1
-PORTREVISION=		1
+PORTVERSION=		1.2.2
 CATEGORIES=		security
 MASTER_SITES=		# manual download
-EXTRACT_SUFX=		.tar
 
 MAINTAINER=		nectar@FreeBSD.org
 
@@ -72,25 +70,6 @@ do-fetch:
 	${FALSE};							\
 	fi
 
-# the distfile is actually a tar of three compressed tars and their
-# signatures
-do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR}
-	@(cd ${WRKDIR} && ${TAR} -xf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-	@for f in crypto doc src; do					\
-	cd ${WRKDIR} &&							\
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTNAME}.$$f.tar.gz    \
-		${EXTRACT_AFTER_ARGS} &&				\
-	${RM} ${DISTNAME}.$$f.tar.gz ${DISTNAME}.$$f.tar.gz.asc;	\
-	done
-.if !defined(EXTRACT_PRESERVE_OWNERSHIP)
-	@if [ `id -u` = 0 ]; then \
-		${CHMOD} -R ug-s ${WRKDIR}; \
-		${CHOWN} -R 0:0 ${WRKDIR}; \
-	fi
-.endif
-
 pre-build:
 .if !defined(KRB5_KRB4_COMPAT)
 	@${ECHO} "------------------------------------------------------"
diff --git a/security/krb5-17/distinfo b/security/krb5-17/distinfo
index 8481b7b72b4a..e8159e50a95c 100644
--- a/security/krb5-17/distinfo
+++ b/security/krb5-17/distinfo
@@ -1 +1 @@
-MD5 (krb5-1.2.1.tar) = a20d10cd42e0fdd0a3c825e0a1e2e08a
+MD5 (krb5-1.2.2.tar.gz) = 57d1bf3a3c68ee8af64e31a46799551c
diff --git a/security/krb5-17/files/patch-au b/security/krb5-17/files/patch-au
deleted file mode 100644
index b408c4a3750d..000000000000
--- a/security/krb5-17/files/patch-au
+++ /dev/null
@@ -1,19 +0,0 @@
-*** appl/bsd/forward.c.ORIG	Fri Feb  6 19:41:16 1998
---- appl/bsd/forward.c	Tue Jun 30 19:46:01 1998
-***************
-*** 51,57 ****
-       */
-    
-      sprintf(ccname, "FILE:/tmp/krb5cc_p%d", getpid());
-!     setenv("KRB5CCNAME", ccname, 0);
-    
-      if (retval = krb5_cc_resolve(context, ccname, ccache)) 
-  	goto cleanup;
---- 51,57 ----
-       */
-    
-      sprintf(ccname, "FILE:/tmp/krb5cc_p%d", getpid());
-!     setenv("KRB5CCNAME", ccname, 1);
-    
-      if (retval = krb5_cc_resolve(context, ccname, ccache)) 
-  	goto cleanup;
diff --git a/security/krb5-17/files/patch-bc b/security/krb5-17/files/patch-bc
deleted file mode 100644
index c80d9411629b..000000000000
--- a/security/krb5-17/files/patch-bc
+++ /dev/null
@@ -1,28 +0,0 @@
---- appl/bsd/krshd.c~	Thu Jun 29 22:27:05 2000
-+++ appl/bsd/krshd.c	Sat Jan  6 12:57:23 2001
-@@ -160,6 +160,16 @@
- Key_schedule v4_schedule;
- #endif
- 
-+#ifdef HAVE_PATHS_H
-+#include <paths.h>
-+#endif
-+
-+#if defined(_PATH_NOLOGIN)
-+#define NOLOGIN		_PATH_NOLOGIN
-+#else
-+#define NOLOGIN		"/etc/nologin"
-+#endif
-+
- #include "defines.h"
- 
- #if HAVE_ARPA_NAMESER_H
-@@ -1119,7 +1129,7 @@
- 	goto signout_please;
-     }
-     
--    if (pwd->pw_uid && !access("/etc/nologin", F_OK)) {
-+    if (pwd->pw_uid && !access(NOLOGIN, F_OK)) {
- 	error("Logins currently disabled.\n");
- 	goto signout_please;
-     }
diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile
index 0c6bf3069e5d..91f5743bba17 100644
--- a/security/krb5-appl/Makefile
+++ b/security/krb5-appl/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=		krb5
-PORTVERSION=		1.2.1
-PORTREVISION=		1
+PORTVERSION=		1.2.2
 CATEGORIES=		security
 MASTER_SITES=		# manual download
-EXTRACT_SUFX=		.tar
 
 MAINTAINER=		nectar@FreeBSD.org
 
@@ -72,25 +70,6 @@ do-fetch:
 	${FALSE};							\
 	fi
 
-# the distfile is actually a tar of three compressed tars and their
-# signatures
-do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR}
-	@(cd ${WRKDIR} && ${TAR} -xf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-	@for f in crypto doc src; do					\
-	cd ${WRKDIR} &&							\
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTNAME}.$$f.tar.gz    \
-		${EXTRACT_AFTER_ARGS} &&				\
-	${RM} ${DISTNAME}.$$f.tar.gz ${DISTNAME}.$$f.tar.gz.asc;	\
-	done
-.if !defined(EXTRACT_PRESERVE_OWNERSHIP)
-	@if [ `id -u` = 0 ]; then \
-		${CHMOD} -R ug-s ${WRKDIR}; \
-		${CHOWN} -R 0:0 ${WRKDIR}; \
-	fi
-.endif
-
 pre-build:
 .if !defined(KRB5_KRB4_COMPAT)
 	@${ECHO} "------------------------------------------------------"
diff --git a/security/krb5-appl/distinfo b/security/krb5-appl/distinfo
index 8481b7b72b4a..e8159e50a95c 100644
--- a/security/krb5-appl/distinfo
+++ b/security/krb5-appl/distinfo
@@ -1 +1 @@
-MD5 (krb5-1.2.1.tar) = a20d10cd42e0fdd0a3c825e0a1e2e08a
+MD5 (krb5-1.2.2.tar.gz) = 57d1bf3a3c68ee8af64e31a46799551c
diff --git a/security/krb5-appl/files/patch-au b/security/krb5-appl/files/patch-au
deleted file mode 100644
index b408c4a3750d..000000000000
--- a/security/krb5-appl/files/patch-au
+++ /dev/null
@@ -1,19 +0,0 @@
-*** appl/bsd/forward.c.ORIG	Fri Feb  6 19:41:16 1998
---- appl/bsd/forward.c	Tue Jun 30 19:46:01 1998
-***************
-*** 51,57 ****
-       */
-    
-      sprintf(ccname, "FILE:/tmp/krb5cc_p%d", getpid());
-!     setenv("KRB5CCNAME", ccname, 0);
-    
-      if (retval = krb5_cc_resolve(context, ccname, ccache)) 
-  	goto cleanup;
---- 51,57 ----
-       */
-    
-      sprintf(ccname, "FILE:/tmp/krb5cc_p%d", getpid());
-!     setenv("KRB5CCNAME", ccname, 1);
-    
-      if (retval = krb5_cc_resolve(context, ccname, ccache)) 
-  	goto cleanup;
diff --git a/security/krb5-appl/files/patch-bc b/security/krb5-appl/files/patch-bc
deleted file mode 100644
index c80d9411629b..000000000000
--- a/security/krb5-appl/files/patch-bc
+++ /dev/null
@@ -1,28 +0,0 @@
---- appl/bsd/krshd.c~	Thu Jun 29 22:27:05 2000
-+++ appl/bsd/krshd.c	Sat Jan  6 12:57:23 2001
-@@ -160,6 +160,16 @@
- Key_schedule v4_schedule;
- #endif
- 
-+#ifdef HAVE_PATHS_H
-+#include <paths.h>
-+#endif
-+
-+#if defined(_PATH_NOLOGIN)
-+#define NOLOGIN		_PATH_NOLOGIN
-+#else
-+#define NOLOGIN		"/etc/nologin"
-+#endif
-+
- #include "defines.h"
- 
- #if HAVE_ARPA_NAMESER_H
-@@ -1119,7 +1129,7 @@
- 	goto signout_please;
-     }
-     
--    if (pwd->pw_uid && !access("/etc/nologin", F_OK)) {
-+    if (pwd->pw_uid && !access(NOLOGIN, F_OK)) {
- 	error("Logins currently disabled.\n");
- 	goto signout_please;
-     }
diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index 0c6bf3069e5d..91f5743bba17 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=		krb5
-PORTVERSION=		1.2.1
-PORTREVISION=		1
+PORTVERSION=		1.2.2
 CATEGORIES=		security
 MASTER_SITES=		# manual download
-EXTRACT_SUFX=		.tar
 
 MAINTAINER=		nectar@FreeBSD.org
 
@@ -72,25 +70,6 @@ do-fetch:
 	${FALSE};							\
 	fi
 
-# the distfile is actually a tar of three compressed tars and their
-# signatures
-do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR}
-	@(cd ${WRKDIR} && ${TAR} -xf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-	@for f in crypto doc src; do					\
-	cd ${WRKDIR} &&							\
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTNAME}.$$f.tar.gz    \
-		${EXTRACT_AFTER_ARGS} &&				\
-	${RM} ${DISTNAME}.$$f.tar.gz ${DISTNAME}.$$f.tar.gz.asc;	\
-	done
-.if !defined(EXTRACT_PRESERVE_OWNERSHIP)
-	@if [ `id -u` = 0 ]; then \
-		${CHMOD} -R ug-s ${WRKDIR}; \
-		${CHOWN} -R 0:0 ${WRKDIR}; \
-	fi
-.endif
-
 pre-build:
 .if !defined(KRB5_KRB4_COMPAT)
 	@${ECHO} "------------------------------------------------------"
diff --git a/security/krb5/distinfo b/security/krb5/distinfo
index 8481b7b72b4a..e8159e50a95c 100644
--- a/security/krb5/distinfo
+++ b/security/krb5/distinfo
@@ -1 +1 @@
-MD5 (krb5-1.2.1.tar) = a20d10cd42e0fdd0a3c825e0a1e2e08a
+MD5 (krb5-1.2.2.tar.gz) = 57d1bf3a3c68ee8af64e31a46799551c
diff --git a/security/krb5/files/patch-au b/security/krb5/files/patch-au
deleted file mode 100644
index b408c4a3750d..000000000000
--- a/security/krb5/files/patch-au
+++ /dev/null
@@ -1,19 +0,0 @@
-*** appl/bsd/forward.c.ORIG	Fri Feb  6 19:41:16 1998
---- appl/bsd/forward.c	Tue Jun 30 19:46:01 1998
-***************
-*** 51,57 ****
-       */
-    
-      sprintf(ccname, "FILE:/tmp/krb5cc_p%d", getpid());
-!     setenv("KRB5CCNAME", ccname, 0);
-    
-      if (retval = krb5_cc_resolve(context, ccname, ccache)) 
-  	goto cleanup;
---- 51,57 ----
-       */
-    
-      sprintf(ccname, "FILE:/tmp/krb5cc_p%d", getpid());
-!     setenv("KRB5CCNAME", ccname, 1);
-    
-      if (retval = krb5_cc_resolve(context, ccname, ccache)) 
-  	goto cleanup;
diff --git a/security/krb5/files/patch-bc b/security/krb5/files/patch-bc
deleted file mode 100644
index c80d9411629b..000000000000
--- a/security/krb5/files/patch-bc
+++ /dev/null
@@ -1,28 +0,0 @@
---- appl/bsd/krshd.c~	Thu Jun 29 22:27:05 2000
-+++ appl/bsd/krshd.c	Sat Jan  6 12:57:23 2001
-@@ -160,6 +160,16 @@
- Key_schedule v4_schedule;
- #endif
- 
-+#ifdef HAVE_PATHS_H
-+#include <paths.h>
-+#endif
-+
-+#if defined(_PATH_NOLOGIN)
-+#define NOLOGIN		_PATH_NOLOGIN
-+#else
-+#define NOLOGIN		"/etc/nologin"
-+#endif
-+
- #include "defines.h"
- 
- #if HAVE_ARPA_NAMESER_H
-@@ -1119,7 +1129,7 @@
- 	goto signout_please;
-     }
-     
--    if (pwd->pw_uid && !access("/etc/nologin", F_OK)) {
-+    if (pwd->pw_uid && !access(NOLOGIN, F_OK)) {
- 	error("Logins currently disabled.\n");
- 	goto signout_please;
-     }