Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dpkg for openSUSE:Factory checked in at 2021-06-18 10:13:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dpkg (Old) and /work/SRC/openSUSE:Factory/.dpkg.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dpkg" Fri Jun 18 10:13:09 2021 rev:33 rq:899017 version:1.20.9 Changes: -------- --- /work/SRC/openSUSE:Factory/dpkg/dpkg.changes 2021-05-12 19:31:35.319192352 +0200 +++ /work/SRC/openSUSE:Factory/.dpkg.new.2625/dpkg.changes 2021-06-18 10:13:10.265945455 +0200 @@ -1,0 +2,1456 @@ +Thu Jun 10 10:36:50 UTC 2021 - Adam Majer <[email protected]> + +- do not include update-alternative manpages in dpkg +- use-clamp-from-C-STD-library.patch: removed, upstreamed + +------------------------------------------------------------------- +Thu Apr 29 08:28:48 UTC 2021 - John Paul Adrian Glaubitz <[email protected]> + +- Refresh patches for new version + * update-alternatives-suse.patch +- Set minimum version for po4a to 0.59 in BuildRequires +- Update file list in %files section +- Version update to 1.20.9 (boo#1181867) + [ Guillem Jover ] + * Test suite: + - Pass --ignore-builtin-builddeps to dpkg-buildpackage. +- from version 1.20.8 + [ Guillem Jover ] + * start-stop-daemon: Open the --output file in append mode. + * dpkg: Fix --auto-deconfigure for essential and protected during + installation. Reported by Julian Andres Klode <[email protected]>. + See #983014. + * dpkg-realpath: Fix resolution for absolute symlinks on ??/??. + Closes: #983855 + * dpkg-realpath: Fix symlink loop tracker. + * Perl modules: + - Test::Dpkg: Fix test data path fetching on CPAN. + - Dpkg::Exit: Preserve exit code in END block. + * Build system: + - Group Test::Dpkg changelog entries into ???Perl modules??? section. + * Packaging: + - Run autopkgtest test suites in verbose mode. + * Test suite: + - Set PERL in the perl test suite. + - Use gunzip instead of zcat and assume it might not be present. + - Mock dpkg and gcc for architecture detection code. + - Initialize DEB_BUILD_ARCH and DEB_HOST_ARCH to avoid computing them. + - Update suppressions for cppcheck 2.4. + [ Update man pages translations ] + * Dutch (Frans Spiesschaert). Closes: #981884 + * German (Helge Kreutzmann). + * Portuguese (Am??rico Monteiro). Closes: #980018 + [ Update programs translations ] + * Dutch (Frans Spiesschaert). Closes: #981882 + [ Update scripts translations ] + * German (Helge Kreutzmann). Closes: #983865 +- from version 1.20.7 + [ Guillem Jover ] + * libdpkg: Do not consider the database locked with a missing lock file. + Reported by David Kalnischkies <[email protected]>. + * Documentation: + - man: Clarify and expand information on dpkg-realpath(1) man page. + Closes: #979564 + * Packaging: + - Update copyright notices in debian/copyright. + - Bump Standards-Version to 4.5.1 (no changes required). + * Test suite: + - On as-root mode do not use sudo if already running as root. + - Print WARN instead of FAIL for maintscript fd leaks. + [ Update man pages translations ] + * German (Helge Kreutzmann). + [ Update programs translations ] + * German (Sven Joachim). +- from version 1.20.6 + [ Guillem Jover ] + * libdpkg: Fix undefined behavior in varbuf functions. + Reported by KOLANICH <[email protected]>. + * libdpkg: Fix memory leaks in tar_extractor(). + * libdpkg: Fix memory leak in trigger deferred processing. + Reported by KOLANICH <[email protected]>. + * libdpkg: Fix memory leak in filesystem treewalk node free function. + * libdpkg: Fix memory leak in filesystem treewalk iterator. + * libdpkg: Fix single-instance memory leak with fsys dir. + * libdpkg: Fix short-lived memory leaks. + * libdpkg: Reset error context errmsg after free(). + * dpkg: Fix memory leak for cidir. + Reported by KOLANICH <[email protected]>. + * dpkg: Fix short-lived memory leak in --force-help output. + Based on a patch by KOLANICH <[email protected]>. + * dpkg-deb: Fix single-instance memory leak on missing conffiles control + file. + * dpkg-divert: Fix short-lived memory leaks. + * dpkg-realpath: Add new -z, --zero option. + Requested by Johannes Schauer <[email protected]>. + * dpkg-deb: Make decompression error message more descriptive. + Closes: #968442 + * dpkg-architecture: Add a --print-format option. + Prompted by #968963. + * dpkg-buildpackage: Warn on known R?? values in uppercase. + Reported by Niels Thykier <[email protected]>. + * dpkg-buildpackage: Error out on R?? "yes" value. + Requested by Niels Thykier <[email protected]>. + * dpkg-buildpackage: Clarify R?? keyword diagnostic messages. + * dpkg-deb, dpkg-split: Fix time handling to support 64-bit time. + * libdpkg: Check that the ar archive time is within bounds. + * libdpkg: Ignore not-installed packages for source related virtual fields. + Closes: #972580 + * libdpkg: Make source version parsing more robust on missing data. + See #972580. + * libdpkg: Do not forget not-installed packages that are set on hold. + Reported by David Kalnischkies <[email protected]>. + * update-alternatives: Fix memory leaks for alternative database context on + load errors. + * update-alternatives: Fix short-lived memory leaks for alternative structs. + * update-alternatives: Fix memory leaks with new_choice. + * update-alternatives: Fix short-lived memory leaks for log_file and admdir. + * dpkg-buildflags: Add support for DFLAGS. Closes: #975896 + * dpkg-parsechanaglog: Document --file in --help output. + * libdpkg: Fix allocation size wrap around when growing a varbuf. + * dpkg-query: Do not print database loading progress. Closes: #977240 + * Rename taint tag to merged-usr-via-aliased-dirs. + * dpkg-buildflags: Enable reproducible=fixfilepath by default. + Thanks to Vagrant Cascadian <[email protected]>. + See https://lists.debian.org/debian-devel/2020/10/msg00222.html. + Closes: #974087 + * start-stop-daemon: Move umask setup before any file has been created. + * start-stop-daemon: Add a new --output option to redirect stderr and stdout. + * dpkg-maintscript-helper: Do not pass DPKG_ROOT prefixed pathmames to + dpkg-realpath. + * dpkg: When removing old files check the pathname with diversion and + instdir. + * dpkg-realpath: Make 'link includes root prefix' error more verbose. + * libdpkg: Make sure we do not walk on rootless trees. + * dpkg: Fix incorrect logic around printing dependency warnings. + Thanks to Jessica Clarke <[email protected]>. + Reported by Helmut Grohne <[email protected]>. + * Support remove-on-upgrade conffile flag via DEBIAN/conffiles. + Based on a patch by Niels Thykier <[email protected]>. Closes: #822462 + * dpkg-fsys-usrunmess: New program. + * Perl modules: + - Dpkg::Index: Add new item_opts option. + - Dpkg::Exit: Fix exit handler on program termination. Closes: #966083 + - Dpkg::Changelog::Entry::Debian: Fix format string. + Prompted by #967911. + - Dpkg::Changelog::Parse: Add new verbose option. + Prompted by #967911. + - Dpkg::Changelog::Parse: Document 'label' option. + - Dpkg::Source::Package::V1: Print a message when verifying tarball + signatures. + - Dpkg::Path: Fix pathname traversal check for symlinks. Closes: #971203 + - Dpkg::Source::Package: Honor no_check for directory traversal checks. + See #971203. + - Dpkg::Source::Package: Call syserr() instead of syserror(). + Reported by Drew Parsons <[email protected]>. + See #849752. Closes: #976249 + - Dpkg::Path: Check first whether the files are the same by comparing + string-wise. Closes: #849752 + - Dpkg::OpenPGP: Refactor gpg armor code into its own function. + * Documentation: + - man: Fix typo in --print-unset option reference. + Reported by Ferenc W??gner <[email protected]>. Closes: #966110 + - man: Clarify that dpkg-architecture uses some of its own variables. + Closes: #966111 + - man: Fix casing and namespacing in VARIABLES definitions. + - man: Fix typo in dpkg-source(1). + Thanks to Paul Wise <[email protected]>. + - man: Add a reference to deb-symbols(5) in deb-src-symbols(5) DESCRIPTION. + Prompted by #970083. + - man: Specify that symbol, version and id are separated by a single + whitespace. Closes: #970083 + - man: Clarify day-of-month format in deb-changelog(5). + Reported by Axel Beckert <[email protected]>. + See #971977. + - man: Update update-alternatives maintainer script usage information. + Prompted by Niels Thykier <[email protected]>. + - man: Switch to use L<> markup for URLs instead of B<>. + - doc, man: Clarify that R?? values are case sensitive. + Prompted by Niels Thykier <[email protected]>. + - man: Add references to deb822(5) to file formats based on it. + Prompted by Niels Thykier <[email protected]>. + - man: Clarify config-files state in dpkg(1). + Prompted by Stuart Prescott <[email protected]>. + - man: Fix typos. + - man: Hyphenate multiple words in deb-override(5) format description. + - man: Uppercase acronyms and logic operators. + - man: Empty or whitespace-only lines in deb-conffiles(5) are not accepted. + * Code internals: + - libcompat, dpkg: Stop using deprecated security_context_t data type. + - update-alternatives: Refactor alternative database context freeing into a + new function. + - libdpkg: Do not define the clamp macro when compiling C++ code. + Reported by Helmut Grohne <[email protected]>. + - libdpkg: Replace FSF address by pointing to the gnu.org URL. + - libdpkg: Initialize pkgbin's newhash to NULL. + Prompted by Steinar H. Gunderson <[email protected]>. + - libdpkg: Use memset() instead of open-coding struct blanking. + Prompted by Steinar H. Gunderson <[email protected]>. + - Do not call fsys_hash_init() before command actions. + Prompted by Steinar H. Gunderson <[email protected]>. + - libdpkg: Fix m_pipe() function definition prototype to match declaration. + - libdpkg: Refactor new str_rtrim_spaces(). + Based on a patch by Niels Thykier <[email protected]>. + - dpkg: Call fsys_hash_find_node() outside tar_fsys_namenode_queue_push(). + - Use a conffilename variable to track the actual conffile name in the + buffer. + Thanks to Niels Thykier <[email protected]>. + * Build system: ++++ 1259 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/dpkg/dpkg.changes ++++ and /work/SRC/openSUSE:Factory/.dpkg.new.2625/dpkg.changes --- /work/SRC/openSUSE:Factory/dpkg/update-alternatives.changes 2021-02-08 11:47:09.993684639 +0100 +++ /work/SRC/openSUSE:Factory/.dpkg.new.2625/update-alternatives.changes 2021-06-18 10:13:10.377945603 +0200 @@ -1,0 +2,1450 @@ +Thu Apr 29 08:28:48 UTC 2021 - John Paul Adrian Glaubitz <[email protected]> + +- Refresh patches for new version + * update-alternatives-suse.patch +- Set minimum version for po4a to 0.59 in BuildRequires +- Update file list in %files section +- Version update to 1.20.9 (boo#1181867) + [ Guillem Jover ] + * Test suite: + - Pass --ignore-builtin-builddeps to dpkg-buildpackage. +- from version 1.20.8 + [ Guillem Jover ] + * start-stop-daemon: Open the --output file in append mode. + * dpkg: Fix --auto-deconfigure for essential and protected during + installation. Reported by Julian Andres Klode <[email protected]>. + See #983014. + * dpkg-realpath: Fix resolution for absolute symlinks on ??/??. + Closes: #983855 + * dpkg-realpath: Fix symlink loop tracker. + * Perl modules: + - Test::Dpkg: Fix test data path fetching on CPAN. + - Dpkg::Exit: Preserve exit code in END block. + * Build system: + - Group Test::Dpkg changelog entries into ???Perl modules??? section. + * Packaging: + - Run autopkgtest test suites in verbose mode. + * Test suite: + - Set PERL in the perl test suite. + - Use gunzip instead of zcat and assume it might not be present. + - Mock dpkg and gcc for architecture detection code. + - Initialize DEB_BUILD_ARCH and DEB_HOST_ARCH to avoid computing them. + - Update suppressions for cppcheck 2.4. + [ Update man pages translations ] + * Dutch (Frans Spiesschaert). Closes: #981884 + * German (Helge Kreutzmann). + * Portuguese (Am??rico Monteiro). Closes: #980018 + [ Update programs translations ] + * Dutch (Frans Spiesschaert). Closes: #981882 + [ Update scripts translations ] + * German (Helge Kreutzmann). Closes: #983865 +- from version 1.20.7 + [ Guillem Jover ] + * libdpkg: Do not consider the database locked with a missing lock file. + Reported by David Kalnischkies <[email protected]>. + * Documentation: + - man: Clarify and expand information on dpkg-realpath(1) man page. + Closes: #979564 + * Packaging: + - Update copyright notices in debian/copyright. + - Bump Standards-Version to 4.5.1 (no changes required). + * Test suite: + - On as-root mode do not use sudo if already running as root. + - Print WARN instead of FAIL for maintscript fd leaks. + [ Update man pages translations ] + * German (Helge Kreutzmann). + [ Update programs translations ] + * German (Sven Joachim). +- from version 1.20.6 + [ Guillem Jover ] + * libdpkg: Fix undefined behavior in varbuf functions. + Reported by KOLANICH <[email protected]>. + * libdpkg: Fix memory leaks in tar_extractor(). + * libdpkg: Fix memory leak in trigger deferred processing. + Reported by KOLANICH <[email protected]>. + * libdpkg: Fix memory leak in filesystem treewalk node free function. + * libdpkg: Fix memory leak in filesystem treewalk iterator. + * libdpkg: Fix single-instance memory leak with fsys dir. + * libdpkg: Fix short-lived memory leaks. + * libdpkg: Reset error context errmsg after free(). + * dpkg: Fix memory leak for cidir. + Reported by KOLANICH <[email protected]>. + * dpkg: Fix short-lived memory leak in --force-help output. + Based on a patch by KOLANICH <[email protected]>. + * dpkg-deb: Fix single-instance memory leak on missing conffiles control + file. + * dpkg-divert: Fix short-lived memory leaks. + * dpkg-realpath: Add new -z, --zero option. + Requested by Johannes Schauer <[email protected]>. + * dpkg-deb: Make decompression error message more descriptive. + Closes: #968442 + * dpkg-architecture: Add a --print-format option. + Prompted by #968963. + * dpkg-buildpackage: Warn on known R?? values in uppercase. + Reported by Niels Thykier <[email protected]>. + * dpkg-buildpackage: Error out on R?? "yes" value. + Requested by Niels Thykier <[email protected]>. + * dpkg-buildpackage: Clarify R?? keyword diagnostic messages. + * dpkg-deb, dpkg-split: Fix time handling to support 64-bit time. + * libdpkg: Check that the ar archive time is within bounds. + * libdpkg: Ignore not-installed packages for source related virtual fields. + Closes: #972580 + * libdpkg: Make source version parsing more robust on missing data. + See #972580. + * libdpkg: Do not forget not-installed packages that are set on hold. + Reported by David Kalnischkies <[email protected]>. + * update-alternatives: Fix memory leaks for alternative database context on + load errors. + * update-alternatives: Fix short-lived memory leaks for alternative structs. + * update-alternatives: Fix memory leaks with new_choice. + * update-alternatives: Fix short-lived memory leaks for log_file and admdir. + * dpkg-buildflags: Add support for DFLAGS. Closes: #975896 + * dpkg-parsechanaglog: Document --file in --help output. + * libdpkg: Fix allocation size wrap around when growing a varbuf. + * dpkg-query: Do not print database loading progress. Closes: #977240 + * Rename taint tag to merged-usr-via-aliased-dirs. + * dpkg-buildflags: Enable reproducible=fixfilepath by default. + Thanks to Vagrant Cascadian <[email protected]>. + See https://lists.debian.org/debian-devel/2020/10/msg00222.html. + Closes: #974087 + * start-stop-daemon: Move umask setup before any file has been created. + * start-stop-daemon: Add a new --output option to redirect stderr and stdout. + * dpkg-maintscript-helper: Do not pass DPKG_ROOT prefixed pathmames to + dpkg-realpath. + * dpkg: When removing old files check the pathname with diversion and + instdir. + * dpkg-realpath: Make 'link includes root prefix' error more verbose. + * libdpkg: Make sure we do not walk on rootless trees. + * dpkg: Fix incorrect logic around printing dependency warnings. + Thanks to Jessica Clarke <[email protected]>. + Reported by Helmut Grohne <[email protected]>. + * Support remove-on-upgrade conffile flag via DEBIAN/conffiles. + Based on a patch by Niels Thykier <[email protected]>. Closes: #822462 + * dpkg-fsys-usrunmess: New program. + * Perl modules: + - Dpkg::Index: Add new item_opts option. + - Dpkg::Exit: Fix exit handler on program termination. Closes: #966083 + - Dpkg::Changelog::Entry::Debian: Fix format string. + Prompted by #967911. + - Dpkg::Changelog::Parse: Add new verbose option. + Prompted by #967911. + - Dpkg::Changelog::Parse: Document 'label' option. + - Dpkg::Source::Package::V1: Print a message when verifying tarball + signatures. + - Dpkg::Path: Fix pathname traversal check for symlinks. Closes: #971203 + - Dpkg::Source::Package: Honor no_check for directory traversal checks. + See #971203. + - Dpkg::Source::Package: Call syserr() instead of syserror(). + Reported by Drew Parsons <[email protected]>. + See #849752. Closes: #976249 + - Dpkg::Path: Check first whether the files are the same by comparing + string-wise. Closes: #849752 + - Dpkg::OpenPGP: Refactor gpg armor code into its own function. + * Documentation: + - man: Fix typo in --print-unset option reference. + Reported by Ferenc W??gner <[email protected]>. Closes: #966110 + - man: Clarify that dpkg-architecture uses some of its own variables. + Closes: #966111 + - man: Fix casing and namespacing in VARIABLES definitions. + - man: Fix typo in dpkg-source(1). + Thanks to Paul Wise <[email protected]>. + - man: Add a reference to deb-symbols(5) in deb-src-symbols(5) DESCRIPTION. + Prompted by #970083. + - man: Specify that symbol, version and id are separated by a single + whitespace. Closes: #970083 + - man: Clarify day-of-month format in deb-changelog(5). + Reported by Axel Beckert <[email protected]>. + See #971977. + - man: Update update-alternatives maintainer script usage information. + Prompted by Niels Thykier <[email protected]>. + - man: Switch to use L<> markup for URLs instead of B<>. + - doc, man: Clarify that R?? values are case sensitive. + Prompted by Niels Thykier <[email protected]>. + - man: Add references to deb822(5) to file formats based on it. + Prompted by Niels Thykier <[email protected]>. + - man: Clarify config-files state in dpkg(1). + Prompted by Stuart Prescott <[email protected]>. + - man: Fix typos. + - man: Hyphenate multiple words in deb-override(5) format description. + - man: Uppercase acronyms and logic operators. + - man: Empty or whitespace-only lines in deb-conffiles(5) are not accepted. + * Code internals: + - libcompat, dpkg: Stop using deprecated security_context_t data type. + - update-alternatives: Refactor alternative database context freeing into a + new function. + - libdpkg: Do not define the clamp macro when compiling C++ code. + Reported by Helmut Grohne <[email protected]>. + - libdpkg: Replace FSF address by pointing to the gnu.org URL. + - libdpkg: Initialize pkgbin's newhash to NULL. + Prompted by Steinar H. Gunderson <[email protected]>. + - libdpkg: Use memset() instead of open-coding struct blanking. + Prompted by Steinar H. Gunderson <[email protected]>. + - Do not call fsys_hash_init() before command actions. + Prompted by Steinar H. Gunderson <[email protected]>. + - libdpkg: Fix m_pipe() function definition prototype to match declaration. + - libdpkg: Refactor new str_rtrim_spaces(). + Based on a patch by Niels Thykier <[email protected]>. + - dpkg: Call fsys_hash_find_node() outside tar_fsys_namenode_queue_push(). + - Use a conffilename variable to track the actual conffile name in the + buffer. + Thanks to Niels Thykier <[email protected]>. + * Build system: + - Add new gen-changelog tool. + - Pre-process the curses header before parsing it. Closes: #970545 + - Fix variable substitution in man pages. + Reported by Niels Thykier <[email protected]>. Closes: #978983 + - Add a README.cpan to be installed as README in the CPAN distribution. + - Do not try to use <sys/sysctl.h> on GNU/Linux. ++++ 1253 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/dpkg/update-alternatives.changes ++++ and /work/SRC/openSUSE:Factory/.dpkg.new.2625/update-alternatives.changes Old: ---- dpkg_1.19.0.5.tar.xz use-clamp-from-C-STD-library.patch New: ---- dpkg_1.20.9.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dpkg.spec ++++++ --- /var/tmp/diff_new_pack.GAgFJU/_old 2021-06-18 10:13:10.841946216 +0200 +++ /var/tmp/diff_new_pack.GAgFJU/_new 2021-06-18 10:13:10.845946221 +0200 @@ -17,7 +17,7 @@ Name: dpkg -Version: 1.19.0.5 +Version: 1.20.9 Release: 0 Summary: Debian package management system License: GPL-2.0-or-later @@ -30,8 +30,6 @@ # PATCH-FIX-SUSE: tar of Leap 42.{2,3} does not recognize --sort=name, --clamp-mtime options Patch2: drop-tar-option.patch Patch3: ncurses-fix.patch -# PATCH-FIX-OPENSUSE: Use clamp from C++ STD library. -Patch4: use-clamp-from-C-STD-library.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ @@ -41,7 +39,7 @@ BuildRequires: libselinux-devel BuildRequires: libtool BuildRequires: ncurses-devel -BuildRequires: po4a +BuildRequires: po4a >= 0.59 BuildRequires: update-alternatives BuildRequires: xz-devel BuildRequires: zlib-devel @@ -91,7 +89,6 @@ %patch2 -p1 %endif %patch3 -p1 -%patch4 -p1 %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects @@ -163,6 +160,8 @@ %doc ABOUT-NLS AUTHORS doc/triggers.txt NEWS README* THANKS TODO debian/changelog %{_mandir}/man*/* %exclude %{_mandir}/man*/update-alternatives* +%exclude %{_datadir}/doc/dpkg/*.txt +%exclude %{_datadir}/doc/dpkg/README* %dir %{_sysconfdir}/dpkg %config(noreplace) %{_sysconfdir}/dpkg/* %{_bindir}/* @@ -173,9 +172,9 @@ %{perl_vendorlib}/Dpkg %{perl_vendorlib}/Dpkg.pm %{perl_vendorlib}/Dselect -%{perl_vendorlib}/Dselect/Ftp.pm %files devel +%{_datadir}/aclocal/*.m4 %{_libdir}/libdpkg.a %{_libdir}/libdpkg.la %{_libdir}/pkgconfig/libdpkg.pc ++++++ update-alternatives.spec ++++++ --- /var/tmp/diff_new_pack.GAgFJU/_old 2021-06-18 10:13:10.865946248 +0200 +++ /var/tmp/diff_new_pack.GAgFJU/_new 2021-06-18 10:13:10.869946253 +0200 @@ -17,7 +17,7 @@ Name: update-alternatives -Version: 1.19.0.5 +Version: 1.20.9 Release: 0 Summary: Maintain symbolic links determining default commands License: GPL-2.0-or-later ++++++ dpkg_1.19.0.5.tar.xz -> dpkg_1.20.9.tar.xz ++++++ ++++ 881931 lines of diff (skipped) ++++++ update-alternatives-suse.patch ++++++ --- /var/tmp/diff_new_pack.GAgFJU/_old 2021-06-18 10:13:16.245953360 +0200 +++ /var/tmp/diff_new_pack.GAgFJU/_new 2021-06-18 10:13:16.245953360 +0200 @@ -1,43 +1,62 @@ -Index: dpkg-1.18.23/man/update-alternatives.man -=================================================================== ---- dpkg-1.18.23.orig/man/update-alternatives.man -+++ dpkg-1.18.23/man/update-alternatives.man -@@ -34,7 +34,7 @@ update\-alternatives \- maintain symboli - .SH DESCRIPTION - .B update\-alternatives +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 @@ + + B<update-alternatives> creates, removes, maintains and displays information about the symbolic -links comprising the Debian alternatives system. +links comprising the SUSE alternatives system. - .PP + It is possible for several programs fulfilling the same or similar functions to be installed on a single system at the same time. -@@ -44,7 +44,7 @@ different editor, if desired, but makes +@@ -47,7 +47,7 @@ to make a good choice for an editor to invoke if the user has not specified a particular preference. - .PP + -Debian's alternatives system aims to solve this problem. +SUSE's alternatives system aims to solve this problem. A generic name in the filesystem is shared by all files providing interchangeable functionality. The alternatives system and the system administrator -@@ -83,10 +83,10 @@ installed, changed or removed, +@@ -85,8 +85,8 @@ + B<update-alternatives> is called to update information about that file in the alternatives system. - .B update\-alternatives - is usually called from the --.B postinst -+.B post - (configure) or - .B prerm --(remove and deconfigure) scripts in Debian packages. -+(remove and deconfigure) scripts in SUSE packages. - .PP - It is often useful for a number of alternatives to be synchronized, - so that they are changed as a group; for example, when several versions -Index: dpkg-1.18.23/utils/update-alternatives.c -=================================================================== ---- dpkg-1.18.23.orig/utils/update-alternatives.c -+++ dpkg-1.18.23/utils/update-alternatives.c -@@ -70,7 +70,7 @@ static int opt_force = 0; + B<update-alternatives> +-is usually called from the following Debian package maintainer scripts, +-B<postinst> ++is usually called from the following SUSE package maintainer scripts, ++B<post> + (configure) to install the alternative and from + B<prerm> and B<postrm> + (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 @@ + + update_alternatives_CPPFLAGS = \ + -DALT_TMP_EXT=\".dpkg-tmp\" \ +- -DADMINDIR_ENVVAR=\"DPKG_ADMINDIR\" \ +- -DINSTDIR_ENVVAR=\"DPKG_ROOT\" \ ++ -DADMINDIR_ENVVAR=\"RPM_ADMINDIR\" \ ++ -DINSTDIR_ENVVAR=\"RPM_ROOT\" \ + $(AM_CPPFLAGS) + + update_alternatives_LDADD = \ +@@ -79,7 +79,7 @@ + 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_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 @@ static void version(void) { @@ -46,18 +65,3 @@ printf("\n"); printf(_( -Index: dpkg-1.18.23/utils/Makefile.am -=================================================================== ---- dpkg-1.18.23.orig/utils/Makefile.am -+++ dpkg-1.18.23/utils/Makefile.am -@@ -25,8 +25,8 @@ update_alternatives_SOURCES = \ - update-alternatives.c - - update_alternatives_CPPFLAGS = \ -- -DALT_TMP_EXT=\".dpkg-tmp\" \ -- -DADMINDIR_ENVVAR=\"DPKG_ADMINDIR\" \ -+ -DALT_TMP_EXT=\".rpm-tmp\" \ -+ -DADMINDIR_ENVVAR=\"RPM_ADMINDIR\" \ - $(AM_CPPFLAGS) - - update_alternatives_LDADD = \
