Bug#1054098: base-passwd: Fix non-linux build

2023-10-17 Thread Colin Watson
On Tue, Oct 17, 2023 at 01:12:46AM +0200, Samuel Thibault wrote:
> I tried to build base-passwd on hurd-amd64, but this change
> 
>   Make it possible to configure whether to use SELinux or not.
> 
> broke the non-Linux builds. Here is a patch to fix this.

I used my preferred spelling of the variable name, but otherwise
applied.  Thanks!

-- 
Colin Watson (he/him)  [cjwat...@debian.org]



Bug#1054098: base-passwd: Fix non-linux build

2023-10-16 Thread Samuel Thibault
Package: base-passwd
Version: 3.6.2~0
Severity: important
Tags: patch

Hello,

I tried to build base-passwd on hurd-amd64, but this change

  Make it possible to configure whether to use SELinux or not.

broke the non-Linux builds. Here is a patch to fix this.

Samuel

-- System Information:
Debian Release: trixie/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 
'testing-debug'), (500, 'stable-security'), (500, 'stable-debug'), (500, 
'oldstable-proposed-updates-debug'), (500, 'oldstable-proposed-updates'), (500, 
'oldoldstable-proposed-updates'), (500, 'oldoldstable'), (500, 
'buildd-unstable'), (500, 'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 
'experimental-debug'), (1, 'buildd-experimental'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, arm64

Kernel: Linux 6.5.0-1-amd64 (SMP w/8 CPU threads; PREEMPT)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages base-passwd depends on:
ii  libc6  2.37-12
ii  libdebconfclient0  0.271
ii  libselinux13.5-1

Versions of packages base-passwd recommends:
ii  cdebconf [debconf-2.0]  0.271
ii  debconf [debconf-2.0]   1.5.82

base-passwd suggests no packages.

-- debconf information excluded

-- 
Samuel
---
Pour une évaluation indépendante, transparente et rigoureuse !
Je soutiens la Commission d'Évaluation de l'Inria.
diff --git a/debian/rules b/debian/rules
index b93e0ad..77c1849 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,11 +5,19 @@
 export DEB_BUILD_MAINT_OPTIONS := hardening=+all
 export DEB_CFLAGS_MAINT_APPEND := -Wall
 
+CONFIGURE =
+
 ifneq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
-override_dh_auto_configure:
-   dh_auto_configure -- --disable-docs
+CONFIGURE += --disable-docs
+endif
+
+ifneq ($(DEB_BUILD_ARCH_OS),linux)
+CONFIGURE += --disable-selinux
 endif
 
+override_dh_auto_configure:
+   dh_auto_configure -- $(CONFIGURE)
+
 execute_before_dh_installdebconf:
touch debian/base-passwd.substvars
mv debian/base-passwd.substvars debian/base-passwd.substvars.real