Fri Apr 24 12:45:10 2020 UTC ()
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++


(leot)
diff -r1.43 -r1.44 pkgsrc/security/dsniff/Makefile
diff -r1.13 -r1.14 pkgsrc/security/dsniff/Makefile.common
diff -r1.12 -r1.13 pkgsrc/security/dsniff/distinfo
diff -r1.18 -r1.19 pkgsrc/security/dsniff-nox11/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/security/dsniff-nox11/PLIST
diff -r0 -r1.1 pkgsrc/security/dsniff/patches/patch-Makefile.in
cvs diff -r1.43 -r1.44 pkgsrc/security/dsniff/Makefile (expand / switch to unified diff)

--- pkgsrc/security/dsniff/Makefile 2020/03/08 16:51:06 1.43
+++ pkgsrc/security/dsniff/Makefile 2020/04/24 12:45:09 1.44
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.43 2020/03/08 16:51:06 wiz Exp $ 1# $NetBSD: Makefile,v 1.44 2020/04/24 12:45:09 leot Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5PKGREVISION= 17 5PKGREVISION= 18
6COMMENT= Password sniffer (webspy) 6COMMENT= Password sniffer (webspy)
7 7
8DEPENDS+= dsniff-nox11-[0-9]*:../../security/dsniff-nox11 8DEPENDS+= dsniff-nox11-[0-9]*:../../security/dsniff-nox11
9 9
10BUILD_TARGET= libmissing.a webspy 10BUILD_TARGET= libmissing.a webspy
11 11
12INSTALLATION_DIRS+= sbin ${PKGMANDIR}/man8 12INSTALLATION_DIRS+= sbin ${PKGMANDIR}/man8
13 13
14do-install: 14do-install:
15 ${INSTALL_PROGRAM} ${WRKSRC}/webspy ${DESTDIR}${PREFIX}/sbin 15 ${INSTALL_PROGRAM} ${WRKSRC}/webspy ${DESTDIR}${PREFIX}/sbin
16 ${INSTALL_MAN} ${WRKSRC}/webspy.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 16 ${INSTALL_MAN} ${WRKSRC}/webspy.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
17 17
18BUILDLINK_DEPMETHOD.libXt?= build 18BUILDLINK_DEPMETHOD.libXt?= build
cvs diff -r1.13 -r1.14 pkgsrc/security/dsniff/Makefile.common (expand / switch to unified diff)

--- pkgsrc/security/dsniff/Makefile.common 2020/04/24 11:41:36 1.13
+++ pkgsrc/security/dsniff/Makefile.common 2020/04/24 12:45:09 1.14
@@ -1,25 +1,23 @@ @@ -1,25 +1,23 @@
1# $NetBSD: Makefile.common,v 1.13 2020/04/24 11:41:36 nia Exp $ 1# $NetBSD: Makefile.common,v 1.14 2020/04/24 12:45:09 leot Exp $
2# 2#
3# used by security/dsniff/Makefile 3# used by security/dsniff/Makefile
4# used by security/dsniff-nox11/Makefile 4# used by security/dsniff-nox11/Makefile
5 5
6DISTNAME= dsniff-${VERS} 6DISTNAME= dsniff-${VERS}
7VERS= 2.3 7VERS= 2.3
8CATEGORIES= security 8CATEGORIES= security
9MASTER_SITES+= https://monkey.org/~dugsong/dsniff/ 9MASTER_SITES+= https://monkey.org/~dugsong/dsniff/
10 10
11BROKEN= "Fails to build with OpenSSL 1.1" 
12 
13MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= https://monkey.org/~dugsong/dsniff/ 12HOMEPAGE= https://monkey.org/~dugsong/dsniff/
15LICENSE= modified-bsd 13LICENSE= modified-bsd
16 14
17GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
18MAKE_JOBS_SAFE= no 16MAKE_JOBS_SAFE= no
19 17
20PATCHDIR= ${.CURDIR}/../../security/dsniff/patches 18PATCHDIR= ${.CURDIR}/../../security/dsniff/patches
21DISTINFO_FILE= ${.CURDIR}/../../security/dsniff/distinfo 19DISTINFO_FILE= ${.CURDIR}/../../security/dsniff/distinfo
22 20
23SUBST_CLASSES+= conf 21SUBST_CLASSES+= conf
24SUBST_STAGE.conf= pre-configure 22SUBST_STAGE.conf= pre-configure
25SUBST_FILES.conf= configure 23SUBST_FILES.conf= configure
cvs diff -r1.12 -r1.13 pkgsrc/security/dsniff/distinfo (expand / switch to unified diff)

