Imported Debian patch 1.1.1~git-20070706-1

diff --git a/debian/changelog b/debian/changelog
index f3aa7670a4a9b78306fb389b6c08a0a0b4938a44..d0f3c5f2076a2d7bcdd83af4e525662cbfbe6296 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+nfs-utils (1:1.1.1~git-20070706-1) unstable; urgency=low
+
+  * New upstream release.
+    * Fixes the "bg" mount option. (Closes: #301955)
+    * Update debian/copyright to tell that we're on git snapshots again.
+    * Remove 01-fix-hostent-memory-leak.diff and 04-umount-exit-status.patch,
+      as they are included in upstream now.
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Mon, 06 Aug 2007 20:01:49 +0200
+
 nfs-utils (1:1.1.0-14) unstable; urgency=low
 
   * Install mount.nfs setuid directly instead of doing dpkg-statoverride in

diff --git a/debian/copyright b/debian/copyright
index 4dc910c11a5d8f012020db628c82485cff2ee94d..abcfdf9e46de8680366453019f3750a08f162bd2 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,13 @@
 This package was debianized by Chip Salzenberg <chip@debian.org> on Fri,  3 Dec 1999 20:00:00 -0800
 
-It was downloaded from http://sourceforge.net/projects/nfs/.
+This is a git snapshot, downloaded August 6th, 2007 using
+the following commands:
+
+  git clone git://git.linux-nfs.org/pub/linux/nfs-utils/ nfs-utils-1.1.1\~git-20070706
+  ( cd nfs-utils-1.1.1\~git-20070706/ && sh ./autogen.sh )
+  tar --exclude=.git -zcf nfs-utils_1.1.1\~git-20070706.orig.tar.gz nfs-utils-1.1.1\~git-20070706
+
+Regular releases are avilable from http://sourceforge.net/projects/nfs/.
 
 View individual source files for respective authors.
 

diff --git a/debian/patches/01-fix-hostent-memory-leak.diff b/debian/patches/01-fix-hostent-memory-leak.diff
deleted file mode 100644 (file)
index 8bbd42d..0000000
--- a/debian/patches/01-fix-hostent-memory-leak.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: nfs-utils-1.1.0/support/export/client.c
-===================================================================
---- nfs-utils-1.1.0.orig/support/export/client.c
-+++ nfs-utils-1.1.0/support/export/client.c
-@@ -262,6 +262,7 @@ client_compose(struct in_addr addr)
-                       name = add_name(name, clp->m_hostname);
-               }
-       }
-+      free(he);
-       return name;
- }
- 

diff --git a/debian/patches/04-umount-exit-status.patch b/debian/patches/04-umount-exit-status.patch
deleted file mode 100644 (file)
index bba5bfd..0000000
--- a/debian/patches/04-umount-exit-status.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-mount.c seems to assume that nfsumount() uses standard C true/false
-return values, and inverts them for the exit status (where 0 is
-traditionally considered success). However, nfsumount() consistently
-seems to use 0 for success, and thus a success gets returned as exit
-status 1 and a failure as exit status 0. This confuses at least
-the GNOME drive manager applet, and probably others as well.
-
-Index: nfs-utils-1.1.0/utils/mount/mount.c
-===================================================================
---- nfs-utils-1.1.0.orig/utils/mount/mount.c
-+++ nfs-utils-1.1.0/utils/mount/mount.c
-@@ -371,7 +371,7 @@ int main(int argc, char *argv[])
-                       umount_usage();
-                       exit(1);
-               }
--              exit(nfsumount(argc, argv) ? 0 : 1);
-+              exit(nfsumount(argc, argv));
-       }
- 
-       if(argv[1] && argv[1][0] == '-') {

diff --git a/debian/patches/series b/debian/patches/series
index 25e339a95014780f000a2eab05cef1fed6c0e59f..6ecb52c76497dcdd34fc5ec7ff8932d3eef57183 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
-01-fix-hostent-memory-leak.diff
 02-document-debian-init-scripts.patch
 03-sm-notify-in-sbin.patch
-04-umount-exit-status.patch
 05-ignore-quota-option.patch
 06-gssd-manpage-typo.patch