diff --git a/.gitignore b/.gitignore index 8052d2a..42b224d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ # Inherited ignores *.a *.o +*.so *.gcno *.gcda *.gcov diff --git a/ChangeLog.old b/ChangeLog.old index ba9d1b3..a20e9ac 100644 --- a/ChangeLog.old +++ b/ChangeLog.old @@ -297,7 +297,7 @@ 2009-02-06 Raphaël Hertzog - * scripts/update-alternatives.pl: Ensure that a non-existant + * scripts/update-alternatives.pl: Ensure that a non-existent alternative result in automatic mode configuration. 2009-02-06 Raphaël Hertzog @@ -4901,7 +4901,7 @@ 2007-10-12 Frank Lichtenheld - * man/dpkg.1 (AUTHORS): Remove some unneccessary markup. + * man/dpkg.1 (AUTHORS): Remove some unnecessary markup. Allows reuse of one more msgid. * man/Makefile.am (update-po): New target to easily @@ -5070,7 +5070,7 @@ * scripts/dpkg-source.pl (handleformat): Include a trailing HT character in the diff labels if - the filename contains spaces. Apparantly this is + the filename contains spaces. Apparently this is standard but undocumented diff behaviour. 2007-09-30 Frank Lichtenheld @@ -5386,7 +5386,7 @@ maintainer_script_installed depending on the conflictor variable. * src/packages.c (dependencies_ok): Remove comment stating that Breaks needs to be implemented. - * src/depcon.c (depisok): Likewise. Remove return at the beggining + * src/depcon.c (depisok): Likewise. Remove return at the beginning of the function checking for a Breaks dependency, that was efectively making it a no-op in that case. * src/processarc.c (process_archive): Fix indentation. Split calls @@ -6575,7 +6575,7 @@ * scripts/controllib.pl (usageerr): Do not mark "%s: %s" for translation. * scripts/changelog/debian.pl: Remove "or argument" from the - "unkown option" string to merge it with other similar ones. + "unknown option" string to merge it with other similar ones. * scripts/dpkg-distaddfile.pl: Quote '%s' in the "unknown option" string. * scripts/dpkg-source.pl: Likewise. @@ -7077,7 +7077,7 @@ 2006-04-19 Nicolas Francois - * man/C/install-info.8: Add a missing quote arround the date. + * man/C/install-info.8: Add a missing quote around the date. * man/C/dpkg-source.1: Add a reference to the Debian Policy Manual for a detailed description of the shlibs format. Thanks to Russ Allbery. @@ -7386,7 +7386,7 @@ and deleted configuration files. Gives and more accurate description to the user and eliminates a warning that was produced when trying to - backup a non-existant file. + backup a non-existent file. * lib/dpkg-db.h (conffile): Add `obsolete' field. * lib/dump.c (w_conffiles): Write "obsolete" at the @@ -7544,7 +7544,7 @@ multiple versions of packages in a single Packages file; use Getopt::Long instead of attempting to parse the command line ourselves and doing it badly; - get rid of unecessary hashes and arrays that aren't used at all; + get rid of unnecessary hashes and arrays that aren't used at all; output help when given the --help/-h/-? options 2006-01-29 maximilian attems @@ -7643,7 +7643,7 @@ of the version in filenames, use (?=[.-]) and (?=\.) instead. \b doesn't work in case the version ends with ~. - * AUTHORS: Updated for new maintainance team + * AUTHORS: Updated for new maintenance team * debian/copyright: Add myself as copyright holder since I also added a note to that effect with my dpkg-shlibdeps patch. @@ -7760,7 +7760,7 @@ * scripts/dpkg-source.pl: If gpg is installed, check the signature of the .dsc file before unpacking. - Allow the unpacking to suceed if the .dsc is unsigned + Allow the unpacking to succeed if the .dsc is unsigned but error out if the signature is bad. If gpg exits with a code >2 (e.g. missing key), show the user the gpg output but continue. @@ -8270,14 +8270,14 @@ name pattern. Document format of file --set-selections takes. * man/C/dpkg-source.1: Remove unnecessary references to policy - and non-existant packaging manual. Refer to dpkg-shlibdeps(1) + and non-existent packaging manual. Refer to dpkg-shlibdeps(1) for shlibs file format. Will need to document changelog format at some point. * man/C/dselect.1: Remove unnecessary reference to policy, refer other reference to the package by name. - * man/C/deb-old.5: Remove reference to non-existant packaging + * man/C/deb-old.5: Remove reference to non-existent packaging manual. - * man/C/deb.5: Remove reference to non-existant packaging + * man/C/deb.5: Remove reference to non-existent packaging manual, will have to document control contents better here later. * man/C/dpkg.1: Fix typo (fileis -> file is). @@ -8388,7 +8388,7 @@ * debian/dpkg.install: Remove md5sum-related files. * debian/copyright: Remove mentions of utils/md5sum.c. * debian/pseudo-tags: Remove md5sum tag; no point filing bugs on - a non-existant program. + a non-existent program. * ostable (netbsd): Restore missing "*" on the end of the regex. @@ -8537,7 +8537,7 @@ (rewrite_gnu): Rewrite along the lines of the code in m4/arch.m4 so they should actually be vaguely consistent now. - * scripts/Makefile.am (do_perl_subst): Replace occurances of + * scripts/Makefile.am (do_perl_subst): Replace occurrences of $pkgdatadir in scripts with the right value. 2005-01-22 Robert Millan @@ -9809,7 +9809,7 @@ Tue Apr 27 19:47:37 BST 2004 Scott James Remnant Tue Apr 27 19:23:01 BST 2004 Scott James Remnant - * main/dpkg.8: Correct reference to non-existant --force-reinstreq + * main/dpkg.8: Correct reference to non-existent --force-reinstreq option to --force-remove-reinstreq. Tue Apr 27 19:01:28 BST 2004 Ruben Porras @@ -10202,7 +10202,7 @@ Fri Sep 19 12:26:54 CDT 2003 Adam Heath Some fields may have vars in them, which breaks the validation. * dpkg-gencontrol calls substvars after parsing the control file, and then validates the substituted depends lines. Originally, - substitution occured only during writing of the final output file. + substitution occurred only during writing of the final output file. * Andreas Barth : Fix bad regex that didn't allow spaces in dependency field parsing. It now directly matches what the c code expects. It previously was @@ -11279,8 +11279,8 @@ Wed Jan 2 16:08:02 CET 2002 Wichert Akkerman Wed Jan 2 15:00:26 CET 2002 Wichert Akkerman - * scripts/dpkg-checkbuilddeps.pl: use space seperated output instead - of comma seperated + * scripts/dpkg-checkbuilddeps.pl: use space separated output instead + of comma separated Tue Jan 1 14:10:55 CET 2002 Wichert Akkerman @@ -12415,7 +12415,7 @@ Fri Apr 20 22:59:39 CEST 2001 Wichert Akkerman Fri Apr 20 14:59:14 CDT 2001 Adam Heath - * main/main.c: Accidentally commited a debug fprintf stmt in the last ci. + * main/main.c: Accidentally committed a debug fprintf stmt in the last ci. Fri Apr 20 13:42:12 CDT 2001 Adam Heath @@ -12424,7 +12424,7 @@ Fri Apr 20 13:42:12 CDT 2001 Adam Heath Fri Apr 20 13:02:23 CDT 2001 Adam Heath * po/fr.po: Fix typo. - * debian/changelog: Close additional bugs, from other already commited + * debian/changelog: Close additional bugs, from other already committed patches. Thu Apr 19 15:18:05 CEST 2001 Wichert Akkerman @@ -12438,7 +12438,7 @@ Thu Apr 19 13:36:58 CEST 2001 Wichert Akkerman Thu Apr 19 00:14:39 CDT 2001 Adam Heath - * main/enquiry.c: Errors during dpkg -s(and other similiar commands) are + * main/enquiry.c: Errors during dpkg -s(and other similar commands) are now printed on stderr. Thu Apr 19 00:03:16 CDT 2001 Adam Heath @@ -12650,7 +12650,7 @@ Sat Feb 3 18:12:18 CET 2001 Wichert Akkerman Fri Feb 2 14:27:47 CET 2001 Wichert Akkerman * scripts/dpkg-statoverride.pl: use -e instead of -f to test - for filesystem object existance + for filesystem object existence * scripts/dpkg-source.pl: swap chdir and open in extracttar to prevent race with source-directory being removed while the sh/grep process is still running. Patch from Colin Watson @@ -13156,7 +13156,7 @@ Mon Dec 4 14:42:01 CET 2000 Wichert Akkerman warning if there is a NEEDED line in the objdump output that we cannot grok. + scripts/update-rc.d.pl: fix typo in regexp for scripts - + debian/rules: remove final occurance of emacs + + debian/rules: remove final occurrence of emacs Mon Dec 4 01:34:57 CET 2000 Wichert Akkerman @@ -13699,7 +13699,7 @@ Tue Feb 15 19:57:45 CET 2000 Wichert Akkerman Sun Feb 13 01:06:46 CET 2000 Wichert Akkerman * scripts/dpkg-buildpackage.sh: we know that dpkg-architecture is - installed since we provide it, so don't test for its existance + installed since we provide it, so don't test for its existence * More updates from Marcus Brinkman: + archtable: Change first column format from CPU to CPU-OS. Add entry for i386-gnu. Update comment. @@ -14103,7 +14103,7 @@ Sat Oct 30 03:31:30 CEST 1999 Wichert Akkerman * Make it all build again * retro-actively add this ChangeLog entry * Removed bogus po/dpkg.po file - * No longer translater internal errors.. we want to see the English text + * No longer translate internal errors.. we want to see the English text in bugreports Fri Oct 29 20:16:43 EDT 1999 Ben Collins @@ -14158,7 +14158,7 @@ Mon Oct 25 11:55:35 EDT 1999 Ben Collins error reporting. Also corrected checks on shlibs.local, which wasn't really being parsed, it now works as advertised. * scripts/{dpkg-gencontrol,dpkg-source,controllib.pl}: fixed references - to old style build dep fields to match current policy ammendment + to old style build dep fields to match current policy amendment Mon Oct 25 17:12:34 CEST 1999 Wichert Akkerman @@ -14235,7 +14235,7 @@ Thu Oct 21 12:57:31 EDT 1999 Ben Collins it was already broken when there was no gcc anyway :) * Fixed missing mipseb that was supposed to be in the archtable * Better output in update-alternatives --config, now shows the - current, and the prefered choices. + current, and the preferred choices. * dpkg-name: ignore epoch when getting version * 50dpkg-dev.el: add it as a conffile for dpkg-dev * dpkg-shlibdeps: redirect STDERR to /dev/null for the dpkg fork so we @@ -14338,7 +14338,7 @@ Mon Oct 18 09:25:30 EDT 1999 Ben Collins to libtool itself after running configure, much cleaner, and reversible since libtool is a generated file * Use DESTDIR when installing instead of specifying all our - dest dirs seperately in the make line. Also fix some of the + dest dirs separately in the make line. Also fix some of the make files to use DESTDIR when installing files * Regenerated .po files and dpkg.pot. Also added update.sh to the po/ subdir for easier regenerating for cvs only @@ -14805,7 +14805,7 @@ dpkg (1.4.0.24) unstable; urgency=low against libraries it depends on). Code by Richard Braakman and Yann Dirson . * debian/rules: remove all reference to the packaging manual as it is - now provided by the seperate "packaging-manual" package. [#21581, + now provided by the separate "packaging-manual" package. [#21581, #21186, #22698, #23342] * debian/rules: link dpkg-divert.1.gz to undocumented.7.gz as the lack of a real manpage has been reported in #11093. @@ -14946,7 +14946,7 @@ dpkg (1.4.0.15) experimental; urgency=low * Provide 50dpkg-dev.el for xemacs as well as emacs. * Explicitly provide path for debian-changelog-mode in 50dpkg-dev to use .el file as workaround until xemacs can read emacs19 .elc files. - * Pass top_distdir explicitly to 'make dist' to accomodate bug in + * Pass top_distdir explicitly to 'make dist' to accommodate bug in automake_1.1o-1. * Fix debian/build to make html documentation without including directories in tar archives (fixes #9348). @@ -15127,7 +15127,7 @@ dpkg (1.4.0.3) unstable; urgency=medium dpkg (1.4.0.2) unstable; urgency=medium * dpkg-buildpackage.sh: reverted the quoting change -- (you - should use super, sudo, realy, but not su. Or write a wrapper + should use super, sudo, really, but not su. Or write a wrapper around su) * dpkg-buildpackge.sh: passing -m, -C, -v options to dpkg-genchanges more the way Ian likes ;-) @@ -16068,7 +16068,7 @@ dpkg (0.93.73) BETA; priority=LOW * `hold' flag changed to be settable by the user only, and made orthogonal to the `reinstallation required' flag. * dpkg will install by default any packages with priority of - `standard' or better unless they're explictly deselected. + `standard' or better unless they're explicitly deselected. * dselect dependency/conflict resolution will suggest marking absent packages for `purge' rather than `deinstall'. diff --git a/Makefile.am b/Makefile.am index fe4c2b7..78a4f5e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -if WITH_DSELECT +if BUILD_DSELECT MAYBE_DSELECT = dselect endif @@ -18,7 +18,11 @@ SUBDIRS = \ ACLOCAL_AMFLAGS = -I m4 -dist_pkgdata_DATA = cputable ostable triplettable +dist_pkgdata_DATA = \ + cputable \ + ostable \ + abitable \ + triplettable EXTRA_DIST = \ .mailmap \ @@ -38,12 +42,14 @@ EXTRA_DIST = \ debian/copyright \ debian/dpkg-dev.docs \ debian/dpkg-dev.install \ + debian/dpkg-dev.manpages \ debian/dpkg-dev.preinst \ debian/dpkg-dev.lintian-overrides \ debian/dpkg.cfg \ debian/dpkg.cron.daily \ debian/dpkg.docs \ debian/dpkg.install \ + debian/dpkg.manpages \ debian/dpkg.postinst \ debian/dpkg.postrm \ debian/dpkg.preinst \ @@ -54,6 +60,7 @@ EXTRA_DIST = \ debian/dselect.cfg \ debian/dselect.docs \ debian/dselect.install \ + debian/dselect.manpages \ debian/dselect.preinst \ debian/dselect.lintian-overrides \ debian/libdpkg-dev.docs \ diff --git a/README b/README index aaaa429..087e875 100644 --- a/README +++ b/README @@ -1,5 +1,112 @@ -This is dpkg, Debian's package maintenance system. +dpkg - Debian's package maintenance system -The primary interface for the dpkg suite is the `dselect' program; +The primary interface for the dpkg suite is the ‘dselect’ program; a more low-level and less user-friendly interface is available in -the form of the `dpkg' command. +the form of the ‘dpkg’ command. + + +Releases +-------- + +The current legacy, stable and development releases can be found at: + + + +For older releases check: + + + + +Mailing List +------------ + +The subscription interface and web archives can be found at: + + + +The mailing list address is (no subscription required to post): + + debian-dpkg@lists.debian.org + + +Source Repository +----------------- + + + + + +Building from git source +------------------------ + +To prepare the dpkg source tree from git before starting the build process +some required software needs to be installed: + + GNU autoconf >= 2.60 + GNU automake >= 1.8 + GNU gettext >= 0.18 (or just autopoint if using --disable-nls) + flex + +After installing the needed software, and running the following command on +the git tree: + + $ autoreconf -f -i + +the source should be roughly equivalent to the distributed tar source. + + +Building from tar source +------------------------ + +The minimum software required to configure and build dpkg from a tarball is: + + C89 compiler with few C99 extensions (see doc/coding-style.txt) + GNU make + pkg-config + perl + +To enable optional functionality or programs, this software might be needed: + + zlib (used instead of gzip command-line tool) + xz's liblzma (used instead of xz command-line tool) + libbzip2 (used instead of bzip2 command-line tool) + libselinux + curses compatible library (needed on --enable-dselect) + +To run the test suite («make check»): + + TimeDate perl module + IO-String perl module + +To enable additional developer's documentation («make doc») this software +will be needed: + + pod2man + doxygen + dot + +To enable translated documentation this software will be needed: + + po4a >= 0.36.4 (>= 0.41 for VPATH builds) + +To enable code coverage («./configure --enable-coverage; make coverage») +this software is needed: + + lcov (from the Linux Test Project) + Devel-Cover perl module + +The build process is done by running the usual «./configure; make». To +see all available configuration options please run «./configure --help». +The following configure options might be of interest to disable specific +programs: + + --disable-dselect + --disable-start-stop-daemon + --disable-update-alternatives + --disable-install-info + +And the following to disable modifications to the build flags: + + --disable-compiler-warnings + --disable-compiler-optimisations + --disable-linker-optimisations diff --git a/TODO b/TODO index e1b1f18..38b82dc 100644 --- a/TODO +++ b/TODO @@ -24,9 +24,7 @@ TODO compatible extension (e.g. new fields). * Build: - - Make dpkg bootstrappable. - Check availability of warning flags at configure time. - - Handle missing lstat at configure time by erroring out. * Code cleanup / bug fixes: - Get rid of static variables inside functions. @@ -42,8 +40,6 @@ TODO - Add needed includes to all header files. - Get rid of unuseful "unsigned" modifiers. - Use internerr instead of assert, and print more meaninful messages. - - Make actionfunction return int, and avoid global exitcode variables. - - Make deb build version a version instead of doing checks over a string. - Use enums for currently hardcoded literals (replacingfilesandsaid, saidread, rok, filetriggers_edited, etc). - Do not use nfmalloc (and friends) for non in-core db memory. @@ -53,7 +49,6 @@ TODO - Handle instdir '/' separator consistently. - Check if caching selinux context for second call is possible. - Add missing newlines in --version output. - - Fix leak on tar_extract (name, linkname). - Handle symlinks in statcmd.c statdb_node_apply(). - Fix dpkg termination on SIGPIPE from status-fd. @@ -63,13 +58,10 @@ TODO * Man pages: - Add example to dpkg-scanfoo manpages? - Merge synopsis lines in dpkg-triggers. - - Check all '<>' use bold instead. - Check all command vs action. - Check usage of '|' instead of ', '. - Check position of short option before long option. - - Use [option...] instead of [options] and friends? - Fix dpkg man page, refs to dpkg-deb and dpkg-split, etc. - - Fix «commandline» vs «command line». - Fix «. ». * L10n: @@ -168,7 +160,7 @@ other stuff unlikely to get done soon * understand Replaces in dselect * diversions list as control archive entry * single maintainer script, and new package getting there first - * local conffiles, aswell as local files that dpkg should check before + * local conffiles, as well as local files that dpkg should check before overwriting * hooks * dselect per-half focus and keybindings improvements. diff --git a/abitable b/abitable new file mode 100644 index 0000000..578228d --- /dev/null +++ b/abitable @@ -0,0 +1,10 @@ +# This file contains the table of arch ABI attribute overrides. +# +# If the ABI is not present here then the attribute information for a +# Debian triplet matches the one on the cputable. +# +# Column 1 is the Debian name for the ABI. +# Column 2 is the size (in bits) of the ABI integers/pointers. +# +# +gnux32 32 diff --git a/configure.ac b/configure.ac index 390a868..7687dfa 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,7 @@ # Process this file with autoconf to produce a configure script. +m4_pattern_forbid([^_?DPKG_]) + AC_PREREQ(2.60) AC_INIT([dpkg], m4_esyscmd([./get-version]), [debian-dpkg@lists.debian.org]) AC_CONFIG_SRCDIR([lib/dpkg/dpkg.h]) @@ -7,7 +9,6 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) AC_USE_SYSTEM_EXTENSIONS -DPKG_ARCHITECTURE AM_INIT_AUTOMAKE([1.8 foreign nostdinc]) @@ -16,12 +17,14 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], AM_GNU_GETTEXT_VERSION([0.18]) AM_GNU_GETTEXT([external]) +DPKG_DIST_CHECK([test "$GMSGFMT" = ":" && test "$USE_NLS" = "yes"], + [gettext required when NLS support enabled]) # Allow compilation without optional programs -DPKG_WITH_PROG([dselect]) -DPKG_WITH_PROG([start-stop-daemon]) -DPKG_WITH_PROG([update-alternatives]) -DPKG_WITH_PROG([install-info]) +DPKG_BUILD_PROG([dselect]) +DPKG_BUILD_PROG([start-stop-daemon]) +DPKG_BUILD_PROG([update-alternatives]) +DPKG_BUILD_PROG([install-info]) # Allow alternate directories DPKG_WITH_DIR([admindir], [${localstatedir}/lib/${PACKAGE_NAME}], @@ -33,6 +36,7 @@ DPKG_WITH_DIR([logdir], [${localstatedir}/log], AC_PROG_CC AC_PROG_CXX AC_PROG_LEX +DPKG_DIST_CHECK([test "$LEX" = ":"], [lex program required]) AC_PROG_RANLIB AC_CHECK_PROGS([DOXYGEN], [doxygen]) AC_CHECK_PROG([HAVE_DOT], [dot], [YES], [NO]) @@ -58,7 +62,7 @@ fi # Checks for header files. AC_HEADER_STDC AC_CHECK_HEADERS([stddef.h error.h locale.h libintl.h kvm.h \ - sys/cdefs.h sys/syscall.h linux/fiemap.h]) + sys/syscall.h linux/fiemap.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_BIGENDIAN @@ -69,6 +73,7 @@ DPKG_C_C99 AC_TYPE_MODE_T AC_TYPE_PID_T AC_TYPE_SIZE_T +DPKG_TYPES_U_INT_T DPKG_TYPE_PTRDIFF_T AC_CHECK_SIZEOF([unsigned int]) AC_CHECK_SIZEOF([unsigned long]) @@ -80,18 +85,24 @@ DPKG_FUNC_C99_SNPRINTF DPKG_CHECK_DECL([offsetof], [stddef.h]) DPKG_CHECK_DECL([WCOREDUMP], [sys/wait.h]) DPKG_CHECK_DECL([TIOCNOTTY], [sys/ioctl.h]) +DPKG_CHECK_PROGNAME DPKG_CHECK_COMPAT_FUNCS([getopt getopt_long obstack_free \ - strnlen strerror strsignal asprintf \ + strnlen strndup strerror strsignal asprintf \ scandir alphasort unsetenv]) -AC_CHECK_FUNCS([strtoul strtoimax isascii bcopy memcpy setsid getdtablesize \ - lutimes posix_fadvise]) +AC_CHECK_DECLS([strnlen], [[#include ]]) +AC_CHECK_FUNCS([memcpy lchown], + [], [AC_ERROR([missing required function])]) +AC_CHECK_FUNCS([strtoul strtoimax isascii setsid getdtablesize \ + getprogname getexecname lutimes posix_fadvise]) DPKG_MMAP +# Checks for the build machinery. AC_DEFINE(LIBDPKG_VOLATILE_API, 1, [Acknowledge the volatility of the API.]) DPKG_COMPILER_WARNINGS DPKG_COMPILER_OPTIMISATIONS DPKG_LINKER_OPTIMISATIONS +DPKG_ARCHITECTURE AC_CONFIG_FILES([ Makefile dpkg-deb/Makefile @@ -108,6 +119,7 @@ AC_CONFIG_FILES([ Makefile man/Makefile po/Makefile.in scripts/Makefile + scripts/mk/Makefile scripts/po/Makefile.in src/Makefile utils/Makefile ]) diff --git a/debian/changelog b/debian/changelog index 365ea39..e66a6a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,281 @@ -dpkg (1.16.1) UNRELEASED; urgency=low +dpkg (1.16.3) unstable; urgency=low + + [ Guillem Jover ] + * Do not look for newline beyond the read buffer on dpkg-deb extract. + * Check update-alternative name and link arguments for all commands. + Closes: #665050 + * Check all dpkg-divert filename arguments to be absolute and to not + contain newlines. Closes: #21722 + * Print errors while reading the file list files on a new line instead + of just after the progress percentage. Closes: #552517 + * Document in dpkg-source(1) that patches for source format “3.0 (quilt)” + are expected to apply without any fuzz. Closes: #666752 + Based on a patch by Luca Capello . + * Remove redundant -Wformat-security from default dpkg-buildflags, which + is already implied by -Werror=format-security. Closes: #664964 + Suggested by Peter Eisentraut . + * Document in dpkg-query(1) that commands producing multiple paragraphs + will preserve the order of the packages specified on the argument list. + * Change start-stop-daemon --exec on GNU/Hurd, FreeBSD, NetBSD, OpenBSD + and Solaris to check for executables matching device and inode numbers + instead of filenames. + * Change start-stop-daemon --name on GNU/Hurd to check the process' argv[1] + in addition to argv[0], to handle both binaries and interpreted scripts. + Reported by Mats Erik Andersson . + * Handle deb format versions as major.minor integers instead of strings or + floats, the latter being susceptible to parsing errors depending on the + current locale (although this was only affecting the old deb format). + * Ignore the minor format version number for deb-split format, unifying + the behaviour with the deb format. + * Add support for an abitable containing arch attribute overrides. + * Add x32 support to abitable, ostable and triplettable. Closes: #667037 + * Fix start-stop-daemon to work with relative --exec arguments and --chdir. + Closes: #669047 + * Ignore request to rename a file owned by the diverting package on + «dpkg-divert --add --rename». Closes: #588077 + * Clarify dpkg-gensymbols(1) by way of examples that architecture wildcards + are supported in symbols files. Closes: #670048 + * Fix memory leak due to Dpkg::Control objects not being garbage-collected. + Thanks to Ben Harris . Closes: #669012 + * Compute the md5sum hash on unpack for empty files too, so that these + can be checked correctly for matching content when installing multiple + package instances. + * Generate md5sums files automatically at unpack time if missing from the + binary package. Closes: #155676, #155799 + * Add missing list and md5sums database file checks to «dpkg --audit». + + [ Helge Kreutzmann ] + * Fix a typo in man/dpkg-buildflags.1. + + [ Updated dpkg translations ] + * French (Christian Perrier). + * German (Sven Joachim). + * Swedish (Peter Krefting). + + [ Updated dselect translations ] + * French (Christian Perrier). + * German (Sven Joachim). + * Swedish (Peter Krefting). + + [ Updated scripts translations ] + * French (Christian Perrier). + * Swedish (Peter Krefting). + + [ Updated scripts translations ] + * French (Christian Perrier). + * German (Helge Kreutzmann). + * Swedish (Peter Krefting). + + -- Guillem Jover Fri, 27 Apr 2012 10:10:10 +0200 + +dpkg (1.16.2) unstable; urgency=low + + [ Guillem Jover ] + * Move and to the top of trigdeferred.l to properly + use the configured features and compat code. + * Honour --disable-nls when the system lacks obstack support, by updating + the obstack compat module from gnulib. + * Link the libdpkg unit tests with libcompat and libintl, so that systems + needing them will compile correctly. + * Check for the presence of the strnlen declaration and correctly provide + the compat one in case the systems lacks it. + * Do not assume existence of paths on the build system in the test suite. + * Do not fail to link dselect on MacOS X when using --disable-nls. + * Remove versioned coreutils Pre-Depends from dpkg due to the ancient + md5sum transition. Reported by Bill Allombert . + Closes: #643746 + * Change dpkg-architecture to only compute the requested variables. This: + - Fixes the bootstrapping problem, as the dpkg build system only needs + the host architecture, for which dpkg itself is not required. + - Reduces the amount of work performed, including loading and parsing + unnecessary table files or calling either of gcc or dpkg programs. + * Improve error message in dpkg-gencontrol and dpkg-gensymbols when + debian/control does not have any package stanza. Closes: #642473 + Based on a patch by Kyle Willmon . + * Add Pre-Depends on tar >= 1.23 (satisfied in stable) to dpkg due to it + using the ‘--warning=no-timestamp’ option. Closes: #642802 + * Do not segfault on GNU/Linux when dpkg cannot retrieve the block size + for the filesystem containing the info database. LP: #872734 + * Fix two memory leaks per tar entry in the tar extractor used on unpack. + * Mark dpkg and dselect as Multi-Arch foreign. + Reported by Steve Langasek . + * Mark dpkg-dev and libdpkg-perl as Multi-Arch foreign. Closes: #648217 + Thanks to Colin Watson . + * Add new deb-origin.5 man page. Closes: #608884 + Thanks to Matt Kraai . + * Return correct status on start-stop-daemon --status when using --pidfile. + * Treat dpkg-deb compression level independently for each backend. This + has the effect of changing the current behaviour for level 0 on all + compressors except gzip. + * Add new dpkg-deb -S option to specify the compression strategy. The only + currently supported value is “extreme” for xz. Closes: #647915 + * Stop using brace expansion to install man pages by using dh_installman + instead of dh_install, the former does not abort on empty glob expansion. + * Do not use absolute paths for programs in perl and shell code. + * Add missing ‘*’ in asprintf() and vasprintf() compat declarations. + * Add support for virtual output binary:Summary and db:Status-Abbrev fields. + Closes: #192619, #427945 + * Add support for virtual output source:Package and source:Version fields. + Closes: #653575 + * Use a different temporary file per process on libcompat's vsnprintf() + function to avoid race conditions from children after fork(3). + Reported by Daniel Ruoso . Closes: #655411 + * Fix start-stop-daemon --exec and --name options on FreeBSD, NetBSD and + OpenBSD by swapping the process matching implementations. + * Fix start-stop-daemon --name option on GNU/Hurd to match the process name. + * Document in more detail the implications of start-stop-daemon matching + options. Closes: #367608 + * Improve and clarify dpkg-shlibdeps superfluous linking warning messages. + Based on a patch by Peter Eisentraut . Closes: #656496 + * Relax --merge-avail Packages file parser, to not fail on bogus versions. + * When building only arch-indep binaries with «dpkg-buildpackage -A», name + the .changes file using ‘all’ as architecture. Closes: #661638 + * Handle unknown architectures gracefully in dpkg-buildflags. + Closes: #663004 + * Add missing --status-logger to dpkg --help output. + * Do not print bogus errno string for invalid package names in dpkg + --ignore-depends option. + * Change dpkg-query to not load the available file by default for --list + and --show, add a new --load-avail option to expose the old behaviour. + * Only allow setting selections via «dpkg --set-selections» for known + packages (i.e. those present in either the status or available files). + * Always ignore older versions when parsing the available file, not only + for --update-avail and --merge-avail. + * Mark not-installed non-arch-qualified selections for removal. + * Add new «dpkg --assert-multi-arch» command to allow checking for + multi-arch support availability. + * Bump Standards-Version to 3.9.3 (no changes needed). + * Add architecture consistency checks to «dpkg --audit». + * Add new dpkg --add-architecture and --remove-architecture commands to + track supported architectures. + + [ Raphaël Hertzog ] + * Update Dpkg::Shlibs to look into multiarch paths when cross-building + too. Closes: #595144 + * Rewrite architecture.mk with explicit loops instead of duplicating many + similar lines. Based on a patch by Thorsten Glaser . + * Modify dpkg-gencontrol and dpkg-distaddfile to grab a write lock + on debian/control before updating debian/files to avoid simultaneous + updates. Closes: #642608 + Add libfile-fcntllock-perl to dpkg-dev's Depends since we use this module + to handle the locking. + * Update dpkg-gensymbols(1) to clarify that -e accepts shell patterns + expansions and not regular expressions. And let dpkg-gensymbols output a + warning when a pattern doesn't match any file. Closes: #649248 + * Add new option "-a " to dpkg-checkbuilddeps to check build + dependencies for another architecture. This is really basic for now since + it assumes all build dependencies must be satisfied on the listed + architecture. Closes: #648180 Thanks to Colin Watson for the patch. + * Error out if a dpkg database .list file is not a regular file. LP: #369898 + * Fix dpkg-mergechangelogs to not error out on invalid versions. + Closes: #651993 + * Fix dpkg-source --commit on "3.0 (quilt)" when an explicit patch file + is given with a relative filename. Closes: #652414 + * Further clarify in dpkg-source(1) the conditions under which it's possible + to pass an explicit patch file to dpkg-source --commit. + * Add new --query-features command to dpkg-buildflags. Thanks to Kees Cook + for the patch. Closes: #651481 + * Fix description of Multi-Arch in deb-control(5). Closes: #654453 + Thanks to Jakub Wilk for spotting the mistake. + * Drop misleading spaces in deb-symbols(5) in the format description. + * Clean up dpkg-architecture(1) dropping useless information and + adding a reference to /usr/share/dpkg/architecture.mk. + * Update dpkg-buildpackage to use the "build-arch" (for -B) and + "build-indep" (for -A) targets unless "make -qn" says that they do not + exist. Closes: #229357 + * Improve deb-shlibs(5) to mention that the dependency field must + use the same syntax as a Depends field. Closes: #658696 + * Update dpkg-maintscript-helper(1) to recommend usage of the version + removing/renaming a conffile with a "~" suffix as "priorversion" + parameter. Thanks to Sam Morris for the patch. + Closes: #658854 + * Fix debug output of dpkg-maintscript-helper. LP: #936340 + + [ Jonathan Nieder ] + * Bump po4a version in Build-Depends to 0.41, since earlier versions do + not handle --srcdir correctly. Closes: #644370 + + [ Guillem Jover, Steve Langasek, Raphaël Hertzog ] + * Add new dpkg --print-foreign-architectures command. + * Add support for virtual output binary:Package field. + * Implement Multi-Arch support. + + [ Helge Kreutzmann ] + * Fix a typo in man/dpkg-deb.1. + + [ Updated dpkg translations ] + * German (Sven Joachim). + * Italian (Milo Casagrande). Closes: #627832, #657849 + * Swedish (Peter Krefting). + * French (Christian Perrier) + * Polish (Michał Kułach). Closes: #658126 + + [ Updated scripts translations ] + * German (Helge Kreutzmann). + * Spanish (Omar Campagne). Closes: #636238 + * Swedish (Peter Krefting). + + [ Updated man page translations ] + * German (Helge Kreutzmann), including typo fix in dpkg-genchanges + Closes: #646496, sub optimal translation of package states LP: #368783 + and an fix by Chris Leick + * Japanese (TAKAHASHI Motonobu). + * Spanish (Omar Campagne). Closes: #643969 + * Swedish (Peter Krefting). + * Minor errors corrected in French (thanks to David Prévot) + * Fix translation of -B and -A options of dpkg-buildpackage. + Thanks to Vincent Danjean. Closes: #654626 + + [ Updated dselect translations ] + * Dutch (Jeroen Schot). Closes: #651813 + + -- Guillem Jover Mon, 19 Mar 2012 07:27:12 +0100 + +dpkg (1.16.1.2) unstable; urgency=medium + + [ Raphaël Hertzog ] + * Fix another typo to correctly set DEB_*_ARCH_BITS in architecture.mk. + * Set urgency to medium as changes are minor, and it should migrate + quickly in case 1.16.2 comes soon. + + [ Jonathan Nieder ] + * Update dpkg-buildflags(1) to note that the processor option + -D_FORTIFY_SOURCE=2 is set in CPPFLAGS now instead of CFLAGS and + CXXFLAGS. Closes: #646073 + + -- Raphaël Hertzog Fri, 25 Nov 2011 11:18:30 +0100 + +dpkg (1.16.1.1) unstable; urgency=low + + [ Raphaël Hertzog ] + * Fix dpkg-source to not ignore the automatic patch when checking + for unrecorded changes. Closes: #643148 + * Let dpkg-source --commit create debian/patches when required. + Closes: #643037 + * Fix dpkg-buildflags --dump to return 0 as exit code and not 1. + * Update dpkg-buildflags(1) to not include quotes in the examples + setting DEB_BUILD_MAINT_OPTIONS. + * Stop outputting build flags in dpkg-buildpackage as it confuses + maintainers who are overriding them in debian/rules and who + are not seeing the expected value in the build log. + * Fix trigger setup code to not reset the status of packages + when they are in a status different from triggers-awaited, + triggers-pending or installed. Closes: #644492 + * Fix dpkg-source to ignore changes on debian/patches/.dpkg-source-applied + when building a "2.0" source package. Closes: #642656 + * Fix buildflags.mk to re-export the environment variables that + the maintainer can use to change the build flags. Closes: #644412 + + [ Guillem Jover ] + * Change dpkg-buildflags to set preprocessor option -D_FORTIFY_SOURCE=2 + in CPPFLAGS, instead of CFLAGS and CXXFLAGS. Closes: #642521, #643632 + * Fix typo to correctly set DEB_*_ARCH_BITS instead of DEB_*_ARCH in + architecture.mk. Thanks to Thorsten Glaser . + * Make dpkg-buildflags disable full relro (bindnow) if relro is not enabled. + + -- Guillem Jover Fri, 14 Oct 2011 07:08:31 +0200 + +dpkg (1.16.1) unstable; urgency=low [ Raphaël Hertzog ] * Dpkg::Deps: Implement new "reset" method and bump module version to 1.01 @@ -19,6 +296,92 @@ dpkg (1.16.1) UNRELEASED; urgency=low * "any" no longer hides "all" in the Architecture field of a .dsc. * Fix dpkg --remove to really remove the triggers from the various internal files in /var/lib/dpkg/info/triggers/. Closes: #525160 + * Avoid a perl warning in dpkg-gensymbols when no symbols file has been + generated (because it would have been empty). Closes: #626684 + * Re-enable the Package-List field but drop the Architecture column since we + have no clear use case yet. It can always be added later on. + Also drop the source line since it duplicates other fields. + Closes: #619131 + * Add the extraction part of Dpkg::Source::Package to the supported API. + Useful to extract source packages without having to depend on dpkg-source + (and hence dpkg-dev). + * Add the Dpkg::Vendor module to the supported API. Useful for lintian + when dpkg-dev is absent. + * Check presence of required parameters in dpkg-vendor. Closes: #628726 + Thanks to Niels Thykier for the patch. + * Avoid a Perl warning in dpkg-buildflags when HOME is not set. + Closes: #635467 + * dpkg-source can now also use debian/source/local-patch-header (that is not + included in the generated source package) instead of + debian/source/patch-header. Closes: #629582 + * Changed dpkg-source --after-build to automatically unapply patches that it + has applied during --before-build. + * Fix two possible causes for the assertion failure "pigp->trigpend_head". + LP: #798793, #424358 Closes: #560251 + * Use "special" instead of "particular" to qualify the "3.0 (custom)" format + in dpkg-source(1). Closes: #631435 + * Add some supplementary checks to ensure debian/control has the required + fields. Closes: #631439 + * dpkg-gensymbols(1): document syntax of comments. Closes: #630996 + * Allow empty lines in symbols files to better delimit multiple libraries. + Thanks to Cyril Brulebois for the patch. + * dpkg: if "prerm upgrade" fails when downgrading, do not try to run + "prerm failed-upgrade" with the prerm of the oldest prerm, it can't work + around a bug of a newer prerm anyway. + * dpkg: support new "interest-noawait" and "activate-noawait" trigger + directives. + * dpkg-buildflags(1): make it clear that DEB_*_(SET|APPEND) environment + variables are meant for users and should not be used by packages. + * update-alternatives: do not allow to reuse a slave link in another + slave alternative. Closes: #631547 + * Improve dpkg-source's logic to identify ignored files. Closes: #632168 + * Fix a small typo in dpkg-source(1). Closes: #632937 + * Reword the description of dpkg-source --before-build and --after-build + to be clearer. Closes: #608260 + * dpkg-buildpackage no longer exports the compiler flags. Closes: #560070 + Packages must directly call dpkg-buildflags to retrieve them. + * dpkg-buildflags supports a prepend command to modify the build + flags. Particularly useful for package maintainers who don't want + their supplementary flags to take precedence over user submitted + flags. + * Add new --dump action to dpkg-buildflags and make it the default action. + Closes: #603435 + * dpkg-mergechangelogs now checks the return value of the close() call. + Thanks to Niels Thykier for the patch. Closes: #633539 + * Similar changes to dpkg-shlibdeps and dpkg-gencontrol, also by Niels. + * Fix update-alternatives to not remove a real file when dropping a + symlink for a slave that's not provided by the new current choice. + Closes: #633627 + * Improve dpkg-source's error message complaining about the lack + of the upstream tarball. Closes: #634510 + * Add some common makefile snippets for use in rules files in + /usr/share/dpkg/: default.mk, architecture.mk, buildflags.mk, pkg-info.mk, + vendor.mk Closes: #606839 + * Fix the dpkg-divert test-suite to also skip test that would fail if run + under root. Closes: #634961 + * Change merge conflict separators created by dpkg-mergechangelogs to match + the usual norm of being composed of 7 characters. LP: #815700 + * With source format 2.0 and 3.0 (quilt), dpkg-source now fails by default + when upstream changes have not been recorded in a quilt patch. The new + --commit operation can be used to properly record the changes before-hand. + LP: #797839 + And it fails before installing the automatic patch in debian/patches/ + Closes: #615899 + * dpkg-buildflags now supports "--export=configure" to output compilation + flags on a single line with double quotes as delimiter of the various + values. It also uses DEB__MAINT_ to let the maintainer + extend the build flags to use. Last but not least, it can now also strip + options from the returned build flags. + * Fix possible segfault of dpkg in findbreakcycle(). LP: #733414 + * dpkg-source now properly cleans up the temporary tarball generated for + native formats in case of unexpected interruption. Closes: #631494 + * Fix simplification logic of union dependencies. Closes: #637564 + * Fix dpkg's handling of a hardlink pointing to a conffile. Closes: #638291 + * Add example of extend-diff-ignore's usage in dpkg-source(1). + Closes: #640198 + * dpkg-buildflags now returns hardening flags by default. Closes: #489771 + They can be individually enabled/disabled via DEB_BUILD_MAINT_OPTIONS, + see dpkg-buildflags(1). Thanks to Kees Cook for his help. [ Guillem Jover ] * Install deb-src-control(5) man pages in dpkg-dev. Closes: #620520 @@ -73,17 +436,87 @@ dpkg (1.16.1) UNRELEASED; urgency=low * Do not allow blank lines in field values. Closes: #308082 * Do not warn on missing architecture on packages in config-files state, but then make sure the architecture field is usable. Closes: #604241 + * Run du with --apparent-size when generating the Installed-Size field in + dpkg-gencontrol to get consistent results independent of build system. + Thanks to Ludovic Brenta . Closes: #630533 + * Do not fail to unpack shared directories missing on the file system + from packages being replaced by other packages. Closes: #631808 + * Do not require programs to define thisname, provide two new functions + to handle the program name (dpkg_set_progname and dpkg_get_progname). + Closes: #631757 + * Man pages cleanup: + - Rename “USAGE” dselect(1) section to “ACTIONS” and clarify they can + be performed interactively or from command line. + - Add missing built-in methods to dselect(1). + - Add missing escaping to field dashes in deb-control(5). + - Use dashes instead of underscores for variable text. + - Clarify that several front-end fields are not dselect specific in + dpkg-query(1). + - Use [option...] instead of [options] and friends. + - Use italics or bold instead of surrounding the text with <>. + - Correctly format text with bold and italics. + - Use minus signs and hyphens consistently in man pages. + - Fix reference to /etc/dpkg/dselect.cfg.d instead of dpkg.cfg.d in + dselect(1). + - Add missing optional group|gid --chuid argument in start-stop-daemon(8). + * Refer to Sources and Packages files as part of a repository instead of + as being of exclusive use or owned by APT, which has never been the case. + * Unify somewhat dpkg-maintscript-helper --help output with other commands. + * Add build-indep and build-arch targets as aliases for build in + debian/rules. + * Use the perl interpreter found by configure to call dpkg-architecture.pl + in the m4 DPKG_ARCHITECTURE macro. + * Add new --verbose option to dpkg-deb and change --extract to honour it. + Closes: #293280 + * Add new --raw-extract option to dpkg-deb combining --control and + --extract. Closes: #552123 + * Defer hardlink renames so that there's never a point were the new + file contents are accessible from the final path before they have + been fsync()ed and cannot be executed causing ETXTBSY when trying + to open the to be installed paths for writing. + Thanks to Jonathan Nieder . Closes: #635683 + * Clarify the default dpkg-deb compression-levels on the man page. + * Clarify dpkg --update-avail usage error message. Closes: #628055 + * Change Dpkg::Compression default values depending on the compressor + used, and as such dpkg-source inherits this functionality. + Prompted by Timo Juhani Lindfors . + * Print an actual error or warning message instead of assert()ing on + readlink()/stat() size discrepancies. Closes: #639229 + * Update alternative links only if they change. This allows for a + read-only file system and a writable database. Closes: #636700 + Based on a patch by Salvatore Bonaccorso . + * Fix double “error:” string in dpkg missing PATH error output. + Closes: #639997 + * Do not warn on strange timestamps when unpacking with dpkg-deb. + Closes: #640298 + * Reduce dpkg-trigger binary size by refactoring libdpkg modules so that + it does not end up pulling triglib. + * Reduce dpkg-deb binary size by refectoring libdpkg modules so that it + does not end up pulling triglib. + * Do not fail on --compare-version when generating parse warnings. + Existing packages with invalid versions should not fail on their + maintainer scripts due to that. + * Use the user name (instead of the user id) when setting the supplementary + groups in start-stop-daemon. Closes: #641834 + * Use --srcdir and --destdir po4a options, and bump Build-Depends version + to 0.36.4. [ Updated dpkg translations ] * German (Sven Joachim). Closes: #620312 + * Swedish (Peter Krefting). + * French (Christian Perrier). [ Updated man page translations ] - * German (Helge Kreutzmann). + * French (Christian Perrier). + * German (Helge Kreutzmann) including improvement by "Flo". + * Swedish (Peter Krefting). [ Updated scripts translations ] + * French (Christian Perrier, Sylvestre Ledru). Closes: #637096 * German (Helge Kreutzmann). + * Swedish (Peter Krefting). - -- Raphaël Hertzog Sat, 02 Apr 2011 09:21:26 +0200 + -- Guillem Jover Fri, 23 Sep 2011 06:00:11 +0200 dpkg (1.16.0.3) unstable; urgency=medium @@ -158,7 +591,7 @@ dpkg (1.16.0) unstable; urgency=low works at all. Thanks to Ivan Gagis . LP: #728708 * Add armhf support to ostable and triplettable. Closes: #594179 * Set the modification time for unpacked symlinks on supported systems. - * Fix undefined value useage in dpkg-genchanges when adding files w/o a + * Fix undefined value usage in dpkg-genchanges when adding files w/o a matching architecture, because they are not present in debian/control, this is most commonly the case due to dpkg-distaddfile. * Terminate immediately on dpkg-divert rename errors instead of propagating @@ -166,6 +599,8 @@ dpkg (1.16.0) unstable; urgency=low leak detectors. Closes: #620380 * When moving a diverted file across filesystems in dpkg-divert, remove the source file. + * Fix large file support for .deb and split .deb in dpkg-deb, dpkg-split + and dpkg on 32-bit architectures. [ Raphaël Hertzog ] * Fail properly when debian/source/format is empty. Closes: #600854 @@ -175,7 +610,7 @@ dpkg (1.16.0) unstable; urgency=low - it documents the VCS-* fields too. Closes: #483119 Thanks to Oxan van Leeuwen who wrote it as part of the Google Code In program. - * Enhance dpkg-shlibdeps to not fail immediatly when a library is not found. + * Enhance dpkg-shlibdeps to not fail immediately when a library is not found. Instead continue and fail after all problems have been reported. Thanks to Chris Baines for the patch. Closes: #596841 * Fix dpkg-source to not list Debian packaging files as modified @@ -1780,7 +2215,7 @@ dpkg (1.15.0) experimental; urgency=low - Cleanup and split of header files. [ Raphaël Hertzog ] - * Enhance dpkg-shlibdeps's error message when a library can't be found to + * Enhance dpkg-shlibdeps' error message when a library can't be found to include the ELF format of the desired library. Closes: #474671 * dpkg-gensymbols now refuses empty values for the the -v -P and -e parameters. @@ -2071,7 +2506,7 @@ dpkg (1.14.21) unstable; urgency=low * Match description of -si option in dpkg-buildpackage to the one in dpkg-genchanges. Closes: #493743 * Close --status-fd file descriptors on exec, so that they are not - inherited by the childs. Closes: #471488, #487684 + inherited by the children. Closes: #471488, #487684 * State that the preferred front-end is aptitude and replace one instance of dselect usage with apt-get. Closes: #483785 @@ -2114,7 +2549,7 @@ dpkg (1.14.20) unstable; urgency=low * When dpkg-divert does renames do no check the target file if the source does not exist and the rename is thus being disabled. This also allows to remove bogus diversions. Closes: #476973, #469033 - * Properly close triggers 'File' file, so it does not get leaked to childs. + * Properly close triggers 'File' file, so it does not get leaked to children. [ Raphaël Hertzog ] * Add missing 'use File::Path' in Dpkg::Source::Package::V3::quilt. @@ -2591,7 +3026,7 @@ dpkg (1.14.16) unstable; urgency=low is used. That way we're consistent with the definition of that variable in deb-substvars(5). Closes: #433477 * Add support of Dm-Upload-Allowed field. Closes: #453400 - * Fix dpkg-shlibdeps's filtering of duplicated dependencies in fields of + * Fix dpkg-shlibdeps' filtering of duplicated dependencies in fields of lesser priority (when -d is used). * Fix behaviour of dpkg-shlibdeps when the same binary was passed multiple times for use in different dependency fields (-d option). @@ -3743,7 +4178,7 @@ dpkg (1.13.17) unstable; urgency=low attributes and other embellishments. * Add dpkg-query(1) in the SEE ALSO section in dpkg(1). Closes: #354643 * Don't try to compile in SELinux support on GNU/kFreeBSD amd64. - * Add new quiet option to dpkg-source to supress warnings. Closes: #355065 + * Add new quiet option to dpkg-source to suppress warnings. Closes: #355065 * Do not expand architecture aliases anymore in .dsc files. * Change start-stop-daemon's --exec behaviour again on GNU/Linux to compare the referred file pointed by the '/proc//exe' symlink, stripping @@ -4155,7 +4590,7 @@ dpkg (1.13.9) unstable; urgency=low SELinux support (Manoj Srivastava): * On SELinux-enabled systems, try to set the security context when the package is unpacked. Closes: #193653, #249496, #307139. - * Added build-dependancy on libselinux1-dev. + * Added build-dependency on libselinux1-dev. Improvements to dpkg-source (Brendan O'Dea): * Support unpacking of "Wig And Pen" (Format 2.0) source packages. @@ -4554,7 +4989,7 @@ dpkg (1.10.22) unstable; urgency=low Closes: #120562. - Add --force-bad-verify to dpkg manpage. Closes: #192812. - Correct dpkg manpage to refer to --force-remove-reinstreq instead of - -non-existant --force-reinstreq option. Closes: #232831. + non-existent --force-reinstreq option. Closes: #232831. - Correct documentation of --compare-versions arguments. Closes: #232317. - Correct usage of "et al" to "et al.". Closes: #230751. - Add dpkg-reconfigure(8) to SEE ALSO section of dpkg(8). Closes: #233282. @@ -4624,7 +5059,7 @@ dpkg (1.10.21) unstable; urgency=low * Add --dir-file option to install-info for GNU install-info compatibility. Closes: #179192 * Refer to debian-policy in dpkg-doc's description instead of the - non-existant packaging-manual. Closes: #120970. + non-existent packaging-manual. Closes: #120970. * Remove incorrect mention of build-essential from dpkg-checkbuilddeps manpage. Closes: #219210. * Add a note about diverting shared libraries to the dpkg-divert @@ -4797,7 +5232,7 @@ dpkg (1.10.14) unstable; urgency=low Some fields may have vars in them, which breaks the validation. * dpkg-gencontrol calls substvars after parsing the control file, and then validates the substituted depends lines. Originally, - substitution occured only during writing of the final output file. + substitution occurred only during writing of the final output file. * Andreas Barth : Fix bad regex that didn't allow spaces in dependency field parsing. It now directly matches what the c code expects. It previously was @@ -5143,7 +5578,7 @@ dpkg (1.10) unstable; urgency=low * dselect now accepts regular expressions when searching for packages and can search in package descriptions as well. Closes: Bug#81009,#83139 - * Move query commands into a seperate dpkg-query command. For the old options + * Move query commands into a separate dpkg-query command. For the old options (-L,-l,-s,-S) dpkg will still call it for you. * Add configurable package listing support to dpkg-query * Handle window resize in dselect main menu. Closes: Bug#98275 @@ -5173,7 +5608,7 @@ dpkg (1.10) unstable; urgency=low Closes: #120924. * Make dpkg-checkbuilddeps always check for build-essential. Closes: Bug#118420. - * Use space seperated output instead of comma seperated in + * Use space separated output instead of comma separated in dpkg-checkbuilddeps * Update default ignore expression in dpkg-source to also match *~ and *.swp in subdirs. Closes: Bug#127458 @@ -5310,7 +5745,7 @@ dpkg (1.9.13) unstable; urgency=medium * Add a -W option to dpkg-source(and the other utils, where it is just passed thru), to turn certain errors into warnings(of which, only - one is changed, namely, the 'tar doesn't contain preceeding directory' + one is changed, namely, the 'tar doesn't contain preceding directory' error). Closes: #101813, and partially 101845. * Don't error out if the files in the tar have leading './', for dpkg-source. (another partial close of 101845). @@ -5551,7 +5986,7 @@ dpkg (1.9.0) unstable; urgency=low segfaults people have been seeing in dpkg. Closes: Bug#90328. * Apply patch from bug#86847, that escapes intl chars in filenames. Closes: Bug#83752, #85040, #86847, #89000. - * Errors during dpkg -s(and other similiar commands) are now printed + * Errors during dpkg -s(and other similar commands) are now printed on stderr. Closes: Bug#88987. * Add a --retry option to start-stop-daemon. Closes: Bug#75139 * Fix regeps to extract Closes magic from a changelog so the # @@ -5932,7 +6367,7 @@ dpkg (1.4.1.19) unstable; urgency=low it was already broken when there was no gcc anyway :) * Fixed missing mipseb that was supposed to be in the archtable * Better output in update-alternatives --config, now shows the - current, and the prefered choices. + current, and the preferred choices. * dpkg-name: ignore epoch when getting version * 50dpkg-dev.el: add it as a conffile for dpkg-dev * internals.sgml: Removed references to the versions of build tools, @@ -6395,7 +6830,7 @@ dpkg (1.4.0.24) unstable; urgency=low against libraries it depends on). Code by Richard Braakman and Yann Dirson . * debian/rules: remove all reference to the packaging manual as it is - now provided by the seperate "packaging-manual" package. [#21581, + now provided by the separate "packaging-manual" package. [#21581, #21186, #22698, #23342] * debian/rules: link dpkg-divert.1.gz to undocumented.7.gz as the lack of a real manpage has been reported in #11093. @@ -6536,7 +6971,7 @@ dpkg (1.4.0.15) experimental; urgency=low * Provide 50dpkg-dev.el for xemacs as well as emacs. * Explicitly provide path for debian-changelog-mode in 50dpkg-dev to use .el file as workaround until xemacs can read emacs19 .elc files. - * Pass top_distdir explicitly to 'make dist' to accomodate bug in + * Pass top_distdir explicitly to 'make dist' to accommodate bug in automake_1.1o-1. * Fix debian/build to make html documentation without including directories in tar archives (fixes #9348). @@ -6717,7 +7152,7 @@ dpkg (1.4.0.3) unstable; urgency=medium dpkg (1.4.0.2) unstable; urgency=medium * dpkg-buildpackage.sh: reverted the quoting change -- (you - should use super, sudo, realy, but not su. Or write a wrapper + should use super, sudo, really, but not su. Or write a wrapper around su) * dpkg-buildpackge.sh: passing -m, -C, -v options to dpkg-genchanges more the way Ian likes ;-) @@ -7658,7 +8093,7 @@ dpkg (0.93.73) BETA; priority=LOW * `hold' flag changed to be settable by the user only, and made orthogonal to the `reinstallation required' flag. * dpkg will install by default any packages with priority of - `standard' or better unless they're explictly deselected. + `standard' or better unless they're explicitly deselected. * dselect dependency/conflict resolution will suggest marking absent packages for `purge' rather than `deinstall'. diff --git a/debian/control b/debian/control index 4b31218..befe7e7 100644 --- a/debian/control +++ b/debian/control @@ -8,9 +8,9 @@ Bugs: debbugs://bugs.debian.org Homepage: http://wiki.debian.org/Teams/Dpkg Vcs-Browser: http://git.debian.org/?p=dpkg/dpkg.git Vcs-Git: git://git.debian.org/git/dpkg/dpkg.git -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Build-Depends: debhelper (>= 7), pkg-config, flex, - gettext (>= 0.18), po4a (>= 0.33.1), + gettext (>= 0.18), po4a (>= 0.41), zlib1g-dev (>= 1:1.1.3-19.1), libbz2-dev, libselinux1-dev (>= 1.28-4) [linux-any], libncursesw5-dev, @@ -32,7 +32,7 @@ Package: dpkg Architecture: any Multi-Arch: foreign Essential: yes -Pre-Depends: ${shlibs:Depends}, coreutils (>= 5.93-1), xz-utils +Pre-Depends: ${shlibs:Depends}, tar (>= 1.23), xz-utils Depends: ${misc:Depends} Breaks: dpkg-dev (<< 1.15.8), libdpkg-perl (<< 1.15.8), apt (<< 0.7.7), aptitude (<< 0.4.7-1), @@ -50,7 +50,8 @@ Package: dpkg-dev Section: utils Priority: optional Architecture: all -Depends: libdpkg-perl (= ${source:Version}), bzip2, xz-utils, +Multi-Arch: foreign +Depends: libdpkg-perl (= ${source:Version}), libfile-fcntllock-perl, bzip2, xz-utils, patch, make, binutils, base-files (>= 5.0.0), ${misc:Depends} Recommends: gcc | c-compiler, build-essential, fakeroot, gnupg, gpgv, libalgorithm-merge-perl Suggests: debian-keyring @@ -66,6 +67,7 @@ Package: libdpkg-perl Section: perl Priority: optional Architecture: all +Multi-Arch: foreign Depends: dpkg (>= 1.15.8), perl, libtimedate-perl, ${misc:Depends} Recommends: bzip2, xz-utils Suggests: debian-keyring, gnupg, gpgv, binutils, patch diff --git a/debian/dpkg-dev.install b/debian/dpkg-dev.install index 1a33079..5cec6fe 100644 --- a/debian/dpkg-dev.install +++ b/debian/dpkg-dev.install @@ -17,31 +17,4 @@ usr/bin/dpkg-scansources usr/bin/dpkg-shlibdeps usr/bin/dpkg-source usr/bin/dpkg-vendor -usr/share/man/{*/*,*}/deb-control.5 -usr/share/man/{*/*,*}/deb-src-control.5 -usr/share/man/{*/*,*}/deb-version.5 -usr/share/man/{*/*,*}/deb-substvars.5 -usr/share/man/{*/*,*}/deb-override.5 -usr/share/man/{*/*,*}/deb-extra-override.5 -usr/share/man/{*/*,*}/deb-shlibs.5 -usr/share/man/{*/*,*}/deb-split.5 -usr/share/man/{*/*,*}/deb-symbols.5 -usr/share/man/{*/*,*}/deb-triggers.5 -usr/share/man/{*/*,*}/deb-old.5 -usr/share/man/{*/*,*}/deb.5 -usr/share/man/{*/*,*}/dpkg-architecture.1 -usr/share/man/{*/*,*}/dpkg-buildflags.1 -usr/share/man/{*/*,*}/dpkg-buildpackage.1 -usr/share/man/{*/*,*}/dpkg-checkbuilddeps.1 -usr/share/man/{*/*,*}/dpkg-distaddfile.1 -usr/share/man/{*/*,*}/dpkg-genchanges.1 -usr/share/man/{*/*,*}/dpkg-gencontrol.1 -usr/share/man/{*/*,*}/dpkg-gensymbols.1 -usr/share/man/{*/*,*}/dpkg-mergechangelogs.1 -usr/share/man/{*/*,*}/dpkg-name.1 -usr/share/man/{*/*,*}/dpkg-parsechangelog.1 -usr/share/man/{*/*,*}/dpkg-scanpackages.1 -usr/share/man/{*/*,*}/dpkg-scansources.1 -usr/share/man/{*/*,*}/dpkg-shlibdeps.1 -usr/share/man/{*/*,*}/dpkg-source.1 -usr/share/man/{*/*,*}/dpkg-vendor.1 +usr/share/dpkg/*.mk diff --git a/debian/dpkg-dev.manpages b/debian/dpkg-dev.manpages new file mode 100644 index 0000000..abe988f --- /dev/null +++ b/debian/dpkg-dev.manpages @@ -0,0 +1,29 @@ +debian/tmp/usr/share/man/*/deb-control.5 +debian/tmp/usr/share/man/*/deb-src-control.5 +debian/tmp/usr/share/man/*/deb-version.5 +debian/tmp/usr/share/man/*/deb-substvars.5 +debian/tmp/usr/share/man/*/deb-origin.5 +debian/tmp/usr/share/man/*/deb-override.5 +debian/tmp/usr/share/man/*/deb-extra-override.5 +debian/tmp/usr/share/man/*/deb-shlibs.5 +debian/tmp/usr/share/man/*/deb-split.5 +debian/tmp/usr/share/man/*/deb-symbols.5 +debian/tmp/usr/share/man/*/deb-triggers.5 +debian/tmp/usr/share/man/*/deb-old.5 +debian/tmp/usr/share/man/*/deb.5 +debian/tmp/usr/share/man/*/dpkg-architecture.1 +debian/tmp/usr/share/man/*/dpkg-buildflags.1 +debian/tmp/usr/share/man/*/dpkg-buildpackage.1 +debian/tmp/usr/share/man/*/dpkg-checkbuilddeps.1 +debian/tmp/usr/share/man/*/dpkg-distaddfile.1 +debian/tmp/usr/share/man/*/dpkg-genchanges.1 +debian/tmp/usr/share/man/*/dpkg-gencontrol.1 +debian/tmp/usr/share/man/*/dpkg-gensymbols.1 +debian/tmp/usr/share/man/*/dpkg-mergechangelogs.1 +debian/tmp/usr/share/man/*/dpkg-name.1 +debian/tmp/usr/share/man/*/dpkg-parsechangelog.1 +debian/tmp/usr/share/man/*/dpkg-scanpackages.1 +debian/tmp/usr/share/man/*/dpkg-scansources.1 +debian/tmp/usr/share/man/*/dpkg-shlibdeps.1 +debian/tmp/usr/share/man/*/dpkg-source.1 +debian/tmp/usr/share/man/*/dpkg-vendor.1 diff --git a/debian/dpkg.install b/debian/dpkg.install index 511effd..26aa1b6 100644 --- a/debian/dpkg.install +++ b/debian/dpkg.install @@ -13,19 +13,8 @@ usr/bin/dpkg-statoverride usr/bin/dpkg-trigger usr/bin/update-alternatives usr/sbin -usr/share/dpkg +usr/share/dpkg/*table usr/share/locale/*/LC_MESSAGES/dpkg.mo -usr/share/man/{*/*,*}/dpkg-deb.1 -usr/share/man/{*/*,*}/dpkg-divert.8 -usr/share/man/{*/*,*}/dpkg-maintscript-helper.1 -usr/share/man/{*/*,*}/dpkg-query.1 -usr/share/man/{*/*,*}/dpkg-split.1 -usr/share/man/{*/*,*}/dpkg-statoverride.8 -usr/share/man/{*/*,*}/dpkg-trigger.1 -usr/share/man/{*/*,*}/dpkg.cfg.5 -usr/share/man/{*/*,*}/dpkg.1 -usr/share/man/{*/*,*}/start-stop-daemon.8 -usr/share/man/{*/*,*}/update-alternatives.8 var/lib/dpkg/alternatives var/lib/dpkg/info var/lib/dpkg/parts diff --git a/debian/dpkg.manpages b/debian/dpkg.manpages new file mode 100644 index 0000000..2df4829 --- /dev/null +++ b/debian/dpkg.manpages @@ -0,0 +1,11 @@ +debian/tmp/usr/share/man/*/dpkg-deb.1 +debian/tmp/usr/share/man/*/dpkg-divert.8 +debian/tmp/usr/share/man/*/dpkg-maintscript-helper.1 +debian/tmp/usr/share/man/*/dpkg-query.1 +debian/tmp/usr/share/man/*/dpkg-split.1 +debian/tmp/usr/share/man/*/dpkg-statoverride.8 +debian/tmp/usr/share/man/*/dpkg-trigger.1 +debian/tmp/usr/share/man/*/dpkg.cfg.5 +debian/tmp/usr/share/man/*/dpkg.1 +debian/tmp/usr/share/man/*/start-stop-daemon.8 +debian/tmp/usr/share/man/*/update-alternatives.8 diff --git a/debian/dpkg.postrm b/debian/dpkg.postrm index 1a7128e..b0550e4 100755 --- a/debian/dpkg.postrm +++ b/debian/dpkg.postrm @@ -42,7 +42,7 @@ cleanup_multiarch_infodb() ls $pkgadmindir | grep : | while read oldfile; do rm "$pkgadmindir/$oldfile" done - rm -f $admindir/format + rm -f $pkgadmindir/format } case "$1" in @@ -55,7 +55,7 @@ case "$1" in upgrade) # Downgrade the multiarch db to a “monoarch” db layout - if dpkg --compare-versions "$2" lt 1.16.0; then + if dpkg --compare-versions "$2" lt 1.16.2; then cleanup_multiarch_infodb fi ;; diff --git a/debian/dpkg.prerm b/debian/dpkg.prerm index abc88b5..bce0e42 100755 --- a/debian/dpkg.prerm +++ b/debian/dpkg.prerm @@ -17,10 +17,53 @@ # Before the package is replaced due to conflict: # remove in-favour +ensure_no_triggers_noawait() +{ + admindir=${DPKG_ADMINDIR:-/var/lib/dpkg} + pkgadmindir=$admindir/info + + trig_noawait=$(find "$pkgadmindir" -name "*.triggers" -type f | \ + xargs -r grep -El "^(interest|activate)-(no)?await" | \ + sed -e 's,^.*/\([^/.:]\+\)[^/]\+$,\1,') + + # Abort if we cannot possibly downgrade + if [ -n "$trig_noawait" ]; then + cat <<- MSG + dpkg: error: You have packages using the "interest-noawait" and/or + "activate-noawait" trigger directives but the dpkg version that + you're trying to downgrade to doesn't support them. Aborting + downgrade. + + List of affected packages: + + $trig_noawait + MSG + exit 1 + fi + + bad_triggers_files=$(find "$admindir/triggers" -type f | \ + xargs -r grep -l "/noawait$" || true) + if [ -n "$bad_triggers_files" ]; then + cat <<- MSG + dpkg: error: Some internal trigger files unexpectedly reference + packages tagged with "/noawait" while their corresponding + infodb files doesn't seem to contain any "interest-noawait" + directive. Aborting the downgrade as those tags are not supported + by the version you're trying to downgrade to. + + List of internal trigger files that are affected: + + $bad_triggers_files + MSG + exit 1 + fi +} + downgrade_multiarch_infodb() { admindir=${DPKG_ADMINDIR:-/var/lib/dpkg} pkgadmindir=$admindir/info + triggersdir=$admindir/triggers coinst_pkgs="`ls "$pkgadmindir" | \ sed -n -e 's/^\([^:]\+:[^.]\+\)\..*$/\1/p' | sort -u | \ @@ -40,49 +83,69 @@ downgrade_multiarch_infodb() exit 1 fi - bad_dep_pkgs=$(dpkg-query -f'${Package} ${Depends} ${Recommends} ${Suggests} ${Enhances} ${Conflicts} ${Replaces} ${Breaks}\n' -W | \ - grep ":any" | cut -d" " -f1 | sort -u) + bad_dep_pkgs=$(dpkg-query -f '${Package}\t${Depends} ${Recommends} ${Suggests} ${Enhances} ${Conflicts} ${Replaces} ${Breaks}\n' -W | \ + grep ":any" | cut -f1 | sort -u) if [ -n "$bad_dep_pkgs" ]; then cat <<- MSG - dpkg: error: Some installed packages have multiarch dependencies - that the old dpkg won't parse. You should get rid of them - (or downgrade them to versions without those dependencies) before - proceeding with dpkg's downgrade. + dpkg: error: Some installed packages have multiarch dependencies that + the old dpkg won't parse. You should get rid of them (or downgrade + them to versions without those dependencies) before proceeding with + dpkg's downgrade. List of affected packages: $bad_dep_pkgs MSG + exit 1 + fi + + dep_fields='Depends|Recommends|Suggests|Enhances|Conflicts|Replaces|Breaks' + if grep -qE "^($dep_fields):.*:any" $admindir/available; then + cat <<- MSG + dpkg: error: Some available packages have multiarch dependencies that + the old dpkg won't parse. You should clear this file before proceeding + with dpkg's downgrade, with: + + # dpkg --clear-avail + MSG exit 1 fi - for dep in Depends Recommends Suggests Enhances \ - Conflicts Replaces Breaks; do - if grep -qE "^$dep:.*:any" $admindir/available; then - cat <<- MSG - dpkg: error: $admindir/available references packages with - multiarch dependencies that the old dpkg won't parse. You - should clear this file with "dpkg --clear-avail" before - proceeding with dpkg's downgrade. - MSG - exit 1 - fi - done + file_triggers_pkgs="`sed -n -e 's/^[^ ]\+ \([^:]\+\):[^.]\+$/\1/p' \ + $triggersdir/File| sort -u`" + + if [ -n "$file_triggers_pkgs" ]; then + cat <<-MSG + dpkg: error: The triggers database contains arch-qualified package + names that the old dpkg won't parse. You should get rid of them (or + downgrade them to a non Multi-Arch: same version) before proceeding + with dpkg's downgrade. + + List of affected packages: + + $file_triggers_pkgs + MSG + exit 1 + fi echo "Downgrading the multiarch dpkg control files database ..." ls $pkgadmindir | grep : | while read oldfile; do # We first do a round of hardlinks to the new names, so that the db # will never be unusable for either of the dpkg versions. newfile=$(echo $oldfile | sed -e 's/:[^.]\+//') - ln "$pkgadmindir/$oldfile" "$pkgadmindir/$newfile" + ln -f "$pkgadmindir/$oldfile" "$pkgadmindir/$newfile" done - echo -n "1" >$admindir/format } case "$1" in upgrade) + # Allow the downgrade only if no package is using the + # (interest|activate)-noawait trigger directives + if dpkg --compare-versions "$2" lt 1.16.1; then + ensure_no_triggers_noawait + fi # Downgrade the multiarch db to a “monoarch” db layout - if dpkg --compare-versions "$2" lt 1.16.0; then + if dpkg --compare-versions "$2" lt 1.16.2; then downgrade_multiarch_infodb fi ;; diff --git a/debian/dselect.install b/debian/dselect.install index e311761..65487d7 100644 --- a/debian/dselect.install +++ b/debian/dselect.install @@ -4,7 +4,5 @@ etc/dpkg/dselect.cfg.d usr/bin/dselect usr/lib/dpkg/methods usr/share/locale/*/LC_MESSAGES/dselect.mo -usr/share/man/{*/*,*}/dselect.cfg.5 -usr/share/man/{*/*,*}/dselect.1 usr/share/perl5/Debian var/lib/dpkg/methods diff --git a/debian/dselect.manpages b/debian/dselect.manpages new file mode 100644 index 0000000..b49942d --- /dev/null +++ b/debian/dselect.manpages @@ -0,0 +1,2 @@ +debian/tmp/usr/share/man/*/dselect.cfg.5 +debian/tmp/usr/share/man/*/dselect.1 diff --git a/debian/rules b/debian/rules index 2503f80..c9f6ec6 100755 --- a/debian/rules +++ b/debian/rules @@ -1,20 +1,16 @@ #!/usr/bin/make -f # debian/rules for the dpkg suite. # Copyright © 2004 Scott James Remnant +# Copyright © 2006-2012 Guillem Jover WFLAGS := -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -CFLAGS = -g $(WFLAGS) -CXXFLAGS = -g $(WFLAGS) - -# Disable optimisations if ‘noopt’ found in $DEB_BUILD_OPTIONS -ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 - CXXFLAGS += -O0 -else - CFLAGS += -O2 - CXXFLAGS += -O2 -endif +# Use the in-tree dpkg-buildflags +dpkg_buildflags = \ + DEB_CFLAGS_MAINT_APPEND="$(WFLAGS)" \ + DEB_CXXFLAGS_MAINT_APPEND="$(WFLAGS)" \ + PERL5LIB=$(CURDIR)/scripts DPKG_DATADIR=$(CURDIR) \ + perl $(CURDIR)/scripts/dpkg-buildflags.pl # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) @@ -33,7 +29,9 @@ DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) ifeq ($(DEB_HOST_ARCH_OS),linux) confflags += --with-selinux endif - +ifeq (,$(filter maintainer-build,$(DEB_BUILD_OPTIONS))) + confflags += --disable-silent-rules +endif # Create configure script if necessary, automake handles rebuilding it. configure: @@ -47,8 +45,7 @@ build-tree/config.status: configure install -d build-tree cd build-tree && ../configure $(confflags) \ - CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ - --disable-silent-rules \ + $(shell $(dpkg_buildflags) --export=configure) \ --prefix=/usr \ --mandir=\$${datadir}/man \ --infodir=\$${datadir}/info \ @@ -58,7 +55,7 @@ build-tree/config.status: configure --with-bz2 # Build the package in build-tree -build: build-tree/config.status +build-indep build-arch build: build-tree/config.status dh_testdir cd build-tree && $(MAKE) @@ -87,6 +84,13 @@ ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes)) $(CURDIR)/debian/tmp/usr/share/dpkg/cputable endif +define dpkg-installmanl10n +for f in `sed -e 's:\*:*/*:' debian/$(1).manpages`; do \ + test -e $$f && \ + install -D $$f `echo $$f | sed -e 's:^debian/tmp:debian/$(1):'`; \ +done +endef + # Put together the dpkg and dselect packages binary-arch: install dh_testdir -a @@ -100,6 +104,9 @@ binary-arch: install dh_installchangelogs -a ChangeLog* dh_installdocs -a + $(call dpkg-installmanl10n,dpkg) + $(call dpkg-installmanl10n,dselect) + dh_installman -a dh_link -a dh_lintian -a dh_strip -a @@ -119,6 +126,8 @@ binary-indep: install dh_installcron -i dh_installchangelogs -i ChangeLog* dh_installdocs -i + $(call dpkg-installmanl10n,dpkg-dev) + dh_installman -i dh_link -i dh_lintian -i dh_strip -i diff --git a/debian/usertags b/debian/usertags index 0a0d9c1..b4c8620 100644 --- a/debian/usertags +++ b/debian/usertags @@ -27,7 +27,7 @@ file-metadata File metadata tracking (perm, acl, cap, hash). trivial [TRIVIAL] Bug should be trivial to fix. perf [PERF] Performance problems. new-field Request for new control file fields. -new-option Request for new command-line option. +new-option Request for new command line option. deb-format Changes to the binary (.deb) format. dsc-format Changes to the source (.dsc) format. arch [ARCH] Updates to ‘cputable’, ‘ostable’ and porting @@ -79,6 +79,7 @@ dpkg-shlibdeps [DPKG-SHLIBDEPS] dpkg-source [DPKG-SOURCE] dpkg-split [DPKG-SPLIT] dpkg-statoverride [DPKG-STATOVERRIDE] +dpkg-trigger dpkg-vendor s-s-d [S-S-D] start-stop-daemon u-a [U-A] update-alternatives @@ -112,6 +113,7 @@ usercategory dpkg-program [hidden] + dpkg-query [tag=dpkg-query] + dpkg-split [tag=dpkg-split] + dpkg-statoverride [tag=dpkg-statoverride] + + dpkg-trigger [tag=dpkg-trigger] + dpkg-maintscript-helper [tag=dpkg-maintscript-helper] + start-stop-daemon [tag=s-s-d] + update-alternatives [tag=u-a] @@ -155,7 +157,7 @@ usercategory dpkg-class [hidden] + Performance issue [perf] + Trivial fix [trivial] + New control field [new-field] - + New command-line option [new-option] + + New command line option [new-option] + Binary package format [deb-format] + Source package format [dsc-format] + Architecture specific issue [arch] diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 27be841..eb7e789 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -282,7 +282,7 @@ TYPEDEF_HIDES_STRUCT = NO # causing a significant performance penality. # If the system has enough physical memory increasing the cache will improve the # performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will rougly double the +# a logarithmic scale so increasing the size by one will roughly double the # memory usage. The cache size is given by this formula: # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, # corresponding to a cache size of 2^16 = 65536 symbols @@ -591,8 +591,7 @@ INPUT_ENCODING = UTF-8 # *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 FILE_PATTERNS = *.c \ - *.h \ - *.l + *.h # The RECURSIVE tag can be used to turn specify whether or not subdirectories # should be searched for input files as well. Possible values are YES and NO. @@ -604,7 +603,7 @@ RECURSIVE = YES # excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. -EXCLUDE = lib/dpkg/trigdeferred.c +EXCLUDE = # The EXCLUDE_SYMLINKS tag can be used select whether or not files or # directories that are symbolic links (a Unix filesystem feature) are excluded diff --git a/doc/README.api b/doc/README.api index fe575ad..6cd8eb2 100644 --- a/doc/README.api +++ b/doc/README.api @@ -31,7 +31,7 @@ What: custom changelog parsers in /usr/lib/dpkg/parsechangelog Status: stable Version: 2.0 Description: - Since dpkg 1.14.16, the set of command-line options that custom + Since dpkg 1.14.16, the set of command line options that custom changelog parsers must support has been expanded (see dpkg-parsechangelog(1)). For compatibility, changelog parsers supporting only the old options are supported in lenny. In lenny+1, that support diff --git a/doc/README.feature-removal-schedule b/doc/README.feature-removal-schedule index 2ce6506..a085ac9 100644 --- a/doc/README.feature-removal-schedule +++ b/doc/README.feature-removal-schedule @@ -7,7 +7,7 @@ Warning: program and lintian (missing-debian-source-format) Why: With the support of multiple source formats, the user should be explicit about the desired source format. The fallback to "1.0" is there only for - backwards compatiblity but will be removed once all packages have the + backwards compatibility but will be removed once all packages have the debian/source/format file. This is unlikely to happen before 1.17.x. What: Source-Version (substvar) diff --git a/doc/coding-style.txt b/doc/coding-style.txt index ca360fa..dbeb2b7 100644 --- a/doc/coding-style.txt +++ b/doc/coding-style.txt @@ -60,11 +60,11 @@ function(void *ptr, int value) if (value > 10) do_something(GLOBAL_MACRO, ptr, value, "some-string", - ref_ptr, ref_value, "other-string", - "extra-string"); + ref_ptr, ref_value, "other-string", + "extra-string"); } -When wrapping, logical operators should be kept on the preceeding line: +When wrapping, logical operators should be kept on the preceding line: if (really_long_variable_to_be_checked_against_a && really_long_variable_to_be_checked_against_b) diff --git a/doc/triggers.txt b/doc/triggers.txt index d10aab0..3d2a04e 100644 --- a/doc/triggers.txt +++ b/doc/triggers.txt @@ -46,13 +46,14 @@ will not be processed immediately when it is activated; processing is deferred until it is convenient (as described below). At a trigger activation, the interested packages(s) are added to the -triggering package's list of triggers-awaited packages; the triggering +triggering package's list of triggers-awaited packages (unless the +trigger has been configured to not require it); the triggering package is said to await the trigger processing. A package which has pending triggers, or which awaits triggers, is not considered properly installed. There are two new dpkg status values, -`triggers-pending' and `triggers-awaited', which lie between -`config-failed' and `installed'. +‘triggers-pending’ and ‘triggers-awaited’, which lie between +‘config-failed’ and ‘installed’. Details - Overview table @@ -81,21 +82,20 @@ processing is awaited by T. Zero or more packages I may be added as a result of any particular trigger activation, depending on how many packages were interested. (If T chooses, explicit trigger activation using dpkg-trigger of I by T need not make T become triggers-awaited -in this way..) +in this way.) A package which awaits trigger processing but would otherwise be -`installed' or `triggers-pending' is considered to be in state -`triggers-awaited'. Packages in `triggers-awaited' do not satisfy +‘installed’ or ‘triggers-pending’ is considered to be in state +‘triggers-awaited’. Packages in ‘triggers-awaited’ do not satisfy Depends dependencies. Every triggered package I in T's list of awaited packages either has a -nonempty list of pending triggers, or is in `config-failed' or worse. -When I enters `installed' (or `config-files' or `not-installed'), the +nonempty list of pending triggers, or is in ‘config-failed’ or worse. +When I enters ‘installed’ (or ‘config-files’ or ‘not-installed’), the entry in T's list of awaited packages is removed so that T may, if it -no longer awaits any packages, become `installed' or -`triggers-pending'. +no longer awaits any packages, become ‘installed’ or ‘triggers-pending’. -Packages in `config-files' or `not-installed' do not await triggers. +Packages in ‘config-files’ or ‘not-installed’ do not await triggers. Details - triggered package @@ -104,77 +104,76 @@ Details - triggered package When one of the triggers in which a package is interested is activated, the triggered package has the trigger added to its list of pending triggers. Packages with a nonempty list of pending triggers -which would otherwise be in state `installed' are in state -`triggers-pending' instead, so if the package was previously -`installed' it becomes `triggers-pending'. +which would otherwise be in state ‘installed’ are in state +‘triggers-pending’ instead, so if the package was previously +‘installed’ it becomes ‘triggers-pending’. If a package has nonempty lists both of pending and awaited triggers, -then it is in `triggers-awaited'. Nevertheless efforts will still be +then it is in ‘triggers-awaited’. Nevertheless efforts will still be made to process its triggers so as to make the list of pending triggers empty. -To restore a package in state `triggers-pending' to `installed', or to +To restore a package in state ‘triggers-pending’ to ‘installed’, or to process pending triggers of a package with both pending and awaited triggers, dpkg will run the postinst script: postinst triggered " ..." This will be attempted for each relevant package at the end of each dpkg run; so, normally, in the same dpkg run as the event which made -the package go to `triggers-pending'. This leaves packages in +the package go to ‘triggers-pending’. This leaves packages in reasonable states by default. -If the `postinst triggered' run fails the package goes to -`config-failed', so that the trigger processing will not be attempted -again until explictly requested. - - - | - V - ,------------. - | unpacked | - `------------' - | - | - (automatic)| ,----------. - | | config- | - | | failed | - | `----------' - | | ^ - | | | - |,---<--' | ,------------------------------. - | (user | | triggers-pending | - postinst | request) | | or | - "configure" | | | t.-awaited with some pending | - | | `------------------------------' - | | | ^ - |`----->------'| | | - | error | postinst | | - | | "triggered" | | trigger(s) - | | (automatic) | | activated - | | | | - | `-----<-----------'| | - | error | | - | | | - V V | - ,--------------------------------------------------. - | installed or t.-awaited with none pending | - `--------------------------------------------------' - -Packages in `config-failed' or worse are never considered to have +If the “postinst triggered” run fails the package goes to +‘config-failed’, so that the trigger processing will not be attempted +again until explicitly requested. + + + │ + v + ┌────────────┐ + │ unpacked │ + └─────┬──────┘ + │ + │ + (automatic)│ ┌───────────────┐ + │ │ config-failed │ + │ └─────┬─────────┘ + │ │ ^ + │ │ │ + ├──────<─────┘ │ ┌──────────────────────────────────┐ + │ (user request) │ │ triggers-pending │ + postinst │ │ │ or │ + "configure" │ │ │ triggers-awaited w/ some pending │ + │ │ └────────────┬─────────────────────┘ + │ │ │ ^ + ├────────>───────┤ postinst │ │ + │ error │ "triggered" │ │ + │ │ (automatic) │ │ + │ │ │ │ trigger(s) + │ │ │ │ activated + │ └────────<─────────┤ │ + │ error │ │ + │ │ │ + v v │ + ┌──────────────────────────────────────────────┴────┐ + │ installed or triggers-awaited w/ none pending │ + └───────────────────────────────────────────────────┘ + +Packages in ‘config-failed’ or worse are never considered to have lists of pending triggers. A package whose postinst is being run can however acquire pending triggers during that run (ie, a package can trigger itself). This means that if a triggering package T awaits trigger processing by -an interested package I, and I goes to `config-failed' or worse (eg, +an interested package I, and I goes to ‘config-failed’ or worse (eg, during unpack for upgrade), then when I is reconfigured (goes to -`installed') or removed, T will no longer await processing by I, so -that T may automatically go from `triggers-awaited' to `installed'. +‘installed’) or removed, T will no longer await processing by I, so +that T may automatically go from ‘triggers-awaited’ to ‘installed’. Or to put it another way, triggered actions are considered irrelevant if the interested package I is not configured. When I's postinst is -called with `configure', it must do whatever actions are necessary to -deal with any trigger activations which might have occured while it +called with ‘configure’, it must do whatever actions are necessary to +deal with any trigger activations which might have occurred while it was not configured, just as if the package was being configured for the first time. @@ -207,18 +206,18 @@ the status database, rather than that when dpkg --status is run.) A package is only guaranteed to become notified of a trigger activation if it is continuously interested in the trigger, and never -in `config-failed' or worse, during the period from when the trigger +in ‘config-failed’ or worse, during the period from when the trigger is activated until dpkg runs the package postinst (either due to --configure --pending, or at the end of the relevant run, as described above). Subsequent to activation and before notification, the -interested package will not be considered in state `installed', so +interested package will not be considered in state ‘installed’, so long as the package remains interested, and the triggering package -will not be considered `installed'. +will not be considered ‘installed’. -If the package is not in state `installed', `triggers-pending' or -`triggers-awaited' then pending triggers are not accumulated. -However, if such a package (between `half-installed' and -`config-failed' inclusive) declares some trigger interests then the +If the package is not in state ‘installed’, ‘triggers-pending’ or +‘triggers-awaited’ then pending triggers are not accumulated. +However, if such a package (between ‘half-installed’ and +‘config-failed’ inclusive) declares some trigger interests then the triggering packages *will* await their configuration (which implies completion of any necessary trigger processing) or removal. @@ -229,8 +228,8 @@ have postinst trigger processing activating another package's triggers dpkg run). Cycles in the triggering graph are prohibited and will eventually, perhaps after some looping, be detected by dpkg and cause trigger processing to fail; when this happens one of the packages -involved will be put in state `config-failed' so that the trigger loop -will not be reattempted. See `Cycle detection' below. +involved will be put in state ‘config-failed’ so that the trigger loop +will not be reattempted. See “Cycle detection” below. Explicit triggers @@ -263,7 +262,7 @@ dpkg during package unpack or removal. The pathname must be absolute. File triggers should not generally be used without mutual consent. The use of a file trigger, and the name of the trigger used, should be stated in policy, so that a package which creates a relevant file in a -maintainer script can activate the trigger explictly. +maintainer script can activate the trigger explicitly. File triggers must definitely not be used as an escalation tool in disagreements between different packages as to the desired contents of @@ -306,12 +305,12 @@ dpkg-generated triggers is as follows: a package which is interested in any unsupported trigger kinds cannot be configured (since such a package cannot be guaranteed to have these triggers properly activated by dpkg). Therefore no package can be interested in any unsupported -trigger kinds and they can be freely activated (both by `activate' and +trigger kinds and they can be freely activated (both by ‘activate’ and by dpkg-trigger). dpkg-deb will be changed to warn about unrecognised trigger names syntaxes and unrecognised trigger control directives. -New command-line interfaces to dpkg tools +New command line interfaces to dpkg tools ----------------------------------------- See dpkg(1). @@ -348,18 +347,18 @@ needed, not the name of a file which would match the trigger. apt and aptitude ---------------- -These must be taught about the new `triggers-awaited' and -`triggers-pending' states. Packages in these states should be treated -roughly like those in `unpacked': the remedy is to run dpkg +These must be taught about the new ‘triggers-awaited’ and +‘triggers-pending’ states. Packages in these states should be treated +roughly like those in ‘unpacked’: the remedy is to run dpkg --configure. -Normally apt and aptitude will not see packages in `triggers-pending' +Normally apt and aptitude will not see packages in ‘triggers-pending’ since dpkg will generally attempt to run the triggers thus leaving the -package in `config-failed' or `installed'. +package in ‘config-failed’ or ‘installed’. Note that automatic package management tools which call dpkg (like apt and aptitude) should not attempt to configure individual packages in -state `triggers-pending' (or indeed `triggers-awaited') with dpkg +state ‘triggers-pending’ (or indeed ‘triggers-awaited’) with dpkg --triggers-only ... or dpkg --no-triggers --configure ..., or similar approaches. This might defeat dpkg's trigger cycle detection. @@ -418,7 +417,7 @@ occurs at every relevant package installation, upgrade or removal. When triggers are available, this will work as follows: - * gnome-foobar will ship its `omf' file in /usr/share/omf as + * gnome-foobar will ship its «omf» file in /usr/share/omf as normal, but will not contain any special machinery to invoke scrollkeeper. @@ -458,7 +457,7 @@ Full implementation of the transition plan defined below, for scrollkeeper, goes like this: 1. Update scrollkeeper: - - Add a `triggers' control archive file containing + - Add a ‘triggers’ control archive file containing interest /usr/share/omf - Make the postinst modifications as described above. - Rename scrollkeeper-update to scrollkeeper-update-now @@ -470,7 +469,7 @@ scrollkeeper, goes like this: fi exec scrollkeeper-update-now "$@" - 2. In gnome-policy chapter 2, `Use of scrollkeeper', + 2. In gnome-policy chapter 2, “Use of scrollkeeper”, - delete the requirement that the package must depend on scrollkeeper - delete the requirement that the package must invoke @@ -484,7 +483,7 @@ scrollkeeper, goes like this: If an OMF file is placed, modified or removed other than as an file installed in the ordinary way by dpkg, the dpkg file - trigger `/usr/share/omf' should be activated; see the dpkg + trigger «/usr/share/omf» should be activated; see the dpkg triggers specification for details. Existing packages which Depend on scrollkeeper (>= 3.8) @@ -548,9 +547,9 @@ pending and refuse. (Since the new dpkg would be installed but then refuse to read the status file.) In case this is necessary a separate tool will be provided which will: * Put all packages with any pending triggers into state - `config-failed' and remove the list of pending triggers. + ‘config-failed’ and remove the list of pending triggers. * Remove the list of awaited triggers from every package. This - may cause packages to go from `triggers-awaited' to `installed' + may cause packages to go from ‘triggers-awaited’ to ‘installed’ which is not 100% accurate but the best that can be done. * Remove /var/lib/dpkg/triggers (to put the situation to that which we would have seen if the trigger-supporting dpkg had never been @@ -575,31 +574,31 @@ Transition hints for existing packages When a central (consumer) package defines a directory where other leaf (producer) packages may place files and/or directories, and currently -the producer packages are required to run an `update-consumer' script +the producer packages are required to run an «update-consumer» script in their postinst: 1. In the relevant policy, define a trigger name which is the name of the directory where the individual files are placed by producer packages. 2. Update the consumer package: * Declare an interest in the trigger. - * Edit update-consumer so that if it is called without --real + * Edit «update-consumer» so that if it is called without --real it does the following: if type dpkg-trigger >/dev/null 2>&1 && \ dpkg-trigger name-of-trigger; then exit 0 fi - If this fails to cause update-consumer to exit, it should do + If this fails to cause «update-consumer» to exit, it should do its normal update processing. Alternatively, if it is more - convenient, update-consumer could be renamed and supplanted with + convenient, «update-consumer» could be renamed and supplanted with a wrapper script which conditionally runs the real - update-consumer. - * In the postinst, arrange for the new `triggered' invocation to - run update-consumer --real. The consumer package's postinst - will already run update-consumer during configuration, and this + «update-consumer». + * In the postinst, arrange for the new ‘triggered’ invocation to + run «update-consumer --real». The consumer package's postinst + will already run «update-consumer» during configuration, and this should be retained and supplemented with the --real option (or changed to call the real script rather than the wrapper). 3. Update the producer packages: - * In the postinst, remove the call to update-consumer + * In the postinst, remove the call to «update-consumer». * Change the dependency on consumer to be versioned, specifying a trigger-interested consumer. This can be done at our leisure. Ideally for loosely coupled @@ -607,11 +606,11 @@ in their postinst: containing the triggers-interested consumer, to facilitate partial upgrades and backports. 4. After all producer packages have been updated according to step 3, - `update-consumer' has become an interface internal to the consumer + «update-consumer» has become an interface internal to the consumer and need no longer be kept stable. If un-updated producers are - still of interest, incompatible changes to `update-consumer' imply + still of interest, incompatible changes to «update-consumer» imply a versioned Breaks against the old producers. -(See also `Transition plan', below.) +(See also “Transition plan”, below.) If there are several consumer packages all of which are interested in the features provided by producer packages, the current arrangements @@ -626,7 +625,7 @@ emacsen-common). In this case: consumers in step 3 (2nd bullet). 3. Update the consumer packages: * Declare an interest in the trigger. - * In the postinst, arrange for the new `trigger' invocation to run + * In the postinst, arrange for the new ‘trigger’ invocation to run the compilation/registration process. This may involve scanning for new or removed producers, and may involve new common functionality from the switchboard (in which case a versioned @@ -715,7 +714,7 @@ a Triggers-Pending field which contains the space-separated names of the pending triggers. For each package which awaits triggers the status file contains a Triggers-Awaited field which contains the *package* names of the packages whose trigger processing is awaited. -See `Details - Overview table' above for the invariants which relate +See “Details - Overview table” above for the invariants which relate Triggers-Pending, Triggers-Awaited, and Status. During dpkg's execution, /var/lib/dpkg/triggers/Unincorp is a list of @@ -755,11 +754,11 @@ be parsed and /var/lib/dpkg/triggers/* updated accordingly. Triggers are run as part of configuration. dpkg will try to first configure all packages which do not depend on packages which are awaiting triggers, and then run triggers one package at a time in the -hope of making useful progress. (This will involve a new `dependtry' +hope of making useful progress. (This will involve a new ‘dependtry’ level in configure.c's algorithm.) The only constraint on the ordering of postinsts is only the normal Depends constraint, so the -usual Depends cycle breaking will function properly. See `Cycle -detection' below regarding cycles in the `A triggers B' relation. +usual Depends cycle breaking will function properly. See “Cycle +detection” below regarding cycles in the “A triggers B” relation. Processing - Transitional @@ -769,9 +768,9 @@ The case where a triggers-supporting dpkg is run for the first time is detected by the absence of /var/lib/dpkg/triggers/Unincorp. When the triggers-supporting dpkg starts up without this it will set each package's list of pending triggers equal to its interests (obviously -only for packages which are in `installed' or `triggers-pending'). -This may result in a package going from `installed' to -`triggers-pending' but it will not create the directory at this time. +only for packages which are in ‘installed’ or ‘triggers-pending’). +This may result in a package going from ‘installed’ to +‘triggers-pending’ but it will not create the directory at this time. Packages marked as triggers-pending in this way will not be scheduled for trigger processing in this dpkg run. @@ -793,7 +792,7 @@ Cycle detection In addition to dependency cycles, triggers raise the possibility of mutually triggering packages - a cycle detectable only dynamically, -which we will call a `trigger cycle'. +which we will call a “trigger cycle”. Trigger cycles are detected using the usual hare-and-tortoise approach. Each time after dpkg runs a postinst for triggers, dpkg @@ -810,6 +809,4 @@ all its (strict) subsets. Trigger processing is supposed to monotonically decrease the set in this ordering. (The set elements are tuples.) -(See `Processing' above for discussion of dependency cycles.) - --- +(See “Processing” above for discussion of dependency cycles.) diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c index 658f0f6..690ed80 100644 --- a/dpkg-deb/build.c +++ b/dpkg-deb/build.c @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include "dpkg-deb.h" @@ -57,8 +57,8 @@ */ struct file_info { struct file_info *next; - struct stat st; - char* fn; + struct stat st; + char *fn; }; static struct file_info * @@ -108,7 +108,7 @@ file_info_get(const char *root, int fd) root_len = varbuf_printf(&fn, "%s/", root); while (1) { - int res; + int res; varbuf_grow(&fn, 1); res = fd_read(fd, (fn.buf + fn.used), 1); @@ -332,7 +332,7 @@ check_new_pkg(const char *dir) /* Start by reading in the control file so we can check its contents. */ m_asprintf(&controlfile, "%s/%s/%s", dir, BUILDCONTROLDIR, CONTROLFILE); - parsedb(controlfile, pdb_recordavailable | pdb_rejectstatus, &pkg); + parsedb(controlfile, pdb_parse_binary, &pkg); if (strspn(pkg->set->name, "abcdefghijklmnopqrstuvwxyz0123456789+-.") != strlen(pkg->set->name)) @@ -406,7 +406,8 @@ do_build(const char *const *argv) if (debar != NULL) { struct stat debarstab; - if (*argv) badusage(_("--build takes at most two arguments")); + if (*argv) + badusage(_("--%s takes at most two arguments"), cipaction->olong); if (stat(debar, &debarstab)) { if (errno != ENOENT) @@ -437,7 +438,7 @@ do_build(const char *const *argv) if (subdir) debar = pkg_get_pathname(debar, pkg); printf(_("dpkg-deb: building package `%s' in `%s'.\n"), - pkg_describe(pkg, pdo_foreign | pdo_avail), debar); + pkg->set->name, debar); } m_output(stdout, _("")); @@ -475,7 +476,13 @@ do_build(const char *const *argv) /* And run gzip to compress our control archive. */ c2 = subproc_fork(); if (!c2) { - compress_filter(&compressor_gzip, p1[0], gzfd, 9, _("control member")); + struct compress_params params; + + params.type = compressor_type_gzip; + params.level = 9; + params.strategy = NULL; + + compress_filter(¶ms, p1[0], gzfd, _("control member")); exit(0); } close(p1[0]); @@ -544,7 +551,7 @@ do_build(const char *const *argv) c2 = subproc_fork(); if (!c2) { close(p1[1]); - compress_filter(compressor, p2[0], gzfd, compress_level, _("data member")); + compress_filter(&compress_params, p2[0], gzfd, _("data member")); exit(0); } close(p2[0]); @@ -588,7 +595,8 @@ do_build(const char *const *argv) if (!oldformatflag) { char datamember[16 + 1]; - sprintf(datamember, "%s%s", DATAMEMBER, compressor->extension); + sprintf(datamember, "%s%s", DATAMEMBER, + compressor_get_extension(compress_params.type)); if (lseek(gzfd, 0, SEEK_SET)) ohshite(_("failed to rewind temporary file (%s)"), _("data member")); diff --git a/dpkg-deb/dpkg-deb.h b/dpkg-deb/dpkg-deb.h index 7ae4ccf..30ed306 100644 --- a/dpkg-deb/dpkg-deb.h +++ b/dpkg-deb/dpkg-deb.h @@ -29,27 +29,23 @@ action_func do_info; action_func do_field; action_func do_extract; action_func do_vextract; +action_func do_raw_extract; action_func do_fsystarfile; +extern int opt_verbose; extern int debugflag, nocheckflag, oldformatflag; void extracthalf(const char *debar, const char *dir, const char *taroption, int admininfo); -extern const char* showformat; -extern struct compressor *compressor; -extern int compress_level; +extern const char *showformat; +extern struct compress_params compress_params; #define ARCHIVEVERSION "2.0" #define BUILDCONTROLDIR "DEBIAN" #define EXTRACTCONTROLDIR BUILDCONTROLDIR -/* Set BUILDOLDPKGFORMAT to 1 to build old-format archives by default. */ -#ifndef BUILDOLDPKGFORMAT -#define BUILDOLDPKGFORMAT 0 -#endif - #define OLDARCHIVEVERSION "0.939000" #define OLDDEBDIR "DEBIAN" diff --git a/dpkg-deb/extract.c b/dpkg-deb/extract.c index b458c1f..08b0664 100644 --- a/dpkg-deb/extract.c +++ b/dpkg-deb/extract.c @@ -3,6 +3,7 @@ * extract.c - extracting archives * * Copyright © 1994,1995 Ian Jackson + * Copyright © 2006-2012 Guillem Jover * * This is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -47,7 +48,8 @@ #include #include #include -#include +#include +#include #include "dpkg-deb.h" @@ -86,7 +88,7 @@ read_line(int fd, char *buf, size_t min_size, size_t max_size) if (r <= 0) return r; - nl = strchr(buf + line_size, '\n'); + nl = memchr(buf + line_size, '\n', r); line_size += r; if (nl != NULL) { @@ -105,8 +107,9 @@ void extracthalf(const char *debar, const char *dir, const char *taroption, int admininfo) { + const char *err; char versionbuf[40]; - float versionnum; + struct deb_version version; off_t ctrllennum, memberlen = 0; ssize_t r; int dummy; @@ -117,8 +120,8 @@ extracthalf(const char *debar, const char *dir, const char *taroption, struct stat stab; char nlc; int adminmember; - bool oldformat, header_done; - struct compressor *decompressor = &compressor_gzip; + bool header_done; + enum compressor_type decompressor = compressor_type_gzip; arfd = open(debar, O_RDONLY); if (arfd < 0) @@ -130,9 +133,7 @@ extracthalf(const char *debar, const char *dir, const char *taroption, if (r < 0) read_fail(r, debar, _("archive magic version number")); - if (!strcmp(versionbuf, DPKG_AR_MAGIC)) { - oldformat = false; - + if (strcmp(versionbuf, DPKG_AR_MAGIC) == 0) { ctrllennum= 0; header_done = false; for (;;) { @@ -144,12 +145,11 @@ extracthalf(const char *debar, const char *dir, const char *taroption, dpkg_ar_normalize_name(&arh); - if (memcmp(arh.ar_fmag,ARFMAG,sizeof(arh.ar_fmag))) + if (dpkg_ar_member_is_illegal(&arh)) ohshit(_("file '%.250s' is corrupt - bad archive header magic"), debar); memberlen = dpkg_ar_member_get_size(debar, &arh); if (!header_done) { char *infobuf; - char *cur; if (strncmp(arh.ar_name, DEBMAGIC, sizeof(arh.ar_name)) != 0) ohshit(_("file `%.250s' is not a debian binary archive (try dpkg-split?)"),debar); @@ -158,25 +158,24 @@ extracthalf(const char *debar, const char *dir, const char *taroption, if (r != (memberlen + (memberlen & 1))) read_fail(r, debar, _("archive information header member")); infobuf[memberlen] = '\0'; - cur= strchr(infobuf,'\n'); - if (!cur) ohshit(_("archive has no newlines in header")); - *cur = '\0'; - cur= strchr(infobuf,'.'); - if (!cur) ohshit(_("archive has no dot in version number")); - *cur = '\0'; - if (strcmp(infobuf,"2")) - ohshit(_("archive version %.250s not understood, get newer dpkg-deb"), infobuf); - *cur= '.'; - strncpy(versionbuf,infobuf,sizeof(versionbuf)); - versionbuf[sizeof(versionbuf) - 1] = '\0'; + + if (strchr(infobuf, '\n') == NULL) + ohshit(_("archive has no newlines in header")); + err = deb_version_parse(&version, infobuf); + if (err) + ohshit(_("archive has invalid format version: %s"), err); + if (version.major != 2) + ohshit(_("archive is format version %d.%d; get a newer dpkg-deb"), + version.major, version.minor); + free(infobuf); header_done = true; } else if (arh.ar_name[0] == '_') { /* Members with ‘_’ are noncritical, and if we don't understand * them we skip them. */ - fd_null_copy(arfd, memberlen + (memberlen & 1), - _("skipped archive member data from %s"), debar); + fd_skip(arfd, memberlen + (memberlen & 1), + _("skipped archive member data from %s"), debar); } else { if (strncmp(arh.ar_name, ADMINMEMBER, sizeof(arh.ar_name)) == 0) adminmember = 1; @@ -190,7 +189,7 @@ extracthalf(const char *debar, const char *dir, const char *taroption, decompressor = compressor_find_by_extension(extension); } - if (adminmember == -1 || decompressor == NULL) + if (adminmember == -1 || decompressor == compressor_type_unknown) ohshit(_("archive '%.250s' contains not understood data member %.*s, giving up"), debar, (int)sizeof(arh.ar_name), arh.ar_name); } @@ -201,8 +200,8 @@ extracthalf(const char *debar, const char *dir, const char *taroption, ctrllennum= memberlen; } if (!adminmember != !admininfo) { - fd_null_copy(arfd, memberlen + (memberlen & 1), - _("skipped archive member data from %s"), debar); + fd_skip(arfd, memberlen + (memberlen & 1), + _("skipped archive member data from %s"), debar); } else { /* Yes! - found it. */ break; @@ -211,21 +210,23 @@ extracthalf(const char *debar, const char *dir, const char *taroption, } if (admininfo >= 2) { - printf(_(" new debian package, version %s.\n" - " size %jd bytes: control archive= %jd bytes.\n"), - versionbuf, (intmax_t)stab.st_size, (intmax_t)ctrllennum); + printf(_(" new debian package, version %d.%d.\n" + " size %jd bytes: control archive=%jd bytes.\n"), + version.major, version.minor, + (intmax_t)stab.st_size, (intmax_t)ctrllennum); m_output(stdout, _("")); } - } else if (!strncmp(versionbuf,"0.93",4) && - sscanf(versionbuf,"%f%c%d",&versionnum,&nlc,&dummy) == 2 && - nlc == '\n') { + } else if (strncmp(versionbuf, "0.93", 4) == 0) { char ctrllenbuf[40]; int l = 0; - oldformat = true; l = strlen(versionbuf); - if (l && versionbuf[l - 1] == '\n') - versionbuf[l - 1] = '\0'; + + if (strchr(versionbuf, '\n') == NULL) + ohshit(_("archive has no newlines in header")); + err = deb_version_parse(&version, versionbuf); + if (err) + ohshit(_("archive has invalid format version: %s"), err); r = read_line(arfd, ctrllenbuf, 1, sizeof(ctrllenbuf)); if (r < 0) @@ -238,19 +239,20 @@ extracthalf(const char *debar, const char *dir, const char *taroption, memberlen = ctrllennum; } else { memberlen = stab.st_size - ctrllennum - strlen(ctrllenbuf) - l; - fd_null_copy(arfd, ctrllennum, - _("skipped archive control member data from %s"), debar); + fd_skip(arfd, ctrllennum, + _("skipped archive control member data from %s"), debar); } if (admininfo >= 2) { - printf(_(" old debian package, version %s.\n" - " size %jd bytes: control archive= %jd, main archive= %jd.\n"), - versionbuf, (intmax_t)stab.st_size, (intmax_t)ctrllennum, + printf(_(" old debian package, version %d.%d.\n" + " size %jd bytes: control archive=%jd, main archive=%jd.\n"), + version.major, version.minor, + (intmax_t)stab.st_size, (intmax_t)ctrllennum, (intmax_t)(stab.st_size - ctrllennum - strlen(ctrllenbuf) - l)); m_output(stdout, _("")); } } else { - if (!strncmp(versionbuf,"!",7)) { + if (strncmp(versionbuf, "!", 7) == 0) { fprintf(stderr, _("dpkg-deb: file looks like it might be an archive which has been\n" "dpkg-deb: corrupted by being downloaded in ASCII mode\n")); @@ -288,19 +290,6 @@ extracthalf(const char *debar, const char *dir, const char *taroption, close(arfd); if (taroption) close(p2[1]); - if (taroption && dir) { - if (chdir(dir)) { - if (errno == ENOENT) { - if (mkdir(dir, 0777)) - ohshite(_("failed to create directory")); - if (chdir(dir)) - ohshite(_("failed to chdir to directory after creating it")); - } else { - ohshite(_("failed to chdir to directory")); - } - } - } - if (taroption) { c3 = subproc_fork(); if (!c3) { @@ -314,7 +303,19 @@ extracthalf(const char *debar, const char *dir, const char *taroption, unsetenv("TAR_OPTIONS"); - execlp(TAR, "tar", buffer, "-", NULL); + if (dir) { + if (chdir(dir)) { + if (errno != ENOENT) + ohshite(_("failed to chdir to directory")); + + if (mkdir(dir, 0777)) + ohshite(_("failed to create directory")); + if (chdir(dir)) + ohshite(_("failed to chdir to directory after creating it")); + } + } + + execlp(TAR, "tar", buffer, "-", "--warning=no-timestamp", NULL); ohshite(_("unable to execute %s (%s)"), "tar", TAR); } close(p2[0]); @@ -324,12 +325,17 @@ extracthalf(const char *debar, const char *dir, const char *taroption, subproc_wait_check(c2, _(""), PROCPIPE); if (c1 != -1) subproc_wait_check(c1, _("paste"), 0); - if (oldformat && admininfo) { - if (versionnum == 0.931F) { + if (version.major == 0 && admininfo) { + /* Handle the version as a float to preserve the behaviour of old code, + * because even if the format is defined to be padded by 0's that might + * not have been always true for really ancient versions... */ + while (version.minor && (version.minor % 10) == 0) + version.minor /= 10; + + if (version.minor == 931) movecontrolfiles(OLDOLDDEBDIR); - } else if (versionnum == 0.932F || versionnum == 0.933F) { + else if (version.minor == 932 || version.minor == 933) movecontrolfiles(OLDDEBDIR); - } } } @@ -378,11 +384,48 @@ do_control(const char *const *argv) int do_extract(const char *const *argv) { - return controlextractvextract(0, "xp", argv); + if (opt_verbose) + return controlextractvextract(0, "xpv", argv); + else + return controlextractvextract(0, "xp", argv); } int do_vextract(const char *const *argv) { - return controlextractvextract(0, "xpv", argv); + /* XXX: Backward compatibility. */ + opt_verbose = 1; + return do_extract(argv); +} + +int +do_raw_extract(const char *const *argv) +{ + const char *debar, *dir; + char *control_dir; + + debar = *argv++; + if (debar == NULL) + badusage(_("--%s needs a .deb filename argument"), cipaction->olong); + + dir = *argv++; + if (dir == NULL) + badusage(_("--%s needs a target directory.\n" + "Perhaps you should be using dpkg --install ?"), + cipaction->olong); + else if (*argv) + badusage(_("--%s takes at most two arguments (.deb and directory)"), + cipaction->olong); + + m_asprintf(&control_dir, "%s/%s", dir, EXTRACTCONTROLDIR); + + if (opt_verbose) + extracthalf(debar, dir, "xpv", 0); + else + extracthalf(debar, dir, "xp", 0); + extracthalf(debar, control_dir, "x", 1); + + free(control_dir); + + return 0; } diff --git a/dpkg-deb/info.c b/dpkg-deb/info.c index c20466d..53eb4cf 100644 --- a/dpkg-deb/info.c +++ b/dpkg-deb/info.c @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include "dpkg-deb.h" @@ -54,13 +54,13 @@ static void cu_info_prepare(int argc, void **argv) { struct stat stab; dir = argv[0]; - if (chdir("/")) - ohshite(_("failed to chdir to `/' for cleanup")); if (lstat(dir, &stab) && errno == ENOENT) return; pid = subproc_fork(); if (pid == 0) { + if (chdir("/")) + ohshite(_("failed to chdir to `/' for cleanup")); execlp(RM, "rm", "-rf", dir, NULL); ohshite(_("unable to execute %s (%s)"), _("rm command for cleanup"), RM); } @@ -99,10 +99,7 @@ info_spew(const char *debar, const char *dir, const char *const *argv) while ((component = *argv++) != NULL) { varbuf_reset(&controlfile); - varbuf_add_str(&controlfile, dir); - varbuf_add_char(&controlfile, '/'); - varbuf_add_str(&controlfile, component); - varbuf_end_str(&controlfile); + varbuf_printf(&controlfile, "%s/%s", dir, component); fd = open(controlfile.buf, O_RDONLY); if (fd >= 0) { @@ -130,22 +127,28 @@ info_list(const char *debar, const char *dir) { char interpreter[INTERPRETER_MAX+1], *p; int il, lines; + struct varbuf controlfile = VARBUF_INIT; struct dirent **cdlist, *cdep; int cdn, n; FILE *cc; struct stat stab; int c; - cdn= scandir(".", &cdlist, &ilist_select, alphasort); + cdn = scandir(dir, &cdlist, &ilist_select, alphasort); if (cdn == -1) ohshite(_("cannot scan directory `%.255s'"), dir); for (n = 0; n < cdn; n++) { cdep = cdlist[n]; - if (stat(cdep->d_name,&stab)) + + varbuf_reset(&controlfile); + varbuf_printf(&controlfile, "%s/%s", dir, cdep->d_name); + + if (stat(controlfile.buf, &stab)) ohshite(_("cannot stat `%.255s' (in `%.255s')"), cdep->d_name, dir); if (S_ISREG(stab.st_mode)) { - if (!(cc= fopen(cdep->d_name,"r"))) + cc = fopen(controlfile.buf, "r"); + if (!cc) ohshite(_("cannot open `%.255s' (in `%.255s')"), cdep->d_name, dir); lines = 0; interpreter[0] = '\0'; @@ -174,9 +177,12 @@ info_list(const char *debar, const char *dir) } free(cdlist); - if (!(cc= fopen("control","r"))) { + varbuf_reset(&controlfile); + varbuf_printf(&controlfile, "%s/%s", dir, CONTROLFILE); + cc = fopen(controlfile.buf, "r"); + if (!cc) { if (errno != ENOENT) - ohshite(_("failed to read `%.255s' (in `%.255s')"), "control", dir); + ohshite(_("failed to read `%.255s' (in `%.255s')"), CONTROLFILE, dir); fputs(_("(no `control' file in control archive!)\n"), stdout); } else { lines= 1; @@ -190,11 +196,12 @@ info_list(const char *debar, const char *dir) putc('\n', stdout); if (ferror(cc)) - ohshite(_("failed to read `%.255s' (in `%.255s')"), "control", dir); + ohshite(_("failed to read `%.255s' (in `%.255s')"), CONTROLFILE, dir); fclose(cc); } m_output(stdout, _("")); + varbuf_destroy(&controlfile); } static void @@ -202,13 +209,17 @@ info_field(const char *debar, const char *dir, const char *const *fields, bool showfieldname) { FILE *cc; + char *controlfile; char fieldname[MAXFIELDNAME+1]; char *pf; const char *const *fp; int c, lno, fnl; bool doing; - if (!(cc= fopen("control","r"))) ohshite(_("could not open the `control' component")); + m_asprintf(&controlfile, "%s/%s", dir, CONTROLFILE); + cc = fopen(controlfile, "r"); + if (!cc) + ohshite(_("could not open the `control' component")); doing = true; lno = 1; for (;;) { @@ -229,7 +240,7 @@ info_field(const char *debar, const char *dir, const char *const *fields, *pf = '\0'; doing= fnl >= MAXFIELDNAME || c=='\n' || c==EOF; for (fp=fields; !doing && *fp; fp++) - if (!strcasecmp(*fp, fieldname)) + if (strcasecmp(*fp, fieldname) == 0) doing = true; if (showfieldname) { if (doing) @@ -249,15 +260,17 @@ info_field(const char *debar, const char *dir, const char *const *fields, } if (ferror(cc)) ohshite(_("failed during read of `control' component")); if (fclose(cc)) - ohshite(_("error closing the '%s' component"), "control"); + ohshite(_("error closing the '%s' component"), CONTROLFILE); if (doing) putc('\n',stdout); m_output(stdout, _("")); + free(controlfile); } int do_showinfo(const char *const *argv) { const char *debar, *dir; + char *controlfile; struct pkginfo *pkg; struct pkg_format_node *fmt = pkg_format_parse(showformat); @@ -266,9 +279,11 @@ do_showinfo(const char *const *argv) info_prepare(&argv, &debar, &dir, 1); - parsedb(CONTROLFILE, pdb_recordavailable | pdb_rejectstatus | pdb_ignorefiles, - &pkg); + m_asprintf(&controlfile, "%s/%s", dir, CONTROLFILE); + parsedb(controlfile, pdb_parse_binary | pdb_ignorefiles, &pkg); pkg_format_show(fmt, pkg, &pkg->available); + pkg_format_free(fmt); + free(controlfile); return 0; } @@ -298,7 +313,7 @@ do_field(const char *const *argv) if (*argv) { info_field(debar, dir, argv, argv[1] != NULL); } else { - static const char *const controlonly[] = { "control", NULL }; + static const char *const controlonly[] = { CONTROLFILE, NULL }; info_spew(debar, dir, controlonly); } @@ -308,9 +323,10 @@ do_field(const char *const *argv) int do_contents(const char *const *argv) { - const char *debar; + const char *debar = *argv++; - if (!(debar= *argv++) || *argv) badusage(_("--contents takes exactly one argument")); + if (debar == NULL || *argv) + badusage(_("--%s takes exactly one argument"), cipaction->olong); extracthalf(debar, NULL, "tv", 0); return 0; diff --git a/dpkg-deb/main.c b/dpkg-deb/main.c index 9543412..7ead380 100644 --- a/dpkg-deb/main.c +++ b/dpkg-deb/main.c @@ -42,11 +42,11 @@ #include #include #include -#include +#include #include "dpkg-deb.h" -const char* showformat = "${Package}\t${Version}\n"; +const char *showformat = "${Package}\t${Version}\n"; static void DPKG_ATTR_NORET printversion(const struct cmdinfo *cip, const char *value) @@ -79,6 +79,8 @@ usage(const struct cmdinfo *cip, const char *value) " -e|--control [] Extract control info.\n" " -x|--extract Extract files.\n" " -X|--vextract Extract & list files.\n" +" -R|--raw-extract \n" +" Extract control info and files.\n" " --fsys-tarfile Output filesystem tarfile.\n" "\n")); @@ -96,6 +98,7 @@ usage(const struct cmdinfo *cip, const char *value) printf(_( "Options:\n" " --showformat= Use alternative format for --show.\n" +" -v, --verbose Enable verbose output.\n" " -D Enable debugging output.\n" " --old, --new Select archive format.\n" " --nocheck Suppress control file check (build bad\n" @@ -103,6 +106,8 @@ usage(const struct cmdinfo *cip, const char *value) " -z# Set the compression level when building.\n" " -Z Set the compression type used when building.\n" " Allowed types: gzip, xz, bzip2, lzma, none.\n" +" -S Set the compression strategy when building.\n" +" Allowed values: extreme (xz).\n" "\n")); printf(_( @@ -125,14 +130,19 @@ usage(const struct cmdinfo *cip, const char *value) exit(0); } -const char thisname[]= BACKEND; -const char printforhelp[]= +static const char printforhelp[] = N_("Type dpkg-deb --help for help about manipulating *.deb files;\n" "Type dpkg --help for help about installing and deinstalling packages."); -int debugflag=0, nocheckflag=0, oldformatflag=BUILDOLDPKGFORMAT; -struct compressor *compressor = &compressor_gzip; -int compress_level = -1; +int debugflag = 0; +int nocheckflag = 0; +int oldformatflag = 0; +int opt_verbose = 0; +struct compress_params compress_params = { + .type = compressor_type_gzip, + .level = -1, + .strategy = NULL, +}; static void set_compress_level(const struct cmdinfo *cip, const char *value) @@ -147,14 +157,14 @@ set_compress_level(const struct cmdinfo *cip, const char *value) if (level < 0 || level > 9) badusage(_("invalid compression level for -%c: %ld'"), cip->oshort, level); - compress_level = level; + compress_params.level = level; } static void setcompresstype(const struct cmdinfo *cip, const char *value) { - compressor = compressor_find_by_name(value); - if (compressor == NULL) + compress_params.type = compressor_find_by_name(value); + if (compress_params.type == compressor_type_unknown) ohshit(_("unknown compression type `%s'!"), value); } @@ -166,15 +176,18 @@ static const struct cmdinfo cmdinfos[]= { ACTION("field", 'f', 0, do_field), ACTION("extract", 'x', 0, do_extract), ACTION("vextract", 'X', 0, do_vextract), + ACTION("raw-extract", 'R', 0, do_raw_extract), ACTION("fsys-tarfile", 0, 0, do_fsystarfile), ACTION("show", 'W', 0, do_showinfo), { "new", 0, 0, &oldformatflag, NULL, NULL, 0 }, { "old", 0, 0, &oldformatflag, NULL, NULL, 1 }, { "debug", 'D', 0, &debugflag, NULL, NULL, 1 }, + { "verbose", 'v', 0, &opt_verbose, NULL, NULL, 1 }, { "nocheck", 0, 0, &nocheckflag, NULL, NULL, 1 }, - { "compression", 'z', 1, NULL, NULL, set_compress_level }, - { "compress_type", 'Z', 1, NULL, NULL, setcompresstype }, + { NULL, 'z', 1, NULL, NULL, set_compress_level }, + { NULL, 'Z', 1, NULL, NULL, setcompresstype }, + { NULL, 'S', 1, NULL, &compress_params.strategy, NULL }, { "showformat", 0, 1, NULL, &showformat, NULL }, { "help", 'h', 0, NULL, NULL, usage }, { "version", 0, 0, NULL, NULL, printversion }, @@ -182,6 +195,7 @@ static const struct cmdinfo cmdinfos[]= { }; int main(int argc, const char *const *argv) { + struct dpkg_error err; int ret; setlocale(LC_NUMERIC, "POSIX"); @@ -189,11 +203,15 @@ int main(int argc, const char *const *argv) { bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); + dpkg_set_progname(BACKEND); standard_startup(); - myopt(&argv, cmdinfos); + myopt(&argv, cmdinfos, printforhelp); if (!cipaction) badusage(_("need an action option")); + if (!compressor_check_params(&compress_params, &err)) + badusage(_("invalid compressor parameters: %s"), err.str); + unsetenv("GZIP"); ret = cipaction->action(argv); diff --git a/dpkg-split/dpkg-split.h b/dpkg-split/dpkg-split.h index 4f3cf6c..88c2e15 100644 --- a/dpkg-split/dpkg-split.h +++ b/dpkg-split/dpkg-split.h @@ -3,6 +3,7 @@ * dpkg-split.h - external definitions for this program * * Copyright © 1995 Ian Jackson + * Copyright © 2008-2012 Guillem Jover * * This is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +22,8 @@ #ifndef DPKG_SPLIT_H #define DPKG_SPLIT_H +#include + action_func do_split; action_func do_join; action_func do_info; @@ -29,8 +32,8 @@ action_func do_queue; action_func do_discard; struct partinfo { + struct deb_version fmtversion; const char *filename; - const char *fmtversion; const char *package; const char *version; const char *arch; @@ -40,7 +43,7 @@ struct partinfo { off_t maxpartlen; off_t thispartoffset; off_t thispartlen; - /* Size of header in part file. */ + /** Size of header in part file. */ off_t headerlen; off_t filesize; }; @@ -48,7 +51,7 @@ struct partinfo { struct partqueue { struct partqueue *nextinqueue; - /* Only fields filename, md5sum, maxpartlen, thispartn, maxpartn + /** Only fields filename, md5sum, maxpartlen, thispartn, maxpartn * are valid; the rest are NULL. If the file is not named correctly * to be a part file md5sum is NULL too and the numbers are zero. */ struct partinfo info; @@ -73,7 +76,7 @@ void addtopartlist(struct partinfo**, struct partinfo*, struct partinfo *refi); #define SPLITVERSION "2.1" -#define PARTSDIR "parts/" +#define PARTSDIR "parts" #define PARTMAGIC "debian-split" #define HEADERALLOWANCE 1024 diff --git a/dpkg-split/info.c b/dpkg-split/info.c index 30e0c27..05d0d88 100644 --- a/dpkg-split/info.c +++ b/dpkg-split/info.c @@ -3,6 +3,7 @@ * info.c - information about split archives * * Copyright © 1995 Ian Jackson + * Copyright © 2008-2012 Guillem Jover * * This is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -37,7 +38,7 @@ #include #include #include -#include +#include #include "dpkg-split.h" @@ -80,6 +81,7 @@ struct partinfo *read_info(FILE *partfile, const char *fn, struct partinfo *ir) size_t thisilen; intmax_t templong; char magicbuf[sizeof(DPKG_AR_MAGIC) - 1], *rip, *partnums, *slash; + const char *err; struct ar_hdr arh; int c; struct stat stab; @@ -99,7 +101,7 @@ struct partinfo *read_info(FILE *partfile, const char *fn, struct partinfo *ir) if (strncmp(arh.ar_name, PARTMAGIC, sizeof(arh.ar_name)) != 0) return NULL; - if (memcmp(arh.ar_fmag,ARFMAG,sizeof(arh.ar_fmag))) + if (dpkg_ar_member_is_illegal(&arh)) ohshit(_("file `%.250s' is corrupt - bad magic at end of first header"),fn); thisilen = dpkg_ar_member_get_size(fn, &arh); if (thisilen >= readinfobuflen) { @@ -119,10 +121,13 @@ struct partinfo *read_info(FILE *partfile, const char *fn, struct partinfo *ir) ir->filename= fn; rip= readinfobuf; - ir->fmtversion = nfstrsave(nextline(&rip, fn, _("format version number"))); - if (strcmp(ir->fmtversion,SPLITVERSION)) - ohshit(_("file `%.250s' is format version `%.250s' - you need a newer dpkg-split"), - fn,ir->fmtversion); + err = deb_version_parse(&ir->fmtversion, + nextline(&rip, fn, _("format version number"))); + if (err) + ohshit(_("file '%.250s' has invalid format version: %s"), fn, err); + if (ir->fmtversion.major != 2) + ohshit(_("file '%.250s' is format version %d.%d; get a newer dpkg-split"), + fn, ir->fmtversion.major, ir->fmtversion.minor); ir->package = nfstrsave(nextline(&rip, fn, _("package name"))); ir->version = nfstrsave(nextline(&rip, fn, _("package version number"))); @@ -162,7 +167,7 @@ struct partinfo *read_info(FILE *partfile, const char *fn, struct partinfo *ir) dpkg_ar_normalize_name(&arh); - if (memcmp(arh.ar_fmag,ARFMAG,sizeof(arh.ar_fmag))) + if (dpkg_ar_member_is_illegal(&arh)) ohshit(_("file `%.250s' is corrupt - bad magic at end of second header"),fn); if (strncmp(arh.ar_name,"data",4)) ohshit(_("file `%.250s' is corrupt - second member is not data member"),fn); @@ -207,7 +212,7 @@ void mustgetpartinfo(const char *filename, struct partinfo *ri) { void print_info(const struct partinfo *pi) { printf(_("%s:\n" - " Part format version: %s\n" + " Part format version: %d.%d\n" " Part of package: %s\n" " ... version: %s\n" " ... architecture: %s\n" @@ -219,7 +224,7 @@ void print_info(const struct partinfo *pi) { " Part offset: %jd bytes\n" " Part file size (used portion): %jd bytes\n\n"), pi->filename, - pi->fmtversion, + pi->fmtversion.major, pi->fmtversion.minor, pi->package, pi->version, pi->arch ? pi->arch : C_("architecture", ""), diff --git a/dpkg-split/join.c b/dpkg-split/join.c index 03017c8..1dd124e 100644 --- a/dpkg-split/join.c +++ b/dpkg-split/join.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include "dpkg-split.h" @@ -55,7 +55,7 @@ void reassemble(struct partinfo **partlist, const char *outputfile) { fd_in = open(pi->filename, O_RDONLY); if (fd_in < 0) ohshite(_("unable to (re)open input part file `%.250s'"), pi->filename); - fd_null_copy(fd_in, pi->headerlen, _("skipping split package header")); + fd_skip(fd_in, pi->headerlen, _("skipping split package header")); fd_fd_copy(fd_in, fd_out, pi->thispartlen, _("split package part")); close(fd_in); diff --git a/dpkg-split/main.c b/dpkg-split/main.c index 860fca5..91e67be 100644 --- a/dpkg-split/main.c +++ b/dpkg-split/main.c @@ -2,7 +2,7 @@ * dpkg-split - splitting and joining of multipart *.deb archives * main.c - main program * - * Copyright © 1995 Ian Jackson + * Copyright © 1994-1996 Ian Jackson * * This is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include "dpkg-split.h" @@ -46,7 +46,7 @@ printversion(const struct cmdinfo *cip, const char *value) { printf(_("Debian `%s' package split/join tool; version %s.\n"), SPLITTER, DPKG_VERSION_ARCH); - printf(_("Copyright (C) 1994-1996 Ian Jackson.\n")); + printf(_( "This is free software; see the GNU General Public License version 2 or\n" "later for copying conditions. There is NO warranty.\n")); @@ -100,8 +100,7 @@ usage(const struct cmdinfo *cip, const char *value) exit(0); } -const char thisname[]= SPLITTER; -const char printforhelp[]= N_("Type dpkg-split --help for help."); +static const char printforhelp[] = N_("Type dpkg-split --help for help."); struct partqueue *queue= NULL; @@ -152,26 +151,17 @@ static const struct cmdinfo cmdinfos[]= { int main(int argc, const char *const *argv) { int ret; - int l; - char *p; setlocale(LC_ALL, ""); bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); + dpkg_set_progname(SPLITTER); standard_startup(); - myopt(&argv, cmdinfos); + myopt(&argv, cmdinfos, printforhelp); if (!cipaction) badusage(_("need an action option")); - l = strlen(opt_depotdir); - if (l && opt_depotdir[l - 1] != '/') { - p= nfmalloc(l+2); - strcpy(p, opt_depotdir); - strcpy(p+l,"/"); - opt_depotdir = p; - } - setvbuf(stdout,NULL,_IONBF,0); ret = cipaction->action(argv); diff --git a/dpkg-split/queue.c b/dpkg-split/queue.c index 5372434..0a8c5d7 100644 --- a/dpkg-split/queue.c +++ b/dpkg-split/queue.c @@ -3,6 +3,7 @@ * queue.c - queue management * * Copyright © 1995 Ian Jackson + * Copyright © 2008-2012 Guillem Jover * * This is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -39,7 +40,7 @@ #include #include #include -#include +#include #include "dpkg-split.h" @@ -94,13 +95,15 @@ void scandepot(void) { if (de->d_name[0] == '.') continue; pq= nfmalloc(sizeof(struct partqueue)); - pq->info.fmtversion= pq->info.package= pq->info.version= NULL; + pq->info.fmtversion.major = 0; + pq->info.fmtversion.minor = 0; + pq->info.package = NULL; + pq->info.version = NULL; pq->info.arch = NULL; pq->info.orglength= pq->info.thispartoffset= pq->info.thispartlen= 0; pq->info.headerlen= 0; - p = nfmalloc(strlen(opt_depotdir) + strlen(de->d_name) + 1); - strcpy(p, opt_depotdir); - strcat(p,de->d_name); + p = nfmalloc(strlen(opt_depotdir) + 1 + strlen(de->d_name) + 1); + sprintf(p, "%s/%s", opt_depotdir, de->d_name); pq->info.filename= p; if (!decompose_filename(de->d_name,pq)) { pq->info.md5sum= NULL; @@ -116,7 +119,7 @@ static bool partmatches(struct partinfo *pi, struct partinfo *refi) { return (pi->md5sum && - !strcmp(pi->md5sum,refi->md5sum) && + strcmp(pi->md5sum, refi->md5sum) == 0 && pi->maxpartn == refi->maxpartn && pi->maxpartlen == refi->maxpartlen); } @@ -171,8 +174,8 @@ do_auto(const char *const *argv) int ap; char *p, *q; - m_asprintf(&p, "%st.%lx", opt_depotdir, (long)getpid()); - m_asprintf(&q, "%s%s.%jx.%x.%x", opt_depotdir, refi->md5sum, + m_asprintf(&p, "%s/t.%lx", opt_depotdir, (long)getpid()); + m_asprintf(&q, "%s/%s.%jx.%x.%x", opt_depotdir, refi->md5sum, (intmax_t)refi->maxpartlen, refi->thispartn, refi->maxpartn); fd_src = open(partfile, O_RDONLY); diff --git a/dpkg-split/split.c b/dpkg-split/split.c index d4fe4bc..d18f81b 100644 --- a/dpkg-split/split.c +++ b/dpkg-split/split.c @@ -3,7 +3,7 @@ * split.c - splitting archives * * Copyright © 1995 Ian Jackson - * Copyright © 2010 Guillem Jover + * Copyright © 2008-2011 Guillem Jover * * This is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -40,10 +40,11 @@ #include #include #include +#include #include #include #include -#include +#include #include "dpkg-split.h" @@ -160,10 +161,7 @@ mksplit(const char *file_src, const char *prefix, off_t maxpartsize, prefixdir = m_strdup(dirname(t)); free(t); - t = m_strdup(prefix); - msdos_prefix = m_strdup(basename(t)); - free(t); - + msdos_prefix = m_strdup(path_basename(prefix)); prefix = clean_msdos_filename(msdos_prefix); } @@ -259,7 +257,7 @@ do_split(const char *const *argv) l = strlen(sourcefile); palloc = nfmalloc(l + 1); strcpy(palloc, sourcefile); - if (!strcmp(palloc + l - (sizeof(DEBEXT) - 1), DEBEXT)) { + if (strcmp(palloc + l - (sizeof(DEBEXT) - 1), DEBEXT) == 0) { l -= (sizeof(DEBEXT) - 1); palloc[l] = '\0'; } diff --git a/dselect/basecmds.cc b/dselect/basecmds.cc index 3804475..cfe0f43 100644 --- a/dselect/basecmds.cc +++ b/dselect/basecmds.cc @@ -112,7 +112,7 @@ baselist::matchsearch(int index) searchlen=strlen(searchstring); lendiff = strlen(name) - searchlen; for (i=0; i<=lendiff; i++) - if (!strncasecmp(name + i, searchstring, searchlen)) + if (strncasecmp(name + i, searchstring, searchlen) == 0) return true; return false; @@ -143,8 +143,10 @@ void baselist::kd_search() { kd_searchagain(); } -void baselist::displayerror(const char* str) { - const char* pr = _("Error: "); +void +baselist::displayerror(const char *str) +{ + const char *pr = _("Error: "); int prlen=strlen(pr); beep(); @@ -162,7 +164,7 @@ void baselist::displayhelp(const struct helpmenuentry *helpmenu, int key) { int maxx, maxy, i, nextkey; getmaxyx(stdscr,maxy,maxx); - wbkgdset(stdscr, ' ' | helpscreen_attr); + wbkgdset(stdscr, ' ' | part_attr[helpscreen]); clearok(stdscr,TRUE); for (;;) { werase(stdscr); @@ -172,14 +174,14 @@ void baselist::displayhelp(const struct helpmenuentry *helpmenu, int key) { if (hme->key) { int x, y DPKG_ATTR_UNUSED; - attrset(helpscreen_attr); + attrset(part_attr[helpscreen]); mvaddstr(1,0, gettext(hme->msg->text)); - attrset(title_attr); + attrset(part_attr[title]); mvaddstr(0,0, _("Help: ")); addstr(gettext(hme->msg->title)); getyx(stdscr,y,x); while (++x to exit help.")); getyx(stdscr,y,x); diff --git a/dselect/baselist.cc b/dselect/baselist.cc index cb876d7..ee49696 100644 --- a/dselect/baselist.cc +++ b/dselect/baselist.cc @@ -124,34 +124,22 @@ void baselist::startdisplay() { for (i = 1; i < numscreenparts; i++) { if (init_pair(i, color[i].fore, color[i].back) != OK) ohshite(_("failed to allocate colour pair")); + part_attr[i] = COLOR_PAIR(i) | color[i].attr; } - /* TODO: should use an array of attr's, indexed by attr name. Oh well. */ - list_attr= COLOR_PAIR(list) | color[list].attr; - listsel_attr= COLOR_PAIR(listsel) | color[listsel].attr; - title_attr= COLOR_PAIR(title) | color[title].attr; - thisstate_attr= COLOR_PAIR(thisstate) | color[thisstate].attr; - selstate_attr= COLOR_PAIR(selstate) | color[selstate].attr; - selstatesel_attr= COLOR_PAIR(selstatesel) | color[selstatesel].attr; - colheads_attr= COLOR_PAIR(colheads) | color[colheads].attr; - query_attr= COLOR_PAIR(query) | color[query].attr; - info_attr= COLOR_PAIR(info) | color[info].attr; - info_headattr= COLOR_PAIR(info_head) | color[info_head].attr; - whatinfo_attr= COLOR_PAIR(whatinfo) | color[whatinfo].attr; - helpscreen_attr= COLOR_PAIR(helpscreen) | color[helpscreen].attr; } else { /* User defined attributes for B&W mode are not currently supported. */ - title_attr= A_REVERSE; - thisstate_attr= A_STANDOUT; - list_attr= 0; - listsel_attr= A_STANDOUT; - selstate_attr= A_BOLD; - selstatesel_attr= A_STANDOUT; - colheads_attr= A_BOLD; - query_attr= title_attr; - info_attr= list_attr; - info_headattr= A_BOLD; - whatinfo_attr= thisstate_attr; - helpscreen_attr= A_NORMAL; + part_attr[title] = A_REVERSE; + part_attr[thisstate] = A_STANDOUT; + part_attr[list] = 0; + part_attr[listsel] = A_STANDOUT; + part_attr[selstate] = A_BOLD; + part_attr[selstatesel] = A_STANDOUT; + part_attr[colheads]= A_BOLD; + part_attr[query] = part_attr[title]; + part_attr[info] = part_attr[list]; + part_attr[info_head] = A_BOLD; + part_attr[whatinfo] = part_attr[thisstate]; + part_attr[helpscreen] = A_NORMAL; } // set up windows and pads, based on screen size @@ -165,31 +153,31 @@ void baselist::startdisplay() { titlewin= newwin(1,xmax, 0,0); if (!titlewin) ohshite(_("failed to create title window")); - wattrset(titlewin,title_attr); + wattrset(titlewin, part_attr[title]); whatinfowin= newwin(1,xmax, whatinfo_row,0); if (!whatinfowin) ohshite(_("failed to create whatinfo window")); - wattrset(whatinfowin,whatinfo_attr); + wattrset(whatinfowin, part_attr[whatinfo]); listpad = newpad(ymax, total_width); if (!listpad) ohshite(_("failed to create baselist pad")); colheadspad= newpad(1, total_width); if (!colheadspad) ohshite(_("failed to create heading pad")); - wattrset(colheadspad,colheads_attr); + wattrset(colheadspad, part_attr[colheads]); thisstatepad= newpad(1, total_width); if (!thisstatepad) ohshite(_("failed to create thisstate pad")); - wattrset(thisstatepad,thisstate_attr); + wattrset(thisstatepad, part_attr[thisstate]); infopad= newpad(MAX_DISPLAY_INFO, total_width); if (!infopad) ohshite(_("failed to create info pad")); - wattrset(infopad,info_attr); - wbkgdset(infopad, ' ' | info_attr); + wattrset(infopad, part_attr[info]); + wbkgdset(infopad, ' ' | part_attr[info]); querywin= newwin(1,xmax,ymax-1,0); if (!querywin) ohshite(_("failed to create query window")); - wbkgdset(querywin, ' ' | query_attr); + wbkgdset(querywin, ' ' | part_attr[query]); if (cursorline >= topofscreen + list_height) topofscreen= cursorline; if (topofscreen > nitems - list_height) topofscreen= nitems - list_height; @@ -225,7 +213,8 @@ void baselist::enddisplay() { void baselist::redrawall() { redrawtitle(); redrawcolheads(); - wattrset(listpad,list_attr); mywerase(listpad); + wattrset(listpad, part_attr[list]); + mywerase(listpad); ldrawnstart= ldrawnend= -1; // start is first drawn; end is first undrawn; -1=none refreshlist(); redrawthisstate(); @@ -242,6 +231,9 @@ baselist::baselist(keybindings *kb) { bindings= kb; nitems= 0; + gap_width = 1; + total_width = max(TOTAL_LIST_WIDTH, COLS); + xmax= -1; list_height=0; info_height=0; topofscreen= 0; leftofscreen= 0; diff --git a/dselect/bindings.cc b/dselect/bindings.cc index b544e29..a6440eb 100644 --- a/dselect/bindings.cc +++ b/dselect/bindings.cc @@ -97,7 +97,7 @@ const char **keybindings::describenext() { for (;;) { if (!iterate->action) return 0; for (count=0, search=bindings; search; search=search->next) - if (!strcmp(search->interp->action,iterate->action)) + if (strcmp(search->interp->action, iterate->action) == 0) count++; if (count) break; iterate++; @@ -105,7 +105,7 @@ const char **keybindings::describenext() { const char **retarray= new const char *[count+2]; retarray[0]= iterate->desc; for (count=1, search=bindings; search; search=search->next) - if (!strcmp(search->interp->action,iterate->action)) + if (strcmp(search->interp->action, iterate->action) == 0) retarray[count++]= key2name(search->key); retarray[count]= 0; iterate++; diff --git a/dselect/bindings.h b/dselect/bindings.h index 7a7fe6f..2566e49 100644 --- a/dselect/bindings.h +++ b/dselect/bindings.h @@ -1,5 +1,5 @@ /* -*- c++ -*- - * dselect - selection of Debian packages + * dselect - Debian package maintenance user interface * bindings.h - keybindings class header file * * Copyright © 1994,1995 Ian Jackson diff --git a/dselect/dselect-curses.h b/dselect/dselect-curses.h index f670d27..6a3ffdb 100644 --- a/dselect/dselect-curses.h +++ b/dselect/dselect-curses.h @@ -1,5 +1,5 @@ /* -*- c++ -*- - * dselect - selection of Debian packages + * dselect - Debian package maintenance user interface * dselect-curses.h - curses header wrapper * * Copyright © 2009 Guillem Jover diff --git a/dselect/dselect.h b/dselect/dselect.h index 1d05e44..004dca3 100644 --- a/dselect/dselect.h +++ b/dselect/dselect.h @@ -1,5 +1,5 @@ /* -*- c++ -*- - * dselect - selection of Debian packages + * dselect - Debian package maintenance user interface * dselect.h - external definitions for this program * * Copyright © 1994,1995 Ian Jackson @@ -45,6 +45,23 @@ struct helpmenuentry { struct keybindings; +enum screenparts { + background, + list, + listsel, + title, + thisstate, + selstate, + selstatesel, + colheads, + query, + info, + info_head, + whatinfo, + helpscreen, + numscreenparts, +}; + class baselist { protected: // Screen dimensions &c. @@ -52,12 +69,10 @@ protected: int title_height, colheads_height, list_height; int thisstate_height, info_height, whatinfo_height; int colheads_row, thisstate_row, info_row, whatinfo_row, list_row; - int list_attr, listsel_attr, title_attr, colheads_attr, info_attr; - int info_headattr, whatinfo_attr; - int thisstate_attr, query_attr; - int selstate_attr, selstatesel_attr; - int helpscreen_attr; + int part_attr[numscreenparts]; + + int gap_width; int total_width; // (n)curses stuff @@ -84,7 +99,7 @@ protected: void unsizes(); void dosearch(); void displayhelp(const struct helpmenuentry *menu, int key); - void displayerror(const char* str); + void displayerror(const char *str); void redrawall(); void redrawitemsrange(int start /*inclusive*/, int end /*exclusive*/); @@ -137,7 +152,7 @@ public: void startdisplay(); void enddisplay(); - baselist(keybindings*); + baselist(keybindings *); virtual ~baselist(); }; @@ -150,23 +165,6 @@ void cursesoff(); extern int expertmode; -enum screenparts { - background, - list, - listsel, - title, - thisstate, - selstate, - selstatesel, - colheads, - query, - info, - info_head, - whatinfo, - helpscreen, - numscreenparts, -}; - struct colordata { int fore; int back; diff --git a/dselect/main.cc b/dselect/main.cc index b00bb12..f73dc36 100644 --- a/dselect/main.cc +++ b/dselect/main.cc @@ -2,8 +2,9 @@ * dselect - Debian package maintenance user interface * main.cc - main program * - * Copyright © 1994,1995 Ian Jackson + * Copyright © 1994-1996 Ian Jackson * Copyright © 2000,2001 Wichert Akkerman + * Copyright © 2006-2012 Guillem Jover * * This is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -40,6 +41,9 @@ #include #include +// Solaris requires curses.h to be included before term.h +#include "dselect-curses.h" + #if defined(HAVE_NCURSESW_TERM_H) #include #elif defined(HAVE_NCURSES_TERM_H) @@ -51,16 +55,14 @@ #include #include #include -#include +#include #include "dselect.h" #include "bindings.h" #include "pkglist.h" -const char thisname[]= DSELECT; -const char printforhelp[]= N_("Type dselect --help for help."); +static const char printforhelp[] = N_("Type dselect --help for help."); -modstatdb_rw readwrite; int expertmode= 0; static const char *admindir = ADMINDIR; @@ -155,10 +157,6 @@ static const menuentry menuentries[]= { static const char programdesc[]= N_("Debian `%s' package handling frontend version %s.\n"); -static const char copyrightstring[]= N_( - "Copyright (C) 1994-1996 Ian Jackson.\n" - "Copyright (C) 2000,2001 Wichert Akkerman.\n"); - static const char licensestring[]= N_( "This is free software; see the GNU General Public License version 2 or\n" "later for copying conditions. There is NO warranty.\n"); @@ -167,8 +165,7 @@ static void DPKG_ATTR_NORET printversion(const struct cmdinfo *ci, const char *value) { printf(gettext(programdesc), DSELECT, DPKG_VERSION_ARCH); - printf("%s", gettext(copyrightstring)); - printf(gettext(licensestring), DSELECT); + printf("%s", gettext(licensestring)); m_output(stdout, _("")); @@ -189,7 +186,7 @@ usage(const struct cmdinfo *ci, const char *value) " --admindir Use instead of %s.\n" " --expert Turn on expert mode.\n" " --debug | -D Turn on debugging, sending output to .\n" -" --colour | --color screenpart:[foreground],[background][:attr[+attr+..]]\n" +" --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n" " Configure screen colours.\n" "\n"), ADMINDIR); @@ -361,8 +358,15 @@ extern void operator delete(void *p) { } urqresult urq_list(void) { - readwrite = modstatdb_open((modstatdb_rw)(msdbrw_writeifposs | - msdbrw_available_readonly)); + struct dpkg_arch *arch; + + modstatdb_open((modstatdb_rw)(msdbrw_writeifposs | + msdbrw_available_readonly)); + + // XXX: Multi-Arch is not supported, bail out. + for (arch = dpkg_arch_get_list(); arch; arch = arch->next) + if (arch->type == arch_foreign) + ohshit(_("foreign architectures enabled but multi-arch is not supported")); curseson(); @@ -420,9 +424,9 @@ refreshmenu(void) "Press to confirm selection. ^L redraws screen.\n\n")); attrset(A_NORMAL); - addstr(gettext(copyrightstring)); - sprintf(buf, gettext(licensestring), DSELECT); - addstr(buf); + addstr(_("Copyright (C) 1994-1996 Ian Jackson.\n" + "Copyright (C) 2000,2001 Wichert Akkerman.\n")); + addstr(gettext(licensestring)); modstatdb_init(); if (!modstatdb_can_lock()) @@ -459,7 +463,10 @@ urqresult urq_menu(void) { dme(cursor,0); cursor+= entries-1; cursor %= entries; dme(cursor,1); } else if (c=='\n' || c=='\r' || c==KEY_ENTER) { clear(); refresh(); - switch (menuentries[cursor].fn()) { /* FIXME: trap errors in urq_... */ + + /* FIXME: trap errors in urq_... */ + urqresult res = menuentries[cursor].fn(); + switch (res) { case urqr_quitmenu: return urqr_quitmenu; case urqr_normal: @@ -467,7 +474,7 @@ urqresult urq_menu(void) { case urqr_fail: break; default: - internerr("unknown menufn"); + internerr("unknown menufn %d", res); } refreshmenu(); dme(cursor,1); } else if (c==C('l')) { @@ -514,10 +521,12 @@ main(int, const char *const *argv) bindtextdomain(DSELECT, LOCALEDIR); textdomain(DSELECT); + dpkg_set_progname(DSELECT); + push_error_context_func(dselect_catch_fatal_error, print_fatal_error, 0); loadcfgfile(DSELECT, cmdinfos); - myopt(&argv,cmdinfos); + myopt(&argv, cmdinfos, printforhelp); admindir = dpkg_db_set_dir(admindir); diff --git a/dselect/methlist.cc b/dselect/methlist.cc index c7f3abf..5b92836 100644 --- a/dselect/methlist.cc +++ b/dselect/methlist.cc @@ -60,14 +60,9 @@ void methodlist::setwidths() { debug(dbg_general, "methodlist[%p]::setwidths()", this); status_width= 1; - gap_width= 1; name_width= 14; name_column= status_width + gap_width; description_column= name_column + name_width + gap_width; - - total_width= TOTAL_LIST_WIDTH; - if (total_width < COLS) - total_width= COLS; description_width= total_width - description_column; } @@ -93,10 +88,10 @@ void methodlist::redraw1itemsel(int index, int selected) { int i; const char *p; - wattrset(listpad, selected ? listsel_attr : list_attr); + wattrset(listpad, part_attr[selected ? listsel : list]); mvwaddch(listpad,index,0, table[index] == coption ? '*' : ' '); - wattrset(listpad, selected ? listsel_attr : list_attr); + wattrset(listpad, part_attr[selected ? listsel : list]); mvwprintw(listpad,index,name_column-1, " %-*.*s ", name_width, name_width, table[index]->name); @@ -114,7 +109,7 @@ void methodlist::redraw1itemsel(int index, int selected) { void methodlist::redrawcolheads() { if (colheads_height) { - wattrset(colheadspad,colheads_attr); + wattrset(colheadspad, part_attr[colheads]); mywerase(colheadspad); mvwaddstr(colheadspad,0,0, " "); mvwaddnstr(colheadspad,0,name_column, _("Abbrev."), name_width); @@ -187,11 +182,11 @@ quitaction methodlist::display() { void methodlist::itd_description() { whatinfovb(_("Explanation")); - wattrset(infopad,info_headattr); + wattrset(infopad, part_attr[info_head]); waddstr(infopad, table[cursorline]->name); waddstr(infopad," - "); waddstr(infopad, table[cursorline]->summary); - wattrset(infopad,info_attr); + wattrset(infopad, part_attr[info]); const char *m= table[cursorline]->description; if (!m || !*m) m= _("No explanation available."); diff --git a/dselect/method.h b/dselect/method.h index a963780..aba7656 100644 --- a/dselect/method.h +++ b/dselect/method.h @@ -51,7 +51,7 @@ struct dselect_option { class methodlist : public baselist { protected: - int status_width, gap_width, name_width, description_width; + int status_width, name_width, description_width; int name_column, description_column; // Table of methods diff --git a/dselect/methods/Debian/Dselect/Ftp.pm b/dselect/methods/Debian/Dselect/Ftp.pm index 73e3bdf..3352e62 100644 --- a/dselect/methods/Debian/Dselect/Ftp.pm +++ b/dselect/methods/Debian/Dselect/Ftp.pm @@ -58,7 +58,7 @@ sub store_config { sub view_mirrors { if (-f '/usr/lib/dpkg/methods/ftp/README.mirrors.txt') { - system('/usr/bin/pager', '/usr/lib/dpkg/methods/ftp/README.mirrors.txt'); + system('pager', '/usr/lib/dpkg/methods/ftp/README.mirrors.txt'); } elsif (-f '/usr/lib/dpkg/methods/ftp/README.mirrors.txt.gz') { system('gzip -dc /usr/lib/dpkg/methods/ftp/README.mirrors.txt.gz | pager'); } else { @@ -191,7 +191,7 @@ sub yesno($$) { $res =~ /^[Yy]/ and return 1; $res =~ /^[Nn]/ and return 0; $res =~ /^[ \t]*$/ and return $r; - print "Please enter one of the letters `y' or `n'\n"; + print "Please enter one of the letters 'y' or 'n'\n"; } } @@ -246,7 +246,7 @@ sub do_connect { if(!$ftp->binary()) { print $ftp->message . "\n"; $exit=1; } } if (!$exit) { - print "Cd to `$ftpdir'...\n"; + print "Cd to '$ftpdir'...\n"; if(!$ftp->cwd($ftpdir)) { print $ftp->message . "\n"; $exit=1; } } diff --git a/dselect/methods/disk/install b/dselect/methods/disk/install index d8a3df2..6053599 100755 --- a/dselect/methods/disk/install +++ b/dselect/methods/disk/install @@ -94,7 +94,7 @@ Perhaps you downloaded it with an unexpected name, or something. In any case, you must find the file(s) and then either place it with the correct filename(s) (as listed in the Packages file or in $vardir/available) and rerun the installation, or upgrade the -package by using `dpkg --install --auto-deconfigure'\'' by hand. +package by using '\''dpkg --install --auto-deconfigure'\'' by hand. "; exit(1); diff --git a/dselect/methods/disk/setup b/dselect/methods/disk/setup index ca1f0cc..bad21a1 100755 --- a/dselect/methods/disk/setup +++ b/dselect/methods/disk/setup @@ -135,7 +135,7 @@ echo " If you make a mistake, use the interrupt key ($intrkey) to abort. " -# State variables, `best first' +# State variables, “best first” # {main,ctb,nf,nus,lcl}_{packages,binary} # Empty before we've found them or if they're not available, # set to the relevant bit under mountpoint otherwise. @@ -145,7 +145,7 @@ If you make a mistake, use the interrupt key ($intrkey) to abort. # mountpoint # The mountpoint for the filesystem containing the stuff # empty or unset if we don't know yet, or if we haven't mounted anything; -# may also be empty if `directory' was set. +# may also be empty if ‘directory’ was set. # blockdevice # The actual block device to mount. # fstype @@ -175,7 +175,7 @@ then 'Several CD-ROMs (or other ISO9660 filesystems) are mounted:' grep 'type iso9660 ([^)]*)$' <$tp.m | nl echo -n \ - 'Is it any of these ? Type a number, or `n'\'' for none. ' + "Is it any of these ? Type a number, or 'n' for none. " read response response="`echo \"$response\" | sed -e 's/[ ]*$//'`" if expr "$response" : '[0-9][0-9]*$' >/dev/null && \ @@ -241,7 +241,7 @@ then response="$defaultnfsserver" fi if [ -z "$response" ]; then continue; fi - if [ -x /usr/bin/rpcinfo ] + if [ -x "`which rpcinfo`" ] then if rpcinfo -u "$response" mountd | grep -q 'ready' then @@ -249,7 +249,7 @@ then else echo "$response appears not to be an NFS server." fi - elif [ -x /bin/ping ] + elif [ -x "`which ping`" ] then if ping -q -c 1 "$response" | grep -q ', 1 packets received' then @@ -259,7 +259,7 @@ then fi else echo \ -"(I can't check that now because there is no /usr/bin/rpcinfo or /bin/ping.)" +"(I can't check that now because there is no rpcinfo or ping.)" nfsserver="$response" fi done @@ -347,7 +347,7 @@ distribution is (eg. 'dists/stable') - this directory usually contains the Packages-Master file. If the CD-ROM is badly organised and doesn't have a straightforward copy of -the distribution you may answer \`none' and we'll go through the parts +the distribution you may answer 'none' and we'll go through the parts I need individually." else echo \ @@ -358,7 +358,7 @@ distribution is (eg. 'debian/dists/stable') - this directory usually contains the Packages-Master file. If you do not have a straightforward copy of the distribution available -just answer \`none' and we'll go through the parts I need individually." +just answer 'none' and we'll go through the parts I need individually." fi defhierbase=none # maybe ask for debian/dists and then show and ask for available dists @@ -368,12 +368,12 @@ just answer \`none' and we'll go through the parts I need individually." if [ -d "$mountpoint/$p_hierbase/main/binary-$iarch" ] then echo " -Last time you said \`$p_hierbase', and that looks plausible." +Last time you said '$p_hierbase', and that looks plausible." defhierbase="$p_hierbase" else echo " -Last time you said \`$p_hierbase', but that doesn't look plausible, -since \`$p_hierbase/main/binary-$iarch' doesn't seem to exist." +Last time you said '$p_hierbase', but that doesn't look plausible, +since '$p_hierbase/main/binary-$iarch' doesn't seem to exist." fi fi if [ none = "$defhierbase" ] @@ -381,12 +381,12 @@ since \`$p_hierbase/main/binary-$iarch' doesn't seem to exist." if [ -d "$mountpoint/debian/dists/stable/main/binary-$iarch" ] then echo " -\`/debian/dists/stable' exists and looks plausible, so that's the default." +'/debian/dists/stable' exists and looks plausible, so that's the default." defhierbase=/debian/dists/stable elif [ -d "$mountpoint/dists/stable/main/binary-$iarch" ] then echo " -\`/dists/stable' exists and looks plausible, so that's the default." +'/dists/stable' exists and looks plausible, so that's the default." defhierbase=/dists/stable fi fi @@ -424,17 +424,17 @@ check_binary () { # checks wether $2 contains *.deb if ! [ -d "$mountpoint$2/" ] then - echo "\`$2' does not exist." + echo "'$2' does not exist." return fi if ! ( find -L "$mountpoint$2/" -name '*.deb' -print \ | head -n 1 ) 2>/dev/null | grep . >/dev/null then - echo "\`$2' does not contain any *.deb packages. Hmmpf." + echo "'$2' does not contain any *.deb packages. Hmmpf." return fi - echo "Using \`$2' as $1 binary dir." + echo "Using '$2' as $1 binary dir." this_binary="$2" } @@ -453,26 +453,26 @@ find_area () { if [ $option = cdrom ] && [ $2 = nf ] && [ -z "$this_binary" ] then - echo ' + echo " Note: most CD-ROM distributions of Debian do not include programs -available in the `non-free'\'' directory of the distribution site. +available in the 'non-free' directory of the distribution site. This is because these programs have copyrights that prevent distribution for profit on a CD-ROM - ie they are not free software. -If you wish to install these programs you'\''ll have to get them from an -alternative source.' +If you wish to install these programs you'll have to get them from an +alternative source." elif [ $2 = lcl ] && [ -z "$this_binary" ] then - echo ' -Note: By default there is no `local'\'' directory. It is intended for -packages you made yourself.' + echo " +Note: By default there is no 'local' directory. It is intended for +packages you made yourself." fi while [ -z "$this_binary" ] do defaultbinary="$4" echo " Which directory contains the *.deb packages from the $1 distribution -area (this directory is named \`$3/binary-$iarch' on the distribution site) ? -Say \`none' if this area is not available." +area (this directory is named '$3/binary-$iarch' on the distribution site) ? +Say 'none' if this area is not available." if [ $2 != main ] && [ -z "$defaultbinary" ] then defaultbinary=none @@ -500,7 +500,7 @@ Say \`none' if this area is not available." do if [ -f "$mountpoint/$this_binary/$f" ] then - echo "Using \`$this_binary/$f' for $1." + echo "Using '$this_binary/$f' for $1." this_packages="$this_binary/$f" break fi @@ -508,21 +508,21 @@ Say \`none' if this area is not available." while [ -z "$this_packages" ] do echo -n " -I can't find the $1 \`Packages' file. The information in the -\`Packages' file is important for package selection during new +I can't find the $1 'Packages' file. The information in the +'Packages' file is important for package selection during new installations, and is very useful for upgrades. If you overlooked it when downloading you should do get it now and return to this installation procedure when you have done so: you will find one Packages file and one Packages.gz file -- either will do -- -in the \`binary-$iarch' subdirectory of each area on the FTP sites and +in the 'binary-$iarch' subdirectory of each area on the FTP sites and CD-ROMs. Alternatively (and this will be rather slow) I can scan the -packages in the distribution area - say \`scan' if you want me to do so. +packages in the distribution area - say 'scan' if you want me to do so. You need a separate Packages file from each of the distribution areas you wish to install. -Where is the _$1_ \`Packages' file (if none is available, say \`none') +Where is the _$1_ 'Packages' file (if none is available, say 'none') [$5] ? " read response diff --git a/dselect/methods/floppy/desc.floppy b/dselect/methods/floppy/desc.floppy index 0bd6329..1880ea6 100644 --- a/dselect/methods/floppy/desc.floppy +++ b/dselect/methods/floppy/desc.floppy @@ -2,7 +2,7 @@ Installation using a pile of floppies, at least one of which (usually the first) contains the Packages file, and the rest of which contain the binary *.deb files. -If you are installing software from the `non-free' or `contrib' +If you are installing software from the 'non-free' or 'contrib' directories as well as the main Debian distribution you must have the Packages files for those areas on separate floppies. The usual way to do this is to put each Packages file on the first floppy which contains diff --git a/dselect/methods/ftp/install b/dselect/methods/ftp/install index bcba43c..f1a1c4c 100755 --- a/dselect/methods/ftp/install +++ b/dselect/methods/ftp/install @@ -131,7 +131,7 @@ procstatus(); sub dcmpvers { my($a, $p, $b) = @_; my ($r); - $r = system("/usr/bin/dpkg", "--compare-versions", "$a", "$p", "$b"); + $r = system("dpkg", "--compare-versions", "$a", "$p", "$b"); $r = $r/256; if ($r == 0) { return 1; @@ -431,7 +431,7 @@ if($totsize != 0) { last DOWNLOAD_TRY; } } elsif ($@) { - print "An error occured ($@) : stopping download\n"; + print "An error occurred ($@) : stopping download\n"; } last DOWNLOAD_TRY; } diff --git a/dselect/methods/multicd/README.multicd b/dselect/methods/multicd/README.multicd index 759d081..8ba4a02 100644 --- a/dselect/methods/multicd/README.multicd +++ b/dselect/methods/multicd/README.multicd @@ -17,8 +17,8 @@ Installation methods for multiple binary CDs Acquiring package data --------------------- - Since this method is derived from the `mounted' method the user is - able to access up to five binary directories within `dists/stable': + Since this method is derived from the 'mounted' method the user is + able to access up to five binary directories within 'dists/stable': . main . contrib @@ -26,7 +26,7 @@ Acquiring package data . non-US . local - The selected method will try to read the `Packages.cd' file from each + The selected method will try to read the 'Packages.cd' file from each of these directories if it is available. Identifying the CD-ROM @@ -40,7 +40,7 @@ Identifying the CD-ROM Installing the files -------------------- - At the beginning of the installation the `multicd' package will sort + At the beginning of the installation the 'multicd' package will sort the list of to-be-installed packages and install them CD by CD. If a different CD-ROM is required the user will be prompted to exchange the CD-ROM. @@ -48,26 +48,26 @@ Installing the files Preparing multiple binary CD-ROMs --------------------------------- - Since the `multicd' methods need to know which packages are on which - CD-ROMs one cannot use regular `Packages' files. An additional data + Since the 'multicd' methods need to know which packages are on which + CD-ROMs one cannot use regular 'Packages' files. An additional data field "X-Medium:" is required. The first CD-ROM from the set should - contain all `Packages.cd' files. To be more convenient you should - include the `Packages.cd' files on all CD-ROMs. This ensures that + contain all 'Packages.cd' files. To be more convenient you should + include the 'Packages.cd' files on all CD-ROMs. This ensures that you don't have to start with the first CD-ROM all the time. Additionally the package needs to gain information which CD-ROM is - currently used. Thus each CD-ROM contains the file `.disk/info' + currently used. Thus each CD-ROM contains the file '.disk/info' which contains the symbolic name for the CD-ROM as specified by "X-Medium:". - In order to be able to create the modified `Packages.cd' files, you - have to use the `-M medium' option of dpkg-scanpackages (supported + In order to be able to create the modified 'Packages.cd' files, you + have to use the '-M medium' option of dpkg-scanpackages (supported in dpkg-dev >= 1.15.5). - To split the `main' distribution into two CD-ROMs you'll need to - create a `Packages.cd' file for each `binary-$arch' directory. + To split the 'main' distribution into two CD-ROMs you'll need to + create a 'Packages.cd' file for each 'binary-$arch' directory. Afterwards you simply append the second one to the first one and - put the resulting `Packages.cd' file into both `binary-$arch' + put the resulting 'Packages.cd' file into both 'binary-$arch' directories. Sample Layout @@ -98,7 +98,7 @@ Sample Layout non-US/binary-all/ To re-generate the Packages file you have to chdir into - `dists/stable/$part' and issue `dpkg-scanpackages' as follows. It's + 'dists/stable/$part' and issue 'dpkg-scanpackages' as follows. It's assumed that you use regular compressed overrides files in /pub/debian/indices. diff --git a/dselect/methods/multicd/install b/dselect/methods/multicd/install index f9262f9..4872f28 100755 --- a/dselect/methods/multicd/install +++ b/dselect/methods/multicd/install @@ -53,7 +53,7 @@ xit=1 do_umount() { if [ "$method" = "multi_mount" ] then - echo /bin/true + echo true return fi if [ -n "$umount" ]; then @@ -66,7 +66,7 @@ do_mount() { if [ "$method" = "multi_mount" ] then - echo /bin/true + echo true return fi diff --git a/dselect/methods/multicd/setup b/dselect/methods/multicd/setup index c7485b4..d463b4d 100755 --- a/dselect/methods/multicd/setup +++ b/dselect/methods/multicd/setup @@ -1,6 +1,6 @@ #!/bin/sh # -# The `multicd' package was initially written by Heiko Schlittermann +# The ‘multicd’ package was initially written by Heiko Schlittermann # based on builtin access methods written by Ian # Jackson . The final packaging as well as # cleanups were made by Martin Schulze who also @@ -175,7 +175,7 @@ echo " If you make a mistake, use the interrupt key ($intrkey) to abort. " -# State variables, `best first' +# State variables, “best first” # {main,ctb,nf,nonus,nonusctb,nonusnf,lcl}_{packages,binary} # Empty before we've found them or if they're not available, # set to the relevant bit under mountpoint otherwise. @@ -184,7 +184,7 @@ If you make a mistake, use the interrupt key ($intrkey) to abort. # mountpoint # The mountpoint for the filesystem containing the stuff # empty or unset if we don't know yet, or if we haven't mounted anything; -# may also be empty if `directory' was set. +# may also be empty if ‘directory’ was set. # blockdevice # The actual block device to mount. # fstype @@ -216,7 +216,7 @@ then 'Several CD-ROMs (or other ISO9660 filesystems) are mounted:' egrep 'type iso9660 \([^)]*\)$' <$tp.m | nl echo -n \ - 'Is it any of these ? Type a number, or `n'\'' for none. ' + "Is it any of these ? Type a number, or 'n' for none. " read response response="`echo \"$response\" | sed -e 's/[ ]*$//'`" if expr "$response" : '[0-9][0-9]*$' >/dev/null && \ @@ -282,7 +282,7 @@ then response="$defaultnfsserver" fi if [ -z "$response" ]; then continue; fi - if [ -x /usr/bin/rpcinfo ] + if [ -x "`which rpcinfo`" ] then if rpcinfo -u "$response" mountd >/dev/null then @@ -290,7 +290,7 @@ then else echo "$response appears not to be an NFS server." fi - elif [ -x /bin/ping ] + elif [ -x "`which ping`" ] then if ping -q -c 1 "$response" | grep -q ', 1 packets received' then @@ -300,7 +300,7 @@ then fi else echo \ -"(I can't check that now because there is no /usr/bin/rpcinfo or /bin/ping.)" +"(I can't check that now because there is no rpcinfo or ping.)" nfsserver="$response" fi done @@ -392,10 +392,10 @@ do then echo \ "I would like to know where on the CD-ROM the top level of the Debian -distribution is - this will usually contain the \`dists' directory. +distribution is - this will usually contain the 'dists' directory. If the CD-ROM is badly organized and doesn't have a straightforward copy of -the distribution you may answer \`none' and we'll go through the parts +the distribution you may answer 'none' and we'll go through the parts I need individually." else echo \ @@ -405,29 +405,29 @@ To use this I'll need to know where the top level of that copy of the distribution is - this directory usually contains the Packages-Master file. If you do not have a straightforward copy of the distribution available -just answer \`none' and we'll go through the parts I need individually." +just answer 'none' and we'll go through the parts I need individually." fi defhierbase=none if [ -n "$p_hierbase" ]; then if [ -d "$mountpoint/$p_hierbase/dists/$dist/main/binary-$iarch" \ -o -n "$multi" ]; then - echo "Last time you said \`$p_hierbase', and that looks plausible." + echo "Last time you said '$p_hierbase', and that looks plausible." defhierbase="$p_hierbase" else echo " -Last time you said \`$p_hierbase', but that doesn't look plausible, -since \`$p_hierbase/dists/$dist/main/binary-$iarch' doesn't seem to exist. +Last time you said '$p_hierbase', but that doesn't look plausible, +since '$p_hierbase/dists/$dist/main/binary-$iarch' doesn't seem to exist. And I can't get the impression that you're using a multi-CD set." fi fi # at this point defhierbase is set if it looks plausible - # if `none' was entered, we assume a CD with a debian/ directory + # if ‘none’ was entered, we assume a CD with a debian/ directory if [ none = "$defhierbase" -a -d "$mountpoint/debian/dists/$dist/main/binary-$iarch" ] then - echo "\`/debian' exists and looks plausible, so that's the default." + echo "'/debian' exists and looks plausible, so that's the default." defhierbase=/debian fi @@ -499,7 +499,7 @@ check_binary () { if [ ! -d "${mountpoint}$2" -a -z "$multi" ] then - echo "\`$2' does not exist." + echo "'$2' does not exist." return fi @@ -510,17 +510,17 @@ check_binary () { # if ! { find -L "$mountpoint$2" -name '*.deb' -print \ # | head -1 | grep . ; } >/dev/null 2>&1 && [ -z "$multi" ]; # then -# echo "\`$2' does not contain any *.deb packages." +# echo "'$2' does not contain any *.deb packages." # return # fi this_binary="$2" - echo -n "Using \`$this_binary' as $1 binary dir" + echo -n "Using '$this_binary' as $1 binary dir" if [ -n "$multi" ]; then this_disk=`getdisklabel ${mountpoint} "/$hierbase"` echo " from disc" - echo " \`$this_disk'" + echo " '$this_disk'" else echo "" fi @@ -540,21 +540,21 @@ find_area () { fi if [ $option = multi_cd -a $2 = nf -a -z "$this_binary" ] then - echo ' + echo " Note: most CD-ROM distributions of Debian do not include programs -available in the `non-free'\'' directory of the distribution site. +available in the 'non-free' directory of the distribution site. This is because these programs have copyrights that prevent distribution for profit on a CD-ROM - ie they are not free software. -If you wish to install these programs you'\''ll have to get them from an -alternative source.' +If you wish to install these programs you'll have to get them from an +alternative source." fi while [ -z "$this_binary" ] do defaultbinary="$4" echo " Which directory contains the *.deb packages from the $1 distribution -area (this directory is named \`$3/binary' on the distribution site) ? -Say \`none' if this area is not available." +area (this directory is named '$3/binary' on the distribution site) ? +Say 'none' if this area is not available." if [ $2 != main -a -z "$defaultbinary" ] then defaultbinary=none @@ -584,34 +584,34 @@ Say \`none' if this area is not available." if [ -f "$mountpoint/$this_binary/$f" ] then this_packages="$this_binary/$f" - echo "Using \`$this_packages' for $1." + echo "Using '$this_packages' for $1." break fi done else if [ -f "${mountpoint}${hierbase}/.disk/packages/$1/Packages.gz" ]; then this_packages=`echo "${hierbase}/.disk/packages/$1/Packages.gz"|sed 's:/\+:/:g'` - echo "Using \`${this_packages}' for $1." + echo "Using '${this_packages}' for $1." fi fi while [ -z "$this_packages" ] do echo -n " -I can't find the $1 \`Packages.cd' file. The information in the -\`Packages.cd' file is important for package selection during new +I can't find the $1 'Packages.cd' file. The information in the +'Packages.cd' file is important for package selection during new installations, and is very useful for upgrades. If you overlooked it when downloading you should do get it now and return to this installation procedure when you have done so: you will find one Packages.cd file and one Packages.cd.gz file -- either will do -- -in the \`binary' subdirectory of each area on the FTP sites and +in the 'binary' subdirectory of each area on the FTP sites and CD-ROMs. Alternatively (and this will be rather slow) I can scan the -packages in the distribution area - say \`scan' if you want me to do so. +packages in the distribution area - say 'scan' if you want me to do so. You need a separate Packages.cd file from each of the distribution areas you wish to install. -Where is the _$1_ \`Packages.cd' file (if none is available, say \`none') +Where is the _$1_ 'Packages.cd' file (if none is available, say 'none') [$5] ? " read response diff --git a/dselect/methparse.cc b/dselect/methparse.cc index ca923a3..0902b44 100644 --- a/dselect/methparse.cc +++ b/dselect/methparse.cc @@ -274,25 +274,14 @@ void getcurrentopt() { } void writecurrentopt() { - FILE *cmo; - int l; - static char *newfile=0; + struct atomic_file *file; assert(methoptfile); - if (!newfile) { - l= strlen(methoptfile); - newfile= new char[l + sizeof(NEWDBEXT) + 1]; - strcpy(newfile,methoptfile); - strcpy(newfile+l, NEWDBEXT); - } - cmo= fopen(newfile,"w"); - if (!cmo) ohshite(_("unable to open new option file `%.250s'"),newfile); - if (fprintf(cmo,"%s %s\n",coption->meth->name,coption->name) == EOF) { - fclose(cmo); - ohshite(_("unable to write new option to `%.250s'"),newfile); - } - if (fclose(cmo)) - ohshite(_("unable to close new option file `%.250s'"),newfile); - if (rename(newfile,methoptfile)) - ohshite(_("unable to install new option as `%.250s'"),methoptfile); + file = atomic_file_new(methoptfile, (enum atomic_file_flags)0); + atomic_file_open(file); + if (fprintf(file->fp, "%s %s\n", coption->meth->name, coption->name) == EOF) + ohshite(_("unable to write new option to `%.250s'"), file->name_new); + atomic_file_close(file); + atomic_file_commit(file); + atomic_file_free(file); } diff --git a/dselect/pkgcmds.cc b/dselect/pkgcmds.cc index 795254c..cade2b3 100644 --- a/dselect/pkgcmds.cc +++ b/dselect/pkgcmds.cc @@ -44,7 +44,7 @@ packagelist::affectedmatches(struct pkginfo *pkg, struct pkginfo *comparewith) { case sso_unsorted: break; default: - internerr("unknown statsortorder in affectedmatches"); + internerr("unknown statsortorder %d", statsortorder); } if (comparewith->priority != pkginfo::pri_unset && (comparewith->priority != pkg->priority || @@ -100,7 +100,10 @@ void packagelist::setwant(pkginfo::pkgwant nwarg) { int index, top, bot; pkginfo::pkgwant nw; - if (!readwrite) { beep(); return; } + if (modstatdb_get_status() == msdbrw_readonly) { + beep(); + return; + } if (recursive) { redrawitemsrange(cursorline,cursorline+1); @@ -145,7 +148,7 @@ void packagelist::kd_purge() { setwant(pkginfo::want_purge); } int would_like_to_install(pkginfo::pkgwant wantvalue, pkginfo *pkg) { /* Returns: 1 for yes, 0 for no, -1 for if they want to preserve an error condition. */ debug(dbg_general, "would_like_to_install(%d, %s) status %d", - wantvalue, pkg_describe(pkg, pdo_foreign), pkg->status); + wantvalue, pkg_name(pkg, pnaw_always), pkg->status); if (wantvalue == pkginfo::want_install) return 1; if (wantvalue != pkginfo::want_hold) return 0; @@ -156,9 +159,6 @@ int would_like_to_install(pkginfo::pkgwant wantvalue, pkginfo *pkg) { } const char *packagelist::itemname(int index) { - /* Ok, because output of itemname is never stored */ - if (table[index]->pkg->set->name) - return pkg_describe(table[index]->pkg, pdo_foreign); return table[index]->pkg->set->name; } @@ -168,7 +168,8 @@ void packagelist::kd_swapstatorder() { case sso_avail: statsortorder= sso_state; break; case sso_state: statsortorder= sso_unsorted; break; case sso_unsorted: statsortorder= sso_avail; break; - default: internerr("unknown statsort in kd_swapstatorder"); + default: + internerr("unknown statsort %d", statsortorder); } resortredisplay(); } @@ -179,7 +180,8 @@ void packagelist::kd_swaporder() { case so_section: sortorder= so_alpha; break; case so_alpha: sortorder= so_priority; break; case so_unsorted: return; - default: internerr("unknown sort in kd_swaporder"); + default: + internerr("unknown sort %d", sortorder); } resortredisplay(); } @@ -193,7 +195,7 @@ void packagelist::resortredisplay() { int index; for (index=0; indexpkg->set->name && - !strcasecmp(oldname, table[index]->pkg->set->name)) { + strcasecmp(oldname, table[index]->pkg->set->name) == 0) { newcursor= index; break; } @@ -216,7 +218,8 @@ void packagelist::kd_versiondisplay() { case vdo_both: versiondisplayopt= vdo_none; break; case vdo_none: versiondisplayopt= vdo_available; break; case vdo_available: versiondisplayopt= vdo_both; break; - default: internerr("unknown versiondisplayopt in kd_versiondisplay"); + default: + internerr("unknown versiondisplayopt %d", versiondisplayopt); } setwidths(); leftofscreen= 0; diff --git a/dselect/pkgdepcon.cc b/dselect/pkgdepcon.cc index 0ff63f5..9fb26c2 100644 --- a/dselect/pkgdepcon.cc +++ b/dselect/pkgdepcon.cc @@ -49,14 +49,10 @@ packagelist::useavailable(pkginfo *pkg) pkgbin * packagelist::find_pkgbin(pkginfo *pkg) { - pkgbin *r = &pkg->installed; - enum pkg_describe_opts pdo = pdo_foreign; - if (useavailable(pkg)) { - r = &pkg->available; - pdo = (enum pkg_describe_opts)(pdo | pdo_avail); - } + pkgbin *r; + r= useavailable(pkg) ? &pkg->available : &pkg->installed; debug(dbg_general, "packagelist[%p]::find_pkgbin(%s) useavailable=%d", - this, pkg_describe(pkg, pdo), useavailable(pkg)); + this, pkgbin_name(pkg, r, pnaw_always), useavailable(pkg)); return r; } @@ -79,7 +75,7 @@ int packagelist::checkdependers(pkginfo *pkg, int changemade) { int packagelist::resolvesuggest() { // We continually go around looking for things to change, but we may - // only change the `suggested' value if we also increase the `priority' + // only change the ‘suggested’ value if we also increase the ‘priority’ // Return 2 if we made a change due to a Recommended, Depends or Conficts, // or 1 if we offered or made a change because of an Optional line. debug(dbg_general, "packagelist[%p]::resolvesuggest()", this); @@ -92,8 +88,7 @@ int packagelist::resolvesuggest() { if (!table[index]->pkg->set->name) continue; debug(dbg_depcon, "packagelist[%p]::resolvesuggest() loop[%i] %s / %d", - this, index, pkg_describe(table[index]->pkg, pdo_foreign), - changemade); + this, index, pkg_name(table[index]->pkg, pnaw_always), changemade); dependency *depends; for (depends = find_pkgbin(table[index]->pkg)->depends; depends; @@ -108,8 +103,7 @@ int packagelist::resolvesuggest() { changemade = checkdependers(&depends->list->ed->pkg, changemade); } debug(dbg_depcon, "packagelist[%p]::resolvesuggest() loop[%i] %s / -> %d", - this, index, pkg_describe(table[index]->pkg, pdo_foreign), - changemade); + this, index, pkg_name(table[index]->pkg, pnaw_always), changemade); } if (!changemade) break; maxchangemade = max(maxchangemade, changemade); @@ -124,7 +118,7 @@ static int dep_update_best_to_change_stop(perpackagestate *& best, pkginfo *tryt if (!trythis->clientdata) return 0; debug(dbg_depcon, "update_best_to_change(best=%s{%d}, test=%s{%d});", - best ? pkg_describe(best->pkg, pdo_foreign) : "", + best ? pkg_name(best->pkg, pnaw_always) : "", best ? (int)best->spriority : -1, trythis->set->name, trythis->clientdata->spriority); @@ -177,8 +171,8 @@ packagelist::deselect_one_of(pkginfo *per, pkginfo *ped, dependency *dep) debug(dbg_depcon, "packagelist[%p]::deselect_one_of(): er %s{%d} ed %s{%d} [%p]", - this, pkg_describe(er->pkg, pdo_foreign), er->spriority, - pkg_describe(ed->pkg, pdo_foreign), ed->spriority, dep); + this, pkg_name(er->pkg, pnaw_always), er->spriority, + pkg_name(ed->pkg, pnaw_always), ed->spriority, dep); perpackagestate *best; @@ -197,7 +191,7 @@ packagelist::deselect_one_of(pkginfo *per, pkginfo *ped, dependency *dep) else best= ed; // ... failing that, the second debug(dbg_depcon, "packagelist[%p]::deselect_one_of(): best %s{%d}", - this, pkg_describe(best->pkg, pdo_foreign), best->spriority); + this, pkg_name(best->pkg, pnaw_always), best->spriority); if (best->spriority >= sp_deselecting) return 0; best->suggested= @@ -224,7 +218,7 @@ int packagelist::resolvedepcon(dependency *depends) { debug(dbg_depcon, "packagelist[%p]::resolvedepcon([%p] %s --%s-->%s); (ing)->want=%s", - this, depends, pkg_describe(depends->up, pdo_foreign), + this, depends, pkg_name(depends->up, pnaw_always), relatestrings[depends->type], pkg_names.string(), depends->up->clientdata ? wantstrings[depends->up->clientdata->suggested] : "(no clientdata)"); @@ -271,7 +265,7 @@ int packagelist::resolvedepcon(dependency *depends) { if (fixbyupgrade) { debug(dbg_depcon, "packagelist[%p]::resolvedepcon([%p]): fixbyupgrade %s", - this, depends, pkg_describe(fixbyupgrade->pkg, pdo_foreign)); + this, depends, pkg_name(fixbyupgrade->pkg, pnaw_always)); best= fixbyupgrade; } else { best= 0; @@ -301,7 +295,7 @@ int packagelist::resolvedepcon(dependency *depends) { } debug(dbg_depcon, "packagelist[%p]::resolvedepcon([%p]): select best=%s{%d}", - this, depends, pkg_describe(best->pkg, pdo_foreign), best->spriority); + this, depends, pkg_name(best->pkg, pnaw_always), best->spriority); if (best->spriority >= sp_selecting) return r; /* Always select depends. Only select recommends if we got here because * of a manually-initiated install request. */ @@ -315,7 +309,7 @@ int packagelist::resolvedepcon(dependency *depends) { best= depends->up->clientdata; debug(dbg_depcon, "packagelist[%p]::resolvedepcon([%p]): mustdeselect best=%s{%d}", - this, depends, pkg_describe(best->pkg, pdo_foreign), best->spriority); + this, depends, pkg_name(best->pkg, pnaw_always), best->spriority); if (best->spriority >= sp_deselecting) return r; /* Always remove depends, but never remove recommends. */ @@ -362,7 +356,7 @@ int packagelist::resolvedepcon(dependency *depends) { return 0; default: - internerr("unknown deptype"); + internerr("unknown deptype %d", depends->type); } /* never reached, make gcc happy */ return 1; @@ -371,7 +365,7 @@ int packagelist::resolvedepcon(dependency *depends) { bool packagelist::deppossatisfied(deppossi *possi, perpackagestate **fixbyupgrade) { - // `satisfied' here for Conflicts and Breaks means that the + // ‘satisfied’ here for Conflicts and Breaks means that the // restriction is violated ie that the target package is wanted int would; pkginfo::pkgwant want= pkginfo::want_purge; @@ -412,6 +406,8 @@ packagelist::deppossatisfied(deppossi *possi, perpackagestate **fixbyupgrade) provider; provider = provider->rev_next) { if (provider->up->type == dep_provides && + ((possi->up->type != dep_conflicts && possi->up->type != dep_breaks) || + provider->up->up->set != possi->up->up->set) && provider->up->up->clientdata && !useavailable(provider->up->up) && would_like_to_install(provider->up->up->clientdata->selected, @@ -422,6 +418,8 @@ packagelist::deppossatisfied(deppossi *possi, perpackagestate **fixbyupgrade) provider; provider = provider->rev_next) { if (provider->up->type != dep_provides || + ((possi->up->type == dep_conflicts || possi->up->type == dep_breaks) && + provider->up->up->set == possi->up->up->set) || !provider->up->up->clientdata || !would_like_to_install(provider->up->up->clientdata->selected, provider->up->up)) diff --git a/dselect/pkgdisplay.cc b/dselect/pkgdisplay.cc index 67750b3..618df43 100644 --- a/dselect/pkgdisplay.cc +++ b/dselect/pkgdisplay.cc @@ -146,8 +146,6 @@ void packagelist::setwidths() { } section_width= 8; - gap_width= 1; - if (sortorder == so_section) { section_column= status_width + gap_width; priority_column= section_column + section_width + gap_width; @@ -180,12 +178,9 @@ void packagelist::setwidths() { description_column= versionavailable_column + versionavailable_width + gap_width; break; default: - internerr("unknown versiondisplayopt in setwidths"); + internerr("unknown versiondisplayopt %d", versiondisplayopt); } - total_width= TOTAL_LIST_WIDTH; - if (total_width < COLS) - total_width= COLS; description_width= total_width - description_column; } @@ -196,7 +191,8 @@ void packagelist::redrawtitle() { mywerase(titlewin); mvwaddnstr(titlewin,0,0, recursive ? _("dselect - recursive package listing") : - !readwrite ? _("dselect - inspection of package states") : + modstatdb_get_status() == msdbrw_readonly ? + _("dselect - inspection of package states") : _("dselect - main package listing"), xmax); getyx(titlewin,y,x); @@ -214,7 +210,7 @@ void packagelist::redrawtitle() { waddnstr(titlewin, _(" (status, section)"), xmax-x); break; default: - internerr("bad statsort in redrawtitle/so_section"); + internerr("bad statsort %d on so_section", statsortorder); } break; case so_priority: @@ -229,7 +225,7 @@ void packagelist::redrawtitle() { waddnstr(titlewin, _(" (status, priority)"), xmax-x); break; default: - internerr("bad statsort in redrawtitle/so_priority"); + internerr("bad statsort %d on so_priority", statsortorder); } break; case so_alpha: @@ -244,21 +240,24 @@ void packagelist::redrawtitle() { waddnstr(titlewin, _(" (by status)"), xmax-x); break; default: - internerr("bad statsort in redrawtitle/so_priority"); + internerr("bad statsort %d on so_priority", statsortorder); } break; - waddnstr(titlewin, _(" (alphabetically)"), xmax-x); - break; case so_unsorted: break; default: - internerr("bad sort in redrawtitle"); + internerr("bad sort %d", sortorder); } } - const char *helpstring= readwrite ? (verbose ? _(" mark:+/=/- terse:v help:?") - : _(" mark:+/=/- verbose:v help:?")) - : (verbose ? _(" terse:v help:?") - : _(" verbose:v help:?")); + const char *helpstring; + + if (modstatdb_get_status() == msdbrw_write) + helpstring = (verbose ? _(" mark:+/=/- terse:v help:?") + : _(" mark:+/=/- verbose:v help:?")); + else + helpstring = (verbose ? _(" terse:v help:?") + : _(" verbose:v help:?")); + int l= strlen(helpstring); getyx(titlewin,y,x); if (xmax-l > 0) { diff --git a/dselect/pkginfo.cc b/dselect/pkginfo.cc index 39e735c..1ab79f5 100644 --- a/dselect/pkginfo.cc +++ b/dselect/pkginfo.cc @@ -57,7 +57,7 @@ const struct helpmenuentry *packagelist::helpmenulist() { { 0 } }; return - !readwrite ? ro : + modstatdb_get_status() == msdbrw_readonly ? ro : !recursive ? rw : recur; } @@ -112,11 +112,11 @@ void packagelist::itd_description() { m = _("No description available."); const char *p= strchr(m,'\n'); int l= p ? (int)(p-m) : strlen(m); - wattrset(infopad,info_headattr); - waddstr(infopad, pkg_describe(table[cursorline]->pkg, pdo_foreign)); + wattrset(infopad, part_attr[info_head]); + waddstr(infopad, table[cursorline]->pkg->set->name); waddstr(infopad," - "); waddnstr(infopad,m,l); - wattrset(infopad,info_attr); + wattrset(infopad, part_attr[info]); if (p) { waddstr(infopad,"\n\n"); wordwrapinfo(1,++p); diff --git a/dselect/pkglist.cc b/dselect/pkglist.cc index b6e6c6f..811ec4c 100644 --- a/dselect/pkglist.cc +++ b/dselect/pkglist.cc @@ -47,7 +47,7 @@ int packagelist::compareentries(const struct perpackagestate *a, case sso_unsorted: break; default: - internerr("unknown statsortorder in compareentries"); + internerr("unknown statsortorder %d", statsortorder); } const char *asection= a->pkg->section; @@ -66,7 +66,6 @@ int packagelist::compareentries(const struct perpackagestate *a, a->pkg->priority - b->pkg->priority; if (!c_priority && a->pkg->priority == pkginfo::pri_other) c_priority= strcasecmp(a->pkg->otherpriority, b->pkg->otherpriority); - /* XXX: Should sort by architecture in case of equality */ int c_name= a->pkg->set->name && b->pkg->set->name ? strcasecmp(a->pkg->set->name, b->pkg->set->name) : @@ -81,7 +80,7 @@ int packagelist::compareentries(const struct perpackagestate *a, return c_name; case so_unsorted: default: - internerr("unsorted or unknown in compareentries"); + internerr("unsorted or unknown sort %d", sortorder); } /* never reached, make gcc happy */ return 1; @@ -116,7 +115,7 @@ void packagelist::addheading(enum ssavailval ssavail, if (nitems == nallocated) { nallocated += nallocated+50; struct perpackagestate **newtable= new struct perpackagestate*[nallocated]; - memcpy(newtable,table,nallocated*sizeof(struct perpackagestate*)); + memcpy(newtable, table, nallocated * sizeof(struct perpackagestate *)); delete[] table; table= newtable; } @@ -148,8 +147,8 @@ void packagelist::addheading(enum ssavailval ssavail, static packagelist *sortpackagelist; int qsort_compareentries(const void *a, const void *b) { - return sortpackagelist->compareentries(*(const struct perpackagestate**)a, - *(const struct perpackagestate**)b); + return sortpackagelist->compareentries(*(const struct perpackagestate **)a, + *(const struct perpackagestate **)b); } void packagelist::sortinplace() { @@ -179,7 +178,7 @@ void packagelist::ensurestatsortinfo() { if (calcssadone) return; for (index=0; index < nitems; index++) { debug(dbg_general, "packagelist[%p]::ensurestatsortinfos() i=%d pkg=%s", - this, index, pkg_describe(table[index]->pkg, pdo_foreign)); + this, index, pkg_name(table[index]->pkg, pnaw_always)); pkg= table[index]->pkg; switch (pkg->status) { case pkginfo::stat_unpacked: @@ -191,7 +190,7 @@ void packagelist::ensurestatsortinfo() { break; case pkginfo::stat_notinstalled: case pkginfo::stat_configfiles: - if (!informativeversion(&pkg->available.version)) { + if (!dpkg_version_is_informative(&pkg->available.version)) { table[index]->ssavail= ssa_notinst_gone; // FIXME: Disable for now as a workaround, until dselect knows how to properly // store seen packages. @@ -206,7 +205,7 @@ void packagelist::ensurestatsortinfo() { case pkginfo::stat_installed: veri= &table[index]->pkg->installed.version; vera= &table[index]->pkg->available.version; - if (!informativeversion(vera)) { + if (!dpkg_version_is_informative(vera)) { table[index]->ssavail= ssa_installed_gone; } else if (versioncompare(vera,veri) > 0) { table[index]->ssavail= ssa_installed_newer; @@ -215,7 +214,7 @@ void packagelist::ensurestatsortinfo() { } break; default: - internerr("unknown stat in ensurestatsortinfo sso_avail"); + internerr("unknown status %d on sso_avail", pkg->status); } debug(dbg_general, "packagelist[%p]::ensurestatsortinfos() i=%d ssavail=%d", @@ -229,7 +228,7 @@ void packagelist::ensurestatsortinfo() { if (calcsssdone) return; for (index=0; index < nitems; index++) { debug(dbg_general, "packagelist[%p]::ensurestatsortinfos() i=%d pkg=%s", - this, index, pkg_describe(table[index]->pkg, pdo_foreign)); + this, index, pkg_name(table[index]->pkg, pnaw_always)); switch (table[index]->pkg->status) { case pkginfo::stat_unpacked: case pkginfo::stat_halfconfigured: @@ -248,7 +247,7 @@ void packagelist::ensurestatsortinfo() { table[index]->ssstate= sss_installed; break; default: - internerr("unknown stat in ensurestatsortinfo sso_state"); + internerr("unknown status %d on sso_state", table[index]->pkg->status); } debug(dbg_general, "packagelist[%p]::ensurestatsortinfos() i=%d ssstate=%d", @@ -257,7 +256,7 @@ void packagelist::ensurestatsortinfo() { calcsssdone= 1; break; default: - internerr("unknown statsortorder in ensurestatsortinfo"); + internerr("unknown statsortorder %d", statsortorder); } } @@ -302,7 +301,7 @@ void packagelist::sortmakeheads() { case sso_unsorted: break; default: - internerr("unknown statsortorder in sortmakeheads"); + internerr("unknown statsortorder %d", statsortorder); } int prioritydiff= (!lastpkg || @@ -316,7 +315,7 @@ void packagelist::sortmakeheads() { debug(dbg_general, "packagelist[%p]::sortmakeheads() pkg=%s state=%d avail=%d %s " "priority=%d otherpriority=%s %s section=%s %s", - this, pkg_describe(thispkg, pdo_foreign), + this, pkg_name(thispkg, pnaw_always), thispkg->clientdata->ssavail, thispkg->clientdata->ssstate, ssdiff ? "*diff" : "same", thispkg->priority, @@ -397,7 +396,8 @@ packagelist::packagelist(keybindings *kb) : baselist(kb) { } // treat all unknown packages as already seen state->direct= state->original= (pkg->want == pkginfo::want_unknown ? pkginfo::want_purge : pkg->want); - if (readwrite && state->original == pkginfo::want_unknown) { + if (modstatdb_get_status() == msdbrw_write && + state->original == pkginfo::want_unknown) { state->suggested= pkg->status == pkginfo::stat_installed || pkg->priority <= pkginfo::pri_standard /* FIXME: configurable */ @@ -446,7 +446,7 @@ packagelist::packagelist(keybindings *kb, pkginfo **pkgltab) : baselist(kb) { void perpackagestate::free(int recursive) { if (pkg->set->name) { - if (readwrite) { + if (modstatdb_get_status() == msdbrw_write) { if (uprec) { assert(recursive); uprec->selected= selected; @@ -543,7 +543,7 @@ packagelist::matchsearch(int index) return true; if (searchdescr) { - const char* descr = table[index]->pkg->available.description; + const char *descr = table[index]->pkg->available.description; if (!descr || !*descr) return false; @@ -595,7 +595,8 @@ pkginfo **packagelist::display() { pop_cleanup(ehflag_normaltidy); // unset the SIGWINCH handler enddisplay(); - if (interp->qa == qa_quitnochecksave || !readwrite) { + if (interp->qa == qa_quitnochecksave || + modstatdb_get_status() == msdbrw_readonly) { debug(dbg_general, "packagelist[%p]::display() done - quitNOcheck", this); return 0; } diff --git a/dselect/pkglist.h b/dselect/pkglist.h index 2169255..08deb9a 100644 --- a/dselect/pkglist.h +++ b/dselect/pkglist.h @@ -1,5 +1,5 @@ /* -*- c++ -*- - * dselect - selection of Debian packages + * dselect - Debian package maintenance user interface * pkglist.h - external definitions for package list handling * * Copyright © 1994,1995 Ian Jackson @@ -38,7 +38,7 @@ enum selpriority { sp_inherit, // inherited from our parent list sp_selecting, // propagating a selection sp_deselecting, // propagating a deselection - sp_fixed // it came from the `status' file and we're not a recursive list + sp_fixed // it came from the ‘status’ file and we're not a recursive list // high }; @@ -63,7 +63,7 @@ enum ssstateval { // State sorting order, first to last: struct perpackagestate { struct pkginfo *pkg; - /* The `heading' entries in the list, for `all packages of type foo', + /* The ‘heading’ entries in the list, for “all packages of type foo”, * point to a made-up pkginfo, which has pkg->name==0. * pkg->priority and pkg->section are set to the values if appropriate, or to * pri_unset resp. null if the heading refers to all priorities resp. sections. @@ -86,12 +86,12 @@ struct perpackagestate { class packagelist : public baselist { protected: - int status_width, gap_width, section_width, priority_width; + int status_width, section_width, priority_width; int package_width, versioninstalled_width, versionavailable_width, description_width; int section_column, priority_column, versioninstalled_column; int versionavailable_column, package_column, description_column; - // Only used when `verbose' is set + // Only used when ‘verbose’ is set int status_hold_width, status_status_width, status_want_width; // Table of packages @@ -229,6 +229,4 @@ extern const char statuschars[]; extern const char eflagchars[]; extern const char wantchars[]; -extern modstatdb_rw readwrite; - #endif /* PKGLIST_H */ diff --git a/dselect/pkgsublist.cc b/dselect/pkgsublist.cc index 3195854..27a3220 100644 --- a/dselect/pkgsublist.cc +++ b/dselect/pkgsublist.cc @@ -33,14 +33,14 @@ #include "bindings.h" void packagelist::add(pkginfo *pkg) { - debug(dbg_general, "packagelist[%p]::add(pkginfo %s)", this, - pkg_describe(pkg, pdo_foreign)); + debug(dbg_general, "packagelist[%p]::add(pkginfo %s)", + this, pkg_name(pkg, pnaw_always)); if (!recursive || // never add things to top level !pkg->clientdata || // don't add pure virtual packages pkg->clientdata->uprec) // don't add ones already in the recursive list return; debug(dbg_general, "packagelist[%p]::add(pkginfo %s) adding", - this, pkg_describe(pkg, pdo_foreign)); + this, pkg_name(pkg, pnaw_always)); perpackagestate *state= &datatable[nitems]; state->pkg= pkg; state->direct= state->original= pkg->clientdata->selected; @@ -55,21 +55,21 @@ void packagelist::add(pkginfo *pkg) { void packagelist::add(pkginfo *pkg, pkginfo::pkgwant nw) { debug(dbg_general, "packagelist[%p]::add(pkginfo %s, %s)", - this, pkg_describe(pkg, pdo_foreign), wantstrings[nw]); + this, pkg_name(pkg, pnaw_always), wantstrings[nw]); add(pkg); if (!pkg->clientdata) return; pkg->clientdata->direct= nw; selpriority np; np= would_like_to_install(nw,pkg) ? sp_selecting : sp_deselecting; if (pkg->clientdata->spriority > np) return; debug(dbg_general, "packagelist[%p]::add(pkginfo %s, %s) setting", - this, pkg_describe(pkg, pdo_foreign), wantstrings[nw]); + this, pkg_name(pkg, pnaw_always), wantstrings[nw]); pkg->clientdata->suggested= pkg->clientdata->selected= nw; pkg->clientdata->spriority= np; } void packagelist::add(pkginfo *pkg, const char *extrainfo, showpriority showimp) { debug(dbg_general, "packagelist[%p]::add(pkginfo %s, ..., showpriority %d)", - this, pkg_describe(pkg, pdo_foreign), showimp); + this, pkg_name(pkg, pnaw_always), showimp); add(pkg); if (!pkg->clientdata) return; if (pkg->clientdata->dpriority < showimp) pkg->clientdata->dpriority= showimp; pkg->clientdata->relations(extrainfo); @@ -118,7 +118,7 @@ packagelist::add(dependency *depends, showpriority displayimportance) const char *comma= ""; varbuf info; - info(pkg_describe(depends->up, pdo_foreign)); + info(depends->up->set->name); info(' '); info(gettext(relatestrings[depends->type])); info(' '); @@ -135,7 +135,8 @@ packagelist::add(dependency *depends, showpriority displayimportance) case dvr_earlierstrict: info(" (<< "); break; case dvr_laterstrict: info(" (>> "); break; case dvr_exact: info(" (= "); break; - default: internerr("unknown verrel"); + default: + internerr("unknown verrel %d", possi->verrel); } info(versiondescribe(&possi->version, vdew_nonambig)); info(")"); diff --git a/dselect/pkgtop.cc b/dselect/pkgtop.cc index 3e39430..14f17e2 100644 --- a/dselect/pkgtop.cc +++ b/dselect/pkgtop.cc @@ -71,7 +71,7 @@ int packagelist::describemany(char buf[], const char *prioritystring, case sso_unsorted: break; default: - internerr("unknown statsortrder in describemany all"); + internerr("unknown statsortrder %d", statsortorder); } if (!prioritystring) { @@ -109,8 +109,7 @@ void packagelist::redrawthisstate() { const char *priority= pkgprioritystring(table[cursorline]->pkg); char *buf= new char[500+ max((table[cursorline]->pkg->set->name ? - strlen(pkg_describe(table[cursorline]->pkg, - pdo_foreign)) : 0), + strlen(table[cursorline]->pkg->set->name) : 0), (section ? strlen(section) : 0) + (priority ? strlen(priority) : 0))]; @@ -118,7 +117,7 @@ void packagelist::redrawthisstate() { sprintf(buf, _("%-*s %s%s%s; %s (was: %s). %s"), package_width, - pkg_describe(table[cursorline]->pkg, pdo_foreign), + table[cursorline]->pkg->set->name, gettext(statusstrings[table[cursorline]->pkg->status]), ((eflagstrings[table[cursorline]->pkg->eflag][0]==' ') && (eflagstrings[table[cursorline]->pkg->eflag][1]=='\0')) ? "" : " - ", @@ -143,7 +142,7 @@ void packagelist::redraw1itemsel(int index, int selected) { const struct pkgbin *info = &pkg->available; int screenline = index - topofscreen; - wattrset(listpad, selected ? listsel_attr : list_attr); + wattrset(listpad, part_attr[selected ? listsel : list]); if (pkg->set->name) { if (verbose) { @@ -158,11 +157,11 @@ void packagelist::redraw1itemsel(int index, int selected) { /* FIXME: keep this? */ /*table[index]->original == table[index]->selected ? "(same)" : */gettext(wantstrings[table[index]->original])); - wattrset(listpad, selected ? selstatesel_attr : selstate_attr); + wattrset(listpad, part_attr[selected ? selstatesel : selstate]); wprintw(listpad, "%-*.*s", status_want_width, status_want_width, gettext(wantstrings[table[index]->selected])); - wattrset(listpad, selected ? listsel_attr : list_attr); + wattrset(listpad, part_attr[selected ? listsel : list]); waddch(listpad, ' '); mvwprintw(listpad, screenline, priority_column - 1, " %-*.*s", @@ -177,9 +176,9 @@ void packagelist::redraw1itemsel(int index, int selected) { /*table[index]->original == table[index]->selected ? ' ' : */wantchars[table[index]->original]); - wattrset(listpad, selected ? selstatesel_attr : selstate_attr); + wattrset(listpad, part_attr[selected ? selstatesel : selstate]); waddch(listpad, wantchars[table[index]->selected]); - wattrset(listpad, selected ? listsel_attr : list_attr); + wattrset(listpad, part_attr[selected ? listsel : list]); wmove(listpad, screenline, priority_column - 1); waddch(listpad, ' '); @@ -200,20 +199,20 @@ void packagelist::redraw1itemsel(int index, int selected) { pkg->section ? pkg->section : "?"); mvwprintw(listpad, screenline, package_column - 1, " %-*.*s ", - package_width, package_width, pkg_describe(pkg, pdo_foreign)); + package_width, package_width, pkg->set->name); if (versioninstalled_width) mvwprintw(listpad, screenline, versioninstalled_column, "%-*.*s ", versioninstalled_width, versioninstalled_width, versiondescribe(&pkg->installed.version, vdew_nonambig)); if (versionavailable_width) { - if (informativeversion(&pkg->available.version) && + if (dpkg_version_is_informative(&pkg->available.version) && versioncompare(&pkg->available.version,&pkg->installed.version) > 0) - wattrset(listpad, selected ? selstatesel_attr : selstate_attr); + wattrset(listpad, part_attr[selected ? selstatesel : selstate]); mvwprintw(listpad, screenline, versionavailable_column, "%-*.*s", versionavailable_width, versionavailable_width, versiondescribe(&pkg->available.version, vdew_nonambig)); - wattrset(listpad, selected ? listsel_attr : list_attr); + wattrset(listpad, part_attr[selected ? listsel : list]); waddch(listpad,' '); } @@ -237,10 +236,10 @@ void packagelist::redraw1itemsel(int index, int selected) { while (j-- >0) { waddch(listpad,ACS_HLINE); i--; } waddch(listpad,' '); - wattrset(listpad, selected ? selstatesel_attr : selstate_attr); + wattrset(listpad, part_attr[selected ? selstatesel : selstate]); p= buf; while (i>0 && *p) { waddnstr(listpad, p,1); p++; i--; } - wattrset(listpad, selected ? listsel_attr : list_attr); + wattrset(listpad, part_attr[selected ? listsel : list]); waddch(listpad,' '); j= (indent<<1) + 1; @@ -254,7 +253,7 @@ void packagelist::redraw1itemsel(int index, int selected) { void packagelist::redrawcolheads() { if (colheads_height) { - wattrset(colheadspad,colheads_attr); + wattrset(colheadspad, part_attr[colheads]); mywerase(colheadspad); if (verbose) { wmove(colheadspad,0,0); diff --git a/dselect/po/bs.po b/dselect/po/bs.po index 823ae92..a135554 100644 --- a/dselect/po/bs.po +++ b/dselect/po/bs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.13\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2011-04-02 00:59+0200\n" +"POT-Creation-Date: 2012-04-27 10:06+0200\n" "PO-Revision-Date: 2006-02-17 08:55+0200\n" "Last-Translator: Safir Šećerović \n" "Language-Team: Bosnian \n" @@ -20,29 +20,29 @@ msgstr "" msgid "Search for ? " msgstr "" -#: dselect/basecmds.cc:147 +#: dselect/basecmds.cc:149 msgid "Error: " msgstr "Greška:" -#: dselect/basecmds.cc:176 +#: dselect/basecmds.cc:180 msgid "Help: " msgstr "Pomoć:" -#: dselect/basecmds.cc:182 +#: dselect/basecmds.cc:186 msgid "Press ? for help menu, . for next topic, to exit help." msgstr "" -#: dselect/basecmds.cc:189 +#: dselect/basecmds.cc:193 msgid "Help information is available under the following topics:" msgstr "" -#: dselect/basecmds.cc:197 +#: dselect/basecmds.cc:201 msgid "" "Press a key from the list above, or `q' to exit help,\n" " or `.' (full stop) to read each help page in turn. " msgstr "" -#: dselect/basecmds.cc:203 +#: dselect/basecmds.cc:207 msgid "error reading keyboard in help" msgstr "" @@ -82,49 +82,49 @@ msgstr "" msgid "failed to allocate colour pair" msgstr "" -#: dselect/baselist.cc:167 +#: dselect/baselist.cc:155 msgid "failed to create title window" msgstr "" -#: dselect/baselist.cc:171 +#: dselect/baselist.cc:159 msgid "failed to create whatinfo window" msgstr "" -#: dselect/baselist.cc:175 +#: dselect/baselist.cc:163 msgid "failed to create baselist pad" msgstr "" -#: dselect/baselist.cc:178 +#: dselect/baselist.cc:166 msgid "failed to create heading pad" msgstr "" -#: dselect/baselist.cc:182 +#: dselect/baselist.cc:170 msgid "failed to create thisstate pad" msgstr "" -#: dselect/baselist.cc:186 +#: dselect/baselist.cc:174 msgid "failed to create info pad" msgstr "" -#: dselect/baselist.cc:191 +#: dselect/baselist.cc:179 msgid "failed to create query window" msgstr "" -#: dselect/baselist.cc:255 +#: dselect/baselist.cc:247 msgid "Keybindings" msgstr "" -#: dselect/baselist.cc:303 +#: dselect/baselist.cc:295 #, c-format msgid " -- %d%%, press " msgstr "" -#: dselect/baselist.cc:306 +#: dselect/baselist.cc:298 #, c-format msgid "%s for more" msgstr "" -#: dselect/baselist.cc:310 +#: dselect/baselist.cc:302 #, c-format msgid "%s to go back" msgstr "" @@ -531,110 +531,104 @@ msgid "" " \\ repeat last search\n" msgstr "" -#: dselect/main.cc:61 +#: dselect/main.cc:64 msgid "Type dselect --help for help." msgstr "Ukucajte dselect --help za pomoć." -#: dselect/main.cc:144 +#: dselect/main.cc:146 msgid "a" msgstr "p" -#: dselect/main.cc:144 +#: dselect/main.cc:146 msgid "[A]ccess" msgstr "[P]ristup" -#: dselect/main.cc:144 +#: dselect/main.cc:146 msgid "Choose the access method to use." msgstr "Izaberite metod pristupa koji će se korisiti." -#: dselect/main.cc:145 +#: dselect/main.cc:147 msgid "u" msgstr "a" -#: dselect/main.cc:145 +#: dselect/main.cc:147 msgid "[U]pdate" msgstr "[A]žuriraj" -#: dselect/main.cc:145 +#: dselect/main.cc:147 msgid "Update list of available packages, if possible." msgstr "Ažuriraj listu dostupnih paketa, po mogućnosti." -#: dselect/main.cc:146 +#: dselect/main.cc:148 msgid "s" msgstr "o" -#: dselect/main.cc:146 +#: dselect/main.cc:148 msgid "[S]elect" msgstr "[O]dabir" -#: dselect/main.cc:146 +#: dselect/main.cc:148 msgid "Request which packages you want on your system." msgstr "Odaberite koje pakete želite na vašem sistemu." -#: dselect/main.cc:147 +#: dselect/main.cc:149 msgid "i" msgstr "i" -#: dselect/main.cc:147 +#: dselect/main.cc:149 msgid "[I]nstall" msgstr "[I]nstaliraj" -#: dselect/main.cc:147 +#: dselect/main.cc:149 msgid "Install and upgrade wanted packages." msgstr "Instaliraj i nadogradi željene pakete." -#: dselect/main.cc:148 +#: dselect/main.cc:150 msgid "c" msgstr "d" -#: dselect/main.cc:148 +#: dselect/main.cc:150 msgid "[C]onfig" msgstr "Po[d]esi" -#: dselect/main.cc:148 +#: dselect/main.cc:150 msgid "Configure any packages that are unconfigured." msgstr "Podesi sve pakete koji nisu podešeni." -#: dselect/main.cc:149 +#: dselect/main.cc:151 msgid "r" msgstr "u" -#: dselect/main.cc:149 +#: dselect/main.cc:151 msgid "[R]emove" msgstr "[U]kloni" -#: dselect/main.cc:149 +#: dselect/main.cc:151 msgid "Remove unwanted software." msgstr "Ukloni neželjeni software" -#: dselect/main.cc:150 +#: dselect/main.cc:152 msgid "q" msgstr "z" -#: dselect/main.cc:150 +#: dselect/main.cc:152 msgid "[Q]uit" msgstr "I[z]ađi" -#: dselect/main.cc:150 +#: dselect/main.cc:152 msgid "Quit dselect." msgstr "Izađi iz dselect programa." -#: dselect/main.cc:151 +#: dselect/main.cc:153 msgid "menu" msgstr "meni" -#: dselect/main.cc:156 +#: dselect/main.cc:158 #, fuzzy, c-format msgid "Debian `%s' package handling frontend version %s.\n" msgstr "Debianov `%s' program za rukovanje paketima." -#: dselect/main.cc:159 -msgid "" -"Copyright (C) 1994-1996 Ian Jackson.\n" -"Copyright (C) 2000,2001 Wichert Akkerman.\n" -msgstr "" - -#: dselect/main.cc:163 +#: dselect/main.cc:161 #, fuzzy msgid "" "This is free software; see the GNU General Public License version 2 or\n" @@ -647,30 +641,30 @@ msgstr "" "ili kasniju za uslove kopiranja. NEMA garancije. Pogledajte\n" "dselect --licence za detalje.\n" -#: dselect/main.cc:173 dselect/main.cc:221 +#: dselect/main.cc:170 dselect/main.cc:218 msgid "" msgstr "" -#: dselect/main.cc:184 +#: dselect/main.cc:181 #, c-format msgid "" "Usage: %s [