v2.12r-9

diff --git a/debian/changelog b/debian/changelog
index 32a2f8b045629e7d6e2751a85c25da9ac173b3c6..1485411acdf9d21606bc54e4ce0dc3acd4bafeed 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+util-linux (2.12r-9) unstable; urgency=low
+
+  * Release NFSv4 support. Closes: #302420, #239031, #290873
+  * Deliver isosize. Closes: #354960
+  * Fix udeb dependencies.  Closes: #360352
+
+ -- LaMont Jones <lamont@debian.org>  Sat,  6 May 2006 21:53:12 -0600
+
+util-linux (2.12r-8.2nfs4) experimental; urgency=low
+
+  * Turn on fixed nfsv4 patch.  Closes: #302420, #239031
+    Thanks to Steinar H. Gunderson <sgunderson@bigfoot.com>
+
+ -- LaMont Jones <lamont@debian.org>  Fri, 28 Apr 2006 11:04:39 -0600
+
 util-linux (2.12r-8) unstable; urgency=high
 
   * Drop NFS v4 patch, since it breaks mounting things exported by

diff --git a/debian/control b/debian/control
index 5cc53ea209b560592873e01fed98b846fac3744b..e41275f10a5aeef0586bd904d6a10b313827fe86 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: util-linux
 Section: base
 Priority: required
-Build-Depends: libncurses5-dev, libslang2-dev (>=2.0.4-1), gettext, zlib1g-dev, libblkid-dev, uuid-dev, dpatch
+Build-Depends: libncurses5-dev, libslang2-dev (>=2.0.4-1), gettext, zlib1g-dev, libblkid-dev, uuid-dev, dpatch, dpkg-dev (>=1.13.12)
 Maintainer: LaMont Jones <lamont@debian.org>
 Standards-Version: 3.6.2.0
 

diff --git a/debian/patches/00list b/debian/patches/00list
index 7d9ff22581c077045111f1b8dba06266136e967b..7868cc3737c4fee8cea9c4259077febc8043d121 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -10,7 +10,8 @@
 10sparcumount
 10warnings
 20guesshelper
-#30nfs4
+30nfs4
+30nfs4-fix
 #20xgethostname
 #50hurd
 60_opt_O1

diff --git a/debian/patches/10agetty.dpatch b/debian/patches/10agetty.dpatch
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/debian/patches/10cal-widechar.dpatch b/debian/patches/10cal-widechar.dpatch
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/debian/patches/10cfdisk.dpatch b/debian/patches/10cfdisk.dpatch
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/debian/patches/10cramfs-udebsize.dpatch b/debian/patches/10cramfs-udebsize.dpatch
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/debian/patches/10debian.dpatch b/debian/patches/10debian.dpatch
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/debian/patches/10fstab.dpatch b/debian/patches/10fstab.dpatch
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/debian/patches/10license.dpatch b/debian/patches/10license.dpatch
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/debian/patches/10misc.dpatch b/debian/patches/10misc.dpatch
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/debian/patches/10mount.dpatch b/debian/patches/10mount.dpatch
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/debian/patches/10sparcumount.dpatch b/debian/patches/10sparcumount.dpatch
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/debian/patches/10warnings.dpatch b/debian/patches/10warnings.dpatch
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/debian/patches/20guesshelper.dpatch b/debian/patches/20guesshelper.dpatch
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/debian/patches/30nfs4-fix.dpatch b/debian/patches/30nfs4-fix.dpatch
new file mode 100644 (file)
index 0000000..8a7d119
--- /dev/null
+++ b/debian/patches/30nfs4-fix.dpatch
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30nfs4-fix.dpatch by Steinar H. Gunderson <sesse@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad util-linux-2.12r~/mount/nfsmount.c util-linux-2.12r/mount/nfsmount.c
+--- util-linux-2.12r~/mount/nfsmount.c 2006-04-28 18:59:19.000000000 +0200
++++ util-linux-2.12r/mount/nfsmount.c  2006-04-28 19:00:18.000000000 +0200
+@@ -301,6 +301,7 @@
+                        (xdrproc_t)xdr_void, (caddr_t)NULL,
+                        (xdrproc_t)xdr_void, (caddr_t)&clnt_res,
+                        TIMEOUT);
++      rpc_createerr.cf_stat = stat;
+       clnt_destroy(clnt);
+       close(sock);
+       if (stat != RPC_PROGVERSMISMATCH)
+@@ -416,7 +417,8 @@
+                               return 1;
+                       memcpy(mnt_pmap, &save_mnt, sizeof(*mnt_pmap));
+               }
+-              if (rpc_createerr.cf_stat != RPC_PROGNOTREGISTERED)
++              if (rpc_createerr.cf_stat != RPC_PROGNOTREGISTERED &&
++                  rpc_createerr.cf_stat != RPC_PROGVERSMISMATCH)
+                       break;
+               memcpy(nfs_pmap, &save_nfs, sizeof(*nfs_pmap));
+       }

