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

 Summary:        Mobile broadband modem manager

 Name:           ModemManager

 Version:        1.14.2

-Release:        2%{?dist}

+Release:        3%{?dist}

 URL:            https://www.freedesktop.org

 License:        GPLv2

 Group:          Applications/System

@@ -11,10 +11,19 @@ Source0:        https://www.freedesktop.org/software/ModemManager/ModemManager-%

 %define sha1    ModemManager=07e36664c9effa548b6d58cd7d7dce5da10a16ca

 BuildRequires:  libqmi-devel

 BuildRequires:  gobject-introspection-devel

+BuildRequires:  libgudev-devel

+BuildRequires:  systemd-devel

+BuildRequires:  systemd-libs

+BuildRequires:  gcc

+BuildRequires:  pkg-config

+BuildRequires:  automake autoconf libtool

 BuildRequires:  libxslt

+

 %if %{with_check}

 BuildRequires:  dbus-devel

 %endif

+

+Requires:       libgudev

 Requires:       libqmi

 Requires:       gobject-introspection

 %description

@@ -55,6 +64,7 @@ make %{?_smp_mflags} check

 %{_libdir}/libmm-glib.so*

 %{_libdir}/girepository-1.0/ModemManager-1.0.typelib

 %{_libdir}/ModemManager/*

+%{_libdir}/systemd/system/ModemManager.service

 %exclude %{_libdir}/debug

 %{_mandir}/man1/mmcli.1.gz

 %{_mandir}/man8/ModemManager.8.gz

@@ -73,6 +83,8 @@ make %{?_smp_mflags} check

 %{_libdir}/libmm-glib.la

 %changelog

+*   Mon Dec 14 2020 Susant Sahani <ssahani@vmware.com> 1.14.2-3

+-   Add build requires

 *   Wed Nov 18 2020 Satya Naga Vasamsetty <svasamsetty@vmware.com> 1.14.2-2

 -   Fix make check

 *   Mon Aug 24 2020 Gerrit Photon <photon-checkins@vmware.com> 1.14.2-1

@@ -1,18 +1,23 @@

-Summary:	Glib interfaces to D-Bus API 

-Name:		dbus-glib

-Version:	0.110

-Release:	1%{?dist}

-License: 	AFL and GPLv2+

-Group: 		System Environment/Libraries

-Source0:	http://dbus.freedesktop.org/releases/dbus-glib/%{name}-%{version}.tar.gz

+Summary:        Glib interfaces to D-Bus API

+Name:           dbus-glib

+Version:        0.110

+Release:        2%{?dist}

+License:        AFL and GPLv2+

+Group:          System Environment/Libraries

+Source0:        http://dbus.freedesktop.org/releases/dbus-glib/%{name}-%{version}.tar.gz

 %define sha1 dbus-glib=998b7c762c8f18c906f19fc393bb8712eabe8c97

-Vendor:		VMware, Inc.

-Distribution:	Photon

+Vendor:         VMware, Inc.

+Distribution:   Photon

+

 BuildRequires:	glib-devel

 BuildRequires:	dbus-devel

-Requires:	glib

-Requires:	dbus

-Provides:	pkgconfig(dbus-glib-1)

+BuildRequires:	systemd-devel

+

+Requires:       glib

+Requires:       dbus

+Requires:       libffi

+Requires:       systemd

+Provides:       pkgconfig(dbus-glib-1)

 %description

 The D-Bus GLib package contains GLib interfaces to the D-Bus API.

@@ -29,12 +34,10 @@ Headers and static libraries for the D-Bus GLib bindings

 %prep

 %setup -q

 %build

-./configure \

-	--prefix=%{_prefix} \

-	--sysconfdir=%{_sysconfdir} \

-        --disable-static \

-	--disable-gtk-doc

- 

+%configure                   \

+  --disable-static            \

+  --disable-gtk-doc

+

 make %{?_smp_mflags}

 %install

 make DESTDIR=%{buildroot} install

@@ -44,7 +47,7 @@ make %{?_smp_mflags} check

 %post	-p /sbin/ldconfig

 %postun	-p /sbin/ldconfig

-%files 

+%files

 %defattr(-,root,root)

 %{_sysconfdir}/bash_completion.d/*

 %{_bindir}/*

@@ -60,22 +63,22 @@ make %{?_smp_mflags} check

 %{_libdir}/*.so

 %{_libdir}/pkgconfig/*.pc

-

-

 %changelog

+*	Mon Dec 14 2020 Susant Sahani<ssahani@vmware.com> 0.110-2

+- Add build requres and requires.

 *	Mon Sep 10 2018 Ajay Kaher <akaher@vmware.com> 0.110-1

--       Upgraded to 0.110

-*       Wed May 03 2017 Bo Gan <ganb@vmware.com> 0.108-1

--       Update to 0.108

-*       Wed Oct 05 2016 ChangLee <changlee@vmware.com> 0.106-5

--       Modified %check

+- Upgraded to 0.110

+* Wed May 03 2017 Bo Gan <ganb@vmware.com> 0.108-1

+- Update to 0.108

+* Wed Oct 05 2016 ChangLee <changlee@vmware.com> 0.106-5

+- Modified %check

 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.106-4

 -	GA - Bump release of all rpms

-*   Mon Feb 22 2016 XIaolin Li <xiaolinl@vmware.com> 0.106-1

--   Updated to version 0.106

-*   	Thu Jan 28 2016 Anish Swaminathan <anishs@vmware.com> 0.104-3

--   	Add requires to dbus-glib-devel

-* 	Tue Sep 22 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 0.104-2

+* Mon Feb 22 2016 XIaolin Li <xiaolinl@vmware.com> 0.106-1

+- Updated to version 0.106

+* Thu Jan 28 2016 Anish Swaminathan <anishs@vmware.com> 0.104-3

+- Add requires to dbus-glib-devel

+* Tue Sep 22 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 0.104-2

 -	Updated build requires after creating devel package for dbus

 *	Tue Jun 23 2015 Divya Thaluru <dthaluru@vmware.com> 0.104-1

 -	Initial build.

@@ -3,15 +3,16 @@

 Name:           dbus-python3

 Version:        1.2.16

-Release:        1%{?dist}

+Release:        2%{?dist}

 Summary:        Python bindings for D-Bus

 License:        MIT

 Group:          Development/Libraries/Python

 Url:            http://www.freedesktop.org/wiki/Software/DBusBindings/

 Source0:        http://dbus.freedesktop.org/releases/dbus-python/dbus-python-%{version}.tar.gz

 %define         sha1 dbus-python=de05308c75baa2ce5434de73d60428c005ac0cc1

-Vendor:		VMware, Inc.

-Distribution:	Photon

+Vendor:         VMware, Inc.

+Distribution:   Photon

+

 BuildRequires:  python3

 BuildRequires:  python3-devel

 BuildRequires:  python3-libs

@@ -19,6 +20,8 @@ BuildRequires:  python3-docutils

 BuildRequires:  dbus-devel

 BuildRequires:  glib-devel

 BuildRequires:  python3-setuptools

+BuildRequires:  systemd-devel

+

 Requires:       python3-xml

 Requires:       dbus

@@ -64,5 +67,7 @@ make check

 %{_libdir}/pkgconfig/dbus-python.pc

 %changelog

+*   Mon Dec 14 2020 Susant Sahani <ssahani@vmware.com> 1.2.16-2

+-   Add build requires

 *   Thu Mar 19 2020 Tapas Kundu <tkundu@vmware.com> 1.2.16-1

 -   Initial release

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

 Summary:        Library for talking to WWAN modems and devices

 Name:           libmbim

 Version:        1.24.2

-Release:        1%{?dist}

+Release:        2%{?dist}

 URL:            https://www.freedesktop.org

 License:        GPLv2

 Group:          Applications/System

@@ -10,7 +10,17 @@ Distribution:   Photon

 Source0:        https://www.freedesktop.org/software/libmbim/libmbim-%{version}.tar.xz

 %define sha1    libmbim=1162a4302be250ca3334f3bfd1e7d04770e4b4ff

 BuildRequires:  libgudev-devel

+BuildRequires:  libgudev

+BuildRequires:  systemd-devel

+BuildRequires:  systemd-libs

+BuildRequires:  python3

+BuildRequires:  gcc

+BuildRequires:  glib-devel

+BuildRequires:  pkg-config

+BuildRequires:  automake autoconf libtool

+

 Requires:       libgudev

+

 %description

 The libmbim package contains a GLib-based library for talking to WWAN modems

 and devices which speak the Mobile Interface Broadband Model (MBIM) protocol.

@@ -23,7 +33,7 @@ Requires:      libgudev-devel

 It contains the libraries and header files for libmbim

 %prep

-%setup -q

+%autosetup -p1

 %build

 %configure --disable-static

@@ -55,6 +65,8 @@ make  %{?_smp_mflags} check

 %{_datadir}/gtk-doc/*

 %changelog

+*   Mon Dec 14 2020 Susant Sahani<ssahani@vmware.com> 1.24.2-2

+-   Add build requires

 *   Wed Jul 08 2020 Gerrit Photon <photon-checkins@vmware.com> 1.24.2-1

 -   Automatic Version Bump

 *   Mon Dec 10 2018 Alexey Makhalov <amakhalov@vmware.com> 1.16.2-1

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

 Summary:        Library for talking to WWAN modems and devices

 Name:           libqmi

 Version:        1.26.4

-Release:        1%{?dist}

+Release:        2%{?dist}

 URL:            https://www.freedesktop.org

 License:        GPLv2

 Group:          Applications/System

@@ -10,7 +10,15 @@ Distribution:   Photon

 Source0:        https://www.freedesktop.org/software/libqmi/libqmi-%{version}.tar.xz

 %define sha1    libqmi=f42a4100d00f20bdee9e4137fa7de143729be41d

 BuildRequires:  libmbim-devel

+BuildRequires:  libgudev-devel

+BuildRequires:  systemd-devel

+BuildRequires:  systemd-libs

+BuildRequires:  gcc

+BuildRequires:  pkg-config

+BuildRequires:  automake autoconf libtool

+

 Requires:       libmbim

+Requires:       libgudev

 %description

 The libqmi package contains a GLib-based library for talking to WWAN modems

 and devices which speak the Qualcomm MSM Interface (QMI) protocol.

@@ -56,6 +64,8 @@ make  %{?_smp_mflags} check

 %{_datadir}/gtk-doc/*

 %changelog

+*   Mon Dec 14 2020 Susant Sahani <ssahani@vmware.com> 1.26.4-2

+-   Add build requires

 *   Wed Sep 09 2020 Gerrit Photon <photon-checkins@vmware.com> 1.26.4-1

 -   Automatic Version Bump

 *   Wed Jul 08 2020 Gerrit Photon <photon-checkins@vmware.com> 1.26.2-1

@@ -1,48 +1,56 @@

 Name:           minimal

 Summary:        Metapackage to install minimal profile

 Version:        0.1

-Release:        3%{?dist}

+Release:        4%{?dist}

 License:        Apache 2.0

 Group:          System Environment/Base

 URL:            https://vmware.github.io/photon/

 Vendor:         VMware, Inc.

 Distribution:   Photon

-Requires:       filesystem

-Requires:	grub2-theme

-Requires:	grub2-efi-image

-Requires:       pkg-config

-Requires:       bzip2

-Requires:       procps-ng

-Requires:       iana-etc

+

 Requires:       bc

-Requires:       libtool

-Requires:       net-tools

+Requires:       bridge-utils

+Requires:       bzip2

+Requires:       cloud-init

+Requires:       cpio

+Requires:       cracklib-dicts

+Requires:       dbus

+Requires:       docker

+Requires:       e2fsprogs

+Requires:       file

+Requires:       filesystem

 Requires:       findutils

+Requires:       gdbm

+Requires:       grep

+Requires:       grub2-efi-image

+Requires:       grub2-theme

+Requires:       gzip

+Requires:       iana-etc

 Requires:       iproute2

 Requires:       iptables

 Requires:       iputils

-Requires:       dbus

-Requires:       file

-Requires:       e2fsprogs

-Requires:       rpm

+Requires:       Linux-PAM

+Requires:       libtool

+Requires:       motd

+Requires:       net-tools

 Requires:       openssh

-Requires:       gdbm

 Requires:       photon-release

 Requires:       photon-repos

+Requires:       pkg-config

+Requires:       procps-ng

+Requires:       rpm

 Requires:       sed

-Requires:       grep

-Requires:       util-linux

-Requires:       cpio

-Requires:       gzip

-Requires:       vim

+Requires:       systemd

+Requires:       systemd-libs

+Requires:       systemd-pam

+Requires:       systemd-rpm-macros

+Requires:       systemd-udev

 Requires:       tdnf

-Requires:       docker

-Requires:       bridge-utils

-Requires:       cloud-init

 Requires:       tzdata

+Requires:       util-linux

+Requires:       vim

 Requires:       which

-Requires:       motd

-Requires:       cracklib-dicts

+

 %ifarch x86_64

 Requires:       open-vm-tools

 %endif

@@ -58,6 +66,8 @@ Metapackage to install minimal profile

 %defattr(-,root,root,0755)

 %changelog

+*   Mon Aug 17 2020 Susant Sahani <ssahani@vmware.com> 0.1-4

+-   Add systemd packages, sort requires packages in alphabetical order

 *   Thu Mar 12 2020 Alexey Makhalov <amakhalov@vmware.com> 0.1-3

 -   Add grub2 packages

 *   Thu Nov 15 2018 Alexey Makhalov <amakhalov@vmware.com> 0.1-2

@@ -2,6 +2,7 @@

 # VMware HotPlug automatization

 #

 # Automatically bring on-line added processors and memory.

-# 

-ACTION=="add", SUBSYSTEM=="cpu", ATTR{online}="1"

-SUBSYSTEM=="memory", ACTION=="add", DEVPATH=="/devices/system/memory/memory*[0-9]", TEST=="state", ATTR{state}="online"

+#

+

+SUBSYSTEM=="cpu", ACTION=="add", TEST=="online", ATTR{online}=="0", ATTR{online}="1"

+SUBSYSTEM=="memory", ACTION=="add", TEST=="state", ATTR{state}=="offline", ATTR{state}="online"

deleted file mode 100644

@@ -1,12 +0,0 @@

-diff -rupN systemd-245/src/resolve/resolved-conf.c systemd-245-dns-from-env/src/resolve/resolved-conf.c

-+++ systemd-245-dns-from-env/src/resolve/resolved-conf.c	2020-04-03 08:25:52.900081836 +0200

-@@ -382,7 +382,7 @@ int manager_parse_config_file(Manager *m

-                 return r;

- 

-         if (m->need_builtin_fallbacks) {

--                r = manager_parse_dns_server_string_and_warn(m, DNS_SERVER_FALLBACK, DNS_SERVERS);

-+                r = manager_parse_dns_server_string_and_warn(m, DNS_SERVER_FALLBACK, secure_getenv("DEFAULT_DNS_SERVERS") ?: DNS_SERVERS);

-                 if (r < 0)

-                         return r;

-         }

deleted file mode 100644

@@ -1,32 +0,0 @@

-diff -rupN systemd-245/src/udev/udev-builtin-net_id.c systemd-245-enoX-uses-instance-number-for-vmware-hv/src/udev/udev-builtin-net_id.c

-+++ systemd-245-enoX-uses-instance-number-for-vmware-hv/src/udev/udev-builtin-net_id.c	2020-04-03 23:07:25.264328010 +0200

-@@ -183,6 +183,28 @@ static int dev_pci_onboard(sd_device *de

-         if (idx == 0 && !naming_scheme_has(NAMING_ZERO_ACPI_INDEX))

-                 return -EINVAL;

- 

-+        if (idx >> 24) {

-+                unsigned domain, bus, slot, func;

-+                const char *device_sysname;

-+                /*

-+                 * VMware acpi_index format:

-+                 * |31 instance 24|23     16|15     8|7    3|2    0|

-+                 * |    number    | domain? |   bus  | slot | func |

-+                 *

-+                 * Let's use instance number to get enoX human readable

-+                 */

