- Work around rpmlint complaining about /var/log/journal shipped with setgid bit

This setgid bit has been already reviewed in the past and wasn't a
  concern. However we want the mode/ownership adjusted by tmpfiles and
  avoid the duplication of these info in rpm.
- Don't ghost own any directories created dynamically by tmpfiles
  Again rpmlint complains but it doesn't seem to make sense to try to
  track all paths (including theirs perms, ownerships...) created
  dynamically. And 'rpm -V' is likely to report issues later with
  these paths anyway.
  This effectively partially reverts the two previous commits.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1194
This commit is contained in:
Franck Bui 2021-09-29 14:09:21 +00:00 committed by Git OBS Bridge
parent 1a17ea0a22
commit feb2ae5fb2
6 changed files with 38 additions and 30 deletions

View File

@ -8,3 +8,4 @@ addFilter("env-script-interpreter")
addFilter(".*files-duplicate /usr/lib/systemd/.*") addFilter(".*files-duplicate /usr/lib/systemd/.*")
addFilter(".*files-duplicated-waste.*") addFilter(".*files-duplicated-waste.*")
addFilter(".*explicit-lib-dependency .*") addFilter(".*explicit-lib-dependency .*")
addFilter(".*tmpfile-not-in-filelist .*")

View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Wed Sep 29 10:04:38 UTC 2021 - Franck Bui <fbui@suse.com>
- Work around rpmlint complaining about /var/log/journal shipped with setgid bit
This setgid bit has been already reviewed in the past and wasn't a
concern. However we want the mode/ownership adjusted by tmpfiles and
avoid the duplication of these info in rpm.
- Don't ghost own any directories created dynamically by tmpfiles
Again rpmlint complains but it doesn't seem to make sense to try to
track all paths (including theirs perms, ownerships...) created
dynamically. And 'rpm -V' is likely to report issues later with
these paths anyway.
This effectively partially reverts the two previous commits.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 24 12:56:31 UTC 2021 - Franck Bui <fbui@suse.com> Fri Sep 24 12:56:31 UTC 2021 - Franck Bui <fbui@suse.com>

View File

@ -1365,8 +1365,6 @@ fi
%{_pam_moduledir}/pam_systemd.so %{_pam_moduledir}/pam_systemd.so
%ghost %dir %attr(2755, root, systemd-journal) %{_localstatedir}/log/journal/
%if %{with gnuefi} %if %{with gnuefi}
%dir %{_prefix}/lib/systemd/boot %dir %{_prefix}/lib/systemd/boot
%dir %{_prefix}/lib/systemd/boot/efi %dir %{_prefix}/lib/systemd/boot/efi
@ -1435,14 +1433,6 @@ fi
%{_modprobedir}/systemd.conf %{_modprobedir}/systemd.conf
# Some files created at runtime. # Some files created at runtime.
%ghost %{_rundir}/log
%ghost %{_rundir}/systemd
%ghost %{_rundir}/systemd/ask-password
%ghost %{_rundir}/systemd/seats
%ghost %{_rundir}/systemd/sessions
%ghost %{_rundir}/systemd/users
%ghost %{_rundir}/systemd/machines
%ghost %{_rundir}/systemd/shutdown
%ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf
%ghost %config(noreplace) %{_sysconfdir}/vconsole.conf %ghost %config(noreplace) %{_sysconfdir}/vconsole.conf
%ghost %config(noreplace) %{_sysconfdir}/locale.conf %ghost %config(noreplace) %{_sysconfdir}/locale.conf
@ -1774,7 +1764,6 @@ fi
%{_mandir}/man8/systemd-journal-remote.* %{_mandir}/man8/systemd-journal-remote.*
%{_mandir}/man8/systemd-journal-upload.* %{_mandir}/man8/systemd-journal-upload.*
%{_datadir}/systemd/gatewayd %{_datadir}/systemd/gatewayd
%ghost %dir %{_localstatedir}/log/journal/remote
%endif %endif
%if %{with networkd} || %{with resolved} %if %{with networkd} || %{with resolved}
@ -1797,10 +1786,6 @@ fi
%{_unitdir}/systemd-networkd.socket %{_unitdir}/systemd-networkd.socket
%{_unitdir}/systemd-networkd-wait-online.service %{_unitdir}/systemd-networkd-wait-online.service
# Some files created at runtime # Some files created at runtime
%ghost %{_rundir}/systemd/netif
%ghost %{_rundir}/systemd/netif/links
%ghost %{_rundir}/systemd/netif/leases
%ghost %{_rundir}/systemd/netif/lldp
%endif %endif
%if %{with resolved} %if %{with resolved}
%{_bindir}/resolvectl %{_bindir}/resolvectl

