<pre style='margin:0'>
tobypeterson pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2dc8bfc022a53524717df3ccb903c87efd17e9fb">https://github.com/macports/macports-ports/commit/2dc8bfc022a53524717df3ccb903c87efd17e9fb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2dc8bfc022a53524717df3ccb903c87efd17e9fb
</span>Author: Zero King <l2dy@icloud.com>
AuthorDate: Sun Nov 20 13:02:50 2016 +0000
<span style='display:block; white-space:pre;color:#404040;'> libarchive: Update to 3.2.2
</span>---
archivers/libarchive/Portfile | 6 +++---
...h-libarchive__archive_read_support_format_lha.c.diff | 17 ++++++++++-------
2 files changed, 13 insertions(+), 10 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 2837f0d..51f1bd1 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;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> name libarchive
homepage http://libarchive.org/
master_sites ${homepage}downloads/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.2.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.2.2
</span> categories archivers
license BSD
maintainers toby
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,8 +16,8 @@ long_description \
</span> also write shar archives.
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 4779f14e2ccf8135908720786c2fa5c3ffe0cc1d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 72ee1a4e3fd534525f13a0ba1aa7b05b203d186e0c6072a8a4738649d0b3cfd2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3fedae2b71685d3003e71acd4189c5f3de80a2db \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 691c194ee132d1f0f7a42541f091db811bc2e56f7107e9121be2bc8c04f1060f
</span>
depends_lib port:bzip2 port:zlib path:lib/libssl.dylib:openssl port:libxml2 port:xz \
port:lzo2 port:libiconv
<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><span style='display:block; white-space:pre;color:#808080;'>index 246eb52..c8fc804 100644
</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;'>+++ b/archivers/libarchive/files/patch-libarchive__archive_read_support_format_lha.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +1,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libarchive/archive_read_support_format_lha.c.orig 2016-06-28 22:40:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libarchive/archive_read_support_format_lha.c 2016-06-28 22:40:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1712,10 +1712,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (;len >= 8; len -= 8) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 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:#e0ffe0;'>++++ libarchive/archive_read_support_format_lha.c 2016-12-02 00:59:09.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1713,13 +1713,15 @@
</span> /* This if statement expects compiler optimization will
* remove the stament which will not be executed. */
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef bswap16
</span> +#ifndef __has_builtin
+#define __has_builtin(x) 0
+#endif
#if defined(_MSC_VER) && _MSC_VER >= 1400 /* Visual Studio */
# define bswap16(x) _byteswap_ushort(x)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif (defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 8) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- || defined(__clang__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ || (defined(__clang__) && __has_builtin(__builtin_bswap16))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 8) || __GNUC__ > 4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* GCC 4.8 and later has __builtin_bswap16() */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define bswap16(x) __builtin_bswap16(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(__clang__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* All clang versions have __builtin_bswap16() */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__clang__) && __has_builtin(__builtin_bswap16)
</span> # define bswap16(x) __builtin_bswap16(x)
#else
# define bswap16(x) ((((x) >> 8) & 0xff) | ((x) << 8))
</pre><pre style='margin:0'>
</pre>