-+

-+                r = sd_device_get_sysname(names->pcidev, &device_sysname);

-+                if (r < 0)

-+                        return r;

-+

-+                if (sscanf(device_sysname, "%x:%x:%x.%u", &domain, &bus, &slot, &func) != 4)

-+                        return -ENOENT;

-+

-+                if ((idx & 0xffff) == ((bus << 8) | (slot << 3) | func))

-+                        idx >>= 24;

-+        }

-+

-         /* Some BIOSes report rubbish indexes that are excessively high (2^24-1 is an index VMware likes to

-          * report for example). Let's define a cut-off where we don't consider the index reliable anymore. We

-          * pick some arbitrary cut-off, which is somewhere beyond the realistic number of physical network

new file mode 100644

@@ -0,0 +1,12 @@

+diff --color -rupN systemd-stable-246.1/src/resolve/resolved-conf.c systemd-stable-246.1-default-dns-from-env/src/resolve/resolved-conf.c

+--- systemd-stable-246.1/src/resolve/resolved-conf.c	2020-08-07 15:09:53.000000000 +0000

+@@ -402,7 +402,7 @@ int manager_parse_config_file(Manager *m

+                 return r;

+ 

+         if (m->need_builtin_fallbacks) {

+-                r = manager_parse_dns_server_string_and_warn(m, DNS_SERVER_FALLBACK, DNS_SERVERS);

++                r = manager_parse_dns_server_string_and_warn(m, DNS_SERVER_FALLBACK, secure_getenv("DEFAULT_DNS_SERVERS") ?: DNS_SERVERS);

+                 if (r < 0)

+                         return r;

+         }

new file mode 100644

@@ -0,0 +1,32 @@

+diff --color -rupN systemd-stable-246.1/src/udev/udev-builtin-net_id.c systemd-stable-246.1-enoX-uses-instance-number/src/udev/udev-builtin-net_id.c

+--- systemd-stable-246.1/src/udev/udev-builtin-net_id.c	2020-08-07 15:09:53.000000000 +0000

+@@ -183,6 +183,28 @@ static int dev_pci_onboard(sd_device *de

+         if (idx == 0 && !naming_scheme_has(NAMING_ZERO_ACPI_INDEX))

+                 return -EINVAL;

+ 

++        if (idx >> 24) {

++                unsigned domain, bus, slot, func;

++                const char *device_sysname;

++                /*

++                 * VMware acpi_index format:

++                 * |31 instance 24|23     16|15     8|7    3|2    0|

++                 * |    number    | domain? |   bus  | slot | func |

++                 *

++                 * Let's use instance number to get enoX human readable

++                 */

