svn commit: r402143 - in head/security: . krb5 krb5-112 krb5-113 krb5-appl krb5/files

Cy Schubert cy at FreeBSD.org
Sat Nov 21 08:47:15 UTC 2015 

Author: cy
Date: Sat Nov 21 08:47:13 2015
New Revision: 402143
URL: https://svnweb.freebsd.org/changeset/ports/402143

Log:
  Introduce the new krb5 1.14:
  
  - move (copy) krb5 (krb5 1.13.2) to krb5-113 (new, added)
  - update krb5 1.13.2 --> 1.14
  - update CONFLICTS in krb5, krb5-112 and krb5-113.
  - update krb5-appl to allow optional dependency on krb5-113.
  - update security/Makefile with copied krb5-113.
  - deprecate and expire krb5-112 (krb5-1.12) on November 20, 2016, as it
    will EOL twelve months after the release of krb5-1.14.

Added:
  head/security/krb5-113/
     - copied from r401618, head/security/krb5/
Deleted:
  head/security/krb5/files/patch-lib__krb5__ccache__cc_file.c
Modified:
  head/security/Makefile
  head/security/krb5-112/Makefile
  head/security/krb5-113/Makefile
  head/security/krb5-appl/Makefile
  head/security/krb5/Makefile
  head/security/krb5/distinfo
  head/security/krb5/pkg-plist

Modified: head/security/Makefile
==============================================================================
--- head/security/Makefile	Sat Nov 21 08:31:00 2015	(r402142)
+++ head/security/Makefile	Sat Nov 21 08:47:13 2015	(r402143)
@@ -269,6 +269,7 @@
     SUBDIR += kqoauth
     SUBDIR += krb5
     SUBDIR += krb5-112
+    SUBDIR += krb5-113
     SUBDIR += krb5-appl
     SUBDIR += kripp
     SUBDIR += kstart

Modified: head/security/krb5-112/Makefile
==============================================================================
--- head/security/krb5-112/Makefile	Sat Nov 21 08:31:00 2015	(r402142)
+++ head/security/krb5-112/Makefile	Sat Nov 21 08:47:13 2015	(r402143)
@@ -18,9 +18,12 @@ COMMENT=		Authentication system develope
 
 LICENSE=		MIT
 
+DEPRECATED=		EOL twelve months after release of krb5-1.14
+EXPIRATION_DATE=	2016-11-20
+
 BUILD_DEPENDS=		gm4:${PORTSDIR}/devel/m4
 
-CONFLICTS=		heimdal-[0-9]* srp-[0-9]* krb5-[0-9]* krb5-maint-111-*
+CONFLICTS=		heimdal-[0-9]* srp-[0-9]* krb5-[0-9].* krb5-11[014-9]-*
 
 KERBEROSV_URL=		http://web.mit.edu/kerberos/
 USE_PERL5=		build

Modified: head/security/krb5-113/Makefile
==============================================================================
--- head/security/krb5/Makefile	Sun Nov 15 00:17:58 2015	(r401618)
+++ head/security/krb5-113/Makefile	Sat Nov 21 08:47:13 2015	(r402143)
@@ -3,9 +3,9 @@
 
 PORTNAME=		krb5
 PORTVERSION=		1.13.2
-PORTREVISION=		5
 CATEGORIES=		security
 MASTER_SITES=		http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
+PKGNAMESUFFIX=		-113
 DISTNAME=		${PORTNAME}-${PORTVERSION}-signed
 EXTRACT_SUFX=		.tar
 
@@ -19,7 +19,7 @@ LICENSE=		MIT
 
 BUILD_DEPENDS=		gm4:${PORTSDIR}/devel/m4
 
-CONFLICTS=		heimdal-[0-9]* srp-[0-9]* krb5-maint-11[0-9]-[0-9]*
+CONFLICTS=		heimdal-[0-9]* srp-[0-9]* krb5-11[0-2]-* krb5-[0-9].*
 
 KERBEROSV_URL=		http://web.mit.edu/kerberos/
 USE_PERL5=		build

Modified: head/security/krb5-appl/Makefile
==============================================================================
--- head/security/krb5-appl/Makefile	Sat Nov 21 08:31:00 2015	(r402142)
+++ head/security/krb5-appl/Makefile	Sat Nov 21 08:47:13 2015	(r402143)
@@ -3,7 +3,7 @@
 
 PORTNAME=		krb5-appl
 PORTVERSION=		1.0.3
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		security
 MASTER_SITES=		http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
 PATCH_SITES=		http://web.mit.edu/kerberos/advisories/
@@ -33,7 +33,7 @@ PATCH_DIST_STRIP=	-p1
 OPTIONS_DEFINE=	KRB5_RENAME_FTP KRB5_RENAME_TELNET KRB5_RENAME_RLOGIN KRB5_RENAME_RSH KRB5_RENAME_RCP
 OPTIONS_DEFAULT=	KRB5_PORT
 OPTIONS_SINGLE=		KRB5_VERSION
-OPTIONS_SINGLE_KRB5_VERSION=	KRB5_PORT KRB5_112_PORT
+OPTIONS_SINGLE_KRB5_VERSION=	KRB5_PORT KRB5_112_PORT KRB5_113_PORT
 KRB5_RENAME_FTP_DESC=		Rename ftp to kftp
 KRB5_RENAME_TELNET_DESC=	Rename telnet to ktelnet
 KRB5_RENAME_RLOGIN_DESC=	Rename rlogin to krlogin
