Page MenuHomeSolus
Files F11035171

D3795.id9566.diff
No OneTemporary
Actions

D3795.id9566.diff
View Options

diff --git a/abi_symbols b/abi_symbols
--- a/abi_symbols
+++ b/abi_symbols
@@ -247,6 +247,7 @@
libarchive.so.13:archive_free
libarchive.so.13:archive_liblz4_version
libarchive.so.13:archive_liblzma_version
+libarchive.so.13:archive_libzstd_version
libarchive.so.13:archive_match_exclude_entry
libarchive.so.13:archive_match_exclude_pattern
libarchive.so.13:archive_match_exclude_pattern_from_file
@@ -392,6 +393,7 @@
libarchive.so.13:archive_read_support_filter_rpm
libarchive.so.13:archive_read_support_filter_uu
libarchive.so.13:archive_read_support_filter_xz
+libarchive.so.13:archive_read_support_filter_zstd
libarchive.so.13:archive_read_support_format_7zip
libarchive.so.13:archive_read_support_format_all
libarchive.so.13:archive_read_support_format_ar
@@ -451,6 +453,7 @@
libarchive.so.13:archive_write_add_filter_program
libarchive.so.13:archive_write_add_filter_uuencode
libarchive.so.13:archive_write_add_filter_xz
+libarchive.so.13:archive_write_add_filter_zstd
libarchive.so.13:archive_write_close
libarchive.so.13:archive_write_data
libarchive.so.13:archive_write_data_block
diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -6,3 +6,4 @@
libnettle.so.6
libxml2.so.2
libz.so.1
+libzstd.so.1
diff --git a/files/security/CVE-2017-14166.patch b/files/security/CVE-2017-14166.patch
deleted file mode 100644
--- a/files/security/CVE-2017-14166.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From fa7438a0ff4033e4741c807394a9af6207940d71 Mon Sep 17 00:00:00 2001
-From: Joerg Sonnenberger <joerg@bec.de>
-Date: Tue, 5 Sep 2017 18:12:19 +0200
-Subject: [PATCH] Do something sensible for empty strings to make fuzzers
- happy.
-
----
- libarchive/archive_read_support_format_xar.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/libarchive/archive_read_support_format_xar.c b/libarchive/archive_read_support_format_xar.c
-index 7a22beb9d..93eeacc5e 100644
---- a/libarchive/archive_read_support_format_xar.c
-+++ b/libarchive/archive_read_support_format_xar.c
-@@ -1040,6 +1040,9 @@ atol10(const char *p, size_t char_cnt)
- uint64_t l;
- int digit;
-
-+ if (char_cnt == 0)
-+ return (0);
-+
- l = 0;
- digit = *p - '0';
- while (digit >= 0 && digit < 10 && char_cnt-- > 0) {
-@@ -1054,7 +1057,10 @@ atol8(const char *p, size_t char_cnt)
- {
- int64_t l;
- int digit;
--
-+
-+ if (char_cnt == 0)
-+ return (0);
-+
- l = 0;
- while (char_cnt-- > 0) {
- if (*p >= '0' && *p <= '7')
diff --git a/files/security/cve-2017-14501.patch b/files/security/cve-2017-14501.patch
deleted file mode 100644
--- a/files/security/cve-2017-14501.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From f9569c086ff29259c73790db9cbf39fe8fb9d862 Mon Sep 17 00:00:00 2001
-From: John Starks <jostarks@microsoft.com>
-Date: Wed, 25 Jul 2018 12:16:34 -0700
-Subject: [PATCH libarchive] Fix CVE-2017-14501
-
-An out-of-bounds read flaw exists in parse_file_info in
-archive_read_support_format_iso9660.c in libarchive 3.3.2 when extracting a
-specially crafted iso9660 iso file, related to
-archive_read_format_iso9660_read_header.
-
-Fixed with Patch : iso9660: validate directory record length
-
----
- .../archive_read_support_format_iso9660.c | 17 +++++++++++------
- 1 file changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
-index f01d37bf..089bb723 100644
---- a/libarchive/archive_read_support_format_iso9660.c
-+++ b/libarchive/archive_read_support_format_iso9660.c
-@@ -409,7 +409,8 @@ static int next_entry_seek(struct archive_read *, struct iso9660 *,
- struct file_info **);
- static struct file_info *
- parse_file_info(struct archive_read *a,
-- struct file_info *parent, const unsigned char *isodirrec);
-+ struct file_info *parent, const unsigned char *isodirrec,
-+ size_t reclen);
- static int parse_rockridge(struct archive_read *a,
- struct file_info *file, const unsigned char *start,
- const unsigned char *end);
-@@ -1022,7 +1023,7 @@ read_children(struct archive_read *a, struct file_info *parent)
- if (*(p + DR_name_len_offset) == 1
- && *(p + DR_name_offset) == '\001')
- continue;
-- child = parse_file_info(a, parent, p);
-+ child = parse_file_info(a, parent, p, b - p);
- if (child == NULL) {
- __archive_read_consume(a, skip_size);
- return (ARCHIVE_FATAL);
-@@ -1112,7 +1113,7 @@ choose_volume(struct archive_read *a, struct iso9660 *iso9660)
- */
- seenJoliet = iso9660->seenJoliet;/* Save flag. */
- iso9660->seenJoliet = 0;
-- file = parse_file_info(a, NULL, block);
-+ file = parse_file_info(a, NULL, block, vd->size);
- if (file == NULL)
- return (ARCHIVE_FATAL);
- iso9660->seenJoliet = seenJoliet;
-@@ -1144,7 +1145,7 @@ choose_volume(struct archive_read *a, struct iso9660 *iso9660)
- return (ARCHIVE_FATAL);
- }
- iso9660->seenJoliet = 0;
-- file = parse_file_info(a, NULL, block);
-+ file = parse_file_info(a, NULL, block, vd->size);
- if (file == NULL)
- return (ARCHIVE_FATAL);
- iso9660->seenJoliet = seenJoliet;
-@@ -1749,7 +1750,7 @@ archive_read_format_iso9660_cleanup(struct archive_read *a)
- */
- static struct file_info *
- parse_file_info(struct archive_read *a, struct file_info *parent,
-- const unsigned char *isodirrec)
-+ const unsigned char *isodirrec, size_t reclen)
- {
- struct iso9660 *iso9660;
- struct file_info *file, *filep;
-@@ -1763,7 +1764,11 @@ parse_file_info(struct archive_read *a, struct file_info *parent,
-
- iso9660 = (struct iso9660 *)(a->format->data);
-
-- dr_len = (size_t)isodirrec[DR_length_offset];
-+ if (reclen == 0 || reclen < (dr_len = (size_t)isodirrec[DR_length_offset])) {
-+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
-+ "Invalid directory record length");
-+ return (NULL);
-+ }
- name_len = (size_t)isodirrec[DR_name_len_offset];
- location = archive_le32dec(isodirrec + DR_extent_offset);
- fsize = toi(isodirrec + DR_size_offset, DR_size_size);
---
-2.18.0
-
diff --git a/files/security/cve-2017-14502.patch b/files/security/cve-2017-14502.patch
deleted file mode 100644
--- a/files/security/cve-2017-14502.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5562545b5562f6d12a4ef991fae158bf4ccf92b6 Mon Sep 17 00:00:00 2001
-From: Joerg Sonnenberger <joerg@bec.de>
-Date: Sat, 9 Sep 2017 17:47:32 +0200
-Subject: [PATCH] Avoid a read off-by-one error for UTF16 names in RAR
- archives.
-
-Reported-By: OSS-Fuzz issue 573
----
- libarchive/archive_read_support_format_rar.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c
-index cbb14c32..751de697 100644
---- a/libarchive/archive_read_support_format_rar.c
-+++ b/libarchive/archive_read_support_format_rar.c
-@@ -1496,7 +1496,11 @@ read_header(struct archive_read *a, struct archive_entry *entry,
- return (ARCHIVE_FATAL);
- }
- filename[filename_size++] = '\0';
-- filename[filename_size++] = '\0';
-+ /*
-+ * Do not increment filename_size here as the computations below
-+ * add the space for the terminating NUL explicitly.
-+ */
-+ filename[filename_size] = '\0';
-
- /* Decoded unicode form is UTF-16BE, so we have to update a string
- * conversion object for it. */
---
-2.14.1
-
diff --git a/files/security/cve-2017-14503.patch b/files/security/cve-2017-14503.patch
deleted file mode 100644
--- a/files/security/cve-2017-14503.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 2c8c83b9731ff822fad6cc8c670ea5519c366a14 Mon Sep 17 00:00:00 2001
-From: Joerg Sonnenberger <joerg@bec.de>
-Date: Thu, 19 Jul 2018 21:14:53 +0200
-Subject: [PATCH] Reject LHA archive entries with negative size.
-
----
- libarchive/archive_read_support_format_lha.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/libarchive/archive_read_support_format_lha.c b/libarchive/archive_read_support_format_lha.c
-index b8ef4ae1..95c99bb1 100644
---- a/libarchive/archive_read_support_format_lha.c
-+++ b/libarchive/archive_read_support_format_lha.c
-@@ -701,6 +701,12 @@ archive_read_format_lha_read_header(struct archive_read *a,
- * Prepare variables used to read a file content.
- */
- lha->entry_bytes_remaining = lha->compsize;
-+ if (lha->entry_bytes_remaining < 0) {
-+ archive_set_error(&a->archive,
-+ ARCHIVE_ERRNO_FILE_FORMAT,
-+ "Invalid LHa entry size");
-+ return (ARCHIVE_FATAL);
-+ }
- lha->entry_offset = 0;
- lha->entry_crc_calculated = 0;
-
---
-2.18.0
-
diff --git a/files/series b/files/series
deleted file mode 100644
--- a/files/series
+++ /dev/null
@@ -1,4 +0,0 @@
-security/CVE-2017-14166.patch
-security/cve-2017-14501.patch
-security/cve-2017-14502.patch
-security/cve-2017-14503.patch
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
name : libarchive
-version : 3.3.2
-release : 20
+version : 3.3.3
+release : 21
source :
- - https://github.com/libarchive/libarchive/archive/v3.3.2.tar.gz : 22560b89d420b11a4a724877bc6672b7d7c0f239e77d42a39dcc5a9c3b28db82
+ - https://github.com/libarchive/libarchive/archive/v3.3.3.tar.gz : 720da414e7aebb255fcdaee106894e4d30e2472ac1390c2c15b70c84c7479658
homepage : http://www.libarchive.org/
license : BSD-2-Clause
component :
@@ -15,6 +15,7 @@
- pkgconfig(ext2fs)
- pkgconfig(liblz4)
- pkgconfig(libxml-2.0)
+ - pkgconfig(libzstd)
- pkgconfig(nettle)
- acl-devel
- attr-devel
@@ -27,7 +28,6 @@
- devel :
- /usr/share/man/man3
setup : |
- %apply_patches
%reconfigure --disable-static
build : |
%make
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -3,8 +3,8 @@
<Name>libarchive</Name>
<Homepage>http://www.libarchive.org/</Homepage>
<Packager>
- <Name>Joey Riches</Name>
- <Email>josephriches@gmail.com</Email>
+ <Name>Pierre-Yves</Name>
+ <Email>pyu@riseup.net</Email>
</Packager>
<License>BSD-2-Clause</License>
<PartOf>programming.library</PartOf>
@@ -21,7 +21,7 @@
<PartOf>programming.library</PartOf>
<Files>
<Path fileType="library">/usr/lib64/libarchive.so.13</Path>
- <Path fileType="library">/usr/lib64/libarchive.so.13.3.2</Path>
+ <Path fileType="library">/usr/lib64/libarchive.so.13.3.3</Path>
</Files>
</Package>
<Package>
@@ -31,7 +31,7 @@
</Description>
<PartOf>system.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="20">libarchive</Dependency>
+ <Dependency release="21">libarchive</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin/bsdcat</Path>
@@ -53,7 +53,7 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="20">libarchive</Dependency>
+ <Dependency release="21">libarchive</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/archive.h</Path>
@@ -99,12 +99,12 @@
</Files>
</Package>
<History>
- <Update release="20">
- <Date>2018-08-09</Date>
- <Version>3.3.2</Version>
+ <Update release="21">
+ <Date>2018-09-04</Date>
+ <Version>3.3.3</Version>
<Comment>Packaging update</Comment>
- <Name>Joey Riches</Name>
- <Email>josephriches@gmail.com</Email>
+ <Name>Pierre-Yves</Name>
+ <Email>pyu@riseup.net</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Thu, Aug 10, 5:37 PM (1 d, 2 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5821577
Default Alt Text
D3795.id9566.diff (11 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.