new file mode 100644

@@ -0,0 +1,11 @@

+# RPM macros for packages creating system accounts

+#

+# Turn a sysusers.d file into macros specified by

+# https://docs.fedoraproject.org/en-US/packaging-guidelines/UsersAndGroups/#_dynamic_allocation

+# This has been modified according to Photon needs

+

+%sysusers_requires_compat Requires(pre): shadow

+

+%sysusers_create_compat() \

+%(%{_rpmconfigdir}/sysusers.generate-pre.sh %{?*}) \

+%{nil}

@@ -1,7 +1,9 @@

+%global udev_services %{name}-udevd.service %{name}-udev-settle.service %{name}-udev-trigger.service %{name}-udevd-control.socket %{name}-udevd-kernel.socket %{name}-timesyncd.service

+

 Name:           systemd

 URL:            http://www.freedesktop.org/wiki/Software/systemd

 Version:        252.4

-Release:        7%{?dist}

+Release:        8%{?dist}

 License:        LGPLv2+ and GPLv2+ and MIT

 Summary:        System and Service Manager

 Group:          System Environment/Security

@@ -18,10 +20,16 @@ Source4:        99-dhcp-en.network

 Source5:        10-rdrand-rng.conf

 Source6:        10-defaults.preset

-Patch0:         enoX-uses-instance-number-for-vmware-hv.patch

-Patch1:         fetch-dns-servers-from-environment.patch

-Patch2:         0001-systemd-Support-OOMPolicy-in-scope-units.patch

-Patch3:         0001-systemd-Default-to-OOMPolicy-continue-for-login-sess.patch

+Source11:       macros.sysusers

+Source12:       sysusers.attr

+Source13:       sysusers.prov

+Source14:       sysusers.generate-pre.sh

+

+Patch0: enoX-uses-instance-number-for-vmware-hv.patch

+Patch1: fetch-dns-servers-from-environment.patch

+Patch2: 0001-systemd-Support-OOMPolicy-in-scope-units.patch

+Patch3: 0001-systemd-Default-to-OOMPolicy-continue-for-login-sess.patch

+Patch4: use-bfq-scheduler.patch

 Requires:       Linux-PAM

 Requires:       bzip2

@@ -144,12 +152,12 @@ Summary: Rule-based device node and kernel event manager

 License:        LGPLv2+

 Requires:       %{name} = %{version}-%{release}

-Requires(post):   %{name}

-Requires(preun):  %{name}

-Requires(postun): %{name}

+Requires(post):   %{name} = %{version}-%{release}

+Requires(preun):  %{name} = %{version}-%{release}

+Requires(postun): %{name} = %{version}-%{release}

 Requires(post):   grep

 Requires:         kmod

-Provides:         udev = %{version}

+Provides:         udev = %{version}-%{release}

 %description udev

 This package contains systemd-udev and the rules and hardware database

@@ -159,9 +167,9 @@ machines and in virtual machines, but not in containers.

 %package container

 Summary: Tools for containers and VMs

 Requires:       %{name} = %{version}-%{release}

-Requires(post):   %{name}

-Requires(preun):  %{name}

-Requires(postun): %{name}

+Requires(post):   %{name} = %{version}-%{release}

+Requires(preun):  %{name} = %{version}-%{release}

+Requires(postun): %{name} = %{version}-%{release}

 License:          LGPLv2+

 %description container

@@ -174,9 +182,9 @@ and %{name}-importd.

 Summary:        Tools to send journal events over the network

 Requires:       %{name} = %{version}-%{release}

 License:        LGPLv2+

-Requires(post):   %{name}

-Requires(preun):  %{name}

-Requires(postun): %{name}

+Requires(post):   %{name} = %{version}-%{release}

+Requires(preun):  %{name} = %{version}-%{release}

+Requires(postun): %{name} = %{version}-%{release}

 Requires:         libmicrohttpd

 Provides:         %{name}-journal-gateway = %{version}-%{release}