diff --git a/debian/patches/60_opt_O1.dpatch b/debian/patches/60_opt_O1.dpatch
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/debian/rules b/debian/rules
index 92dc264e93e87c7cc7d73d95e9108aecb6bd43b6..967fc5a4351c3d66dbf199ae65e7cb7d75665c95 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -79,7 +79,7 @@ INITFILES = debian/hwclock.sh debian/hwclockfirst.sh
 SBINFILES += hwclock/hwclock
 endif
 BINFILES  += sys-utils/dmesg
-SBINFILES += disk-utils/{blockdev,raw} mount/pivot_root login-utils/agetty
+SBINFILES += disk-utils/{blockdev,raw,isosize} mount/pivot_root login-utils/agetty
 UBINFILES += disk-utils/fdformat
 USBINFILES = sys-utils/readprofile disk-utils/elvtune # disk-utils/setfdprm
 endif
@@ -111,7 +111,7 @@ ifneq ($(arch),$(nohwclock))
 MAN8FILES += hwclock/hwclock.8
 endif
 MAN1FILES += sys-utils/readprofile.1
-MAN8FILES += login-utils/agetty.8 disk-utils/{blockdev.8,elvtune.8} \
+MAN8FILES += login-utils/agetty.8 disk-utils/{blockdev.8,elvtune.8,isosize.8} \
             sys-utils/dmesg.8 mount/pivot_root.8 \
             disk-utils/fdformat.8 disk-utils/raw.8 # disk-utils/setfdprm.8
 endif
@@ -267,12 +267,12 @@ ifeq ($(arch),$(fdisk_arch))
                cp $(CFDISK_PO_DIR)/$$LANG.gmo debian/tmp-cfdisk-udeb/usr/share/locale/$$LANG/LC_MESSAGES/util-linux.mo ; \
        done
 
-       ls debian/tmp-fdisk-udeb/usr/sbin/* | xargs dpkg-shlibdeps -pfdisk-udeb
+       ls debian/tmp-fdisk-udeb/usr/sbin/* | xargs dpkg-shlibdeps -pfdisk-udeb -tudeb
        dpkg-gencontrol -isp -pfdisk-udeb -Pdebian/tmp-fdisk-udeb -fdebian/files~
        dpkg-distaddfile fdisk-udeb_$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)_$(arch).udeb debian-installer extra
        dpkg --build debian/tmp-fdisk-udeb ../fdisk-udeb_$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)_$(arch).udeb
 
-       ls debian/tmp-cfdisk-udeb/usr/sbin/* | xargs dpkg-shlibdeps -pcfdisk-udeb
+       ls debian/tmp-cfdisk-udeb/usr/sbin/* | xargs dpkg-shlibdeps -pcfdisk-udeb -tudeb
        dpkg-gencontrol -isp -pcfdisk-udeb -Pdebian/tmp-cfdisk-udeb -fdebian/files~
        dpkg-distaddfile cfdisk-udeb_$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)_$(arch).udeb debian-installer extra
        dpkg --build debian/tmp-cfdisk-udeb ../cfdisk-udeb_$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)_$(arch).udeb