]> git.ipfire.org Git - ipfire-3.x.git/blobdiff - systemd/systemd.nm
json-c: Update to version 0.17-20230812
[ipfire-3.x.git] / systemd / systemd.nm
index 3ed1b5b978963a51d3250789536a417d13702714..bdb1e3f048a194d123d06867a8d99f73490ef4c9 100644 (file)
 ###############################################################################
 
 name       = systemd
-version    = 215
-release    = 1
+version    = 254
+release    = 3
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = System/Base
 url        = http://www.freedesktop.org/wiki/Software/systemd
 license    = GPLv2+
-summary    = A System and Service Manager.
+summary    = A System and Service Manager
 
 description
        systemd is a system and service manager for Linux, compatible with
        SysV and LSB init scripts.
 end
 
-source_dl  = http://cgit.freedesktop.org/systemd/systemd/snapshot/
+source_dl  = https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/
 
 build
        unitdir = %{prefix}/lib/systemd/system
 
+       # The tools which are shipped by systemd requires an rpath to
+       # the libsystemd-shared binary to run properly. So the macro for
+       # removing any rpath's have to be disabled.
+       MACRO_FIX_LIBTOOL = # Do nothing
+
        requires
+               # Testsuite
+               /usr/bin/getfacl
+               /usr/bin/mount
+               /usr/bin/tree
+               /usr/bin/umount
+
                attr-devel
-               audit-devel
-               automake
-               autoconf
                cryptsetup-luks-devel >= 1.4.2
                dbus-devel
                docbook-utils
                docbook-xsl
+               elfutils-devel
                gettext-devel
                glib2-devel
                gobject-introspection-devel >= 1.31
                gperf
                hwdata
-               intltool
+               intltool >= 0.51.0
+               kbd
                kmod-devel >= 15
                libacl-devel
+               libbpf-devel
                libblkid-devel
                libcap-devel
+               libcurl-devel
+               libfdisk-devel
                libgcrypt-devel
-               libselinux-devel
-               libtool
-               libuuid-devel
+               libidn-devel
+               libidn2-devel
+               libmount-devel >= 2.34-2
+               libpwquality-devel
+               libseccomp-devel
+               libuuid-devel >= 2.34-2
+               libxcrypt-devel
+               lz4-devel
+               m4
+               meson >= 0.50.1
+               ninja >= 1.9.0
+               openssl-devel
+               p11-kit-devel
                pam-devel
                pciutils-devel
+               python3-devel
+               python3-jinja2
+               python3-lxml
+               setup >= 3.0-13
                usbutils
                vala
                xz-devel
+               zlib-devel
        end
 
+       export LD_LIBRARY_PATH = %{DIR_APP}/.libs
+
+       configure_options = \
+               -Dsysvinit-path= \
+               -Dsysvrcnd-path= \
+               -Dnobody-user=nobody \
+               -Dnobody-group=nobody \
+               -Dfallback-hostname="localhost" \
+               -Dzlib=true \
+               -Dman=true \
+               -Dsmack=false \
+               -Dbacklight=false \
+               -Dfirstboot=false \
+               -Dhibernate=false \
+               -Dimportd=false \
+               -Dlibiptc=false \
+               -Dmachined=false \
+               -Dnetworkd=false \
+               -Dresolve=false \
+               -Dportabled=false \
+               -Dtimesyncd=false \
+               -Dtimedated=false \
+               -Dpolkit=false
+
+       # Assign group ids
        configure_options += \
-               --with-sysvinit-path= \
-               --with-sysvrcnd-path= \
-               --enable-introspection=yes \
-               --disable-networkd \
-               --disable-resolvd \
-               --disable-sysusers \
-               --disable-timesyncd \
-               --disable-static
-
-       prepare_cmds
-               ./autogen.sh ac
+               -Dadm-gid=4 \
+               -Dtty-gid=5 \
+               -Ddisk-gid=6 \
+               -Dlp-gid=7 \
+               -Dkmem-gid=9 \
+               -Dwheel-gid=10 \
+               -Dcdrom-gid=11 \
+               -Ddialout-gid=18 \
+               -Dutmp-gid=22 \
+               -Dtape-gid=33 \
+               -Dkvm-gid=36 \
+               -Dvideo-gid=39 \
+               -Daudio-gid=63 \
+               -Dusers-gid=100 \
+               -Dinput-gid=104 \
+               -Drender-gid=105 \
+               -Dsgx-gid=106 \
+               -Dsystemd-journal-gid=190
+
+       build
+               # Call meson and pass configure options.
+               %{meson} %{configure_options}
+
+               # Call ninja to start build
+               %{meson_build}
+       end
+
+       test
+               # Create dummy machine-id file, which is required for some tests.
+               touch %{sysconfdir}/machine-id
+
+               # Run the testsuite.
+               %{meson_test} || true
        end
 
