From 9a565047e61ea42d8b8261ee4cb0d4e62be10b15 Mon Sep 17 00:00:00 2001
From: autodist <autodist@openmamba.org>
Date: Sat, 30 Dec 2023 11:39:21 +0100
Subject: [PATCH] Release 246-2mamba

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

diff --git a/systemd.spec b/systemd.spec
index 66456d7..7e36228 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -27,7 +27,7 @@
 Name:          systemd
 Epoch:         2
 Version:       246
-Release:       1mamba
+Release:       2mamba
 Summary:       A system and service manager compatible with SysV and LSB init scripts
 Group:         System/Configuration
 Vendor:        openmamba
@@ -188,7 +188,7 @@ It also replaces hotplug and runs entirely in userspace.
 %package -n libudev
 Summary:       udev libraries
 Group:         System/Libraries
-%ifarch x86_64
+%ifarch x86_64 aarch64
 Provides:      libudev.so.0()(64bit)
 %else
 Provides:      libudev.so.0
@@ -215,38 +215,12 @@ This package include development files for building software using udev librarie
 
 %prep
 %setup -q
-%define _default_patch_fuzz 1
 #-D -T
 #:<< _EOF
-#%patch0 -p1
-
-## ARM only patch: old_cloexec compatibility patch with old kernels
-#%ifarch arm
-#%patch5 -p1
-#%endif
-#%patch1 -R -p1
-#%patch2 -p1
-#%patch3 -p1
-#%patch4 -p1
-#%patch6 -p1
-#%patch7 -p1
-#%patch9 -p1
-#%patch10 -p1
-#%patch11 -p1
-#%patch12 -p1
-#%patch13 -p1
-#%patch14 -p1
-#%patch15 -p1
-#%patch16 -p1
-#%patch17 -p1
-#%patch18 -p1
-#%patch19 -p1
-#%patch20 -p1
 
 sed -i "s|@bindir@|/bin|g" src/core/macros.systemd.in
 
 %build
-#./autogen.sh
 # LANG Workaround for meson error
 export LANG="en_US.UTF-8"
 export LC_ALL="en_US.UTF-8"
@@ -270,6 +244,7 @@ meson build \
    -Dman=true \
    -Dusers-gid=100 \
    -Dsplit-usr=true \
+   -Dsplit-bin=true \
    -Dsysvinit-path=%{_initrddir} \
    -Drc-local=%{_initrddir}/rc.local \
    -Ddebug-shell=/bin/sh \
@@ -298,18 +273,6 @@ make
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 %makeinstall rpmmacrosdir=%{_sysconfdir}/rpm
 
-
-## compatibility links
-#install -d -m0755 %{buildroot}/sbin
-#for f in halt poweroff reboot runlevel shutdown telinit; do
-#   ln -s ../bin/systemctl %{buildroot}/sbin/$f
-#done
-#ln -s ../lib/systemd/systemd %{buildroot}/sbin/init
-
-# udev
-#install -D -m755 %{S:1} %{buildroot}%{_initrddir}/udev
-#install -D -m755 %{S:15} %{buildroot}%{_initrddir}/udev-post
-#install -D -m644 %{S:16} %{buildroot}%{_sysconfdir}/sysconfig/udev
 install -D -m644 %{S:2} \
    %{buildroot}/lib/udev/rules.d/60-permissions.rules
 install -D -m644 %{S:4} \
@@ -319,14 +282,6 @@ install -D -m644 %{S:4} \
 install -D -m755 %{S:8} \
    %{buildroot}/lib/udev/check-cdrom.sh
 
-#install -d %{buildroot}%{_sysconfdir}/rc.d/rcsysinit.d
-#ln -s ../init.d/udev %{buildroot}%{_sysconfdir}/rc.d/rcsysinit.d/S12udev
-#install -d %{buildroot}%{_sysconfdir}/rc0.d
-#ln -s ../init.d/udev %{buildroot}%{_sysconfdir}/rc0.d/K97udev
-#install -d %{buildroot}%{_sysconfdir}/rc6.d
-#ln -s ../init.d/udev %{buildroot}%{_sysconfdir}/rc6.d/K97udev
-#install -D -m755 %{S:11} \
-#   %{buildroot}/lib/udev/devices/MAKEDEV
 install -D -m644 %{S:13} \
    %{buildroot}%{_sysconfdir}/modprobe.d/udev.conf
 install -d -m0755 %{buildroot}/sbin
@@ -355,6 +310,9 @@ ln -s /proc/mounts %{buildroot}%{_sysconfdir}/mtab
 install -D -m0755 %{SOURCE17} %{buildroot}/lib/systemd/systemd-sysv-install
 %find_lang %{name}
 
+install -d -m0755 %{buildroot}%{_sysconfdir}/repart.d
+install -d -m0755 %{buildroot}%{_prefix}/lib/repart.d
+
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
@@ -473,6 +431,7 @@ groupadd render -g %{group_render} 2>/dev/null
 
 %posttrans core
 if [ $1 -ge 1 ]; then
+   systemctl --no-reload preset systemd-timesyncd
    # remove broken left sysv5 symlink due to migrating services to systemd
    find /etc/rc*.d/* -xtype l -delete 2>/dev/null
    systemctl -q daemon-reload
@@ -534,6 +493,7 @@ fi
 %{_sysconfdir}/pam.d/systemd-user
 %dir %{_sysconfdir}/binfmt.d
 %dir %{_sysconfdir}/modules-load.d
+%dir %{_sysconfdir}/repart.d
 %dir %{_sysconfdir}/sysctl.d
 %dir %{_sysconfdir}/tmpfiles.d
 %dir %{_sysconfdir}/xdg/systemd
@@ -590,6 +550,7 @@ fi
 %{_prefix}/lib/kernel/install.d/90-loaderentry.install
 %dir %{_prefix}/lib/binfmt.d
 %dir %{_prefix}/lib/modules-load.d
+%dir %{_prefix}/lib/repart.d
 %dir %{_prefix}/lib/sysctl.d
 %{_prefix}/lib/sysctl.d/50-*.conf
 %dir %{_prefix}/lib/tmpfiles.d
@@ -687,6 +648,9 @@ fi
 
 %files -n udev
 %defattr(-,root,root)
+%dir %{_sysconfdir}/udev
+%dir %{_sysconfdir}/udev/hwdb.d
+%dir %{_sysconfdir}/udev/rules.d
 %{_sysconfdir}/udev/udev.conf
 %{_sysconfdir}/modprobe.d/udev.conf
 /sbin/udevd
@@ -724,6 +688,10 @@ fi
 %{_libdir}/pkgconfig/libudev.pc
 
 %changelog
+* Thu Oct 01 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 246-2mamba
+- make sure systemd-timesyncd is enabled
+- provide empty directories {/etc,/usr/lib}/repart.d and /etc/udev/hwdb.d/
+
 * Sat Aug 01 2020 Automatic Build System <autodist@mambasoft.it> 246-1mamba
 - automatic version update by autodist