Bug#887695: nfs-utils: diff for NMU version 1:1.3.4-2.2
Control: tags 887695 + pending
Dear maintainer,
I've prepared an NMU for nfs-utils (versioned as 1:1.3.4-2.2) and
uploaded it to DELAYED/15. Please feel free to tell me if I should
cancel it.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
diff -Nru nfs-utils-1.3.4/debian/changelog nfs-utils-1.3.4/debian/changelog
--- nfs-utils-1.3.4/debian/changelog 2017-03-20 17:07:55.000000000 +0200
+++ nfs-utils-1.3.4/debian/changelog 2018-02-06 21:20:36.000000000 +0200
@@ -1,3 +1,14 @@
+nfs-utils (1:1.3.4-2.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add upstream fix for FTBFS with glibc 2.26,
+ thanks to Juhani Numminen. (Closes: #887695)
+ * Update the build dependency from the obsolete dh-systemd.
+ * Stop using bzip2 for source compression,
+ the default xz compresses better.
+
+ -- Adrian Bunk <bunk@debian.org> Tue, 06 Feb 2018 21:20:36 +0200
+
nfs-utils (1:1.3.4-2.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru nfs-utils-1.3.4/debian/control nfs-utils-1.3.4/debian/control
--- nfs-utils-1.3.4/debian/control 2016-12-15 15:30:00.000000000 +0200
+++ nfs-utils-1.3.4/debian/control 2018-02-06 21:20:36.000000000 +0200
@@ -3,7 +3,7 @@
Section: net
Maintainer: Debian kernel team <debian-kernel@lists.debian.org>
Uploaders: Anibal Monsalve Salazar <anibal@debian.org>, Ben Hutchings <ben@decadent.org.uk>, Steve Langasek <vorlon@debian.org>, Daniel Pocock <pocock@debian.org>
-Build-Depends: debhelper (>= 7), libwrap0-dev, libevent-dev, libnfsidmap-dev (>= 0.24), libkrb5-dev, libblkid-dev, libkeyutils-dev, pkg-config, libldap2-dev, libcap-dev, libtirpc-dev (>= 0.2.4-2~), libdevmapper-dev, dh-autoreconf, libmount-dev, libsqlite3-dev, dh-systemd
+Build-Depends: debhelper (>= 9.20160709), libwrap0-dev, libevent-dev, libnfsidmap-dev (>= 0.24), libkrb5-dev, libblkid-dev, libkeyutils-dev, pkg-config, libldap2-dev, libcap-dev, libtirpc-dev (>= 0.2.4-2~), libdevmapper-dev, dh-autoreconf, libmount-dev, libsqlite3-dev
Standards-Version: 3.9.8
Homepage: http://linux-nfs.org/
Vcs-Git: git://anonscm.debian.org/collab-maint/nfs-utils.git
diff -Nru nfs-utils-1.3.4/debian/gbp.conf nfs-utils-1.3.4/debian/gbp.conf
--- nfs-utils-1.3.4/debian/gbp.conf 2016-12-15 15:30:00.000000000 +0200
+++ nfs-utils-1.3.4/debian/gbp.conf 2018-02-06 21:20:36.000000000 +0200
@@ -6,4 +6,3 @@
# Options only affecting git-buildpackage
[git-buildpackage]
sign-tags = True
-compression = bzip2
diff -Nru nfs-utils-1.3.4/debian/patches/0001-rpc.c-added-include-file-so-UINT16_MAX-is-defined.patch nfs-utils-1.3.4/debian/patches/0001-rpc.c-added-include-file-so-UINT16_MAX-is-defined.patch
--- nfs-utils-1.3.4/debian/patches/0001-rpc.c-added-include-file-so-UINT16_MAX-is-defined.patch 1970-01-01 02:00:00.000000000 +0200
+++ nfs-utils-1.3.4/debian/patches/0001-rpc.c-added-include-file-so-UINT16_MAX-is-defined.patch 2018-02-06 21:19:05.000000000 +0200
@@ -0,0 +1,25 @@
+From ba03a02c2fd912f370e1f55de921a403bf5f9247 Mon Sep 17 00:00:00 2001
+From: Steve Dickson <steved@redhat.com>
+Date: Thu, 22 Jun 2017 12:56:41 -0400
+Subject: rpc.c: added include file so UINT16_MAX is defined.
+
+Signed-off-by: Steve Dickson <steved@redhat.com>
+---
+ support/nsm/rpc.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/support/nsm/rpc.c b/support/nsm/rpc.c
+index 4e5f40e..0a8e56f 100644
+--- a/support/nsm/rpc.c
++++ b/support/nsm/rpc.c
+@@ -38,6 +38,7 @@
+ #include <sys/socket.h>
+ #include <sys/time.h>
+
++#include <stdint.h>
+ #include <time.h>
+ #include <stdbool.h>
+ #include <string.h>
+--
+2.11.0
+
diff -Nru nfs-utils-1.3.4/debian/patches/series nfs-utils-1.3.4/debian/patches/series
--- nfs-utils-1.3.4/debian/patches/series 2016-12-17 12:47:35.000000000 +0200
+++ nfs-utils-1.3.4/debian/patches/series 2018-02-06 21:20:34.000000000 +0200
@@ -10,3 +10,4 @@
unbreak-gssd-rpc_pipefs-run.patch
28-nfs-utils_env-location.patch
29-start-statd-fd-9.patch
+0001-rpc.c-added-include-file-so-UINT16_MAX-is-defined.patch
diff -Nru nfs-utils-1.3.4/debian/source/options nfs-utils-1.3.4/debian/source/options
--- nfs-utils-1.3.4/debian/source/options 2016-12-15 15:30:00.000000000 +0200
+++ nfs-utils-1.3.4/debian/source/options 2018-02-06 21:20:36.000000000 +0200
@@ -1,3 +1 @@
-compression = "bzip2"
-compression-level = 9
extend-diff-ignore = "(^|/)(config.sub|config.guess|Makefile.in|configure|config.log|aclocal.m4|ltmain.sh|aclocal/libtool.m4)$"
Reply to: