pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security/dsniff Add a patch from Debian that allows th...
details: https://anonhg.NetBSD.org/pkgsrc/rev/f464d27ccd15
branches: trunk
changeset: 392768:f464d27ccd15
user: adrianp <adrianp%pkgsrc.org@localhost>
date: Sat May 09 16:33:04 2009 +0000
description:
Add a patch from Debian that allows the dsniff tools to read from a pcap
file in addition to sniffing the wire directly.
diffstat:
security/dsniff/Makefile | 6 +-
security/dsniff/distinfo | 14 ++++++++-
security/dsniff/patches/patch-ba | 24 +++++++++++++++
security/dsniff/patches/patch-bb | 63 ++++++++++++++++++++++++++++++++++++++++
security/dsniff/patches/patch-bc | 23 ++++++++++++++
security/dsniff/patches/patch-bd | 60 ++++++++++++++++++++++++++++++++++++++
security/dsniff/patches/patch-be | 23 ++++++++++++++
security/dsniff/patches/patch-bf | 58 ++++++++++++++++++++++++++++++++++++
security/dsniff/patches/patch-bg | 23 ++++++++++++++
security/dsniff/patches/patch-bh | 60 ++++++++++++++++++++++++++++++++++++++
security/dsniff/patches/patch-bi | 24 +++++++++++++++
security/dsniff/patches/patch-bj | 57 ++++++++++++++++++++++++++++++++++++
security/dsniff/patches/patch-bk | 23 ++++++++++++++
security/dsniff/patches/patch-bl | 45 ++++++++++++++++++++++++++++
14 files changed, 499 insertions(+), 4 deletions(-)
diffs (truncated from 578 to 300 lines):
diff -r c74aaced8915 -r f464d27ccd15 security/dsniff/Makefile
--- a/security/dsniff/Makefile Sat May 09 16:32:52 2009 +0000
+++ b/security/dsniff/Makefile Sat May 09 16:33:04 2009 +0000
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.30 2008/10/01 08:43:09 apb Exp $
+# $NetBSD: Makefile,v 1.31 2009/05/09 16:33:04 adrianp Exp $
.include "Makefile.common"
-PKGREVISION= 6
+PKGREVISION= 7
COMMENT= Password sniffer (webspy)
DEPENDS+= dsniff-nox11-[0-9]*:../../security/dsniff-nox11
BUILD_TARGET= libmissing.a webspy
-INSTALLATION_DIRS+= sbin man/man8
+INSTALLATION_DIRS+= sbin ${PKGMANDIR}/man8
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/webspy ${PREFIX}/sbin
diff -r c74aaced8915 -r f464d27ccd15 security/dsniff/distinfo
--- a/security/dsniff/distinfo Sat May 09 16:32:52 2009 +0000
+++ b/security/dsniff/distinfo Sat May 09 16:33:04 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2008/10/01 08:43:09 apb Exp $
+$NetBSD: distinfo,v 1.9 2009/05/09 16:33:04 adrianp Exp $
SHA1 (dsniff-2.3.tar.gz) = 671a1df823ab0657fc95e79112924a57281e9c3b
RMD160 (dsniff-2.3.tar.gz) = 89dad0259e90acef30a7aa5f3471de3aaeb06147
@@ -8,3 +8,15 @@
SHA1 (patch-ac) = da25b9c7d6c06a18308ae8739bc5483341121dee
SHA1 (patch-ad) = cab09e1b1a61fd6a3fa96c24fff3cd1519146a3e
SHA1 (patch-ae) = e54a7be65c2e1d236b2427d216e1184ff6046a0b
+SHA1 (patch-ba) = 5f774dcb904681f123fa9cae25ea4d88afee6bb6
+SHA1 (patch-bb) = 58026805c5a8f91f7fa80a94ddbea0b8fadfadd5
+SHA1 (patch-bc) = 6d27957bd1d10b66428dbea214b0463fa8321bef
+SHA1 (patch-bd) = dc0f17dd287327ff5105e91c5bfa8b2390841fe2
+SHA1 (patch-be) = 878d5e81909790d852db442ec0bb57fb161a73a4
+SHA1 (patch-bf) = c1bd7f1794d6f8b9fec6cf1d6b24e75ed32c0616
+SHA1 (patch-bg) = 6888b68ae38b32a2fd635f5b08c7c637033a28b5
+SHA1 (patch-bh) = 1e4bee85e6d289c011632ef84d460e46746287c9
+SHA1 (patch-bi) = 47c6b0e3682af9ee3b212b0d0800d9a74037df30
+SHA1 (patch-bj) = b6d45af26058a221cb68d72c45e7358c1ef894c0
+SHA1 (patch-bk) = 3a36f7a11a5590daea9b1cf7c8d7772a88ff2a18
+SHA1 (patch-bl) = add5db6023f9e76e269e953eb95ff5b808f650ab
diff -r c74aaced8915 -r f464d27ccd15 security/dsniff/patches/patch-ba
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/dsniff/patches/patch-ba Sat May 09 16:33:04 2009 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-ba,v 1.1 2009/05/09 16:33:04 adrianp Exp $
+
+diff -ur dsniff-2.3.orig/dsniff.8 dsniff-2.3/dsniff.8
+--- dsniff.8.orig 2000-12-15 16:05:36.000000000 +0000
++++ dsniff.8 2009-05-06 23:23:49.000000000 +0100
+@@ -10,7 +10,7 @@
+ .nf
+ .fi
+ \fBdsniff\fR [\fB-c\fR] [\fB-d\fR] [\fB-m\fR] [\fB-n\fR] [\fB-i
+-\fIinterface\fR] [\fB-s \fIsnaplen\fR] [\fB-f \fIservices\fR]
++\fIinterface\fR | \fB-p \fIpcapfile\fR] [\fB-s \fIsnaplen\fR] [\fB-f \fIservices\fR]
+ [\fB-t \fItrigger[,...]\fR]]
+ [\fB-r\fR|\fB-w\fR \fIsavefile\fR] [\fIexpression\fR]
+ .SH DESCRIPTION
+@@ -45,6 +45,9 @@
+ Do not resolve IP addresses to hostnames.
+ .IP "\fB-i \fIinterface\fR"
+ Specify the interface to listen on.
++.IP "\fB-p \fIpcapfile\fR"
++Rather than processing the contents of packets observed upon the network
++process the given PCAP capture file.
+ .IP "\fB-s \fIsnaplen\fR"
+ Analyze at most the first \fIsnaplen\fR bytes of each TCP connection,
+ rather than the default of 1024.
diff -r c74aaced8915 -r f464d27ccd15 security/dsniff/patches/patch-bb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/dsniff/patches/patch-bb Sat May 09 16:33:04 2009 +0000
@@ -0,0 +1,63 @@
+$NetBSD: patch-bb,v 1.1 2009/05/09 16:33:04 adrianp Exp $
+
+diff -ur dsniff-2.3.orig/dsniff.c dsniff-2.3/dsniff.c
+--- dsniff.c.orig 2000-12-01 21:27:15.000000000 +0000
++++ dsniff.c 2009-05-06 23:23:49.000000000 +0100
+@@ -44,8 +44,9 @@
+ usage(void)
+ {
+ fprintf(stderr, "Version: " VERSION "\n"
+- "Usage: dsniff [-cdmn] [-i interface] [-s snaplen] [-f services]\n"
+- " [-t trigger[,...]] [-r|-w savefile] [expression]\n");
++ "Usage: dsniff [-cdmn] [-i interface | -p pcapfile] [-s snaplen]\n"
++ " [-f services] [-t trigger[,...]] [-r|-w savefile]\n"
++ " [expression]\n");
+ exit(1);
+ }
+
+@@ -75,7 +76,7 @@
+
+ services = savefile = triggers = NULL;
+
+- while ((c = getopt(argc, argv, "cdf:i:mnr:s:t:w:h?V")) != -1) {
++ while ((c = getopt(argc, argv, "cdf:i:mnp:r:s:t:w:h?V")) != -1) {
+ switch (c) {
+ case 'c':
+ Opt_client = 1;
+@@ -95,6 +96,9 @@
+ case 'n':
+ Opt_dns = 0;
+ break;
++ case 'p':
++ nids_params.filename = optarg;
++ break;
+ case 'r':
+ Opt_read = 1;
+ savefile = optarg;
+@@ -164,10 +168,23 @@
+ else nids_register_tcp(trigger_tcp);
+
+ if (nids_params.pcap_filter != NULL) {
+- warnx("listening on %s [%s]", nids_params.device,
+- nids_params.pcap_filter);
++ if (nids_params.filename == NULL) {
++ warnx("listening on %s [%s]", nids_params.device,
++ nids_params.pcap_filter);
++ }
++ else {
++ warnx("using %s [%s]", nids_params.filename,
++ nids_params.pcap_filter);
++ }
++ }
++ else {
++ if (nids_params.filename == NULL) {
++ warnx("listening on %s", nids_params.device);
++ }
++ else {
++ warnx("using %s", nids_params.filename);
++ }
+ }
+- else warnx("listening on %s", nids_params.device);
+
+ nids_run();
+
diff -r c74aaced8915 -r f464d27ccd15 security/dsniff/patches/patch-bc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/dsniff/patches/patch-bc Sat May 09 16:33:04 2009 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-bc,v 1.1 2009/05/09 16:33:04 adrianp Exp $
+
+diff -ur dsniff-2.3.orig/filesnarf.8 dsniff-2.3/filesnarf.8
+--- filesnarf.8.orig 2000-11-19 06:23:33.000000000 +0000
++++ filesnarf.8 2009-05-06 23:23:49.000000000 +0100
+@@ -9,7 +9,7 @@
+ .na
+ .nf
+ .fi
+-\fBfilesnarf\fR [\fB-i \fIinterface\fR] [[\fB-v\fR] \fIpattern [\fIexpression\fR]]
++\fBfilesnarf\fR [\fB-i \fIinterface\fR | \fB-p \fIpcapfile\fR] [[\fB-v\fR] \fIpattern [\fIexpression\fR]]
+ .SH DESCRIPTION
+ .ad
+ .fi
+@@ -18,6 +18,8 @@
+ .SH OPTIONS
+ .IP "\fB-i \fIinterface\fR"
+ Specify the interface to listen on.
++.IP "\fB-p \fIpcapfile\fR"
++Process packets from the specified PCAP capture file instead of the network.
+ .IP \fB-v\fR
+ "Versus" mode. Invert the sense of matching, to select non-matching
+ files.
diff -r c74aaced8915 -r f464d27ccd15 security/dsniff/patches/patch-bd
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/dsniff/patches/patch-bd Sat May 09 16:33:04 2009 +0000
@@ -0,0 +1,60 @@
+$NetBSD: patch-bd,v 1.1 2009/05/09 16:33:04 adrianp Exp $
+
+diff -ur dsniff-2.3.orig/filesnarf.c dsniff-2.3/filesnarf.c
+--- filesnarf.c.orig 2000-12-15 20:16:58.000000000 +0000
++++ filesnarf.c 2009-05-06 23:23:49.000000000 +0100
+@@ -51,7 +51,7 @@
+ usage(void)
+ {
+ fprintf(stderr, "Version: " VERSION "\n"
+- "Usage: filesnarf [-i interface] [[-v] pattern [expression]]\n");
++ "Usage: filesnarf [-i interface | -p pcapfile] [[-v] pattern [expression]]\n");
+ exit(1);
+ }
+
+@@ -462,11 +462,14 @@
+ {
+ int c;
+
+- while ((c = getopt(argc, argv, "i:vh?V")) != -1) {
++ while ((c = getopt(argc, argv, "i:p:vh?V")) != -1) {
+ switch (c) {
+ case 'i':
+ nids_params.device = optarg;
+ break;
++ case 'p':
++ nids_params.filename = optarg;
++ break;
+ case 'v':
+ Opt_invert = 1;
+ break;
+@@ -496,11 +499,24 @@
+ nids_register_ip(decode_udp_nfs);
+ nids_register_tcp(decode_tcp_nfs);
+
+- if (nids_params.pcap_filter != NULL) {
+- warnx("listening on %s [%s]", nids_params.device,
+- nids_params.pcap_filter);
+- }
+- else warnx("listening on %s", nids_params.device);
++ if (nids_params.pcap_filter != NULL) {
++ if (nids_params.filename == NULL) {
++ warnx("listening on %s [%s]", nids_params.device,
++ nids_params.pcap_filter);
++ }
++ else {
++ warnx("using %s [%s]", nids_params.filename,
++ nids_params.pcap_filter);
++ }
++ }
++ else {
++ if (nids_params.filename == NULL) {
++ warnx("listening on %s", nids_params.device);
++ }
++ else {
++ warnx("using %s", nids_params.filename);
++ }
++ }
+
+ nids_run();
+
diff -r c74aaced8915 -r f464d27ccd15 security/dsniff/patches/patch-be
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/dsniff/patches/patch-be Sat May 09 16:33:04 2009 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-be,v 1.1 2009/05/09 16:33:04 adrianp Exp $
+
+diff -ur dsniff-2.3.orig/mailsnarf.8 dsniff-2.3/mailsnarf.8
+--- mailsnarf.8.orig 2000-11-19 06:09:28.000000000 +0000
++++ mailsnarf.8 2009-05-06 23:23:49.000000000 +0100
+@@ -9,7 +9,7 @@
+ .na
+ .nf
+ .fi
+-\fBmailsnarf\fR [\fB-i \fIinterface\fR] [[\fB-v\fR] \fIpattern [\fIexpression\fR]]
++\fBmailsnarf\fR [\fB-i \fIinterface\fR | \fB-p \fIpcapfile\fR] [[\fB-v\fR] \fIpattern [\fIexpression\fR]]
+ .SH DESCRIPTION
+ .ad
+ .fi
+@@ -19,6 +19,8 @@
+ .SH OPTIONS
+ .IP "\fB-i \fIinterface\fR"
+ Specify the interface to listen on.
++.IP "\fB-p \fIpcapfile\fR"
++Process packets from the specified PCAP capture file instead of the network.
+ .IP \fB-v\fR
+ "Versus" mode. Invert the sense of matching, to select non-matching
+ messages.
diff -r c74aaced8915 -r f464d27ccd15 security/dsniff/patches/patch-bf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/dsniff/patches/patch-bf Sat May 09 16:33:04 2009 +0000
@@ -0,0 +1,58 @@
+$NetBSD: patch-bf,v 1.1 2009/05/09 16:33:04 adrianp Exp $
+
+diff -ur dsniff-2.3.orig/mailsnarf.c dsniff-2.3/mailsnarf.c
+--- mailsnarf.c.orig 2000-11-19 19:39:41.000000000 +0000
++++ mailsnarf.c 2009-05-06 23:23:49.000000000 +0100
+@@ -57,7 +57,7 @@
+ usage(void)
+ {
+ fprintf(stderr, "Version: " VERSION "\n"
+- "Usage: mailsnarf [-i interface] [[-v] pattern [expression]]\n");
++ "Usage: mailsnarf [-i interface | -p pcapfile] [[-v] pattern [expression]]\n");
+ exit(1);
+ }
+
+@@ -340,11 +340,14 @@
+ {
+ int c;
+
+- while ((c = getopt(argc, argv, "i:vh?V")) != -1) {
++ while ((c = getopt(argc, argv, "i:p:vh?V")) != -1) {
+ switch (c) {
+ case 'i':
+ nids_params.device = optarg;
+ break;
++ case 'p':
++ nids_params.filename = optarg;
++ break;
+ case 'v':
+ Opt_invert = 1;
+ break;
+@@ -374,10 +377,23 @@
+ nids_register_tcp(sniff_pop_session);
+
+ if (nids_params.pcap_filter != NULL) {
+- warnx("listening on %s [%s]", nids_params.device,
+- nids_params.pcap_filter);
Home |
Main Index |
Thread Index |
Old Index