Imported Debian patch 1.2.2-1

diff --git a/debian/changelog b/debian/changelog
index faa81b3fcccceff6509871814b1daaf1d4b936e6..90fa79e624b84f5d59bd9ea97d1562ac3f9db521 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+nfs-utils (1:1.2.2-1) unstable; urgency=low
+
+  [ Anibal Monsalve Salazar ]
+  * New upstream release 
+    Build depend on libcap-dev
+    Set configure option --enable-nfsv41
+  * X-ref nfsd({7,8})
+    02-524255-manpages.patch by Cyril Brulebois
+    Closes: 524255
+
+  [ Ben Hutchings ]
+  * 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
+
+ -- Anibal Monsalve Salazar <anibal@debian.org>  Tue, 06 Apr 2010 16:11:22 +1000
+

 nfs-utils (1:1.2.1-3) unstable; urgency=low
 
   * Change the reading of /proc/kallsyms
 nfs-utils (1:1.2.1-3) unstable; urgency=low
 
   * Change the reading of /proc/kallsyms

diff --git a/debian/control b/debian/control
index 5a43c3d46ab32412a30bd8ccf5b5ad174913203c..71511e7e37c50ea71d91998b706522e21e1d8797 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,10 @@
 Source: nfs-utils
 Priority: standard
 Section: net
 Source: nfs-utils
 Priority: standard
 Section: net

-Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
-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
+Maintainer: Debian kernel team <debian-kernel@lists.debian.org>
+Uploaders: Anibal Monsalve Salazar <anibal@debian.org>, Ben Hutchings <ben@decadent.org.uk>
+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, libcap-dev
+Standards-Version: 3.8.4

 Homepage: http://nfs.sourceforge.net/
 
 Package: nfs-kernel-server
 Homepage: http://nfs.sourceforge.net/
 
 Package: nfs-kernel-server


@@ -25,8 +26,7 @@ Description: support for NFS kernel server
  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.
  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
 
 Package: nfs-common
 Architecture: any


@@ -38,5 +38,4 @@ Description: NFS support files common to client and server
  Use this package on any machine that uses NFS, either as client or
  server.  Programs included: lockd, statd, showmount, nfsstat, gssd
  and idmapd.
  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 --git a/debian/nfs-common.lintian-overrides b/debian/nfs-common.lintian-overrides
new file mode 100644 (file)
index 0000000..c37aee8
--- /dev/null
+++ b/debian/nfs-common.lintian-overrides
@@ -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 --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index 1da9b46137a2ec594974470d96fb51c7c0a58959..bec2d0292294c60978d0da086f112e17625c9249 100644 (file)
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -64,7 +64,7 @@ case "$1" in
                do_modprobe nfsd
 
                # See if our running kernel supports the NFS kernel server
                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
                        log_warning_msg "Not starting $DESC: no support in current kernel."
                        exit 0
                fi

diff --git a/debian/patches/01-sm-notify-in-sbin.patch b/debian/patches/01-sm-notify-in-sbin.patch
index 825e2566026ebb71ed89bee72970a2cd3cece81f..fb5fc56e6d7b375bd8b44ce3cd3d671dd7b47ba7 100644 (file)
--- a/debian/patches/01-sm-notify-in-sbin.patch
+++ b/debian/patches/01-sm-notify-in-sbin.patch
@@ -1,8 +1,6 @@
-Index: nfs-utils-1.1.6/utils/statd/statd.c
-===================================================================
---- nfs-utils-1.1.6.orig/utils/statd/statd.c
-+++ nfs-utils-1.1.6/utils/statd/statd.c
-@@ -233,7 +233,7 @@ static void run_sm_notify(int outport)
+--- a/utils/statd/statd.c      2010-02-18 23:35:00.000000000 +1100
++++ b/utils/statd/statd.c      2010-04-06 16:12:51.000000000 +1000
+@@ -190,7 +190,7 @@ static void run_sm_notify(int outport)

        char *av[6];
        int ac = 0;
  
        char *av[6];
        int ac = 0;
  

