aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcy <cy@FreeBSD.org>2013-04-17 08:41:37 +0800
committercy <cy@FreeBSD.org>2013-04-17 08:41:37 +0800
commitdaec60b10971d62bc2c574ec53a939e8415f3991 (patch)
treef10862a4c94f797c780a5222fbd9976a1895ccdb
parentbedfa10f82819630369aec3754049d52cd556bf5 (diff)
downloadfreebsd-ports-gnome-daec60b10971d62bc2c574ec53a939e8415f3991.tar.gz
freebsd-ports-gnome-daec60b10971d62bc2c574ec53a939e8415f3991.tar.zst
freebsd-ports-gnome-daec60b10971d62bc2c574ec53a939e8415f3991.zip
Update 1.11.1 --> 1.11.2
Major changes in 1.11.2 (2013-04-12) ==================================== This is a bugfix release. * Incremental propagation could erroneously act as if a slave's database were current after the slave received a full dump that failed to load. * gss_import_sec_context incorrectly set internal state that identifies whether an imported context is from an interposer mechanism or from the underlying mechanism. Feature safe: yes
-rw-r--r--security/krb5/Makefile5
-rw-r--r--security/krb5/distinfo4
-rw-r--r--security/krb5/files/patch-kadmin-dbutil-dump.c23
3 files changed, 4 insertions, 28 deletions
diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index 4237e7b56a0b..473468d3a310 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= krb5
-PORTVERSION= 1.11.1
-PORTREVISION= 1
+PORTVERSION= 1.11.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//}/
DISTNAME= ${PORTNAME}-${PORTVERSION}-signed
@@ -56,7 +55,7 @@ CONFIGURE_ARGS+= --enable-dns-for-realm
.include "${PORTSDIR}/Mk/bsd.openssl.mk"
-MAN1= k5srvutil.1 kadmin.1 krb5-send-pr.1 \
+MAN1= k5srvutil.1 kadmin.1 krb5-config.1 krb5-send-pr.1 \
kpasswd.1 klist.1 kinit.1 kdestroy.1 kswitch.1 ksu.1 \
ktutil.1 \
sclient.1 kvno.1 compile_et.1
diff --git a/security/krb5/distinfo b/security/krb5/distinfo
index 087efeaf1095..d150cb50ecb6 100644
--- a/security/krb5/distinfo
+++ b/security/krb5/distinfo
@@ -1,2 +1,2 @@
-SHA256 (krb5-1.11.1-signed.tar) = 3a230ff6a7f8775752292e9303d3fa8a801a353301bc24d80b860d99f9d20768
-SIZE (krb5-1.11.1-signed.tar) = 11663360
+SHA256 (krb5-1.11.2-signed.tar) = f0373295fb320b9702468eb0df33397e7278326ec1681a8c6037cc53cb0120a5
+SIZE (krb5-1.11.2-signed.tar) = 11673600
diff --git a/security/krb5/files/patch-kadmin-dbutil-dump.c b/security/krb5/files/patch-kadmin-dbutil-dump.c
deleted file mode 100644
index 8fc6623ab414..000000000000
--- a/security/krb5/files/patch-kadmin-dbutil-dump.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- kadmin/dbutil/dump.c.orig 2013-02-21 15:23:19.000000000 -0800
-+++ kadmin/dbutil/dump.c 2013-03-05 08:01:25.046422435 -0800
-@@ -2973,6 +2973,20 @@
- */
- if (!(flags & FLAG_UPDATE)) {
- if (exit_status) {
-+
-+ /* Re-init ulog so we don't accidentally think we are current */
-+ if (log_ctx && log_ctx->iproprole) {
-+ log_ctx->ulog->kdb_last_sno = 0;
-+ log_ctx->ulog->kdb_last_time.seconds = 0;
-+ log_ctx->ulog->kdb_last_time.useconds = 0;
-+
-+ log_ctx->ulog->kdb_first_sno = 0;
-+ log_ctx->ulog->kdb_first_time.seconds = 0;
-+ log_ctx->ulog->kdb_first_time.useconds = 0;
-+
-+ ulog_sync_header(log_ctx->ulog);
-+ }
-+
- kret = krb5_db_destroy(kcontext, db5util_db_args);
- /*
- * Ignore a not supported error since there is nothing to do about