Update krb5 to 1.12. Security/krb5 tracks MIT KRB5 current release.

Adjust the newly created krb5-maint with a new portname and conflicts.
Krb5-maint is a maintenance release for those who wish to use the previous
release of krb5. krb5-maint remains at 1.11.3.

Adjust CONFLICTS in security/heimdal and security/srp to account for the
newly repocopied krb5-maint.

Adjust security/Makefile to include krb5-maint.

8 files changed, 41 insertions, 38 deletions

diff --git a/security/Makefile b/security/Makefile
index f45d6b0c14f7..4f210ea9b885 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -249,6 +249,7 @@
     SUBDIR += kpcli
     SUBDIR += krb5
     SUBDIR += krb5-appl
+    SUBDIR += krb5-maint
     SUBDIR += kripp
     SUBDIR += kwallet
     SUBDIR += l0pht-watch
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 30b90543e1c6..355e1e11075d 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.h5l.org/dist/src/ \
 MAINTAINER=	Joerg.Pulz@frm2.tum.de
 COMMENT=	Popular BSD-licensed implementation of Kerberos 5
 
-CONFLICTS=	krb4-[0-9]* krb5-[0-9]* srp-[0-9]*
+CONFLICTS=	krb4-[0-9]* krb5-[0-9]* krb5-maint-[0-9]* srp-[0-9]*
 
 OPTIONS_DEFINE=	IPV6 KCM BDB SQLITE LDAP PKINIT DIGEST KX509 CRACKLIB X11
 OPTIONS_DEFAULT=	KCM BDB PKINIT DIGEST KX509
diff --git a/security/krb5-maint/Makefile b/security/krb5-maint/Makefile
index d0e01bee4f90..521344408729 100644
--- a/security/krb5-maint/Makefile
+++ b/security/krb5-maint/Makefile
@@ -1,7 +1,7 @@
 # Created by: nectar@FreeBSD.org
 # $FreeBSD$
 
-PORTNAME=		krb5
+PORTNAME=		krb5-maint
 PORTVERSION=		1.11.3
 PORTREVISION=		2
 CATEGORIES=		security
@@ -19,7 +19,7 @@ LICENSE=		MIT
 
 BUILD_DEPENDS=		gm4:${PORTSDIR}/devel/m4
 
-CONFLICTS=		heimdal-[0-9]* srp-[0-9]*
+CONFLICTS=		heimdal-[0-9]* srp-[0-9]* krb5-[0-9]*
 
 LATEST_LINK=		${PORTNAME}-19
 KERBEROSV_URL=		http://web.mit.edu/kerberos/
diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index d0e01bee4f90..7243981360c0 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=		krb5
-PORTVERSION=		1.11.3
-PORTREVISION=		2
+PORTVERSION=		1.12
 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
@@ -19,7 +18,7 @@ LICENSE=		MIT
 
 BUILD_DEPENDS=		gm4:${PORTSDIR}/devel/m4
 
-CONFLICTS=		heimdal-[0-9]* srp-[0-9]*
+CONFLICTS=		heimdal-[0-9]* srp-[0-9]* krb5-maint-[0-9]*
 
 LATEST_LINK=		${PORTNAME}-19
 KERBEROSV_URL=		http://web.mit.edu/kerberos/
diff --git a/security/krb5/distinfo b/security/krb5/distinfo
index 203e595f6d7b..394e50eec76b 100644
--- a/security/krb5/distinfo
+++ b/security/krb5/distinfo
@@ -1,2 +1,2 @@
-SHA256 (krb5-1.11.3-signed.tar) = 9abd94bb94a70996da0f8d90408957154bb543271b097e86c63eb33e5f5751b5
-SIZE (krb5-1.11.3-signed.tar) = 11673600
+SHA256 (krb5-1.12-signed.tar) = 3dc6c2f3f9ca2b51976e7f1dc035c08127ce7edc8f442d3e007f58a7aecb9d4c
+SIZE (krb5-1.12-signed.tar) = 11929600
diff --git a/security/krb5/files/patch-config::shlib.conf b/security/krb5/files/patch-config::shlib.conf
index 55f967d8a505..805e56e91e7f 100644
--- a/security/krb5/files/patch-config::shlib.conf
+++ b/security/krb5/files/patch-config::shlib.conf
@@ -1,33 +1,19 @@
---- config/shlib.conf.orig	2012-08-08 15:27:55.000000000 -0700
-+++ config/shlib.conf	2012-11-02 17:49:31.140500618 -0700
-@@ -306,24 +306,18 @@
- 	;;
- 
- *-*-freebsd*)
--	if test -x /usr/bin/objformat ; then
--		objformat=`/usr/bin/objformat`
--	else
--		objformat="elf"
--	fi
--	PICFLAGS=-fpic
--	if test "x$objformat" = "xelf" ; then
-+	case $krb5_cv_host in
-+	sparc64-*)      PICFLAGS=-fPIC;;
-+	*)              PICFLAGS=-fpic;;
-+	esac
-+ 
- 		SHLIBVEXT='.so.$(LIBMAJOR)'
-+		LDCOMBINE="libtool --mode=link cc -Xcompiler -shared"
- 		RPATH_FLAG='-Wl,-rpath -Wl,'
--	else
--		RPATH_FLAG=-R
--		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
--	fi
+--- config/shlib.conf.orig	2013-12-10 14:49:15.000000000 -0800
++++ config/shlib.conf	2013-12-11 12:58:51.983110392 -0800
+@@ -315,13 +315,13 @@
+ 			;;
+ 	esac
+ 	SHLIBVEXT='.so.$(LIBMAJOR)'
+-	RPATH_FLAG='-Wl,--enable-new-dtags -Wl,-rpath -Wl,'
++	LDCOMBINE="libtool --mode=link cc -Xcompiler -shared"
++	RPATH_FLAG='-Wl,-rpath -Wl,'
  	PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
  	CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
  	CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)'
  	SHLIBEXT=.so
 -	LDCOMBINE='ld -Bshareable'
- 	SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)'
+-	SHLIB_RPATH_FLAGS='--enable-new-dtags -rpath $(SHLIB_RDIRS)'
++	SHLIB_RPATH_FLAGS='-rpath $(SHLIB_RDIRS)'
  	SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
  	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
+ 	CXX_LINK_STATIC='$(CXX) $(PROG_LIBPATH) $(CXXFLAGS) $(LDFLAGS)'
diff --git a/security/krb5/pkg-plist b/security/krb5/pkg-plist
index 10295cfb0acf..8982a1652a3f 100644
--- a/security/krb5/pkg-plist
+++ b/security/krb5/pkg-plist
@@ -37,9 +37,14 @@ include/gssrpc/svc.h
 include/gssrpc/svc_auth.h
 include/gssrpc/types.h
 include/gssrpc/xdr.h
+include/krad.h
 include/krb5.h
-%%LDAP%%include/krb5/ccselect_plugin.h
+include/krb5/ccselect_plugin.h
+include/krb5/clpreauth_plugin.h
+include/krb5/hostrealm_plugin.h
 include/krb5/kadm5_hook_plugin.h
+include/krb5/kdcpreauth_plugin.h
+include/krb5/localauth_plugin.h
 include/krb5/krb5.h
 include/krb5/locate_plugin.h
 include/krb5/plugin.h
@@ -62,10 +67,10 @@ lib/libk5crypto.so
 lib/libk5crypto.so.3
 lib/libkadm5clnt.so
 lib/libkadm5clnt_mit.so
-lib/libkadm5clnt_mit.so.8
+lib/libkadm5clnt_mit.so.9
 lib/libkadm5srv.so
 lib/libkadm5srv_mit.so
-lib/libkadm5srv_mit.so.8
+lib/libkadm5srv_mit.so.9
 lib/libkdb5.so
 lib/libkdb5.so.7
 lib/libkrb5.so
@@ -74,11 +79,22 @@ lib/libkrb5support.so
 lib/libkrb5support.so.0
 lib/krb5/plugins/kdb/db2.so
 %%LDAP%%lib/krb5/plugins/kdb/kldap.so
+lib/krb5/plugins/preauth/otp.so
 lib/krb5/plugins/preauth/pkinit.so
 %%LDAP%%lib/libkdb_ldap.so
 %%LDAP%%lib/libkdb_ldap.so.1
+lib/libkrad.so
+lib/libkrad.so.0
 lib/libverto.so.0
 lib/libverto.so
+lib/pkgconfig/gssrpc.pc
+lib/pkgconfig/kadm-client.pc
+lib/pkgconfig/kadm-server.pc
+lib/pkgconfig/kdb.pc
+lib/pkgconfig/krb5-gssapi.pc
+lib/pkgconfig/krb5.pc
+lib/pkgconfig/mit-krb5-gssapi.pc
+lib/pkgconfig/mit-krb5.pc
 sbin/gss-server
 sbin/kadmin.local
 sbin/kadmind
@@ -105,6 +121,7 @@ share/locale/en_US/LC_MESSAGES/mit-krb5.mo
 @dirrmtry var
 @dirrmtry share/locale/en_US/LC_MESSAGES
 @dirrmtry share/locale/en_US
+@dirrm lib/pkgconfig
 @dirrm lib/krb5/plugins/preauth
 @dirrm lib/krb5/plugins/libkrb5
 @dirrm lib/krb5/plugins/kdb
diff --git a/security/srp/Makefile b/security/srp/Makefile
index 96cb2d2f120a..f358c0f3b117 100644
--- a/security/srp/Makefile
+++ b/security/srp/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://srp.stanford.edu/source/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Secure Remote Password protocol library, TELNET, and FTP
 
-CONFLICTS=	krb4-[0-9]* krb5-[0-9]* heimdal-[0-9]*
+CONFLICTS=	krb4-[0-9]* krb5-[0-9]* krb5-maint-[0-9]* heimdal-[0-9]*
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	INSTALL="/usr/bin/install -C"