Accepting request 869763 from Base:System
OBS-URL: https://build.opensuse.org/request/show/869763 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=324
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
parent
9ab73ef591
commit
488849158e
@ -1,3 +1,34 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 5 13:02:58 UTC 2021 - Franck Bui <fbui@suse.com>
|
||||
|
||||
- systemd-sysv-convert: handle the case when services are migrated
|
||||
from SysV scripts to systemd units and are renamed at the same
|
||||
time (bsc#1181788)
|
||||
|
||||
The list of such services is hard coded and contains only the
|
||||
'ntp->ntpd' translation.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 3 09:57:58 UTC 2021 - Franck Bui <fbui@suse.com>
|
||||
|
||||
- Import commit 134cf1c8bc3e361a2641161aa11ac2b5b990480b (merge of v246.10)
|
||||
|
||||
25f220eafb sysusers: flush nscd's caches whenever /etc/{passwd,group} are modified (bsc#1181121)
|
||||
4a543f0257 journal: send journald logs to kmsg again
|
||||
26df96473f busctl: add a timestamp to the output of the busctl monitor command (bsc#1180225)
|
||||
|
||||
For a complete list of changes, visit:
|
||||
https://github.com/openSUSE/systemd/compare/520e53b6d85087b05892ee637ae93f1b269e7e52...134cf1c8bc3e361a2641161aa11ac2b5b990480b
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 13 10:37:16 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
|
||||
|
||||
- prepare usrmerge (boo#1029961)
|
||||
* don't install legacy symlinks to /
|
||||
* use %_pamdir to install pam modules
|
||||
* leave nss files in /usr/lib*, glibc loads them from there just
|
||||
fine independent of usrmerge
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 18 08:54:20 UTC 2020 - Franck Bui <fbui@suse.com>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package systemd-mini
|
||||
#
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -26,7 +26,7 @@
|
||||
##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! #####
|
||||
%define mini -mini
|
||||
%define min_kernel_version 4.5
|
||||
%define suse_version +suse.78.g520e53b6d8
|
||||
%define suse_version +suse.83.g134cf1c8bc
|
||||
|
||||
%bcond_with gnuefi
|
||||
%if 0%{?bootstrap}
|
||||
@ -55,7 +55,7 @@
|
||||
|
||||
Name: systemd-mini
|
||||
URL: http://www.freedesktop.org/wiki/Software/systemd
|
||||
Version: 246.9
|
||||
Version: 246.10
|
||||
Release: 0
|
||||
Summary: A System and Session Manager
|
||||
License: LGPL-2.1-or-later
|
||||
@ -511,7 +511,7 @@ systemd-journal-remote, and systemd-journal-upload.
|
||||
-Dsplit-bin=true \
|
||||
-Dsystem-uid-max=499 \
|
||||
-Dsystem-gid-max=499 \
|
||||
-Dpamlibdir=/%{_lib}/security \
|
||||
-Dpamlibdir=%{_pamdir} \
|
||||
-Drpmmacrosdir=no \
|
||||
-Dcertificate-root=%{_sysconfdir}/pki/systemd \
|
||||
-Ddefault-hierarchy=hybrid \
|
||||
@ -577,10 +577,7 @@ systemd-journal-remote, and systemd-journal-upload.
|
||||
%install
|
||||
%meson_install
|
||||
|
||||
# move to %{_lib}
|
||||
%if ! 0%{?bootstrap}
|
||||
mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib}
|
||||
%else
|
||||
%if 0%{?bootstrap}
|
||||
rm %{buildroot}%{_libdir}/libnss_systemd.so*
|
||||
rm -r %{buildroot}%{_datadir}/locale
|
||||
%endif
|
||||
@ -611,6 +608,7 @@ for s in %{S:100} %{S:101} %{S:102}; do
|
||||
install -m0755 -D $s %{buildroot}%{_prefix}/lib/systemd/scripts/${s#*/scripts-systemd-}
|
||||
done
|
||||
|
||||
%if !0%{?usrmerged}
|
||||
# Legacy sysvinit tools
|
||||
mkdir -p %{buildroot}/sbin
|
||||
ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init
|
||||
@ -622,6 +620,7 @@ ln -s ../usr/bin/systemctl %{buildroot}/sbin/poweroff
|
||||
ln -s ../usr/bin/systemctl %{buildroot}/sbin/telinit
|
||||
ln -s ../usr/bin/systemctl %{buildroot}/sbin/runlevel
|
||||
%endif
|
||||
%endif
|
||||
|
||||
# Make sure we don't ship static enablement symlinks in /etc during
|
||||
# installation, presets should be honoured instead.
|
||||
@ -1171,7 +1170,7 @@ fi
|
||||
%dir %{_prefix}/lib/systemd/system-shutdown/
|
||||
%dir %{_prefix}/lib/systemd/system-sleep/
|
||||
|
||||
/%{_lib}/security/pam_systemd.so
|
||||
%{_pamdir}/pam_systemd.so
|
||||
|
||||
%if %{with gnuefi}
|
||||
%dir %{_prefix}/lib/systemd/boot
|
||||
@ -1350,6 +1349,7 @@ fi
|
||||
|
||||
%files sysvinit
|
||||
%defattr(-,root,root,-)
|
||||
%if !0%{?usrmerged}
|
||||
/sbin/init
|
||||
/sbin/reboot
|
||||
/sbin/halt
|
||||
@ -1359,6 +1359,7 @@ fi
|
||||
/sbin/telinit
|
||||
/sbin/runlevel
|
||||
%endif
|
||||
%endif
|
||||
%{_sbindir}/init
|
||||
%{_sbindir}/reboot
|
||||
%{_sbindir}/halt
|
||||
@ -1508,7 +1509,7 @@ fi
|
||||
|
||||
%files -n nss-myhostname
|
||||
%defattr(-, root, root)
|
||||
/%{_lib}/*nss_myhostname*
|
||||
%{_libdir}/*nss_myhostname*
|
||||
%{_mandir}/man8/libnss_myhostname.*
|
||||
%{_mandir}/man8/nss-myhostname.*
|
||||
|
||||
|
||||
@ -79,6 +79,14 @@ case "$1" in
|
||||
# in the db only once.
|
||||
database_add $initscript -1
|
||||
|
||||
# Some services were renamed during the transition from SySV init to
|
||||
# systemd (bsc#1181788). Rather than letting packages fixing that
|
||||
# themselves by hacking our database directly, let's hard-code renames
|
||||
# here. Not really nice but that's the least worst solution.
|
||||
case $initscript in
|
||||
ntpd) initscript=ntp ;;
|
||||
esac
|
||||
|
||||
# The package is introducing new services and never has any sysv init
|
||||
# scripts (bsc#982303).
|
||||
if [ ! -r /etc/init.d/$initscript ] &&
|
||||
|
||||
3
systemd-v246.10+suse.83.g134cf1c8bc.tar.xz
Normal file
3
systemd-v246.10+suse.83.g134cf1c8bc.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0c1fd0a518b62d8f9db6eed77a4ba465e23663e9ac6cc9278b44bca596fd23d6
|
||||
size 6572124
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:988d1da9b2cdd0856c7036b120c037789f2ed6d5171911ff654cd8bcf72cf07a
|
||||
size 6569608
|
||||
@ -1,3 +1,34 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 5 13:02:58 UTC 2021 - Franck Bui <fbui@suse.com>
|
||||
|
||||
- systemd-sysv-convert: handle the case when services are migrated
|
||||
from SysV scripts to systemd units and are renamed at the same
|
||||
time (bsc#1181788)
|
||||
|
||||
The list of such services is hard coded and contains only the
|
||||
'ntp->ntpd' translation.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 3 09:57:58 UTC 2021 - Franck Bui <fbui@suse.com>
|
||||
|
||||
- Import commit 134cf1c8bc3e361a2641161aa11ac2b5b990480b (merge of v246.10)
|
||||
|
||||
25f220eafb sysusers: flush nscd's caches whenever /etc/{passwd,group} are modified (bsc#1181121)
|
||||
4a543f0257 journal: send journald logs to kmsg again
|
||||
26df96473f busctl: add a timestamp to the output of the busctl monitor command (bsc#1180225)
|
||||
|
||||
For a complete list of changes, visit:
|
||||
https://github.com/openSUSE/systemd/compare/520e53b6d85087b05892ee637ae93f1b269e7e52...134cf1c8bc3e361a2641161aa11ac2b5b990480b
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 13 10:37:16 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
|
||||
|
||||
- prepare usrmerge (boo#1029961)
|
||||
* don't install legacy symlinks to /
|
||||
* use %_pamdir to install pam modules
|
||||
* leave nss files in /usr/lib*, glibc loads them from there just
|
||||
fine independent of usrmerge
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 18 08:54:20 UTC 2020 - Franck Bui <fbui@suse.com>
|
||||
|
||||
|
||||
21
systemd.spec
21
systemd.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package systemd
|
||||
#
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -24,7 +24,7 @@
|
||||
%define bootstrap 0
|
||||
%define mini %nil
|
||||
%define min_kernel_version 4.5
|
||||
%define suse_version +suse.78.g520e53b6d8
|
||||
%define suse_version +suse.83.g134cf1c8bc
|
||||
|
||||
%bcond_with gnuefi
|
||||
%if 0%{?bootstrap}
|
||||
@ -53,7 +53,7 @@
|
||||
|
||||
Name: systemd
|
||||
URL: http://www.freedesktop.org/wiki/Software/systemd
|
||||
Version: 246.9
|
||||
Version: 246.10
|
||||
Release: 0
|
||||
Summary: A System and Session Manager
|
||||
License: LGPL-2.1-or-later
|
||||
@ -509,7 +509,7 @@ systemd-journal-remote, and systemd-journal-upload.
|
||||
-Dsplit-bin=true \
|
||||
-Dsystem-uid-max=499 \
|
||||
-Dsystem-gid-max=499 \
|
||||
-Dpamlibdir=/%{_lib}/security \
|
||||
-Dpamlibdir=%{_pamdir} \
|
||||
-Drpmmacrosdir=no \
|
||||
-Dcertificate-root=%{_sysconfdir}/pki/systemd \
|
||||
-Ddefault-hierarchy=hybrid \
|
||||
@ -575,10 +575,7 @@ systemd-journal-remote, and systemd-journal-upload.
|
||||
%install
|
||||
%meson_install
|
||||
|
||||
# move to %{_lib}
|
||||
%if ! 0%{?bootstrap}
|
||||
mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib}
|
||||
%else
|
||||
%if 0%{?bootstrap}
|
||||
rm %{buildroot}%{_libdir}/libnss_systemd.so*
|
||||
rm -r %{buildroot}%{_datadir}/locale
|
||||
%endif
|
||||
@ -609,6 +606,7 @@ for s in %{S:100} %{S:101} %{S:102}; do
|
||||
install -m0755 -D $s %{buildroot}%{_prefix}/lib/systemd/scripts/${s#*/scripts-systemd-}
|
||||
done
|
||||
|
||||
%if !0%{?usrmerged}
|
||||
# Legacy sysvinit tools
|
||||
mkdir -p %{buildroot}/sbin
|
||||
ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init
|
||||
@ -620,6 +618,7 @@ ln -s ../usr/bin/systemctl %{buildroot}/sbin/poweroff
|
||||
ln -s ../usr/bin/systemctl %{buildroot}/sbin/telinit
|
||||
ln -s ../usr/bin/systemctl %{buildroot}/sbin/runlevel
|
||||
%endif
|
||||
%endif
|
||||
|
||||
# Make sure we don't ship static enablement symlinks in /etc during
|
||||
# installation, presets should be honoured instead.
|
||||
@ -1169,7 +1168,7 @@ fi
|
||||
%dir %{_prefix}/lib/systemd/system-shutdown/
|
||||
%dir %{_prefix}/lib/systemd/system-sleep/
|
||||
|
||||
/%{_lib}/security/pam_systemd.so
|
||||
%{_pamdir}/pam_systemd.so
|
||||
|
||||
%if %{with gnuefi}
|
||||
%dir %{_prefix}/lib/systemd/boot
|
||||
@ -1348,6 +1347,7 @@ fi
|
||||
|
||||
%files sysvinit
|
||||
%defattr(-,root,root,-)
|
||||
%if !0%{?usrmerged}
|
||||
/sbin/init
|
||||
/sbin/reboot
|
||||
/sbin/halt
|
||||
@ -1357,6 +1357,7 @@ fi
|
||||
/sbin/telinit
|
||||
/sbin/runlevel
|
||||
%endif
|
||||
%endif
|
||||
%{_sbindir}/init
|
||||
%{_sbindir}/reboot
|
||||
%{_sbindir}/halt
|
||||
@ -1506,7 +1507,7 @@ fi
|
||||
|
||||
%files -n nss-myhostname
|
||||
%defattr(-, root, root)
|
||||
/%{_lib}/*nss_myhostname*
|
||||
%{_libdir}/*nss_myhostname*
|
||||
%{_mandir}/man8/libnss_myhostname.*
|
||||
%{_mandir}/man8/nss-myhostname.*
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user