dropbear: Update to 2020.81

3 files changed, 8 insertions, 64 deletions

diff --git a/security/dropbear/Makefile b/security/dropbear/Makefile
index b7f92a9e0fa..5bc3acf68e7 100644
--- a/security/dropbear/Makefile
+++ b/security/dropbear/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2019/06/10 13:44:35 nia Exp $
+# $NetBSD: Makefile,v 1.37 2020/12/19 11:07:10 nia Exp $
 
-DISTNAME=	dropbear-2019.78
+DISTNAME=	dropbear-2020.81
 CATEGORIES=	security
 MASTER_SITES=	https://matt.ucc.asn.au/dropbear/releases/
 EXTRACT_SUFX=	.tar.bz2
@@ -48,12 +48,10 @@ CPPFLAGS+=		-DXAUTH_COMMAND="\"${XAUTHBASE}/bin/xauth\""
 CFLAGS.NetBSD+=		-DHAVE_NETINET_IN_SYSTM_H
 LDFLAGS.SunOS+=		-lsocket -lnsl
 
-INSTALLATION_DIRS=	share/doc/dropbear ${PKGMANDIR}/man1 ${PKGMANDIR}/man8
-
 BUILD_TARGET=		all scp
 
 post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/scp ${DESTDIR}/${PREFIX}/bin/dbscp
+	${INSTALL_PROGRAM} ${WRKSRC}/scp ${DESTDIR}${PREFIX}/bin/dbscp
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../math/ltm/buildlink3.mk"
diff --git a/security/dropbear/distinfo b/security/dropbear/distinfo
index 2120430bc49..edc44d65d6c 100644
--- a/security/dropbear/distinfo
+++ b/security/dropbear/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.26 2019/06/10 13:44:35 nia Exp $
+$NetBSD: distinfo,v 1.27 2020/12/19 11:07:10 nia Exp $
 
-SHA1 (dropbear-2019.78.tar.bz2) = 820ec2b8c869edbcf5ad1138777fc0f54349505c
-RMD160 (dropbear-2019.78.tar.bz2) = a6b00e7aa6482b8ca2aa68443306b58be816d80e
-SHA512 (dropbear-2019.78.tar.bz2) = f667ba8dae17ea89c118642b566f2c134c71bfd0b8bacea5cf7ec87d75ac79bd7cd1864a8788367a89d30ee35427d389ef6416375adff6e83caae30ff3e0549f
-Size (dropbear-2019.78.tar.bz2) = 2708659 bytes
-SHA1 (patch-aa) = 2f1ff3a9e3bccab9852d05ee7c0a68484be3f0c3
+SHA1 (dropbear-2020.81.tar.bz2) = c3d4fe27fa17ec8217dbedbd33dd73a1ca6cda2c
+RMD160 (dropbear-2020.81.tar.bz2) = 15c78343cc230931d4f5b39bc40cb9beed262c05
+SHA512 (dropbear-2020.81.tar.bz2) = 2fa9d4d7dcb1c81281f5e47c8a99b7300eb46b3bb605daaec956404eae9124879a8bbbef521dea6da8b3643f3dc6f7f5005e265bfcaba97e89812f5642c294da
+Size (dropbear-2020.81.tar.bz2) = 2289644 bytes
 SHA1 (patch-configure) = 95c82b951d16a5cca92a3d4d7ef67b7eb5f47540
 SHA1 (patch-default__options.h) = ef38d09e20b9d74abdd118901a4fc30459eb0dcb
diff --git a/security/dropbear/patches/patch-aa b/security/dropbear/patches/patch-aa
deleted file mode 100644
index f3eb7390aea..00000000000
--- a/security/dropbear/patches/patch-aa
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-aa,v 1.12 2019/06/10 13:44:35 nia Exp $
-
-use pkgsrc macros to install programs and man pages
-set up dropbear default key locations correctly
-
---- Makefile.in.orig	2019-06-10 12:46:46.830428737 +0000
-+++ Makefile.in
-@@ -154,31 +154,30 @@ strip: $(TARGETS)
- install: $(addprefix inst_, $(TARGETS))
- 
- insmultidropbear: dropbearmulti$(EXEEXT)
--	$(INSTALL) -d $(DESTDIR)$(sbindir)
-+	$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(sbindir)
- 	-rm -f $(DESTDIR)$(sbindir)/dropbear$(EXEEXT)
- 	-ln -s $(bindir)/dropbearmulti$(EXEEXT) $(DESTDIR)$(sbindir)/dropbear$(EXEEXT) 
--	$(INSTALL) -d $(DESTDIR)$(mandir)/man8
--	$(INSTALL) -m 644 $(srcdir)/dropbear.8  $(DESTDIR)$(mandir)/man8/dropbear.8
-+	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man8
-+	$(BSD_INSTALL_MAN) $(srcdir)/dropbear.8  $(DESTDIR)$(mandir)/man8/dropbear.8
- 
- insmulti%: dropbearmulti$(EXEEXT)
--	$(INSTALL) -d $(DESTDIR)$(bindir)
--	-rm -f $(DESTDIR)$(bindir)/$*$(EXEEXT) 
-+	$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir)
- 	-ln -s $(bindir)/dropbearmulti$(EXEEXT) $(DESTDIR)$(bindir)/$*$(EXEEXT) 
--	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
--	if test -e $*.1; then $(INSTALL) -m 644 $*.1 $(DESTDIR)$(mandir)/man1/$*.1; fi
-+	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1
-+	if test -e $*.1; then $(BSD_INSTALL_MAN) $*.1 $(DESTDIR)$(mandir)/man1/$*.1; fi
- 
- # dropbear should go in sbin, so it needs a separate rule
- inst_dropbear: dropbear
--	$(INSTALL) -d $(DESTDIR)$(sbindir)
--	$(INSTALL) dropbear$(EXEEXT) $(DESTDIR)$(sbindir)
--	$(INSTALL) -d $(DESTDIR)$(mandir)/man8
--	$(INSTALL) -m 644 $(srcdir)/dropbear.8 $(DESTDIR)$(mandir)/man8/dropbear.8
-+	$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(sbindir)
-+	$(BSD_INSTALL_PROGRAM) dropbear$(EXEEXT) $(DESTDIR)$(sbindir)
-+	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man8
-+	$(BSD_INSTALL_MAN) $(srcdir)/dropbear.8 $(DESTDIR)$(mandir)/man8/dropbear.8
- 
- inst_%: %
--	$(INSTALL) -d $(DESTDIR)$(bindir)
--	$(INSTALL) $*$(EXEEXT) $(DESTDIR)$(bindir)
--	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
--	if test -e $*.1; then $(INSTALL) -m 644 $*.1 $(DESTDIR)$(mandir)/man1/$*.1; fi
-+	$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir)
-+	$(BSD_INSTALL_PROGRAM) $*$(EXEEXT) $(DESTDIR)$(bindir)
-+	$(BSD_INSTALL_MAN_DIR) -d $(DESTDIR)$(mandir)/man1
-+	if test -e $*.1; then $(BSD_INSTALL_MAN) -m 644 $*.1 $(DESTDIR)$(mandir)/man1/$*.1; fi
- 
- inst_dropbearmulti: $(addprefix insmulti, $(PROGRAMS)) 
-