On Mon, 11 Mar 2024 at 20:09:06 +0000, Simon McVittie wrote:
> Thanks for proposing this, but I think these should be ifneq instead
> of ifeq
Actually, this patch also still allowed dh_auto_test to run on the
time64-affected architectures, which would presumably fail because the
tests' dependencies weren't met.
I attach a tested patch based on Mattia's, also available from
<https://salsa.debian.org/debian/stunnel/-/merge_requests/3>. This seems
to have the desired results:
* amd64: tests are run, and pass; autopkgtests also pass
* i386: tests are run, and pass; autopkgtests still in progress at the
time of writing
* armhf on a porterbox: tests are not run, package is buildable without
having to wait for python3-cryptography
armhf and other affected architectures will still be tested via autopkgtest
after python3-cryptography becomes available.
I think this change might be a pragmatic way to shorten the critical
path for the time64 transition. Please consider applying it?
Thanks,
smcv
>From 93d5d5d18d916d7fda9dcd0298019f9e1c887133 Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Tue, 12 Mar 2024 10:26:49 +0000
Subject: [PATCH 1/2] Don't run build-time tests on the 32-bit non-i386
architectures
This allows libcurl to be rebuilt on the architectures affected by the
64-bit time_t transition, which unblocks rebuilding of a lot of the
C/C++ ecosystem without having to wait for rustc/cargo to be
re-bootstrapped (#1065787).
Closes: #1066049
Co-authored-by: Mattia Rizzolo <mat...@debian.org>
Signed-off-by: Simon McVittie <s...@debian.org>
---
debian/control | 10 +++++-----
debian/rules | 5 +++++
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/debian/control b/debian/control
index f32dc6f..f34acbd 100644
--- a/debian/control
+++ b/debian/control
@@ -10,13 +10,13 @@ Build-Depends:
libssl-dev,
libsystemd-dev [linux-any],
libwrap0-dev,
- net-tools <!nocheck>,
- netcat-openbsd <!nocheck>,
+ net-tools [!armel !armhf !hppa !m68k !powerpc !sh4] <!nocheck>,
+ netcat-openbsd [!armel !armhf !hppa !m68k !powerpc !sh4] <!nocheck>,
openssl,
pkgconf,
- procps <!nocheck>,
- python3 <!nocheck>,
- python3-cryptography <!nocheck>,
+ procps [!armel !armhf !hppa !m68k !powerpc !sh4] <!nocheck>,
+ python3 [!armel !armhf !hppa !m68k !powerpc !sh4] <!nocheck>,
+ python3-cryptography [!armel !armhf !hppa !m68k !powerpc !sh4] <!nocheck>,
Maintainer: Peter Pentchev <r...@debian.org>
Uploaders: Laszlo Boszormenyi (GCS) <g...@debian.org>
Standards-Version: 4.6.2
diff --git a/debian/rules b/debian/rules
index 8801c88..d022647 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,6 +30,10 @@ override_dh_auto_configure:
sleep 1
touch src/dhparam.c
+ifeq ($(DEB_HOST_ARCH_BITS)$(filter i386,$(DEB_HOST_ARCH_CPU)),32)
+override_dh_auto_test:
+ : # Tests temporarily skipped for 64-bit time_t transition
+else
execute_before_dh_auto_test:
env PYTHONPATH='$(CURDIR)/debian/tests/python' \
python3 -B -u -m struntime \
@@ -42,6 +46,7 @@ override_dh_auto_test:
find tests/logs/ -type f -name '*.log' -exec grep -EHe '^' -- '{}' + 1>&2; \
false; \
}
+endif
override_dh_auto_install:
dh_auto_install -- -C src
--
2.43.0
>From ca30697de1fd1f034947dff786cca0f897fc2f03 Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Tue, 12 Mar 2024 10:29:26 +0000
Subject: [PATCH 2/2] Update changelog
---
debian/changelog | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 9f9ff57..90f0a3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+stunnel4 (3:5.72-1.1) UNRELEASED; urgency=medium
+
+ * Don't run build-time tests on the 32-bit non-i386 architectures.
+ This allows libcurl to be rebuilt on the architectures affected by the
+ 64-bit time_t transition, which unblocks rebuilding of a lot of the
+ C/C++ ecosystem without having to wait for rustc/cargo to be
+ re-bootstrapped (#1065787).
+ Thanks to Mattia Rizzolo (Closes: #1066049)
+
+ -- Simon McVittie <s...@debian.org> Tue, 12 Mar 2024 10:28:55 +0000
+
stunnel4 (3:5.72-1) unstable; urgency=medium
* Minor improvements to the test suite for the autopkgtest suite:
--
2.43.0
