From: Andreas Henriksson Date: Thu, 11 Aug 2016 16:50:24 +0000 (+0200) Subject: Import Debian patch 1:1.2.8-9.2 X-Git-Tag: debian/1%1.2.8-9.2^0 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=45e5820959ae49256747cae78f0d18d0ca61bb06;p=nfs-utils.git Import Debian patch 1:1.2.8-9.2 --- diff --git a/debian/changelog b/debian/changelog index 05a2cce..51b9adb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +nfs-utils (1:1.2.8-9.2) unstable; urgency=medium + + * Non-maintainer upload. + * Really add keyutils as a dependency of nfs-common. (Closes: #830777) + - changelog entry included but actual change missed when partially + merging the ubuntu delta in previous NMU. + * Add debian/patches/unbreak-blkmapd-rpc_pipefs-run.patch (Closes: #828826) + - patch from Christoph Hellwig to unbreak blkmapd after move of + rpc_pipefs to /run. + * Add debian/patches/unbreak-gssd-rpc_pipefs-run.patch (Closes: #632141) + - similarly to blkmapd also unbreak gssd. Thanks to Christoph Hellwig + for pointing this out. + + -- Andreas Henriksson Thu, 11 Aug 2016 18:50:24 +0200 + nfs-utils (1:1.2.8-9.1) unstable; urgency=medium Partial sync from ubuntu, included changes: diff --git a/debian/control b/debian/control index f98ea5d..aef1f0d 100644 --- a/debian/control +++ b/debian/control @@ -32,7 +32,7 @@ Homepage: http://nfs.sourceforge.net/ Package: nfs-common Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, rpcbind, adduser, ucf, lsb-base (>= 1.3-9ubuntu3), libtirpc1 (>= 0.2.4) +Depends: ${shlibs:Depends}, ${misc:Depends}, rpcbind, adduser, ucf, lsb-base (>= 1.3-9ubuntu3), libtirpc1 (>= 0.2.4), keyutils Recommends: python Suggests: open-iscsi, watchdog Provides: nfs-client diff --git a/debian/patches/series b/debian/patches/series index 2211877..235c889 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -15,3 +15,5 @@ 25-systemd-daemon-paths.patch 26-systemd-server-before-client.patch 27-systemd-enable-with-systemctl-statd.patch +unbreak-blkmapd-rpc_pipefs-run.patch +unbreak-gssd-rpc_pipefs-run.patch diff --git a/debian/patches/unbreak-blkmapd-rpc_pipefs-run.patch b/debian/patches/unbreak-blkmapd-rpc_pipefs-run.patch new file mode 100644 index 0000000..2e73b81 --- /dev/null +++ b/debian/patches/unbreak-blkmapd-rpc_pipefs-run.patch @@ -0,0 +1,28 @@ +From: Christoph Hellwig +Subject: nfs-common: move of rpc_pipefs mountpoint to /run breaks blkmapd + +commit ba649fa4 ("Migrate the rpc_pipefs mount out of /var/lib to /run, to +better support /var on NFS.") in the Debian packaging repo completely +broke blkmapd, which still looks for rpc_pipefs in the old place. +From looking in the BTS gssd also seems to have the same problem (#632141). + +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=828826 + +diff --git a/utils/blkmapd/device-discovery.c b/utils/blkmapd/device-discovery.c +index 69f00fa..7b00c90 100644 +--- a/utils/blkmapd/device-discovery.c ++++ b/utils/blkmapd/device-discovery.c +@@ -55,9 +55,9 @@ + #define EVENT_SIZE (sizeof(struct inotify_event)) + #define EVENT_BUFSIZE (1024 * EVENT_SIZE) + +-#define BL_PIPE_FILE "/var/lib/nfs/rpc_pipefs/nfs/blocklayout" +-#define NFSPIPE_DIR "/var/lib/nfs/rpc_pipefs/nfs" +-#define RPCPIPE_DIR "/var/lib/nfs/rpc_pipefs" ++#define BL_PIPE_FILE "/run/rpc_pipefs/nfs/blocklayout" ++#define NFSPIPE_DIR "/run/rpc_pipefs/nfs" ++#define RPCPIPE_DIR "/run/rpc_pipefs" + #define PID_FILE "/run/blkmapd.pid" + + struct bl_disk *visible_disk_list; + diff --git a/debian/patches/unbreak-gssd-rpc_pipefs-run.patch b/debian/patches/unbreak-gssd-rpc_pipefs-run.patch new file mode 100644 index 0000000..bdf273f --- /dev/null +++ b/debian/patches/unbreak-gssd-rpc_pipefs-run.patch @@ -0,0 +1,19 @@ +From: Andreas Henriksson +Subject: move of rpc_pipefs mountpoint to /run breaks gssd + +This is a followup patch for gssd also needing to know about the new +rpc_pipefs location, as mentioned in https://bugs.debian.org/828826 + +Bug-Debian: https://bugs.debian.org/632141 + +--- a/utils/gssd/gssd.h ++++ b/utils/gssd/gssd.h +@@ -38,7 +38,7 @@ + #define MAX_FILE_NAMELEN 32 + #define FD_ALLOC_BLOCK 256 + #ifndef GSSD_PIPEFS_DIR +-#define GSSD_PIPEFS_DIR "/var/lib/nfs/rpc_pipefs" ++#define GSSD_PIPEFS_DIR "/run/rpc_pipefs" + #endif + #define INFO "info" + #define KRB5 "krb5"