SHA256
3
0
forked from pool/dpkg

Accepting request 246358 from home:jblunck:branches:system:packagemanager

- Make Dpkg::Source::Archive use tar --format=gnu

OBS-URL: https://build.opensuse.org/request/show/246358
OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/dpkg?expand=0&rev=15
This commit is contained in:
Frank Lichtenheld 2014-08-25 13:50:18 +00:00 committed by Git OBS Bridge
parent 55c6cd397b
commit 4ac6329295
3 changed files with 33 additions and 0 deletions

View File

@ -0,0 +1,24 @@
From: Jan Blunck <jblunck@infradead.org>
Subject: Make Dpkg::Source::Archive use tar --format=gnu
Some versions of tar (specifically on openSUSE 12.2) have different default
tar format. So lets explicitly instruct Dpkg::Source::Archive to create the
gnu tar format.
http://anonscm.debian.org/gitweb/?p=dpkg/dpkg.git;h=3f0c739bff65e6167cc91626fa77145247560fda
Signed-off-by: Jan Blunck <jblunck@infradead.org>
Index: dpkg-1.16.10/scripts/Dpkg/Source/Archive.pm
===================================================================
--- dpkg-1.16.10.orig/scripts/Dpkg/Source/Archive.pm
+++ dpkg-1.16.10/scripts/Dpkg/Source/Archive.pm
@@ -48,7 +48,7 @@ sub create {
# Call tar creation process
$spawn_opts{"delete_env"} = [ "TAR_OPTIONS" ];
$spawn_opts{'exec'} = [ 'tar', '--null', '-T', '-', '--numeric-owner',
- '--owner', '0', '--group', '0',
+ '--owner', '0', '--group', '0', '--format=gnu',
@{$opts{"options"}}, '-cf', '-' ];
*$self->{"pid"} = spawn(%spawn_opts);
*$self->{"cwd"} = getcwd();

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Aug 25 13:35:42 UTC 2014 - jblunck@infradead.org
- Make Dpkg::Source::Archive use tar --format=gnu
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Aug 23 19:02:35 UTC 2014 - dvlaeev@suse.com Sat Aug 23 19:02:35 UTC 2014 - dvlaeev@suse.com

View File

@ -39,6 +39,7 @@ Patch4: dpkg-old-File-Path.patch
Patch5: dpkg-old-Test-More.patch Patch5: dpkg-old-Test-More.patch
Patch6: dpkg-sparc.diff Patch6: dpkg-sparc.diff
Patch7: dpkg-ppc64le.diff Patch7: dpkg-ppc64le.diff
Patch8: dpkg-archive_tar_format_gnu.patch
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libselinux-devel BuildRequires: libselinux-devel
%define use_selinux 1 %define use_selinux 1
@ -119,6 +120,9 @@ Provides translations to the package %{name}
%endif %endif
%patch6 -p1 %patch6 -p1
%patch7 -p1 %patch7 -p1
%if 0%{?suse_version} >= 1220
%patch8 -p1
%endif
%build %build
export CFLAGS="%{optflags}" export CFLAGS="%{optflags}"