diff --git a/systemd-mini.changes b/systemd-mini.changes index 97fa4101..e63fc72b 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -39,6 +39,11 @@ Wed Mar 24 07:05:22 UTC 2021 - Franck Bui Temporary workaround for bsc#1183745 (upstream issue 18917) until an actual fix is found. +------------------------------------------------------------------- +Tue Mar 23 14:11:03 UTC 2021 - Ludwig Nussel + +- enable libiptc for masquerading support in networkd + ------------------------------------------------------------------- Mon Mar 22 21:12:40 UTC 2021 - Neal Gompa @@ -80,6 +85,12 @@ Mon Mar 15 11:06:54 UTC 2021 - Franck Bui e06139117c nspawn: make rootfs relative to oci bundle path (bsc#1182598) 8ba587d46c PATCH] Always free deserialized_subscribed on reload (bsc#1180020) +------------------------------------------------------------------- +Thu Mar 11 16:58:44 UTC 2021 - Ludwig Nussel + +- create subpackage systemd-experimental to host pstore, repart, + userdb and homed + ------------------------------------------------------------------- Thu Mar 11 09:51:53 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index eeeba9ef..502c0ac6 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -38,6 +38,7 @@ %bcond_with portabled %bcond_with resolved %bcond_with sysvcompat +%bcond_with experimental %else %bcond_without coredump %ifarch %{ix86} x86_64 @@ -50,6 +51,7 @@ %bcond_without portabled %bcond_without resolved %bcond_without sysvcompat +%bcond_without experimental %endif %bcond_with parentpathid @@ -111,6 +113,10 @@ BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33 %if %{with gnuefi} BuildRequires: gnu-efi %endif +%if %{with experimental} +BuildRequires: pkgconfig(fdisk) +BuildRequires: pkgconfig(openssl) +%endif %if 0%{?bootstrap} #!BuildIgnore: dbus-1 @@ -493,6 +499,19 @@ This package contains systemd-journal-gatewayd, systemd-journal-remote, and systemd-journal-upload. %endif +%package experimental +Summary: Experimental systemd features +License: LGPL-2.1-or-later +Group: System/Base +Requires: %{name} = %{version}-%{release} +%systemd_requires + +%description experimental +This package contains optional extra systemd services that are +considered a preview feature. Components that turn out to be +stable may be merged into the main package later. Use at your own +risk. + %if ! 0%{?bootstrap} %lang_package %endif @@ -526,14 +545,22 @@ systemd-journal-remote, and systemd-journal-upload. -Dsmack=false \ -Dima=false \ -Delfutils=auto \ +%if %{with experimental} + -Dpstore=true \ + -Drepart=true \ + -Dhomed=true \ + -Duserdb=true \ +%else -Dpstore=false \ -Drepart=false \ - -Duserdb=false \ -Dhomed=false \ + -Duserdb=false \ +%endif +%if 0%{?bootstrap} -Dfdisk=false \ -Dpwquality=false \ -Dp11kit=false \ -%if ! 0%{?bootstrap} +%else -Dman=true \ -Dhtml=true \ %endif @@ -1049,6 +1076,29 @@ fi %service_del_postun systemd-portabled.service %endif +%if %{with experimental} +%pre experimental +%service_add_pre systemd-pstore.service +%service_add_pre systemd-userdbd.service systemd-userdbd.socket +%service_add_pre systemd-homed.service + +%post experimental +%tmpfiles_create systemd-pstore.conf +%service_add_post systemd-pstore.service +%service_add_post systemd-userdbd.service systemd-userdbd.socket +%service_add_post systemd-homed.service + +%preun experimental +%service_del_preun systemd-pstore.service +%service_del_preun systemd-userdbd.service systemd-userdbd.socket +%service_del_preun systemd-homed.service + +%postun experimental +%service_del_postun systemd-pstore.service +%service_del_postun systemd-userdbd.service systemd-userdbd.socket +%service_del_postun systemd-homed.service +%endif + %clean %files @@ -1146,6 +1196,22 @@ fi %exclude %{_unitdir}/dbus-org.freedesktop.portable1.service %exclude %{_tmpfilesdir}/portables.conf %endif +%if %{with experimental} +%exclude %{_prefix}/lib/systemd/systemd-pstore +%exclude %{_unitdir}/systemd-pstore.service +%exclude %{_tmpfilesdir}/systemd-pstore.conf +%exclude %{_unitdir}/systemd-repart.service +%exclude %{_unitdir}/initrd-root-fs.target.wants/systemd-repart.service +%exclude %{_unitdir}/sysinit.target.wants/systemd-repart.service +%exclude %{_prefix}/lib/systemd/systemd-userwork +%exclude %{_prefix}/lib/systemd/systemd-userdbd +%exclude %{_unitdir}/systemd-userdbd.service +%exclude %{_unitdir}/systemd-userdbd.socket +%exclude %{_prefix}/lib/systemd/systemd-homed +%exclude %{_prefix}/lib/systemd/systemd-homework +%exclude %{_unitdir}/systemd-homed-activate.service +%exclude %{_unitdir}/systemd-homed.service +%endif %{_unitdir}/*.automount %{_unitdir}/*.service @@ -1308,6 +1374,17 @@ fi %exclude %{_mandir}/man*/portablectl* %exclude %{_mandir}/man*/systemd-portabled* %endif +%if %{with experimental} +%exclude %{_mandir}/man*/*pstore* +%exclude %{_mandir}/man*/*repart* +%exclude %{_mandir}/man*/userdbctl* +%exclude %{_mandir}/man*/systemd-userdbd* +%exclude %{_mandir}/man*/*homectl* +%exclude %{_mandir}/man*/*homed* +%exclude %{_mandir}/man*/org.freedesktop.home1* +%exclude %{_mandir}/man*/pam_systemd_home* +%exclude %{_datadir}/bash-completion/completions/homectl +%endif %endif %{_docdir}/systemd @@ -1614,4 +1691,38 @@ fi %{_mandir}/man*/systemd-portabled* %endif +%if %{with experimental} +%files experimental +%defattr(-,root,root) +%config(noreplace) /etc/systemd/pstore.conf +%{_prefix}/lib/systemd/systemd-pstore +%{_unitdir}/systemd-pstore.service +%{_tmpfilesdir}/systemd-pstore.conf +%{_mandir}/man*/*pstore* +%{_bindir}/systemd-repart +%{_unitdir}/systemd-repart.service +%{_mandir}/man*/*repart* +/usr/bin/userdbctl +%{_prefix}/lib/systemd/systemd-userwork +%{_prefix}/lib/systemd/systemd-userdbd +%{_unitdir}/systemd-userdbd.service +%{_unitdir}/systemd-userdbd.socket +%{_mandir}/man*/userdbctl* +%{_mandir}/man*/systemd-userdbd* +%config %{_sysconfdir}/homed.conf +%{_bindir}/homectl +%{_prefix}/lib/systemd/systemd-homed +%{_prefix}/lib/systemd/systemd-homework +%{_unitdir}/systemd-homed.service +%{_pamdir}/pam_systemd_home.so +%{_datadir}/dbus-1/system-services/org.freedesktop.home1.service +%{_datadir}/dbus-1/system.d/org.freedesktop.home1.conf +%{_datadir}/polkit-1/actions/org.freedesktop.home1.policy +%{_datadir}/bash-completion/completions/homectl +%{_mandir}/man*/*homectl* +%{_mandir}/man*/*homed* +%{_mandir}/man*/org.freedesktop.home1* +%{_mandir}/man*/pam_systemd_home* +%endif + %changelog diff --git a/systemd.changes b/systemd.changes index 97fa4101..e63fc72b 100644 --- a/systemd.changes +++ b/systemd.changes @@ -39,6 +39,11 @@ Wed Mar 24 07:05:22 UTC 2021 - Franck Bui Temporary workaround for bsc#1183745 (upstream issue 18917) until an actual fix is found. +------------------------------------------------------------------- +Tue Mar 23 14:11:03 UTC 2021 - Ludwig Nussel + +- enable libiptc for masquerading support in networkd + ------------------------------------------------------------------- Mon Mar 22 21:12:40 UTC 2021 - Neal Gompa @@ -80,6 +85,12 @@ Mon Mar 15 11:06:54 UTC 2021 - Franck Bui e06139117c nspawn: make rootfs relative to oci bundle path (bsc#1182598) 8ba587d46c PATCH] Always free deserialized_subscribed on reload (bsc#1180020) +------------------------------------------------------------------- +Thu Mar 11 16:58:44 UTC 2021 - Ludwig Nussel + +- create subpackage systemd-experimental to host pstore, repart, + userdb and homed + ------------------------------------------------------------------- Thu Mar 11 09:51:53 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 50f7c2b9..678d1ee3 100644 --- a/systemd.spec +++ b/systemd.spec @@ -36,6 +36,7 @@ %bcond_with portabled %bcond_with resolved %bcond_with sysvcompat +%bcond_with experimental %else %bcond_without coredump %ifarch %{ix86} x86_64 @@ -48,6 +49,7 @@ %bcond_without portabled %bcond_without resolved %bcond_without sysvcompat +%bcond_without experimental %endif %bcond_with parentpathid @@ -109,6 +111,10 @@ BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33 %if %{with gnuefi} BuildRequires: gnu-efi %endif +%if %{with experimental} +BuildRequires: pkgconfig(fdisk) +BuildRequires: pkgconfig(openssl) +%endif %if 0%{?bootstrap} #!BuildIgnore: dbus-1 @@ -491,6 +497,19 @@ This package contains systemd-journal-gatewayd, systemd-journal-remote, and systemd-journal-upload. %endif +%package experimental +Summary: Experimental systemd features +License: LGPL-2.1-or-later +Group: System/Base +Requires: %{name} = %{version}-%{release} +%systemd_requires + +%description experimental +This package contains optional extra systemd services that are +considered a preview feature. Components that turn out to be +stable may be merged into the main package later. Use at your own +risk. + %if ! 0%{?bootstrap} %lang_package %endif @@ -524,14 +543,22 @@ systemd-journal-remote, and systemd-journal-upload. -Dsmack=false \ -Dima=false \ -Delfutils=auto \ +%if %{with experimental} + -Dpstore=true \ + -Drepart=true \ + -Dhomed=true \ + -Duserdb=true \ +%else -Dpstore=false \ -Drepart=false \ - -Duserdb=false \ -Dhomed=false \ + -Duserdb=false \ +%endif +%if 0%{?bootstrap} -Dfdisk=false \ -Dpwquality=false \ -Dp11kit=false \ -%if ! 0%{?bootstrap} +%else -Dman=true \ -Dhtml=true \ %endif @@ -1047,6 +1074,29 @@ fi %service_del_postun systemd-portabled.service %endif +%if %{with experimental} +%pre experimental +%service_add_pre systemd-pstore.service +%service_add_pre systemd-userdbd.service systemd-userdbd.socket +%service_add_pre systemd-homed.service + +%post experimental +%tmpfiles_create systemd-pstore.conf +%service_add_post systemd-pstore.service +%service_add_post systemd-userdbd.service systemd-userdbd.socket +%service_add_post systemd-homed.service + +%preun experimental +%service_del_preun systemd-pstore.service +%service_del_preun systemd-userdbd.service systemd-userdbd.socket +%service_del_preun systemd-homed.service + +%postun experimental +%service_del_postun systemd-pstore.service +%service_del_postun systemd-userdbd.service systemd-userdbd.socket +%service_del_postun systemd-homed.service +%endif + %clean %files @@ -1144,6 +1194,22 @@ fi %exclude %{_unitdir}/dbus-org.freedesktop.portable1.service %exclude %{_tmpfilesdir}/portables.conf %endif +%if %{with experimental} +%exclude %{_prefix}/lib/systemd/systemd-pstore +%exclude %{_unitdir}/systemd-pstore.service +%exclude %{_tmpfilesdir}/systemd-pstore.conf +%exclude %{_unitdir}/systemd-repart.service +%exclude %{_unitdir}/initrd-root-fs.target.wants/systemd-repart.service +%exclude %{_unitdir}/sysinit.target.wants/systemd-repart.service +%exclude %{_prefix}/lib/systemd/systemd-userwork +%exclude %{_prefix}/lib/systemd/systemd-userdbd +%exclude %{_unitdir}/systemd-userdbd.service +%exclude %{_unitdir}/systemd-userdbd.socket +%exclude %{_prefix}/lib/systemd/systemd-homed +%exclude %{_prefix}/lib/systemd/systemd-homework +%exclude %{_unitdir}/systemd-homed-activate.service +%exclude %{_unitdir}/systemd-homed.service +%endif %{_unitdir}/*.automount %{_unitdir}/*.service @@ -1306,6 +1372,17 @@ fi %exclude %{_mandir}/man*/portablectl* %exclude %{_mandir}/man*/systemd-portabled* %endif +%if %{with experimental} +%exclude %{_mandir}/man*/*pstore* +%exclude %{_mandir}/man*/*repart* +%exclude %{_mandir}/man*/userdbctl* +%exclude %{_mandir}/man*/systemd-userdbd* +%exclude %{_mandir}/man*/*homectl* +%exclude %{_mandir}/man*/*homed* +%exclude %{_mandir}/man*/org.freedesktop.home1* +%exclude %{_mandir}/man*/pam_systemd_home* +%exclude %{_datadir}/bash-completion/completions/homectl +%endif %endif %{_docdir}/systemd @@ -1612,4 +1689,38 @@ fi %{_mandir}/man*/systemd-portabled* %endif +%if %{with experimental} +%files experimental +%defattr(-,root,root) +%config(noreplace) /etc/systemd/pstore.conf +%{_prefix}/lib/systemd/systemd-pstore +%{_unitdir}/systemd-pstore.service +%{_tmpfilesdir}/systemd-pstore.conf +%{_mandir}/man*/*pstore* +%{_bindir}/systemd-repart +%{_unitdir}/systemd-repart.service +%{_mandir}/man*/*repart* +/usr/bin/userdbctl +%{_prefix}/lib/systemd/systemd-userwork +%{_prefix}/lib/systemd/systemd-userdbd +%{_unitdir}/systemd-userdbd.service +%{_unitdir}/systemd-userdbd.socket +%{_mandir}/man*/userdbctl* +%{_mandir}/man*/systemd-userdbd* +%config %{_sysconfdir}/homed.conf +%{_bindir}/homectl +%{_prefix}/lib/systemd/systemd-homed +%{_prefix}/lib/systemd/systemd-homework +%{_unitdir}/systemd-homed.service +%{_pamdir}/pam_systemd_home.so +%{_datadir}/dbus-1/system-services/org.freedesktop.home1.service +%{_datadir}/dbus-1/system.d/org.freedesktop.home1.conf +%{_datadir}/polkit-1/actions/org.freedesktop.home1.policy +%{_datadir}/bash-completion/completions/homectl +%{_mandir}/man*/*homectl* +%{_mandir}/man*/*homed* +%{_mandir}/man*/org.freedesktop.home1* +%{_mandir}/man*/pam_systemd_home* +%endif + %changelog