Skip to contentSkip to conversation

package/p7zip: bump to version v17.04

PATCH New André Zwing 2 participants 2 messages Jul 19, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/p7zip: bump to version v17.04

This new attempt to maintain p7zip is already picked up by Distributions. It fixes CVE-2016-9296, CVE-2017-17969, CVE-2018-5996 and CVE-2018-10115. Note that the version is now prefixed with 'v'.

---
 package/p7zip/0001-CVE-2016-9296.patch        |  25 --
 package/p7zip/0002-CVE-2017-17969.patch       |  37 ---
 package/p7zip/0003-CVE-2018-5996.patch        | 223 ------------------
 .../p7zip/0004-Fix-build-with-gcc-10.patch    |  32 ---
 package/p7zip/p7zip.hash                      |   7 +-
 package/p7zip/p7zip.mk                        |  12 +-
 6 files changed, 4 insertions(+), 332 deletions(-)
 delete mode 100644 package/p7zip/0001-CVE-2016-9296.patch
 delete mode 100644 package/p7zip/0002-CVE-2017-17969.patch
 delete mode 100644 package/p7zip/0003-CVE-2018-5996.patch
 delete mode 100644 package/p7zip/0004-Fix-build-with-gcc-10.patch
package/p7zip/0001-CVE-2016-9296.patch deleted +0 -25
deleted file mode 100644
index 6e6fc9f58f..0000000000
@@ -1,25 +0,0 @@
-From: Robert Luberda <[email protected]>
-Date: Sat, 19 Nov 2016 08:48:08 +0100
-Subject: Fix nullptr dereference (CVE-2016-9296)
-
-Patch taken from https://sourceforge.net/p/p7zip/bugs/185/
-
-Signed-off-by: Andr? Hentschel <[email protected]>
----
- CPP/7zip/Archive/7z/7zIn.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CPP/7zip/Archive/7z/7zIn.cpp b/CPP/7zip/Archive/7z/7zIn.cpp
-index b0c6b98..7c6dde2 100644
---- a/CPP/7zip/Archive/7z/7zIn.cpp
-+++ b/CPP/7zip/Archive/7z/7zIn.cpp
-@@ -1097,7 +1097,8 @@ HRESULT CInArchive::ReadAndDecodePackedStreams(
-       if (CrcCalc(data, unpackSize) != folders.FolderCRCs.Vals[i])
-         ThrowIncorrect();
-   }
--  HeadersSize += folders.PackPositions[folders.NumPackStreams];
-+  if (folders.PackPositions)
-+      HeadersSize += folders.PackPositions[folders.NumPackStreams];
-   return S_OK;
- }
- 
package/p7zip/0002-CVE-2017-17969.patch deleted +0 -37
deleted file mode 100644
index 9198127cb9..0000000000
@@ -1,37 +0,0 @@
-From: =?utf-8?q?Antoine_Beaupr=C3=A9?= <[email protected]>
-Date: Fri, 2 Feb 2018 11:11:41 +0100
-Subject: Heap-based buffer overflow in 7zip/Compress/ShrinkDecoder.cpp
-
-Origin: vendor, https://sourceforge.net/p/p7zip/bugs/_discuss/thread/0920f369/27d7/attachment/CVE-2017-17969.patch
-Forwarded: https://sourceforge.net/p/p7zip/bugs/_discuss/thread/0920f369/#27d7
-Bug: https://sourceforge.net/p/p7zip/bugs/204/
-Bug-Debian: https://bugs.debian.org/888297
-Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2017-17969
-Reviewed-by: Salvatore Bonaccorso <[email protected]>
-Last-Update: 2018-02-01
-Applied-Upstream: 18.00-beta
-
-Signed-off-by: Andr? Hentschel <[email protected]>
----
- CPP/7zip/Compress/ShrinkDecoder.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/CPP/7zip/Compress/ShrinkDecoder.cpp b/CPP/7zip/Compress/ShrinkDecoder.cpp
-index 80b7e67..ca37764 100644
---- a/CPP/7zip/Compress/ShrinkDecoder.cpp
-+++ b/CPP/7zip/Compress/ShrinkDecoder.cpp
-@@ -121,8 +121,13 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
-     {
-       _stack[i++] = _suffixes[cur];
-       cur = _parents[cur];
-+      if (cur >= kNumItems || i >= kNumItems)
-+        break;
-     }
--    
-+
-+    if (cur >= kNumItems || i >= kNumItems)
-+      break;
-+
-     _stack[i++] = (Byte)cur;
-     lastChar2 = (Byte)cur;
- 
package/p7zip/0003-CVE-2018-5996.patch deleted +0 -223

223 lines not on this page · raw message

