The branch, master has been updated
       via  23857e8a4490d052543937092a73e180637f4917 (commit)
       via  4f5bfb5f777f859cdad0757adfb0d662a361a673 (commit)
       via  fb08b88f65d57baa742f33e8e6ec36a772fe801a (commit)
       via  00f6e12340ad050e96f9126dfe328f7f3c9fb128 (commit)
       via  2a7fb2bfef928c26a137e4649793feac79ec00b1 (commit)
       via  aa398d55bd6e6348c60192fa8f585793b24c867c (commit)
       via  572f408d18109c39bac7084f88732572053a102e (commit)
      from  87d4a19fdcb72e67c88584c4ccfa5b5ac2b88d7f (commit)


- Shortlog ------------------------------------------------------------
23857e8 Merge branch 'stable'

Summary of changes:
 ChangeLog                  |   37 +++++++++++++
 debian/changelog           |   19 +++++++
 man/dpkg-genchanges.1      |    3 +
 scripts/dpkg-genchanges.pl |    7 +--
 scripts/dpkg-gencontrol.pl |    3 +-
 scripts/dpkg-source.pl     |    2 +-
 utils/start-stop-daemon.c  |  123 +++++++++++++++++---------------------------
 7 files changed, 111 insertions(+), 83 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 23857e8a4490d052543937092a73e180637f4917
Merge: 87d4a19fdcb72e67c88584c4ccfa5b5ac2b88d7f 
4f5bfb5f777f859cdad0757adfb0d662a361a673
Author: Guillem Jover <[EMAIL PROTECTED]>
Date:   Wed Jan 23 00:02:49 2008 +0200

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

diff --combined ChangeLog
index c8f02a8,8fa8b72..4b34536
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,73 -1,42 +1,110 @@@
  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.3.
+ 
+ 2008-01-22  Guillem Jover  <[EMAIL PROTECTED]>
+ 
+       * utils/start-stop-daemon.c (tvselector): Remove typedef.
+       (tvselector_sec): Remove function.
+       (tvselector_usec): Likewise.
+       (TVCALC_ELEM): Remove macro.
+       (TVCALC): Likewise.
+       (tsub): New function.
+       (tmul): Likewise.
+       (run_stop_schedule): Use tsub and tmul instead of TVCALC. Make sure
+       the time is not negative.
+ 
+ 2008-01-22  Guillem Jover  <[EMAIL PROTECTED]>
+ 
+       * utils/start-stop-daemon.c (main): Only call initgroups if changeuser
+       is not NULL.
+ 
+ 2008-01-22  Guillem Jover  <[EMAIL PROTECTED]>
+ 
+       * utils/start-stop-daemon.c (gid_in_current_groups): Remove function.
+       (main): Call initgroups if the real user or group are different than
+       the ones we should switch to. Call setgid before initgroups.
+ 
+ 2008-01-22  Raphael Hertzog  <[EMAIL PROTECTED]>
+ 
+       * scripts/dpkg-genchanges.pl, scripts/dpkg-gencontrol.pl,
+       scripts/dpkg-source.pl: Remove the IO-layer that converts to
+       UTF-8. It's not as smart as I expected.
+ 
+       * scripts/dpkg-genchanges.pl: Do not substitute variables on
+       the output.
+       * man/dpkg-genchanges.pl: Document this change.
+ 
+ 2008-01-22  Guillem Jover  <[EMAIL PROTECTED]>
+ 
        * configure.ac: Release 1.14.16.2.
  
  2008-01-22  Guillem Jover  <[EMAIL PROTECTED]>
@@@ -89,7 -58,6 +126,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 896e828,e9e95b0..b6d5725
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,22 +1,40 @@@
 +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.
 +
 +  [ Updated manpages translations ]
 +  * German (Helge Kreutzmann).
 +
 +  [ Updated scripts translations ]
 +  * German (Helge Kreutzmann).
 +  * Swedish (Peter Karlsson).
 +
 + -- Guillem Jover <[EMAIL PROTECTED]>  Mon, 21 Jan 2008 10:11:55 +0200
 +
+ dpkg (1.14.16.3) unstable; urgency=low
+ 
+   [ Raphael Hertzog ]
+   * Remove the ":utf8" layer that utf8-encodes already valid utf8.
+     Closes: #462098
+   * Disable variable substitution in dpkg-genchanges. Closes: #462079, #462089
+ 
+   [ Guillem Jover ]
+   * Make start-stop-daemon set the supplementary groups if the real user or
+     group are different than the ones we should switch to. Closes: #462075
+   * Fix segfault in start-stop-daemon when using --group w/o --chuid (as
+     a side effect, using --group alone works for the first time in years).
+     Closes: #462072
+   * Fix timeout computations for start-stop-daemon --retry option. This has
+     not worked properly for a long time (maybe never), but came to light
+     due to #460903's fix. Closes: #462104
+ 
+  -- Guillem Jover <[EMAIL PROTECTED]>  Tue, 22 Jan 2008 23:39:59 +0200
+ 
  dpkg (1.14.16.2) unstable; urgency=low
  
    * Change uid after changing gid and initializing supplementary groups in

-- 
dpkg's main repository


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

Reply via email to