2001-10-08 Chip Salzenberg <chip@pobox.com>

	* utils/Makefile.in: Remove Makefile in target 'distclean'.
	* utils/mountd/mountd.man: Update paths to /var/lib.
	* debian/*: Version 0.3.3-1, with Debian-specific fixes.

diff --git a/ChangeLog b/ChangeLog
index d8e822b93e21b724b299a1e1c7227df168a3da43..ddee2ebbf9105f5a30b8e45ce9fb57bbed195141 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2001-10-08  Chip Salzenberg  <chip@pobox.com>
 
 2001-10-08  Chip Salzenberg  <chip@pobox.com>
 

-       * utils/mountd/mountd.man: Updated paths to /var/lib.
+       * utils/Makefile.in: Remove Makefile in target 'distclean'.
+       * utils/mountd/mountd.man: Update paths to /var/lib.
+       * debian/*: Version 0.3.3-1, with Debian-specific fixes.

 
 2001-10-06  Preston Brown <pbrown@redhat.com>
 
 
 2001-10-06  Preston Brown <pbrown@redhat.com>
 

diff --git a/debian/changelog b/debian/changelog
index 6909446674f6a6612d486191d5d68bd2db18c775..a5f88e3ffd795b68c89723ea82dc779d566f4e19 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+nfs-utils (1:0.3.3-1) unstable; urgency=medium
+
+  * The "Life Goes On" release.
+  * New upstream version.  (closes: #113042)
+    > Avoid DNS when unexporting... important for shutdown.
+    > Recognize double-quote and \octal quoting in pathnames.
+    > Print pathnames with \octal quoting as necessary.
+  * Depend on a version of glibc that restores rpcinfo to its rightful
+    place.  (closes: #102400)
+  * Fix pathname in mountd doc.  (closes: #112088)
+  * debian/nfs-kernel-server.postinst: Remove rc.d symlinks to old
+    nfs-server init script, which doesn't realize when it's been removed.
+    (closes: #97099)
+  * Warn users about "rpc.mountd" -> "mountd" in /etc/hosts.{allow,deny}.
+    This marks my first use of debconf!  W00T!  (closes: #92671)
+
+ -- Chip Salzenberg <chip@debian.org>  Mon,  8 Oct 2001 15:04:08 -0700
+

 nfs-utils (1:0.3.2-2) unstable; urgency=low
 
   * Rebuild with new libc.  (closes: #97252, #97455, #99829, #100317)
 nfs-utils (1:0.3.2-2) unstable; urgency=low
 
   * Rebuild with new libc.  (closes: #97252, #97455, #99829, #100317)


@@ -214,6 +232,3 @@ nfs-utils (0.1.3-1) unstable; urgency=low
 
  -- Chip Salzenberg <chip@valinux.com>  Fri,  3 Dec 1999 20:00:00 -0800
 
 
  -- Chip Salzenberg <chip@valinux.com>  Fri,  3 Dec 1999 20:00:00 -0800
 

-Local variables:
-mode: debian-changelog
-End:

diff --git a/debian/control b/debian/control
index c1088351e59ea50a40fb01631fb0ce9b89a9fcfe..2004be106c8aac537d14e0e5a11b560ed34077d7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.1.1.1
 
 Package: nfs-kernel-server
 Architecture: any
 
 Package: nfs-kernel-server
 Architecture: any

-Depends: nfs-common (>= 1:0.1.5), ${shlibs:Depends}
+Depends: debconf (>= 1.0), nfs-common (>= 1:0.1.5), ${shlibs:Depends}

 Provides: knfs, nfs-server
 Conflicts: knfs, nfs-server
 Replaces: knfs, nfs-server
 Provides: knfs, nfs-server
 Conflicts: knfs, nfs-server
 Replaces: knfs, nfs-server

diff --git a/debian/nfs-kernel-server.config b/debian/nfs-kernel-server.config
new file mode 100644 (file)
index 0000000..e0baf75
--- /dev/null
+++ b/debian/nfs-kernel-server.config
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+. /usr/share/debconf/confmodule
+
+db_input high nfs-kernel-server/tcpwrappers-mountd || true
+db_go
+

diff --git a/debian/nfs-kernel-server.postinst b/debian/nfs-kernel-server.postinst
index 6a343fc6f7c34725b1b9801c8a76efda052d222d..e02d8ee6a738934f5b6ba218db0a9990cec3cd4b 100755 (executable)
--- a/debian/nfs-kernel-server.postinst
+++ b/debian/nfs-kernel-server.postinst
@@ -2,8 +2,12 @@
 
 #DEBHELPER#
 
 
 #DEBHELPER#
 

+. /usr/share/debconf/confmodule
+

 case "$1" in
     configure)
 case "$1" in
     configure)

+       db_get nfs-kernel-server/tcpwrappers-mountd || true
+

        mkdir -p /var/lib/nfs
        touch /var/lib/nfs/xtab /var/lib/nfs/etab /var/lib/nfs/rmtab
        if test -s /etc/exports
        mkdir -p /var/lib/nfs
        touch /var/lib/nfs/xtab /var/lib/nfs/etab /var/lib/nfs/rmtab
        if test -s /etc/exports


@@ -16,6 +20,10 @@ case "$1" in
 EOF
        fi
 
 EOF
        fi
 

+       # The old nfs-server's init script can't tell that it's been
+       # removed, so we have to kill the symlinks to it.
+       update-rc.d -f nfs-server remove
+

        update-rc.d nfs-kernel-server defaults 20 80 >/dev/null 2>&1
 
        /etc/init.d/nfs-kernel-server start
        update-rc.d nfs-kernel-server defaults 20 80 >/dev/null 2>&1
 
        /etc/init.d/nfs-kernel-server start

diff --git a/debian/nfs-kernel-server.templates b/debian/nfs-kernel-server.templates
new file mode 100644 (file)
index 0000000..2ed964d
--- /dev/null
+++ b/debian/nfs-kernel-server.templates
@@ -0,0 +1,9 @@
+Template: nfs-kernel-server/tcpwrappers-mountd
+Type: note
+Description: in /etc/hosts.{allow,deny}, replace "rpc.mountd" with "mountd"
+ Older versions of nfs-kernel-server included a mount daemon that
+ called itself "rpc.mountd".  The current mount daemon, however, calls
+ itself just plain "mountd".
+ .
+ Therefore, you should replace all occurrences of "rpc.mountd" with
+ "mountd" in /etc/hosts.allow and /etc/hosts.deny.

diff --git a/debian/rules b/debian/rules
index fa1fc0acadf78c74c30b22a46c378240e5e4b6c3..536853119f1124a8b3e6e6b196ff8947138017cd 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -64,9 +64,13 @@ binary-arch: build
        dh_strip
        dh_compress
        dh_fixperms
        dh_strip
        dh_compress
        dh_fixperms

+       dh_installdebconf

        dh_installdeb
 #      dh_makeshlibs
        dh_shlibdeps
        dh_installdeb
 #      dh_makeshlibs
        dh_shlibdeps

+       # Hackery Begins Here #
+       perl -pi -e 's/2\.2\.4-2/2.2.4-1/g' debian/*substvars
+       # Hackery Ends Here #

        dh_gencontrol
        dh_md5sums
        dh_builddeb
        dh_gencontrol
        dh_md5sums
        dh_builddeb

diff --git a/utils/Makefile.in b/utils/Makefile.in
index fbd9b3d54696466ab0f3bc31e8149aed89dc75c3..8f258796100384c472e80ab57740a001a1325e92 100644 (file)
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -8,3 +8,6 @@ SUBDIRS = exportfs mountd nfsd statd nfsstat @RQUOTAD@ showmount \
 include $(TOP)rules.mk
 
 # .EXPORT_ALL_VARIABLES:
 include $(TOP)rules.mk
 
 # .EXPORT_ALL_VARIABLES:

+
+distclean::
+       rm -f Makefile