package/p7zip/0004-Fix-build-with-gcc-10.patch deleted +0 -32
deleted file mode 100644
index b01833db29..0000000000
@@ -1,32 +0,0 @@
-From 78b760eae21d7b340c69e8abab8ca706e1e00adc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20S=C3=B8rensen?= <[email protected]>
-Date: Mon, 4 May 2020 09:19:46 +0200
-Subject: [PATCH] Fix build with gcc 10.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add cast to code that mixes HRESULT (aka long) and DWORD (aka unsigned
-int) which causes an narrowing error with gcc 10.
-
-Signed-off-by: Stefan S?rensen <[email protected]>
----
- CPP/Windows/ErrorMsg.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CPP/Windows/ErrorMsg.cpp b/CPP/Windows/ErrorMsg.cpp
-index 99684ae..ab48352 100644
---- a/CPP/Windows/ErrorMsg.cpp
-+++ b/CPP/Windows/ErrorMsg.cpp
-@@ -13,7 +13,7 @@ UString MyFormatMessage(DWORD errorCode)
-   const char * txt = 0;
-   AString msg;
- 
--  switch(errorCode) {
-+  switch((HRESULT)errorCode) {
-     case ERROR_NO_MORE_FILES   : txt = "No more files"; break ;
-     case E_NOTIMPL             : txt = "E_NOTIMPL"; break ;
-     case E_NOINTERFACE         : txt = "E_NOINTERFACE"; break ;
--- 
-2.26.2
-
package/p7zip/p7zip.hash +2 -5
index a63a0b4a97..7b5e7f6ca8 100644
@@ -1,6 +1,3 @@
-# From https://sourceforge.net/projects/p7zip/files/p7zip/16.02/
-md5 a0128d661cfe7cc8c121e73519c54fbf  p7zip_16.02_src_all.tar.bz2
-sha1 e8819907132811aa1afe5ef296181d3a15cc8f22  p7zip_16.02_src_all.tar.bz2
-# Locally computed
-sha256  5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f  p7zip_16.02_src_all.tar.bz2
+# Locally calculated
+sha256  ea029a2e21d2d6ad0a156f6679bd66836204aa78148a4c5e498fe682e77127ef  p7zip-v17.04.tar.gz
 sha256  555806657dcf0f1e720b581c52643c195ec86ae3f00bd18cc66d2e0f88ffa210  DOC/License.txt
package/p7zip/p7zip.mk +2 -10
index 43fbe775dc..f054fb5766 100644
@@ -4,20 +4,12 @@
 #
 ################################################################################
 
-P7ZIP_VERSION = 16.02
-P7ZIP_SOURCE = p7zip_$(P7ZIP_VERSION)_src_all.tar.bz2
-P7ZIP_SITE = http://downloads.sourceforge.net/project/p7zip/p7zip/$(P7ZIP_VERSION)
+P7ZIP_VERSION = v17.04
+P7ZIP_SITE = $(call github,jinfeihan57,p7zip,$(P7ZIP_VERSION))
 P7ZIP_LICENSE = LGPL-2.1+ with unRAR restriction
 P7ZIP_LICENSE_FILES = DOC/License.txt
 P7ZIP_CPE_ID_VENDOR = 7-zip
 
-# 0001-CVE-2016-9296.patch
-P7ZIP_IGNORE_CVES += CVE-2016-9296
-# 0002-CVE-2017-17969.patch
-P7ZIP_IGNORE_CVES += CVE-2017-17969
-# 0003-CVE-2018-5996.patch
-P7ZIP_IGNORE_CVES += CVE-2018-5996
-
 # p7zip buildsystem is a mess: it plays dirty tricks with CFLAGS and
 # CXXFLAGS, so we can't pass them. Instead, it accepts ALLFLAGS_C
 # and ALLFLAGS_CPP as variables to pass the CFLAGS and CXXFLAGS.
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 package/p7zip: bump to version v17.04

Quoted 5 lines · On Mon, 19 Jul 2021 21:21:12 +0200 Andr? Zwing <[email protected]> wrote:

This new attempt to maintain p7zip is already picked up by Distributions. It fixes CVE-2016-9296, CVE-2017-17969, CVE-2018-5996 and CVE-2018-10115. Note that the version is now prefixed with 'v'.

Thanks for this patch, I have applied, but after doing one change.

package/p7zip/p7zip.mk line 8

Quoted 5 lines
package/p7zip/p7zip.mk +2 -3
-P7ZIP_VERSION = 16.02
-P7ZIP_SOURCE = p7zip_$(P7ZIP_VERSION)_src_all.tar.bz2
-P7ZIP_SITE = http://downloads.sourceforge.net/project/p7zip/p7zip/$(P7ZIP_VERSION)
+P7ZIP_VERSION = v17.04
+P7ZIP_SITE = $(call github,jinfeihan57,p7zip,$(P7ZIP_VERSION))

This should have been:

P7ZIP_VERSION = 17.04
P7ZIP_SITE = $(call github,jinfeihan57,p7zip,v$(P7ZIP_VERSION))

So that the "v" isn't in the version prefix. Indeed, we do some matching against release-monitoring.org, and they store versions without "v" prefixes. See https://release-monitoring.org/project/2583/

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com