2003-02-12 Chip Salzenberg <chip@pobox.com>

	* debian/changelog: Version 1.0.2-2.

diff --git a/ChangeLog b/ChangeLog
index 9fae2b24918700458487efdfcccd015f555bf1e7..a2c7629bbf1fcd15489d78c02e31fbd464f69053 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-12  Chip Salzenberg  <chip@pobox.com>
+
+       * debian/changelog: Version 1.0.2-2.
+
 2002-11-27  Chip Salzenberg  <chip@pobox.com>
 
        * utils/mountd/rmtab.c (slink_safe_rename): Fix off-by-one buffer

diff --git a/debian/changelog b/debian/changelog
index 3a7eae2931c7d0d17a8552732659f435838446b4..3b3fb69f0c7606110f3635e12408027c0694c7e0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+nfs-utils (1:1.0.2-2) unstable; urgency=medium
+
+  * Upstream CVS sync:
+    > Fix one-byte buffer overflow with no apparent security implications.
+      (It's a readlink on a path that should be writable only to root.)
+  * Make nfs-{common,kernel-server} depend on sysvinit 2.80-1 for invoke-rc.d.
+  * Make nfs-common depend on debconf (long overdue).
+  * Fix package description to name nfs-user-server as an alternative, rather
+    than "nfs-server" (which no longer exists).
+
+ -- Chip Salzenberg <chip@debian.org>  Wed, 12 Feb 2003 21:27:24 -0500
+
 nfs-utils (1:1.0.2-1) unstable; urgency=high
 
   * New upstream version:

diff --git a/debian/control b/debian/control
index 8b46a68de8832c83fc4b620d76678fe33263ab2f..c5925548c86aeaf5f500bd0b4f3cc9db74c81d5c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,30 +8,21 @@ Standards-Version: 3.1.1.1
 Package: nfs-kernel-server
 Priority: optional
 Architecture: any
-Depends: debconf (>= 1.0), nfs-common (>= 1:0.3.3-3), ${shlibs:Depends}
+Depends: nfs-common (>= 1:0.3.3-3), debconf (>= 1.0), sysvinit (>= 2.80-1), ${shlibs:Depends}
 Provides: knfs, nfs-server
 Conflicts: knfs, nfs-server
 Replaces: knfs, nfs-server
 Description: Kernel NFS server support
  Use this package if you have a fairly recent kernel (2.2.13 or better)
  and you want to use the kernel-mode NFS server.  The user-mode NFS
- server in the "nfs-server" package is slower but more featureful and
- easier to debug than the kernel-mode server.
- .
- Upstream: SourceForge project "nfs", CVS module nfs-utils.
-
-Package: nhfsstone
-Priority: extra
-Architecture: any
-Depends: nfs-common, ${shlibs:Depends}
-Replaces: nfs-kernel-server
-Description: NFS benchmark program.
+ server in the "nfs-user-server" package is slower but more featureful
+ and easier to debug than the kernel-mode server.
  .
  Upstream: SourceForge project "nfs", CVS module nfs-utils.
 
 Package: nfs-common
 Architecture: any
-Depends: portmap, ${shlibs:Depends}
+Depends: portmap, debconf (>= 1.0), sysvinit (>= 2.80-1), ${shlibs:Depends}
 Provides: nfs-client
 Conflicts: nfs-client
 Replaces: nfs-client
@@ -40,3 +31,12 @@ Description: NFS support files common to client and server
  server.  Programs included: lockd, statd, showmount, and nfsstat.
  .
  Upstream: SourceForge project "nfs", CVS module nfs-utils.
+
+Package: nhfsstone
+Priority: extra
+Architecture: any
+Depends: nfs-common, ${shlibs:Depends}
+Replaces: nfs-kernel-server
+Description: NFS benchmark program.
+ .
+ Upstream: SourceForge project "nfs", CVS module nfs-utils.