pool/libarchive
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 131394 from home:k0da:ppc

Browse Source 
- fix http://code.google.com/p/libarchive/issues/detail?id=277
  test_option_b and test_option_nodump are failing on ppc64

OBS-URL: https://build.opensuse.org/request/show/131394
OBS-URL: https://build.opensuse.org/package/show/Archiving/libarchive?expand=0&rev=17
This commit is contained in:
Marcus Meissner 2012-08-23 08:36:59 +00:00 committed by Git OBS Bridge
parent c65748bbe4
commit 13a64b2c7c
3 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libarchive-ppc64.patch Normal file
View File

@ -0,0 +1,26 @@
Index: libarchive-3.0.4/libarchive/archive_read_disk_entry_from_file.c
===================================================================
--- libarchive-3.0.4.orig/libarchive/archive_read_disk_entry_from_file.c
+++ libarchive-3.0.4/libarchive/archive_read_disk_entry_from_file.c
@@ -197,7 +197,7 @@ archive_read_disk_entry_from_file(struct
fd = open(path, O_RDONLY | O_NONBLOCK);
}
if (fd >= 0) {
- unsigned long stflags;
+ int stflags;
r = ioctl(fd, EXT2_IOC_GETFLAGS, &stflags);
if (r == 0 && stflags != 0)
archive_entry_set_fflags(entry, stflags, 0);
Index: libarchive-3.0.4/libarchive/archive_read_disk_posix.c
===================================================================
--- libarchive-3.0.4.orig/libarchive/archive_read_disk_posix.c
+++ libarchive-3.0.4/libarchive/archive_read_disk_posix.c
@@ -984,7 +984,7 @@ next_entry(struct archive_read_disk *a,
#elif defined(EXT2_IOC_GETFLAGS) && defined(EXT2_NODUMP_FL) &&\
defined(HAVE_WORKING_EXT2_IOC_GETFLAGS)
if (S_ISREG(st->st_mode) || S_ISDIR(st->st_mode)) {
- unsigned long stflags;
+ int stflags;
t->entry_fd = open_on_current_dir(t,
tree_current_access_path(t), O_RDONLY | O_NONBLOCK);

6
libarchive.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Aug 23 08:30:05 UTC 2012 - dvaleev@suse.com
- fix http://code.google.com/p/libarchive/issues/detail?id=277
test_option_b and test_option_nodump are failing on ppc64
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 9 09:05:01 UTC 2012 - cfarrell@suse.com Thu Aug 9 09:05:01 UTC 2012 - cfarrell@suse.com

3
libarchive.spec
View File

@ -36,6 +36,8 @@ Source0: http://libarchive.googlecode.com/files/libarchive-%{version}.tar
Source1: baselibs.conf Source1: baselibs.conf
# PATCH-FIX-UPSTREAM libarchive-fix-checks.patch dimstar@opensuse.org -- Fix GCC 4.7 side effects. Taken from upstream. # PATCH-FIX-UPSTREAM libarchive-fix-checks.patch dimstar@opensuse.org -- Fix GCC 4.7 side effects. Taken from upstream.
Patch0: libarchive-fix-checks.patch Patch0: libarchive-fix-checks.patch
# PATCH-FIX-UPSTREAM libarchive-ppc64.patch dvaleev@suse.com -- fix tests failing on ppc64
Patch1: libarchive-ppc64.patch
%description %description
Libarchive is a programming library that can create and read several Libarchive is a programming library that can create and read several
@ -134,6 +136,7 @@ This package contains the development files.
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1
%build %build
%global optflags %{optflags} -D_REENTRANT -pipe %global optflags %{optflags} -D_REENTRANT -pipe