-       install_cmds
+       install
+               # Install systemd.
+               %{meson_install}
+
+               # Use the installed files to create all users and groups
+               # in one shot.
+               %{create_groups}
+
                # Create folder in log to store the journal.
                mkdir -pv %{BUILDROOT}/var/log/journal
 
@@ -111,14 +193,24 @@ build
                        ln -svf ../system/${i}.target ${i}.target || exit 1
                done
 
+               # Remove .so file for the shared library, it's not supposed to be used for anything.
+               rm -rvf %{BUILDROOT}%{prefix}/lib/systemd/libsystemd-shared.so
+
                # Remove tmpfile for X11
                rm -rfv %{BUILDROOT}/usr/lib/tmpfiles.d/x11.conf
 
+               # Drop X11 related config files
+               rm -rvf %{BUILDROOT}%{sysconfdir}/X11
+
                # Remove unneeded stuff for xdg
                rm -rfv %{BUILDROOT}/etc/xdg
 
                # Remove unneeded stuff for rpm.
                rm -rvf %{BUILDROOT}/etc/rpm
+               rm -rvf %{BUILDROOT}/usr/lib/rpm
+
+               # Drop ZSH related files
+               rm -rvf %{BUILDROOT}%{datadir}/zsh
 
                # Use journald. Enable the import of kernel messages.
                # Stop forwarding to a syslog daemon.
@@ -127,33 +219,50 @@ build
                        -e "s/^#ImportKernel=.*$/ImportKernel=yes/" \
                        -i %{BUILDROOT}/etc/systemd/journald.conf
 
-               # Install legacy tmpfile to autocreate /run/lock on startup.
-               install -v -m 644 %{DIR_APP}/tmpfiles.d/legacy.conf %{BUILDROOT}%{prefix}/lib/tmpfiles.d/
-
                # Remove udev rules for "predictable" network device renaming.
                # http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/
                rm -vf %{BUILDROOT}/usr/lib/udev/rules.d/80-net-name-slot.rules
+
+               # Don't let udev set up any networking
+               rm -vf %{BUILDROOT}/usr/lib/udev/rules.d/80-net-setup-link.rules
+
+               mkdir -pv %{BUILDROOT}/var/log/journal
+               chown root:systemd-journal %{BUILDROOT}/var/log/journal
+
+               # Create empty environment file.
+               touch %{BUILDROOT}%{sysconfdir}/environment
        end
 end
 
