<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8c4a4c917bc446bae9f0bf4ca479ac29a3ba4ffd">https://github.com/macports/macports-ports/commit/8c4a4c917bc446bae9f0bf4ca479ac29a3ba4ffd</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 8c4a4c917bc libretroshare: update to current upstream
</span>8c4a4c917bc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8c4a4c917bc446bae9f0bf4ca479ac29a3ba4ffd
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Sat Mar 4 10:10:24 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> libretroshare: update to current upstream
</span>---
net/libretroshare/Portfile | 14 ++++----
...atch => 0001-Fix-CMakeLists-for-MacPorts.patch} | 0
...sfile.h-fix-for-macOS-add-missing-headers.patch | 25 --------------
net/libretroshare/files/0002-rsdnsutils.patch | 38 ++++++++++++++++++++++
4 files changed, 45 insertions(+), 32 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/libretroshare/Portfile b/net/libretroshare/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d5a2262aafb..805064ee4a5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/libretroshare/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/libretroshare/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,8 @@ PortGroup github 1.0
</span> PortGroup legacysupport 1.1
PortGroup openssl 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup RetroShare libretroshare efe09b87d3a11833e36a65e120328d6d5f26a7de
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2023.01.30
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup RetroShare libretroshare 74cd958cf8a3c8b3e2d3f8a22657b5e16bdad476
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2023.02.18
</span> revision 0
categories net devel
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,9 +17,9 @@ long_description {*}${description} RetroShare functionalities (file shari
</span> are implemented under the hood by libretroshare which offer a documented C++ and JSON API. \
While RetroShare is an application on it’s own, libretroshare is meant to be used as part of other programs.
homepage https://retroshare.cc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 07b2cfb88a77669003cc778130ecf057e4682f7f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 71bf77287d80ccee60c3f2db5cc97d6f6ff4a03c90e9dec0befe0fa90a17f247 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1906845
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4e524d9cfbcc0a951aee02d80007692622ca6ad3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5c23a9bdbdb058e66c204468779d8913efa207f8aa1cd32fc2a91abc36c431ba \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1908315
</span>
# getline, strnlen
legacysupport.newest_darwin_requires_legacy 10
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,8 +40,8 @@ depends_build-append path:bin/doxygen:doxygen \
</span> port:python${py_ver_nodot}
git.cmd ${prefix}/bin/git
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles 0001-rsfile.h-fix-for-macOS-add-missing-headers.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0002-Fix-CMakeLists-for-MacPorts.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles 0001-Fix-CMakeLists-for-MacPorts.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-rsdnsutils.patch
</span>
post-patch {
reinplace "s,@PREFIX@,${prefix}," ${worksrcpath}/CMakeLists.txt
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/libretroshare/files/0002-Fix-CMakeLists-for-MacPorts.patch b/net/libretroshare/files/0001-Fix-CMakeLists-for-MacPorts.patch
</span>similarity index 100%
rename from net/libretroshare/files/0002-Fix-CMakeLists-for-MacPorts.patch
rename to net/libretroshare/files/0001-Fix-CMakeLists-for-MacPorts.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/libretroshare/files/0001-rsfile.h-fix-for-macOS-add-missing-headers.patch b/net/libretroshare/files/0001-rsfile.h-fix-for-macOS-add-missing-headers.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d943b58291e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/libretroshare/files/0001-rsfile.h-fix-for-macOS-add-missing-headers.patch
</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;'>-From f8dfe0da87656ea580f7b0e775efb9e4e4c9fd2a Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 30 Jan 2023 19:21:33 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/2] rsfile.h: fix for macOS: add missing headers
</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;'>- src/util/rsfile.h | 5 +++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 5 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/util/rsfile.h b/src/util/rsfile.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 530459d4..21055458 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/util/rsfile.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/util/rsfile.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,6 +24,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef WINDOWS_SYS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <sys/socket.h>
</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;'>- namespace RsFileUtil {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int set_fd_nonblock(int fd);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/libretroshare/files/0002-rsdnsutils.patch b/net/libretroshare/files/0002-rsdnsutils.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..872b9b3b0df
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/libretroshare/files/0002-rsdnsutils.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The define below does not fit well with LegacySupport one;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# however, we require LegacySupport so far for getline.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/util/rsdnsutils.cc.orig 2023-02-19 03:51:45.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/util/rsdnsutils.cc 2023-03-04 09:45:22.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,19 +33,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <netdb.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static size_t strnlen(const char *s, size_t maxlength) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- size_t l = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- while (l < maxlength && *s) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- l++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- s++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return l;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//static size_t strnlen(const char *s, size_t maxlength) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// size_t l = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// while (l < maxlength && *s) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// l++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// s++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// return l;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //https://www.iana.org/assignments/dns-parameters/dns-parameters.xhtml#dns-parameters-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ constexpr uint16_t DNSC_IN = 1; //Internet (IN)
</span></pre><pre style='margin:0'>
</pre>