Merge recent changelog entries.

diff --git a/debian/changelog b/debian/changelog
index 2bf4967f921db09ca6c23f3486a1f251b0d91dec..a3639eaa167c919635c8653d6fff5e0f904c310e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,49 +1,42 @@
-userv (0.60) unstable; urgency=low
+userv (0.60.1) frozen unstable; urgency=high
 
-  * Fixed assertion failure if user's home directory not accessible.
+  * Fixed failure to save pathnames in a couple of places in parser.c.
+    Without this, include-directory would often try to open a garbage
+    filename.  This could be a security problem in certain cases where
+    user-owned config files were included from sysadmin-defined files,
+    and the sysadmin wants to control how a user provides services.
 
- --
+  * Fix failure to terminate string properly in parser.c, which would usually
+    cause "-quoted strings to be mishandled.  (This is not thought to
+    be security-critical, and the bug can be avoided by not using
+    "-quoted strings in configuration files.)
 
-userv (0.59.2) unstable; urgency=low
+  * Fixed spurious assertion failure if user's home directory not
+    accessible.
 
-  * Reran autoconf.
-
- -- Ian Jackson <ian@davenant.greenend.org.uk>  Sat, 30 Jan 1999 20:48:46 +0000
+  * Fixed a couple of memory and fd leaks in error exits from
+    include-directory and include-lookup in parser.c.
 
-userv (0.59.1) unstable; urgency=low
+  * Debian and `upstream' version integrated; Changelogs merged.
 
-  * autoconf-generated files included in CVS.
-  * Changelogs merged.
+  * Provided `system.default' file checks /etc/userv/services.d and
+    /etc/userv/default.d; system.override runs /etc/userv/override.d.
 
- -- Ian Jackson <ian@davenant.greenend.org.uk>  Sat, 30 Jan 1999 19:43:57 +0000
+  * Add <string.h> to servexec.c.
+  * Add -D_GNU_SOURCE to CFLAGS in configure.in.
+  * Braces added in client.c to prevent GCC `ambiguous else' warning.
 
-userv (0.59) unstable; urgency=low
+  * Reran autoconf.
+  * autoconf-generated files included in CVS.
 
-  * New upstream version which fixes the problems fixed in NMUs.
-  * Debian and mainstream version integrated.
+  * Debian package description mentions use by system admin.
 
- -- Ian Jackson <ian@davenant.greenend.org.uk>  Sat, 30 Jan 1999 19:39:39 +0000
+ -- 
 
 
 *** Main changelog file included here - see far down this file for the
-*** pre-0.59 Debian-specific changes.
-  
-
-userv (0.59); urgency=high
-  
-  * Fix failure to terminate string properly in parser.c, which could
-    cause some problems with "-quoted strings.  (This is not thought to be
-    security-critical, and the bug can be avoided by not using "-quoted
-    strings in configuration files.)
-  
-  * Provided `system.default' file checks /etc/userv/services.d and
-    /etc/userv/default.d; system.override runs /etc/userv/override.d.
-  
-  * Add <string.h> to servexec.c.
-  * Add -D_GNU_SOURCE to CFLAGS in configure.in.
-  * Braces added in client.c to prevent GCC `ambiguous else' warning.
+*** pre-0.60 Debian-specific changes.
 
- -- Ian Jackson <ian@davenant.greenend.org.uk>  Sat, 30 Jan 1999 19:37:17 +0000
 
 userv (0.58); urgency=high
 
@@ -85,12 +78,12 @@ userv (0.56); urgency=medium
 
 userv (0.55.2); urgency=low
 
-  * Added info about WWW page, mailing lists and bug reporting to README.  
-  
+  * Added info about WWW page, mailing lists and bug reporting to README.
+
   * clean targets except realclean don't remove spec.html, spec.ps,
     lexer.[lc], tokens.h, overview.ps.  New totalclean target for
     removing configure and config.h.in.
-  
+
   * Added <sys/types.h> and <errno.h> to lexer.l.m4.
   * <sys/wait.h> instead of <wait.h>; %d instead of %ld for WEXITSTATUS
     in overlord.c; PIPEMAXLEN etc. #defines include cast to int to avoid