diffstat of debian/ for nfs-utils_1.2.8-9 nfs-utils_1.3.0-0tanglu1 changelog | 8 + compat | 2 control | 7 - nfs-common.install | 5 - patches/11-532048-reduce-verbosity.patch | 59 ------------ patches/20-remove-autogenerated-man.patch | 140 ------------------------------ patches/23_nfs-common-systemd-alias.patch | 9 + patches/series | 5 - rules | 6 + 9 files changed, 32 insertions(+), 209 deletions(-) --- nfs-utils-1.2.8/debian/changelog 2014-08-13 00:12:43.000000000 +0000 +++ nfs-utils-1.3.0/debian/changelog 2014-10-22 16:40:57.000000000 +0000 @@ -1,3 +1,11 @@ +nfs-utils (1:1.3.0-0tanglu1) staging; urgency=low + + * New upstream release + * Install systemd units, alias the nfs-client.target as nfs-common + * This release is experimental, please test it in staging + + -- Matthias Klumpp Wed, 22 Oct 2014 17:56:46 +0200 + nfs-utils (1:1.2.8-9) unstable; urgency=medium * debian/patches/22-mountd-fix-segfault-in-add_name-with-newer-gcc- --- nfs-utils-1.2.8/debian/compat 2014-08-13 00:12:43.000000000 +0000 +++ nfs-utils-1.3.0/debian/compat 2014-10-22 16:24:33.000000000 +0000 @@ -1 +1 @@ -7 +9 --- nfs-utils-1.2.8/debian/control 2014-08-13 00:12:43.000000000 +0000 +++ nfs-utils-1.3.0/debian/control 2014-10-22 16:24:40.000000000 +0000 @@ -1,10 +1,11 @@ Source: nfs-utils Priority: standard Section: net -Maintainer: Debian kernel team +Maintainer: Tanglu Developers +XSBC-Original-Maintainer: Debian kernel team Uploaders: Anibal Monsalve Salazar , Ben Hutchings , Steve Langasek -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 +Build-Depends: debhelper (>= 9), 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, dh-systemd, libmount-dev, libsqlite3-dev +Standards-Version: 3.9.6 Homepage: http://nfs.sourceforge.net/ Vcs-Git: git://git.debian.org/kernel/nfs-utils.git Vcs-Browser: http://git.debian.org/?p=kernel/nfs-utils.git --- nfs-utils-1.2.8/debian/nfs-common.install 2014-08-13 00:12:43.000000000 +0000 +++ nfs-utils-1.3.0/debian/nfs-common.install 2014-10-22 16:26:59.000000000 +0000 @@ -15,10 +15,11 @@ debian/tmp/usr/sbin/rpc.gssd debian/tmp/usr/sbin/rpc.idmapd debian/tmp/usr/sbin/rpc.svcgssd -debian/tmp/usr/sbin/gss_clnt_send_err -debian/tmp/usr/sbin/gss_destroy_creds debian/tmp/usr/sbin/rpcdebug debian/tmp/var/lib/nfs/state debian/idmapd.conf usr/share/nfs-common/conffiles/ debian/nfs-common.default usr/share/nfs-common/conffiles/ debian/id_resolver.conf etc/request-key.d/ +systemd/*.service /lib/systemd/system/ +systemd/*.mount /lib/systemd/system/ +systemd/*.target /lib/systemd/system/ --- nfs-utils-1.2.8/debian/patches/11-532048-reduce-verbosity.patch 2014-08-13 00:12:43.000000000 +0000 +++ nfs-utils-1.3.0/debian/patches/11-532048-reduce-verbosity.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,59 +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 - -Index: nfs-utils/utils/gssd/gssd_proc.c -=================================================================== ---- nfs-utils.orig/utils/gssd/gssd_proc.c 2013-05-10 08:50:57.000000000 +0000 -+++ nfs-utils/utils/gssd/gssd_proc.c 2013-05-10 08:50:57.000000000 +0000 -@@ -714,7 +714,7 @@ - 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; -@@ -978,7 +978,7 @@ - gss_cred_id_t gss_cred; - OM_uint32 maj_stat, min_stat, lifetime_rec; - -- printerr(1, "handling krb5 upcall (%s)\n", clp->dirname); -+ printerr(2, "handling krb5 upcall (%s)\n", clp->dirname); - - token.length = 0; - token.value = NULL; -@@ -1082,7 +1082,7 @@ - } - - 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; -Index: nfs-utils/utils/gssd/gss_util.c -=================================================================== ---- nfs-utils.orig/utils/gssd/gss_util.c 2013-05-10 08:50:57.000000000 +0000 -+++ nfs-utils/utils/gssd/gss_util.c 2013-05-10 08:50:57.000000000 +0000 -@@ -126,7 +126,7 @@ - "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.8/debian/patches/20-remove-autogenerated-man.patch 2014-08-13 00:12:43.000000000 +0000 +++ nfs-utils-1.3.0/debian/patches/20-remove-autogenerated-man.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,140 +0,0 @@ -The man page was generated, but this file is intended as the source to make modifications. So remove all generated comments and only leave what's needed and easily maintained manually without changing the appearance of the man page. - -Acked-by: Jeff Layton -Signed-off-by: Luk Claes ---- - utils/nfsdcltrack/nfsdcltrack.man | 114 ------------------------------------- - 1 file changed, 114 deletions(-) - -diff --git a/utils/nfsdcltrack/nfsdcltrack.man b/utils/nfsdcltrack/nfsdcltrack.man -index 47007df..6940788 100644 ---- a/utils/nfsdcltrack/nfsdcltrack.man -+++ b/utils/nfsdcltrack/nfsdcltrack.man -@@ -1,53 +1,3 @@ --.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16) --.\" --.\" Standard preamble: --.\" ======================================================================== --.de Sp \" Vertical space (when we can't use .PP) --.if t .sp .5v --.if n .sp --.. --.de Vb \" Begin verbatim text --.ft CW --.nf --.ne \\$1 --.. --.de Ve \" End verbatim text --.ft R --.fi --.. --.\" Set up some character translations and predefined strings. \*(-- will --.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left --.\" double quote, and \*(R" will give a right double quote. \*(C+ will --.\" give a nicer C++. Capital omega is used to do unbreakable dashes and --.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, --.\" nothing in troff, for use with C<>. --.tr \(*W- --.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' --.ie n \{\ --. ds -- \(*W- --. ds PI pi --. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch --. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch --. ds L" "" --. ds R" "" --. ds C` "" --. ds C' "" --'br\} --.el\{\ --. ds -- \|\(em\| --. ds PI \(*p --. ds L" `` --. ds R" '' --'br\} --.\" --.\" Escape single quotes in literal strings from groff's Unicode transform. --.ie \n(.g .ds Aq \(aq --.el .ds Aq ' --.\" --.\" If the F register is turned on, we'll generate index entries on stderr for --.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index --.\" entries marked with X<> in POD. Of course, you'll have to process the --.\" output yourself in some meaningful fashion. - .ie \nF \{\ - . de IX - . tm Index:\\$1\t\\n%\t"\\$2" -@@ -59,70 +9,6 @@ - . de IX - .. - .\} --.\" --.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). --.\" Fear. Run. Save yourself. No user-serviceable parts. --. \" fudge factors for nroff and troff --.if n \{\ --. ds #H 0 --. ds #V .8m --. ds #F .3m --. ds #[ \f1 --. ds #] \fP --.\} --.if t \{\ --. ds #H ((1u-(\\\\n(.fu%2u))*.13m) --. ds #V .6m --. ds #F 0 --. ds #[ \& --. ds #] \& --.\} --. \" simple accents for nroff and troff --.if n \{\ --. ds ' \& --. ds ` \& --. ds ^ \& --. ds , \& --. ds ~ ~ --. ds / --.\} --.if t \{\ --. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" --. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' --. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' --. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' --. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' --. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' --.\} --. \" troff and (daisy-wheel) nroff accents --.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' --.ds 8 \h'\*(#H'\(*b\h'-\*(#H' --.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] --.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' --.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' --.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] --.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] --.ds ae a\h'-(\w'a'u*4/10)'e --.ds Ae A\h'-(\w'A'u*4/10)'E --. \" corrections for vroff --.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' --.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' --. \" for low resolution devices (crt and lpr) --.if \n(.H>23 .if \n(.V>19 \ --\{\ --. ds : e --. ds 8 ss --. ds o a --. ds d- d\h'-1'\(ga --. ds D- D\h'-1'\(hy --. ds th \o'bp' --. ds Th \o'LP' --. ds ae ae --. ds Ae AE --.\} --.rm #[ #] #H #V #F C --.\" ======================================================================== --.\" - .IX Title "NFSDCLTRACK 8" - .TH NFSDCLTRACK 8 "2012-10-24" "" "" - .\" For nroff, turn off justification. Always turn off hyphenation; it makes --- -1.7.10.4 - --- nfs-utils-1.2.8/debian/patches/23_nfs-common-systemd-alias.patch 1970-01-01 00:00:00.000000000 +0000 +++ nfs-utils-1.3.0/debian/patches/23_nfs-common-systemd-alias.patch 2014-10-22 16:35:48.000000000 +0000 @@ -0,0 +1,9 @@ +--- a/systemd/nfs-client.target ++++ b/systemd/nfs-client.target +@@ -12,3 +12,6 @@ + [Install] + WantedBy=multi-user.target + WantedBy=remote-fs.target ++ ++# Debian compatibility ++Alias=nfs-common --- nfs-utils-1.2.8/debian/patches/series 2014-08-13 00:12:43.000000000 +0000 +++ nfs-utils-1.3.0/debian/patches/series 2014-10-22 16:34:07.000000000 +0000 @@ -2,9 +2,8 @@ 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 19-iscsiadm-path.patch -20-remove-autogenerated-man.patch -22-mountd-fix-segfault-in-add_name-with-newer-gcc-compi.patch +22-mountd-fix-segfault-in-add_name-with-newer-gcc-compi.patch +23_nfs-common-systemd-alias.patch --- nfs-utils-1.2.8/debian/rules 2014-08-13 00:12:43.000000000 +0000 +++ nfs-utils-1.3.0/debian/rules 2014-10-22 16:25:00.000000000 +0000 @@ -29,7 +29,9 @@ --enable-nfsv41 \ --enable-ipv6 \ --enable-libmount-mount \ - --with-tcp-wrappers + --with-tcp-wrappers \ + --enable-gss \ + --enable-mountconfig $(MAKE) $(MAKEFLAGS) touch build-stamp @@ -54,7 +56,9 @@ dh_install -Xman --fail-missing dh_installdocs -A dh_installdocs -pnfs-common debian/README.Debian.nfsv4 + dh_systemd_enable -pnfs-common dh_installinit -pnfs-common -R + dh_systemd_start -pnfs-common install -m 0755 debian/nfs-kernel-server.init debian/nfs-kernel-server/etc/init.d/nfs-kernel-server install -m 0644 debian/nfs-common.bugcontrol debian/nfs-common/usr/share/bug/nfs-common/control install -m 0755 debian/nfs-common.bugscript debian/nfs-common/usr/share/bug/nfs-common/script