Explorar o código

Update to dpkg 1.4.1.12, clean up some rejections

Wichert Akkerman %!s(int64=27) %!d(string=hai) anos
pai
achega
1d2321a158
Modificáronse 4 ficheiros con 12 adicións e 4 borrados
  1. 8 0
      debian/changelog
  2. 2 2
      doc/manuals-version
  3. 1 1
      main/enquiry.c
  4. 1 1
      main/help.c

+ 8 - 0
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.

+ 2 - 2
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">

+ 1 - 1
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};

+ 1 - 1
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