diff --git a/debian/patches/02-524255-manpages.patch b/debian/patches/02-524255-manpages.patch
new file mode 100644 (file)
index 0000000..536b0a0
--- /dev/null
+++ b/debian/patches/02-524255-manpages.patch
@@ -0,0 +1,22 @@
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=524255
+
+--- a/utils/exportfs/nfsd.man  2010-02-18 23:35:00.000000000 +1100
++++ b/utils/exportfs/nfsd.man  2010-04-06 19:03:32.000000000 +1000
+@@ -196,6 +196,7 @@ classes of tracing to be enabled.  Consu
+ find out what number correspond to what tracing.
+ 
+ .SH SEE ALSO
++.BR nfsd (8),
+ .BR rpc.nfsd (8),
+ .BR exports (5),
+ .BR nfsstat (8),
+--- a/utils/nfsd/nfsd.man      2010-02-18 23:35:00.000000000 +1100
++++ b/utils/nfsd/nfsd.man      2010-04-06 19:03:32.000000000 +1000
+@@ -94,6 +94,7 @@ address family combinations that are mar
+ database.
+ 
+ .SH SEE ALSO
++.BR nfsd (7),
+ .BR rpc.mountd (8),
+ .BR exports (5),
+ .BR exportfs (8),

diff --git a/debian/patches/03-handle-mtab-symlink.patch b/debian/patches/03-handle-mtab-symlink.patch
index 9cf09761282a6b9c8a7f347c2a44b7871687e835..06dd781041736ab06b8df20c6cd9431e2de70b94 100644 (file)
--- a/debian/patches/03-handle-mtab-symlink.patch
+++ b/debian/patches/03-handle-mtab-symlink.patch
@@ -1,7 +1,5 @@
-Index: nfs-utils-1.1.4/utils/mount/fstab.c
-===================================================================
---- nfs-utils-1.1.4.orig/utils/mount/fstab.c
-+++ nfs-utils-1.1.4/utils/mount/fstab.c
+--- a/utils/mount/fstab.c      2010-02-18 23:35:00.000000000 +1100
++++ b/utils/mount/fstab.c      2010-04-06 16:12:51.000000000 +1000

 @@ -57,7 +57,7 @@ mtab_does_not_exist(void) {
        return var_mtab_does_not_exist;
  }
 @@ -57,7 +57,7 @@ mtab_does_not_exist(void) {
        return var_mtab_does_not_exist;
  }


