Merge branch 'stable'

Conflicts:

	ChangeLog
	configure.ac
	debian/changelog

ChangeLog

@@ -66,6 +66,15 @@
 
 	* configure.ac: Bump version to 1.14.17~.
 
+2008-01-22  Guillem Jover  <guillem@debian.org>
+
+	* configure.ac: Release 1.14.16.2.
+
+2008-01-22  Guillem Jover  <guillem@debian.org>
+
+	* utils/start-stop-daemon.c (main): Move setuid code after initgroups
+	and setgid.
+
 2008-01-21  Frank Lichtenheld  <djpig@debian.org>
 
 	* configure.ac: Release 1.14.16.1

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

debian/changelog

@@ -9,6 +9,16 @@ dpkg (1.14.17) UNRELEASED; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Mon, 21 Jan 2008 10:11:55 +0200
 
+dpkg (1.14.16.2) unstable; 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 <guillem@debian.org>  Tue, 22 Jan 2008 13:05:22 +0200
+
 dpkg (1.14.16.1) unstable; urgency=low
 
   * Add libtimedate-perl to dpkg-dev's Depends and to Build-Depends.

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

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 */