Merge the uploaded changes and update the version for the open changelog entry.
-nfs-utils (1:1.2.8-7) UNRELEASED; urgency=medium
+nfs-utils (1:1.2.8-10) UNRELEASED; urgency=medium
* Update debian/watch
-- Ben Hutchings <ben@decadent.org.uk> Mon, 23 Mar 2015 16:33:59 +0000
+nfs-utils (1:1.2.8-9) unstable; urgency=medium
+
+ * debian/patches/22-mountd-fix-segfault-in-add_name-with-newer-gcc-
+ compi.patch: cherry-pick fix from upstream for a segfault in
+ add_name with newer gcc compilers. Closes: #757835, LP: #1355829.
+
+ -- Steve Langasek <vorlon@debian.org> Tue, 12 Aug 2014 17:12:38 -0700
+
+nfs-utils (1:1.2.8-8) unstable; urgency=medium
+
+ * Upload to unstable where this belongs.
+ * libtirpc versioning against 0.2.4, not 0.2.4-2.
+ * Drop versioned dependency on rpcbind; nothing in the rpcbind relationship
+ requires this.
+
+ -- Steve Langasek <vorlon@debian.org> Mon, 11 Aug 2014 00:20:32 -0700
+
+nfs-utils (1:1.2.8-7) experimental; urgency=medium
+
+ * Get rid of libgssglue1.
+ Don't pass "--with-gssglue" to ./configure.
+ Build-depend on libtirpc-dev (>= 0.2.4-2~).
+ Depend on libtirpc1 (>= 0.2.4-2~).
+ Depend on rpcbind (>= 0.2.1-5~).
+ * Remove debian/source/options.
+
+ -- Anibal Monsalve Salazar <anibal@debian.org> Sat, 02 Aug 2014 12:25:47 +0100
+
nfs-utils (1:1.2.8-6) unstable; urgency=medium
* Fix the sec=krb5* handling in debian/nfs-common.init to properly match
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>
-Build-Depends: debhelper (>= 7), libwrap0-dev, libevent-dev, libnfsidmap-dev (>= 0.24), libkrb5-dev, libgssglue-dev (>= 0.3), libblkid-dev, libkeyutils-dev, pkg-config, libldap2-dev, libcap-dev, libtirpc-dev, libdevmapper-dev, dh-autoreconf, libmount-dev, libsqlite3-dev
+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
Standards-Version: 3.9.0
Homepage: http://nfs.sourceforge.net/
Vcs-Git: git://git.debian.org/kernel/nfs-utils.git
Package: nfs-kernel-server
Priority: optional
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, nfs-common (= ${binary:Version}), ucf, lsb-base (>= 1.3-9ubuntu3)
+Depends: ${shlibs:Depends}, ${misc:Depends}, nfs-common (= ${binary:Version}), ucf, lsb-base (>= 1.3-9ubuntu3), libtirpc1 (>= 0.2.4)
Provides: knfs, nfs-server
Conflicts: knfs, nfs-server
Replaces: knfs, nfs-server
Package: nfs-common
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, rpcbind, adduser, ucf, lsb-base (>= 1.3-9ubuntu3), initscripts (>= 2.88dsf-13.3)
+Depends: ${shlibs:Depends}, ${misc:Depends}, rpcbind, adduser, ucf, lsb-base (>= 1.3-9ubuntu3), initscripts (>= 2.88dsf-13.3), libtirpc1 (>= 0.2.4)
Recommends: python
Suggests: open-iscsi, watchdog
Provides: nfs-client
--- /dev/null
+From 8b03fdbfb0dd8e0147aa61ff30b8311235caf5f3 Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@poochiereds.net>
+Date: Thu, 1 May 2014 11:15:16 -0400
+Subject: [PATCH] mountd: fix segfault in add_name with newer gcc compilers
+Bug-Debian: http://bugs.debian.org/757835
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+bug/1355829
+
+I hit a segfault in add_name with a mountd built with gcc-4.9.0. Some
+NULL pointer checks got reordered such that a pointer was dereferenced
+before checking to see whether it was NULL. The problem was due to
+nfs-utils relying on undefined behavior, which tricked gcc into assuming
+that the pointer would never be NULL.
+
+At first I assumed that this was a compiler bug, but Jakub Jelinek and
+Jeff Law pointed out:
+
+"If old is NULL, then:
+
+ strncpy(new, old, cp-old);
+
+is undefined behavior (even when cp == old == NULL in that case),
+therefore gcc assumes that old is never NULL, as otherwise it would be
+invalid.
+
+Just guard
+ strncpy(new, old, cp-old);
+ new[cp-old] = 0;
+with if (old) { ... }."
+
+This patch does that. If old is NULL though, then we still need to
+ensure that new is NULL terminated, lest the subsequent strcats walk off
+the end of it.
+
+Cc: Jeff Law <law@redhat.com>
+Cc: Jakub Jelinek <jakub@redhat.com>
+Signed-off-by: Jeff Layton <jlayton@poochiereds.net>
+Signed-off-by: Steve Dickson <steved@redhat.com>
+---
+ support/export/client.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/support/export/client.c b/support/export/client.c
+index ba2db8f..e749cac 100644
+--- a/support/export/client.c
++++ b/support/export/client.c
+@@ -482,8 +482,12 @@ add_name(char *old, const char *add)
+ else
+ cp = cp + strlen(cp);
+ }
+- strncpy(new, old, cp-old);
+- new[cp-old] = 0;
++ if (old) {
++ strncpy(new, old, cp-old);
++ new[cp-old] = 0;
++ } else {
++ new[0] = 0;
++ }
+ if (cp != old && !*cp)
+ strcat(new, ",");
+ strcat(new, add);
+--
+2.1.0.rc1
+
17-multiarch-kerberos-paths.patch
19-iscsiadm-path.patch
20-remove-autogenerated-man.patch
+22-mountd-fix-segfault-in-add_name-with-newer-gcc-compi.patch
--enable-nfsv41 \
--enable-ipv6 \
--enable-libmount-mount \
- --with-gssglue \
--with-tcp-wrappers
$(MAKE) $(MAKEFLAGS)
touch build-stamp
projects / nfs-utils.git / commitdiff