[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1103835: unblock: libcap2/1:2.75-7



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

Hi,

I'd like to ask for pre-approval up an upload of libcap2/1:2.75-7.
Helmut discovered that recent upload introducing a go package introduced
a FTCBFS, and submitted a patch for it.

[ Reason ]

The FTCBFS introduced broke architecture cross bootstrap.

[ Impact ]

No user-visible changes, but architecture cross bootstrap is a valuable
maintainer use case that needs this fix.

[ Tests ]

As there are no user-visible changes, no special tests for this are
needed.

[ Risks ]

No user-visible changes, so no risk.

[ 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

unblock libcap2/1:2.75-7
diff -Nru libcap2-2.75/debian/changelog libcap2-2.75/debian/changelog
--- libcap2-2.75/debian/changelog	2025-04-11 20:52:04.000000000 +0200
+++ libcap2-2.75/debian/changelog	2025-04-21 20:42:52.000000000 +0200
@@ -1,3 +1,10 @@
+libcap2 (1:2.75-7) unstable; urgency=medium
+
+  [ Helmut Grohne ]
+  * Fix FTCBFS: Move go dependencies to B-D-I. (Closes: #1103808)
+
+ -- Christian Kastner <ckk@debian.org>  Mon, 21 Apr 2025 20:42:52 +0200
+
 libcap2 (1:2.75-6) unstable; urgency=medium
 
   * Add cleaning for Golang build
diff -Nru libcap2-2.75/debian/control libcap2-2.75/debian/control
--- libcap2-2.75/debian/control	2025-04-11 20:52:04.000000000 +0200
+++ libcap2-2.75/debian/control	2025-04-21 20:42:52.000000000 +0200
@@ -4,11 +4,11 @@
 Maintainer: Christian Kastner <ckk@debian.org>
 Build-Depends: patchelf,
                debhelper-compat (= 13),
-               dh-golang,
-               golang-any,
                gperf (>= 3.1),
                indent,
                libpam0g-dev,
+Build-Depends-Indep: dh-golang,
+                     golang-any,
 Rules-Requires-Root: no
 Standards-Version: 4.7.0
 Homepage: https://sites.google.com/site/fullycapable/
diff -Nru libcap2-2.75/debian/rules libcap2-2.75/debian/rules
--- libcap2-2.75/debian/rules	2025-04-11 20:52:04.000000000 +0200
+++ libcap2-2.75/debian/rules	2025-04-21 20:42:52.000000000 +0200
@@ -37,8 +37,10 @@
 	dh_auto_clean -- $(MAKE_ASSIGNMENTS)
 	# The Golang build system does not appear to fully honor -B, so we need
 	# two cleans
-	dh_auto_clean -B_build -O--buildsystem=golang
-	dh_auto_clean O--buildsystem=golang
+	set -e; if test -d _build; then \
+		dh_auto_clean -B_build -O--buildsystem=golang; \
+		dh_auto_clean O--buildsystem=golang; \
+	fi
 	# Undo change of lookup (see override_dh_auto_build)
 	sed -i -e 's,\./tcapsh-static,../progs/tcapsh-static,g' tests/libcap_launch_test.c
 
@@ -110,11 +112,11 @@
 	kernel.org/pub/linux/libs/security/libcap/cap \
 	kernel.org/pub/linux/libs/security/libcap/psx
 
-execute_after_dh_auto_configure:
+execute_after_dh_auto_configure-indep:
 	dh_auto_configure -B_build -O--buildsystem=golang
 
-execute_after_dh_auto_install:
+execute_after_dh_auto_install-indep:
 	dh_auto_install -B_build -O--buildsystem=golang
 
-execute_after_dh_auto_build:
+execute_after_dh_auto_build-indep:
 	dh_auto_build -B_build -O--buildsystem=golang

Reply to: