MIT Kerberos released 1.13; 1.12 becomes a maintenance release,

1.11 remains a maintenance release.

- Update security/krb5 1.12.2 --> 1.13
- Copy the old security/krb5 1.12.2 to security/krb5-112
  (now a maintenance release supported by MIT)
- Move the old krb5-maint (1.11.5: old maintenance release) to
  security/krb5-111 (the old maintenance release still supported by MIT)

5 files changed, 18 insertions, 23 deletions

diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index 28cf6403c062..142c910a67d2 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=		krb5
-PORTVERSION=		1.12.2
+PORTVERSION=		1.13
 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
@@ -18,7 +18,7 @@ LICENSE=		MIT
 
 BUILD_DEPENDS=		gm4:${PORTSDIR}/devel/m4
 
-CONFLICTS=		heimdal-[0-9]* srp-[0-9]* krb5-maint-[0-9]*
+CONFLICTS=		heimdal-[0-9]* srp-[0-9]* krb5-maint-11[0-9]-[0-9]*
 
 LATEST_LINK=		${PORTNAME}-19
 KERBEROSV_URL=		http://web.mit.edu/kerberos/
diff --git a/security/krb5/distinfo b/security/krb5/distinfo
index 964947a9eaf8..89e5f8d20756 100644
--- a/security/krb5/distinfo
+++ b/security/krb5/distinfo
@@ -1,2 +1,2 @@
-SHA256 (krb5-1.12.2-signed.tar) = 09bd180107b5c2b3b7378c57c023fb02a103d4cac39d6f2dd600275d7a4f3744
-SIZE (krb5-1.12.2-signed.tar) = 11991040
+SHA256 (krb5-1.13-signed.tar) = dc8f79ae9ab777d0f815e84ed02ac4ccfe3d5826eb4947a195dfce9fd95a9582
+SIZE (krb5-1.13-signed.tar) = 12083200
diff --git a/security/krb5/files/patch-lib-apputils-net-server.c b/security/krb5/files/patch-lib-apputils-net-server.c
deleted file mode 100644
index b4fbf4a5655c..000000000000
--- a/security/krb5/files/patch-lib-apputils-net-server.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- lib/apputils/net-server.c.orig	2014-08-11 15:46:27.000000000 -0700
-+++ lib/apputils/net-server.c	2014-08-13 05:33:48.913580280 -0700
-@@ -992,8 +992,12 @@
-     case RTM_NEWADDR: return "RTM_NEWADDR";
-     case RTM_DELADDR: return "RTM_DELADDR";
-     case RTM_IFINFO: return "RTM_IFINFO";
-+#ifdef RTM_OLDADD
-     case RTM_OLDADD: return "RTM_OLDADD";
-+#endif
-+#ifdef RTM_OLDDEL
-     case RTM_OLDDEL: return "RTM_OLDDEL";
-+#endif
-     case RTM_RESOLVE: return "RTM_RESOLVE";
- #ifdef RTM_NEWMADDR
-     case RTM_NEWMADDR: return "RTM_NEWMADDR";
diff --git a/security/krb5/files/patch-lib__krb5__ccache__kcm.c b/security/krb5/files/patch-lib__krb5__ccache__kcm.c
new file mode 100644
index 000000000000..931d821ff783
--- /dev/null
+++ b/security/krb5/files/patch-lib__krb5__ccache__kcm.c
@@ -0,0 +1,11 @@
+--- lib/krb5/ccache/cc_kcm.c.orig	2014-10-15 16:55:10.000000000 -0700
++++ lib/krb5/ccache/cc_kcm.c	2014-10-16 00:04:30.312921884 -0700
+@@ -377,7 +377,7 @@
+ kcmio_call(krb5_context context, struct kcmio *io, struct kcmreq *req)
+ {
+     krb5_error_code ret;
+-    size_t reply_len;
++    size_t reply_len = 0;	/* XXX Make clang happy */
+ 
+     if (k5_buf_status(&req->reqbuf) != 0)
+         return ENOMEM;
diff --git a/security/krb5/pkg-plist b/security/krb5/pkg-plist
index 95f61efd08d7..ab2b5fc28ce7 100644
--- a/security/krb5/pkg-plist
+++ b/security/krb5/pkg-plist
@@ -78,12 +78,13 @@ lib/libkadm5srv.so
 lib/libkadm5srv_mit.so
 lib/libkadm5srv_mit.so.9
 lib/libkdb5.so
-lib/libkdb5.so.7
+lib/libkdb5.so.8
 lib/libkrb5.so
 lib/libkrb5.so.3
 lib/libkrb5support.so
 lib/libkrb5support.so.0
 lib/krb5/plugins/kdb/db2.so
+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
@@ -104,7 +105,6 @@ lib/pkgconfig/mit-krb5.pc
 man/man1/k5srvutil.1.gz
 man/man1/kadmin.1.gz
 man/man1/krb5-config.1.gz
-man/man1/krb5-send-pr.1.gz
 man/man1/kpasswd.1.gz
 man/man1/klist.1.gz
 man/man1/kinit.1.gz
@@ -150,7 +150,6 @@ share/et/et_h.awk
 share/examples/krb5/kdc.conf
 share/examples/krb5/krb5.conf
 share/examples/krb5/services.append
-share/gnats/mit
 share/locale/en_US/LC_MESSAGES/mit-krb5.mo
 @exec mkdir -p %D/var/krb5kdc
 @dirrmtry var/krb5kdc
@@ -158,6 +157,7 @@ share/locale/en_US/LC_MESSAGES/mit-krb5.mo
 @dirrmtry share/locale/en_US/LC_MESSAGES
 @dirrmtry share/locale/en_US
 @dirrm lib/pkgconfig
+@dirrm lib/krb5/plugins/tls
 @dirrm lib/krb5/plugins/preauth
 @dirrm lib/krb5/plugins/libkrb5
 @dirrm lib/krb5/plugins/kdb
@@ -169,5 +169,4 @@ share/locale/en_US/LC_MESSAGES/mit-krb5.mo
 @dirrm include/krb5
 @dirrm include/kadm5
 @dirrm share/et
-@dirrmtry share/gnats
 @dirrm share/examples/krb5