Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package krb5 krb5_1.12.1+dfsg-11 in jessie is the first version which contains systemd unit files. That version had a typo in the EnvironmentFile name for krb5-kdc, which means that any DAEMON_ARGS the user specified via debconf will not be applied when systemd is being used. Additionally, updates to kfreebsd-headers-10.1 since the previous upload caused the -12 package to FTBFS on kfreebsd-*, so I have included that fix (from upstream) in the -13 for which I reques the unblock. The -12 included an unrelated change which does not meet the jessie freeze criteria (adding an ExecReload to krb5-kdc.service) which was removed for the -13; my apologies for the extra noise in the diff. The attached debdiff between the -11 and -13 was passed through filterdiff -x krb5-1.12.1+dfsg/debian/.git-dpm unblock krb5/1.12.1+dfsg-13 -- 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-06 18:08:50.000000000 -0500 @@ -1,3 +1,19 @@ +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 <ka...@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 <ka...@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-06 17:58:00.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-06 17:58:01.000000000 -0500 @@ -22,3 +22,4 @@ 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 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-06 17:58:01.000000000 -0500 @@ -0,0 +1,40 @@ +From d7fed85eab3ce61671a257c4f620e6d494206fb9 Mon Sep 17 00:00:00 2001 +From: Ben Kaduk <ka...@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
