[backports-release-1.10] Bump p7zip_jll to 17.6.1

deps/checksums/p7zip

@@ -1,34 +1,34 @@
-p7zip-17.04.tar.gz/md5/00acfd6be87848231722d2d53f89e4a5
-p7zip-17.04.tar.gz/sha512/ad176db5b657b1c39584f6792c47978d94f2f1ccb1cf5bdb0f52ab31a7356b3822f4a922152c4253f4aa7e79166ba052b6592530b7a38f548cd555fe9c008be3
-p7zip.v17.4.0+2.aarch64-apple-darwin.tar.gz/md5/b418adbae6512a13e04407c120ba78e0
-p7zip.v17.4.0+2.aarch64-apple-darwin.tar.gz/sha512/818f7afb0d3ffbff8079f5f4b8e9745a847148ac9cb5a261b6ca2f2f3a1dd722fa93f798645129bc9bc4a48f756bf2e55605791abb394a32635dfaef31f21e70
-p7zip.v17.4.0+2.aarch64-linux-gnu.tar.gz/md5/3f976d6514e6327a9aee4a3f21a25a64
-p7zip.v17.4.0+2.aarch64-linux-gnu.tar.gz/sha512/a4dd8be97c53b864e81aae40e248759f97249fbd6d8c5b91f0ac115a84126cbfc4825ffa3876f5e8b66652b014a78ba04e3ffc1ba1d9c96786b914b1279682c0
-p7zip.v17.4.0+2.aarch64-linux-musl.tar.gz/md5/b31699d7ea671c689fa9194913fbe7ee
-p7zip.v17.4.0+2.aarch64-linux-musl.tar.gz/sha512/5c8d95df66055ab8027b047b23534743ac929befd37dc8a8e591deece22006209f94524f7951de580a5ded9530ead2ce7ec3370c482865554830b53d09f41bf1
-p7zip.v17.4.0+2.armv6l-linux-gnueabihf.tar.gz/md5/fbe2ebeeaa6e5b33dcb71662fb7040f1
-p7zip.v17.4.0+2.armv6l-linux-gnueabihf.tar.gz/sha512/6ca1d7eb1d3f6a7c4dc9860ac3d5a835abce92cddcda015a93086ecde44ed1b3d9f83a3c1e1eddc510af429ec269716dde6bc5fae4aa6bbbc3dcfc9a51326786
-p7zip.v17.4.0+2.armv6l-linux-musleabihf.tar.gz/md5/dae4b1e6060bf4431d3ead53e6b3e167
-p7zip.v17.4.0+2.armv6l-linux-musleabihf.tar.gz/sha512/856c2283c63728d8c542ce5a3d58e38c985f190774c407fc421dd30f05e0ae3467e2844cb7d535aa8a6b8fb24b21b29af75b736fbd9af67c24340609ad6b5841
-p7zip.v17.4.0+2.armv7l-linux-gnueabihf.tar.gz/md5/42b6b9b19158303c4399d651ee5b14cf
-p7zip.v17.4.0+2.armv7l-linux-gnueabihf.tar.gz/sha512/4f8792639db8599af026f592496a8c594c0fd6a62dc949965add55b1b85a95d4edc2f99960cf5b21e7beeb8e1bca1d9c1a1a34600103df04dc20d0509410c486
-p7zip.v17.4.0+2.armv7l-linux-musleabihf.tar.gz/md5/e34f5585a50c0cfce29c79e9ece60cf4
-p7zip.v17.4.0+2.armv7l-linux-musleabihf.tar.gz/sha512/87f72568f5a877008d3a8a032a85f69c29d3af4293d7b42d70419bb4c9ca7e99dc13c6b22621ca83886d07f765118451ee9f2a3aee63979d8070910887bf7cdd
-p7zip.v17.4.0+2.i686-linux-gnu.tar.gz/md5/d917247133b1c62663334b6a908e30e9
-p7zip.v17.4.0+2.i686-linux-gnu.tar.gz/sha512/4839bec129b7fbd68c61d35fd3b3af9863c757d9fec0220926d45f1f58174d88d0bbb4a472d259d1d77775b906e9c58ba707fc20e2a4a060ca9030722609182d
-p7zip.v17.4.0+2.i686-linux-musl.tar.gz/md5/951614fc7597de8c12e0109cbd81bfa9
-p7zip.v17.4.0+2.i686-linux-musl.tar.gz/sha512/f0420ddd6df82d2b3e1ece9cc5cf537cb0803d291d274a495bb9a575bb253a4241cdae38a88e43ddafaab7f6911b310a30c1b874b0a0a9bc447f8c42c5a24652
-p7zip.v17.4.0+2.i686-w64-mingw32.tar.gz/md5/cc81daf0e40990c48db178cb53a95d08
-p7zip.v17.4.0+2.i686-w64-mingw32.tar.gz/sha512/ae5bcbcf32dad20db95319c3c2f874fdbb0cd41054d6c192f2ab106e0aece1b4b0b591055b37c2c909b07b303204a75dec5c4b3c224243c2041da811f99cd7e5
-p7zip.v17.4.0+2.powerpc64le-linux-gnu.tar.gz/md5/e97d74ac4dacfaa215c3119e055a2df0
-p7zip.v17.4.0+2.powerpc64le-linux-gnu.tar.gz/sha512/8b0596ebd84fa9947e8f15f63c426339980e08c81eb4c1474b4a66af6329f0a2fe1bd31eef964d147bf9cf0213e85bdc143fab1a4f1dbfa09da5ebd9e73a3d8d
-p7zip.v17.4.0+2.x86_64-apple-darwin.tar.gz/md5/4d9a26dbfc0a02a812c8f7de20ea5440
-p7zip.v17.4.0+2.x86_64-apple-darwin.tar.gz/sha512/3cba51ba9742b616afec13a14e8e3bd3c73c835256af8f6a49d4abf32f5ddf3f86ac8ae08ffd9bc331caa8a711dd1b63f4cd082443a7863e3d512f6ca2152bcd
-p7zip.v17.4.0+2.x86_64-linux-gnu.tar.gz/md5/37b7570712ecb8677059f4280a346201
-p7zip.v17.4.0+2.x86_64-linux-gnu.tar.gz/sha512/9445add6a475bdfc2924dc52c07917c2746b07a41a2dbfdab8ad4b4e5b87b0192c13f4da5da64e5d3544bbf9c79fda3c633664eecb372e8475031789770c41ee
-p7zip.v17.4.0+2.x86_64-linux-musl.tar.gz/md5/04d6ae950d05c81c6b165721de2ba7e7
-p7zip.v17.4.0+2.x86_64-linux-musl.tar.gz/sha512/524d8ed80a1af903b572d5e32710b384702175cacc83ce2305d7f7a35d45aae7d08e2afc14a9e40c934ba4eb578787afa9bece4f820e96e4b624869cb2bcec26
-p7zip.v17.4.0+2.x86_64-unknown-freebsd.tar.gz/md5/e2a3361e91258e39db541c9dec5a73fe
-p7zip.v17.4.0+2.x86_64-unknown-freebsd.tar.gz/sha512/ecc1db9a1823ebdac290548f6e001688b5d111caede4cbfab4e2ef492dbb31844690e9b69360ed9c6ebb2affded7f352d57c0e5cfe67be951876d1fc5e87d92d
-p7zip.v17.4.0+2.x86_64-w64-mingw32.tar.gz/md5/2b5f77bb31526c469e0fd48399d0cf9a
-p7zip.v17.4.0+2.x86_64-w64-mingw32.tar.gz/sha512/a3a17af4db98b82b71c8d4d09e5315dc4fa77b38cc19f0593654b63744bc7489383d40032e48c2141d6b55e330d1538c527819378a2575a245de436bc6daf532
+p7zip-17.06.tar.gz/md5/d1c764d2b0ad18ec9fc2a4ac9693b110
+p7zip-17.06.tar.gz/sha512/5d6fa691da7fcbeabfe5610aa29b613daac1470002c3d84201f3ad63bcf79f2c72e21fa45f6ba19abbb41cf404f2d659990b9f9fd29b84ac511c8a17f09fec68
+p7zip.v17.6.1+0.aarch64-apple-darwin.tar.gz/md5/93c592e6122e692020bd36e6128bf45b
+p7zip.v17.6.1+0.aarch64-apple-darwin.tar.gz/sha512/431e266b17f09e221e557ccb65e1d45b27db06ef893127568d688f59d3825f2d72a2a801b84b1e56cfd7f8dec99c7871a722bf003a173b7ca605a4142da246b7
+p7zip.v17.6.1+0.aarch64-linux-gnu.tar.gz/md5/ae0b4a1239421acccddb1071fce9d0eb
+p7zip.v17.6.1+0.aarch64-linux-gnu.tar.gz/sha512/dd163718da495641542764855b85d7b8a29c79d0d68b0b57e01d32ed4a44cb8bb8b7fa4a7d2dd8dc22f5b692134be13c8732429c59464d0924c0723179c28c14
+p7zip.v17.6.1+0.aarch64-linux-musl.tar.gz/md5/d6c13a52c726ca9222e4daacfea2858d
+p7zip.v17.6.1+0.aarch64-linux-musl.tar.gz/sha512/8ca70ecc8486cd669226b0b2ba29a76014f3a3812b39103b3c194883dea140be765e3beb22d08706d4e5edc3e491680840d18d49cb2986ee57de2f02ca701b26
+p7zip.v17.6.1+0.armv6l-linux-gnueabihf.tar.gz/md5/a3113a09c037c4ddfb291512969e6af1
+p7zip.v17.6.1+0.armv6l-linux-gnueabihf.tar.gz/sha512/cada8c6a642817ca26835056e3134e8d226d171b96c3de9b6882640349b960c3a5963ad8e3bea676b1cba8e5f0661cc168fc9f8f2f4c7d00bad2b7b3eaa58712
+p7zip.v17.6.1+0.armv6l-linux-musleabihf.tar.gz/md5/bc16a76eb41e80145140c4100d187391
+p7zip.v17.6.1+0.armv6l-linux-musleabihf.tar.gz/sha512/3f5ffa4397a0ee893fd8d0c36616268bf7cba79ed2574edaa167bd370a34d68778eeba434afbec4b863f9ece052e4cc84f9a6cba50b062ffda9e78a7ba49995c
+p7zip.v17.6.1+0.armv7l-linux-gnueabihf.tar.gz/md5/7bb800aa01942efcdd264e0cb184189b
+p7zip.v17.6.1+0.armv7l-linux-gnueabihf.tar.gz/sha512/88fef4e50f7b1bc9e6f340559916a83fc5cabaa3d44feec131b80bd4f62b883c363ff3edfb9c6410702c317151b0d531cd47222850a150090ba5f6416112128d
+p7zip.v17.6.1+0.armv7l-linux-musleabihf.tar.gz/md5/4ecfdd2c67d6ed6e165d7a40b77619dd
+p7zip.v17.6.1+0.armv7l-linux-musleabihf.tar.gz/sha512/bcd88c1149a927100850fe428c51ee141356b1173900c1f416f66bed1ed4791f1996c1514362053f50075a841bca89e3ab1cee5a93ee70ff6578f44c677f95a6
+p7zip.v17.6.1+0.i686-linux-gnu.tar.gz/md5/800fb52191fa2bb14e81717d6d981148
+p7zip.v17.6.1+0.i686-linux-gnu.tar.gz/sha512/72a7ef2268aceaffd43a009d50a2664c1aa8674dcd50b40a41a469c8b55ecee6af133ae78f5284ac5143423d12819bcdc6b2ed82898d2484b59cad0469a698c7
+p7zip.v17.6.1+0.i686-linux-musl.tar.gz/md5/b29eabbd4392475025ab0e8842751a48
+p7zip.v17.6.1+0.i686-linux-musl.tar.gz/sha512/2111c68684c08666d53d188623537f0d1045880abd0c45b0860f989a15c000a87102c76d5ea9f05233af56623bc42a6dc23e00275ad45c790cf3519a6e965fe4
+p7zip.v17.6.1+0.i686-w64-mingw32.tar.gz/md5/8aa4ea90bc28bbaa4f480dac0c64a4ab
+p7zip.v17.6.1+0.i686-w64-mingw32.tar.gz/sha512/796152faeeaa8a1eec913597fdc52d18f3af1c777fcb4e38d24ca074cf1e5269a51d30b5ae240b28b836c2fda8696f93b1102f0b6b97401abc2200cb7583e96a
+p7zip.v17.6.1+0.powerpc64le-linux-gnu.tar.gz/md5/27eb34b92c3a3d316662a09358887117
+p7zip.v17.6.1+0.powerpc64le-linux-gnu.tar.gz/sha512/747c4fec17286490294092eb85e365cde2bc3657b5f67a0bcc2578e36ef441b53454181baea4dfd42b0385d43dbffcce6580918b714b8754e322a1e5da59cb14
+p7zip.v17.6.1+0.x86_64-apple-darwin.tar.gz/md5/360e51654cb9c10d1714b93937e6ccd2
+p7zip.v17.6.1+0.x86_64-apple-darwin.tar.gz/sha512/1126f1ac3386f2af6b5889e18949765b791d197fc86a301d725a4140bcd1731b2b4f9bce9ffb2c18e04738ee4d9594064b9d6d64915fc1583264ab338397bec5
+p7zip.v17.6.1+0.x86_64-linux-gnu.tar.gz/md5/e06ebc6d7c418ae3d9300f5f3fb1962c
+p7zip.v17.6.1+0.x86_64-linux-gnu.tar.gz/sha512/4c6e840cab63b1ca8d1b04c7ce25bf194126da3c344f90f05e6df9d377cab269de83285b3eec08d8de6960a92dfb61d7750a711e6ff0771ca5888f538bee1577
+p7zip.v17.6.1+0.x86_64-linux-musl.tar.gz/md5/9fb835290f6f13d36d7652fe2a4b8cb1
+p7zip.v17.6.1+0.x86_64-linux-musl.tar.gz/sha512/f2bda87542077107446f3a845c6e12a33829184a78972aaf09f4c85f7de5175d8a8392c7cc161bed4278b340ab7696eb5a29f6a97f098243475dc5b0a3ad41ab
+p7zip.v17.6.1+0.x86_64-unknown-freebsd.tar.gz/md5/61f4a73a10ac176da322c65cfb0516a3
+p7zip.v17.6.1+0.x86_64-unknown-freebsd.tar.gz/sha512/8c16ff3e12bad12b7f61c972b68510f51967bc7ede9c7b739b57b7773a08099b19d2b097b86b6de25424e852bb2179857dc99d96d874fd163b1739d7f7109c31
+p7zip.v17.6.1+0.x86_64-w64-mingw32.tar.gz/md5/9eeab70f56b060d749f24e0faedfc12f
+p7zip.v17.6.1+0.x86_64-w64-mingw32.tar.gz/sha512/fa024300b9bd6bf147f4d7200a28b72a0690159b33567b5de23ac32c5572b7c423618adcc1a4463639283fab7a643c4e70f84343572907220cd8b4a1014f1cef

