diff mbox series

[meta-oe,01/11] cabextract: Upgrade 1.11 -> 1.12

Message ID 20261117224337.4181772-1-leon.anavi@konsulko.com
State New
Headers show
Series [meta-oe,01/11] cabextract: Upgrade 1.11 -> 1.12 | expand

Commit Message

Leon Anavi Nov. 17, 2026, 10:43 p.m. UTC
Upgrade to release 1.12:

- cabextract -f now finds "hidden" files. There are two ways to look in
  cabinets for files, which normally have the same results, but don't have
  to. 7-Zip and Microsoft extract.exe find "hidden" files but not "normal"
  files, while cabextract and Microsoft expand.exe find "normal" files but
  not "hidden" files. cabextract -f now finds both "hidden" and "normal"
  files, if they differ.
- cabextract now prints more warning and error messages for normal cab files
  listed on the command line. For example, it now prints "WARNING; atypical
  files offset in header" if cabextract -f might find "hidden" files

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
---
 .../cabextract/cabextract/fix-fnmatch.patch        | 14 +++++++++-----
 .../{cabextract_1.11.bb => cabextract_1.12.bb}     |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)
 rename meta-oe/recipes-support/cabextract/{cabextract_1.11.bb => cabextract_1.12.bb} (88%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/cabextract/cabextract/fix-fnmatch.patch b/meta-oe/recipes-support/cabextract/cabextract/fix-fnmatch.patch
index bd486283b6..27d1028ba5 100644
--- a/meta-oe/recipes-support/cabextract/cabextract/fix-fnmatch.patch
+++ b/meta-oe/recipes-support/cabextract/cabextract/fix-fnmatch.patch
@@ -1,5 +1,6 @@ 
-From - Mon Jun 11 00:00:00 2024
+From e1f0981b45923c50382e7bbbd2f581a9597d68fb Mon Sep 17 00:00:00 2001
 From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+Date: Tue, 17 Nov 2026 13:33:30 +0000
 Subject: [PATCH] Don't play with fnmatch.c replacement
 
 Currently fnmatch.c, even if it is selected, conditionally disables compilation
@@ -15,11 +16,14 @@  collect2: error: ld returned 1 exit status
 
 Upstream-Status: Submitted [https://github.com/kyz/libmspack/pull/51]
 Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+---
+ fnmatch.c | 7 -------
+ 1 file changed, 7 deletions(-)
 
-Index: cabextract-1.11/fnmatch.c
-===================================================================
---- cabextract-1.11.orig/fnmatch.c
-+++ cabextract-1.11/fnmatch.c
+diff --git a/fnmatch.c b/fnmatch.c
+index 868bdae..d2b6f05 100644
+--- a/fnmatch.c
++++ b/fnmatch.c
 @@ -49,11 +49,6 @@ static const char rcsid[] =
     it is simpler to just do this in the source for each such file.
  */
diff --git a/meta-oe/recipes-support/cabextract/cabextract_1.11.bb b/meta-oe/recipes-support/cabextract/cabextract_1.12.bb
similarity index 88%
rename from meta-oe/recipes-support/cabextract/cabextract_1.11.bb
rename to meta-oe/recipes-support/cabextract/cabextract_1.12.bb
index 96e29aef2b..41d475dbf1 100644
--- a/meta-oe/recipes-support/cabextract/cabextract_1.11.bb
+++ b/meta-oe/recipes-support/cabextract/cabextract_1.12.bb
@@ -11,7 +11,7 @@  SRC_URI = "\
     file://fix-fnmatch.patch \
 "
 
-SRC_URI[sha256sum] = "b5546db1155e4c718ff3d4b278573604f30dd64c3c5bfd4657cd089b823a3ac6"
+SRC_URI[sha256sum] = "8f39ad5f9c076b9c62c67dea4f8649e75dcc16899a2d8122ca32ba68262cb713"
 
 UPSTREAM_CHECK_URI = "https://github.com/kyz/libmspack/tags"
 UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)"