<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e654f9c5be0675914df96a1d4a6ced7f408062de">https://github.com/macports/macports-ports/commit/e654f9c5be0675914df96a1d4a6ced7f408062de</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 e654f9c isync: update to 1.3.1
</span>e654f9c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e654f9c5be0675914df96a1d4a6ced7f408062de
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Mon Jun 3 05:25:39 2019 +0000
<span style='display:block; white-space:pre;color:#404040;'> isync: update to 1.3.1
</span>---
mail/isync/Portfile | 15 +++++--------
mail/isync/files/patch-src-socket.diff | 40 ----------------------------------
mail/isync/files/patch-src-util.c.diff | 21 ------------------
3 files changed, 5 insertions(+), 71 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/isync/Portfile b/mail/isync/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7ff1d52..86842b6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/isync/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/isync/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name isync
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.3.1
</span> categories mail
platforms darwin
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,8 +19,9 @@ long_description isync is a command line utility for synchronizing a \
</span> homepage http://isync.sourceforge.net/
master_sites sourceforge:project/isync/isync/${version}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 01d7b028fc61e7ad3b51b529a082637fbc4a6816 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8d5f583976e3119705bdba27fa4fc962e807ff5996f24f354957178ffa697c9c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 65ce1693e2eec5619fc9648e6c568eb4bf9679be \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 68cb4643d58152097f01c9b3abead7d7d4c9563183d72f3c2a31d22bc168f0ea \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 311868
</span>
depends_build port:perl5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,13 +31,7 @@ depends_lib port:db53 \
</span>
depends_run path:share/curl/curl-ca-bundle.crt:curl-ca-bundle
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-src-drv_proxy_gen.pl.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-socket.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string match *gcc-4.2* ${configure.compiler}] || [string match *clang* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-util.c.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-src-drv_proxy_gen.pl.diff
</span>
post-patch {
reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/drv_proxy_gen.pl
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/isync/files/patch-src-socket.diff b/mail/isync/files/patch-src-socket.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c08b36f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/isync/files/patch-src-socket.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,40 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Redefinition of symbols is not allowed with GCC < 4.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-and is a warning in clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://sourceforge.net/p/isync/bugs/35/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/socket.c.orig 2017-10-01 03:42:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/socket.c 2017-10-04 01:06:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,15 +36,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <netinet/tcp.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <arpa/inet.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <netdb.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef HAVE_LIBSSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# include <openssl/ssl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# include <openssl/err.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# include <openssl/x509v3.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# if OPENSSL_VERSION_NUMBER < 0x10100000L
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define X509_OBJECT_get0_X509(o) ((o)->data.x509)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define X509_STORE_get0_objects(o) ((o)->objs)
</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;'>- enum {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SCK_CONNECTING,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/socket.h.orig 2017-10-01 03:42:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/socket.h 2017-10-04 01:06:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,9 +30,13 @@
</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 HAVE_LIBSSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--typedef struct ssl_st SSL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--typedef struct ssl_ctx_st SSL_CTX;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--typedef struct stack_st _STACK;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <openssl/ssl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <openssl/err.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <openssl/x509v3.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if OPENSSL_VERSION_NUMBER < 0x10100000L
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define X509_OBJECT_get0_X509(o) ((o)->data.x509)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define X509_STORE_get0_objects(o) ((o)->objs)
</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;'>- enum {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SSLv3 = 2,
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/isync/files/patch-src-util.c.diff b/mail/isync/files/patch-src-util.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bf70e2a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/isync/files/patch-src-util.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,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#pragma GCC is not allowed inside functions with GCC < 4.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-and -Wmaybe-uninitialized is not recognized by clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://sourceforge.net/p/isync/bugs/36/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/util.c.orig 2017-08-05 14:57:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/util.c 2017-10-04 00:22:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -519,15 +519,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (ll = 0; ll < inl; ll++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (arg[i + ll] != in[ll])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goto rnexti;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef __GNUC__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# pragma GCC diagnostic push
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=42145 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- memcpy( p, out, outl );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef __GNUC__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# pragma GCC diagnostic pop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p += outl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- i += inl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue;
</span></pre><pre style='margin:0'>
</pre>