<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/2d56e4c35e7ca54122cfc044c0916d4bab47407c">https://github.com/macports/macports-ports/commit/2d56e4c35e7ca54122cfc044c0916d4bab47407c</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 2d56e4c35e7 cryptcat: Fix implicit func decls; modernize
</span>2d56e4c35e7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2d56e4c35e7ca54122cfc044c0916d4bab47407c
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Jul 2 07:54:32 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> cryptcat: Fix implicit func decls; modernize
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix implicit declaration of functions that prevented building with
</span><span style='display:block; white-space:pre;color:#404040;'> Xcode 12+. Modernize checksums. Use "use_tar yes" instead of doing it
</span><span style='display:block; white-space:pre;color:#404040;'> manually. Use leading 0 for octal numbers. Use makefile portgroup which
</span><span style='display:block; white-space:pre;color:#404040;'> makes the port use the right compiler and flags and adds a universal
</span><span style='display:block; white-space:pre;color:#404040;'> 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/63124
</span>---
net/cryptcat/Portfile | 21 +++++++++++----------
net/cryptcat/files/patch-Makefile.diff | 16 ++++++----------
net/cryptcat/files/patch-netcat.c.diff | 29 +++++++++++++++++++++++++++--
3 files changed, 44 insertions(+), 22 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/cryptcat/Portfile b/net/cryptcat/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a36d1a9a94e..c81a6e24792 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/cryptcat/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/cryptcat/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,13 @@
</span> PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup makefile 1.0
</span>
name cryptcat
version 1.2.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 90c66c134deb7a3188bf27c1b0a42e8ef9bf2b27 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5dc9a9c2beac3d9658cc3e082c00f1127981a2f995b4ec485f281bf1800840d0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 190464
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories net security
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,23 +20,18 @@ long_description Cryptcat is a lightweight version of netcat with \
</span> homepage http://cryptcat.sourceforge.net/
master_sites sourceforge:project/cryptcat/cryptcat-unix-${branch}/cryptcat-unix-${version}
distname cryptcat-unix-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.suffix .tar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 fc4afff350f3dd5e4fe51b0dd01a8e21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_tar yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patchfiles patch-Makefile.diff patch-netcat.c.diff
worksrcdir unix
<span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.cmd cat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.pre_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> build.target darwin
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${worksrcpath}/cryptcat ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} Changelog Credits README README.cryptcat \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 ${worksrcpath}/cryptcat ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 -d ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} Changelog Credits README README.cryptcat \
</span> ${destroot}${prefix}/share/doc/${name}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/cryptcat/files/patch-Makefile.diff b/net/cryptcat/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 25bccd7d695..c4b4c15e421 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/cryptcat/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/cryptcat/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.org 2006-10-14 22:59:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2006-10-14 23:01:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10,16 +10,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2005-10-17 19:41:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2021-07-02 07:45:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,13 +10,11 @@
</span> # debugging
# DFLAGS = -DTEST -DDEBUG
DFLAGS = -DGAPING_SECURITY_HOLE
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,11 +14,7 @@
</span> -LD = $(CC) -s # linker; defaults to stripped executables
o = o # object extension
<span style='display:block; white-space:pre;background:#ffe0e0;'>--ALL = cryptcat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+all: cryptcat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ### BOGON-CATCHERS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ALL = cryptcat
</span> @@ -28,8 +26,8 @@
### HARD TARGETS
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +22,7 @@
</span> -cryptcat: netcat.c farm9crypt.o twofish2.o
- $(LD) $(DFLAGS) $(XFLAGS) $(STATIC) -o cryptcat netcat.c farm9crypt.o twofish2.o $(XLIBS)
+cryptcat: netcat.o farm9crypt.o twofish2.o
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(XLIBS)
</span>
nc-dos:
@echo "DOS?! Maybe someday, but not now"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +31,7 @@
</span> XLIBS='-lstdc++'
+darwin:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ make -e $(ALL) $(MFLAGS) XFLAGS='-DFREEBSD' XLIBS='-lstdc++'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ make -e $(ALL) $(MFLAGS) XFLAGS='-DFREEBSD' XLIBS='-lresolv'
</span> +
bsdi:
make -e $(ALL) $(MFLAGS) XFLAGS='-DBSDI' STATIC=-Bstatic
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/cryptcat/files/patch-netcat.c.diff b/net/cryptcat/files/patch-netcat.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5acf8918031..c1d1ddaedef 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/cryptcat/files/patch-netcat.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/cryptcat/files/patch-netcat.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- netcat.c.orig 2005-10-19 03:42:05.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ netcat.c 2008-07-04 23:30:26.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- netcat.c.orig 2005-10-18 12:42:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ netcat.c 2021-07-02 07:48:55.000000000 -0500
</span> @@ -48,9 +48,6 @@
#else
#include <malloc.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,3 +21,28 @@
</span> #ifdef HAVE_RANDOM /* aficionados of ?rand48() should realize */
#define SRAND srandom /* that this doesn't need *strong* random */
#define RAND random /* numbers just to mix up port numbers!! */
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -81,9 +82,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <errno.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <signal.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <fcntl.h> /* O_WRONLY et al */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef LINUX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <resolv.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "farm9crypt.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_HELP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void helpme(void);
</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;'>+ /* handy stuff: */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1661,7 +1666,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_HELP /* unless we wanna be *really* cryptic */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* helpme :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the obvious */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-helpme()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void helpme(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ o_verbose = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ holler ("[v1.10]\n\
</span></pre><pre style='margin:0'>
</pre>