Bug#1106570: unblock: cdbs/0.4.173

[Santiago Vila <sanvila@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: cdbs@packages.debian.org, sanvila@debian.org
Control: affects -1 + src:cdbs

Please unblock package cdbs

unblock cdbs/0.4.173

Explanation in the changelog and also here:

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1106313#50

I'm attaching the debdiff.

Thanks.

diff -Nru cdbs-0.4.172/1/rules/buildcore.mk.in cdbs-0.4.173/1/rules/buildcore.mk.in
--- cdbs-0.4.172/1/rules/buildcore.mk.in	2025-04-07 15:57:09.000000000 +0200
+++ cdbs-0.4.173/1/rules/buildcore.mk.in	2025-05-26 13:30:00.000000000 +0200
@@ -101,6 +101,23 @@
 done)
 endif
 
+# Avoid recursive braindamage if we're building autotools-dev
+ifeq (,$(shell grep -xi 'Package: autotools-dev' debian/control))
+config_guess := $(shell find $(DEB_SRCDIR) \( -type f -or -type l \) -name config.guess)
+config_sub := $(shell find $(DEB_SRCDIR) \( -type f -or -type l \) -name config.sub)
+ifneq (,$(config_all_tar))
+config_guess_tar := $(filter %/config.guess, $(config_all_tar))
+config_sub_tar := $(filter %/config.sub, $(config_all_tar))
+endif
+endif
+# Ditto for gnulib
+ifeq (,$(shell grep -xi 'Package: gnulib' debian/control))
+config_rpath := $(shell find $(DEB_SRCDIR) \( -type f -or -type l \) -name config.rpath)
+ifneq (,$(config_all_tar))
+config_rpath_tar := $(filter %/config.rpath, $(config_all_tar))
+endif
+endif
+
 CDBS_BUILD_DEPENDS_rules_buildcore_config-guess-sub ?= autotools-dev
 CDBS_BUILD_DEPENDS += $(if $(config_guess)$(config_sub)$(config_guess_tar)$(config_sub_tar),\
 	$(comma) $(CDBS_BUILD_DEPENDS_rules_buildcore_config-guess-sub))
diff -Nru cdbs-0.4.172/debian/changelog cdbs-0.4.173/debian/changelog
--- cdbs-0.4.172/debian/changelog	2025-04-09 17:24:18.000000000 +0200
+++ cdbs-0.4.173/debian/changelog	2025-05-26 13:30:00.000000000 +0200
@@ -1,3 +1,13 @@
+cdbs (0.4.173) unstable; urgency=medium
+
+  * QA upload.
+  * Revert "remove special casing for packages not using CDBS anymore".
+    It breaks several packages on arm64 by not getting their
+    config.guess/config.sub files updated.
+    Closes: #1106313, #1106314, #1106315, #1106317, #1106318, #1106319.
+
+ -- Santiago Vila <sanvila@debian.org>  Mon, 26 May 2025 13:30:00 +0200
+
 cdbs (0.4.172) unstable; urgency=medium
 
   * QA upload.