@@ -41,6 +41,7 @@ KRB5_RENAME_RSH_DESC=		Rename rsh to krs
 KRB5_RENAME_RCP_DESC=		Rename rcp to krcp
 KRB5_PORT_DESC=			Depend on security/krb5
 KRB5_112_PORT_DESC=		Depend on security/krb5-112
+KRB5_112_PORT_DESC=		Depend on security/krb5-113
 
 .include <bsd.port.pre.mk>
 
@@ -50,6 +51,9 @@ RUN_DEPENDS=		kinit:${PORTSDIR}/security
 .elif ${PORT_OPTIONS:MKRB5_112_PORT}
 LIB_DEPENDS=		libkrb5support.so:${PORTSDIR}/security/krb5-112
 RUN_DEPENDS=		kinit:${PORTSDIR}/security/krb5-112
+.elif ${PORT_OPTIONS:MKRB5_113_PORT}
+LIB_DEPENDS=		libkrb5support.so:${PORTSDIR}/security/krb5-113
+RUN_DEPENDS=		kinit:${PORTSDIR}/security/krb5-113
 .else
 BROKEN=			krb5 dependency not selected
 .endif

Modified: head/security/krb5/Makefile
==============================================================================
--- head/security/krb5/Makefile	Sat Nov 21 08:31:00 2015	(r402142)
+++ head/security/krb5/Makefile	Sat Nov 21 08:47:13 2015	(r402143)
@@ -2,12 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=		krb5
-PORTVERSION=		1.13.2
-PORTREVISION=		5
+PORTVERSION=		1.14
 CATEGORIES=		security
 MASTER_SITES=		http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
-DISTNAME=		${PORTNAME}-${PORTVERSION}-signed
-EXTRACT_SUFX=		.tar
 
 PATCH_SITES=		http://web.mit.edu/kerberos/advisories/
 PATCH_DIST_STRIP=	-p2
@@ -19,7 +16,7 @@ LICENSE=		MIT
 
 BUILD_DEPENDS=		gm4:${PORTSDIR}/devel/m4
 
-CONFLICTS=		heimdal-[0-9]* srp-[0-9]* krb5-maint-11[0-9]-[0-9]*
+CONFLICTS=		heimdal-[0-9]* srp-[0-9]* krb5-11[0-9]-*
 
 KERBEROSV_URL=		http://web.mit.edu/kerberos/
 USE_PERL5=		build
@@ -109,10 +106,6 @@ WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVE
 HTML_DOC_DIR=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc/html
 PDF_DOC_DIR=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc/pdf
 
-post-extract:
-	@${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz --no-same-owner --no-same-permissions
-	@${RM} ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz.asc
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5
 # html documentation

Modified: head/security/krb5/distinfo
==============================================================================
--- head/security/krb5/distinfo	Sat Nov 21 08:31:00 2015	(r402142)
+++ head/security/krb5/distinfo	Sat Nov 21 08:47:13 2015	(r402143)
@@ -1,2 +1,2 @@
-SHA256 (krb5-1.13.2-signed.tar) = e528c30b0209c741f6f320cb83122ded92f291802b6a1a1dc1a01dcdb3ff6de1
-SIZE (krb5-1.13.2-signed.tar) = 12113920
+SHA256 (krb5-1.14.tar.gz) = cedb07fad8331e3ff2983d26e977a2ddba622f379c2b19bfea85bd695930f9e9
+SIZE (krb5-1.14.tar.gz) = 12255176

Modified: head/security/krb5/pkg-plist
==============================================================================
--- head/security/krb5/pkg-plist	Sat Nov 21 08:31:00 2015	(r402142)
+++ head/security/krb5/pkg-plist	Sat Nov 21 08:47:13 2015	(r402143)
@@ -77,12 +77,12 @@ lib/libk5crypto.so.3
 lib/libk5crypto.so.3.1
 lib/libkadm5clnt.so
 lib/libkadm5clnt_mit.so
-lib/libkadm5clnt_mit.so.9
-lib/libkadm5clnt_mit.so.9.0
+lib/libkadm5clnt_mit.so.10
+lib/libkadm5clnt_mit.so.10.0
 lib/libkadm5srv.so
 lib/libkadm5srv_mit.so
-lib/libkadm5srv_mit.so.9
-lib/libkadm5srv_mit.so.9.0
+lib/libkadm5srv_mit.so.10
+lib/libkadm5srv_mit.so.10.0
 lib/libkdb5.so
 lib/libkdb5.so.8
 lib/libkdb5.so.8.0
@@ -97,6 +97,7 @@ lib/krb5/plugins/tls/k5tls.so
 %%LDAP%%lib/krb5/plugins/kdb/kldap.so
 lib/krb5/plugins/preauth/otp.so
 lib/krb5/plugins/preauth/pkinit.so
+lib/krb5/plugins/preauth/test.so
 %%LDAP%%lib/libkdb_ldap.so
 %%LDAP%%lib/libkdb_ldap.so.1
 %%LDAP%%lib/libkdb_ldap.so.1.0

More information about the svn-ports-head mailing list