The branch, stable has been updated
via 110bf27287939e8b03ce91d57eb3db81c347d9ce (commit)
via 6ffa472efb61000824bdc13027fafed2080b0f6e (commit)
via b5841bbaecc7659490400eb8d105473c4b646caf (commit)
from 6585256b0f1040d5656ac4c9dce045de6c1d6323 (commit)
- Shortlog ------------------------------------------------------------
110bf27 Release 1.14.16.2
6ffa472 Move dpkg Breaks on dpkg-dev (= 1.14.13) and (= 1.14.14) to Conflicts
b5841bb s-s-d: Change uid after changing gid and initalizing supplementary
groups
Summary of changes:
ChangeLog | 9 +++++++++
TODO | 2 ++
configure.ac | 2 +-
debian/changelog | 10 ++++++++++
debian/control | 3 +--
utils/start-stop-daemon.c | 8 ++++----
6 files changed, 27 insertions(+), 7 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 110bf27287939e8b03ce91d57eb3db81c347d9ce
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Tue Jan 22 13:05:46 2008 +0200
Release 1.14.16.2
diff --git a/ChangeLog b/ChangeLog
index f315fa1..153a90a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2008-01-22 Guillem Jover <[EMAIL PROTECTED]>
+ * configure.ac: Release 1.14.16.2.
+
+2008-01-22 Guillem Jover <[EMAIL PROTECTED]>
+
* utils/start-stop-daemon.c (main): Move setuid code after initgroups
and setgid.
diff --git a/configure.ac b/configure.ac
index b1a096f..4692f5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([dpkg], [1.14.16.1], [EMAIL PROTECTED])
+AC_INIT([dpkg], [1.14.16.2], [EMAIL PROTECTED])
AC_CONFIG_SRCDIR([lib/dpkg.h])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([config])
diff --git a/debian/changelog b/debian/changelog
index ff5df76..a22bb1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dpkg (1.14.16.2) UNRELEASED; urgency=low
+dpkg (1.14.16.2) unstable; urgency=low
* Change uid after changing gid and initializing supplementary groups in
start-stop-daemon. Closes: #462018
@@ -6,7 +6,7 @@ dpkg (1.14.16.2) UNRELEASED; urgency=low
to Conflicts, so that users from etch can upgrade to sid (or lenny
once dpkg has migrated).
- -- Guillem Jover <[EMAIL PROTECTED]> Tue, 22 Jan 2008 12:52:11 +0200
+ -- Guillem Jover <[EMAIL PROTECTED]> Tue, 22 Jan 2008 13:05:22 +0200
dpkg (1.14.16.1) unstable; urgency=low
commit 6ffa472efb61000824bdc13027fafed2080b0f6e
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Tue Jan 22 13:03:51 2008 +0200
Move dpkg Breaks on dpkg-dev (= 1.14.13) and (= 1.14.14) to Conflicts
So that users from etch can upgrade to sid (or lenny once dpkg has
migrated). Those Conflicts should be removed before lenny's release.
diff --git a/TODO b/TODO
index 0ab1196..972b53f 100644
--- a/TODO
+++ b/TODO
@@ -9,6 +9,8 @@ lenny
* Triage as much bugs as possible to get the bug count below 300 ;) and
merge as much patches as possible.
+ * Remove Conflicts on dpkg-dev exact versions before the release.
+
1.14.x
------
diff --git a/debian/changelog b/debian/changelog
index 625527a..ff5df76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ dpkg (1.14.16.2) UNRELEASED; urgency=low
* Change uid after changing gid and initializing supplementary groups in
start-stop-daemon. Closes: #462018
+ * Change temporary dpkg Breaks on dpkg-dev (= 1.14.13) and (= 1.14.14)
+ to Conflicts, so that users from etch can upgrade to sid (or lenny
+ once dpkg has migrated).
-- Guillem Jover <[EMAIL PROTECTED]> Tue, 22 Jan 2008 12:52:11 +0200
diff --git a/debian/control b/debian/control
index fbe7e68..4f301a6 100644
--- a/debian/control
+++ b/debian/control
@@ -18,9 +18,8 @@ Package: dpkg
Architecture: any
Essential: yes
Pre-Depends: ${shlibs:Depends}, coreutils (>= 5.93-1)
-Breaks: dpkg-dev (= 1.14.13), dpkg-dev (= 1.14.14)
Conflicts: sysvinit (<< 2.82-1), dpkg-iasearch (<< 0.11), dpkg-static,
- dpkg-dev (<< 1.14.6)
+ dpkg-dev (<< 1.14.6), dpkg-dev (= 1.14.13), dpkg-dev (= 1.14.14)
Replaces: dpkg-doc-ja, dpkg-static, manpages-de (<= 0.4-3),
manpages-pl (<= 20051117-1)
Suggests: apt, lzma
commit b5841bbaecc7659490400eb8d105473c4b646caf
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Tue Jan 22 12:57:43 2008 +0200
s-s-d: Change uid after changing gid and initalizing supplementary groups
Closes: #462018
diff --git a/ChangeLog b/ChangeLog
index 1cb5c8a..f315fa1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-22 Guillem Jover <[EMAIL PROTECTED]>
+
+ * utils/start-stop-daemon.c (main): Move setuid code after initgroups
+ and setgid.
+
2008-01-21 Frank Lichtenheld <[EMAIL PROTECTED]>
* configure.ac: Release 1.14.16.1
diff --git a/debian/changelog b/debian/changelog
index f4145a7..625527a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dpkg (1.14.16.2) UNRELEASED; urgency=low
+
+ * Change uid after changing gid and initializing supplementary groups in
+ start-stop-daemon. Closes: #462018
+
+ -- Guillem Jover <[EMAIL PROTECTED]> Tue, 22 Jan 2008 12:52:11 +0200
+
dpkg (1.14.16.1) unstable; urgency=low
* Add libtimedate-perl to dpkg-dev's Depends and to Build-Depends.
diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index ed21c3c..2a31f73 100644
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -1413,10 +1413,6 @@ main(int argc, char **argv)
if (chdir(changedir) < 0)
fatal("Unable to chdir() to %s", changedir);
- if (changeuser != NULL && getuid() != (uid_t)runas_uid) {
- if (setuid(runas_uid))
- fatal("Unable to set uid to %s", changeuser);
- }
if (changegroup != NULL && *changegroup != '\0' &&
getgid() != (gid_t)runas_gid) {
if (!gid_in_current_groups(runas_gid))
@@ -1426,6 +1422,10 @@ main(int argc, char **argv)
if (setgid(runas_gid))
fatal("Unable to set gid to %d", runas_gid);
}
+ if (changeuser != NULL && getuid() != (uid_t)runas_uid) {
+ if (setuid(runas_uid))
+ fatal("Unable to set uid to %s", changeuser);
+ }
if (background) {
/* Continue background setup */
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
