From 4228d7368bb131d65b6cc7bb3ba9d3c070ada5d3 Mon Sep 17 00:00:00 2001 From: Anibal Monsalve Salazar Date: Wed, 26 Mar 2008 18:40:09 +1100 Subject: [PATCH] Imported Debian patch 1.1.2-1 --- debian/changelog | 21 ++++++++++++ debian/control | 14 +++----- debian/patches/05-ignore-quota-option.patch | 22 ------------- debian/patches/06-gssd-manpage-typo.patch | 13 -------- .../patches/07-amd64-logging-segfault.patch | 32 ------------------- debian/patches/08-clarify-unexport.patch | 19 ----------- debian/patches/09-fix-nfsstat-option.patch | 26 --------------- debian/patches/10-no-flush-blkid-cache.patch | 13 -------- .../11-honor-credential-cache-dir.patch | 13 -------- debian/patches/12-fix-nfsmount-segfault.patch | 13 -------- debian/patches/series | 8 ----- debian/watch | 2 ++ 12 files changed, 28 insertions(+), 168 deletions(-) delete mode 100644 debian/patches/05-ignore-quota-option.patch delete mode 100644 debian/patches/06-gssd-manpage-typo.patch delete mode 100644 debian/patches/07-amd64-logging-segfault.patch delete mode 100644 debian/patches/08-clarify-unexport.patch delete mode 100644 debian/patches/09-fix-nfsstat-option.patch delete mode 100644 debian/patches/10-no-flush-blkid-cache.patch delete mode 100644 debian/patches/11-honor-credential-cache-dir.patch delete mode 100644 debian/patches/12-fix-nfsmount-segfault.patch create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog index af0ab38..86bd2d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,24 @@ +nfs-utils (1:1.1.2-1) unstable; urgency=low + + * New upstream release + * Move homepage to control header + * Standards-Versio bumped to 3.7.3 + * Added dwbian/watch + * Binary pakckages depend on ${misc:Depends} + * Build-depends on libldap2-dev + - /usr/bin/ld couldn't find -lldap + * The following patches were merged: + - 05-ignore-quota-option.patch + - 06-gssd-manpage-typo.patch + - 07-amd64-logging-segfault.patch + - 08-clarify-unexport.patch + - 09-fix-nfsstat-option.patch + - 10-no-flush-blkid-cache.patch + - 11-honor-credential-cache-dir.patch + - 12-fix-nfsmount-segfault.patch + + -- Anibal Monsalve Salazar Wed, 26 Mar 2008 18:40:09 +1100 + nfs-utils (1:1.1.1-14) unstable; urgency=low * Another init dependency patch from Petter Reinholdtsen, this time for diff --git a/debian/control b/debian/control index 995347a..b9036d6 100644 --- a/debian/control +++ b/debian/control @@ -3,13 +3,14 @@ Priority: standard Section: net Maintainer: Anibal Monsalve Salazar Uploaders: Steinar H. Gunderson , Daniel Baumann -Build-Depends: debhelper (>= 5), libwrap0-dev, libevent-dev, libnfsidmap-dev, libkrb5-dev, libgssglue-dev (>= 0.1-1), librpcsecgss-dev (>= 0.16-1), libblkid-dev, libkeyutils-dev, pkg-config, quilt (>= 0.40) -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 5), libwrap0-dev, libevent-dev, libnfsidmap-dev, libkrb5-dev, libgssglue-dev (>= 0.1-1), librpcsecgss-dev (>= 0.16-1), libblkid-dev, libkeyutils-dev, pkg-config, quilt (>= 0.40), libldap2-dev +Standards-Version: 3.7.3 +Homepage: http://nfs.sourceforge.net/ Package: nfs-kernel-server Priority: optional Architecture: any -Depends: nfs-common (>= 1:1.0.8-1), ucf, lsb-base (>= 1.3-9ubuntu3), ${shlibs:Depends}, libblkid1 (>= 1.39+1.40-WIP-2006.11.14+dfsg-2) +Depends: nfs-common (>= 1:1.0.8-1), ucf, lsb-base (>= 1.3-9ubuntu3), ${shlibs:Depends}, ${misc:Depends}, libblkid1 (>= 1.39+1.40-WIP-2006.11.14+dfsg-2) Provides: knfs, nfs-server Conflicts: knfs, nfs-server Replaces: knfs, nfs-server @@ -27,12 +28,10 @@ Description: support for NFS kernel 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 -Depends: portmap | rpcbind, adduser, ucf, lsb-base (>= 1.3-9ubuntu3), netbase (>= 4.24), initscripts (>= 2.86.ds1-38.1), ${shlibs:Depends} +Depends: portmap | rpcbind, adduser, ucf, lsb-base (>= 1.3-9ubuntu3), netbase (>= 4.24), initscripts (>= 2.86.ds1-38.1), ${shlibs:Depends}, ${misc:Depends} Provides: nfs-client Conflicts: nfs-client Replaces: nfs-client, nfs-kernel-server (<< 1:1.0.7-5), mount (<< 2.13~) @@ -42,6 +41,3 @@ Description: NFS support files common to client and server and idmapd. . Upstream: SourceForge project "nfs", CVS module nfs-utils. - . - Homepage: http://nfs.sourceforge.net/ - diff --git a/debian/patches/05-ignore-quota-option.patch b/debian/patches/05-ignore-quota-option.patch deleted file mode 100644 index 22c53ef..0000000 --- a/debian/patches/05-ignore-quota-option.patch +++ /dev/null @@ -1,22 +0,0 @@ -The mount(5) man page states that the noquota, quota, usrquota and -grpquota options are ignored. (They are, however, used by the quota -tools, so having them in fstab can be useful.) Make mount.nfs ignore -them properly, matching the man page. There are a few aliases (like -usrjquota) that are parsed by quota, but as these are not documented -nor seem to be widely used, they are not included. - -Index: nfs-utils-1.1.1/utils/mount/mount.c -=================================================================== ---- nfs-utils-1.1.1.orig/utils/mount/mount.c -+++ nfs-utils-1.1.1/utils/mount/mount.c -@@ -130,6 +130,10 @@ static const struct opt_map opt_map[] = - { "diratime", 0, 1, MS_NODIRATIME }, /* Update dir access times */ - { "nodiratime", 0, 0, MS_NODIRATIME },/* Do not update dir access times */ - #endif -+ { "noquota", 0, 0, MS_DUMMY }, /* Don't enforce quota */ -+ { "quota", 0, 0, MS_DUMMY }, /* Enforce user quota */ -+ { "usrquota", 0, 0, MS_DUMMY }, /* Enforce user quota */ -+ { "grpquota", 0, 0, MS_DUMMY }, /* Enforce group quota */ - { NULL, 0, 0, 0 } - }; - diff --git a/debian/patches/06-gssd-manpage-typo.patch b/debian/patches/06-gssd-manpage-typo.patch deleted file mode 100644 index 4dfc72f..0000000 --- a/debian/patches/06-gssd-manpage-typo.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: nfs-utils-1.1.0/utils/gssd/gssd.man -=================================================================== ---- nfs-utils-1.1.0.orig/utils/gssd/gssd.man -+++ nfs-utils-1.1.0/utils/gssd/gssd.man -@@ -35,7 +35,7 @@ With the \-n option, "machine credential - for accesses by UID 0. Instead, credentials must be obtained - manually like all other users. Use of this option means that - "root" must manually obtain Kerberos credentials before --attemtpting to mount an nfs filesystem requiring Kerberos -+attempting to mount an nfs filesystem requiring Kerberos - authentication. - .TP - .B -k keytab diff --git a/debian/patches/07-amd64-logging-segfault.patch b/debian/patches/07-amd64-logging-segfault.patch deleted file mode 100644 index 49ebdd8..0000000 --- a/debian/patches/07-amd64-logging-segfault.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: nfs-utils-1.1.1/support/nfs/xlog.c -=================================================================== ---- nfs-utils-1.1.1.orig/support/nfs/xlog.c -+++ nfs-utils-1.1.1/support/nfs/xlog.c -@@ -133,9 +133,13 @@ xlog_enabled(int fac) - void - xlog_backend(int kind, const char *fmt, va_list args) - { -+ va_list args2; -+ - if (!(kind & (L_ALL)) && !(logging && (kind & logmask))) - return; - -+ va_copy(args2, args); -+ - if (log_syslog) { - switch (kind) { - case L_FATAL: -@@ -172,10 +176,12 @@ xlog_backend(int kind, const char *fmt, - fprintf(stderr, "%s: ", log_name); - #endif - -- vfprintf(stderr, fmt, args); -+ vfprintf(stderr, fmt, args2); - fprintf(stderr, "\n"); - } - -+ va_end(args2); -+ - if (kind == L_FATAL) - exit(1); - } diff --git a/debian/patches/08-clarify-unexport.patch b/debian/patches/08-clarify-unexport.patch deleted file mode 100644 index 9b203b8..0000000 --- a/debian/patches/08-clarify-unexport.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: nfs-utils-1.1.1/utils/exportfs/exportfs.man -=================================================================== ---- nfs-utils-1.1.1.orig/utils/exportfs/exportfs.man -+++ nfs-utils-1.1.1/utils/exportfs/exportfs.man -@@ -167,11 +167,13 @@ all entries listed in - are removed from the kernel export tables, and the file is cleared. This - effectively shuts down all NFS activity. - .P --To remove individual export entries, one can specify a -+To remove an export to a host, specify a - .I host:/path - pair. This deletes the specified entry from - .B xtab - and removes the corresponding kernel entry (if any). -+To remove one or more exports to several hosts, use -+.BR "exportfs -ua" . - .P - .\" -------------------- Dumping the Export Table ----------------- - .SS Dumping the Export Table diff --git a/debian/patches/09-fix-nfsstat-option.patch b/debian/patches/09-fix-nfsstat-option.patch deleted file mode 100644 index 0da1fa9..0000000 --- a/debian/patches/09-fix-nfsstat-option.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: nfs-utils-1.1.1/utils/nfsstat/nfsstat.c -=================================================================== ---- nfs-utils-1.1.1.orig/utils/nfsstat/nfsstat.c 2007-11-19 21:57:59.000000000 +0100 -+++ nfs-utils-1.1.1/utils/nfsstat/nfsstat.c 2007-11-19 21:58:13.000000000 +0100 -@@ -207,7 +207,7 @@ - { - printf("Usage: %s [OPTION]...\n\ - \n\ -- -m, --mounted\t\tShow statistics on mounted NFS filesystems\n\ -+ -m, --mounts\t\tShow statistics on mounted NFS filesystems\n\ - -c, --client\t\tShow NFS client statistics\n\ - -s, --server\t\tShow NFS server statistics\n\ - -2\t\t\tShow NFS version 2 statistics\n\ -Index: nfs-utils-1.1.1/utils/nfsstat/nfsstat.man -=================================================================== ---- nfs-utils-1.1.1.orig/utils/nfsstat/nfsstat.man 2007-11-19 21:58:16.000000000 +0100 -+++ nfs-utils-1.1.1/utils/nfsstat/nfsstat.man 2007-11-19 21:58:48.000000000 +0100 -@@ -35,7 +35,7 @@ - .B \-4 - Print only NFS v4 statistics. - .TP --.B \-m, \-\-mounted -+.B \-m, \-\-mounts - Print information about each of the mounted \fBNFS\fR file systems. - - If this option is used, all other options are ignored. diff --git a/debian/patches/10-no-flush-blkid-cache.patch b/debian/patches/10-no-flush-blkid-cache.patch deleted file mode 100644 index 7f7a7e8..0000000 --- a/debian/patches/10-no-flush-blkid-cache.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: nfs-utils-1.1.1/utils/mountd/cache.c -=================================================================== ---- nfs-utils-1.1.1.orig/utils/mountd/cache.c -+++ nfs-utils-1.1.1/utils/mountd/cache.c -@@ -181,8 +181,6 @@ int get_uuid(char *path, char *uuid, int - if (cache == NULL) - blkid_get_cache(&cache, NULL); - -- blkid_probe_all_new(cache); -- - if (stat(path, &stb) != 0) - return 0; - devname = blkid_devno_to_devname(stb.st_dev); diff --git a/debian/patches/11-honor-credential-cache-dir.patch b/debian/patches/11-honor-credential-cache-dir.patch deleted file mode 100644 index 88966ac..0000000 --- a/debian/patches/11-honor-credential-cache-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: nfs-utils-1.1.1/utils/gssd/krb5_util.c -=================================================================== ---- nfs-utils-1.1.1.orig/utils/gssd/krb5_util.c -+++ nfs-utils-1.1.1/utils/gssd/krb5_util.c -@@ -404,7 +404,7 @@ gssd_get_single_krb5_cred(krb5_context c - cache_type = "FILE"; - snprintf(cc_name, sizeof(cc_name), "%s:%s/%s%s_%s", - cache_type, -- GSSD_DEFAULT_CRED_DIR, GSSD_DEFAULT_CRED_PREFIX, -+ ccachedir, GSSD_DEFAULT_CRED_PREFIX, - GSSD_DEFAULT_MACHINE_CRED_SUFFIX, ple->realm); - ple->endtime = my_creds.times.endtime; - if (ple->ccname != NULL) diff --git a/debian/patches/12-fix-nfsmount-segfault.patch b/debian/patches/12-fix-nfsmount-segfault.patch deleted file mode 100644 index 2dc73b2..0000000 --- a/debian/patches/12-fix-nfsmount-segfault.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: nfs-utils-1.1.1/utils/mount/nfsmount.c -=================================================================== ---- nfs-utils-1.1.1.orig/utils/mount/nfsmount.c -+++ nfs-utils-1.1.1/utils/mount/nfsmount.c -@@ -714,7 +714,7 @@ nfsmount(const char *spec, const char *n - rpc_mount_errors(*nfs_server.hostname, 1, bg); - } - -- if (nfs_pmap->pm_vers == 2) { -+ if (mnt_pmap->pm_vers <= 2) { - if (mntres.nfsv2.fhs_status != 0) { - nfs_error(_("%s: %s:%s failed, reason given by server: %s"), - progname, hostname, dirname, diff --git a/debian/patches/series b/debian/patches/series index 017d8be..1b1c418 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,10 +1,2 @@ -12-fix-nfsmount-segfault.patch 02-document-debian-init-scripts.patch 03-sm-notify-in-sbin.patch -05-ignore-quota-option.patch -06-gssd-manpage-typo.patch -07-amd64-logging-segfault.patch -08-clarify-unexport.patch -09-fix-nfsstat-option.patch -10-no-flush-blkid-cache.patch -11-honor-credential-cache-dir.patch diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..f9d9d7f --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/nfs/ nfs-utils-([\.\d]+).tar.gz -- 2.39.5