From: Wichert Akkerman Date: Mon, 27 Sep 1999 01:42:33 +0000 (+0000) Subject: Update to dpkg 1.4.1.12, clean up some rejections X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d2321a158c5683bfb624991773e6df6199f0c92;p=dpkg Update to dpkg 1.4.1.12, clean up some rejections --- diff --git a/debian/changelog b/debian/changelog index 9ba55da4..44a42beb 100644 --- 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 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 703ead00..cd37e106 100644 --- a/doc/manuals-version +++ b/doc/manuals-version @@ -1,2 +1,2 @@ - - + + diff --git a/main/enquiry.c b/main/enquiry.c index 7e95a497..01686480 100644 --- 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 1ee9114b..9c74e29e 100644 --- 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