* version-nr: update to 1.6.5

* doc/Makefile.in: install THANKS
* TODO: remove items that have been done
* lib/showcright.c: exit(0) after showing the copyright since we don't exec cat anymore
* main/configure.c: add NULL to execlp() parameters; this fixes the random segfaults when showing the conffile-diff

diff --git a/ChangeLog b/ChangeLog
index cdf53044a0e0a211930c3999e6518d672baebdf1..d4cdffbedf667cb0f75519d426d0f7db8ad94c93 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,21 @@
+Fri Dec 24 17:34:30 CET 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * version-nr: update to 1.6.5
+  * doc/Makefile.in: install THANKS
+  * TODO: remove items that have been done
+  * lib/showcright.c: exit(0) after showing the copyright since
+    we don't exec cat anymore
+  * Patch from David Huggins-Daines <dhd@eradicator.org>:
+    + main/configure.c: add NULL to execlp() parameters; this fixes the random
+      segfaults when showing the conffile-diff
+
 Fri Dec 24 15:35:29 CET 1999 Wichert Akkerman <wakkerma@debian.org>
 
   * debian/control: add Build-Depends
   * THANKS: new file which lists everyone who contributed to the code
   * Change `Debian Linux' to `Debian GNU/Linux' in a couple of manpages
   * main/enquiry.c: modify list1package to use the full width of the tty
+  * main/main.c: fix wrong call to fputs
   * Merge patches from Adam Heath:
     + lib/mlib.c: new function do_fd_copy to read a file into a fd
     + dpkg-deb/build.c: use do_fd_copy