View File

@ -8,3 +8,4 @@ addFilter("env-script-interpreter")
addFilter(".*files-duplicate /usr/lib/systemd/.*") addFilter(".*files-duplicate /usr/lib/systemd/.*")
addFilter(".*files-duplicated-waste.*") addFilter(".*files-duplicated-waste.*")
addFilter(".*explicit-lib-dependency .*") addFilter(".*explicit-lib-dependency .*")
addFilter(".*tmpfile-not-in-filelist .*")

View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Wed Sep 29 10:04:38 UTC 2021 - Franck Bui <fbui@suse.com>
- Work around rpmlint complaining about /var/log/journal shipped with setgid bit
This setgid bit has been already reviewed in the past and wasn't a
concern. However we want the mode/ownership adjusted by tmpfiles and
avoid the duplication of these info in rpm.
- Don't ghost own any directories created dynamically by tmpfiles
Again rpmlint complains but it doesn't seem to make sense to try to
track all paths (including theirs perms, ownerships...) created
dynamically. And 'rpm -V' is likely to report issues later with
these paths anyway.
This effectively partially reverts the two previous commits.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 24 12:56:31 UTC 2021 - Franck Bui <fbui@suse.com> Fri Sep 24 12:56:31 UTC 2021 - Franck Bui <fbui@suse.com>

View File

@ -1363,8 +1363,6 @@ fi
%{_pam_moduledir}/pam_systemd.so %{_pam_moduledir}/pam_systemd.so
%ghost %dir %attr(2755, root, systemd-journal) %{_localstatedir}/log/journal/
%if %{with gnuefi} %if %{with gnuefi}
%dir %{_prefix}/lib/systemd/boot %dir %{_prefix}/lib/systemd/boot
%dir %{_prefix}/lib/systemd/boot/efi %dir %{_prefix}/lib/systemd/boot/efi
@ -1433,14 +1431,6 @@ fi
%{_modprobedir}/systemd.conf %{_modprobedir}/systemd.conf
# Some files created at runtime. # Some files created at runtime.
%ghost %{_rundir}/log
%ghost %{_rundir}/systemd
%ghost %{_rundir}/systemd/ask-password
%ghost %{_rundir}/systemd/seats
%ghost %{_rundir}/systemd/sessions
%ghost %{_rundir}/systemd/users
%ghost %{_rundir}/systemd/machines
%ghost %{_rundir}/systemd/shutdown
%ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf
%ghost %config(noreplace) %{_sysconfdir}/vconsole.conf %ghost %config(noreplace) %{_sysconfdir}/vconsole.conf
%ghost %config(noreplace) %{_sysconfdir}/locale.conf %ghost %config(noreplace) %{_sysconfdir}/locale.conf
@ -1772,7 +1762,6 @@ fi
%{_mandir}/man8/systemd-journal-remote.* %{_mandir}/man8/systemd-journal-remote.*
%{_mandir}/man8/systemd-journal-upload.* %{_mandir}/man8/systemd-journal-upload.*
%{_datadir}/systemd/gatewayd %{_datadir}/systemd/gatewayd
%ghost %dir %{_localstatedir}/log/journal/remote
%endif %endif
%if %{with networkd} || %{with resolved} %if %{with networkd} || %{with resolved}
@ -1795,10 +1784,6 @@ fi
%{_unitdir}/systemd-networkd.socket %{_unitdir}/systemd-networkd.socket
%{_unitdir}/systemd-networkd-wait-online.service %{_unitdir}/systemd-networkd-wait-online.service
# Some files created at runtime # Some files created at runtime
%ghost %{_rundir}/systemd/netif
%ghost %{_rundir}/systemd/netif/links
%ghost %{_rundir}/systemd/netif/leases
%ghost %{_rundir}/systemd/netif/lldp
%endif %endif
%if %{with resolved} %if %{with resolved}
%{_bindir}/resolvectl %{_bindir}/resolvectl