Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: unblock X-Debbugs-Cc: roam@debian.org This is a pre-approval request before I upload ucspi-unix to unstable to fix a FTBFS on architectures where dietlibc is not built; see #991774. [ Reason ] See #991774 for more details: the way ucspi-unix runs the upstream build twice is not fully conditional on the presence of the dietlibc build helpers. [ Impact ] The ucspi-unix package is not built at all on architectures that dietlibc does not support, thus Debian users are currently missing the ucspi-unix functionality for these architectures. [ Tests ] None; it does not currently build at all. [ Risks ] Leaf package, not widely used. The risk that exposing Debian users to the functionality of ucspi-unix would do them harm is, IMHO, negligible. [ Checklist ] [x] all changes are documented in the d/changelog [x] I reviewed all changes and I approve them [x] attach debdiff against the package in testing [ Other info ] I based my fix on Dmitry Bogatov's already existing Salsa repository for ucspi-unix. There was already a Salsa-specific commit there that is not directly related to this bugfix, but does not affect the package at all. Still, if you'd prefer me to prepare a new, bullseye-specific branch that will only include this fix and not the Salsa CI definition, let me know. unblock ucspi-unix/1.0-2
diff -Nru ucspi-unix-1.0/debian/changelog ucspi-unix-1.0/debian/changelog
--- ucspi-unix-1.0/debian/changelog 2018-11-28 06:26:16.000000000 +0200
+++ ucspi-unix-1.0/debian/changelog 2021-08-02 01:36:27.000000000 +0300
@@ -1,3 +1,14 @@
+ucspi-unix (1.0-2) unstable; urgency=medium
+
+ [ Dmitry Bogatov ]
+ * Add a Gitlab CI config file.
+
+ [ Peter Pentchev ]
+ * New maintainer. Closes: #983804
+ * Only run the dietlibc build if possible. Closes: #991774
+
+ -- Peter Pentchev <roam@debian.org> Mon, 02 Aug 2021 01:36:27 +0300
+
ucspi-unix (1.0-1) unstable; urgency=medium
* New maintainer (Closes: #907084)
diff -Nru ucspi-unix-1.0/debian/control ucspi-unix-1.0/debian/control
--- ucspi-unix-1.0/debian/control 2018-11-28 06:26:16.000000000 +0200
+++ ucspi-unix-1.0/debian/control 2021-08-02 00:59:30.000000000 +0300
@@ -1,7 +1,7 @@
Source: ucspi-unix
Section: net
Priority: optional
-Maintainer: Dmitry Bogatov <KAction@debian.org>
+Maintainer: Peter Pentchev <roam@debian.org>
Build-Depends:
debhelper-compat (= 11),
dh-buildinfo (>= 0.11+nmu1),
diff -Nru ucspi-unix-1.0/debian/.gitlab-ci.yml ucspi-unix-1.0/debian/.gitlab-ci.yml
--- ucspi-unix-1.0/debian/.gitlab-ci.yml 1970-01-01 02:00:00.000000000 +0200
+++ ucspi-unix-1.0/debian/.gitlab-ci.yml 2021-08-02 00:57:09.000000000 +0300
@@ -0,0 +1,5 @@
+include:
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+variables:
+ RELEASE: experimental
diff -Nru ucspi-unix-1.0/debian/rules ucspi-unix-1.0/debian/rules
--- ucspi-unix-1.0/debian/rules 2018-11-28 06:26:16.000000000 +0200
+++ ucspi-unix-1.0/debian/rules 2021-08-02 00:59:38.000000000 +0300
@@ -41,7 +41,9 @@
echo 'diet gcc $(LDFLAGS)' > diet/conf-ld
override_dh_auto_build:
+ifeq (${HAVE_DIETLIBC},yes)
$(MAKE) -C diet
+endif
$(MAKE) -C glibc
override_dh_auto_install:
Attachment:
signature.asc
Description: PGP signature