diffstat of debian/ for nfs-utils_1.2.6-3 nfs-utils_1.2.8-SprezzOS1 changelog | 19 ++++++++++ control | 9 +++-- nfs-common.install | 1 patches/11-532048-reduce-verbosity.patch | 55 ------------------------------- patches/18-osd_login-sbindir.patch | 39 --------------------- patches/series | 2 - rules | 4 +- watch | 2 - 8 files changed, 30 insertions(+), 101 deletions(-) --- nfs-utils-1.2.6/debian/changelog 2012-07-10 17:42:42.000000000 +0000 +++ nfs-utils-1.2.8/debian/changelog 2013-04-24 09:18:01.000000000 +0000 @@ -1,3 +1,22 @@ +nfs-utils (1:1.2.8-SprezzOS1) unstable; urgency=low + + * New upstream + + -- Nick Black Wed, 24 Apr 2013 05:12:20 -0400 + +nfs-utils (1:1.2.7-SprezzOS1) unstable; urgency=low + + * New upstream 1.2.7 (2012-11-11) + + -- nick black Mon, 12 Nov 2012 01:11:13 -0500 + +nfs-utils (1:1.2.6-SprezzOS1) unstable; urgency=low + + * SprezzOS build + * Purge libwrap dep + + -- nick black Tue, 02 Oct 2012 07:55:31 -0400 + nfs-utils (1:1.2.6-3) unstable; urgency=low * Iterate through exports.d to look for expors (Closes: #676604). --- nfs-utils-1.2.6/debian/control 2012-07-10 17:42:42.000000000 +0000 +++ nfs-utils-1.2.8/debian/control 2013-04-24 09:18:01.000000000 +0000 @@ -1,9 +1,14 @@ Source: nfs-utils Priority: standard Section: net -Maintainer: Debian kernel team +Maintainer: Nick Black +XSBC-Original-Maintainer: Debian kernel team Uploaders: Anibal Monsalve Salazar , Ben Hutchings , Luk Claes -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 +Build-Depends: debhelper (>= 7), 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 Standards-Version: 3.9.0 Homepage: http://nfs.sourceforge.net/ Vcs-Git: git://git.debian.org/kernel/nfs-utils.git --- nfs-utils-1.2.6/debian/nfs-common.install 2012-07-10 17:42:42.000000000 +0000 +++ nfs-utils-1.2.8/debian/nfs-common.install 2013-04-24 09:18:01.000000000 +0000 @@ -7,6 +7,7 @@ debian/tmp/usr/sbin/rpc.statd sbin/ debian/tmp/usr/sbin/sm-notify sbin/ debian/tmp/usr/sbin/showmount sbin/ +debian/tmp/usr/sbin/nfsdcltrack debian/tmp/usr/sbin/nfsstat debian/tmp/usr/sbin/nfsidmap debian/tmp/usr/sbin/start-statd --- nfs-utils-1.2.6/debian/patches/11-532048-reduce-verbosity.patch 2012-07-10 17:42:42.000000000 +0000 +++ nfs-utils-1.2.8/debian/patches/11-532048-reduce-verbosity.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=532048 - -The nfs-utils package in Ubuntu has been patched to reduce the default log -verbosity in the case of expired Kerberos credentials, for the reasons -described here: - -https://bugs.launchpad.net/ubuntu/+source/nfs-utils/+bug/293705 - -Please consider applying the attached patch to Debian as well. - -Andrew Pollock said he was submitting this patch upstream, but there doesn't -seem to be any evidence that it's been included yet in 1.2.0. - -Steve Langasek - ---- a/utils/gssd/gssd_proc.c 2010-02-18 23:35:00.000000000 +1100 -+++ b/utils/gssd/gssd_proc.c 2010-04-06 16:43:55.000000000 +1000 -@@ -638,7 +638,7 @@ do_error_downcall(int k5_fd, uid_t uid, - unsigned int timeout = 0; - int zero = 0; - -- printerr(1, "doing error downcall\n"); -+ printerr(2, "doing error downcall\n"); - - if (WRITE_BYTES(&p, end, uid)) goto out_err; - if (WRITE_BYTES(&p, end, timeout)) goto out_err; -@@ -906,7 +906,7 @@ process_krb5_upcall(struct clnt_info *cl - int create_resp = -1; - int err, downcall_err = -EACCES; - -- printerr(1, "handling krb5 upcall (%s)\n", clp->dirname); -+ printerr(2, "handling krb5 upcall (%s)\n", clp->dirname); - - if (tgtname) { - if (clp->servicename) { -@@ -1066,7 +1066,7 @@ process_spkm3_upcall(struct clnt_info *c - } - - if (!authgss_get_private_data(auth, &pd)) { -- printerr(1, "WARNING: Failed to obtain authentication " -+ printerr(2, "WARNING: Failed to obtain authentication " - "data for user with uid %d for server %s\n", - uid, clp->servername); - goto out_return_error; ---- a/utils/gssd/gss_util.c 2010-02-18 23:35:00.000000000 +1100 -+++ b/utils/gssd/gss_util.c 2010-04-06 16:43:55.000000000 +1000 -@@ -126,7 +126,7 @@ display_status_1(char *m, u_int32_t code - "gss_display_status called from %s\n", m); - break; - } else { -- printerr(0, "ERROR: GSS-API: (%s) error in %s(): %s\n", -+ printerr(2, "ERROR: GSS-API: (%s) error in %s(): %s\n", - typestr, m, (char *)msg.value); - } - --- nfs-utils-1.2.6/debian/patches/18-osd_login-sbindir.patch 2012-07-10 17:42:42.000000000 +0000 +++ nfs-utils-1.2.8/debian/patches/18-osd_login-sbindir.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -From d4d392087f8ee049ed8f476e5ae780cbc0d0012a Mon Sep 17 00:00:00 2001 -From: NeilBrown -Date: Thu, 17 May 2012 08:14:57 -0400 -Subject: [PATCH] osd_login - ensure /sbin is created before installation. - -If we use a more standard approach to describing the osd_login -script, the automake infrastructure will create /sbin before -attempting installation. -This is important for: make DESTDIR=/empty-dir install - -Signed-off-by: NeilBrown -Signed-off-by: Steve Dickson ---- - utils/osd_login/Makefile.am | 11 ++++------- - 1 files changed, 4 insertions(+), 7 deletions(-) - -diff --git a/utils/osd_login/Makefile.am b/utils/osd_login/Makefile.am -index adc493a..20c2d8c 100644 ---- a/utils/osd_login/Makefile.am -+++ b/utils/osd_login/Makefile.am -@@ -1,12 +1,9 @@ - ## Process this file with automake to produce Makefile.in - --OSD_LOGIN_FILES= osd_login -+# These binaries go in /sbin (not /usr/sbin), and that cannot be -+# overridden at config time. -+sbindir = /sbin - --EXTRA_DIST= $(OSD_LOGIN_FILES) -- --all-local: $(OSD_LOGIN_FILES) -- --install-data-hook: -- $(INSTALL) --mode 755 osd_login $(DESTDIR)/sbin/osd_login -+sbin_SCRIPTS = osd_login - - MAINTAINERCLEANFILES = Makefile.in --- -1.7.4.1 --- nfs-utils-1.2.6/debian/patches/series 2012-07-10 17:42:42.000000000 +0000 +++ nfs-utils-1.2.8/debian/patches/series 2013-04-24 09:18:01.000000000 +0000 @@ -1,8 +1,6 @@ 01-sm-notify-in-sbin.patch 02-524255-manpages.patch 03-handle-mtab-symlink.patch -11-532048-reduce-verbosity.patch 16-mount.nfs.man-update-distinction-between-fstype.patch 17-multiarch-kerberos-paths.patch -18-osd_login-sbindir.patch 19-iscsiadm-path.patch --- nfs-utils-1.2.6/debian/rules 2012-07-10 17:42:42.000000000 +0000 +++ nfs-utils-1.2.8/debian/rules 2013-04-24 09:18:01.000000000 +0000 @@ -27,7 +27,7 @@ --enable-nfsv41 \ --enable-ipv6 \ --enable-libmount-mount \ - --with-tcp-wrappers + --without-tcp-wrappers $(MAKE) $(MAKEFLAGS) touch build-stamp @@ -60,7 +60,7 @@ install -m 0644 debian/nfs-utils.bugpresubj debian/nfs-common/usr/share/bug/nfs-utils/presubj install -m 0755 debian/nfs-kernel-server.bugscript debian/nfs-kernel-server/usr/share/bug/nfs-kernel-server/script dh_link - dh_installchangelogs ChangeLog + dh_installchangelogs linux-nfs/ChangeLog dh_lintian dh_strip dh_compress --- nfs-utils-1.2.6/debian/watch 2012-07-10 17:42:42.000000000 +0000 +++ nfs-utils-1.2.8/debian/watch 2013-04-24 09:18:01.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -http://www.kernel.org/pub/linux/utils/nfs/nfs-utils-([\.\d]+).tar.bz2 +http://sf.net/nfs/nfs-utils-(.*)\.tar\.bz2