From: mtboehlke <mtboehlke@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] dropbear: update to 2022.82.
Date: Sun, 01 May 2022 04:06:20 +0200 [thread overview]
Message-ID: <20220501020620.VESboM-LMOFY-TL5UoVJI_DkpI_PG5LQ4FsdwB1_zt8@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36692@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1247 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: **briefly**
<!--
#### 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: 4419 bytes --]
From 31fa8a72af5c51e4791f0cbf7b7f38ff3ffde1d1 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.
---
.../dropbear/patches/skip-some-tests.patch | 72 +++++++++++++++++++
srcpkgs/dropbear/template | 5 +-
2 files changed, 75 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..f127f9e5ba0f
--- /dev/null
+++ b/srcpkgs/dropbear/patches/skip-some-tests.patch
@@ -0,0 +1,72 @@
+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..71a478a 100644
+--- a/test/test_channels.py
++++ b/test/test_channels.py
+@@ -5,6 +5,7 @@ import socket
+
+ # Tests for various edge cases of SSH channels and connection service
+
++@pytest.mark.skip(reason="Don't run this in the chroot")
+ def test_exitcode(request, dropbear):
+ r = dbclient(request, "exit 44")
+ assert r.returncode == 44
+@@ -14,6 +15,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 +23,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 +48,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 +72,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 +80,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 +95,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..a13f40bb2294 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 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"
post_install() {
next prev parent reply other threads:[~2022-05-01 2:06 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-14 15:59 [PR PATCH] " mtboehlke
2022-04-19 14:00 ` [PR PATCH] [Updated] " mtboehlke
2022-04-20 14:44 ` abenson
2022-04-20 17:35 ` mtboehlke
2022-05-01 1:03 ` [PR PATCH] [Updated] " mtboehlke
2022-05-01 2:06 ` mtboehlke [this message]
2022-05-02 18:11 ` mtboehlke
2022-05-02 18:19 ` mtboehlke
2022-05-07 12:48 ` leahneukirchen
2022-05-07 14:27 ` [PR PATCH] [Updated] " mtboehlke
2022-05-07 14:29 ` mtboehlke
2022-05-07 15:26 ` [PR PATCH] [Merged]: " leahneukirchen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220501020620.VESboM-LMOFY-TL5UoVJI_DkpI_PG5LQ4FsdwB1_zt8@z \
--to=mtboehlke@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).