[pkgsrc/trunk]: pkgsrc/security/dsniff Avoid conflicts with complex functions.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9d8877ccbd20
branches:  trunk
changeset: 624723:9d8877ccbd20
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Sep 29 10:19:01 2013 +0000

description:
Avoid conflicts with complex functions.

diffstat:

 security/dsniff/distinfo                |   4 +++-
 security/dsniff/patches/patch-sshmitm.c |  12 ++++++++++++
 security/dsniff/patches/patch-webmitm.c |  12 ++++++++++++
 3 files changed, 27 insertions(+), 1 deletions(-)

diffs (47 lines):

diff -r 137affca9961 -r 9d8877ccbd20 security/dsniff/distinfo
--- a/security/dsniff/distinfo  Sun Sep 29 10:17:34 2013 +0000
+++ b/security/dsniff/distinfo  Sun Sep 29 10:19:01 2013 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2009/05/09 16:33:04 adrianp Exp $
+$NetBSD: distinfo,v 1.10 2013/09/29 10:19:01 joerg Exp $
 
 SHA1 (dsniff-2.3.tar.gz) = 671a1df823ab0657fc95e79112924a57281e9c3b
 RMD160 (dsniff-2.3.tar.gz) = 89dad0259e90acef30a7aa5f3471de3aaeb06147
@@ -20,3 +20,5 @@
 SHA1 (patch-bj) = b6d45af26058a221cb68d72c45e7358c1ef894c0
 SHA1 (patch-bk) = 3a36f7a11a5590daea9b1cf7c8d7772a88ff2a18
 SHA1 (patch-bl) = add5db6023f9e76e269e953eb95ff5b808f650ab
+SHA1 (patch-sshmitm.c) = b1b219739c05290eb2635ae17175966eb2150b68
+SHA1 (patch-webmitm.c) = 426f4eb0e6b704b487e032f3a772766a0f1de061
diff -r 137affca9961 -r 9d8877ccbd20 security/dsniff/patches/patch-sshmitm.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/dsniff/patches/patch-sshmitm.c   Sun Sep 29 10:19:01 2013 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-sshmitm.c,v 1.1 2013/09/29 10:19:01 joerg Exp $
+
+--- sshmitm.c.orig     2013-09-28 13:07:42.000000000 +0000
++++ sshmitm.c
+@@ -41,6 +41,7 @@ int   mitm_fd;
+ int    client_fd, server_fd;
+ SSH_CTX       *ssh_client_ctx, *ssh_server_ctx;
+ SSH   *ssh_client, *ssh_server;
++#define csin my_csin
+ struct         sockaddr_in csin, ssin;
+ int    sig_pipe[2];
+ 
diff -r 137affca9961 -r 9d8877ccbd20 security/dsniff/patches/patch-webmitm.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/dsniff/patches/patch-webmitm.c   Sun Sep 29 10:19:01 2013 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-webmitm.c,v 1.1 2013/09/29 10:19:01 joerg Exp $
+
+--- webmitm.c.orig     2013-09-28 13:09:07.000000000 +0000
++++ webmitm.c
+@@ -43,6 +43,7 @@ int   http_fd, https_fd;
+ int    client_fd, server_fd;
+ SSL_CTX       *ssl_client_ctx, *ssl_server_ctx;
+ SSL   *ssl_client, *ssl_server;
++#define csin my_csin
+ struct         sockaddr_in csin, ssin;
+ int    do_ssl, sig_pipe[2];
+