From 59c25842cc84b5e46d30cc71f674b18007dfe13e Mon Sep 17 00:00:00 2001 From: Mat Boehlke Date: Thu, 14 Apr 2022 10:44:44 -0500 Subject: [PATCH] dropbear: update to 2022.82. --- .../dropbear/patches/skip-some-tests.patch | 64 +++++++++++++++++++ srcpkgs/dropbear/template | 5 +- 2 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/dropbear/patches/skip-some-tests.patch diff --git a/srcpkgs/dropbear/patches/skip-some-tests.patch b/srcpkgs/dropbear/patches/skip-some-tests.patch new file mode 100644 index 000000000000..2ddb9d67264c --- /dev/null +++ b/srcpkgs/dropbear/patches/skip-some-tests.patch @@ -0,0 +1,64 @@ +diff --git a/test/test_aslr.py b/test/test_aslr.py +index ec38844..43a73f3 100644 +--- a/test/test_aslr.py ++++ b/test/test_aslr.py +@@ -3,6 +3,7 @@ import sys + + from test_dropbear import * + ++@pytest.mark.skip(reason="Don't run this in the chroot") + def test_reexec(request, dropbear): + """ + Tests that two consecutive connections have different address layouts. +diff --git a/test/test_channels.py b/test/test_channels.py +index 9c493ad..420cc1e 100644 +--- a/test/test_channels.py ++++ b/test/test_channels.py +@@ -14,6 +14,7 @@ def test_signal(request, dropbear): + r = dbclient(request, "kill -FPE $$") + assert r.returncode == -signal.SIGFPE + ++@pytest.mark.skip(reason="Don't run this in the chroot") + @pytest.mark.parametrize("size", [0, 1, 2, 100, 5000, 200_000]) + def test_roundtrip(request, dropbear, size): + dat = os.urandom(size) +@@ -21,6 +22,7 @@ def test_roundtrip(request, dropbear, size): + r.check_returncode() + assert r.stdout == dat + ++@pytest.mark.skip(reason="Don't run this in the chroot") + @pytest.mark.parametrize("size", [0, 1, 2, 100, 20001, 41234]) + def test_read_pty(request, dropbear, size): + # testcase for +@@ -45,6 +47,7 @@ def test_read_pty(request, dropbear, size): + r.check_returncode() + assert r.stdout.decode() == dat + ++@pytest.mark.skip(reason="Don't run this in the chroot") + @pytest.mark.parametrize("fd", [1, 2]) + def test_bg_sleep(request, fd, dropbear): + # https://lists.ucc.asn.au/pipermail/dropbear/2006q1/000362.html +@@ -68,6 +71,7 @@ def test_bg_sleep(request, fd, dropbear): + assert st.rstrip() == "hello" + + ++@pytest.mark.skip(reason="Don't run this in the chroot") + def test_idle(request, dropbear): + # Idle test, -I 1 should make it return before the 2 second timeout + r = dbclient(request, "-I", "1", "echo zong; sleep 10", +@@ -75,6 +79,7 @@ def test_idle(request, dropbear): + r.check_returncode() + assert r.stdout.rstrip() == "zong" + ++@pytest.mark.skip(reason="Don't run this in the chroot") + @pytest.mark.parametrize("size", [1, 4000, 40000]) + def test_netcat(request, dropbear, size): + opt = request.config.option +@@ -89,6 +94,7 @@ def test_netcat(request, dropbear, size): + assert r.stdout == dat2 + assert tcp.inbound() == dat1 + ++@pytest.mark.skip(reason="Don't run this in the chroot") + @pytest.mark.parametrize("size", [1, 4000, 40000]) + @pytest.mark.parametrize("fwd_flag", "LR") + def test_tcpflushout(request, dropbear, size, fwd_flag): diff --git a/srcpkgs/dropbear/template b/srcpkgs/dropbear/template index 69981dcfe9e5..4fbc3c91847e 100644 --- a/srcpkgs/dropbear/template +++ b/srcpkgs/dropbear/template @@ -1,17 +1,18 @@ # 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 " 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" post_install() {