<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/587dc98f07a1c06b827fc20cd41c7f3f71015d6e">https://github.com/macports/macports-ports/commit/587dc98f07a1c06b827fc20cd41c7f3f71015d6e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 587dc98f07a1c06b827fc20cd41c7f3f71015d6e
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Jan 6 04:47:03 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> echoping: Fix gnutls variant
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/62953
</span>---
net/echoping/Portfile | 2 +-
net/echoping/files/gnutls.patch | 59 +++++++++++++++++++++++++++++++++
net/echoping/files/patch-configure.diff | 22 ------------
3 files changed, 60 insertions(+), 23 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/echoping/Portfile b/net/echoping/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 59e1420bd4a..03faac7d747 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/echoping/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/echoping/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@ depends_lib port:libidn \
</span> path:lib/libldap.dylib:openldap \
port:popt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles gnutls.patch \
</span> patch-plugins-dns-dns.c.diff \
dynamic_lookup-11.patch \
implicit.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/echoping/files/gnutls.patch b/net/echoping/files/gnutls.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..898920e35ce
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/echoping/files/gnutls.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,59 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use "pkg-config gnutls" instead of "libgnutls-config" which was removed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+in gnutls 2.8.0.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use "gnutls_priority_set_direct" instead of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"gnutls_certificate_type_set_priority" which was removed in gnutls 3.4.0.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=624049
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't use "CTYPE-OPENPGP" because OpenPGP support was removed in gnutls
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+3.6.0.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=879531
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2007-04-09 14:53:04.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2010-04-01 03:29:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20144,8 +20144,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GNUTLS=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CPPFLAGS="${CPPFLAGS} `libgnutls-config --cflags`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDFLAGS="${LDFLAGS} `libgnutls-config --libs`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CPPFLAGS="${CPPFLAGS} `pkg-config gnutls --cflags`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LDFLAGS="${LDFLAGS} `pkg-config gnutls --libs`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$withval" != "yes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GNUTLSROOT=$withval
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS="${LDFLAGS} -L$GNUTLSROOT/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22926,7 +22926,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { echo "$as_me:$LINENO: result: $ac_cv_lib_gnutls_gnutls_global_init" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "${ECHO_T}$ac_cv_lib_gnutls_gnutls_global_init" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test $ac_cv_lib_gnutls_gnutls_global_init = yes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBS="${LIBS} `libgnutls-config --libs`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBS="${LIBS} `pkg-config gnutls --libs`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { { echo "$as_me:$LINENO: error: Get the GNU TLS library (http://www.gnutls.org/)" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "$as_me: error: Get the GNU TLS library (http://www.gnutls.org/)" >&2;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- echoping.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ echoping.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -137,9 +137,6 @@ main(argc, argv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gnutls_session session;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gnutls_certificate_credentials xcred;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int tls_result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const int cert_type_priority[3] = { GNUTLS_CRT_X509,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GNUTLS_CRT_OPENPGP, 0
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int priority;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1020,9 +1017,9 @@ main(argc, argv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (tls_result != 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err_sys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ("Cannot create a new TLS session");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gnutls_set_default_priority(session);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gnutls_certificate_type_set_priority(session,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cert_type_priority);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gnutls_priority_set_direct(session,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "NORMAL",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gnutls_credentials_set(session,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GNUTLS_CRD_CERTIFICATE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xcred);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/echoping/files/patch-configure.diff b/net/echoping/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 65d98d0793f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/echoping/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2007-04-09 14:53:04.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2010-04-01 03:29:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20144,8 +20144,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GNUTLS=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CPPFLAGS="${CPPFLAGS} `libgnutls-config --cflags`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LDFLAGS="${LDFLAGS} `libgnutls-config --libs`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CPPFLAGS="${CPPFLAGS} `pkg-config gnutls --cflags`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LDFLAGS="${LDFLAGS} `pkg-config gnutls --libs`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$withval" != "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GNUTLSROOT=$withval
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${LDFLAGS} -L$GNUTLSROOT/lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22926,7 +22926,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { echo "$as_me:$LINENO: result: $ac_cv_lib_gnutls_gnutls_global_init" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "${ECHO_T}$ac_cv_lib_gnutls_gnutls_global_init" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test $ac_cv_lib_gnutls_gnutls_global_init = yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBS="${LIBS} `libgnutls-config --libs`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBS="${LIBS} `pkg-config gnutls --libs`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { { echo "$as_me:$LINENO: error: Get the GNU TLS library (http://www.gnutls.org/)" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "$as_me: error: Get the GNU TLS library (http://www.gnutls.org/)" >&2;}
</span></pre><pre style='margin:0'>
</pre>