CVS commit: pkgsrc/security

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Fri Apr 24 12:45:10 UTC 2020

Modified Files:
        pkgsrc/security/dsniff: Makefile Makefile.common distinfo
        pkgsrc/security/dsniff-nox11: Makefile PLIST
Added Files:
        pkgsrc/security/dsniff/patches: patch-Makefile.in

Log Message:
dsniff{,-nox11}: unbreak them by not installing sshmitm

Only sshmitm is incompatible with OpenSSL 1.1.  Temporarily avoid to build and
install it (possible patches that should fix building it with OpenSSL 1.1 are
present in Debian and are probably worth to look).

PKGREVISION++


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/security/dsniff/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/security/dsniff/Makefile.common
cvs rdiff -u -r1.12 -r1.13 pkgsrc/security/dsniff/distinfo
cvs rdiff -u -r1.18 -r1.19 pkgsrc/security/dsniff-nox11/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/security/dsniff-nox11/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/security/dsniff/patches/patch-Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/dsniff/Makefile
diff -u pkgsrc/security/dsniff/Makefile:1.43 pkgsrc/security/dsniff/Makefile:1.44
--- pkgsrc/security/dsniff/Makefile:1.43        Sun Mar  8 16:51:06 2020
+++ pkgsrc/security/dsniff/Makefile     Fri Apr 24 12:45:09 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2020/03/08 16:51:06 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2020/04/24 12:45:09 leot Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=   17
+PKGREVISION=   18
 COMMENT=       Password sniffer (webspy)
 
 DEPENDS+=      dsniff-nox11-[0-9]*:../../security/dsniff-nox11

Index: pkgsrc/security/dsniff/Makefile.common
diff -u pkgsrc/security/dsniff/Makefile.common:1.13 pkgsrc/security/dsniff/Makefile.common:1.14
--- pkgsrc/security/dsniff/Makefile.common:1.13 Fri Apr 24 11:41:36 2020
+++ pkgsrc/security/dsniff/Makefile.common      Fri Apr 24 12:45:09 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2020/04/24 11:41:36 nia Exp $
+# $NetBSD: Makefile.common,v 1.14 2020/04/24 12:45:09 leot Exp $
 #
 # used by security/dsniff/Makefile
 # used by security/dsniff-nox11/Makefile
@@ -8,8 +8,6 @@ VERS=           2.3
 CATEGORIES=    security
 MASTER_SITES+= https://monkey.org/~dugsong/dsniff/
 
-BROKEN=                "Fails to build with OpenSSL 1.1"
-
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://monkey.org/~dugsong/dsniff/
 LICENSE=       modified-bsd

Index: pkgsrc/security/dsniff/distinfo
diff -u pkgsrc/security/dsniff/distinfo:1.12 pkgsrc/security/dsniff/distinfo:1.13
--- pkgsrc/security/dsniff/distinfo:1.12        Mon Apr 18 08:34:35 2016
+++ pkgsrc/security/dsniff/distinfo     Fri Apr 24 12:45:09 2020
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.12 2016/04/18 08:34:35 leot Exp $
+$NetBSD: distinfo,v 1.13 2020/04/24 12:45:09 leot Exp $
 
 SHA1 (dsniff-2.3.tar.gz) = 671a1df823ab0657fc95e79112924a57281e9c3b
 RMD160 (dsniff-2.3.tar.gz) = 89dad0259e90acef30a7aa5f3471de3aaeb06147
 SHA512 (dsniff-2.3.tar.gz) = d27b2bf901cd7e2dcef0d6170318d131ba57d4881c0b85f24ee3de9581c41841eab4363cc8ea0dd6d7dcd1c27dcb61d054dfca964b5674301d8c7a173a9f113d
 Size (dsniff-2.3.tar.gz) = 126797 bytes
+SHA1 (patch-Makefile.in) = 90954f3959d2f55f5c50f1753210cee9fdc0a872
 SHA1 (patch-aa) = b3798143fa0a662870c3144f136773d575c54364
 SHA1 (patch-ab) = 6385da7139dcb11ea29ffba468e7fac260b61b44
 SHA1 (patch-ac) = 1730b92ecd421e396781e2e4ba9b7a7d9b90d992

Index: pkgsrc/security/dsniff-nox11/Makefile
diff -u pkgsrc/security/dsniff-nox11/Makefile:1.18 pkgsrc/security/dsniff-nox11/Makefile:1.19
--- pkgsrc/security/dsniff-nox11/Makefile:1.18  Sun Mar  8 16:51:07 2020
+++ pkgsrc/security/dsniff-nox11/Makefile       Fri Apr 24 12:45:09 2020
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2020/03/08 16:51:07 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2020/04/24 12:45:09 leot Exp $
 
 .include "../../security/dsniff/Makefile.common"
 
 PKGNAME=       dsniff-nox11-${VERS}
-PKGREVISION=   11
+PKGREVISION=   12
 COMMENT=       Password sniffer
 
 CONFIGURE_ARGS+=       --without-x

Index: pkgsrc/security/dsniff-nox11/PLIST
diff -u pkgsrc/security/dsniff-nox11/PLIST:1.1.1.1 pkgsrc/security/dsniff-nox11/PLIST:1.2
--- pkgsrc/security/dsniff-nox11/PLIST:1.1.1.1  Tue Mar 22 01:05:16 2005
+++ pkgsrc/security/dsniff-nox11/PLIST  Fri Apr 24 12:45:09 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/03/22 01:05:16 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/04/24 12:45:09 leot Exp $
 lib/dnsspoof.hosts
 lib/dsniff.magic
 lib/dsniff.services
@@ -21,7 +21,6 @@ sbin/filesnarf
 sbin/macof
 sbin/mailsnarf
 sbin/msgsnarf
-sbin/sshmitm
 sbin/tcpkill
 sbin/tcpnice
 sbin/urlsnarf

Added files:

Index: pkgsrc/security/dsniff/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/security/dsniff/patches/patch-Makefile.in:1.1
--- /dev/null   Fri Apr 24 12:45:10 2020
+++ pkgsrc/security/dsniff/patches/patch-Makefile.in    Fri Apr 24 12:45:09 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.in,v 1.1 2020/04/24 12:45:09 leot Exp $
+
+Do not build and install sshmitm, needs to be adjusted to OpenSSL 1.1.
+
+--- Makefile.in.orig   2000-12-15 20:03:26.000000000 +0000
++++ Makefile.in
+@@ -69,7 +69,7 @@ OBJS = $(SRCS:.c=.o)
+ LIBOBJS       = dummy.o @LIBOBJS@
+ 
+ PROGS = arpspoof dnsspoof dsniff filesnarf macof mailsnarf msgsnarf \
+-        sshmitm tcpkill tcpnice @TCPHIJACK@ urlsnarf webmitm @WEBSPY@ 
++        tcpkill tcpnice @TCPHIJACK@ urlsnarf webmitm @WEBSPY@ 
+ 
+ CONFIGS       = dsniff.magic dsniff.services dnsspoof.hosts
+