Accepting request 161337 from home:flichtenheld
Update to 1.16.10 OBS-URL: https://build.opensuse.org/request/show/161337 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/dpkg?expand=0&rev=6
This commit is contained in:
Frank Lichtenheld
Git OBS Bridge
parent
1d295a02e8
commit
4c93b71c9b
22
dpkg-old-File-Path.patch
Normal file
22
dpkg-old-File-Path.patch
Normal file
@ -0,0 +1,22 @@
|
||||
Index: dpkg-1.16.10/scripts/Dpkg/Source/Quilt.pm
|
||||
===================================================================
|
||||
--- dpkg-1.16.10.orig/scripts/Dpkg/Source/Quilt.pm
|
||||
+++ dpkg-1.16.10/scripts/Dpkg/Source/Quilt.pm
|
||||
@@ -29,7 +29,7 @@ use Dpkg::Vendor qw(get_current_vendor);
|
||||
use File::Spec;
|
||||
use File::Copy;
|
||||
use File::Find;
|
||||
-use File::Path qw(make_path);
|
||||
+use File::Path qw(mkpath);
|
||||
use File::Basename;
|
||||
|
||||
sub new {
|
||||
@@ -289,7 +289,7 @@ sub restore_quilt_backup_files {
|
||||
my $target = File::Spec->catfile($self->{'dir'}, $relpath_in_srcpkg);
|
||||
if (-s $_) {
|
||||
unlink($target);
|
||||
- make_path(dirname($target));
|
||||
+ mkpath(dirname($target));
|
||||
unless (link($_, $target)) {
|
||||
copy($_, $target) ||
|
||||
syserr(_g("failed to copy %s to %s"), $_, $target);
|
||||
238
dpkg-old-Test-More.patch
Normal file
238
dpkg-old-Test-More.patch
Normal file
@ -0,0 +1,238 @@
|
||||
Index: dpkg-1.16.10/src/t/100_dpkg_divert.t
|
||||
===================================================================
|
||||
--- dpkg-1.16.10.orig/src/t/100_dpkg_divert.t
|
||||
+++ dpkg-1.16.10/src/t/100_dpkg_divert.t
|
||||
@@ -148,7 +148,7 @@ sub diversions_eq {
|
||||
|
||||
cleanup();
|
||||
|
||||
-note("Command line parsing testing");
|
||||
+#note("Command line parsing testing");
|
||||
|
||||
my $usagere = qr/.*Usage.*dpkg-divert.*Commands.*Options.*/s;
|
||||
|
||||
@@ -191,7 +191,7 @@ call([@dd, '--admindir'], [],
|
||||
|
||||
cleanup();
|
||||
|
||||
-note("Querying information from diverts db (empty one)");
|
||||
+#note("Querying information from diverts db (empty one)");
|
||||
|
||||
install_diversions('');
|
||||
|
||||
@@ -201,7 +201,7 @@ call_divert_sort(['--list', 'baz'], expe
|
||||
|
||||
cleanup();
|
||||
|
||||
-note("Querying information from diverts db (1)");
|
||||
+#note("Querying information from diverts db (1)");
|
||||
|
||||
install_diversions(<<EOF);
|
||||
/bin/sh
|
||||
@@ -237,7 +237,7 @@ call_divert_sort(['--list', '/bin/sh', '
|
||||
|
||||
cleanup();
|
||||
|
||||
-note("Querying information from diverts db (2)");
|
||||
+#note("Querying information from diverts db (2)");
|
||||
|
||||
install_diversions(<<EOF);
|
||||
/bin/sh
|
||||
@@ -259,7 +259,7 @@ call_divert(['--truename', '/bin/somethi
|
||||
|
||||
cleanup();
|
||||
|
||||
-note("Adding diversion");
|
||||
+#note("Adding diversion");
|
||||
|
||||
my $diversions_added_foo_local = <<EOF;
|
||||
$testdir/foo
|
||||
@@ -279,7 +279,7 @@ diversions_eq($diversions_added_foo_loca
|
||||
|
||||
cleanup();
|
||||
|
||||
-note("Adding diversion (2)");
|
||||
+#note("Adding diversion (2)");
|
||||
|
||||
install_diversions('');
|
||||
|
||||
@@ -293,7 +293,7 @@ diversions_eq($diversions_added_foo_loca
|
||||
|
||||
cleanup();
|
||||
|
||||
-note("Adding diversion (3)");
|
||||
+#note("Adding diversion (3)");
|
||||
|
||||
install_diversions('');
|
||||
|
||||
@@ -306,7 +306,7 @@ diversions_eq($diversions_added_foo_loca
|
||||
|
||||
cleanup();
|
||||
|
||||
-note("Adding diversion (4)");
|
||||
+#note("Adding diversion (4)");
|
||||
|
||||
install_diversions('');
|
||||
system("touch $testdir/foo");
|
||||
@@ -318,7 +318,7 @@ diversions_eq('');
|
||||
|
||||
cleanup();
|
||||
|
||||
-note("Adding diversion (5)");
|
||||
+#note("Adding diversion (5)");
|
||||
|
||||
install_diversions('');
|
||||
call_divert(['--quiet', '--rename', "$testdir/foo"],
|
||||
@@ -328,7 +328,7 @@ ok(!-e "$testdir/foo.distrib", "foo was
|
||||
|
||||
cleanup();
|
||||
|
||||
-note("Adding diversion (6)");
|
||||
+#note("Adding diversion (6)");
|
||||
|
||||
install_diversions('');
|
||||
system("touch $testdir/foo");
|
||||
@@ -341,7 +341,7 @@ diversions_eq($diversions_added_foo_loca
|
||||
|
||||
cleanup();
|
||||
|
||||
-note("Adding diversion (7)");
|
||||
+#note("Adding diversion (7)");
|
||||
|
||||
install_diversions('');
|
||||
call_divert(['--quiet', '--rename', '--package', 'bash', "$testdir/foo"],
|
||||
@@ -352,7 +352,7 @@ $testdir/foo.distrib
|
||||
bash
|
||||
EOF
|
||||
|
||||
-note("Adding diversion (8)");
|
||||
+#note("Adding diversion (8)");
|
||||
|
||||
install_diversions('');
|
||||
system("touch $testdir/foo; ln $testdir/foo $testdir/foo.distrib");
|
||||
@@ -363,7 +363,7 @@ ok(-e "$testdir/foo.distrib", "foo diver
|
||||
|
||||
cleanup();
|
||||
|
||||
-note("Adding diversion (9)");
|
||||
+#note("Adding diversion (9)");
|
||||
|
||||
install_diversions('');
|
||||
system("touch $testdir/foo $testdir/foo.distrib");
|
||||
@@ -373,7 +373,7 @@ diversions_eq('');
|
||||
|
||||
cleanup();
|
||||
|
||||
-note("Adding second diversion");
|
||||
+#note("Adding second diversion");
|
||||
|
||||
install_diversions('');
|
||||
call_divert(["$testdir/foo"]);
|
||||
@@ -393,7 +393,7 @@ call_divert(['--divert', "$testdir/foo",
|
||||
|
||||
cleanup();
|
||||
|
||||
-note("Adding third diversion");
|
||||
+#note("Adding third diversion");
|
||||
|
||||
install_diversions('');
|
||||
call_divert(["$testdir/foo"]);
|
||||
@@ -405,7 +405,7 @@ call_divert(['--package', 'foobar', "$te
|
||||
|
||||
cleanup();
|
||||
|
||||
-note("Adding diversion in non-existing directory");
|
||||
+#note("Adding diversion in non-existing directory");
|
||||
|
||||
install_diversions('');
|
||||
|
||||
@@ -419,7 +419,7 @@ EOF
|
||||
|
||||
cleanup();
|
||||
|
||||
-note("Adding diversion of file owned by --package");
|
||||
+#note("Adding diversion of file owned by --package");
|
||||
|
||||
install_filelist("coreutils", "i386", "$testdir/foo");
|
||||
install_diversions('');
|
||||
@@ -437,7 +437,7 @@ EOF
|
||||
|
||||
cleanup();
|
||||
|
||||
-note("Remove diversions");
|
||||
+#note("Remove diversions");
|
||||
|
||||
install_diversions('');
|
||||
|
||||
@@ -446,7 +446,7 @@ call_divert(['--remove', '--quiet', '/bi
|
||||
|
||||
cleanup();
|
||||
|
||||
-note("Remove diversion (2)");
|
||||
+#note("Remove diversion (2)");
|
||||
|
||||
install_diversions('');
|
||||
call_divert(["$testdir/foo"]);
|
||||
@@ -473,7 +473,7 @@ EOF
|
||||
|
||||
cleanup();
|
||||
|
||||
-note("Remove diversion (3)");
|
||||
+#note("Remove diversion (3)");
|
||||
|
||||
install_diversions('');
|
||||
|
||||
@@ -494,7 +494,7 @@ EOF
|
||||
|
||||
cleanup();
|
||||
|
||||
-note("Remove diversion (4)");
|
||||
+#note("Remove diversion (4)");
|
||||
|
||||
install_diversions('');
|
||||
|
||||
@@ -515,7 +515,7 @@ EOF
|
||||
|
||||
cleanup();
|
||||
|
||||
-note("Remove diversion(5)");
|
||||
+#note("Remove diversion(5)");
|
||||
|
||||
install_diversions('');
|
||||
system("touch $testdir/foo");
|
||||
@@ -535,7 +535,7 @@ diversions_eq('');
|
||||
|
||||
cleanup();
|
||||
|
||||
-note("Corrupted divertions db handling");
|
||||
+#note("Corrupted divertions db handling");
|
||||
|
||||
SKIP: {
|
||||
skip "running as root or similar", 3, if (defined($ENV{FAKEROOTKEY}) or $> == 0);
|
||||
@@ -569,7 +569,7 @@ cleanup();
|
||||
SKIP: {
|
||||
skip "running as root or similar", 10, if (defined($ENV{FAKEROOTKEY}) or $> == 0);
|
||||
|
||||
- note("R/O directory");
|
||||
+ #note("R/O directory");
|
||||
|
||||
install_diversions('');
|
||||
system("mkdir $testdir/rodir && touch $testdir/rodir/foo $testdir/bar && chmod 500 $testdir/rodir");
|
||||
@@ -582,7 +582,7 @@ SKIP: {
|
||||
system("chmod 755 $testdir/rodir");
|
||||
cleanup();
|
||||
|
||||
- note("Unavailable file");
|
||||
+ #note("Unavailable file");
|
||||
|
||||
install_diversions('');
|
||||
system("mkdir $testdir/nadir && chmod 000 $testdir/nadir");
|
||||
@@ -596,7 +596,7 @@ SKIP: {
|
||||
cleanup();
|
||||
}
|
||||
|
||||
-note("Errors during saving diversions db");
|
||||
+#note("Errors during saving diversions db");
|
||||
|
||||
install_diversions('');
|
||||
|
||||
26
dpkg.changes
26
dpkg.changes
@ -1,3 +1,29 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 26 13:22:40 UTC 2013 - frank.lichtenheld@sophos.com
|
||||
|
||||
- Enable test suite
|
||||
- Fix dpkg-source for SLES 11. Quilt.pm was depending on a
|
||||
newer API of File::Path.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 25 20:25:54 UTC 2013 - frank.lichtenheld@sophos.com
|
||||
|
||||
- update to dpkg-1.16.10
|
||||
* Add missing @LIBLZMA_LIBS@ to Libs.Private in libdpkg.pc.in
|
||||
* Fix OpenPGP armored signature parsing, to be resilient against doctored
|
||||
input, including source package control files. deb#695919
|
||||
* Fix warning in Dpkg::Source::Archive with «perl -w» due to redefinition
|
||||
of getcwd() by removing unused POSIX modules usage. deb#700978
|
||||
- update to dpkg-1.16.9
|
||||
* Fix regression on old-style binNMUs for packages that specify an
|
||||
explicit binary version to dpkg-gencontrol, by always fixing up the
|
||||
source version. deb#690823
|
||||
* Fix dpkg-source regression in "3.0 (quilt)" source packages while
|
||||
unapplying patches that remove all files in a directory. deb#683547
|
||||
* Fix segfault in field format parsing on empty strings, affecting
|
||||
«dpkg-query -W -f ''» and «dpkg-deb -W --showformat=''». lp#1035512
|
||||
- see /usr/share/doc/packages/dpkg/changelog for details
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 11 18:55:33 UTC 2012 - frank.lichtenheld@sophos.com
|
||||
|
||||
|
||||
17
dpkg.spec
17
dpkg.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package dpkg
|
||||
#
|
||||
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -19,7 +19,7 @@
|
||||
%define admindir %{_localstatedir}/lib/rpm/
|
||||
|
||||
Name: dpkg
|
||||
Version: 1.16.8
|
||||
Version: 1.16.10
|
||||
Release: 0
|
||||
Summary: Debian package management system
|
||||
License: GPL-2.0+
|
||||
@ -28,17 +28,23 @@ Url: http://www.debian.org
|
||||
Source0: http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_%{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-%{version}-suse.patch
|
||||
Patch1: update-alternatives-1.16.8-suse.patch
|
||||
# PATCH-FIX-OPENSUSE add openSUSE supported architectures
|
||||
Patch2: dpkg-archtable-suse.patch
|
||||
# PATCH-FIX-UPSTREAM remove --utf8 since we only build En manpages.
|
||||
Patch3: dpkg-pod2man-no-utf8.patch
|
||||
# PATCH-FIX-SUSE support for old File::Path (SLES11)
|
||||
Patch4: dpkg-old-File-Path.patch
|
||||
# PATCH-FIX-SUSE support for old Test::More (SLES11)
|
||||
Patch5: dpkg-old-Test-More.patch
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: libselinux-devel
|
||||
%define use_selinux 1
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: xz
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: perl(Date::Parse)
|
||||
BuildRequires: perl(IO::String)
|
||||
Requires: cpio
|
||||
Requires: make
|
||||
Requires: patch
|
||||
@ -106,6 +112,8 @@ Provides translations to the package %{name}
|
||||
%patch2 -p1
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1130
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%endif
|
||||
|
||||
%build
|
||||
@ -161,6 +169,9 @@ cat dselect.lang dpkg-dev.lang >> %{name}.lang
|
||||
# extras
|
||||
install -m 755 %{SOURCE3} %{buildroot}%{_bindir}
|
||||
|
||||
%check
|
||||
%{__make} check
|
||||
|
||||
%post
|
||||
cd %{_localstatedir}/lib/dpkg
|
||||
for f in diversions statoverride status ; do
|
||||
|
||||
3
dpkg_1.16.10.tar.xz
Normal file
3
dpkg_1.16.10.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:aeaacf0884039940d9463901102194f9a42eb5702157b9e7a23f43e0d9f65cf2
|
||||
size 3703340
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4a1f4611390d93f1f198d910d3a4e4913b3cf81702b31f585a1872ca98df0eaa
|
||||
size 3601652
|
||||
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 25 20:35:24 UTC 2013 - frank.lichtenheld@sophos.com
|
||||
|
||||
- update to 1.16.10
|
||||
* Fix update-alternatives test suite to behave correctly on non-Debian
|
||||
binary paths. Known to be affecting at least Gentoo and Mac OS X.
|
||||
* Do not leak subcall command arguments in update-alternatives.
|
||||
* Fix segfault on update-alternatives when passing --slave without any
|
||||
action at all. lp#1037431
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 27 21:58:39 UTC 2012 - frank.lichtenheld@sophos.com
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package update-alternatives
|
||||
#
|
||||
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -19,7 +19,7 @@
|
||||
%define admindir %{_localstatedir}/lib/rpm/
|
||||
|
||||
Name: update-alternatives
|
||||
Version: 1.16.8
|
||||
Version: 1.16.10
|
||||
Release: 0
|
||||
Summary: Maintain symbolic links determining default commands
|
||||
License: GPL-2.0+
|
||||
@ -27,7 +27,7 @@ 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
|
||||
Source3: sensible-editor
|
||||
Patch0: update-alternatives-%{version}-suse.patch
|
||||
Patch0: update-alternatives-1.16.8-suse.patch
|
||||
Patch1: dpkg-archtable-suse.patch
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: xz
|
||||
|
||||
Loading…
Reference in New Issue
Block a user