deps/p7zip.mk

@@ -15,7 +15,12 @@ $(BUILDDIR)/p7zip-$(P7ZIP_VER)/source-extracted: $(SRCCACHE)/p7zip-$(P7ZIP_VER).
 checksum-p7zip: $(SRCCACHE)/p7zip-$(P7ZIP_VER).tar.gz
 	$(JLCHECKSUM) $<
 
-$(BUILDDIR)/p7zip-$(P7ZIP_VER)/build-configured: $(BUILDDIR)/p7zip-$(P7ZIP_VER)/source-extracted
+$(BUILDDIR)/p7zip-$(P7ZIP_VER)/p7zip-zipitem.patch-applied: $(BUILDDIR)/p7zip-$(P7ZIP_VER)/source-extracted
+	cd $(BUILDDIR)/p7zip-$(P7ZIP_VER) && \
+		patch -p1 -f < $(SRCDIR)/patches/p7zip-zipitem.patch
+	echo 1 > $@
+
+$(BUILDDIR)/p7zip-$(P7ZIP_VER)/build-configured: $(BUILDDIR)/p7zip-$(P7ZIP_VER)/p7zip-zipitem.patch-applied
 $(BUILDDIR)/p7zip-$(P7ZIP_VER)/build-compiled: $(BUILDDIR)/p7zip-$(P7ZIP_VER)/build-configured
 	$(MAKE) -C $(dir $<) $(MAKE_COMMON) CC="$(CC)" CXX="$(CXX)" 7za
 	echo 1 > $@

