<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/aa599916919c535ea6e639d4d9182a78c282aaf5">https://github.com/macports/macports-ports/commit/aa599916919c535ea6e639d4d9182a78c282aaf5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit aa599916919c535ea6e639d4d9182a78c282aaf5
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Sat Mar 13 04:34:33 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> libarchive: drop unneeded patch
</span>---
archivers/libarchive/Portfile | 6 ------
.../files/patch-libarchive-3.5-strnlen.diff | 25 ----------------------
2 files changed, 31 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 107ab2a7c44..9a3eaa568ab 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;'>@@ -32,12 +32,6 @@ depends_lib port:bzip2 port:zlib port:libxml2 port:xz \
</span>
patchfiles patch-libarchive__archive_read_support_format_lha.c.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch for strnlen -- using legacysupport causes a failure on Tiger
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# note upstream now has fallback function for next release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/libarchive/libarchive/issues/1464
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# REMOVE this patch for next libarchive release please
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-libarchive-3.5-strnlen.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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/patch-libarchive-3.5-strnlen.diff b/archivers/libarchive/files/patch-libarchive-3.5-strnlen.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5a3199cdb4e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/libarchive/files/patch-libarchive-3.5-strnlen.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git libarchive/archive_read_support_format_mtree.c libarchive/archive_read_support_format_mtree.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 127706d..c74f004 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libarchive/archive_read_support_format_mtree.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libarchive/archive_read_support_format_mtree.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -65,6 +65,20 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_mtree.c 2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define O_CLOEXEC 0
</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;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static size_t strnlen(const char *s, size_t maxlen) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t l = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (l < maxlen && *s) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ l++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return l;
</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;'>-+#endif
</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;'>- #define MTREE_HAS_DEVICE 0x0001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define MTREE_HAS_FFLAGS 0x0002
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define MTREE_HAS_GID 0x0004
</span></pre><pre style='margin:0'>
</pre>