On Mon, 2010-04-05 at 13:32 +1000, Aníbal Monsalve Salazar wrote:
> On Sun, Apr 04, 2010 at 08:38:28PM +0100, Ben Hutchings wrote:
> >nfs-kernel-server is closely related to the Linux kernel and most of
> >the bugs reported on it appear to actually be kernel bugs. Therefore
> >it seems to me that it would make more sense for the kernel team to
> >maintain it.
>
> Sure.
>
> >Would you be willing to hand over or share maintainership?
>
> I would like to share maintainership.
Here's the debdiff for the changes I'd like to make now. We should
probably import nfs-utils into a VCS somewhere, but I'm not sure how
best to do that with a v3.0 package.
Ben.
diff -Nru nfs-utils-1.2.1/debian/changelog nfs-utils-1.2.1/debian/changelog
--- nfs-utils-1.2.1/debian/changelog2010-01-14 06:15:29.0 +
+++ nfs-utils-1.2.1/debian/changelog2010-04-05 22:57:53.0 +0100
@@ -1,3 +1,19 @@
+nfs-utils (1:1.2.1-4) unstable; urgency=low
+
+ * Change maintainer to Debian kernel team; move Aníbal to uploaders and
+add myself to uploaders
+ * Check for nfsd in /proc/filesystems rather than looking for signs of it in
+/proc/kallsyms (Closes: #563104, #572736)
+ * Document the -n option to svcgssd, thanks to Alberto Gonzalez Iniesta
+(Closes: #451402, #550270)
+ * Replace upstream reference in package descriptions with Homepage fields,
+and do not refer to the obsolete CVS repository
+ * Update policy version to 3.8.4; no changes required
+ * Override lintian error 'init.d-script-missing-dependency-on-remote_fs';
+the init script does work without /usr mounted
+
+ -- Ben Hutchings Mon, 05 Apr 2010 22:57:52 +0100
+
nfs-utils (1:1.2.1-3) unstable; urgency=low
* Change the reading of /proc/kallsyms
diff -Nru nfs-utils-1.2.1/debian/control nfs-utils-1.2.1/debian/control
--- nfs-utils-1.2.1/debian/control 2010-01-14 06:14:26.0 +
+++ nfs-utils-1.2.1/debian/control 2010-04-05 22:24:39.0 +0100
@@ -1,9 +1,10 @@
Source: nfs-utils
Priority: standard
Section: net
-Maintainer: Anibal Monsalve Salazar
+Maintainer: Debian kernel team
+Uploaders: Anibal Monsalve Salazar , Ben Hutchings
Build-Depends: debhelper (>= 7), libwrap0-dev, libevent-dev, libnfsidmap-dev,
libkrb5-dev, libgssglue-dev, librpcsecgss-dev (>= 0.17), libblkid-dev,
libkeyutils-dev, pkg-config, libldap2-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Homepage: http://nfs.sourceforge.net/
Package: nfs-kernel-server
@@ -25,8 +26,7 @@
This package contains the user-space support needed to use the
NFS kernel server. Most administrators wishing to set up an NFS server
would want to install this package.
- .
- Upstream: SourceForge project "nfs", CVS module nfs-utils.
+Homepage: http://nfs.sourceforge.net/
Package: nfs-common
Architecture: any
@@ -38,5 +38,4 @@
Use this package on any machine that uses NFS, either as client or
server. Programs included: lockd, statd, showmount, nfsstat, gssd
and idmapd.
- .
- Upstream: SourceForge project "nfs", CVS module nfs-utils.
+Homepage: http://nfs.sourceforge.net/
diff -Nru nfs-utils-1.2.1/debian/nfs-common.lintian-overrides
nfs-utils-1.2.1/debian/nfs-common.lintian-overrides
--- nfs-utils-1.2.1/debian/nfs-common.lintian-overrides 1970-01-01
01:00:00.0 +0100
+++ nfs-utils-1.2.1/debian/nfs-common.lintian-overrides 2010-04-05
23:06:54.0 +0100
@@ -0,0 +1,4 @@
+# nfs-common can start daemons installed on /usr if it is already mounted,
+# but will still work if /usr is not mounted.
+nfs-common binary: init.d-script-missing-dependency-on-remote_fs
/etc/init.d/nfs-common: required-start
+nfs-common binary: init.d-script-missing-dependency-on-remote_fs
/etc/init.d/nfs-common: required-stop
diff -Nru nfs-utils-1.2.1/debian/nfs-kernel-server.init
nfs-utils-1.2.1/debian/nfs-kernel-server.init
--- nfs-utils-1.2.1/debian/nfs-kernel-server.init 2010-01-14
05:23:49.0 +
+++ nfs-utils-1.2.1/debian/nfs-kernel-server.init 2010-04-05
23:15:48.0 +0100
@@ -64,7 +64,7 @@
do_modprobe nfsd
# See if our running kernel supports the NFS kernel server
- if [ -f /proc/kallsyms ] && ! grep -Eq
"[[:space:]]nfsd_open([[:space:]]|$)" /proc/kallsyms; then
+ if ! grep -E -qs "[[:space:]]nfsd\$" /proc/filesystems; then
log_warning_msg "Not starting $DESC: no support in
current kernel."
exit 0
fi
diff -Nru nfs-utils-1.2.1/debian/patches/12-svcgssd-document-n-option.patch
nfs-utils-1.2.1/debian/patches/12-svcgssd-document-n-option.patch
--- nfs-utils-1.2.1/debian/patches/12-svcgssd-document-n-option.patch
1970-01-01 01:00:00.0 +0100
+++ nfs-utils-1.2.1/debian/patches/12-svcgssd-document-n-option.patch
2010-04-05 21:17:54.0 +0100
@@ -0,0 +1,16 @@
+From: Alberto Gonzalez Iniesta
+
+--- a/utils/gssd/svcgssd.man
b/utils/gssd/svcgssd.man
+@@ -35,6 +35,11 @