--- pkgsrc/security/dsniff/distinfo 2016/04/18 08:34:35 1.12
+++ pkgsrc/security/dsniff/distinfo 2020/04/24 12:45:09 1.13
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1$NetBSD: distinfo,v 1.12 2016/04/18 08:34:35 leot Exp $ 1$NetBSD: distinfo,v 1.13 2020/04/24 12:45:09 leot Exp $
2 2
3SHA1 (dsniff-2.3.tar.gz) = 671a1df823ab0657fc95e79112924a57281e9c3b 3SHA1 (dsniff-2.3.tar.gz) = 671a1df823ab0657fc95e79112924a57281e9c3b
4RMD160 (dsniff-2.3.tar.gz) = 89dad0259e90acef30a7aa5f3471de3aaeb06147 4RMD160 (dsniff-2.3.tar.gz) = 89dad0259e90acef30a7aa5f3471de3aaeb06147
5SHA512 (dsniff-2.3.tar.gz) = d27b2bf901cd7e2dcef0d6170318d131ba57d4881c0b85f24ee3de9581c41841eab4363cc8ea0dd6d7dcd1c27dcb61d054dfca964b5674301d8c7a173a9f113d 5SHA512 (dsniff-2.3.tar.gz) = d27b2bf901cd7e2dcef0d6170318d131ba57d4881c0b85f24ee3de9581c41841eab4363cc8ea0dd6d7dcd1c27dcb61d054dfca964b5674301d8c7a173a9f113d
6Size (dsniff-2.3.tar.gz) = 126797 bytes 6Size (dsniff-2.3.tar.gz) = 126797 bytes
 7SHA1 (patch-Makefile.in) = 90954f3959d2f55f5c50f1753210cee9fdc0a872
7SHA1 (patch-aa) = b3798143fa0a662870c3144f136773d575c54364 8SHA1 (patch-aa) = b3798143fa0a662870c3144f136773d575c54364
8SHA1 (patch-ab) = 6385da7139dcb11ea29ffba468e7fac260b61b44 9SHA1 (patch-ab) = 6385da7139dcb11ea29ffba468e7fac260b61b44
9SHA1 (patch-ac) = 1730b92ecd421e396781e2e4ba9b7a7d9b90d992 10SHA1 (patch-ac) = 1730b92ecd421e396781e2e4ba9b7a7d9b90d992
10SHA1 (patch-ad) = cab09e1b1a61fd6a3fa96c24fff3cd1519146a3e 11SHA1 (patch-ad) = cab09e1b1a61fd6a3fa96c24fff3cd1519146a3e
11SHA1 (patch-ae) = e54a7be65c2e1d236b2427d216e1184ff6046a0b 12SHA1 (patch-ae) = e54a7be65c2e1d236b2427d216e1184ff6046a0b
12SHA1 (patch-ba) = 5f774dcb904681f123fa9cae25ea4d88afee6bb6 13SHA1 (patch-ba) = 5f774dcb904681f123fa9cae25ea4d88afee6bb6
13SHA1 (patch-bb) = 58026805c5a8f91f7fa80a94ddbea0b8fadfadd5 14SHA1 (patch-bb) = 58026805c5a8f91f7fa80a94ddbea0b8fadfadd5
14SHA1 (patch-bc) = 6d27957bd1d10b66428dbea214b0463fa8321bef 15SHA1 (patch-bc) = 6d27957bd1d10b66428dbea214b0463fa8321bef
15SHA1 (patch-bd) = dc0f17dd287327ff5105e91c5bfa8b2390841fe2 16SHA1 (patch-bd) = dc0f17dd287327ff5105e91c5bfa8b2390841fe2
16SHA1 (patch-be) = 878d5e81909790d852db442ec0bb57fb161a73a4 17SHA1 (patch-be) = 878d5e81909790d852db442ec0bb57fb161a73a4
17SHA1 (patch-bf) = c1bd7f1794d6f8b9fec6cf1d6b24e75ed32c0616 18SHA1 (patch-bf) = c1bd7f1794d6f8b9fec6cf1d6b24e75ed32c0616
18SHA1 (patch-bg) = 6888b68ae38b32a2fd635f5b08c7c637033a28b5 19SHA1 (patch-bg) = 6888b68ae38b32a2fd635f5b08c7c637033a28b5
19SHA1 (patch-bh) = 1e4bee85e6d289c011632ef84d460e46746287c9 20SHA1 (patch-bh) = 1e4bee85e6d289c011632ef84d460e46746287c9
cvs diff -r1.18 -r1.19 pkgsrc/security/dsniff-nox11/Makefile (expand / switch to unified diff)

