diff --git a/dpkg.changes b/dpkg.changes index 9d3fbb8..b5e7a56 100644 --- a/dpkg.changes +++ b/dpkg.changes @@ -1,3 +1,246 @@ +------------------------------------------------------------------- +Mon Jan 3 12:15:28 UTC 2022 - Dan Čermák + +- rebase patches: + * update-alternatives.changes + * update-alternatives.spec + * update-alternatives-suse.patch + +- New upstream release 1.21.1 + +dpkg (1.21.1) unstable; urgency=medium + + [ Guillem Jover ] + * dpkg-buildpackage: Remove duplicate command print for dpkg-genchanges. + * dpkg-buildpackage: Fix build description due to improper multiline match. + * dpkg-realpath: Remove spurious heading space from --help output. + * update-alternatives: When initializing admindir from DPKG_ADMINDIR append + "/alternatives". Closes: #1001198 + * Code internals: + - Remove inclusions. + * Packaging: + - Install deb-md5sums(5) into dpkg-dev package. + +dpkg (1.21.0) unstable; urgency=medium + + [ Guillem Jover ] + * dpkg-genchanges: Include orig tarball on source package renames. + Closes: #980066 + * scripts: Consider SHA-1 and RIPEMD-160 weak algorithms in OpenPGP + signatures. + * dpkg: During unpack print a removal message due to Conflicts. + Closes: #985401 + * scripts: Add zsh completions for dpkg-parsechangelog. + Thanks to Daniel Shahaf . Closes: #986103 + * dpkg-buildpackage: When printing build type match the extension exactly. + Closes: #989824 + * dpkg-maintscript-helper: Use xargs -I argument instead of deprecated -i. + * dpkg-maintscript-helper: Quote variable inside ${} to avoid pattern match. + * libdpkg: Fix dpkg_fsys_get_path() to always strip leading / and ./. + * libdpkg: Set the default database directory relative to the system root. + * dpkg-divert, dpkg-statoverride: Set admindir after instdir. + * update-alternatives: Fix admindir setting. + Prompted by Johannes Schauer Marin Rodrigues . + * dselect: Honor DPKG_ADMINDIR environment variable. + * dpkg-query, dpkg-trigger, dselect: Add support for setting the root + directory. + * dpkg-fsys-usrunmess: Move forced reconfiguration to the last step. + See #991190. + * dpkg-fsys-usrunmess: Install a local policy-rc.d to ignore service + restarts. Closes: #991190 + * dpkg-fsys-usrunmess: Do not fail when removing lingering directories. + * dpkg-fsys-usrunmess: Generate a regression prevention package. + * dpkg-fsys-usrunmess: Fix typo in debug message. + * dpkg: Distinguish deconfiguration message for installation and multi-arch + syncs. + * dpkg-buildpackage: Add new --changes-file option. + Prompted by Niels Thykier . + * dpkg-buildpackage: Add new --buildinfo-file option. + * dpkg: Rework --assert- logic to be more robust. + Prompted by Helmut Grohne . + Prompted by David Kalnischkies . + * dpkg: Improve --assert- descriptions. + * dpkg: Add a new --assert-help option. + * scripts/mk: Pass DEB_BUILD_PATH to dpkg-buildflags. See #985553. + * dpkg-db-backup: New program factored out from Debian-specific daily cron. + * dpkg-db-backup: Accept an option to override the number of rotation cycles. + * dpkg-db-backup: Honor the admindir set at configure time. + * update-alternatives: Fix --auto and --set-selections output progress. + * update-alternatives: Print defaults for configuration and database + pathnames. + * scripts: Replace shebang in dpkg-error shell library with shellcheck + directive. + * dpkg-buildpackage: Add support for terse DEB_BUILD_OPTIONS. + * dpkg-mergechangelogs: Add new --merge-unreleased option. Closes: #582921 + * dpkg: Restore fallback to "new-prerm failed-upgrade" for downgrades. + Analysis by Ian Jackson . Closes: #996959 + * dselect: Use safe temporary file creation in methods setup. + * dselect: Remove bashism from update script in multicd method. + * dpkg: Fix --verify to handle missing or inaccessible pathnames. + Closes: #963087 + * dpkg: Add partial --verify support for mode checks. + * Use «digest» instead of «hash» in output messages. + Reported by Sven Joachim . + * dselect: use `grep -E` instead of `egrep`. + Thanks to Ville Skyttä . Closes: #999600 + * libdpkg: Fix memory leak on End Of Tape condition in tar parser. + * dpkg: Fix short lived memory leak with --recursive. + * dpkg: Fix conffile removal-on-upgrade handling. Closes: #995387 + * dpkg-deb: Fix conffile name length tracking on remove-on-upgrade parsing. + Reported by uau on IRC. + * Architecture support: + - Clarify that the regex columns need to be ordered to match first. + - Add support for ARCv2 CPU. Closes: #980963 + Based on a patch by Alexey Brodkin . + * Portability: + - start-stop-daemon: Define SOCK_NONBLOCK to 0 if not defined. + - libdpkg: Add support for AIX to dpkg_get_progname(). + * Perl modules: + - Dpkg::Source::Quilt: Add hint to check missing files on patch apply + failures. + Reported by Joseph Nahmias . + - Dpkg::Changelog::Parse: Require format plugins to inherit from + Dpkg::Changelog. + - Dpkg::OpenPGP: Refactor openpgp implementation execution into a new + function. + - Dpkg::Vendor::Debian: Refactor compiler flag names into an array. + - Dpkg::Vendor::Debian: Add new lto feature in new optimize area. + Closes: #940571 + - Test::Dpkg: Print actual error messages in test_neutralize_checksums(). + - Dpkg::Deps: Use current_sub feature for __SUB__. + - Dpkg::BuildFlags: Add support for ASFLAGS. + See https://salsa.debian.org/debian/debhelper/-/merge_requests/50. + - Dpkg::Compression: Use gzip --rsyncable unconditionally. + - Dpkg::Changelog::Entry::Debian: Fix full month misuse warning. + - Dpkg::Shlibs::Symbol: Emit a warning on fully qualified symver patterns. + Closes: #993991 + - Dpkg::Control::HashCore: Add new keep_duplicate option. + - Dpkg::Control::FieldsCore: Add new field_parse_binary_source(). + Closes: #980527 + - Dpkg::Control::FieldsCore: Fix types allowed for + field_parse_binary_source(). + Reported by Johannes Schauer Marin Rodrigues . + - Dpkg::Shlibs::Objdump: Fix apply_relocations to work with versioned + symbols. Closes: #1000421 + - Dpkg::Vendor::Ubuntu: Update Maintainer field logic to include + “canonical”. Based on a patch by + William 'jawn-smith' Wilson . + Closes: #1000557 + - Dpkg::Source::Package::V2: Add hint about version matching source tree. + Based on a patch by Samuel Henrique . + Closes: #996044 + * Documentation: + - man: Itemize dpkg-gensymbols -c levels. + - man: Add man page for deb-md5sums(5). + Reported by Maxim Cournoyer (on IRC). + - man: Switch the Architecture field in deb-control(5) to required. + Reported by Maxim Cournoyer (on IRC). + - man: Make clear that dpkg-query arguments accept multiple values. + Prompted by Rémi Rampin . See #913781. + - man: Document dpkg-query --search and --listfiles output formats. + - doc: Fix incorrect use of ‘an’ article. + - doc: Update coding style to document POD instead of troff. + - doc: Update THANKS file. + - doc: Annotate current maintainer start year. + - doc: Sort maintenance information chronologically. + - man: Add versions since features where introduced. + - man: Further clarify when re-inclusions of excluded pathnames happen. + Closes: #871420 + - doc: Update Doxygen configuration from version 1.9.1. + - doc: Improve description of dpkg suite. + Prompted by Fabrice Bauzac-Stehly . + - man: Add a reference to where the Installed-Size algorithm is described. + - man: Improve dpkg --verify-format rpm format documentation. + - man: Document in deb-substvars(5) what ${} is good for. + Prompted by Paul Wise . + - man: Document in dpkg-architecture(1) target being useful for emulators + too. Prompted by Helmut Grohne . + - man: Document in dpkg-query(1) full --search and --listfiles output + format. Prompted by Johannes Schauer Marin Rodrigues . + * Code internals: + - Remove irrelevant or obsolete FIXME markers. + - Turn FIXME markers denoting pending actions into TODO markers. + - Turn FIXME markers giving historic information into simple Notes. + - update-alternatives: Turn FIXME for explicit behavior choice into an XXX. + - Use localtime_r() instead of localtime(). + - libdpkg: Remove MDEBUG support from m_malloc() implementation. + - libdpkg: Mark dpkg_arch_unmark() arch_remove argument as const. + - libdpkg: Mark treewalk_open() func argument as const. + - dpkg: Mark ignore_depends() pkg argument as const. + - dpkg: Mark deb_parse_conffiles() pkg argument as const. + - libcompat: Remove local setexecfilecon() and require libselinux 2.3. + - libdpkg: Add missing DPKG_{BEGIN,END}_DECLS in header files. + - dpkg: Move SE Linux function declarations into its own header file. + - dpkg: Move the command action enum to its own header file. + - dpkg: Switch from including "main.h" to "force.h". + - dselect: Rename dme() to display_menu_entry(). + - dpkg: Split function handling deconfiguration due to install and removal. + - libdpkg: Add new ACTION_MUX macro for continued options. + - dpkg: Refactor --assert- handling to be data driven. + - dpkg-fsys-usrunmess: Do not use interpolated strings for literals. + - dpkg-db-backup: Add a license header comment. + * Build system: + - Fallback to $^X and 'perl' if $Config{perlpath} is unset or empty. + - Bump minimal Perl version to 5.28.1. + - Remove redundant localedir and pkgconfdir initializations. + - Check for libsocket. + - Do not set have_libmd on the found branch in AC_SEARCH_LIBS. + - Switch DPKG_FUNC_C99_SNPRINTF from AC_LANG_SOURCE to AC_LANG_PROGRAM. + - Check whether fsync(3) works on directories. + - Remove obsolete AC_HEADER_STDC. + - Detect appropriate sed program at configure time. + - Rename DPKG_DEB_PROG_TAR to DPKG_PROG_TAR. + - Parametrize the backups directory with a configure option. + - Add a check for symlinks in the git repository. + - Rename shell scripts to .sh. + - Switch from hardcoded /run to parametrized runstatedir. + - Use new Dpkg::Control keep_duplicate option in gen-changelog. + - Use title-case for field in gen-changelog. + - Execute run-script via CONFIG_SHELL. + Reported by Larkin Nickle . + - Quote variables containing pathnames in m4 macros. + - Add support for commit message fix up machinery in gen-changelog. + * Packaging: + - Use absolute pathnames in .install debhelper fragments. + - Remove unused dh_installcron call for arch-indep targets. + - Add support for a native systemd timer. Closes: #985444 + - Create auotpkgtest installation directory. + - Bump Standards-Version to 4.6.0 (no changes needed). + * Test suite: + - Pass --ignore-builtin-builddeps to dpkg-buildpackage. + - Use can_run() instead of find_command(). + - Add descriptions to makefile test runners. + - Add unit tests for architecture bijective mapping property. + - Suppress cppcheck constParameter check. + - Suppress bogus cppcheck for nullPointerRedundantCheck. + - Mark external sourced shell files for checking. + - Ignore new shellcheck checks. + - Remove shipped dpkg database. + - Add re-inclusion of symlink case to t-filtering. See #871420. + - Generate symlink during test build time. + - Remove superfluous long filename. + - Refactor parse_ctrl() from parse_dsc(). + - Update codespell stopwords. + + [ Helge Kreutzmann ] + * deb-md5sums.pod: Fix typo. + + [ Add programs translations ] + * Occitan (Quentin PAGÈS). + + [ Update dselect translations ] + * German (Sven Joachim). + + [ Update man pages translations ] + * German (Helge Kreutzmann). + + [ Update programs translations ] + * German (Sven Joachim). + * Polish (Marcin Owsiany, Łukasz Dulny). + + [ Update scripts translations ] + * German (Helge Kreutzmann). + ------------------------------------------------------------------- Thu Jun 10 10:36:50 UTC 2021 - Adam Majer diff --git a/dpkg.spec b/dpkg.spec index 670aaf2..5549d45 100644 --- a/dpkg.spec +++ b/dpkg.spec @@ -17,13 +17,13 @@ Name: dpkg -Version: 1.20.9 +Version: 1.21.1 Release: 0 Summary: Debian package management system License: GPL-2.0-or-later Group: System/Packages -URL: http://www.debian.org -Source0: http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.xz +URL: https://tracker.debian.org/pkg/%{name} +Source0: https://ftp.debian.org/debian/pool/main/d/dpkg/%{name}_%{version}.tar.xz Source3: sensible-editor # PATCH-FIX-OPENSUSE replace debian with opensuse. replace macros. update-alternatives temp directories' path and name from dpkg* to rpm*. Patch1: update-alternatives-suse.patch @@ -93,7 +93,7 @@ Libraries and header files for dpkg. %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects autoreconf -fvi -export CFLAGS="%{optflags}" +export CFLAGS="%{?build_cflags:%build_cflags}%{?!build_cflags:%optflags}" %configure \ --disable-silent-rules \ --with-libselinux \ @@ -119,7 +119,7 @@ export CFLAGS="%{optflags}" %endif sed -i 's/^#define ARCHITECTURE ""/#define ARCHITECTURE "%{debarch}"/' config.h -make %{?_smp_mflags} +%make_build %install %make_install @@ -143,7 +143,7 @@ cat dselect.lang dpkg-dev.lang >> %{name}.lang install -m 755 %{SOURCE3} %{buildroot}%{_bindir} %check -make %{?_smp_mflags} check +%make_build check %post cd %{_localstatedir}/lib/dpkg @@ -168,6 +168,9 @@ exit 0 %{_sbindir}/* %{_libexecdir}/dpkg %{_datadir}/dpkg +%dir %{_datadir}/zsh +%dir %{_datadir}/zsh/vendor-completions +%{_datadir}/zsh/vendor-completions/_dpkg-parsechangelog %{_localstatedir}/lib/dpkg %{perl_vendorlib}/Dpkg %{perl_vendorlib}/Dpkg.pm diff --git a/dpkg_1.20.9.tar.xz b/dpkg_1.20.9.tar.xz deleted file mode 100644 index 17cad2f..0000000 --- a/dpkg_1.20.9.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ce242830f213b5620f08e6c4183adb1ef4dc9da28d31988a27c87c71fe534ce -size 4954428 diff --git a/dpkg_1.21.1.tar.xz b/dpkg_1.21.1.tar.xz new file mode 100644 index 0000000..9d1b02d --- /dev/null +++ b/dpkg_1.21.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1eb9fd5228b3199284ea5134904bb45b7a5bc12fb044b8e4964d89d2e5bbb563 +size 4986936 diff --git a/drop-tar-option.patch b/drop-tar-option.patch index 10905ec..3bd8c32 100644 --- a/drop-tar-option.patch +++ b/drop-tar-option.patch @@ -1,7 +1,17 @@ -diff -ruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-dpkg-1.18.23/scripts/Dpkg/Source/Archive.pm ./scripts/Dpkg/Source/Archive.pm ---- ../orig-dpkg-1.18.23/scripts/Dpkg/Source/Archive.pm 2017-02-22 22:50:39.000000000 +0100 -+++ ./scripts/Dpkg/Source/Archive.pm 2017-12-09 09:59:34.985938649 +0100 -@@ -51,8 +51,8 @@ +From d0bcdce521f648c0a18bea795edfcb4f5ec77388 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= +Date: Mon, 3 Jan 2022 13:18:13 +0100 +Subject: [PATCH 1/4] drop tar option + +--- + scripts/Dpkg/Source/Archive.pm | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/scripts/Dpkg/Source/Archive.pm b/scripts/Dpkg/Source/Archive.pm +index 33c181b20..0cf545cb4 100644 +--- a/scripts/Dpkg/Source/Archive.pm ++++ b/scripts/Dpkg/Source/Archive.pm +@@ -51,8 +51,8 @@ sub create { my $mtime = $opts{source_date} // $ENV{SOURCE_DATE_EPOCH} || time; # Call tar creation process $spawn_opts{delete_env} = [ 'TAR_OPTIONS' ]; @@ -12,3 +22,6 @@ diff -ruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache '--numeric-owner', '--owner=0', '--group=0', @{$opts{options}}, '-T', '-' ]; *$self->{pid} = spawn(%spawn_opts); +-- +2.33.1 + diff --git a/ncurses-fix.patch b/ncurses-fix.patch index c2b523e..6357255 100644 --- a/ncurses-fix.patch +++ b/ncurses-fix.patch @@ -1,5 +1,14 @@ +From 9b94694e59fa442b96ddf30a33782647cdda9b70 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= +Date: Mon, 3 Jan 2022 13:18:35 +0100 +Subject: [PATCH 2/4] ncurses fix + +--- + dselect/keyoverride | 1 + + 1 file changed, 1 insertion(+) + diff --git a/dselect/keyoverride b/dselect/keyoverride -index 35967ff..91a8c0c 100644 +index 35967ffec..91a8c0cec 100644 --- a/dselect/keyoverride +++ b/dselect/keyoverride @@ -56,3 +56,4 @@ KEY_SRIGHT Shift Right @@ -7,3 +16,6 @@ index 35967ff..91a8c0c 100644 KEY_MAX [elide] KEY_MIN [elide] +KEY_EVENT [elide] +-- +2.33.1 + diff --git a/update-alternatives-slavetomaster.patch b/update-alternatives-slavetomaster.patch index aaf40b4..7110ad1 100644 --- a/update-alternatives-slavetomaster.patch +++ b/update-alternatives-slavetomaster.patch @@ -1,8 +1,17 @@ -Index: dpkg-1.19.0.5/utils/update-alternatives.c -=================================================================== ---- dpkg-1.19.0.5.orig/utils/update-alternatives.c -+++ dpkg-1.19.0.5/utils/update-alternatives.c -@@ -1796,7 +1796,10 @@ alternative_prepare_install(struct alter +From 472d6aad992b2d459c31449ff7d36e20a76e4adf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= +Date: Mon, 3 Jan 2022 13:19:13 +0100 +Subject: [PATCH 4/4] update-alternatives-slavetomaster + +--- + utils/update-alternatives.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/utils/update-alternatives.c b/utils/update-alternatives.c +index eee59d590..41fdce430 100644 +--- a/utils/update-alternatives.c ++++ b/utils/update-alternatives.c +@@ -2035,7 +2035,10 @@ alternative_prepare_install(struct alternative *a, const char *choice) /* Drop unused slave. */ fn = xasprintf("%s/%s", altdir, sl->name); if (alternative_path_can_remove(sl->link)) @@ -14,3 +23,6 @@ Index: dpkg-1.19.0.5/utils/update-alternatives.c else warning(_("not removing %s since it's not a symlink"), sl->link); +-- +2.33.1 + diff --git a/update-alternatives-suse.patch b/update-alternatives-suse.patch index 4c85514..464e9b7 100644 --- a/update-alternatives-suse.patch +++ b/update-alternatives-suse.patch @@ -1,7 +1,20 @@ -diff -Nru dpkg-1.20.9.orig/man/update-alternatives.pod dpkg-1.20.9/man/update-alternatives.pod ---- dpkg-1.20.9.orig/man/update-alternatives.pod 2021-01-30 07:09:02.000000000 +0100 -+++ dpkg-1.20.9/man/update-alternatives.pod 2021-04-28 11:43:20.093959620 +0200 -@@ -37,7 +37,7 @@ +From 8cad1e2d4d20f76383a424aa85ebd3bc3a51487a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= +Date: Mon, 3 Jan 2022 13:19:00 +0100 +Subject: [PATCH 3/4] update-alternatives-suse + +--- + man/update-alternatives.pod | 8 ++++---- + utils/Makefile.am | 10 +++++----- + utils/t/update_alternatives.t | 4 ++-- + utils/update-alternatives.c | 2 +- + 4 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/man/update-alternatives.pod b/man/update-alternatives.pod +index 7f3e0e66f..54e91f26b 100644 +--- a/man/update-alternatives.pod ++++ b/man/update-alternatives.pod +@@ -37,7 +37,7 @@ B B creates, removes, maintains and displays information about the symbolic @@ -10,7 +23,7 @@ diff -Nru dpkg-1.20.9.orig/man/update-alternatives.pod dpkg-1.20.9/man/update-al It is possible for several programs fulfilling the same or similar functions to be installed on a single system at the same time. -@@ -47,7 +47,7 @@ +@@ -47,7 +47,7 @@ different editor, if desired, but makes it difficult for a program to make a good choice for an editor to invoke if the user has not specified a particular preference. @@ -19,7 +32,7 @@ diff -Nru dpkg-1.20.9.orig/man/update-alternatives.pod dpkg-1.20.9/man/update-al A generic name in the filesystem is shared by all files providing interchangeable functionality. The alternatives system and the system administrator -@@ -85,8 +85,8 @@ +@@ -85,8 +85,8 @@ installed, changed or removed, B is called to update information about that file in the alternatives system. B @@ -30,10 +43,11 @@ diff -Nru dpkg-1.20.9.orig/man/update-alternatives.pod dpkg-1.20.9/man/update-al (configure) to install the alternative and from B and B (remove) to remove the alternative. -diff -Nru dpkg-1.20.9.orig/utils/Makefile.am dpkg-1.20.9/utils/Makefile.am ---- dpkg-1.20.9.orig/utils/Makefile.am 2021-01-30 07:09:02.000000000 +0100 -+++ dpkg-1.20.9/utils/Makefile.am 2021-04-28 11:44:41.674722417 +0200 -@@ -45,8 +45,8 @@ +diff --git a/utils/Makefile.am b/utils/Makefile.am +index a86cba32b..d19007073 100644 +--- a/utils/Makefile.am ++++ b/utils/Makefile.am +@@ -45,8 +45,8 @@ update_alternatives_SOURCES = \ update_alternatives_CPPFLAGS = \ -DALT_TMP_EXT=\".dpkg-tmp\" \ @@ -44,19 +58,39 @@ diff -Nru dpkg-1.20.9.orig/utils/Makefile.am dpkg-1.20.9/utils/Makefile.am $(AM_CPPFLAGS) update_alternatives_LDADD = \ -@@ -79,7 +79,7 @@ - uninstall-local: +@@ -81,9 +81,9 @@ uninstall-local: rm -f $(DESTDIR)$(sysconfdir)/alternatives/README --TEST_ENV_VARS = DPKG_DATADIR=$(top_srcdir)/data -+TEST_ENV_VARS = RPM_DATADIR=$(top_srcdir)/data + TEST_ENV_VARS = \ +- DPKG_DATADIR=$(top_srcdir)/data \ +- UA_ROOTDIR_ENVVAR=DPKG_ROOT \ +- UA_ADMINDIR_ENVVAR=DPKG_ADMINDIR \ ++ RPM_DATADIR=$(top_srcdir)/data \ ++ UA_ROOTDIR_ENVVAR=RPM_ROOT \ ++ UA_ADMINDIR_ENVVAR=RPM_ADMINDIR \ + UA_ADMINDIR_DEFAULT=$(admindir) \ + # EOL - test_tmpdir = t.tmp - test_scripts = \ -diff -Nru dpkg-1.20.9.orig/utils/update-alternatives.c dpkg-1.20.9/utils/update-alternatives.c ---- dpkg-1.20.9.orig/utils/update-alternatives.c 2021-03-02 03:15:25.000000000 +0100 -+++ dpkg-1.20.9/utils/update-alternatives.c 2021-04-28 11:43:44.998192415 +0200 -@@ -115,7 +115,7 @@ +diff --git a/utils/t/update_alternatives.t b/utils/t/update_alternatives.t +index a4885dda9..a0959e5d9 100644 +--- a/utils/t/update_alternatives.t ++++ b/utils/t/update_alternatives.t +@@ -32,8 +32,8 @@ my $bindir = File::Spec->rel2abs("$tmpdir/bin"); + my @ua = ("$ENV{builddir}/update-alternatives", '--log', '/dev/null', + '--quiet', '--admindir', "$admindir", '--altdir', "$altdir"); + +-my $rootdir_envvar = $ENV{UA_ROOTDIR_ENVVAR} // 'DPKG_ROOT'; +-my $admindir_envvar = $ENV{UA_ADMINDIR_ENVVAR} // 'DPKG_ADMINDIR'; ++my $rootdir_envvar = $ENV{UA_ROOTDIR_ENVVAR} // 'RPM_ROOT'; ++my $admindir_envvar = $ENV{UA_ADMINDIR_ENVVAR} // 'RPM_ADMINDIR'; + + delete $ENV{$rootdir_envvar}; + delete $ENV{$admindir_envvar}; +diff --git a/utils/update-alternatives.c b/utils/update-alternatives.c +index 716035876..eee59d590 100644 +--- a/utils/update-alternatives.c ++++ b/utils/update-alternatives.c +@@ -115,7 +115,7 @@ static int opt_force = 0; static void version(void) { @@ -65,3 +99,6 @@ diff -Nru dpkg-1.20.9.orig/utils/update-alternatives.c dpkg-1.20.9/utils/update- printf("\n"); printf(_( +-- +2.33.1 + diff --git a/update-alternatives.changes b/update-alternatives.changes index 7c1e53e..4d70c09 100644 --- a/update-alternatives.changes +++ b/update-alternatives.changes @@ -1,3 +1,246 @@ +------------------------------------------------------------------- +Mon Jan 3 12:15:28 UTC 2022 - Dan Čermák + +- rebase patches: + * update-alternatives.changes + * update-alternatives.spec + * update-alternatives-suse.patch + +- New upstream release 1.21.1 + +dpkg (1.21.1) unstable; urgency=medium + + [ Guillem Jover ] + * dpkg-buildpackage: Remove duplicate command print for dpkg-genchanges. + * dpkg-buildpackage: Fix build description due to improper multiline match. + * dpkg-realpath: Remove spurious heading space from --help output. + * update-alternatives: When initializing admindir from DPKG_ADMINDIR append + "/alternatives". Closes: #1001198 + * Code internals: + - Remove inclusions. + * Packaging: + - Install deb-md5sums(5) into dpkg-dev package. + +dpkg (1.21.0) unstable; urgency=medium + + [ Guillem Jover ] + * dpkg-genchanges: Include orig tarball on source package renames. + Closes: #980066 + * scripts: Consider SHA-1 and RIPEMD-160 weak algorithms in OpenPGP + signatures. + * dpkg: During unpack print a removal message due to Conflicts. + Closes: #985401 + * scripts: Add zsh completions for dpkg-parsechangelog. + Thanks to Daniel Shahaf . Closes: #986103 + * dpkg-buildpackage: When printing build type match the extension exactly. + Closes: #989824 + * dpkg-maintscript-helper: Use xargs -I argument instead of deprecated -i. + * dpkg-maintscript-helper: Quote variable inside ${} to avoid pattern match. + * libdpkg: Fix dpkg_fsys_get_path() to always strip leading / and ./. + * libdpkg: Set the default database directory relative to the system root. + * dpkg-divert, dpkg-statoverride: Set admindir after instdir. + * update-alternatives: Fix admindir setting. + Prompted by Johannes Schauer Marin Rodrigues . + * dselect: Honor DPKG_ADMINDIR environment variable. + * dpkg-query, dpkg-trigger, dselect: Add support for setting the root + directory. + * dpkg-fsys-usrunmess: Move forced reconfiguration to the last step. + See #991190. + * dpkg-fsys-usrunmess: Install a local policy-rc.d to ignore service + restarts. Closes: #991190 + * dpkg-fsys-usrunmess: Do not fail when removing lingering directories. + * dpkg-fsys-usrunmess: Generate a regression prevention package. + * dpkg-fsys-usrunmess: Fix typo in debug message. + * dpkg: Distinguish deconfiguration message for installation and multi-arch + syncs. + * dpkg-buildpackage: Add new --changes-file option. + Prompted by Niels Thykier . + * dpkg-buildpackage: Add new --buildinfo-file option. + * dpkg: Rework --assert- logic to be more robust. + Prompted by Helmut Grohne . + Prompted by David Kalnischkies . + * dpkg: Improve --assert- descriptions. + * dpkg: Add a new --assert-help option. + * scripts/mk: Pass DEB_BUILD_PATH to dpkg-buildflags. See #985553. + * dpkg-db-backup: New program factored out from Debian-specific daily cron. + * dpkg-db-backup: Accept an option to override the number of rotation cycles. + * dpkg-db-backup: Honor the admindir set at configure time. + * update-alternatives: Fix --auto and --set-selections output progress. + * update-alternatives: Print defaults for configuration and database + pathnames. + * scripts: Replace shebang in dpkg-error shell library with shellcheck + directive. + * dpkg-buildpackage: Add support for terse DEB_BUILD_OPTIONS. + * dpkg-mergechangelogs: Add new --merge-unreleased option. Closes: #582921 + * dpkg: Restore fallback to "new-prerm failed-upgrade" for downgrades. + Analysis by Ian Jackson . Closes: #996959 + * dselect: Use safe temporary file creation in methods setup. + * dselect: Remove bashism from update script in multicd method. + * dpkg: Fix --verify to handle missing or inaccessible pathnames. + Closes: #963087 + * dpkg: Add partial --verify support for mode checks. + * Use «digest» instead of «hash» in output messages. + Reported by Sven Joachim . + * dselect: use `grep -E` instead of `egrep`. + Thanks to Ville Skyttä . Closes: #999600 + * libdpkg: Fix memory leak on End Of Tape condition in tar parser. + * dpkg: Fix short lived memory leak with --recursive. + * dpkg: Fix conffile removal-on-upgrade handling. Closes: #995387 + * dpkg-deb: Fix conffile name length tracking on remove-on-upgrade parsing. + Reported by uau on IRC. + * Architecture support: + - Clarify that the regex columns need to be ordered to match first. + - Add support for ARCv2 CPU. Closes: #980963 + Based on a patch by Alexey Brodkin . + * Portability: + - start-stop-daemon: Define SOCK_NONBLOCK to 0 if not defined. + - libdpkg: Add support for AIX to dpkg_get_progname(). + * Perl modules: + - Dpkg::Source::Quilt: Add hint to check missing files on patch apply + failures. + Reported by Joseph Nahmias . + - Dpkg::Changelog::Parse: Require format plugins to inherit from + Dpkg::Changelog. + - Dpkg::OpenPGP: Refactor openpgp implementation execution into a new + function. + - Dpkg::Vendor::Debian: Refactor compiler flag names into an array. + - Dpkg::Vendor::Debian: Add new lto feature in new optimize area. + Closes: #940571 + - Test::Dpkg: Print actual error messages in test_neutralize_checksums(). + - Dpkg::Deps: Use current_sub feature for __SUB__. + - Dpkg::BuildFlags: Add support for ASFLAGS. + See https://salsa.debian.org/debian/debhelper/-/merge_requests/50. + - Dpkg::Compression: Use gzip --rsyncable unconditionally. + - Dpkg::Changelog::Entry::Debian: Fix full month misuse warning. + - Dpkg::Shlibs::Symbol: Emit a warning on fully qualified symver patterns. + Closes: #993991 + - Dpkg::Control::HashCore: Add new keep_duplicate option. + - Dpkg::Control::FieldsCore: Add new field_parse_binary_source(). + Closes: #980527 + - Dpkg::Control::FieldsCore: Fix types allowed for + field_parse_binary_source(). + Reported by Johannes Schauer Marin Rodrigues . + - Dpkg::Shlibs::Objdump: Fix apply_relocations to work with versioned + symbols. Closes: #1000421 + - Dpkg::Vendor::Ubuntu: Update Maintainer field logic to include + “canonical”. Based on a patch by + William 'jawn-smith' Wilson . + Closes: #1000557 + - Dpkg::Source::Package::V2: Add hint about version matching source tree. + Based on a patch by Samuel Henrique . + Closes: #996044 + * Documentation: + - man: Itemize dpkg-gensymbols -c levels. + - man: Add man page for deb-md5sums(5). + Reported by Maxim Cournoyer (on IRC). + - man: Switch the Architecture field in deb-control(5) to required. + Reported by Maxim Cournoyer (on IRC). + - man: Make clear that dpkg-query arguments accept multiple values. + Prompted by Rémi Rampin . See #913781. + - man: Document dpkg-query --search and --listfiles output formats. + - doc: Fix incorrect use of ‘an’ article. + - doc: Update coding style to document POD instead of troff. + - doc: Update THANKS file. + - doc: Annotate current maintainer start year. + - doc: Sort maintenance information chronologically. + - man: Add versions since features where introduced. + - man: Further clarify when re-inclusions of excluded pathnames happen. + Closes: #871420 + - doc: Update Doxygen configuration from version 1.9.1. + - doc: Improve description of dpkg suite. + Prompted by Fabrice Bauzac-Stehly . + - man: Add a reference to where the Installed-Size algorithm is described. + - man: Improve dpkg --verify-format rpm format documentation. + - man: Document in deb-substvars(5) what ${} is good for. + Prompted by Paul Wise . + - man: Document in dpkg-architecture(1) target being useful for emulators + too. Prompted by Helmut Grohne . + - man: Document in dpkg-query(1) full --search and --listfiles output + format. Prompted by Johannes Schauer Marin Rodrigues . + * Code internals: + - Remove irrelevant or obsolete FIXME markers. + - Turn FIXME markers denoting pending actions into TODO markers. + - Turn FIXME markers giving historic information into simple Notes. + - update-alternatives: Turn FIXME for explicit behavior choice into an XXX. + - Use localtime_r() instead of localtime(). + - libdpkg: Remove MDEBUG support from m_malloc() implementation. + - libdpkg: Mark dpkg_arch_unmark() arch_remove argument as const. + - libdpkg: Mark treewalk_open() func argument as const. + - dpkg: Mark ignore_depends() pkg argument as const. + - dpkg: Mark deb_parse_conffiles() pkg argument as const. + - libcompat: Remove local setexecfilecon() and require libselinux 2.3. + - libdpkg: Add missing DPKG_{BEGIN,END}_DECLS in header files. + - dpkg: Move SE Linux function declarations into its own header file. + - dpkg: Move the command action enum to its own header file. + - dpkg: Switch from including "main.h" to "force.h". + - dselect: Rename dme() to display_menu_entry(). + - dpkg: Split function handling deconfiguration due to install and removal. + - libdpkg: Add new ACTION_MUX macro for continued options. + - dpkg: Refactor --assert- handling to be data driven. + - dpkg-fsys-usrunmess: Do not use interpolated strings for literals. + - dpkg-db-backup: Add a license header comment. + * Build system: + - Fallback to $^X and 'perl' if $Config{perlpath} is unset or empty. + - Bump minimal Perl version to 5.28.1. + - Remove redundant localedir and pkgconfdir initializations. + - Check for libsocket. + - Do not set have_libmd on the found branch in AC_SEARCH_LIBS. + - Switch DPKG_FUNC_C99_SNPRINTF from AC_LANG_SOURCE to AC_LANG_PROGRAM. + - Check whether fsync(3) works on directories. + - Remove obsolete AC_HEADER_STDC. + - Detect appropriate sed program at configure time. + - Rename DPKG_DEB_PROG_TAR to DPKG_PROG_TAR. + - Parametrize the backups directory with a configure option. + - Add a check for symlinks in the git repository. + - Rename shell scripts to .sh. + - Switch from hardcoded /run to parametrized runstatedir. + - Use new Dpkg::Control keep_duplicate option in gen-changelog. + - Use title-case for field in gen-changelog. + - Execute run-script via CONFIG_SHELL. + Reported by Larkin Nickle . + - Quote variables containing pathnames in m4 macros. + - Add support for commit message fix up machinery in gen-changelog. + * Packaging: + - Use absolute pathnames in .install debhelper fragments. + - Remove unused dh_installcron call for arch-indep targets. + - Add support for a native systemd timer. Closes: #985444 + - Create auotpkgtest installation directory. + - Bump Standards-Version to 4.6.0 (no changes needed). + * Test suite: + - Pass --ignore-builtin-builddeps to dpkg-buildpackage. + - Use can_run() instead of find_command(). + - Add descriptions to makefile test runners. + - Add unit tests for architecture bijective mapping property. + - Suppress cppcheck constParameter check. + - Suppress bogus cppcheck for nullPointerRedundantCheck. + - Mark external sourced shell files for checking. + - Ignore new shellcheck checks. + - Remove shipped dpkg database. + - Add re-inclusion of symlink case to t-filtering. See #871420. + - Generate symlink during test build time. + - Remove superfluous long filename. + - Refactor parse_ctrl() from parse_dsc(). + - Update codespell stopwords. + + [ Helge Kreutzmann ] + * deb-md5sums.pod: Fix typo. + + [ Add programs translations ] + * Occitan (Quentin PAGÈS). + + [ Update dselect translations ] + * German (Sven Joachim). + + [ Update man pages translations ] + * German (Helge Kreutzmann). + + [ Update programs translations ] + * German (Sven Joachim). + * Polish (Marcin Owsiany, Łukasz Dulny). + + [ Update scripts translations ] + * German (Helge Kreutzmann). + ------------------------------------------------------------------- Thu Apr 29 08:28:48 UTC 2021 - John Paul Adrian Glaubitz diff --git a/update-alternatives.spec b/update-alternatives.spec index 9769e55..ed8ec74 100644 --- a/update-alternatives.spec +++ b/update-alternatives.spec @@ -17,13 +17,13 @@ Name: update-alternatives -Version: 1.20.9 +Version: 1.21.1 Release: 0 Summary: Maintain symbolic links determining default commands License: GPL-2.0-or-later Group: System/Management -URL: http://ftp.de.debian.org/debian/pool/main/d/dpkg/ -Source0: http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.xz +URL: https://tracker.debian.org/pkg/dpkg/ +Source0: https://ftp.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.xz Source3: sensible-editor Patch0: update-alternatives-suse.patch Patch1: update-alternatives-slavetomaster.patch