++

++                r = sd_device_get_sysname(names->pcidev, &device_sysname);

++                if (r < 0)

++                        return r;

++

++                if (sscanf(device_sysname, "%x:%x:%x.%u", &domain, &bus, &slot, &func) != 4)

++                        return -ENOENT;

++

++                                if ((idx & 0xffff) == ((bus << 8) | (slot << 3) | func))

++                                        idx >>= 24;

++        }

++

+         /* Some BIOSes report rubbish indexes that are excessively high (2^24-1 is an index VMware likes to

+          * report for example). Let's define a cut-off where we don't consider the index reliable anymore. We

+          * pick some arbitrary cut-off, which is somewhere beyond the realistic number of physical network

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

 Name:             systemd

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

-Version:          245.5

-Release:          3%{?dist}

+Version:          247

+Release:          1%{?dist}

 License:          LGPLv2+ and GPLv2+ and MIT

 Summary:          System and Service Manager

@@ -10,7 +10,7 @@ Vendor:           VMware, Inc.

 Distribution:     Photon

 Source0:          %{name}-stable-%{version}.tar.gz

-%define sha1      systemd=eb92a3cf4dac32a5e125aff2d90a0d6eb8a875f5

+%define sha1      systemd=352aa4ebb76385af788dc2037a8fd138aaec56b3

 Source1:          99-vmware-hotplug.rules

 Source2:          50-security-hardening.conf

 Source3:          systemd.cfg

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

 Source5:          10-rdrand-rng.conf

 Source6:          10-defaults.preset

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

-Patch1:           systemd-245-default-dns-from-env.patch

-Patch2:           util-return-the-correct-correct-wd-from-inotify-help.patch

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

+Patch1:           systemd-247-default-dns-from-env.patch

 Requires:         Linux-PAM

 Requires:         bzip2

+Requires:         curl

 Requires:         elfutils

 Requires:         filesystem >= 1.1

 Requires:         glib

 Requires:         gnutls

 Requires:         kmod

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

+Requires:         %{name}-rpm-macros = %{version}-%{release}

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

 Requires:         libacl

 Requires:         libcap

 Requires:         libgcrypt

+Requires:         libmicrohttpd

 Requires:         libseccomp

 Requires:         libselinux

 Requires:         lz4

@@ -39,6 +43,7 @@ Requires:         pcre

 Requires:         xz

 BuildRequires:   bzip2-devel

+BuildRequires:   curl-devel

 BuildRequires:   docbook-xml

 BuildRequires:   docbook-xsl

 BuildRequires:   gettext

@@ -58,6 +63,7 @@ BuildRequires:   libxslt

 BuildRequires:   Linux-PAM-devel

 BuildRequires:   lz4-devel

 BuildRequires:   meson

+BuildRequires:   libmicrohttpd-devel

 BuildRequires:   ninja-build

 BuildRequires:   openssl-devel

 BuildRequires:   pcre-devel

@@ -86,14 +92,89 @@ runtime directories and settings, and daemons to manage simple network

 configuration, network time synchronization, log forwarding, and name

 resolution.

+%package libs

+Summary:        systemd libraries

+License:        LGPLv2+ and MIT

+Provides:       nss-myhostname = 0.4

+Requires(post): coreutils

+Requires(post): sed

+Requires(post): grep

+

+%description libs

+Libraries for systemd and udev.

+

+%package pam

+Summary:        systemd PAM module

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

+

+%description pam

+Systemd PAM module registers the session with systemd-logind.

+

+%package rpm-macros

+Summary:        Macros that define paths and scriptlets related to systemd

+BuildArch:      noarch

+

+%description rpm-macros

+Just the definitions of rpm macros.

+

 %package devel

 Summary:        Development headers for systemd

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

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

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

 Requires:       glib-devel

+Provides:       libudev-devel = %{version}

 %description devel

 Development headers for developing applications linking to libsystemd

+%package udev

+Summary: Rule-based device node and kernel event manager

+License:        LGPLv2+

+

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

+Requires(post):   systemd

+Requires(preun):  systemd

+Requires(postun): systemd

+Requires(post):   grep

+Requires:         kmod

+Provides:         udev = %{version}

+

+%description udev

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

+needed to manage device nodes. This package is necessary on physical

+machines and in virtual machines, but not in containers.

+

+%package container

+Summary: Tools for containers and VMs

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

+Requires(post):   systemd

+Requires(preun):  systemd

+Requires(postun): systemd

+License:          LGPLv2+

+

+%description container

+Systemd tools to spawn and manage containers and virtual machines.

+

+This package contains systemd-nspawn, machinectl, systemd-machined,

+and systemd-importd.

+

+%package journal-remote

+Summary:        Tools to send journal events over the network

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

+License:        LGPLv2+

+Requires(post):   systemd

+Requires(preun):  systemd

+Requires(postun): systemd

+Requires:         libmicrohttpd

+Provides:         systemd-journal-gateway = %{version}-%{release}

+

+%description journal-remote

+Programs to forward journal entries over the network, using encrypted HTTP,

+and to write journal files from serialized journal contents.

+

+This package contains systemd-journal-gatewayd,

+systemd-journal-remote, and systemd-journal-upload.

+

 %package lang

 Summary:        Language pack for systemd

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

@@ -101,15 +182,20 @@ Requires:       %{name} = %{version}-%{release}

 %description lang

 Language pack for systemd

+%package tests

+Summary:       Internal unit tests for systemd

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

+License:       LGPLv2+

+

+%description tests

+"Installed tests" that are usually run as part of the build system.

+They can be useful to test systemd internals.

+

 %prep

-%setup -n %{name}-stable-%{version}

+%autosetup -n %{name}-stable-%{version} -p1

 sed -i "s#\#DefaultTasksMax=512#DefaultTasksMax=infinity#g" src/core/system.conf.in

-%patch0 -p1

-%patch1 -p1

-%patch2 -p1

-

 %build

 if [ %{_host} != %{_build} ]; then

 CPU_FAMILY=""

@@ -147,7 +233,10 @@ fi

 CONFIGURE_OPTS=(

        --prefix=%{_prefix}

+       -Dmode=release

        -Dkmod=true

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

+       -Dservice-watchdog=

        -Dblkid=true

        -Dseccomp=true

        -Ddefault-dnssec=no

@@ -166,9 +255,13 @@ CONFIGURE_OPTS=(

        -Dpam=true

        -Dpolkit=true

        -Dselinux=true

+       -Dlibcurl=true

+       -Dgnutls=true

+       -Db_ndebug=false

        -Dhwdb=true

        -Ddefault-kill-user-processes=false

        -Dtests=unsafe

+       -Dinstall-tests=true

        -Dnobody-user=nobody

        -Dnobody-group=nobody

        -Dsplit-usr=false

@@ -178,6 +271,8 @@ CONFIGURE_OPTS=(

        -Ddefault-hierarchy=hybrid

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

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

+       -Dfallback-hostname=photon

+       -Doomd=true

        -Dversion-tag=v%{version}-%{release}

        $CROSS_COMPILE_CONFIG

 )

@@ -193,12 +288,11 @@ export LANG=en_US.UTF-8

 export LC_ALL=en_US.UTF-8

 DESTDIR=%{buildroot} ninja -C build install

-install -vdm 755 %{buildroot}/sbin

-for tool in runlevel reboot shutdown poweroff halt telinit; do

-     ln -sfv ../bin/systemctl %{buildroot}/sbin/${tool}

-done

+sed -i '/srv/d' %{buildroot}/usr/lib/tmpfiles.d/home.conf

+sed -i "s:0775 root lock:0755 root root:g" %{buildroot}/usr/lib/tmpfiles.d/legacy.conf

+sed -i "s:NamePolicy=kernel database onboard slot path:NamePolicy=kernel database:g" %{buildroot}/usr/lib/systemd/network/99-default.link

+sed -i "s:#LLMNR=yes:LLMNR=false:g" %{buildroot}/etc/systemd/resolved.conf

-ln -sfv ../lib/systemd/systemd %{buildroot}/sbin/init

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

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

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

@@ -232,10 +326,9 @@ systemctl daemon-reexec &>/dev/null || {

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

 systemd-tmpfiles --create &>/dev/null || :

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

 # See https://github.com/systemd/systemd/blob/master/NEWS#L1273

-if [ $1 -gt 0 ] ; then

+if [ $1 -eq 1 ] ; then

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

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

 fi

@@ -243,6 +336,15 @@ fi

 %clean

 rm -rf %{buildroot}/*

+%post udev

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

+

+%preun udev

+%systemd_preun systemd-udev{d,-settle,-trigger}.service systemd-udevd-{control,kernel}.socket systemd-timesyncd.service

+

+%postun udev

+%systemd_postun_with_restart systemd-udevd.service

+

 %files

 %defattr(-,root,root)

 %dir %{_sysconfdir}/systemd

@@ -257,9 +359,10 @@ rm -rf %{buildroot}/*

 %{_sysconfdir}/sysctl.d/50-security-hardening.conf

 %{_sysconfdir}/xdg/systemd

 %{_sysconfdir}/rc.d/init.d/README

-%{_sysconfdir}/systemd/sleep.conf

-%{_sysconfdir}/pam.d/systemd-user

+%config(noreplace) %{_sysconfdir}/oomd.conf

+

+%config(noreplace) %{_sysconfdir}/systemd/sleep.conf

 %config(noreplace) %{_sysconfdir}/systemd/system.conf

 %config(noreplace) %{_sysconfdir}/systemd/user.conf

 %config(noreplace) %{_sysconfdir}/systemd/logind.conf

@@ -275,30 +378,73 @@ rm -rf %{buildroot}/*

 %endif

 %config(noreplace) %{_sysconfdir}/systemd/network/99-dhcp-en.network

-%dir %{_sysconfdir}/udev

-%dir %{_sysconfdir}/udev/rules.d

-%dir %{_sysconfdir}/udev/hwdb.d

-

-%{_sysconfdir}/udev/rules.d/99-vmware-hotplug.rules

-%config(noreplace) %{_sysconfdir}/udev/udev.conf

 %config(noreplace) /boot/systemd.cfg

+%{_sbindir}/halt

+%{_sbindir}/init

+%{_sbindir}/poweroff

+%{_sbindir}/reboot

+%{_sbindir}/runlevel

+%{_sbindir}/shutdown

+%{_sbindir}/telinit

+%{_sbindir}/resolvconf

+

+%{_bindir}/busctl

+%{_bindir}/coredumpctl

+%{_bindir}/hostnamectl

+%{_bindir}/journalctl

+%{_bindir}/localectl

+%{_bindir}/loginctl

+%{_bindir}/networkctl

+%{_bindir}/portablectl

+%{_bindir}/resolvectl

+%{_bindir}/systemctl

+%{_bindir}/systemd-analyze

+%{_bindir}/systemd-ask-password

+%{_bindir}/systemd-cat

+%{_bindir}/systemd-cgls

+%{_bindir}/systemd-cgtop

+%{_bindir}/systemd-delta

+%{_bindir}/systemd-detect-virt

+%{_bindir}/systemd-escape

+%{_bindir}/systemd-id128

+%{_bindir}/systemd-inhibit

+%{_bindir}/systemd-machine-id-setup

+%{_bindir}/systemd-mount

+%{_bindir}/systemd-notify

+%{_bindir}/systemd-path

+%{_bindir}/systemd-resolve

+%{_bindir}/systemd-run

+%{_bindir}/systemd-socket-activate

+%{_bindir}/systemd-stdio-bridge

+%{_bindir}/systemd-tmpfiles

+%{_bindir}/systemd-tty-ask-password-agent

+%{_bindir}/systemd-umount

+%{_bindir}/timedatectl

+%{_bindir}/userdbctl

+%{_bindir}/systemd-repart

+%{_bindir}/systemd-dissect

+%{_bindir}/oomctl

+

+%{_libdir}/tmpfiles.d/etc.conf

+%{_libdir}/tmpfiles.d/home.conf

+%{_libdir}/tmpfiles.d/journal-nocow.conf

+%{_libdir}/tmpfiles.d/legacy.conf

+%{_libdir}/tmpfiles.d/portables.conf

+%{_libdir}/tmpfiles.d/static-nodes-permissions.conf

+%{_libdir}/tmpfiles.d/systemd-nologin.conf

+%{_libdir}/tmpfiles.d/systemd-tmp.conf

+%{_libdir}/tmpfiles.d/systemd.conf

+%{_libdir}/tmpfiles.d/tmp.conf

+%{_libdir}/tmpfiles.d/var.conf

+%{_libdir}/tmpfiles.d/x11.conf

+

 %{_libdir}/environment.d/99-environment.conf

 %exclude %{_datadir}/locale

 %{_libdir}/binfmt.d

-%{_libdir}/kernel

-%{_libdir}/modules-load.d

 %{_libdir}/rpm

-%{_libdir}/*.so*

 %{_libdir}/sysctl.d

 %{_libdir}/systemd

-%{_libdir}/tmpfiles.d

-%{_libdir}/udev

-%{_libdir}/security/pam_systemd.so

-%{_libdir}/modprobe.d/systemd.conf

-%{_bindir}/*

-%{_sbindir}/*

-/sbin/*

 %{_datadir}/bash-completion/*

 %{_datadir}/factory/*

@@ -327,6 +473,7 @@ rm -rf %{buildroot}/*

 %ghost %dir %attr(0755,-,-) /etc/systemd/system

 %files devel

+%defattr(-,root,root)

 %dir %{_includedir}/systemd

 %{_libdir}/libudev.so

 %{_libdir}/libsystemd.so

@@ -337,15 +484,183 @@ rm -rf %{buildroot}/*

 %{_datadir}/pkgconfig/systemd.pc

 %{_datadir}/pkgconfig/udev.pc

+%files udev

+%defattr(-,root,root)

+%dir %{_sysconfdir}/udev

+%{_sysconfdir}/udev/rules.d/99-vmware-hotplug.rules

+%dir %{_sysconfdir}/kernel

+%dir %{_sysconfdir}/modules-load.d

+%{_sysconfdir}/systemd/pstore.conf

+%{_sysconfdir}/systemd/sleep.conf

+%{_sysconfdir}/systemd/timesyncd.conf

+%{_sysconfdir}/udev/udev.conf

+%{_libdir}/tmpfiles.d/systemd-pstore.conf

+%{_bindir}/bootctl

+%{_bindir}/kernel-install

+%{_bindir}/systemd-hwdb

+%{_bindir}/udevadm

+

+%{_libdir}/udev/v4l_id

+%{_libdir}/kernel

+%{_libdir}/modprobe.d

+%{_libdir}/modules-load.d

+%{_libdir}/systemd/network/99-default.link

+%{_libdir}/systemd/ntp-units.d/80-systemd-timesync.list

+%{_libdir}/systemd/system-generators/systemd-bless-boot-generator

+%{_libdir}/systemd/system-generators/systemd-hibernate-resume-generator

+%{_libdir}/systemd/system-sleep

+%{_libdir}/systemd/system/hibernate.target

+%{_libdir}/systemd/system/hybrid-sleep.target

+%{_libdir}/systemd/system/initrd-udevadm-cleanup-db.service

+%{_libdir}/systemd/system/kmod-static-nodes.service

+%{_libdir}/systemd/system/quotaon.service

+%{_libdir}/systemd/system/sleep.target

+%{_libdir}/systemd/system/sockets.target.wants/systemd-udevd-control.socket

+%{_libdir}/systemd/system/sockets.target.wants/systemd-udevd-kernel.socket

+%{_libdir}/systemd/system/suspend-then-hibernate.target

+%{_libdir}/systemd/system/suspend.target

+%{_libdir}/systemd/system/sysinit.target.wants/kmod-static-nodes.service

+%{_libdir}/systemd/system/sysinit.target.wants/systemd-boot-system-token.service

+%{_libdir}/systemd/system/sysinit.target.wants/systemd-hwdb-update.service

+%{_libdir}/systemd/system/sysinit.target.wants/systemd-modules-load.service

+%{_libdir}/systemd/system/sysinit.target.wants/systemd-random-seed.service

+%{_libdir}/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service

+%{_libdir}/systemd/system/sysinit.target.wants/systemd-udevd.service

+%{_libdir}/systemd/system/systemd-backlight@.service

+%{_libdir}/systemd/system/systemd-bless-boot.service

+%{_libdir}/systemd/system/systemd-boot-system-token.service

+%{_libdir}/systemd/system/systemd-fsck-root.service

+%{_libdir}/systemd/system/systemd-fsck@.service

+%{_libdir}/systemd/system/systemd-hibernate-resume@.service

+%{_libdir}/systemd/system/systemd-hibernate.service

+%{_libdir}/systemd/system/systemd-hwdb-update.service