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

Accepting request 443193 from OBS:Server:Unstable

Browse Source 
fix

OBS-URL: https://build.opensuse.org/request/show/443193
OBS-URL: https://build.opensuse.org/package/show/Archiving/libarchive?expand=0&rev=67
This commit is contained in:
Adrian Schröter 2016-12-02 13:53:54 +00:00 committed by Git OBS Bridge
parent cdb2c644e6
commit 9e4730ab62
3 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fix-extract-over-links.patch Normal file
View File

@ -0,0 +1,23 @@
--- a/libarchive/archive_write_disk_posix.c.orig 2016-12-02 13:13:57.433550535 +0000
+++ a/libarchive/archive_write_disk_posix.c 2016-12-02 13:16:36.770020356 +0000
@@ -2051,12 +2051,14 @@ create_filesystem_object(struct archive_
/* EPERM is more appropriate than error_number for our callers */
return (EPERM);
}
- r = check_symlinks_fsobj(linkname_copy, &error_number, &error_string, a->flags);
- if (r != ARCHIVE_OK) {
- archive_set_error(&a->archive, error_number, "%s", error_string.s);
- free(linkname_copy);
- /* EPERM is more appropriate than error_number for our callers */
- return (EPERM);
+ if (a->flags & ARCHIVE_EXTRACT_SECURE_SYMLINKS) {
+ r = check_symlinks_fsobj(linkname_copy, &error_number, &error_string, a->flags);
+ if (r != ARCHIVE_OK) {
+ archive_set_error(&a->archive, error_number, "%s", error_string.s);
+ free(linkname_copy);
+ /* EPERM is more appropriate than error_number for our callers */
+ return (EPERM);
+ }
}
free(linkname_copy);
r = link(linkname, a->name) ? errno : 0;

7
libarchive.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Dec 2 13:37:54 UTC 2016 - adrian@suse.com
- fix extracting over symlinks: fix-extract-over-links.patch
the problem is solved upstream different, but git master
is too different atm.
-------------------------------------------------------------------
Wed Oct 26 09:27:32 UTC 2016 - adrian@suse.com

7
libarchive.spec
View File

@ -41,6 +41,8 @@ Group: Productivity/Archiving/Compression
Url: http://www.libarchive.org/
Source0: http://www.libarchive.org/downloads/libarchive-%{version}.tar.gz
Source1: baselibs.conf
# PATCH-FIX-OPENSUSE the problem is solved upstream different, but git master is too different atm.
Patch0: fix-extract-over-links.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libacl-devel
BuildRequires: libbz2-devel
@ -55,7 +57,7 @@ BuildRequires: libxml2-devel
BuildRequires: pkg-config
BuildRequires: xz-devel
BuildRequires: zlib-devel
Patch0: libarchive-openssl.patch
Patch1: libarchive-openssl.patch
%description
Libarchive is a programming library that can create and read several
@ -162,8 +164,9 @@ static library for libarchive
%prep
%setup -q
%patch0 -p1
%if %{with openssl}
%patch0 -p0
%patch1 -p0
%endif
%build