Accepting request 890017 from home:glaubitz:branches:system:packagemanager

- 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 <jak@debian.org>.
    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.

OBS-URL: https://build.opensuse.org/request/show/890017
OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/dpkg?expand=0&rev=81
This commit is contained in:
Adam Majer 2021-06-07 13:39:12 +00:00 committed by Git OBS Bridge
parent 94626ae7d9
commit a34a7702db
7 changed files with 2955 additions and 50 deletions

File diff suppressed because it is too large Load Diff

View File

@ -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
@ -41,7 +41,7 @@ BuildRequires: libmd-devel
BuildRequires: libselinux-devel
BuildRequires: libtool
BuildRequires: ncurses-devel
BuildRequires: po4a
BuildRequires: po4a >= 0.59
BuildRequires: update-alternatives
BuildRequires: xz-devel
BuildRequires: zlib-devel
@ -162,7 +162,8 @@ exit 0
%license COPYING
%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 +174,9 @@ exit 0
%{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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:818046927a7f77c1bcbbad7d8dbc04cdf0f3e6ec4e1a4f9d313378ecc69d85b5
size 4557428

3
dpkg_1.20.9.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5ce242830f213b5620f08e6c4183adb1ef4dc9da28d31988a27c87c71fe534ce
size 4954428

View File

@ -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 @@ Index: dpkg-1.18.23/utils/update-alternatives.c
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 = \

File diff suppressed because it is too large Load Diff

View File

@ -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