<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cf4834210b8eff4a766d55993389d7548fa5aafd">https://github.com/macports/macports-ports/commit/cf4834210b8eff4a766d55993389d7548fa5aafd</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 cf4834210b8 libarchive: update to 3.7.1
</span>cf4834210b8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cf4834210b8eff4a766d55993389d7548fa5aafd
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Jul 31 07:43:27 2023 +1000
<span style='display:block; white-space:pre;color:#404040;'> libarchive: update to 3.7.1
</span>---
archivers/libarchive/Portfile | 14 ++--
archivers/libarchive/files/bsdunzip-time.diff | 85 --------------------
archivers/libarchive/files/getline.patch | 92 ----------------------
...archive__archive_read_support_format_lha.c.diff | 20 -----
4 files changed, 6 insertions(+), 205 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/libarchive/Portfile b/archivers/libarchive/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a6e7379ddc3..91f474cead0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/libarchive/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/libarchive/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup clang_dependency 1.0
</span> PortGroup github 1.0
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup libarchive libarchive 3.7.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup libarchive libarchive 3.7.1 v
</span> github.tarball_from releases
categories archivers
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,9 +18,10 @@ long_description \
</span> most popular tar variants, several cpio formats, 7zip and rar. It can \
also write shar archives.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 14d2fa5007e6fcf69a1edfa8fd95f3177f237c9f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d937886a14b48c4287c4d343644feb294a14b31b7926ba9a4f1777123ce7c2cc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7462563
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 fad90cf001cade0211f62a7b2bef3a0a1809f459 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b17403ce670ff18d8e06fea05a9ea9accf70678c88f1b9392a2e29b51127895f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5254260
</span>
homepage https://libarchive.org/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,10 +30,7 @@ depends_lib port:bzip2 port:zlib port:libxml2 port:xz \
</span> port:lz4 port:zstd \
port:libb2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-libarchive__archive_read_support_format_lha.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fix_pc_file.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bsdunzip-time.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- getline.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles fix_pc_file.patch
</span>
platform darwin 8 {
patchfiles-append patch-libarchive-3.5-fix-tests-tiger.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/libarchive/files/bsdunzip-time.diff b/archivers/libarchive/files/bsdunzip-time.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 19199cb84a0..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/libarchive/files/bsdunzip-time.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,85 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/libarchive/libarchive/commit/b55d25506ad63667e394a31bee91b494ad891ceb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/unzip/bsdunzip.c b/unzip/bsdunzip.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index be18ecfb5..cd8237aa7 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- unzip/bsdunzip.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ unzip/bsdunzip.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -72,6 +72,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_UNISTD_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if ((!defined(HAVE_UTIMENSAT) && defined(HAVE_LUTIMES)) || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (!defined(HAVE_FUTIMENS) && defined(HAVE_FUTIMES)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_SYS_TIME_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <sys/time.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <archive.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <archive_entry.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -630,9 +636,15 @@ extract_file(struct archive *a, struct archive_entry *e, char **path)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int mode;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct timespec mtime;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct stat sb;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- struct timespec ts[2];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int fd, check, text;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *linkname;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(HAVE_UTIMENSAT) || defined(HAVE_FUTIMENS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct timespec ts[2];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if ((!defined(HAVE_UTIMENSAT) && defined(HAVE_LUTIMES)) || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (!defined(HAVE_FUTIMENS) && defined(HAVE_FUTIMES)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct timeval times[2];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mode = archive_entry_mode(e) & 0777;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (mode == 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -686,9 +698,18 @@ extract_file(struct archive *a, struct archive_entry *e, char **path)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</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;'>-+#if defined(HAVE_UTIMENSAT) || defined(HAVE_FUTIMENS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ts[0].tv_sec = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ts[0].tv_nsec = UTIME_NOW;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ts[1] = mtime;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if ((!defined(HAVE_UTIMENSAT) && defined(HAVE_LUTIMES)) || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (!defined(HAVE_FUTIMENS) && defined(HAVE_FUTIMES)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ times[0].tv_sec = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ times[0].tv_usec = -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ times[1].tv_sec = mtime.tv_sec;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ times[1].tv_usec = mtime.tv_nsec / 1000;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* process symlinks */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- linkname = archive_entry_symlink(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -701,8 +722,14 @@ extract_file(struct archive *a, struct archive_entry *e, char **path)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- warning("Cannot set mode for '%s'", *path);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* set access and modification time */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(HAVE_UTIMENSAT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (utimensat(AT_FDCWD, *path, ts, AT_SYMLINK_NOFOLLOW) != 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- warning("utimensat('%s')", *path);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(HAVE_LUTIMES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gettimeofday(×[0], NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (lutimes(*path, times) != 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ warning("lutimes('%s')", *path);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</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;'>-@@ -720,8 +747,14 @@ extract_file(struct archive *a, struct archive_entry *e, char **path)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- info("\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* set access and modification time */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(HAVE_FUTIMENS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (futimens(fd, ts) != 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error("futimens('%s')", *path);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(HAVE_FUTIMES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gettimeofday(×[0], NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (futimes(fd, times) != 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ error("futimes('%s')", *path);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (close(fd) != 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error("close('%s')", *path);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/libarchive/files/getline.patch b/archivers/libarchive/files/getline.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 041684d0298..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/libarchive/files/getline.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,92 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- unzip/bsdunzip.c.orig 2023-07-24 16:33:11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ unzip/bsdunzip.c 2023-07-24 16:54:44
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -460,7 +460,89 @@ static char spinner[] = { '|', '/', '-', '\\' };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static unsigned char buffer[8192];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static char spinner[] = { '|', '/', '-', '\\' };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(__DARWIN_C_LEVEL) || __DARWIN_C_LEVEL < 200809L
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* Need to provide getline() implementation */
</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;'>-+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * All rights reserved.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * This code is derived from software contributed to The NetBSD Foundation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * by Christos Zoulas.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Redistribution and use in source and binary forms, with or without
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * modification, are permitted provided that the following conditions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * are met:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * 1. Redistributions of source code must retain the above copyright
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * notice, this list of conditions and the following disclaimer.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * 2. Redistributions in binary form must reproduce the above copyright
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * notice, this list of conditions and the following disclaimer in the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * documentation and/or other materials provided with the distribution.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * POSSIBILITY OF SUCH DAMAGE.
</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;'>-+ssize_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *ptr, *eptr;
</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;'>-+ if (*buf == NULL || *bufsiz == 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *bufsiz = BUFSIZ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((*buf = malloc(*bufsiz)) == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return -1;
</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;'>-+ for (ptr = *buf, eptr = *buf + *bufsiz;;) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int c = fgetc(fp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (c == -1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (feof(fp)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ssize_t diff = (ssize_t)(ptr - *buf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (diff != 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *ptr = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return diff;
</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 -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *ptr++ = c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (c == delimiter) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *ptr = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return ptr - *buf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (ptr + 2 >= eptr) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *nbuf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t nbufsiz = *bufsiz * 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ssize_t d = ptr - *buf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((nbuf = realloc(*buf, nbufsiz)) == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *buf = nbuf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *bufsiz = nbufsiz;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ eptr = nbuf + nbufsiz;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ptr = nbuf + d;
</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;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ssize_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+getline(char **buf, size_t *bufsiz, FILE *fp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return getdelim(buf, bufsiz, '\n', fp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- handle_existing_file(char **path)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/libarchive/files/patch-libarchive__archive_read_support_format_lha.c.diff b/archivers/libarchive/files/patch-libarchive__archive_read_support_format_lha.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c7c5be62d8b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/libarchive/files/patch-libarchive__archive_read_support_format_lha.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libarchive/archive_read_support_format_lha.c.orig 2016-12-02 00:55:30.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libarchive/archive_read_support_format_lha.c 2016-12-02 00:59:09.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1814,13 +1814,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* This if statement expects compiler optimization will
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * remove the statement which will not be executed. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef bswap16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __has_builtin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define __has_builtin(x) 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(_MSC_VER) && _MSC_VER >= 1400 /* Visual Studio */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define bswap16(x) _byteswap_ushort(x)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 8) || __GNUC__ > 4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* GCC 4.8 and later has __builtin_bswap16() */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define bswap16(x) __builtin_bswap16(x)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif defined(__clang__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* All clang versions have __builtin_bswap16() */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(__clang__) && __has_builtin(__builtin_bswap16)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define bswap16(x) __builtin_bswap16(x)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define bswap16(x) ((((x) >> 8) & 0xff) | ((x) << 8))
</span></pre><pre style='margin:0'>
</pre>