deps/p7zip.version

@@ -2,4 +2,4 @@
 P7ZIP_JLL_NAME := p7zip
 
 ## source build
-P7ZIP_VER := 17.04
+P7ZIP_VER := 17.06

deps/patches/p7zip-zipitem.patch

@@ -0,0 +1,101 @@
+diff --git a/CPP/7zip/Archive/Zip/ZipItem.cpp b/CPP/7zip/Archive/Zip/ZipItem.cpp
+index 353e895..a196245 100644
+--- a/CPP/7zip/Archive/Zip/ZipItem.cpp
++++ b/CPP/7zip/Archive/Zip/ZipItem.cpp
+@@ -1,9 +1,5 @@
+ // Archive/ZipItem.cpp
+
+-#if (!defined _WIN32) && (!defined __CYGWIN__) && (!defined __APPLE__)
+-#include <iconv.h>
+-#include <locale.h>
+-#endif
+
+ #include "StdAfx.h"
+
+@@ -355,86 +351,6 @@ void CItem::GetUnicodeString(UString &res, const AString &s, bool isComment, boo
+     #endif
+   }
+
+-  #if (!defined _WIN32) && (!defined __CYGWIN__) && (!defined __APPLE__)
+-  // Convert OEM char set to UTF-8 if needed
+-  // Use system locale to select code page
+-
+-  Byte hostOS = GetHostOS();
+-  if (!isUtf8 && ((hostOS == NFileHeader::NHostOS::kFAT) || (hostOS == NFileHeader::NHostOS::kNTFS))) {
+-
+-    const char *oemcp;
+-    oemcp = getenv("OEMCP");
+-    if (!oemcp) {
+-      oemcp = "CP437\0"; // CP name is 6 chars max
+-
+-      const char *lc_to_cp_table[] = {
+-      "af_ZA", "CP850", "ar_SA", "CP720", "ar_LB", "CP720", "ar_EG", "CP720",
+-      "ar_DZ", "CP720", "ar_BH", "CP720", "ar_IQ", "CP720", "ar_JO", "CP720",
+-      "ar_KW", "CP720", "ar_LY", "CP720", "ar_MA", "CP720", "ar_OM", "CP720",
+-      "ar_QA", "CP720", "ar_SY", "CP720", "ar_TN", "CP720", "ar_AE", "CP720",
+-      "ar_YE", "CP720","ast_ES", "CP850", "az_AZ", "CP866", "az_AZ", "CP857",
+-      "be_BY", "CP866", "bg_BG", "CP866", "br_FR", "CP850", "ca_ES", "CP850",
+-      "zh_CN", "CP936", "zh_TW", "CP950", "kw_GB", "CP850", "cs_CZ", "CP852",
+-      "cy_GB", "CP850", "da_DK", "CP850", "de_AT", "CP850", "de_LI", "CP850",
+-      "de_LU", "CP850", "de_CH", "CP850", "de_DE", "CP850", "el_GR", "CP737",
+-      "en_AU", "CP850", "en_CA", "CP850", "en_GB", "CP850", "en_IE", "CP850",
+-      "en_JM", "CP850", "en_BZ", "CP850", "en_PH", "CP437", "en_ZA", "CP437",
+-      "en_TT", "CP850", "en_US", "CP437", "en_ZW", "CP437", "en_NZ", "CP850",
+-      "es_PA", "CP850", "es_BO", "CP850", "es_CR", "CP850", "es_DO", "CP850",
+-      "es_SV", "CP850", "es_EC", "CP850", "es_GT", "CP850", "es_HN", "CP850",
+-      "es_NI", "CP850", "es_CL", "CP850", "es_MX", "CP850", "es_ES", "CP850",
+-      "es_CO", "CP850", "es_ES", "CP850", "es_PE", "CP850", "es_AR", "CP850",
+-      "es_PR", "CP850", "es_VE", "CP850", "es_UY", "CP850", "es_PY", "CP850",
+-      "et_EE", "CP775", "eu_ES", "CP850", "fa_IR", "CP720", "fi_FI", "CP850",
+-      "fo_FO", "CP850", "fr_FR", "CP850", "fr_BE", "CP850", "fr_CA", "CP850",
+-      "fr_LU", "CP850", "fr_MC", "CP850", "fr_CH", "CP850", "ga_IE", "CP437",
+-      "gd_GB", "CP850", "gv_IM", "CP850", "gl_ES", "CP850", "he_IL", "CP862",
+-      "hr_HR", "CP852", "hu_HU", "CP852", "id_ID", "CP850", "is_IS", "CP850",
+-      "it_IT", "CP850", "it_CH", "CP850", "iv_IV", "CP437", "ja_JP", "CP932",
+-      "kk_KZ", "CP866", "ko_KR", "CP949", "ky_KG", "CP866", "lt_LT", "CP775",
+-      "lv_LV", "CP775", "mk_MK", "CP866", "mn_MN", "CP866", "ms_BN", "CP850",
+-      "ms_MY", "CP850", "nl_BE", "CP850", "nl_NL", "CP850", "nl_SR", "CP850",
+-      "nn_NO", "CP850", "nb_NO", "CP850", "pl_PL", "CP852", "pt_BR", "CP850",
+-      "pt_PT", "CP850", "rm_CH", "CP850", "ro_RO", "CP852", "ru_RU", "CP866",
+-      "sk_SK", "CP852", "sl_SI", "CP852", "sq_AL", "CP852", "sr_RS", "CP855",
+-      "sr_RS", "CP852", "sv_SE", "CP850", "sv_FI", "CP850", "sw_KE", "CP437",
+-      "th_TH", "CP874", "tr_TR", "CP857", "tt_RU", "CP866", "uk_UA", "CP866",
+-      "ur_PK", "CP720", "uz_UZ", "CP866", "uz_UZ", "CP857", "vi_VN", "CP1258",
+-      "wa_BE", "CP850", "zh_HK", "CP950", "zh_SG", "CP936"};
+-      int table_len = sizeof(lc_to_cp_table) / sizeof(char *);
+-      int lc_len, i;
+-
+-      char *lc = setlocale(LC_CTYPE, "");
+-
+-      if (lc && lc[0]) {
+-          // Compare up to the dot, if it exists, e.g. en_US.UTF-8
+-          for (lc_len = 0; lc[lc_len] != '.' && lc[lc_len] != '\0'; ++lc_len)
+-              ;
+-          for (i = 0; i < table_len; i += 2)
+-              if (strncmp(lc, lc_to_cp_table[i], lc_len) == 0)
+-                  oemcp = lc_to_cp_table[i + 1];
+-      }
+-    }
+-
+-    iconv_t cd;
+-    if ((cd = iconv_open("UTF-8", oemcp)) != (iconv_t)-1) {
+-
+-      AString s_utf8;
+-      const char* src = s.Ptr();
+-      size_t slen = s.Len();
+-      size_t dlen = slen * 4;
+-      const char* dest = s_utf8.GetBuf_SetEnd(dlen + 1); // (source length * 4) + null termination
+-
+-      size_t done = iconv(cd, (char**)&src, &slen, (char**)&dest, &dlen);
+-      bzero((size_t*)dest + done, 1);
+-
+-      iconv_close(cd);
+-
+-      if (ConvertUTF8ToUnicode(s_utf8, res) || ignore_Utf8_Errors)
+-        return;
+-    }    
+-  }
+-  #endif
+
+   if (isUtf8)
+     if (ConvertUTF8ToUnicode(s, res) || ignore_Utf8_Errors)

stdlib/p7zip_jll/Project.toml

@@ -1,6 +1,6 @@
 name = "p7zip_jll"
 uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
-version = "17.4.0+2"
+version = "17.6.1+0"
 
 [deps]
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"