2002-08-26 Chip Salzenberg <chip@pobox.com>

	* utils/nfsd/nfsd.man: Fix typo.
	* debian/changelog: Version 1.0.1-1.

7 files changed, 53 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 054b39e..c50ca92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-26  Chip Salzenberg  <chip@pobox.com>
+
+	* utils/nfsd/nfsd.man: Fix typo.
+	* debian/changelog: Version 1.0.1-1.
+
 2002-05-29 NeilBrown <neilb@cse.unsw.edu.au>
 
 	* let parseopts know if /etc/exports was being read or not, 
diff --git a/debian/changelog b/debian/changelog
index f09bf90..ce71df2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+nfs-utils (1:1.0.1-1) unstable; urgency=low
+
+  * New upstream version:
+    > BIG CHANGE: Exports default to "sync", that is, synchronous writes.
+      This is safer but MUCH SLOWER than the old default of "async".
+      All exports should be marked as either "sync" or "async" to avoid a
+      warning from exportfs.
+  * Patches from CVS through 2002-08-26.
+  * Let init script start statd on a specific port.  (closes: #144344)
+  * Fix typo in debconf message about tcpwrappers.  (closes: #128709)
+  * Fix typo in rpc.nfsd(8).  (closes: #152556)
+  * Add Russian templates.  (closes: #136599, #136932)
+
+ -- Chip Salzenberg <chip@debian.org>  Mon, 26 Aug 2002 12:17:57 -0400
+
 nfs-utils (1:1.0-2) unstable; urgency=low
 
   * Fail an export if its mapping option is unsupported.  (closes: #85678)
diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 31357bd..2ae17b3 100755
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -11,6 +11,10 @@
 
 PREFIX=
 
+# Should rpc.statd listen on a specific port?
+# If so, set this variable to a statd argument like: "--port 1000".
+STATDPORT=""
+
 NEED_LOCKD=yes
 if test -f /proc/ksyms
 then
@@ -32,7 +36,7 @@ case "$1" in
 	printf "Starting $DESC:"
 	printf " statd"
 	start-stop-daemon --start --quiet \
-	    --exec $PREFIX/sbin/rpc.statd
+	    --exec $PREFIX/sbin/rpc.statd -- $STATDPORT
 	if [ "$NEED_LOCKD" = yes ]
 	then
 	    printf " lockd"
diff --git a/debian/nfs-common.templates b/debian/nfs-common.templates
index 5046bfa..fe11b12 100644
--- a/debian/nfs-common.templates
+++ b/debian/nfs-common.templates
@@ -7,3 +7,7 @@ Description-de: statd benutzt tcpwrappers
  Der statd-Daemon benutzt tcpwrappers fЭr die Zugriffskontrolle. Um
  diesen zu konfigurieren, benutzen Sie den Namen "statd" in den Dateien
  /etc/hosts.allow und /etc/hosts.deny.
+Description-ru: statd использует tcp-врапперы
+ Демон  statd  использует  tcp-врапперы  для управления доступом. Чтобы
+ настроить  враппер,   используйте   имя  программы  "statd"  в  файлах
+ /etc/hosts.allow и /etc/hosts.deny.
diff --git a/debian/nfs-kernel-server.config b/debian/nfs-kernel-server.config
index 8698129..de5df58 100644
--- a/debian/nfs-kernel-server.config
+++ b/debian/nfs-kernel-server.config
@@ -2,6 +2,11 @@
 
 . /usr/share/debconf/confmodule
 
+if grep -s '^/' /etc/exports | grep -vq sync
+then
+    db_input high nfs-kernel-server/sync-default || true
+fi
+
 if fgrep -q 'rpc' /etc/hosts.allow /etc/hosts.deny
 then
     db_input high nfs-kernel-server/tcpwrappers-mountd || true
diff --git a/debian/nfs-kernel-server.templates b/debian/nfs-kernel-server.templates
index 6e95139..9596aa2 100644
--- a/debian/nfs-kernel-server.templates
+++ b/debian/nfs-kernel-server.templates
@@ -1,8 +1,16 @@
+Template: nfs-kernel-server/sync-default
+Type: note
+Description: To comply with standards and increase data safety,
+ the Linux NFS server now defaults to synchronous writes.  Since
+ this is a major change, it is not silent:  All exports should be
+ explicitly marked as either "sync" or "async".  Exports not so
+ marked will elicit warnings.
+
 Template: nfs-kernel-server/tcpwrappers-mountd
 Type: note
 Description: in /etc/hosts.{allow,deny}, replace "rpc.mountd" with "mountd"
  The mount daemon uses tcpwrappers to control access.  To configure
- it, use program name "mount" in /etc/hosts.allow and /etc/hosts.deny.
+ it, use program name "mountd" in /etc/hosts.allow and /etc/hosts.deny.
  .
  Older versions of nfs-kernel-server included a mount daemon that
  called itself "rpc.mountd".  Therefore, you should replace all
@@ -15,3 +23,12 @@ Description-de: "rpc.mountd" mit "mountd" in /etc/hosts.{allow,deny} ersetzen
  .
  Deshalb sollten Sie alle Referenzen zu "rpc.mountd" in den Dateien
  /etc/hosts.allow und /etc/hosts.deny mit "mountd" ersetzen.
+Description-ru: Замените в /etc/hosts.{allow,deny} "rpc.mountd" на "mountd"
+ Демон  монтирования  использует  для управления доступом tcp-врапперы.
+ Чтобы  их  настроить,  используйте  имя  "mountd"  в /etc/hosts.allow и
+ /etc/hosts.deny.
+ .
+ Более  старые  версии  nfs-kernel-server  включали демон монтирования,
+ который  называл  себя  "rpc.mountd".  Поэтому, вы должны заменить все
+ вхождения   "rpc.mountd"  на  "mountd"  в  файлах  /etc/hosts.allow  и
+ /etc/hosts.deny.
diff --git a/utils/nfsd/nfsd.man b/utils/nfsd/nfsd.man
index f415cfd..a890ea6 100644
--- a/utils/nfsd/nfsd.man
+++ b/utils/nfsd/nfsd.man
@@ -18,7 +18,7 @@ number of kernel threads.
 .P
 The
 .B rpc.mountd
-server provides an ancially service needed to satisfy mount requests
+server provides an ancillary service needed to satisfy mount requests
 by NFS clients.
 .SH OPTIONS
 .TP