-packages
-       package %{name}
-               groups += Base
+create_groups
+       # Create the sysusers folder in the jail.
+       mkdir -pv %{sysusersdir}
+
+       # Copy all sysusers files from BUILDROOT into the jail's sysusers directory.
+       install -v -m 644 %{BUILDROOT}%{sysusersdir}/*.conf %{sysusersdir}
 
-               prerequires += authconfig
+       # We do not have a libsystemd or systemd-sysusers binary, so
+       # call the installed one inside BUILDROOT to create all users and
+       # groups in one shot.
+       LD_LIBRARY_PATH="%{BUILDROOT}%{libdir}/systemd/" \
+               %{BUILDROOT}%{bindir}/systemd-sysusers
+end
 
+packages
+       package %{name}
                requires
                        dbus
                        hwdata
-                       python-cairo
-                       python-dbus
-                       python-gobject3
-                       %{name}-libs=%{thisver}
-                       %{name}-units=%{thisver}
-                       util-linux>=2.19
+                       python3-cairo
+                       python3-dbus
+                       python3-gobject3
+                       %{name}-basetools = %{thisver}
+                       %{name}-libs = %{thisver}
+                       util-linux >= 2.19
                end
 
                provides
+                       /bin/systemctl
                        /bin/systemd
                        /sbin/halt
                        /sbin/init
@@ -161,8 +270,10 @@ packages
                        /sbin/reboot
                        /sbin/shutdown
 
-                       syslog
                        udev = %{thisver}
+                       systemd-units = %{thisver}
+
+                       syslog
                end
 
                conflicts
@@ -170,11 +281,13 @@ packages
                        dracut < 019
                        filesystem < 002
                        rsyslog < 5.8.6-4
+                       setup < 3.0-13
                        upstart
                end
 
                obsoletes
                        udev < 183
+                       systemd-units <= 242
                end
 
                configfiles
@@ -188,51 +301,36 @@ packages
                        /etc/vconsole.conf
                end
 
-               script prein
-                       # Create groups for udev.
-                       getent group cdrom >/dev/null || groupadd -g 11 cdrom || :
-                       getent group tape >/dev/null || groupadd -g 33 tape || :
-                       getent group dialout >/dev/null || groupadd -g 18 dialout || :
-                       getent group floppy >/dev/null || groupadd -g 19 floppy || :
-               end
-
                script postin
-                       # Generate Machine ID.
-                       /usr/bin/systemd-machine-id-setup > /dev/null 2>&1 || :
-
                        # Reexec systemd daemon.
                        /usr/bin/systemctl daemon-reexec > /dev/null 2>&1 || :
 
-                       # Make sure pam_systemd is enabled
-                       if ! grep -q pam_systemd /etc/pam.d/system-auth-ac ; then
-                               authconfig --update --nostart >/dev/null 2>&1 || :
-
-                               # Try harder
-                               grep -q pam_systemd /etc/pam.d/system-auth-ac || authconfig --updateall --nostart >/dev/null 2>&1 || :
-                       fi
+                       # Automatically spawn a getty on TTY1
+                       /usr/bin/systemctl enable getty@.service >/dev/null 2>&1 || :
 
-                       /usr/bin/systemctl enable \
-                               getty@.service \
-                               remote-fs.target \
-                               systemd-readahead-replay.service \
-                               systemd-readahead-collect.service \
-                               >/dev/null 2>&1 || :
+                       # Enable targed to mount all remote filesystems.
+                       /usr/bin/systemctl enable remote-fs.target >/dev/null 2>&1 || :
                end
 
                script preup
                        # Be sure to stop the old udev before updating.
                        /usr/bin/systemctl stop udev.service udev-trigger.service \
                                udev-control.socket udev-kernel.socket >/dev/null 2>&1 || :
+
+                       %{create_groups}
                end
 
                script postup
+                       # Re-exec systemd after update.
+                       /usr/bin/systemctl daemon-reexec >/dev/null 2>&1 || :
+
                        # Restart login service after update
                        /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
                        /usr/bin/systemctl try-restart systemd-logind.service >/dev/null 2>&1 || :
 
                        # Use the new journald configuration file and restart the service.
                        if ! grep -xq ImportKernel=yes /etc/systemd/journald.conf ; then
-                               mv /etc/systemd/journald.conf.paknew /etc/systemd/journald.conf
+                               mv /etc/systemd/journald.conf.paknew /etc/systemd/journald.conf >/dev/null 2>&1 || :
                                /usr/bin/systemctl restart systemd-journald.service >/dev/null 2>&1 || :
                        fi
                end
@@ -243,40 +341,35 @@ packages
                end
        end
 
-       # Package information for systemd-units
-       package %{name}-units
-               summary =  Configuration files, directories and installation tool for systemd.
+       package %{name}-basetools
+               summary = Basetools from the systemd package, like sysuses and tmpfiles.
                description
-                       This package contains all needed configuration files, directories
-                       and installation / configuration tool for systemd.
-               end
+                       This package contains some very basic tools from systemd like
+                       systemd-sysusers and systemd-tmpfiles.
 
-               prerequires
-                       /bin/sh
-                       coreutils
+                       They mostly are required in a very early stage and shipping them
+                       in an own package allows us to handle this properly.
                end
 
                provides
-                       /bin/systemctl
+                       systemd-sysusers = %{thisver}
+                       systemd-tmpfiles = %{thisver}
                end
 
-               conflicts
-                       filesystem < 002
+               requires
+                       %{name}-libs = %{thisver}
                end
 
                files
-                       %{sysconfdir}/etc/systemd/system
-                       %{sysconfdir}/tmpfiles.d
-                       %{sysconfdir}/bash_completion.d/systemctl-bash-completion.sh
-                       %{unitdir}
-                       %{bindir}/systemctl
-                       %{bindir}/systemd-tmpfiles
-                       %{mandir}/man1/systemctl.*
-               end
-
-               script postup
-                       # Reload service files
-                       /usr/bin/systemctl daemon-reload > /dev/null 2>&1 || :
+                       %{bindir}/%{name}-sysusers
+                       %{bindir}/%{name}-tmpfiles
+                       %{mandir}/man1/%{name}-sysusers*
+                       %{mandir}/man1/%{name}-tmpfiles*
+
+                       # Only ship the sysusers.d folder without
+                       # any config files.
+                       %{sysusersdir}
+                       !%{sysusersdir}/*.conf
                end
        end
 
@@ -295,6 +388,7 @@ packages
 
                obsoletes
                        nss-myhostname <= 0.3-3
+                       systemd-compat-libs < 230
                end
 
                conflicts
@@ -303,6 +397,9 @@ packages
                        systemd < %{thisver}
                end
 
+               files += \
+                       %{libdir}/%{name}
+
                # Add myhostname to the hosts line of /etc/nsswitch.conf
                script postin
                        if [ -f "/etc/nsswitch.conf" ]; then