Update to dpkg 1.4.1.12, clean up some rejections

diff --git a/debian/changelog b/debian/changelog
index 9ba55da4aaebdb3eccdced84eae2998d4defe586..44a42beb354c2a8f2a8b8ee2ebf5a8c276678d28 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dpkg (1.4.1.12) unstable; urgency=low
+
+  * Non-maintainer release.
+  * Fix typo in chmodsafe_unlink that made dpkg chmod files that
+    weren't setuid or setgid
+
+ -- Wichert Akkerman <wakkerma@debian.org>  Sun, 26 Sep 1999 02:41:30 +0200
+
 dpkg (1.4.1.11) unstable; urgency=low
 
   * Non-maintainer release.

diff --git a/doc/manuals-version b/doc/manuals-version
index 703ead0020cdce00a585a20eb7160af5b88f98b0..cd37e106bf982ec7a15d5abccb1d21ddb7a5e2fc 100644 (file)
--- a/doc/manuals-version
+++ b/doc/manuals-version
@@ -1,2 +1,2 @@
-<!entity manuals-version "1.4.1.10">
-<!entity dpkg-version "1.4.1.10">
+<!entity manuals-version "1.4.1.11">
+<!entity dpkg-version "1.4.1.11">

diff --git a/main/enquiry.c b/main/enquiry.c
index 7e95a4976074e1e1a7ef2cded2f666120c9b8ba7..0168648076578e86e4b891415e4f086fb974f8cb 100644 (file)
--- a/main/enquiry.c
+++ b/main/enquiry.c
@@ -496,7 +496,7 @@ void assertversion(const char *const *argv,
 void assertpredep(const char *const *argv) {
   static struct versionrevision predepversion = {~0UL,0,0};
   assertversion(argv,&predepversion,"1.1.0");
-  }
+}
 
 void assertepoch(const char *const *argv) {
   static struct versionrevision epochversion = {~0UL,0,0};

diff --git a/main/help.c b/main/help.c
index 1ee9114bc52b53e371cf6ea54d60503b2ca00e49..9c74e29e88804785269eb1bee2262ac2b8c3d367 100644 (file)
--- a/main/help.c
+++ b/main/help.c
@@ -463,7 +463,7 @@ int chmodsafe_unlink(const char *pathname) {
   struct stat stab;
 
   if (lstat(pathname,&stab)) return -1;
-  if (S_ISREG(stab.st_mode) ? (stab.st_mode | 07000) :
+  if (S_ISREG(stab.st_mode) ? (stab.st_mode & 07000) :
       !(S_ISLNK(stab.st_mode) || S_ISDIR(stab.st_mode) ||
    S_ISFIFO(stab.st_mode) || S_ISSOCK(stab.st_mode))) {
     /* We chmod it if it is 1. a sticky or set-id file, or 2. an unrecognised