Re: [PR PATCH] [Updated] dropbear: update to 2022.82.

[mtboehlke <mtboehlke@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]

There is an updated pull request by mtboehlke against master on the void-packages repository

https://github.com/mtboehlke/void-packages dropbear
https://github.com/void-linux/void-packages/pull/36692

dropbear: update to 2022.82.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

A patch file from https://github.com/void-linux/void-packages/pull/36692.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dropbear-36692.patch --]
[-- Type: text/x-diff, Size: 2350 bytes --]

From 4a3e5e6ee0d3f1786d0e09c9de2f21b448997709 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Thu, 14 Apr 2022 10:44:44 -0500
Subject: [PATCH] dropbear: update to 2022.82.

---
 srcpkgs/dropbear/patches/test-without-pip.patch | 15 +++++++++++++++
 srcpkgs/dropbear/template                       | 12 ++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dropbear/patches/test-without-pip.patch

diff --git a/srcpkgs/dropbear/patches/test-without-pip.patch b/srcpkgs/dropbear/patches/test-without-pip.patch
new file mode 100644
index 000000000000..f726be40a34e
--- /dev/null
+++ b/srcpkgs/dropbear/patches/test-without-pip.patch
@@ -0,0 +1,15 @@
+diff --git a/test/Makefile.in b/test/Makefile.in
+index b2c8d43..5747310 100644
+--- a/test/Makefile.in
++++ b/test/Makefile.in
+@@ -13,9 +13,7 @@ one: venv/bin/pytest fakekey
+ fakekey:
+ 	../dropbearkey -t ecdsa -f $@
+ 
+-venv/bin/pytest: $(srcdir)/requirements.txt
++venv/bin/pytest:
+ 	python3 -m venv init venv
+-	./venv/bin/pip install --upgrade pip
+-	./venv/bin/pip install -r $(srcdir)/requirements.txt
+ 
+ .PHONY: test
diff --git a/srcpkgs/dropbear/template b/srcpkgs/dropbear/template
index 69981dcfe9e5..8b792314536d 100644
--- a/srcpkgs/dropbear/template
+++ b/srcpkgs/dropbear/template
@@ -1,19 +1,27 @@
 # Template file for 'dropbear'
 pkgname=dropbear
-version=2020.81
+version=2022.82
 revision=1
 build_style=gnu-configure
 configure_args="--enable-zlib --disable-bundled-libtom"
 makedepends="zlib-devel libtommath-devel libtomcrypt-devel"
+checkdepends="python3-pytest python3-parsing python3-psutil openssh"
 short_desc="Small SSH server and client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://matt.ucc.asn.au/dropbear/dropbear.html"
 changelog="https://matt.ucc.asn.au/dropbear/CHANGES"
 distfiles="https://matt.ucc.asn.au/${pkgname}/releases/${pkgname}-${version}.tar.bz2"
-checksum=48235d10b37775dbda59341ac0c4b239b82ad6318c31568b985730c788aac53b
+checksum=3a038d2bbc02bf28bbdd20c012091f741a3ec5cbe460691811d714876aad75d1
 make_dirs="/etc/dropbear 0755 root root"
 
+# These tests don't work from within xbps-src
+# and probably should not be run from there
+pre_check() {
+	rm test/test_aslr.py
+	rm test/test_channels.py
+}
+
 post_install() {
 	vsv dropbear
 	vlicense LICENSE