From: Guillem Jover Date: Tue, 22 Jan 2008 22:02:49 +0000 (+0200) Subject: Merge branch 'stable' X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23857e8a4490d052543937092a73e180637f4917;p=dpkg Merge branch 'stable' Conflicts: ChangeLog configure.ac debian/changelog --- 23857e8a4490d052543937092a73e180637f4917 diff --cc ChangeLog index c8f02a88,8fa8b721..4b34536c --- a/ChangeLog +++ b/ChangeLog @@@ -1,71 -1,40 +1,108 @@@ +2008-01-22 Guillem Jover + + * dpkg-deb/extract.c (extracthalf): Refactor fflush and its buggy + fpos handling to ... + (safe_fflush): ... here. New function. + +2008-01-22 Guillem Jover + + * lib/vercmp.c [0] (verrevcmp): Remove dead code. + +2008-01-22 Guillem Jover + + * 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 + + * configure.ac (AC_CHECK_HEADERS): Check for 'stddef.h'. + +2008-01-21 Colin Watson + + * 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 + + * 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 + + * lib/mlib.c (m_strdup): New function. + * lib/dpkg.h (m_strdup): New declaration. + * lib/tarfn.c: Include . + (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 + + * configure.ac: Bump version to 1.14.17~. + + 2008-01-22 Guillem Jover + + * configure.ac: Release 1.14.16.3. + + 2008-01-22 Guillem Jover + + * 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 + + * utils/start-stop-daemon.c (main): Only call initgroups if changeuser + is not NULL. + + 2008-01-22 Guillem Jover + + * 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 + + * 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 * configure.ac: Release 1.14.16.2. diff --cc debian/changelog index 896e828a,e9e95b05..b6d57259 --- a/debian/changelog +++ b/debian/changelog @@@ -1,20 -1,21 +1,39 @@@ +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 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 Tue, 22 Jan 2008 23:39:59 +0200 dpkg (1.14.16.2) unstable; urgency=low