diff --git a/fix-extract-over-links.patch b/fix-extract-over-links.patch deleted file mode 100644 index f3d24ff..0000000 --- a/fix-extract-over-links.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- 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; diff --git a/libarchive-3.2.2.tar.gz b/libarchive-3.2.2.tar.gz deleted file mode 100644 index dd0c074..0000000 --- a/libarchive-3.2.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:691c194ee132d1f0f7a42541f091db811bc2e56f7107e9121be2bc8c04f1060f -size 5458241 diff --git a/libarchive-3.3.1.tar.gz b/libarchive-3.3.1.tar.gz new file mode 100644 index 0000000..81327e9 --- /dev/null +++ b/libarchive-3.3.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29ca5bd1624ca5a007aa57e16080262ab4379dbf8797f5c52f7ea74a3b0424e7 +size 6219943 diff --git a/libarchive.changes b/libarchive.changes index 97655c5..771baa5 100644 --- a/libarchive.changes +++ b/libarchive.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Apr 3 14:44:27 UTC 2017 - adrian@suse.de + +- update to version 3.3.1 + * Security & Feature release + Details are not documented from upstream yet + ------------------------------------------------------------------- Fri Dec 2 13:37:54 UTC 2016 - adrian@suse.com diff --git a/libarchive.spec b/libarchive.spec index 0f8d645..a584265 100644 --- a/libarchive.spec +++ b/libarchive.spec @@ -1,7 +1,7 @@ # # spec file for package libarchive # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,7 +33,7 @@ %define libname libarchive%{somajor} Name: libarchive -Version: 3.2.2 +Version: 3.3.1 Release: 0 Summary: Creates and reads several different streaming archive formats License: BSD-2-Clause @@ -41,8 +41,6 @@ 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 @@ -57,7 +55,6 @@ BuildRequires: libxml2-devel BuildRequires: pkg-config BuildRequires: xz-devel BuildRequires: zlib-devel -Patch1: libarchive-openssl.patch %description Libarchive is a programming library that can create and read several @@ -164,10 +161,6 @@ static library for libarchive %prep %setup -q -%patch0 -p1 -%if %{with openssl} -%patch1 -p0 -%endif %build %if !0%{?skip_autoreconf} @@ -187,7 +180,8 @@ sed -i -e "/HAVE_LZMA_STREAM_ENCODER_MT/d" config.h make %{?_smp_mflags} %check -make check +# test suite is a bit racy unfortunatly, so give it three attempts +make check || make check || make check %install %makeinstall