@@ -25,7 +37,7 @@ Wed Dec 22 12:07:40 CET 1999 Wichert Akkerman <wakkerma@debian.org>
 
   * debian/dpkg-doc.postrm: Use doc-name instead of file-name (probably
     need to change the filename, but I'll be lazy now :)
-  * dselect/pkgdisplay.cc: Replace empty string for eflags to a space
+  * dselect/pkgdisplay.cc: Replace empty string for eflags with a space
     so gettext doesn't use the translation-info
   * po/update.sh: Generate dselect/helpmsgs.{cc,h} so we can translate them.
   * po/POTFILES.in: add dselect/helpmsgs.cc

diff --git a/THANKS b/THANKS
index dcfdec689c4bc03bac83af6dec21db4459db5124..46bbfdb50f772c853e25ce34770c1d23e0a42de8 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -10,6 +10,7 @@ Christophe Le Bars <clebars@teaser.fr>
 Colin Plumb
 Dan Gohman <gohmandj@mrs.umn.edu>
 Darren Stalder <torin@daft.com>
+David Huggins-Daines <dhd@eradicator.org>
 Erick Branderhorst <branderhorst@heel.fgg.eur.nl>
 Galen Hazelwood <galenh@debian.org>
 Guy Maor <maor@debian.org>

diff --git a/TODO b/TODO
index a376e51f7f9c1f9a4e71ef41785b5e78c2c77d5f..5dbc9756fc20acea332e8d3b898e193e328b67af 100644 (file)
--- a/TODO
+++ b/TODO
@@ -4,7 +4,6 @@ urgent
  * Conflicts << installation ordering
  * Version numbers in pre-depends stuff
  * Search for all pre-depends things at once, bomb out if any not found
- * field overflow in dpkg --list
  * _always_ show section in --yet-to-unpack
  * automatically do --yet-to-unpack in installation methods
  * check depending packages when installing new version.
@@ -15,8 +14,6 @@ urgent
  * logging, both transcript logs (kept briefly)
    and action logs (kept forever?)  957
  * start-stop-daemon process status check. 1480
- * remove old docs from /usr/doc/dpkg.
- * WTA: fix translations for dpkg --help which broke after adding --stop-after
  * openpgp signatures in the package archive
 
 other stuff unlikely to get done soon
@@ -30,7 +27,8 @@ other stuff unlikely to get done soon
    (when running dpkg -i)? Keeps it from being listed as obsolete, and maybe
    from being considered for auto-upgrades (apt-get needs to know about this
    too)
- * Filename field generated by --record-avail handle split packages somehow.
+ * Filename field generated by --record-avail 
+ * handle split packages somehow.
  * understand Replaces in dselect
  * provide way for package to declare ownership of files for dpkg -S
    and -L without having dpkg act on this (.psuedolist?)
@@ -41,7 +39,6 @@ other stuff unlikely to get done soon
  * local conffiles, aswell as local files that dpkg should check before
    overwriting
  * hooks
- * gzip -0 option for dpkg-deb (probably easier to add a -z# option)
  * There is no documentation. 1526
  * newbie interface to dselect. 1037
  * dselect per-half focus and keybindings improvements. 1555

diff --git a/debian/changelog b/debian/changelog
index fe6bfd487d554258617a2cc122c826a9180e3dcd..9823360c664c1aeb0bc7c0e3bc847ffa29e96cd5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ dpkg (1.6.5) unstable; urgency=low
   * Use full width of tty in packagelisting, Closes: Bug# 53395
   * Add -z option to dpkg-deb to set compressionlevel when building
     packages, Closes: Bug# 53398
+  * Fix segfaults when producing a diff between current and new conffile,
+    Closes: Bug# 52197
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 
@@ -22,7 +24,7 @@ dpkg (1.6.4) unstable; urgency=low
   * Fix architecture-detection in dpkg-gencontrol, Closes: Bug#52616
   * Accept single-number values in update-rc.d, Closes: Bug#46810
 
- -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
+ -- Wichert Akkerman <wakkerma@debian.org>  Sun, 19 Dec 1999 16:27:48 +0100
 
 dpkg (1.6.3) unstable; urgency=high
 

diff --git a/doc/Makefile.in b/doc/Makefile.in
index d9b3822fe52d6bf7828654de0153bb2af6e24ec4..ad3eeddeac9b82eb7dee034a7845df8c005a313b 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -39,7 +39,7 @@ install-doc: install-doc-recursive
                $(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/internals/$$bn ; \
        done
        $(INSTALL_DATA) $(srcdir)/ChangeLog $(DESTDIR)$(docdir)/ChangeLog.manuals
-       set -e ; for i in ChangeLog TODO ; do \
+       set -e ; for i in ChangeLog THANKS TODO ; do \
                $(INSTALL_DATA) $(top_srcdir)/$$i $(DESTDIR)$(docdir) ; \
        done
        $(INSTALL_DATA) $(top_srcdir)/COPYING $(DESTDIR)$(copyingfile)

diff --git a/dpkg-deb/main.c b/dpkg-deb/main.c
index f12dd80d121636c694c789df39143dfaf6331348..e23c4406bf176034c39eb819ccbc6ce1b3d76071 100644 (file)
--- a/dpkg-deb/main.c
+++ b/dpkg-deb/main.c
@@ -80,7 +80,7 @@ const char printforhelp[]=
      "Type dpkg --help for help about installing and deinstalling packages.");
 
 int debugflag=0, nocheckflag=0, oldformatflag=BUILDOLDPKGFORMAT;
-const char* compression=NULL;
+char* compression=NULL;
 const struct cmdinfo *cipaction=0;
 dofunction *action=0;
 

diff --git a/lib/showcright.c b/lib/showcright.c
index c0236ce40886ccd562669de12c948094bd1a256c..807a2441cc76b75dda1e9b122ce5c32fcc6e1a2b 100644 (file)
--- a/lib/showcright.c
+++ b/lib/showcright.c
@@ -30,4 +30,5 @@ void showcopyright(const struct cmdinfo *c, const char *v) {
   fd= open(COPYINGFILE,O_RDONLY);
   if (fd < 0) ohshite(_("cannot open GPL file " COPYINGFILE));
   do_fd_copy(fd, 1, _("showcopyright"));
+  exit(0);
 }

diff --git a/main/configure.c b/main/configure.c
index 694a8365c960d79f46c15ee1d9c740b1552160d0..fe69e47514a65d95cd17b17988abbfe529c82e55 100644 (file)
--- a/main/configure.c
+++ b/main/configure.c
@@ -319,7 +319,7 @@ void deferred_configure(struct pkginfo *pkg) {
              sprintf(cmdbuf, "diff -u %.250s %.250s | %.250s", cdr.buf, cdr2.buf, p);
               s= getenv(SHELLENV);
               if (!s || !*s) s= DEFAULTSHELL;
-             execlp(s,s,"-c", cmdbuf);
+             execlp(s,s,"-c", cmdbuf, NULL);
               ohshite(_("failed to run diff (%.250s)"), cmdbuf);
            }
             while ((r= waitpid(c1,&status,0)) == -1 && errno == EINTR);

diff --git a/version-nr b/version-nr
index 9edc58bb1dd8cff2f0729fabe243a96e33f9d453..9f05f9f2ce1c66b8e4327cd51e27c8c983a64293 100644 (file)
--- a/version-nr
+++ b/version-nr
@@ -1 +1 @@
-1.6.4
+1.6.5