Compare commits
12 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 863a9bedc8 | |||
| d7e651dba7 | |||
| 494146edf6 | |||
| 0932ff4928 | |||
| 990fe59683 | |||
| 4b431cce2a | |||
| 2e75f6a38d | |||
| c5f2789941 | |||
| ac8e83fd2e | |||
| 2d6d1534a5 | |||
| 52dbe5c5e5 | |||
| f4ea1d112c |
@@ -1,3 +1,36 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 15 07:39:03 UTC 2026 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
- Avoid restarting klog.service and klogd.service in postun as
|
||||
both services should be started once (boo#1243035#c14)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 9 11:02:05 UTC 2026 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
- Do not masked out the already existing %ghost file entry
|
||||
(Accordingly to Packaging for Immutable Mode - Best Practices)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 18 08:04:54 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Install tmpfile correctly as syslogd.conf (instead of
|
||||
sendmail.conf),
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 17 14:39:05 UTC 2025 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
- Fix tmpfile handling for transactional updates (jsc#PED-14864)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 17 13:55:32 UTC 2025 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
- Drop last sysvinit Requirement/Provide (PED-13698)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat May 3 10:14:22 UTC 2025 - Friedrich Haubensak <hsk17@mail.de>
|
||||
|
||||
- Add -std=gnu89 to compile flags to fix gcc-15 errors
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 26 13:28:29 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
|
||||
42
syslogd.spec
42
syslogd.spec
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package syslogd
|
||||
#
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
# Copyright (c) 2026 SUSE LLC and contributors
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -21,9 +21,6 @@
|
||||
%define _fillupdir /var/adm/fillup-templates
|
||||
%endif
|
||||
|
||||
%if ! %{defined _rundir}
|
||||
%define _rundir %{_localstatedir}/run
|
||||
%endif
|
||||
Name: syslogd
|
||||
Version: 1.5.1
|
||||
Release: 0
|
||||
@@ -41,6 +38,7 @@ Source6: klog.service
|
||||
Source7: klogd.service
|
||||
Source8: syslogd.service
|
||||
Source9: syslogd-service-prepare
|
||||
Source10: syslogd.tmpfiles
|
||||
Source11: syslogd-rpmlintrc
|
||||
Source12: sysconfig.boot
|
||||
Patch0: sysklogd-1.4.1.dif
|
||||
@@ -70,6 +68,7 @@ BuildRequires: pkgconfig
|
||||
BuildRequires: group(news)
|
||||
BuildRequires: pkgconfig(libsystemd)
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
BuildRequires: rpm_macro(_tmpfilesdir)
|
||||
BuildRequires: user(news)
|
||||
Requires: klogd
|
||||
Requires(post): %fillup_prereq
|
||||
@@ -82,8 +81,6 @@ Requires(pre): group(news)
|
||||
Conflicts: syslog
|
||||
Provides: sysklogd
|
||||
Provides: syslog
|
||||
Provides: sysvinit(syslog)
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%{?systemd_requires}
|
||||
|
||||
%description
|
||||
@@ -112,7 +109,6 @@ Summary: Syslog service files & scripts
|
||||
Group: System/Daemons
|
||||
Requires: logrotate
|
||||
Requires: syslog
|
||||
Requires: sysvinit(network)
|
||||
Requires(post): %fillup_prereq
|
||||
BuildArch: noarch
|
||||
|
||||
@@ -146,6 +142,8 @@ scripts for SysV and the service unit files for systemd.
|
||||
%patch -P 0 -b .p0
|
||||
|
||||
%build
|
||||
# mis-use RPM_OPT_FLAGS here as others are not properly propagated
|
||||
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -std=gnu89"
|
||||
%ifarch s390 s390x
|
||||
mv sample-s390.conf sample.conf
|
||||
%endif
|
||||
@@ -159,7 +157,7 @@ mkdir -p %{buildroot}/%{_sbindir}
|
||||
mkdir -p %{buildroot}/%{_mandir}/man{5,8}
|
||||
mkdir -p %{buildroot}%{_fillupdir}
|
||||
mkdir -p %{buildroot}%{_unitdir}
|
||||
mkdir -p -m 0755 %{buildroot}/%{_rundir}/syslogd
|
||||
#mkdir -p -m 0755 %%{buildroot}/run/syslogd
|
||||
make install MANDIR=%{_mandir} BINDIR=%{_sbindir} DESTDIR=%{buildroot}
|
||||
%if 0%{?suse_version} > 1500
|
||||
mkdir -p %{buildroot}%{_distconfdir}/logrotate.d
|
||||
@@ -187,6 +185,9 @@ sed -i 's/^KERNEL_LOGLEVEL=1/KERNEL_LOGLEVEL=7/' \
|
||||
%{buildroot}%{_fillupdir}/sysconfig.klogd
|
||||
%endif
|
||||
|
||||
mkdir -p %{buildroot}%{_tmpfilesdir}
|
||||
install -m 0644 %{S:10} %{buildroot}%{_tmpfilesdir}/syslogd.conf
|
||||
|
||||
%if %{defined verify_permissions}
|
||||
%verifyscript
|
||||
%verify_permissions -e %{_sysconfdir}/syslog.conf
|
||||
@@ -196,31 +197,13 @@ sed -i 's/^KERNEL_LOGLEVEL=1/KERNEL_LOGLEVEL=7/' \
|
||||
%service_add_pre syslogd.service
|
||||
|
||||
%post
|
||||
%tmpfiles_create %{_tmpfilesdir}/syslog.conf
|
||||
%set_permissions %{_sysconfdir}/syslog.conf
|
||||
#
|
||||
# add syslog variables provided by syslogd if needed
|
||||
#
|
||||
%{remove_and_set -n syslog SYSLOG_DAEMON}
|
||||
%{remove_and_set -n syslog SYSLOG_REQUIRES_NETWORK}
|
||||
%{fillup_only -ns syslog syslogd}
|
||||
#
|
||||
# create dirs, touch log default files
|
||||
#
|
||||
mkdir -p var/log
|
||||
touch var/log/messages; chmod 640 var/log/messages
|
||||
touch var/log/mail; chmod 640 var/log/mail
|
||||
touch var/log/mail.info; chmod 640 var/log/mail.info
|
||||
touch var/log/mail.warn; chmod 640 var/log/mail.warn
|
||||
touch var/log/mail.err; chmod 640 var/log/mail.err
|
||||
test -f var/log/news && mv var/log/news var/log/news.bak
|
||||
mkdir -p -m 0750 var/log/news
|
||||
chown news:news var/log/news
|
||||
touch var/log/news/news.crit; chmod 640 var/log/news/news.crit
|
||||
chown news:news var/log/news/news.crit
|
||||
touch var/log/news/news.err; chmod 640 var/log/news/news.err
|
||||
chown news:news var/log/news/news.err
|
||||
touch var/log/news/news.notice; chmod 640 var/log/news/news.notice
|
||||
chown news:news var/log/news/news.notice
|
||||
#
|
||||
# Enable the syslogd as service
|
||||
#
|
||||
@@ -345,7 +328,7 @@ done
|
||||
%endif
|
||||
|
||||
%postun -n syslog-service
|
||||
%service_del_postun klog.service
|
||||
%service_del_postun_without_restart klog.service
|
||||
|
||||
%pre -n klogd
|
||||
%service_add_pre klogd.service
|
||||
@@ -366,12 +349,13 @@ done
|
||||
%service_del_preun klogd.service
|
||||
|
||||
%postun -n klogd
|
||||
%service_del_postun klogd.service
|
||||
%service_del_postun_without_restart klogd.service
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%{_fillupdir}/sysconfig.syslogd
|
||||
%config %verify(not mode) %attr(0600,root,root) %{_sysconfdir}/syslog.conf
|
||||
%{_tmpfilesdir}/syslogd.conf
|
||||
%{_mandir}/man5/syslog.conf.5%{ext_man}
|
||||
%{_mandir}/man8/syslogd.8%{ext_man}
|
||||
%{_mandir}/man8/sysklogd.8%{ext_man}
|
||||
|
||||
10
syslogd.tmpfiles
Normal file
10
syslogd.tmpfiles
Normal file
@@ -0,0 +1,10 @@
|
||||
d /run/syslogd 0750 root root -
|
||||
f /var/log/messages 0640 root root -
|
||||
f /var/log/mail 0640 root root -
|
||||
f /var/log/mail.info 0640 root root -
|
||||
f /var/log/mail.warn 0640 root root -
|
||||
f /var/log/mail.err 0640 root root -
|
||||
d /var/log/news 0750 news news -
|
||||
f /var/log/news/news.crit 0640 news news -
|
||||
f /var/log/news/news.err 0640 news news -
|
||||
f /var/log/news/news.notice 0640 news news -
|
||||
Reference in New Issue
Block a user