<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/073f504db792fe9b221b5c81fdc19e053c781e41">https://github.com/macports/macports-ports/commit/073f504db792fe9b221b5c81fdc19e053c781e41</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 073f504db79 dsniff: Use openssl 1.0; fix libpcap build failure
</span>073f504db79 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 073f504db792fe9b221b5c81fdc19e053c781e41
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Jul 29 12:58:21 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> dsniff: Use openssl 1.0; fix libpcap build failure
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use openssl 1.0 because this code is not compatible with openssl 1.1.
</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/59969
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Rename local pcap_init function for compatibility with libpcap 1.10 and
</span><span style='display:block; white-space:pre;color:#404040;'> later which introduced its own pcap_init function.
</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/62950
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add size to checksums. Fix permissions of extracted files for easier
</span><span style='display:block; white-space:pre;color:#404040;'> development. Fix implicit declaration of functions.
</span>---
net/dsniff/Portfile | 45 +++++++++++++++++-----
net/dsniff/files/patch-Makefile.in.diff | 20 ++++++++++
net/dsniff/files/patch-arp.c.diff | 12 ++++++
net/dsniff/files/patch-buf.c.diff | 12 ++++++
net/dsniff/files/patch-configure.diff | 32 +++++++++++++++
net/dsniff/files/patch-dnsspoof.c.diff | 11 +++---
net/dsniff/files/patch-pcaputil.c | 10 -----
net/dsniff/files/patch-pcaputil.c.diff | 19 +++++++++
net/dsniff/files/patch-pcaputil.h.diff | 11 ++++++
net/dsniff/files/patch-ssh.c.diff | 12 ++++++
.../{patch-sshcrypto.c => patch-sshcrypto.c.diff} | 0
net/dsniff/files/patch-tcpkill.c.diff | 13 +++++--
net/dsniff/files/patch-tcpnice.c.diff | 13 +++++--
13 files changed, 180 insertions(+), 30 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/dsniff/Portfile b/net/dsniff/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5c2d84ed1e0..19e86c2d74f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/dsniff/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/dsniff/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,10 +2,15 @@
</span>
PortSystem 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup old_openssl 1.0
</span>
name dsniff
version 2.4b1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4d5dee193f0d252d22cfe2417f067460db9638b1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a9803a7a02ddfe5fb9704ce86f0ffc48453c321e88db85810db411ba0841152a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 131666
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories net
license BSD ISC
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,25 +33,45 @@ long_description dsniff is a collection of tools for network auditing \
</span> homepage https://monkey.org/~dugsong/dsniff/
master_sites ${homepage}beta/
distname dsniff-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 4d5dee193f0d252d22cfe2417f067460db9638b1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a9803a7a02ddfe5fb9704ce86f0ffc48453c321e88db85810db411ba0841152a
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:libpcap \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.branch 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.configure build_flags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:libpcap \
</span> port:libnids \
port:xorg-libXmu
worksrcdir dsniff-2.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-pcaputil.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-sshcrypto.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-sshow.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copy "owner" permission to "group" and "others" but removing write.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fs-traverse item ${worksrcpath} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set p [file attributes ${item} -permissions]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set x [expr {${p} >> 6 & 5}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file attributes ${item} -permissions [format {0%o} [expr {${x} | (${x} << 3) | ${p}}]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Arrange openssl include/lib dirs the way the configure script expects.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${workpath}/openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${openssl.includedir} ${workpath}/openssl/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${openssl.libdir} ${workpath}/openssl/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-Makefile.in.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-arp.c.diff \
</span> patch-arpspoof.c.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-buf.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-configure.diff \
</span> patch-dnsspoof.c.diff \
patch-filesnarf.c.diff \
patch-macof.c.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-pcaputil.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-pcaputil.h.diff \
</span> patch-record.c.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ssh.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-sshcrypto.c.diff \
</span> patch-sshmitm.c.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-sshow.c.diff \
</span> patch-tcp_raw.c.diff \
patch-tcp_raw.h.diff \
patch-tcpkill.c.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,7 +85,9 @@ patchfiles patch-pcaputil.c \
</span> patch-webmitm.c-redef-of-csin.diff
require_active_variants libnids libnet11 libnet
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --mandir=${prefix}/share/man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --mandir=${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-openssl=${workpath}/openssl
</span> configure.cflags-append -DBIND_8_COMPAT
use_parallel_build no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/dsniff/files/patch-Makefile.in.diff b/net/dsniff/files/patch-Makefile.in.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f86c2c3770b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/dsniff/files/patch-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use CPPFLAGS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.in.orig 2001-03-15 02:34:42.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.in 2021-07-29 12:47:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,6 +17,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC = @CC@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS = @CFLAGS@ -DDSNIFF_LIBDIR=\"$(libdir)/\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CPPFLAGS= @CPPFLAGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS = @LDFLAGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PCAPINC = @PCAPINC@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,7 +38,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ X11INC = @X_CFLAGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ X11LIB = @X_LIBS@ @X_PRE_LIBS@ -lXmu -lX11 @X_EXTRA_LIBS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-INCS = -I. $(NIDSINC) $(PCAPINC) $(LNETINC) $(DBINC) $(SSLINC) $(X11INC) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++INCS = -I. $(CPPFLAGS) $(NIDSINC) $(PCAPINC) $(LNETINC) $(DBINC) $(SSLINC) $(X11INC) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I$(srcdir)/missing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS = @LIBS@ -L$(srcdir) -lmissing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/dsniff/files/patch-arp.c.diff b/net/dsniff/files/patch-arp.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6d9f74e6fc0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/dsniff/files/patch-arp.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+./arp.c:76:4: error: implicitly declaring library function 'memcpy' with type 'void *(void *, const void *, unsigned long)' [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- arp.c.orig 2001-03-15 02:32:58.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ arp.c 2021-07-29 10:51:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,6 +33,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "arp.h"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/dsniff/files/patch-buf.c.diff b/net/dsniff/files/patch-buf.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..65c535fb50e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/dsniff/files/patch-buf.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+./buf.c:136:7: error: implicitly declaring library function 'memcmp' with type 'int (const void *, const void *, unsigned long)' [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- buf.c.orig 2001-03-15 02:32:59.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ buf.c 2021-07-29 11:14:25.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,6 +14,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdarg.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <ctype.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <err.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/dsniff/files/patch-configure.diff b/net/dsniff/files/patch-configure.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..310aa5793f8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/dsniff/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure:1104:1: error: implicit declaration of function 'XtMalloc' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure:1870:67: error: implicitly declaring library function 'exit' with type 'void (int) __attribute__((noreturn))' [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure:2269:3: error: implicitly declaring library function 'exit' with type 'void (int) __attribute__((noreturn))' [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure:2269:8: error: implicitly declaring library function 'memcmp' with type 'int (const void *, const void *, unsigned long)' [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2001-03-19 00:52:37.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2021-07-29 10:48:48.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1099,6 +1099,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat > conftest.$ac_ext <<EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #line 1101 "configure"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "confdefs.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <X11/Intrinsic.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${x_direct_test_function}()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1863,6 +1864,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #line 1864 "configure"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "confdefs.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <ctype.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2262,6 +2264,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat > conftest.$ac_ext <<EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #line 2264 "configure"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "confdefs.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/dsniff/files/patch-dnsspoof.c.diff b/net/dsniff/files/patch-dnsspoof.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 64e1090d165..46040fb8616 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/dsniff/files/patch-dnsspoof.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/dsniff/files/patch-dnsspoof.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;'>---- dnsspoof.c.orig 2009-09-08 23:45:30.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dnsspoof.c 2009-09-09 00:00:26.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dnsspoof.c.orig 2001-03-15 02:33:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dnsspoof.c 2021-07-29 11:08:07.000000000 -0500
</span> @@ -38,7 +38,7 @@
pcap_t *pcap_pd = NULL;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,16 +125,17 @@
</span> int i;
dev = hosts = NULL;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -306,7 +306,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -306,18 +306,18 @@
</span> strlcpy(buf, p, sizeof(buf));
}
else snprintf(buf, sizeof(buf), "udp dst port 53 and not src %s",
- libnet_host_lookup(lnet_ip, 0));
+ libnet_addr2name4(lnet_ip, LIBNET_DONT_RESOLVE));
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((pcap_pd = pcap_init(dev, buf, 128)) == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((pcap_pd = pcap_init(dev, buf, 128)) == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((pcap_pd = pcap_myinit(dev, buf, 128)) == NULL)
</span> errx(1, "couldn't initialize sniffing");
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -314,10 +314,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if ((pcap_off = pcap_dloff(pcap_pd)) < 0)
errx(1, "couldn't determine link layer offset");
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/dsniff/files/patch-pcaputil.c b/net/dsniff/files/patch-pcaputil.c
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 009d97c7c4c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/dsniff/files/patch-pcaputil.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pcaputil.c.old Thu Mar 25 11:14:26 2004
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pcaputil.c Thu Mar 25 11:14:33 2004
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,6 +17,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <err.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <pcap.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef BSD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef BSD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <pcap-int.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/dsniff/files/patch-pcaputil.c.diff b/net/dsniff/files/patch-pcaputil.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d68818d0c62
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/dsniff/files/patch-pcaputil.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pcaputil.c.orig 2001-03-15 02:33:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pcaputil.c 2021-07-29 11:08:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,6 +17,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <err.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <pcap.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef BSD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef BSD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <pcap-int.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,7 +61,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pcap_t *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-pcap_init(char *intf, char *filter, int snaplen)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++pcap_myinit(char *intf, char *filter, int snaplen)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pcap_t *pd;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ u_int net, mask;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/dsniff/files/patch-pcaputil.h.diff b/net/dsniff/files/patch-pcaputil.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9746a810ddb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/dsniff/files/patch-pcaputil.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pcaputil.h.orig 2001-03-15 02:33:06.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pcaputil.h 2021-07-29 11:08:41.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,7 +11,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef PCAPUTIL_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define PCAPUTIL_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-pcap_t *pcap_init(char *intf, char *filter, int snaplen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++pcap_t *pcap_myinit(char *intf, char *filter, int snaplen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int pcap_dloff(pcap_t *pd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/dsniff/files/patch-ssh.c.diff b/net/dsniff/files/patch-ssh.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ee22e4f4a3e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/dsniff/files/patch-ssh.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+./ssh.c:137:2: error: implicit declaration of function 'MD5' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ssh.c.orig 2001-03-15 02:33:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ssh.c 2021-07-29 12:50:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,6 +15,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <arpa/nameser.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <openssl/ssl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <openssl/err.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <openssl/md5.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <openssl/rand.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <err.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/dsniff/files/patch-sshcrypto.c b/net/dsniff/files/patch-sshcrypto.c.diff
</span>similarity index 100%
rename from net/dsniff/files/patch-sshcrypto.c
rename to net/dsniff/files/patch-sshcrypto.c.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/dsniff/files/patch-tcpkill.c.diff b/net/dsniff/files/patch-tcpkill.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 95c6f8aff07..48322401ad7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/dsniff/files/patch-tcpkill.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/dsniff/files/patch-tcpkill.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;'>---- tcpkill.c.orig 2009-09-08 23:51:15.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tcpkill.c 2009-09-09 00:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tcpkill.c.orig 2001-03-17 02:10:43.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tcpkill.c 2021-07-29 11:09:15.000000000 -0500
</span> @@ -39,17 +39,18 @@
static void
tcp_kill_cb(u_char *user, const struct pcap_pkthdr *pcap, const u_char *pkt)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,7 +85,14 @@
</span> pcap_t *pd;
intf = NULL;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -136,14 +136,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -130,20 +130,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ filter = copy_argv(argv);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((pd = pcap_init(intf, filter, 64)) == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((pd = pcap_myinit(intf, filter, 64)) == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ errx(1, "couldn't initialize sniffing");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if ((pcap_off = pcap_dloff(pd)) < 0)
errx(1, "couldn't determine link layer offset");
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/dsniff/files/patch-tcpnice.c.diff b/net/dsniff/files/patch-tcpnice.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3349f990931..4ba77d355bc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/dsniff/files/patch-tcpnice.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/dsniff/files/patch-tcpnice.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;'>---- tcpnice.c.orig 2009-09-08 23:51:45.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tcpnice.c 2009-09-09 00:02:31.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tcpnice.c.orig 2001-03-17 01:41:51.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tcpnice.c 2021-07-29 11:09:01.000000000 -0500
</span> @@ -41,107 +41,106 @@
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -176,7 +176,14 @@
</span> pcap_t *pd;
intf = NULL;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -209,14 +210,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -203,20 +204,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ filter = copy_argv(argv);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((pd = pcap_init(intf, filter, 128)) == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((pd = pcap_myinit(intf, filter, 128)) == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ errx(1, "couldn't initialize sniffing");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if ((pcap_off = pcap_dloff(pd)) < 0)
errx(1, "couldn't determine link layer offset");
</pre><pre style='margin:0'>
</pre>