From 22a832f2ce965f306a96e8294171c86d16f0893b Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Wed, 2 Oct 2024 19:07:09 -0400 Subject: [PATCH] xar: 498 -> 501 https://github.com/apple-oss-distributions/xar/compare/xar-498...xar-501 --- pkgs/by-name/xa/xar/package.nix | 4 ++-- .../0001-Update-tests-for-Python-3-and-Nix-sandbox.patch | 2 +- .../patches/0002-Update-for-modern-liblzma5-versions.patch | 2 +- .../0003-Fix-undefined-EXT2_ECOMPR_FL-for-e2fsprogs.patch | 2 +- .../patches/0004-Fix-compatibility-with-openssl-1.0.patch | 2 +- .../patches/0005-Fix-configure.ac-for-Linux-headers.patch | 2 +- .../xa/xar/patches/0006-Fix-more-non-Darwin-stuff.patch | 4 ++-- ...replace-initialized-constant-with-define-statement.patch | 2 +- ...Fix-configure.ac-not-finding-AR-with-target-prefix.patch | 2 +- .../0009-Add-useless-descriptions-to-AC_DEFINE.patch | 2 +- ...date-configure.ac-for-openssl-libxml2-liblzma-and-.patch | 2 +- ...x-missing-includes-and-silence-string-format-warni.patch | 4 ++-- .../0012-Fix-char-signedness-for-ARM-and-PowerPC.patch | 2 +- .../patches/0013-Enable-extended-attributes-for-btrfs.patch | 2 +- .../0014-Fix-segfault-when-copying-xattr-buffers.patch | 2 +- .../0015-Fix-segfault-in-xar_attrcopy_from_heap.patch | 6 +++--- .../patches/0016-Do-not-set-property-for-empty-ACL.patch | 2 +- .../xa/xar/patches/0017-Fix-time-format-for-musl.patch | 2 +- .../patches/0018-Replace-memcpy-with-memmove-for-musl.patch | 6 +++--- ...0019-Prefer-OpenSSL-over-CommonCrypto-if-available.patch | 2 +- 20 files changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/by-name/xa/xar/package.nix b/pkgs/by-name/xa/xar/package.nix index 1331041c98af532..3b4aafa43b200b7 100644 --- a/pkgs/by-name/xa/xar/package.nix +++ b/pkgs/by-name/xa/xar/package.nix @@ -31,13 +31,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "xar${lib.optionalString (e2fsprogs == null) "-minimal"}"; - version = "498"; + version = "501"; src = fetchFromGitHub { owner = "apple-oss-distributions"; repo = "xar"; rev = "xar-${finalAttrs.version}"; - hash = "sha256-RyWeR/ZnDBHIZhwzVxETdrTTPQA2VgsLZegRkxX1240="; + hash = "sha256-Fq+Re0LCBIGhW2FR+pgV8SWtaDOEFgTh+rQ8JFWK/k0="; }; # Update patch set with diff --git a/pkgs/by-name/xa/xar/patches/0001-Update-tests-for-Python-3-and-Nix-sandbox.patch b/pkgs/by-name/xa/xar/patches/0001-Update-tests-for-Python-3-and-Nix-sandbox.patch index 2b26cc1429df2f1..e50c467b1c50244 100644 --- a/pkgs/by-name/xa/xar/patches/0001-Update-tests-for-Python-3-and-Nix-sandbox.patch +++ b/pkgs/by-name/xa/xar/patches/0001-Update-tests-for-Python-3-and-Nix-sandbox.patch @@ -957,5 +957,5 @@ index dfe69eb..a5fbe37 100644 } -- -2.44.1 +2.46.0 diff --git a/pkgs/by-name/xa/xar/patches/0002-Update-for-modern-liblzma5-versions.patch b/pkgs/by-name/xa/xar/patches/0002-Update-for-modern-liblzma5-versions.patch index ef9ad00394103f6..b7c50e61ae06a5f 100644 --- a/pkgs/by-name/xa/xar/patches/0002-Update-for-modern-liblzma5-versions.patch +++ b/pkgs/by-name/xa/xar/patches/0002-Update-for-modern-liblzma5-versions.patch @@ -149,5 +149,5 @@ index ba9c868..8dcb484 100644 LZMA_CONTEXT(context)->lzma.next_out = ((unsigned char *)out) + offset; LZMA_CONTEXT(context)->lzma.avail_out = outlen - offset; -- -2.44.1 +2.46.0 diff --git a/pkgs/by-name/xa/xar/patches/0003-Fix-undefined-EXT2_ECOMPR_FL-for-e2fsprogs.patch b/pkgs/by-name/xa/xar/patches/0003-Fix-undefined-EXT2_ECOMPR_FL-for-e2fsprogs.patch index 795c42ad59c401b..a192e860436427e 100644 --- a/pkgs/by-name/xa/xar/patches/0003-Fix-undefined-EXT2_ECOMPR_FL-for-e2fsprogs.patch +++ b/pkgs/by-name/xa/xar/patches/0003-Fix-undefined-EXT2_ECOMPR_FL-for-e2fsprogs.patch @@ -35,5 +35,5 @@ index 767891a..2380846 100644 flags |= EXT2_BTREE_FL ; if( e2prop_get(f, "HashIndexed", (char **)&tmp) == 0 ) -- -2.44.1 +2.46.0 diff --git a/pkgs/by-name/xa/xar/patches/0004-Fix-compatibility-with-openssl-1.0.patch b/pkgs/by-name/xa/xar/patches/0004-Fix-compatibility-with-openssl-1.0.patch index bd1fed261c782f5..28279eb11ce036f 100644 --- a/pkgs/by-name/xa/xar/patches/0004-Fix-compatibility-with-openssl-1.0.patch +++ b/pkgs/by-name/xa/xar/patches/0004-Fix-compatibility-with-openssl-1.0.patch @@ -56,5 +56,5 @@ index 66876ad..cb4f6cf 100644 *nbyte = HASH_CTX(hash)->length; -- -2.44.1 +2.46.0 diff --git a/pkgs/by-name/xa/xar/patches/0005-Fix-configure.ac-for-Linux-headers.patch b/pkgs/by-name/xa/xar/patches/0005-Fix-configure.ac-for-Linux-headers.patch index 1b24fc6b2dfce29..7bfc4834180ec3f 100644 --- a/pkgs/by-name/xa/xar/patches/0005-Fix-configure.ac-for-Linux-headers.patch +++ b/pkgs/by-name/xa/xar/patches/0005-Fix-configure.ac-for-Linux-headers.patch @@ -119,5 +119,5 @@ index 0ea661a..1db2daa 100644 optimal_rsize = fs_iosize; } -- -2.44.1 +2.46.0 diff --git a/pkgs/by-name/xa/xar/patches/0006-Fix-more-non-Darwin-stuff.patch b/pkgs/by-name/xa/xar/patches/0006-Fix-more-non-Darwin-stuff.patch index bd052fba25ef5b0..4c7b0044f611d28 100644 --- a/pkgs/by-name/xa/xar/patches/0006-Fix-more-non-Darwin-stuff.patch +++ b/pkgs/by-name/xa/xar/patches/0006-Fix-more-non-Darwin-stuff.patch @@ -9,7 +9,7 @@ Subject: [PATCH 06/19] Fix more non-Darwin stuff 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/xar/include/xar.h.in b/xar/include/xar.h.in -index 9c93798..3d24b4f 100644 +index 054b742..a4811d1 100644 --- a/xar/include/xar.h.in +++ b/xar/include/xar.h.in @@ -52,6 +52,7 @@ extern "C" { @@ -34,5 +34,5 @@ index 0fec2bb..58ee6a8 100644 free(tmp); free(bname); -- -2.44.1 +2.46.0 diff --git a/pkgs/by-name/xa/xar/patches/0007-replace-initialized-constant-with-define-statement.patch b/pkgs/by-name/xa/xar/patches/0007-replace-initialized-constant-with-define-statement.patch index 0a2bc9dd6cb2d01..e807b2a2f6b49c4 100644 --- a/pkgs/by-name/xa/xar/patches/0007-replace-initialized-constant-with-define-statement.patch +++ b/pkgs/by-name/xa/xar/patches/0007-replace-initialized-constant-with-define-statement.patch @@ -29,5 +29,5 @@ index f31682a..9c30c03 100644 // If the two pointers match, call it the same. -- -2.44.1 +2.46.0 diff --git a/pkgs/by-name/xa/xar/patches/0008-Fix-configure.ac-not-finding-AR-with-target-prefix.patch b/pkgs/by-name/xa/xar/patches/0008-Fix-configure.ac-not-finding-AR-with-target-prefix.patch index 4345a5b271e70bf..8c5d96a80c01b54 100644 --- a/pkgs/by-name/xa/xar/patches/0008-Fix-configure.ac-not-finding-AR-with-target-prefix.patch +++ b/pkgs/by-name/xa/xar/patches/0008-Fix-configure.ac-not-finding-AR-with-target-prefix.patch @@ -33,5 +33,5 @@ index 26d41a5..3d8e5de 100644 dnl Some libtool envy -- -2.44.1 +2.46.0 diff --git a/pkgs/by-name/xa/xar/patches/0009-Add-useless-descriptions-to-AC_DEFINE.patch b/pkgs/by-name/xa/xar/patches/0009-Add-useless-descriptions-to-AC_DEFINE.patch index 8dd0932d09b64ea..8b36f4bf04d1d3a 100644 --- a/pkgs/by-name/xa/xar/patches/0009-Add-useless-descriptions-to-AC_DEFINE.patch +++ b/pkgs/by-name/xa/xar/patches/0009-Add-useless-descriptions-to-AC_DEFINE.patch @@ -109,5 +109,5 @@ index 3d8e5de..0cc04dd 100644 dnl -- -2.44.1 +2.46.0 diff --git a/pkgs/by-name/xa/xar/patches/0010-Update-configure.ac-for-openssl-libxml2-liblzma-and-.patch b/pkgs/by-name/xa/xar/patches/0010-Update-configure.ac-for-openssl-libxml2-liblzma-and-.patch index a1b5aef3ca6cc9f..b3f225da06ac047 100644 --- a/pkgs/by-name/xa/xar/patches/0010-Update-configure.ac-for-openssl-libxml2-liblzma-and-.patch +++ b/pkgs/by-name/xa/xar/patches/0010-Update-configure.ac-for-openssl-libxml2-liblzma-and-.patch @@ -123,5 +123,5 @@ index 0cc04dd..e466ee0 100644 dnl Configure libpthread. dnl -- -2.44.1 +2.46.0 diff --git a/pkgs/by-name/xa/xar/patches/0011-Fix-missing-includes-and-silence-string-format-warni.patch b/pkgs/by-name/xa/xar/patches/0011-Fix-missing-includes-and-silence-string-format-warni.patch index 3eac163156e49cf..870147655488894 100644 --- a/pkgs/by-name/xa/xar/patches/0011-Fix-missing-includes-and-silence-string-format-warni.patch +++ b/pkgs/by-name/xa/xar/patches/0011-Fix-missing-includes-and-silence-string-format-warni.patch @@ -84,7 +84,7 @@ index 1db2daa..ac0b822 100644 #include #include diff --git a/xar/src/xar_internal.h b/xar/src/xar_internal.h -index b78745c..2e6199e 100644 +index b97aba3..8f5ff7b 100644 --- a/xar/src/xar_internal.h +++ b/xar/src/xar_internal.h @@ -8,11 +8,7 @@ @@ -100,5 +100,5 @@ index b78745c..2e6199e 100644 // Undeprecate these for internal usage xar_t xar_open(const char *file, int32_t flags) API_AVAILABLE(macos(10.4)); -- -2.44.1 +2.46.0 diff --git a/pkgs/by-name/xa/xar/patches/0012-Fix-char-signedness-for-ARM-and-PowerPC.patch b/pkgs/by-name/xa/xar/patches/0012-Fix-char-signedness-for-ARM-and-PowerPC.patch index bc4fb7ff850416c..72796ef0334fbbe 100644 --- a/pkgs/by-name/xa/xar/patches/0012-Fix-char-signedness-for-ARM-and-PowerPC.patch +++ b/pkgs/by-name/xa/xar/patches/0012-Fix-char-signedness-for-ARM-and-PowerPC.patch @@ -42,5 +42,5 @@ index 9977e8a..1bceb63 100644 const char *tocfile = NULL; int arglen, i, err; -- -2.44.1 +2.46.0 diff --git a/pkgs/by-name/xa/xar/patches/0013-Enable-extended-attributes-for-btrfs.patch b/pkgs/by-name/xa/xar/patches/0013-Enable-extended-attributes-for-btrfs.patch index 7722e5c748e5732..91f4b445bb86f3c 100644 --- a/pkgs/by-name/xa/xar/patches/0013-Enable-extended-attributes-for-btrfs.patch +++ b/pkgs/by-name/xa/xar/patches/0013-Enable-extended-attributes-for-btrfs.patch @@ -39,5 +39,5 @@ index 58ee6a8..496dd82 100644 for(p = xar_prop_pfirst(f); p; p = xar_prop_pnext(p)) { -- -2.44.1 +2.46.0 diff --git a/pkgs/by-name/xa/xar/patches/0014-Fix-segfault-when-copying-xattr-buffers.patch b/pkgs/by-name/xa/xar/patches/0014-Fix-segfault-when-copying-xattr-buffers.patch index 6a9f3998e512f54..7540711f69b4d5d 100644 --- a/pkgs/by-name/xa/xar/patches/0014-Fix-segfault-when-copying-xattr-buffers.patch +++ b/pkgs/by-name/xa/xar/patches/0014-Fix-segfault-when-copying-xattr-buffers.patch @@ -119,5 +119,5 @@ index 496dd82..30c85c2 100644 } -- -2.44.1 +2.46.0 diff --git a/pkgs/by-name/xa/xar/patches/0015-Fix-segfault-in-xar_attrcopy_from_heap.patch b/pkgs/by-name/xa/xar/patches/0015-Fix-segfault-in-xar_attrcopy_from_heap.patch index bfec41f10a731ae..eeb81e28bbce6d2 100644 --- a/pkgs/by-name/xa/xar/patches/0015-Fix-segfault-in-xar_attrcopy_from_heap.patch +++ b/pkgs/by-name/xa/xar/patches/0015-Fix-segfault-in-xar_attrcopy_from_heap.patch @@ -41,10 +41,10 @@ index dcb5783..cfb3d58 100644 + return XAR(x)->attrcopy_from_heap(x, f, tmpp, xar_data_verify_callback, (void *)(&context)); } diff --git a/xar/lib/io.c b/xar/lib/io.c -index fb9a72e..64c69af 100644 +index ac636eb..efcb5dc 100644 --- a/xar/lib/io.c +++ b/xar/lib/io.c -@@ -529,9 +529,6 @@ int32_t xar_attrcopy_from_heap(xar_t x, xar_file_t f, xar_prop_t p, write_callba +@@ -527,9 +527,6 @@ int32_t xar_attrcopy_from_heap(xar_t x, xar_file_t f, xar_prop_t p, write_callba readsofar += bsize; @@ -55,5 +55,5 @@ index fb9a72e..64c69af 100644 } -- -2.44.1 +2.46.0 diff --git a/pkgs/by-name/xa/xar/patches/0016-Do-not-set-property-for-empty-ACL.patch b/pkgs/by-name/xa/xar/patches/0016-Do-not-set-property-for-empty-ACL.patch index d036d1e3eb82230..9a79c25f8c36d26 100644 --- a/pkgs/by-name/xa/xar/patches/0016-Do-not-set-property-for-empty-ACL.patch +++ b/pkgs/by-name/xa/xar/patches/0016-Do-not-set-property-for-empty-ACL.patch @@ -86,5 +86,5 @@ index b0cce7c..81771dc 100644 if( a ) { char *t; -- -2.44.1 +2.46.0 diff --git a/pkgs/by-name/xa/xar/patches/0017-Fix-time-format-for-musl.patch b/pkgs/by-name/xa/xar/patches/0017-Fix-time-format-for-musl.patch index 6123eef845f84a6..9c8f4a5e741b112 100644 --- a/pkgs/by-name/xa/xar/patches/0017-Fix-time-format-for-musl.patch +++ b/pkgs/by-name/xa/xar/patches/0017-Fix-time-format-for-musl.patch @@ -71,5 +71,5 @@ index 81771dc..d71a613 100644 } else { tv[MTIME].tv_sec = time(NULL); -- -2.44.1 +2.46.0 diff --git a/pkgs/by-name/xa/xar/patches/0018-Replace-memcpy-with-memmove-for-musl.patch b/pkgs/by-name/xa/xar/patches/0018-Replace-memcpy-with-memmove-for-musl.patch index 2b8c17100951eed..cecef1685adda67 100644 --- a/pkgs/by-name/xa/xar/patches/0018-Replace-memcpy-with-memmove-for-musl.patch +++ b/pkgs/by-name/xa/xar/patches/0018-Replace-memcpy-with-memmove-for-musl.patch @@ -8,10 +8,10 @@ Subject: [PATCH 18/19] Replace memcpy with memmove for musl 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xar/lib/io.c b/xar/lib/io.c -index 64c69af..c962c4b 100644 +index efcb5dc..3aa882f 100644 --- a/xar/lib/io.c +++ b/xar/lib/io.c -@@ -650,7 +650,7 @@ static int32_t flush_stream(xar_stream *stream) { +@@ -648,7 +648,7 @@ static int32_t flush_stream(xar_stream *stream) { state->pending_buf = NULL; } else if( state->pending_buf_size > len ) { state->pending_buf_size -= len; @@ -21,5 +21,5 @@ index 64c69af..c962c4b 100644 } -- -2.44.1 +2.46.0 diff --git a/pkgs/by-name/xa/xar/patches/0019-Prefer-OpenSSL-over-CommonCrypto-if-available.patch b/pkgs/by-name/xa/xar/patches/0019-Prefer-OpenSSL-over-CommonCrypto-if-available.patch index 622ae16dc5fe99e..2091200edaa348f 100644 --- a/pkgs/by-name/xa/xar/patches/0019-Prefer-OpenSSL-over-CommonCrypto-if-available.patch +++ b/pkgs/by-name/xa/xar/patches/0019-Prefer-OpenSSL-over-CommonCrypto-if-available.patch @@ -146,5 +146,5 @@ index cb4f6cf..b99eca9 100644 CCDigestDestroy(HASH_CTX(hash)->digest); #else -- -2.44.1 +2.46.0