<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/c3dba40724294eaf07c3fa89f7efaa26d6b41227">https://github.com/macports/macports-ports/commit/c3dba40724294eaf07c3fa89f7efaa26d6b41227</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 c3dba407242 ncftp: update to 3.2.7
</span>c3dba407242 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c3dba40724294eaf07c3fa89f7efaa26d6b41227
</span>Author: Toby Peterson <toby@macports.org>
AuthorDate: Mon Jul 15 23:08:05 2024 -0700
<span style='display:block; white-space:pre;color:#404040;'> ncftp: update to 3.2.7
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/70378
</span>---
net/ncftp/Portfile | 12 ++---
net/ncftp/files/patch-configure | 116 ++++++++++++++--------------------------
2 files changed, 45 insertions(+), 83 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/ncftp/Portfile b/net/ncftp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c4e9537dc58..6d6da9a1542 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/ncftp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/ncftp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,7 @@
</span> PortSystem 1.0
name ncftp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.2.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.2.7
</span> categories net
platforms darwin
maintainers {toby @tobypeterson}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,17 +26,16 @@ distname ${name}-${version}-src
</span> worksrcdir ${name}-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# 3.2.6 received a stealth update...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir ${name}/${version}_1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 105f59747ea98d756e610368ad96fb8481fc80f9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5f200687c05d0807690d9fb770327b226f02dd86155b49e750853fce4e31098d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 214b4f7d89fe2275a2c378e24ae50c5da59ad704 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d41c5c4d6614a8eae2ed4e4d7ada6b6d3afcc9fb65a4ed9b8711344bef24f7e8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 422480
</span>
patchfiles patch-configure
depends_lib port:ncurses
configure.args --disable-universal --disable-precomp
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append -DHAVE_STDLIB_H
</span>
livecheck.type regex
livecheck.url http://www.ncftpd.com/download/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/ncftp/files/patch-configure b/net/ncftp/files/patch-configure
</span><span style='display:block; white-space:pre;color:#808080;'>index bc9d04a18c1..da2b6d4352b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/ncftp/files/patch-configure
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/ncftp/files/patch-configure
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2020-06-23 14:47:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2020-06-23 14:52:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1232,7 +1232,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2024-07-15 20:30:43
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2024-07-15 23:03:55
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1235,7 +1235,7 @@
</span> macos*|darwin|rhapsody)
OS="macosx"
SYS="macosx"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,100 +9,64 @@
</span> if [ "$os_v" = "" ] && [ -x "$HOME/bin/macosver" ] ; then
os_v=`"$HOME/bin/macosver" 2>/dev/null`
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4773,6 +4773,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #line 4774 "configure"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4834,6 +4834,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #line 4835 "configure"
</span> #include "confdefs.h"
#include <ctype.h>
+#include <stdlib.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4954,6 +4955,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_SYS_UN_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/un.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5078,6 +5079,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_STDLIB_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <stdlib.h>
</span> #endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- main()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5015,6 +5017,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/uio.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;'>- #include <sys/un.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span> +#include <string.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int main() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5588,6 +5592,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/uio.h>
</span> #include <sys/socket.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <netinet/in.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <netdb.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- main()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6398,6 +6403,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* includes */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6470,6 +6472,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_STDLIB_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span> +#include <string.h>
#ifdef HAVE_NCURSES_H
# define NCURSES_OPAQUE 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7111,6 +7117,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6526,7 +6529,7 @@
</span> #endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- long long hugeNumvar = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-main(int argc, char **argv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int main(int argc, char **argv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Note: don't actually call curses, since it may block;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * We just want to see if it (dynamic) linked in okay.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8461,7 +8464,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/select.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/socket.h> /* MG: always incl */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern select ($ac_cv_func_select_arg1,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg5);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int select ($ac_cv_func_select_arg1,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg5);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main(void) {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8645,6 +8652,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_RESOLV_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <resolv.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; return 0; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8726,6 +8729,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_STDLIB_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <stdlib.h>
</span> #endif
+#include <string.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int main() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8692,6 +8700,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/uio.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;'>- #include <sys/un.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int main() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8745,6 +8754,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/uio.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;'>- #include <sys/un.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int main() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8797,6 +8807,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/uio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/stat.h>
</span> #include <sys/socket.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/un.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int main() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9878,6 +9889,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <signal.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <setjmp.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int main() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10072,6 +10084,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #line 10073 "configure"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10184,8 +10188,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #line 10185 "configure"
</span> #include "confdefs.h"
#include <stdio.h>
+#include <stdlib.h>
/* If setvbuf has the reversed format, exit 0. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>- main () {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- main () {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int main (void) {
</span> /* This call has the arguments reversed.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ A reversed system may check and see that the address of main
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ is not _IOLBF, _IONBF, or _IOFBF, and return nonzero. */
</span></pre><pre style='margin:0'>
</pre>