@@ -246,13 +254,12 @@ fi

 CONFIGURE_OPTS=(

        -Dmode=release

        -Dkmod=true

-       -Duser-path=/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin

+       -Duser-path=%{_usr}/local/bin:%{_usr}/local/sbin:%{_bindir}:%{_sbindir}

        -Dservice-watchdog=

        -Dblkid=true

        -Dseccomp=true

        -Ddefault-dnssec=no

        -Dfirstboot=false

-       -Dinstall-tests=false

        -Dldconfig=false

        -Dxz=true

        -Dzlib=true

@@ -262,7 +269,7 @@ CONFIGURE_OPTS=(

        -Dsmack=true

        -Dgcrypt=true

        -Dsplit-usr=true

-       -Dsysusers=false

+       -Dsysusers=true

        -Dpam=true

        -Dpolkit=true

        -Dselinux=true

@@ -283,8 +290,8 @@ CONFIGURE_OPTS=(

        -Db_lto=true

        -Db_ndebug=false

        -Ddefault-hierarchy=hybrid

-       -Dsysvinit-path=/etc/rc.d/init.d

-       -Drc-local=/etc/rc.d/rc.local

+       -Dsysvinit-path=%{_sysconfdir}/rc.d/init.d

+       -Drc-local=%{_sysconfdir}/rc.d/rc.local

        -Dfallback-hostname=photon

        -Doomd=false

        -Dhomed=false

@@ -297,11 +304,11 @@ CONFIGURE_OPTS=(

        $CROSS_COMPILE_CONFIG

 )

-%meson "${CONFIGURE_OPTS[@]}"

-%meson_build

+%{meson} "${CONFIGURE_OPTS[@]}"

+%{meson_build}

 %install

-%meson_install

+%{meson_install}

 sed -i '/srv/d' %{buildroot}%{_tmpfilesdir}/home.conf

 sed -i "s:0775 root lock:0755 root root:g" %{buildroot}%{_tmpfilesdir}/legacy.conf

@@ -313,10 +320,13 @@ sed -i "s:#DNSOverTLS=opportunistic:DNSOverTLS=no:g" %{buildroot}%{_sysconfdir}/

 sed -i 's/#DefaultOOMPolicy=stop/DefaultOOMPolicy=continue/' %{buildroot}%{_sysconfdir}/%{name}/system.conf

-rm -f %{buildroot}%{_var}/log/README

-mkdir -p %{buildroot}%{_localstatedir}/opt/journal/log

-mkdir -p %{buildroot}%{_localstatedir}/log

-ln -sfv %{_localstatedir}/opt/journal/log %{buildroot}%{_localstatedir}/log/journal

+rm -f %{buildroot}%{_var}/log/README \

+      %{buildroot}%{_sysusersdir}/README

+

+mkdir -p %{buildroot}%{_var}/opt/journal/log \

+         %{buildroot}%{_var}/log

+

+ln -sfr %{buildroot}%{_var}/opt/journal/log %{buildroot}%{_var}/log/journal

 find %{buildroot} -name '*.la' -delete

 install -Dm 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/udev/rules.d

@@ -333,30 +343,35 @@ ln -sfv multi-user.target %{buildroot}%{_unitdir}/default.target

 %ifarch x86_64

 install -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/modules-load.d

 %endif

+

+install -m 0644 -D -t %{buildroot}%{_rpmmacrodir}/ %{SOURCE11}

+install -m 0644 -D -t %{buildroot}%{_rpmconfigdir}/fileattrs/ %{SOURCE12}

+install -m 0755 -D -t %{buildroot}%{_rpmconfigdir}/ %{SOURCE13}

+install -m 0755 -D -t %{buildroot}%{_rpmconfigdir}/ %{SOURCE14}

+

 %find_lang %{name} ../%{name}.lang

 %post

 %{name}-machine-id-setup &>/dev/null || :

 systemctl daemon-reexec &>/dev/null || {

-    if [ $1 -gt 1 ] && [ -d /run/%{name}/system ] ; then

-        kill -TERM 1 &>/dev/null || :

-    fi

+  if [ $1 -gt 1 ] && [ -d /run/%{name}/system ] ; then

+    kill -TERM 1 &>/dev/null || :

+  fi

 }

 journalctl --update-catalog &>/dev/null || :

+systemd-sysusers || :

 %{name}-tmpfiles --create &>/dev/null || :

 if [ $1 -eq 1 ] ; then

-        systemctl preset-all &>/dev/null || :

-        systemctl --global preset-all &>/dev/null || :

+  systemctl preset-all &>/dev/null || :

+  systemctl --global preset-all &>/dev/null || :

 fi

 %clean

 rm -rf %{buildroot}/*

-%global udev_services %{name}-udevd.service %{name}-udev-settle.service %{name}-udev-trigger.service %{name}-udevd-control.socket %{name}-udevd-kernel.socket %{name}-timesyncd.service

-

 %post udev

 udevadm hwdb --update &>/dev/null || :

 if [ $1 -eq 1 ] || [ $1 -eq 2 ]; then

@@ -371,9 +386,6 @@ fi

 %postun udev

 %systemd_postun_with_restart %{name}-udevd.service

-%postun tests

-rm -rf %{_libdir}/%{name}/tests

-

 %files

 %defattr(-,root,root)

 %dir %{_sysconfdir}/%{name}

@@ -399,6 +411,7 @@ rm -rf %{_libdir}/%{name}/tests

 %config(noreplace) %{_sysconfdir}/%{name}/timesyncd.conf

 %config(noreplace) %{_sysconfdir}/%{name}/networkd.conf

 %config(noreplace) %{_sysconfdir}/%{name}/pstore.conf

+%config(noreplace) %{_sysusersdir}/*.conf

 %ifarch x86_64

 %config(noreplace) %{_sysconfdir}/modules-load.d/10-rdrand-rng.conf

@@ -426,6 +439,7 @@ rm -rf %{_libdir}/%{name}/tests

 %{_bindir}/portablectl

 %{_bindir}/resolvectl

 %{_bindir}/systemctl

+%{_bindir}/%{name}-sysusers

 %{_bindir}/%{name}-analyze

 %{_bindir}/%{name}-ask-password

 %{_bindir}/%{name}-cat

@@ -474,10 +488,21 @@ rm -rf %{_libdir}/%{name}/tests

 %{_environmentdir}/99-environment.conf

 %exclude %{_datadir}/locale

 %{_libdir}/binfmt.d

-%{_libdir}/rpm

-%{_libdir}/sysctl.d

-%{_libdir}/%{name}

-

+%{_libdir}/rpm/*

+%{_libdir}/sysctl.d/*

+%{_systemd_util_dir}/boot/*

+%{_systemd_util_dir}/catalog/*

+%{_systemd_util_dir}/*.so

+%{_systemd_util_dir}/network/*

+%{_systemd_util_dir}/ntp-units.d/*

+%{_systemd_util_dir}/portable/*

+%{_systemd_util_dir}/resolv.conf

+%{_systemd_util_dir}/%{name}*

+%{_systemd_util_dir}/user*

+%{_systemd_util_dir}/import-pubring.gpg

+%{_unitdir}/*

+%{_presetdir}/*

+%{_systemdgeneratordir}/*

 %{_datadir}/bash-completion/*

 %{_datadir}/factory/*

 %{_datadir}/dbus-1

@@ -485,24 +510,24 @@ rm -rf %{_libdir}/%{name}/tests

 %{_datadir}/polkit-1

 %{_datadir}/%{name}

 %{_datadir}/zsh/*

-%{_localstatedir}/log/journal

-

-%ghost %dir %attr(0755,-,-) /etc/%{name}/system/basic.target.wants

-%ghost %dir %attr(0755,-,-) /etc/%{name}/system/bluetooth.target.wants

-%ghost %dir %attr(0755,-,-) /etc/%{name}/system/default.target.wants

-%ghost %dir %attr(0755,-,-) /etc/%{name}/system/getty.target.wants

-%ghost %dir %attr(0755,-,-) /etc/%{name}/system/graphical.target.wants

-%ghost %dir %attr(0755,-,-) /etc/%{name}/system/local-fs.target.wants

-%ghost %dir %attr(0755,-,-) /etc/%{name}/system/machines.target.wants

-%ghost %dir %attr(0755,-,-) /etc/%{name}/system/multi-user.target.wants

-%ghost %dir %attr(0755,-,-) /etc/%{name}/system/network-online.target.wants

-%ghost %dir %attr(0755,-,-) /etc/%{name}/system/printer.target.wants

-%ghost %dir %attr(0755,-,-) /etc/%{name}/system/remote-fs.target.wants

-%ghost %dir %attr(0755,-,-) /etc/%{name}/system/sockets.target.wants

-%ghost %dir %attr(0755,-,-) /etc/%{name}/system/sysinit.target.wants

-%ghost %dir %attr(0755,-,-) /etc/%{name}/system/system-update.target.wants

-%ghost %dir %attr(0755,-,-) /etc/%{name}/system/timers.target.wants

-%ghost %dir %attr(0755,-,-) /etc/%{name}/system

+%{_var}/log/journal

+

+%ghost %dir %attr(0755,-,-) %{_sysconfdir}/%{name}/system/basic.target.wants

+%ghost %dir %attr(0755,-,-) %{_sysconfdir}/%{name}/system/bluetooth.target.wants

+%ghost %dir %attr(0755,-,-) %{_sysconfdir}/%{name}/system/default.target.wants

+%ghost %dir %attr(0755,-,-) %{_sysconfdir}/%{name}/system/getty.target.wants

+%ghost %dir %attr(0755,-,-) %{_sysconfdir}/%{name}/system/graphical.target.wants

+%ghost %dir %attr(0755,-,-) %{_sysconfdir}/%{name}/system/local-fs.target.wants

+%ghost %dir %attr(0755,-,-) %{_sysconfdir}/%{name}/system/machines.target.wants

+%ghost %dir %attr(0755,-,-) %{_sysconfdir}/%{name}/system/multi-user.target.wants

+%ghost %dir %attr(0755,-,-) %{_sysconfdir}/%{name}/system/network-online.target.wants

+%ghost %dir %attr(0755,-,-) %{_sysconfdir}/%{name}/system/printer.target.wants

+%ghost %dir %attr(0755,-,-) %{_sysconfdir}/%{name}/system/remote-fs.target.wants

+%ghost %dir %attr(0755,-,-) %{_sysconfdir}/%{name}/system/sockets.target.wants

+%ghost %dir %attr(0755,-,-) %{_sysconfdir}/%{name}/system/sysinit.target.wants

+%ghost %dir %attr(0755,-,-) %{_sysconfdir}/%{name}/system/system-update.target.wants

+%ghost %dir %attr(0755,-,-) %{_sysconfdir}/%{name}/system/timers.target.wants

+%ghost %dir %attr(0755,-,-) %{_sysconfdir}/%{name}/system

 %files devel

 %defattr(-,root,root)

@@ -670,7 +695,7 @@ rm -rf %{_libdir}/%{name}/tests

 %files rpm-macros

 %defattr(-,root,root)

-%{_libdir}/rpm/macros.d

+%{_rpmmacrodir}/*

 %files tests

 %defattr(-,root,root)

@@ -679,6 +704,10 @@ rm -rf %{_libdir}/%{name}/tests

 %files lang -f ../%{name}.lang

 %changelog

+* Fri Feb 03 2023 Shreenidhi Shedi <sshedi@vmware.com> 252.4-8

+- Enable sysusers

+- Add a patch to use bBFQ scheduler

+- Remove test file packaging with main package

 * Tue Jan 17 2023 Ashwin Dayanand Kamat <kashwindayan@vmware.com> 252.4-7

 - Support OOMPolicy in scope units

 * Sat Jan 14 2023 Ashwin Dayanand Kamat <kashwindayan@vmware.com> 252.4-6

new file mode 100644

@@ -0,0 +1,2 @@

+%__sysusers_provides    %{_rpmconfigdir}/sysusers.prov

+%__sysusers_path        ^%{_sysusersdir}/.*\\.conf$

new file mode 100644

@@ -0,0 +1,96 @@

+#!/bin/bash

+# -*- mode: shell-script; indent-tabs-mode: true; tab-width: 4; -*-

+

+# This script turns sysuser.d files into scriptlets mandated by Fedora

+# packaging guidelines. The general idea is to define users using the

+# declarative syntax but to turn this into traditional scriptlets.

+

+user() {

+  local user="$1"

+  local uid="$2"

+  local desc="$3"

+  local group="$4"

+  local home="$5"

+  local shell="$6"

+

+  [ "$desc" = '-' ] && desc=

+  { [ "$home" = '-' ] || [ "$home" = '' ]; } && home=/

+  { [ "$shell" = '-' ] || [ "$shell" = '' ]; } && shell=/usr/sbin/nologin

+

+  if [ "$uid" = '-' ] || [ "$uid" = '' ]; then

+    cat <<EOF

+getent passwd '$user' >/dev/null || \\

+  useradd -r -g '$group' -d '$home' -s '$shell' -c '$desc' '$user' || :

+EOF

+  else

+    cat <<EOF

+if ! getent passwd '$user' >/dev/null; then

+  if ! getent passwd '$uid' >/dev/null; then

+    useradd -r -u '$uid' -g '$group' -d '$home' -s '$shell' -c '$desc' '$user' || :

+  else

+    useradd -r -g '$group' -d '$home' -s '$shell' -c '$desc' '$user' || :

+  fi

+fi

+EOF

+  fi

+}

+

+group() {

+  local group="$1"

+  local gid="$2"

+

+  if [ "$gid" = '-' ]; then

+    cat <<EOF

+getent group '$group' >/dev/null || groupadd -r '$group' || :

+EOF

+  else

+    cat <<EOF

+getent group '$group' >/dev/null || groupadd -f -g '$gid' -r '$group' || :

+EOF

+  fi

+}

+

+usermod() {

+  local user="$1"

+  local group="$2"

+

+  cat <<EOF

+if getent group '$group' >/dev/null; then

+  usermod -a -G '$group' '$user' || :

+fi

+EOF

+}

+

+parse() {

+  local line=""

+  while read -r line || [ -n "$line" ] ; do

+    { [ "${line:0:1}" = '#' ] || [ "${line:0:1}" = ';' ]; } && continue

+    line="${line## *}"

+    [ -z "$line" ] && continue

+    eval "arr=( $line )"

+    case "${arr[0]}" in

+      ('u')

+        if [[ "${arr[2]}" == *":"* ]]; then

+          user "${arr[1]}" "${arr[2]%:*}" "${arr[3]}" "${arr[2]#*:}" "${arr[4]}" "${arr[5]}"

+        else

+          group "${arr[1]}" "${arr[2]}"

+          user "${arr[1]}" "${arr[2]}" "${arr[3]}" "${arr[1]}" "${arr[4]}" "${arr[5]}"

+        fi

+        ;;

+      ('g')

+        group "${arr[1]}" "${arr[2]}"

+        ;;

+      ('m')

+        group "${arr[2]}" "-"

+        user "${arr[1]}" "-" "" "${arr[1]}" "" ""

+        usermod "${arr[1]}" "${arr[2]}"

+        ;;

+    esac

+  done

+}

+

+for fn in "$@"; do

+  [ -e "$fn" ] || continue

+  echo "# generated from $(basename "$fn")"

+  parse <"$fn"

+done

new file mode 100644

@@ -0,0 +1,62 @@

+#!/bin/bash

+

+process_u() {

+  if [ ! -z "${2##*[!0-9]*}" ]; then

+    # Single shared static ID.

+    echo "user($1) = $2"

+    echo "group($1) = $2"

+  elif [[ $2 == *:* ]]; then

+    # UID:<group>.

+    uid=$(echo $2 | cut -d':' -f1 -)

+    group=$(echo $2 | cut -d':' -f2 -)

+    if [ ! -z "${group##*[!0-9]*}" ]; then

+      # UID:GID.

+      echo "user($1) = ${uid}"

+      echo "group($1) = ${group}"

+    else

+      # UID:<groupname>.

+      echo "user($1) = ${uid}"

+      echo "group(${group})"

+    fi

+  else

+    # Dynamic (or something else uninteresting).

+    echo "user($1)"

+    echo "group($1)"

+  fi

+}

+

+process_g() {

+  if [ ! -z "${2##*[!0-9]*}" ]; then

+    # Static GID.

+    echo "group($1) = $2"

+  else

+    # Dynamic (or something else uninteresting).

+    echo "group($1)"

+  fi

+}

+

+parse() {

+  local line=""

+  while read line; do

+    [ "${line:0:1}" = '#' -o "${line:0:1}" = ';' ] && continue

+    line="${line## *}"

+    [ -z "$line" ] && continue

+    set -- $line

+    case "$1" in

+      ('u')

+        process_u "$2" "$3"

+        ;;

+      ('g')

+        process_g "$2" "$3"

+        ;;

+      ('m')

+        echo "user($2)"

+        echo "group($3)"

+        ;;

+    esac

+  done

+}

+

+while read fn; do

+  parse < "$fn"

+done

new file mode 100644

@@ -0,0 +1,43 @@

+From 1990fb757f6d275d807fcb48ad09f5fc7c947bc6 Mon Sep 17 00:00:00 2001

+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>

+Date: Wed, 14 Aug 2019 15:57:42 +0200

+Subject: [PATCH] udev: use bfq as the default scheduler

+

+As requested in https://bugzilla.redhat.com/show_bug.cgi?id=1738828.

+Test results are that bfq seems to behave better and more consistently on

+typical hardware. The kernel does not have a configuration option to set

+the default scheduler, and it currently needs to be set by userspace.

+

+See the bug for more discussion and links.

+---

+ rules.d/60-block-scheduler.rules | 5 +++++

+ rules.d/meson.build              | 1 +

+ 2 files changed, 6 insertions(+)

+ create mode 100644 rules.d/60-block-scheduler.rules

+

+diff --git a/rules.d/60-block-scheduler.rules b/rules.d/60-block-scheduler.rules

+new file mode 100644

+index 0000000000..850b64540e

+--- /dev/null

+@@ -0,0 +1,5 @@

++# do not edit this file, it will be overwritten on update

++

++ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", \

++  KERNEL=="mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|sd*[!0-9]|sr*", \

++  ATTR{queue/scheduler}="bfq"

+diff --git a/rules.d/meson.build b/rules.d/meson.build

+index 8d2878a36d..a3b395c9ce 100644

+--- a/rules.d/meson.build

+@@ -8,6 +8,7 @@ rules = [

+         [files('60-autosuspend.rules',

+                '60-block.rules',

+                '60-cdrom_id.rules',

++               '60-block-scheduler.rules',

+                '60-drm.rules',

+                '60-evdev.rules',

+                '60-fido-id.rules',

+-- 

+2.37.2

+