Bug#769363: unblock: krb5/1.12.1+dfsg-14
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package krb5
An unblock was granted for krb5/1.12.1+dfsg-13 (#768385) to
fix a typo in the krb5-kdc EnvironmentFile and fix a FTBFS on
kfreebsd, however, the kfreebsd fix was incomplete.
The -14 was upladed with the full kfreebsd build fix (and the
buildds confirm that it builds).
The EnvironmentFile issue is #768344 and the kfreebsd build fix
is #769379. My apologies for the other noise in the changelog.
The attached debdiff between the -11 and the -14 was passed through
filterdiff -x krb5-1.12.1+dfsg/debian/.git-dpm
unblock krb5/1.12.1+dfsg-14
-- System Information:
Debian Release: jessie/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.14-2-amd64 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru krb5-1.12.1+dfsg/debian/changelog krb5-1.12.1+dfsg/debian/changelog
--- krb5-1.12.1+dfsg/debian/changelog 2014-10-21 09:17:32.000000000 -0400
+++ krb5-1.12.1+dfsg/debian/changelog 2014-11-07 13:17:43.000000000 -0500
@@ -1,3 +1,27 @@
+krb5 (1.12.1+dfsg-14) unstable; urgency=medium
+
+ * The upstream patch in 1.12.1+dfsg-13 was incomplete; pull in
+ another upstream patch upon which it depended, to fix the
+ kfreebsd build, Closes: #768379
+
+ -- Benjamin Kaduk <kaduk@mit.edu> Fri, 07 Nov 2014 13:17:36 -0500
+
+krb5 (1.12.1+dfsg-13) unstable; urgency=medium
+
+ * Remove the ExecReload line added in 1.12.1+dfsg-12; it is not
+ a regression from the SysV init script and therefore not suitable
+ for jessie post-freeze
+ * Apply upstream patch to fix build on FreeBSD 10.1, Closes: #768379
+
+ -- Benjamin Kaduk <kaduk@mit.edu> Thu, 06 Nov 2014 18:08:26 -0500
+
+krb5 (1.12.1+dfsg-12) unstable; urgency=medium
+
+ * Fix typo in krb5-kdc EnvironmentFile name, Closes: #768344
+ * Add an ExecReload line to krb5-kdc.service to help with log rotation
+
+ -- Benjamin Kaduk <kaduk@mit.edu> Thu, 06 Nov 2014 15:30:44 -0500
+
krb5 (1.12.1+dfsg-11) unstable; urgency=medium
* Provide systemd service units for krb5-kdc, Partially affects: #734161
diff -Nru krb5-1.12.1+dfsg/debian/.git-dpm krb5-1.12.1+dfsg/debian/.git-dpm
diff -Nru krb5-1.12.1+dfsg/debian/krb5-kdc.service krb5-1.12.1+dfsg/debian/krb5-kdc.service
--- krb5-1.12.1+dfsg/debian/krb5-kdc.service 2014-10-21 09:17:32.000000000 -0400
+++ krb5-1.12.1+dfsg/debian/krb5-kdc.service 2014-11-07 13:15:18.000000000 -0500
@@ -6,7 +6,7 @@
Type=forking
PIDFile=/var/run/krb5-kdc.pid
ExecReload=/bin/kill -HUP $MAINPID
-EnvironmentFile=-/etc/default/-krb5-kdc
+EnvironmentFile=-/etc/default/krb5-kdc
ExecStart=/usr/sbin/krb5kdc -P /var/run/krb5-kdc.pid $DAEMON_ARGS
InaccessibleDirectories=/etc/ssh /etc/ssl/private /root
ReadOnlyDirectories=/
diff -Nru krb5-1.12.1+dfsg/debian/patches/series krb5-1.12.1+dfsg/debian/patches/series
--- krb5-1.12.1+dfsg/debian/patches/series 2014-10-21 09:17:32.000000000 -0400
+++ krb5-1.12.1+dfsg/debian/patches/series 2014-11-07 13:15:18.000000000 -0500
@@ -22,3 +22,5 @@
debian-local/0022-Fix-krb5-config-paths.patch
debian-local/0023-Use-isystem-for-include-paths.patch
upstream/0024-Return-only-new-keys-in-randkey-CVE-2014-5351.patch
+upstream/0025-Fix-build-on-systems-without-RTM_OLD.patch
+upstream/0026-Remove-rtm_type_name.patch
diff -Nru krb5-1.12.1+dfsg/debian/patches/upstream/0025-Fix-build-on-systems-without-RTM_OLD.patch krb5-1.12.1+dfsg/debian/patches/upstream/0025-Fix-build-on-systems-without-RTM_OLD.patch
--- krb5-1.12.1+dfsg/debian/patches/upstream/0025-Fix-build-on-systems-without-RTM_OLD.patch 1969-12-31 19:00:00.000000000 -0500
+++ krb5-1.12.1+dfsg/debian/patches/upstream/0025-Fix-build-on-systems-without-RTM_OLD.patch 2014-11-07 13:15:18.000000000 -0500
@@ -0,0 +1,40 @@
+From d7fed85eab3ce61671a257c4f620e6d494206fb9 Mon Sep 17 00:00:00 2001
+From: Ben Kaduk <kaduk@mit.edu>
+Date: Thu, 3 Jul 2014 10:42:21 -0400
+Subject: Fix build on systems without RTM_OLD*
+
+For example, FreeBSD has removed RTM_OLDADD and RTM_OLDDEL from its API
+in March 2014, with the message:
+Garbage collect long time obsoleted (or never used) stuff from routing API
+
+Only attempt to define behavior for these cases if they are defined.
+
+(cherry picked from commit fd352d41a79013114708e99510b6be3836200237)
+
+ticket: 7955
+version_fixed: 1.12.2
+status: resolved
+
+(cherry picked from commit 37f87c189ff050c01282f3d8da7bc97fe8a9ea92)
+Patch-Category: upstream
+---
+ src/lib/apputils/net-server.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/lib/apputils/net-server.c b/src/lib/apputils/net-server.c
+index 7780b8a..331b857 100644
+--- a/src/lib/apputils/net-server.c
++++ b/src/lib/apputils/net-server.c
+@@ -1026,8 +1026,12 @@ routing_update_needed(struct rt_msghdr *rtm)
+ case RTM_NEWADDR:
+ case RTM_DELADDR:
+ case RTM_IFINFO:
++#ifdef RTM_OLDADD
+ case RTM_OLDADD:
++#endif
++#ifdef RTM_OLDDEL
+ case RTM_OLDDEL:
++#endif
+ /*
+ * Some flags indicate routing table updates that don't
+ * indicate local address changes. They may come from
diff -Nru krb5-1.12.1+dfsg/debian/patches/upstream/0026-Remove-rtm_type_name.patch krb5-1.12.1+dfsg/debian/patches/upstream/0026-Remove-rtm_type_name.patch
--- krb5-1.12.1+dfsg/debian/patches/upstream/0026-Remove-rtm_type_name.patch 1969-12-31 19:00:00.000000000 -0500
+++ krb5-1.12.1+dfsg/debian/patches/upstream/0026-Remove-rtm_type_name.patch 2014-11-07 13:15:18.000000000 -0500
@@ -0,0 +1,79 @@
+From 69fa1fe36396c1f370c0dd91ca6de5ebd92c8601 Mon Sep 17 00:00:00 2001
+From: Ben Kaduk <kaduk@mit.edu>
+Date: Fri, 1 Nov 2013 15:12:33 -0400
+Subject: Remove rtm_type_name()
+
+It has been unused since 2009 when Ken decided that the routing log
+messages were too verbose (commit 91fc077c96926dd60).
+
+(cherry picked from commit bcc91c8d8b3d5b775cfde1ee461d7e0394070852)
+
+There was a slight conflict because commit
+3a8eaa43045fb242739ad9729bb66f915be209b9 had #if 0'd this function, but
+that commit is too large for the current purpose.
+
+Patch-Category: upstream
+---
+ src/lib/apputils/net-server.c | 35 -----------------------------------
+ 1 file changed, 35 deletions(-)
+
+diff --git a/src/lib/apputils/net-server.c b/src/lib/apputils/net-server.c
+index 331b857..ccb6c77 100644
+--- a/src/lib/apputils/net-server.c
++++ b/src/lib/apputils/net-server.c
+@@ -983,30 +983,6 @@ setup_udp_port(void *P_data, struct sockaddr *addr)
+ #ifdef HAVE_STRUCT_RT_MSGHDR
+ #include <net/route.h>
+
+-static char *
+-rtm_type_name(int type)
+-{
+- switch (type) {
+- case RTM_ADD: return "RTM_ADD";
+- case RTM_DELETE: return "RTM_DELETE";
+- case RTM_NEWADDR: return "RTM_NEWADDR";
+- case RTM_DELADDR: return "RTM_DELADDR";
+- case RTM_IFINFO: return "RTM_IFINFO";
+- case RTM_OLDADD: return "RTM_OLDADD";
+- case RTM_OLDDEL: return "RTM_OLDDEL";
+- case RTM_RESOLVE: return "RTM_RESOLVE";
+-#ifdef RTM_NEWMADDR
+- case RTM_NEWMADDR: return "RTM_NEWMADDR";
+- case RTM_DELMADDR: return "RTM_DELMADDR";
+-#endif
+- case RTM_MISS: return "RTM_MISS";
+- case RTM_REDIRECT: return "RTM_REDIRECT";
+- case RTM_LOSING: return "RTM_LOSING";
+- case RTM_GET: return "RTM_GET";
+- default: return "?";
+- }
+-}
+-
+ static void
+ do_network_reconfig(verto_ctx *ctx, verto_ev *ev)
+ {
+@@ -1056,11 +1032,6 @@ routing_update_needed(struct rt_msghdr *rtm)
+ if (rtm->rtm_flags & RTF_LLINFO)
+ break;
+ #endif
+-#if 0
+- krb5_klog_syslog(LOG_DEBUG,
+- "network reconfiguration message (%s) received",
+- rtm_type_name(rtm->rtm_type));
+-#endif
+ return 1;
+ case RTM_RESOLVE:
+ #ifdef RTM_NEWMADDR
+@@ -1117,12 +1088,6 @@ process_routing_update(verto_ctx *ctx, verto_ev *ev)
+ return;
+ }
+ }
+-#if 0
+- krb5_klog_syslog(LOG_INFO,
+- _("got routing msg type %d(%s) v%d"),
+- rtm.rtm_type, rtm_type_name(rtm.rtm_type),
+- rtm.rtm_version);
+-#endif
+ if (rtm.rtm_msglen > sizeof(rtm)) {
+ /* It appears we get a partial message and the rest is
+ thrown away? */
Reply to: