The branch, master has been updated
       via  ac3aee6b63d9357bea7c78dd7d73e0fad4f32f59 (commit)
       via  110bf27287939e8b03ce91d57eb3db81c347d9ce (commit)
       via  6ffa472efb61000824bdc13027fafed2080b0f6e (commit)
       via  b5841bbaecc7659490400eb8d105473c4b646caf (commit)
      from  fb312088e4031edc1ed1a241f8c5f4953970bec4 (commit)


- Shortlog ------------------------------------------------------------
ac3aee6 Merge branch 'stable'

Summary of changes:
 ChangeLog                 |    9 +++++++++
 TODO                      |    2 ++
 debian/changelog          |   10 ++++++++++
 debian/control            |    3 +--
 utils/start-stop-daemon.c |    8 ++++----
 5 files changed, 26 insertions(+), 6 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit ac3aee6b63d9357bea7c78dd7d73e0fad4f32f59
Merge: fb312088e4031edc1ed1a241f8c5f4953970bec4 
110bf27287939e8b03ce91d57eb3db81c347d9ce
Author: Guillem Jover <[EMAIL PROTECTED]>
Date:   Tue Jan 22 13:30:49 2008 +0200

    Merge branch 'stable'
    
    Conflicts:
    
        ChangeLog
        configure.ac
        debian/changelog

diff --combined ChangeLog
index 820ad55,153a90a..c8f02a8
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,71 -1,12 +1,80 @@@
  2008-01-22  Guillem Jover  <[EMAIL PROTECTED]>
  
 +      * dpkg-deb/extract.c (extracthalf): Refactor fflush and its buggy
 +      fpos handling to ...
 +      (safe_fflush): ... here. New function.
 +
 +2008-01-22  Guillem Jover  <[EMAIL PROTECTED]>
 +
 +      * lib/vercmp.c [0] (verrevcmp): Remove dead code.
 +
 +2008-01-22  Guillem Jover  <[EMAIL PROTECTED]>
 +
 +      * lib/dpkg.h [!offsetof] (offsetof): New compatibilty macro.
 +      * lib/parsedump.h (PKGIFPOFF): Use offsetof instead of ad-hoc
 +      calculation.
 +      (FILEFOFF): Likewise.
 +      (struct fieldinfo): Change integer member type to size_t.
 +      * lib/tarfn.c (TarChecksumOffset): Use offsetof instead of ad-hoc
 +      calculation.
 +
 +2008-01-22  Guillem Jover  <[EMAIL PROTECTED]>
 +
 +      * configure.ac (AC_CHECK_HEADERS): Check for 'stddef.h'.
 +
 +2008-01-21  Colin Watson  <[EMAIL PROTECTED]>
 +
 +      * dselect/pkgkeys.cc (packagelist_korgbindings): Add 'C'.
 +      (packagelist_kinterps): Add 'revertinstalled'.
 +      * dselect/bindings.cc (keybindings::descriptions): Likewise.
 +      * dselect/pkglist.h (class packagelist): Add kd_revertinstalled.
 +      * dselect/pkgcmds.cc (packagelist::kd_revertinstalled): New method.
 +      * man/dselect.1: Document new 'C' keybinding.
 +
 +2008-01-21  Guillem Jover  <[EMAIL PROTECTED]>
 +
 +      * dpkg-deb/build.c (getfi): Use m_malloc instead of malloc.
 +      (do_build): Likewise.
 +      * dpkg-deb/extract.c (extracthalf): Likewise.
 +      * lib/mlib.c (buffer_write): Likewise.
 +      (buffer_copy): Likewise.
 +      * lib/myopt.c (loadcfgfile): Likewise.
 +      * lib/parse.c (parsedb): Likewise.
 +      * lib/showpkg.c (alloclstitem): Likewise.
 +      (parsefield): Likewise.
 +      (parsestring): Likewise.
 +      * lib/tarfn.c (StoC): Likewise.
 +      (TarExtractor): Likewise.
 +      * src/archives.c (try_deconfigure_can): Likewise.
 +      * src/main.c (execbackend): Likewise.
 +
 +2008-01-21  Guillem Jover  <[EMAIL PROTECTED]>
 +
 +      * lib/mlib.c (m_strdup): New function.
 +      * lib/dpkg.h (m_strdup): New declaration.
 +      * lib/tarfn.c: Include <dpkg.h>.
 +      (TarExtractor): Use m_strdup instead of strdup.
 +      * lib/database.c (findpackage): Likewise.
 +      * lib/myopt.c (myfileopt): Likewise.
 +      * dpkg-deb/build.c (getfi): Likewise.
 +      * src/configure.c (md5hash): Likewise.
 +      * src/help.c (vbuildarglist): Likewis.
 +      * src/main.c (execbackend): Likewise.
 +      (commandfd): Likewise.
 +
 +2008-01-21  Guillem Jover  <[EMAIL PROTECTED]>
 +
 +      * configure.ac: Bump version to 1.14.17~.
 +
++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.
+ 
  2008-01-21  Frank Lichtenheld  <[EMAIL PROTECTED]>
  
        * configure.ac: Release 1.14.16.1
@@@ -80,7 -21,6 +89,7 @@@
        with Perl itself. But to me it seems not worth
        trying to replace that code.
  
 +
  2008-01-21  Guillem Jover  <[EMAIL PROTECTED]>
  
        * configure.ac: Release 1.14.16.
diff --combined debian/changelog
index 5b2408b,a22bb1b..b8b8cbb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,13 +1,24 @@@
 +dpkg (1.14.17) UNRELEASED; urgency=low
 +
 +  [ Guillem Jover ]
 +  * Replace strdup plus error checking usage with a new m_strdup function.
 +    Closes: #379028
 +  * Add new keybinding in dselect to restore all selections back to
 +    whatever's currently installed. Closes: #151540
 +    Thanks to Colin Watson.
 +
 + -- Guillem Jover <[EMAIL PROTECTED]>  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 <[EMAIL PROTECTED]>  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.

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to