summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorjoerg <joerg>2013-09-29 10:19:01 +0000
committerjoerg <joerg>2013-09-29 10:19:01 +0000
commit825138c394dda834c67784ff12608d06e9d2bbb6 (patch)
treeaafb3e5c9accc708687dbc46a2a1aabf4bad51b5 /security
parent9a486eafb5e50960928e6bcd477e75d4da3e90a1 (diff)
downloadpkgsrc-825138c394dda834c67784ff12608d06e9d2bbb6.tar.gz
Avoid conflicts with complex functions.
Diffstat (limited to 'security')
-rw-r--r--security/dsniff/distinfo4
-rw-r--r--security/dsniff/patches/patch-sshmitm.c12
-rw-r--r--security/dsniff/patches/patch-webmitm.c12
3 files changed, 27 insertions, 1 deletions
diff --git a/security/dsniff/distinfo b/security/dsniff/distinfo
index b4e4eae054d..6959ebf00c6 100644
--- a/security/dsniff/distinfo
+++ b/security/dsniff/distinfo
@@ -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-bi) = 47c6b0e3682af9ee3b212b0d0800d9a74037df30
SHA1 (patch-bj) = b6d45af26058a221cb68d72c45e7358c1ef894c0
SHA1 (patch-bk) = 3a36f7a11a5590daea9b1cf7c8d7772a88ff2a18
SHA1 (patch-bl) = add5db6023f9e76e269e953eb95ff5b808f650ab
+SHA1 (patch-sshmitm.c) = b1b219739c05290eb2635ae17175966eb2150b68
+SHA1 (patch-webmitm.c) = 426f4eb0e6b704b487e032f3a772766a0f1de061
diff --git a/security/dsniff/patches/patch-sshmitm.c b/security/dsniff/patches/patch-sshmitm.c
new file mode 100644
index 00000000000..ad14923af60
--- /dev/null
+++ b/security/dsniff/patches/patch-sshmitm.c
@@ -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 --git a/security/dsniff/patches/patch-webmitm.c b/security/dsniff/patches/patch-webmitm.c
new file mode 100644
index 00000000000..51b6b64d7f6
--- /dev/null
+++ b/security/dsniff/patches/patch-webmitm.c
@@ -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];
+