--- pkgsrc/security/dsniff-nox11/Makefile 2020/03/08 16:51:07 1.18
+++ pkgsrc/security/dsniff-nox11/Makefile 2020/04/24 12:45:09 1.19
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.18 2020/03/08 16:51:07 wiz Exp $ 1# $NetBSD: Makefile,v 1.19 2020/04/24 12:45:09 leot Exp $
2 2
3.include "../../security/dsniff/Makefile.common" 3.include "../../security/dsniff/Makefile.common"
4 4
5PKGNAME= dsniff-nox11-${VERS} 5PKGNAME= dsniff-nox11-${VERS}
6PKGREVISION= 11 6PKGREVISION= 12
7COMMENT= Password sniffer 7COMMENT= Password sniffer
8 8
9CONFIGURE_ARGS+= --without-x 9CONFIGURE_ARGS+= --without-x
10 10
11INSTALLATION_DIRS+= ${PKGMANDIR}/man8 11INSTALLATION_DIRS+= ${PKGMANDIR}/man8
12INSTALL_MAKE_FLAGS+= install_prefix=${DESTDIR} 12INSTALL_MAKE_FLAGS+= install_prefix=${DESTDIR}
13 13
14CFLAGS.Darwin+= -DBIND_8_COMPAT 14CFLAGS.Darwin+= -DBIND_8_COMPAT
15 15
16post-configure: 16post-configure:
17 ( cd ${WRKSRC} \ 17 ( cd ${WRKSRC} \
18 && grep '#define.*HAVE_SYS_QUEUE_H' config.h >/dev/null \ 18 && grep '#define.*HAVE_SYS_QUEUE_H' config.h >/dev/null \
19 && mv missing/sys/queue.h missing/sys/queue.h.fake ) 19 && mv missing/sys/queue.h missing/sys/queue.h.fake )
cvs diff -r1.1.1.1 -r1.2 pkgsrc/security/dsniff-nox11/PLIST (expand / switch to unified diff)

--- pkgsrc/security/dsniff-nox11/PLIST 2005/03/22 01:05:16 1.1.1.1
+++ pkgsrc/security/dsniff-nox11/PLIST 2020/04/24 12:45:09 1.2
@@ -1,28 +1,27 @@ @@ -1,28 +1,27 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2005/03/22 01:05:16 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.2 2020/04/24 12:45:09 leot Exp $
2lib/dnsspoof.hosts 2lib/dnsspoof.hosts
3lib/dsniff.magic 3lib/dsniff.magic
4lib/dsniff.services 4lib/dsniff.services
5man/man8/arpspoof.8 5man/man8/arpspoof.8
6man/man8/dnsspoof.8 6man/man8/dnsspoof.8
7man/man8/dsniff.8 7man/man8/dsniff.8
8man/man8/filesnarf.8 8man/man8/filesnarf.8
9man/man8/macof.8 9man/man8/macof.8
10man/man8/mailsnarf.8 10man/man8/mailsnarf.8
11man/man8/msgsnarf.8 11man/man8/msgsnarf.8
12man/man8/sshmitm.8 12man/man8/sshmitm.8
13man/man8/tcpkill.8 13man/man8/tcpkill.8
14man/man8/tcpnice.8 14man/man8/tcpnice.8
15man/man8/urlsnarf.8 15man/man8/urlsnarf.8
16man/man8/webmitm.8 16man/man8/webmitm.8
17sbin/arpspoof 17sbin/arpspoof
18sbin/dnsspoof 18sbin/dnsspoof
19sbin/dsniff 19sbin/dsniff
20sbin/filesnarf 20sbin/filesnarf
21sbin/macof 21sbin/macof
22sbin/mailsnarf 22sbin/mailsnarf
23sbin/msgsnarf 23sbin/msgsnarf
24sbin/sshmitm 
25sbin/tcpkill 24sbin/tcpkill
26sbin/tcpnice 25sbin/tcpnice
27sbin/urlsnarf 26sbin/urlsnarf
28sbin/webmitm 27sbin/webmitm
File Added: pkgsrc/security/dsniff/patches/patch-Makefile.in
$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