scripts/dpkg-divert.pl: only allow absolute filenames

main/configure.c: add -N option to diff invocation

diff --git a/ChangeLog b/ChangeLog
index b652833fddec01b889a2442d7ec3b1300c256768..c2722acae22e0f2f109906d8548b3b5afd3c868f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jan 21 20:09:36 SGT 2001 Wichert Akkerman <wakkerma@debian.org>
+
+  * scripts/dpkg-divert.pl: only allow absolute filenames
+  * main/configure.c: add -N option to diff invocation
+
 Mon Jan 15 07:27:10 CET 2001 peter karlsson <peterk@debian.org>
 
   * po/sv.po: Updated Swedish translation.

diff --git a/debian/changelog b/debian/changelog
index c9927c4fb3c2759fb00ace339775265a49f85943..a5f65bb9941bbfdc353e1c651f27fd41997a6612 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ dpkg (1.9.0) unstable; urgency=low
   * remove --import option from dpkg-statoverride, Closes: Bug#81358
   * Replace nfmalloc implementation with obstack. Added obstack.[ch] to
     optlib, for non-GNU systems.
+  * dpkg-divert only allows absolute filenames now. Closes: Bug#82419
+  * Handle diffs from non-existing files to existing files. Closes: Bug#82708
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

diff --git a/main/configure.c b/main/configure.c
index af1fd59cfce7896a705099a8bd97f104d8f7800c..2b83eb69798eb311e149cb1bb7ee4dfafbfa3b0a 100644 (file)
--- a/main/configure.c
+++ b/main/configure.c
@@ -316,7 +316,7 @@ void deferred_configure(struct pkginfo *pkg) {
              char cmdbuf[1024];
              p= getenv(PAGERENV);
              if (!p || !*p) p= DEFAULTPAGER;
-             sprintf(cmdbuf, "diff -u %.250s %.250s | %.250s", cdr.buf, cdr2.buf, p);
+             sprintf(cmdbuf, "diff -Nu %.250s %.250s | %.250s", cdr.buf, cdr2.buf, p);
               s= getenv(SHELLENV);
               if (!s || !*s) s= DEFAULTSHELL;
              execlp(s,s,"-c", cmdbuf, NULL);

diff --git a/scripts/dpkg-divert.pl b/scripts/dpkg-divert.pl
index 310b867506d06396a3e19581a8f3b2b262f23159..03c591c9d542f33dc30d5cc2eef66b918e12a8b4 100755 (executable)
--- a/scripts/dpkg-divert.pl
+++ b/scripts/dpkg-divert.pl
@@ -117,9 +117,11 @@ close(O);
 if ($mode eq 'add') {
     @ARGV == 1 || &badusage("--add needs a single argument");
     $file= $ARGV[0];
+    $file =~ m#^/# || &badusage("filename \"$file\" is not absolute");
     $file =~ m/\n/ && &badusage("file may not contain newlines");
        -d $file && &badusage("Cannot divert directories");
     $divertto= "$file.distrib" unless defined($divertto);
+    $divertto =~ m#^/# || &badusage("filename \"$divertto\" is not absolute");
     $package= ':' unless defined($package);
     for ($i=0; $i<=$#contest; $i++) {
         if ($contest[$i] eq $file || $altname[$i] eq $file ||