From a1357ea6e14c9514b7c0a0d29da746a8c3fcaaeb Mon Sep 17 00:00:00 2001
From: autodist <autodist@openmamba.org>
Date: Sat, 30 Dec 2023 11:36:06 +0100
Subject: [PATCH] Release 217-3mamba

---
 systemd.spec | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/systemd.spec b/systemd.spec
index 24a059d..dfc7c17 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -25,7 +25,7 @@
 Name:          systemd
 Epoch:         2
 Version:       217
-Release:       1mamba
+Release:       3mamba
 Summary:       A system and service manager compatible with SysV and LSB init scripts
 Group:         System/Configuration
 Vendor:        openmamba
@@ -205,14 +205,18 @@ This package include development files for building software using udev librarie
    --with-rootprefix= \
    --with-rootlibdir=/%{_lib} \
    --with-pamlibdir=/%{_lib}/security \
-   --with-firmware-path=/lib/firmware \
    --with-tty-gid=4 \
    --enable-split-usr \
    --enable-chkconfig \
    --with-rc-local-script-path-start=/etc/rc.d/init.d/rc.local \
    --enable-compat-libs \
+   --with-debug-shell=/bin/sh \
    KMOD=/sbin/kmod
 
+# TODO?
+#   --enable-terminal \
+#   --enable-kdbus \
+
 %make \
    rpmmacrosdir=%{_sysconfdir}/rpm
 
@@ -310,9 +314,12 @@ if [ "$1" -ge 1 ]; then
    useradd -u %{user_systemd_timesync} -g systemd-timesync \
       -d /dev/null -s /sbin/nologin -c "Systemd time sync" \
 	  systemd-timesync 2>/dev/null
+   # Fix previously configured myhostname in last position
+   grep "^hosts:.* myhostname$" /etc/nsswitch.conf &>/dev/null && \
+      sed -i "s| myhostname||" /etc/nsswitch.conf
    # Configure libnss_myhostanme.so resolver
    grep "^hosts:.* myhostname" /etc/nsswitch.conf &>/dev/null || \
-      sed -i "s|\(^hosts:.*\)|\1 myhostname|" /etc/nsswitch.conf
+      sed -i "s|\(^hosts:.*files\)|\1 myhostname|" /etc/nsswitch.conf
 fi
 :
 
@@ -439,7 +446,6 @@ fi
 %{_bindir}/hostnamectl
 %{_bindir}/kernel-install
 %{_bindir}/localectl
-#%{_bindir}/systemd-coredumpctl
 %{_bindir}/systemd-path
 %{_bindir}/systemd-run
 %{_bindir}/timedatectl
@@ -579,30 +585,18 @@ fi
 %defattr(-,root,root)
 %{_sysconfdir}/udev/udev.conf
 %{_sysconfdir}/modprobe.d/udev.conf
-#%{_initrddir}/udev
-#%{_initrddir}/udev-post
-#%{_sysconfdir}/rc0.d/K97udev
-#%{_sysconfdir}/rc6.d/K97udev
-#%{_sysconfdir}/rc.d/rcsysinit.d/S12udev
-#%{_sysconfdir}/sysconfig/udev
 /sbin/udevd
 /bin/udevadm
 %{_datadir}/bash-completion/completions/udevadm
 /lib/systemd/systemd-udevd
 %dir /lib/udev
-#/lib/udev/devices/MAKEDEV
 /lib/udev/accelerometer
 /lib/udev/ata_id
 /lib/udev/cdrom_id
 /lib/udev/check-cdrom.sh
 /lib/udev/collect
-#/lib/udev/findkeyboards
 %dir /lib/udev/hwdb.d
 /lib/udev/hwdb.d/*.hwdb
-#/lib/udev/keyboard-force-release.sh
-#/lib/udev/keymap
-#%dir /lib/udev/keymaps
-#/lib/udev/keymaps/*
 /lib/udev/mtd_probe
 %dir /lib/udev/rules.d
 /lib/udev/rules.d/*.rules
@@ -634,6 +628,12 @@ fi
 %{_datadir}/pkgconfig/udev.pc
 
 %changelog
+* Sat Nov 22 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 217-3mamba
+- fix myhostname ordering in nsswitch.conf
+
+* Sat Nov 22 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 217-2mamba
+- add --with-debug-shell=/bin/sh because default is /sbin/sushell which we don't have
+
 * Thu Oct 30 2014 Automatic Build System <autodist@mambasoft.it> 217-1mamba
 - automatic version update by autodist