Date: Thu, 16 Oct 2014 19:44:22 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371019 - in head: . security security/krb5 security/krb5-111 security/krb5-112 security/krb5-maint security/krb5/files Message-ID: <201410161944.s9GJiMJU040608@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Thu Oct 16 19:44:22 2014 New Revision: 371019 URL: https://svnweb.freebsd.org/changeset/ports/371019 QAT: https://qat.redports.org/buildarchive/r371019/ Log: 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) Added: head/security/krb5-111/ - copied from r370735, head/security/krb5-maint/ head/security/krb5-112/ - copied from r370735, head/security/krb5/ head/security/krb5/files/patch-lib__krb5__ccache__kcm.c (contents, props changed) Deleted: head/security/krb5-maint/ head/security/krb5/files/patch-lib-apputils-net-server.c Modified: head/MOVED head/security/Makefile head/security/krb5-111/Makefile head/security/krb5-112/Makefile head/security/krb5/Makefile head/security/krb5/distinfo head/security/krb5/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Thu Oct 16 19:44:14 2014 (r371018) +++ head/MOVED Thu Oct 16 19:44:22 2014 (r371019) @@ -7159,3 +7159,4 @@ ports-mgmt/portaudit-db||2014-10-13|port ports-mgmt/kports-qt4||2014-10-13|portaudit expired net-mgmt/check_snmp_pkgvuln||2014-10-13|portaudit expired mail/p5-Email-Stuff|mail/p5-Email-Stuffer|2014-10-15|Has expired: Deprecated in favour of mail/p5-Email-Stuffer +security/krb5-maint|krb5-111|2014-10-16|MIT now supports two maintenance releases of which 1.11 is the older of the two. Modified: head/security/Makefile ============================================================================== --- head/security/Makefile Thu Oct 16 19:44:14 2014 (r371018) +++ head/security/Makefile Thu Oct 16 19:44:22 2014 (r371019) @@ -247,8 +247,9 @@ SUBDIR += kpcli SUBDIR += kqoauth SUBDIR += krb5 + SUBDIR += krb5-111 + SUBDIR += krb5-112 SUBDIR += krb5-appl - SUBDIR += krb5-maint SUBDIR += kripp SUBDIR += kwalletmanager SUBDIR += l0pht-watch Modified: head/security/krb5-111/Makefile ============================================================================== --- head/security/krb5-maint/Makefile Sun Oct 12 19:07:07 2014 (r370735) +++ head/security/krb5-111/Makefile Thu Oct 16 19:44:22 2014 (r371019) @@ -1,7 +1,7 @@ # Created by: nectar@FreeBSD.org # $FreeBSD$ -PORTNAME= krb5-maint +PORTNAME= krb5--111 PORTVERSION= 1.11.5 PORTREVISION= 3 CATEGORIES= security @@ -19,7 +19,7 @@ LICENSE= MIT BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -CONFLICTS= heimdal-[0-9]* srp-[0-9]* krb5-[0-9]* +CONFLICTS= heimdal-[0-9]* srp-[0-9]* krb5-[0-9]* krb5-maint-112-* KERBEROSV_URL= http://web.mit.edu/kerberos/ USES= gettext gmake perl5 Modified: head/security/krb5-112/Makefile ============================================================================== --- head/security/krb5/Makefile Sun Oct 12 19:07:07 2014 (r370735) +++ head/security/krb5-112/Makefile Thu Oct 16 19:44:22 2014 (r371019) @@ -1,7 +1,7 @@ # Created by: nectar@FreeBSD.org # $FreeBSD$ -PORTNAME= krb5 +PORTNAME= krb5-112 PORTVERSION= 1.12.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//}/ @@ -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-[0-9]* krb5-maint-111-* LATEST_LINK= ${PORTNAME}-19 KERBEROSV_URL= http://web.mit.edu/kerberos/ Modified: head/security/krb5/Makefile ============================================================================== --- head/security/krb5/Makefile Thu Oct 16 19:44:14 2014 (r371018) +++ head/security/krb5/Makefile Thu Oct 16 19:44:22 2014 (r371019) @@ -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/ Modified: head/security/krb5/distinfo ============================================================================== --- head/security/krb5/distinfo Thu Oct 16 19:44:14 2014 (r371018) +++ head/security/krb5/distinfo Thu Oct 16 19:44:22 2014 (r371019) @@ -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 Added: head/security/krb5/files/patch-lib__krb5__ccache__kcm.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/krb5/files/patch-lib__krb5__ccache__kcm.c Thu Oct 16 19:44:22 2014 (r371019) @@ -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; Modified: head/security/krb5/pkg-plist ============================================================================== --- head/security/krb5/pkg-plist Thu Oct 16 19:44:14 2014 (r371018) +++ head/security/krb5/pkg-plist Thu Oct 16 19:44:22 2014 (r371019) @@ -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. @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. @dirrm include/krb5 @dirrm include/kadm5 @dirrm share/et -@dirrmtry share/gnats @dirrm share/examples/krb5
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410161944.s9GJiMJU040608>