<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7c082b3e80bcfe8e6c761106764b596dac14f35e">https://github.com/macports/macports-ports/commit/7c082b3e80bcfe8e6c761106764b596dac14f35e</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 7c082b3e80b xar: update to 1.8.0.852
</span>7c082b3e80b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7c082b3e80bcfe8e6c761106764b596dac14f35e
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Mon Mar 14 06:15:35 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> xar: update to 1.8.0.852
</span>---
archivers/xar/Portfile | 15 +++++-----
archivers/xar/files/patch-stdout.diff | 56 +++++++++++++++++++++--------------
2 files changed, 41 insertions(+), 30 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/xar/Portfile b/archivers/xar/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 56e851f200d..10a67dcc9d5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/xar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/xar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,26 +5,25 @@ PortGroup clang_dependency 1.0
</span> PortGroup openssl 1.0
name xar
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set apple_version 452
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set apple_version 482
</span> version 1.8.0.${apple_version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories archivers sysutils
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin freebsd linux
</span> license BSD
description xar is the eXtensible ARchiver
long_description {*}${description}
maintainers {mps @Schamschula} openmaintainer
homepage https://opensource.apple.com/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}tarballs/xar/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://github.com/apple-oss-distributions/xar/archive/
</span>
distname ${name}-${apple_version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir ${distname}/xar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir ${name}-${distname}/xar
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 287b799d011816ba51a54fda5f78f652e2550ed0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0102eb5c4e1844ea44474624d2d7e542fb6b842377e6962fb879361072802d62 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 220690
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 66bb553e4f964a8e8872406fb8219fc8bbffa20c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 03ae7f6201d2586be03681feb06e32a2ddee08fe59c4002759c354c86964f62d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 220908
</span>
depends_build port:pkgconfig \
port:automake
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/xar/files/patch-stdout.diff b/archivers/xar/files/patch-stdout.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3d3d4d88b01..1e1e752741f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/xar/files/patch-stdout.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/xar/files/patch-stdout.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,9 +13,9 @@ https://github.com/mackyle/xar/commit/ddea2e4b53b6b2cfdd0d13c6beaac0978330c2a2 2
</span> /* xar signing algorithms */
#define XAR_SIG_SHA1RSA 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/archive.c.orig 2022-03-10 05:12:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/archive.c 2022-03-10 06:17:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -876,6 +876,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/archive.c.orig 2022-03-14 05:57:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/archive.c 2022-03-14 06:03:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -886,6 +886,9 @@
</span> if( (strcmp(option, XAR_OPT_TOCCKSUM) == 0) ) {
XAR(x)->heap_offset = xar_io_get_toc_checksum_length_for_type(value);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,31 +25,27 @@ https://github.com/mackyle/xar/commit/ddea2e4b53b6b2cfdd0d13c6beaac0978330c2a2 2
</span>
/* This was an edit from xar-1.4
Looks like we would only allow one definition for a particular key in this list
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1488,26 +1491,39 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *tmp1, *dname;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1499,33 +1502,46 @@
</span> xar_file_t tmpf;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t result = -1;
</span>
- if( (strstr(XAR_FILE(f)->fspath, "/") != NULL) && (stat(XAR_FILE(f)->fspath, &sb)) && (XAR_FILE(f)->parent_extracted == 0) ) {
- tmp1 = strdup(XAR_FILE(f)->fspath);
- dname = xar_safe_dirname(tmp1);
- tmpf = xar_file_find(XAR(x)->files, dname);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- free(dname);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- free(tmp1);
</span> - if( !tmpf ) {
- xar_err_set_string(x, "Unable to find file");
- xar_err_callback(x, XAR_SEVERITY_NONFATAL, XAR_ERR_ARCHIVE_EXTRACTION);
- return -1;
- }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- free(dname);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- free(tmp1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- XAR_FILE(f)->parent_extracted++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int32_t result = xar_extract(x, tmpf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (result < 0)
</span> + if (XAR(x)->tostdout) {
+ char *buffer = NULL;
+ size_t bsize = 0;
+ int32_t result;
+ if ((result = xar_extract_tobuffersz(x, f, &buffer, &bsize)) != 0)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return result;
</span> + if (bsize && buffer && fwrite(buffer, bsize, 1, stdout) != 1)
+ result = -1;
+ free(buffer);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,25 +56,41 @@ https://github.com/mackyle/xar/commit/ddea2e4b53b6b2cfdd0d13c6beaac0978330c2a2 2
</span> + tmp1 = strdup(XAR_FILE(f)->fspath);
+ dname = xar_safe_dirname(tmp1);
+ tmpf = xar_file_find(XAR(x)->files, dname);
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ free(dname);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ free(tmp1);
</span> + if( !tmpf ) {
+ xar_err_set_string(x, "Unable to find file");
+ xar_err_callback(x, XAR_SEVERITY_NONFATAL, XAR_ERR_ARCHIVE_EXTRACTION);
+ return -1;
+ }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ free(dname);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ free(tmp1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XAR_FILE(f)->parent_extracted++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- result = xar_extract(x, tmpf);
</span> + XAR_FILE(f)->parent_extracted++;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int32_t result = xar_extract(x, tmpf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ result = xar_extract(x, tmpf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (result < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return result;
</span> + if (result < 0)
+ return result;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span> + }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return xar_extract_tofile(x, f, XAR_FILE(f)->fspath);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return xar_extract_tofile(x, f, XAR_FILE(f)->fspath);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char* safe_path = xar_get_safe_path(f);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (safe_path) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- result = xar_extract_tofile(x, f, safe_path);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- free(safe_path);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char* safe_path = xar_get_safe_path(f);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (safe_path) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ result = xar_extract_tofile(x, f, safe_path);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ free(safe_path);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span> }
int32_t xar_verify_progress(xar_t x, xar_file_t f, xar_progress_callback p) {
</pre><pre style='margin:0'>
</pre>