@@ -11,10 +9,8 @@ Index: nfs-utils-1.1.4/utils/mount/fstab.c
  mtab_is_a_symlink(void) {
          get_mtab_info();
          return var_mtab_is_a_symlink;
  mtab_is_a_symlink(void) {
          get_mtab_info();
          return var_mtab_is_a_symlink;

-Index: nfs-utils-1.1.4/utils/mount/fstab.h
-===================================================================
---- nfs-utils-1.1.4.orig/utils/mount/fstab.h
-+++ nfs-utils-1.1.4/utils/mount/fstab.h
+--- a/utils/mount/fstab.h      2010-02-18 23:35:00.000000000 +1100
++++ b/utils/mount/fstab.h      2010-04-06 16:12:51.000000000 +1000

 @@ -7,6 +7,7 @@
  #define _PATH_FSTAB "/etc/fstab"
  #endif
 @@ -7,6 +7,7 @@
  #define _PATH_FSTAB "/etc/fstab"
  #endif


@@ -23,11 +19,9 @@ Index: nfs-utils-1.1.4/utils/mount/fstab.h
  int mtab_is_writable(void);
  int mtab_does_not_exist(void);
  void reset_mtab_info(void);
  int mtab_is_writable(void);
  int mtab_does_not_exist(void);
  void reset_mtab_info(void);

-Index: nfs-utils-1.1.4/utils/mount/mount.c
-===================================================================
---- nfs-utils-1.1.4.orig/utils/mount/mount.c
-+++ nfs-utils-1.1.4/utils/mount/mount.c
-@@ -230,6 +230,13 @@ create_mtab (void) {
+--- a/utils/mount/mount.c      2010-02-18 23:35:00.000000000 +1100
++++ b/utils/mount/mount.c      2010-04-06 16:12:51.000000000 +1000
+@@ -232,6 +232,13 @@ create_mtab (void) {

        int flags;
        mntFILE *mfp;
  
        int flags;
        mntFILE *mfp;
  

diff --git a/debian/patches/07-remove-duplicate-exports-paragraphs.patch b/debian/patches/07-remove-duplicate-exports-paragraphs.patch
index 8bc59f9cb7e43cc3f339f25372f97f8c87746ccc..686b7e65b2085a6c236ae6e701eccfc3b9a95346 100644 (file)
--- a/debian/patches/07-remove-duplicate-exports-paragraphs.patch
+++ b/debian/patches/07-remove-duplicate-exports-paragraphs.patch
@@ -1,8 +1,6 @@
-Index: nfs-utils-1.1.2/utils/exportfs/exports.man
-===================================================================
---- nfs-utils-1.1.2.orig/utils/exportfs/exports.man    2008-03-14 16:46:29.000000000 +0100
-+++ nfs-utils-1.1.2/utils/exportfs/exports.man 2008-07-11 18:57:46.000000000 +0200
-@@ -365,20 +365,6 @@
+--- a/utils/exportfs/exports.man       2010-02-18 23:35:00.000000000 +1100
++++ b/utils/exportfs/exports.man       2010-04-06 16:12:51.000000000 +1000
+@@ -365,20 +365,6 @@ If the client asks for alternative locat

  will be given this list of alternatives. (Note that actual replication
  of the filesystem must be handled elsewhere.)
  
  will be given this list of alternatives. (Note that actual replication
  of the filesystem must be handled elsewhere.)
  

diff --git a/debian/patches/11-532048-reduce-verbosity.patch b/debian/patches/11-532048-reduce-verbosity.patch
index 997c3aff5edb16474dccd33dd5916e61af47aa6e..ecb2bb1e959eb0a8062450384b506b6d91a41108 100644 (file)
--- a/debian/patches/11-532048-reduce-verbosity.patch
+++ b/debian/patches/11-532048-reduce-verbosity.patch
@@ -13,9 +13,9 @@ seem to be any evidence that it's been included yet in 1.2.0.
 
 Steve Langasek <steve.langasek@canonical.com>
 
 
 Steve Langasek <steve.langasek@canonical.com>
 

---- a/utils/gssd/gssd_proc.c   2009-06-03 00:43:05.000000000 +1000
-+++ b/utils/gssd/gssd_proc.c   2009-06-09 11:04:24.000000000 +1000
-@@ -548,7 +548,7 @@ do_error_downcall(int k5_fd, uid_t uid, 
+--- 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;
  
        unsigned int timeout = 0;
        int     zero = 0;
  


@@ -24,16 +24,16 @@ Steve Langasek <steve.langasek@canonical.com>
  
        if (WRITE_BYTES(&p, end, uid)) goto out_err;
        if (WRITE_BYTES(&p, end, timeout)) goto out_err;
  
        if (WRITE_BYTES(&p, end, uid)) goto out_err;
        if (WRITE_BYTES(&p, end, timeout)) goto out_err;

-@@ -816,7 +816,7 @@ handle_krb5_upcall(struct clnt_info *clp
-       char                    **dirname;
+@@ -906,7 +906,7 @@ process_krb5_upcall(struct clnt_info *cl

        int                     create_resp = -1;
        int                     create_resp = -1;

+       int                     err, downcall_err = -EACCES;

  
  

--      printerr(1, "handling krb5 upcall\n");
-+      printerr(2, "handling krb5 upcall\n");
+-      printerr(1, "handling krb5 upcall (%s)\n", clp->dirname);
++      printerr(2, "handling krb5 upcall (%s)\n", clp->dirname);

  
  

-       token.length = 0;
-       token.value = NULL;
-@@ -949,7 +949,7 @@ handle_spkm3_upcall(struct clnt_info *cl
+       if (tgtname) {
+               if (clp->servicename) {
+@@ -1066,7 +1066,7 @@ process_spkm3_upcall(struct clnt_info *c

        }
  
        if (!authgss_get_private_data(auth, &pd)) {
        }
  
        if (!authgss_get_private_data(auth, &pd)) {


@@ -42,8 +42,8 @@ Steve Langasek <steve.langasek@canonical.com>
                            "data for user with uid %d for server %s\n",
                         uid, clp->servername);
                goto out_return_error;
                            "data for user with uid %d for server %s\n",
                         uid, clp->servername);
                goto out_return_error;

---- a/utils/gssd/gss_util.c    2009-06-03 00:43:05.000000000 +1000
-+++ b/utils/gssd/gss_util.c    2009-06-09 11:04:24.000000000 +1000
+--- 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;
 @@ -126,7 +126,7 @@ display_status_1(char *m, u_int32_t code
                                "gss_display_status called from %s\n", m);
                        break;

diff --git a/debian/patches/12-svcgssd-document-n-option.patch b/debian/patches/12-svcgssd-document-n-option.patch
new file mode 100644 (file)
index 0000000..804413a
--- /dev/null
+++ b/debian/patches/12-svcgssd-document-n-option.patch
@@ -0,0 +1,16 @@
+From: Alberto Gonzalez Iniesta <agi@inittab.org>
+
+--- a/utils/gssd/svcgssd.man   2010-02-18 23:35:00.000000000 +1100
++++ b/utils/gssd/svcgssd.man   2010-04-06 16:48:19.000000000 +1000
+@@ -35,6 +35,11 @@ increases the verbosity of the output (c
+ .B -i
+ If the nfsidmap library supports setting debug level,
+ increases the verbosity of the output (can be specified multiple times).
++.TP
++.B -n
++Do not search for nfs/<your.host>@<YOUR.REALM> at start up, but instead
++accept requests for any key in the keytab file. Useful for HA clusters
++where the NFS service hostname is different from the node hostname.
+ 
+ .SH SEE ALSO
+ .BR rpc.gssd(8),

diff --git a/debian/patches/series b/debian/patches/series
index b6407f6358ccc7dd26ca999d9165c87e09d308c0..abd79b350e2d7109b4ef422a50b1e9afe9e5adae 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,6 @@
 01-sm-notify-in-sbin.patch
 01-sm-notify-in-sbin.patch

+02-524255-manpages.patch

 03-handle-mtab-symlink.patch
 07-remove-duplicate-exports-paragraphs.patch
 11-532048-reduce-verbosity.patch
 03-handle-mtab-symlink.patch
 07-remove-duplicate-exports-paragraphs.patch
 11-532048-reduce-verbosity.patch

+12-svcgssd-document-n-option.patch

diff --git a/debian/rules b/debian/rules
index f9a196a45207fde3176537ea88a4d928f1feb8e2..81fb344a7763837eda3c60e4b74d05041a9861c4 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,7 @@ build-stamp:
        dh_testdir
        CFLAGS="$(CFLAGS)" ./configure \
                --mandir='$${prefix}/share/man' \
        dh_testdir
        CFLAGS="$(CFLAGS)" ./configure \
                --mandir='$${prefix}/share/man' \

+               --enable-nfsv41 \

                --disable-tirpc \
                --with-tcp-wrappers
        $(MAKE) $(MAKEFLAGS)
                --disable-tirpc \
                --with-tcp-wrappers
        $(MAKE) $(MAKEFLAGS)


@@ -50,6 +51,7 @@ binary-arch: build
        dh_installman
        dh_link
        dh_installchangelogs ChangeLog
        dh_installman
        dh_link
        dh_installchangelogs ChangeLog

+       dh_lintian

        dh_strip
        dh_compress
        dh_fixperms
        dh_strip
        dh_compress
        dh_fixperms