Accepting request 404993 from home:scarabeus_iv:branches:Base:System
- Cleanup various rpmlint warnings - Use upstream url and sources - Remove the omv files, not needed OBS-URL: https://build.opensuse.org/request/show/404993 OBS-URL: https://build.opensuse.org/package/show/Base:System/syslogd?expand=0&rev=133
This commit is contained in:
Git OBS Bridge
parent
182cd5b113
commit
1ba1f4d43a
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e62600f2c93b9da14ef7c27c7cf1b8a546284295904e2554388bb6af836cfb50
|
||||
size 68572
|
||||
3
sysklogd-1.4.1.tar.gz
Normal file
3
sysklogd-1.4.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:44357e0fae8c8f0e315bf130b4e86a4f96b91d66eeb4e473def4ce8336fff102
|
||||
size 81784
|
||||
98
syslog.xml
98
syslog.xml
@ -1,98 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<!--
|
||||
Copyright (c) 2006 Novell, Inc. All rights reserved.
|
||||
|
||||
|
||||
Service Description XML Document for syslog.
|
||||
|
||||
This file should be placed in /etc/omc/svcinfo.d
|
||||
|
||||
Note: The name of the service is the name of this file without the .xml
|
||||
file extension.
|
||||
-->
|
||||
|
||||
<serviceDescription version="1.0">
|
||||
|
||||
<!-- Caption for display purposes -->
|
||||
<caption>Syslog Serivce</caption>
|
||||
|
||||
<!-- Description of this service -->
|
||||
<description>
|
||||
Syslog daemon Service
|
||||
</description>
|
||||
|
||||
|
||||
<!--
|
||||
The startCommand tag specifies the command line that will be
|
||||
invoked to start the service. The return code from this command
|
||||
must be as follows:
|
||||
0 - success
|
||||
1 - generic or unspecified error
|
||||
2 - invalid or excess argument(s)
|
||||
3 - unimplemented feature (e.g. "reload")
|
||||
4 - user had insufficient privileges
|
||||
5 - program is not installed
|
||||
6 - program is not configured
|
||||
7 - program is not running
|
||||
-->
|
||||
<startCommand>/usr/bin/systemctl start syslog.service</startCommand>
|
||||
|
||||
<!--
|
||||
The reStartCommand tag specifies the command line that will be
|
||||
invoked to restart the service. The return code from this command
|
||||
must be as specified in the startCommand tag.
|
||||
-->
|
||||
<reStartCommand>/usr/bin/systemctl restart syslog.servic</reStartCommand>
|
||||
|
||||
<!--
|
||||
The stopCommand tag specifies the command line that will be
|
||||
invoked to stop the service. The return code from this command
|
||||
must be as specified in the startCommand tag.
|
||||
-->
|
||||
<stopCommand>/usr/bin/systemctl stop syslog.service</stopCommand>
|
||||
|
||||
<!--
|
||||
The statusCommand specifies the command line that can be run
|
||||
that will report on the status of the service. The return code
|
||||
from this command line should be as follows:
|
||||
0 - service up and running
|
||||
1 - service dead, but /var/run/ pid file exists
|
||||
2 - service dead, but /var/lock/ lock file exists
|
||||
3 - service not running (unused)
|
||||
4 - service status unknown :-(
|
||||
-->
|
||||
<statusCommand>/usr/bin/systemctl status syslog.service</statusCommand>
|
||||
<!--
|
||||
The processInformation tag allows the XML Service provider to
|
||||
identify the processes that belong to the service. This allows
|
||||
the ServiceProcess associations to be instrumented.
|
||||
If the process_information tag is not specifed, the will be no
|
||||
ServiceProcess association for the service.
|
||||
-->
|
||||
|
||||
<processInformation>
|
||||
<name>syslog-ng</name>
|
||||
<modulePath>/usr/sbin/syslog-ng</modulePath>
|
||||
</processInformation>
|
||||
|
||||
<processInformation>
|
||||
<name>rsyslogd</name>
|
||||
<modulePath>/usr/sbin/rsyslogd</modulePath>
|
||||
</processInformation>
|
||||
|
||||
<processInformation>
|
||||
<name>syslogd</name>
|
||||
<modulePath>/usr/sbin/syslogd</modulePath>
|
||||
</processInformation>
|
||||
|
||||
<!--
|
||||
Define the services that this service has a dependency on.
|
||||
There must be a corresponding Service Description XML file
|
||||
for the antecedent service in the /etc/omc/svcinfo.d directory.
|
||||
-->
|
||||
<dependsOn>
|
||||
<serviceName>network</serviceName>
|
||||
</dependsOn>
|
||||
|
||||
|
||||
</serviceDescription>
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 27 12:22:47 UTC 2016 - tchvatal@suse.com
|
||||
|
||||
- Cleanup various rpmlint warnings
|
||||
- Use upstream url and sources
|
||||
- Remove the omv files, not needed
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 25 14:22:13 UTC 2016 - schwab@suse.de
|
||||
|
||||
|
||||
230
syslogd.spec
230
syslogd.spec
@ -16,38 +16,20 @@
|
||||
#
|
||||
|
||||
|
||||
Name: syslogd
|
||||
%define omc_prefix /usr/share/omc
|
||||
%define omc_svcdir %{omc_prefix}/svcinfo.d
|
||||
%if ! %{defined _rundir}
|
||||
%define _rundir %{_localstatedir}/run
|
||||
%endif
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
%{?systemd_requires}
|
||||
%define sysdsysunitdir %{_unitdir}
|
||||
Requires(post): %fillup_prereq
|
||||
Requires(post): permissions
|
||||
Requires(pre): coreutils
|
||||
Requires(pre): klogd
|
||||
Requires(pre): sed
|
||||
# Note: this package is for >= 12.3 only
|
||||
# and does not provide LSB init scripts!
|
||||
Requires(pre): syslog-service >= 2.0
|
||||
Provides: sysklogd
|
||||
Provides: syslog
|
||||
Provides: sysvinit(syslog)
|
||||
Conflicts: otherproviders(syslog)
|
||||
Name: syslogd
|
||||
Version: 1.4.1
|
||||
Release: 0
|
||||
Summary: The Syslog daemon
|
||||
License: GPL-2.0+
|
||||
Group: System/Daemons
|
||||
Source: sysklogd-1.4.1.tar.bz2
|
||||
Url: http://www.infodrom.org/projects/sysklogd/
|
||||
Source: http://www.infodrom.org/projects/sysklogd/download/sysklogd-%{version}.tar.gz
|
||||
Source1: logrotate.syslog
|
||||
Source2: sysconfig.syslogd
|
||||
Source3: sysconfig.klogd
|
||||
Source4: syslog.xml
|
||||
Source5: syslog.8
|
||||
Source6: klog.service
|
||||
Source7: klogd.service
|
||||
@ -86,7 +68,19 @@ Patch26: sysklogd-1.4.1-systemd-sock-name.patch
|
||||
# PATCH-FIX-SUSE bsc#897262, CVE-2014-3634 rsyslog/syslogd: remote syslog PRI vulnerability
|
||||
Patch28: sysklogd-1.4.1-CVE-2014-3634.patch
|
||||
Patch29: klogd-obsolete.patch
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
Requires(post): %fillup_prereq
|
||||
Requires(post): permissions
|
||||
# Note: this package is for >= 12.3 only
|
||||
# and does not provide LSB init scripts!
|
||||
Requires(pre): syslog-service >= 2.0
|
||||
Conflicts: otherproviders(syslog)
|
||||
Provides: sysklogd
|
||||
Provides: syslog
|
||||
Provides: sysvinit(syslog)
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%{?systemd_requires}
|
||||
|
||||
%description
|
||||
The syslogd daemon is the general system logging daemon, which is
|
||||
@ -95,20 +89,10 @@ responsible for handling requests for syslog services.
|
||||
This version of syslogd is similar to the standard Berkeley product,
|
||||
but with a number of compatible extensions.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Dr. Greg Wettstein <greg@wind.rmcc.com>
|
||||
Stephen Tweedie <sct@dcs.ed.ac.uk>
|
||||
Juha Virtanen <jiivee@hut.fi>
|
||||
Shane Alderton <shane@scs.apana.org.au>
|
||||
|
||||
%package -n klogd
|
||||
Provides: klogd:/sbin/klogd
|
||||
Requires(post): %fillup_prereq
|
||||
Summary: The kernel log daemon
|
||||
Group: System/Daemons
|
||||
Requires(post): %fillup_prereq
|
||||
|
||||
%description -n klogd
|
||||
The klogd daemon 'listens' to kernel log messages, prioritizes them,
|
||||
@ -117,116 +101,99 @@ and routes them to either output files or to syslog daemon.
|
||||
This version of klogd will optionally translate kernel addresses to
|
||||
their symbolic equivalents if provided with a system map.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Dr. Greg Wettstein <greg@wind.rmcc.com>
|
||||
Stephen Tweedie <sct@dcs.ed.ac.uk>
|
||||
Juha Virtanen <jiivee@hut.fi>
|
||||
Shane Alderton <shane@scs.apana.org.au>
|
||||
|
||||
%package -n syslog-service
|
||||
Requires(post): %fillup_prereq
|
||||
Version: 2.0
|
||||
Release: 0
|
||||
Summary: Syslog service files & scripts
|
||||
Group: System/Daemons
|
||||
Requires: logrotate
|
||||
Requires: syslog
|
||||
Requires: sysvinit(network)
|
||||
Summary: Syslog service files & scripts
|
||||
Group: System/Daemons
|
||||
Requires(post): %fillup_prereq
|
||||
BuildArch: noarch
|
||||
Version: 2.0
|
||||
Release: 0
|
||||
|
||||
%description -n syslog-service
|
||||
The package syslog-service provides the service boot
|
||||
scripts for SysV and the service unit files for systemd.
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Marius Tomaschewski
|
||||
Werner Fink
|
||||
|
||||
%prep
|
||||
%setup -n sysklogd-1.4.1
|
||||
%patch1 -p0 -b .dgram
|
||||
%patch2 -p0 -b .sparc
|
||||
%patch3 -p0 -b .forw
|
||||
%patch4 -p0 -b .fileleak
|
||||
%patch5 -p0 -b .ipv6
|
||||
%patch6 -p0 -b .klogd24
|
||||
%patch7 -p0 -b .large
|
||||
%patch8 -p0 -b .dns
|
||||
%patch9 -p0 -b .reopen
|
||||
%patch10 -p0 -b .sobsd
|
||||
%patch11 -p0 -b .owlcr
|
||||
%patch12 -p0 -b .klsize
|
||||
%patch13 -p0 -b .usock
|
||||
%patch14 -p0 -b .shprio
|
||||
%patch15 -p0 -b .presperc
|
||||
%patch16 -p0 -b .utf8
|
||||
%patch17 -p0 -b .ksym
|
||||
%patch18 -p0 -b .sleep
|
||||
%patch19 -p0 -b .signal
|
||||
%patch20 -p0 -b .clear
|
||||
%patch21 -p0 -b .nofortify
|
||||
%patch22 -p0 -b .sysmap
|
||||
%patch23 -p0 -b .reload
|
||||
%patch24 -p0 -b .sd
|
||||
%patch25 -p0 -b .sd2
|
||||
%patch26 -p0 -b .sd3
|
||||
%patch28 -p0 -b .cve20143634
|
||||
%setup -q -n sysklogd-1.4.1
|
||||
%patch1 -b .dgram
|
||||
%patch2 -b .sparc
|
||||
%patch3 -b .forw
|
||||
%patch4 -b .fileleak
|
||||
%patch5 -b .ipv6
|
||||
%patch6 -b .klogd24
|
||||
%patch7 -b .large
|
||||
%patch8 -b .dns
|
||||
%patch9 -b .reopen
|
||||
%patch10 -b .sobsd
|
||||
%patch11 -b .owlcr
|
||||
%patch12 -b .klsize
|
||||
%patch13 -b .usock
|
||||
%patch14 -b .shprio
|
||||
%patch15 -b .presperc
|
||||
%patch16 -b .utf8
|
||||
%patch17 -b .ksym
|
||||
%patch18 -b .sleep
|
||||
%patch19 -b .signal
|
||||
%patch20 -b .clear
|
||||
%patch21 -b .nofortify
|
||||
%patch22 -b .sysmap
|
||||
%patch23 -b .reload
|
||||
%patch24 -b .sd
|
||||
%patch25 -b .sd2
|
||||
%patch26 -b .sd3
|
||||
%patch28 -b .cve20143634
|
||||
%patch29 -p1
|
||||
%patch0 -p0
|
||||
%patch0
|
||||
|
||||
%build
|
||||
%ifarch s390 s390x
|
||||
mv sample-s390.conf sample.conf
|
||||
%endif
|
||||
# honor the increased LOG_BUF_LEN in kernel/printk.c
|
||||
make %{?_smp_mflags} BINDIR=%{_sbindir} LOG_BUFFER_SIZE=-DLOG_BUFFER_SIZE=131072
|
||||
# honor the increased LOG_BUF_LEN in kernel/printk.c
|
||||
make %{?_smp_mflags} BINDIR=%{_sbindir} LOG_BUFFER_SIZE=-DLOG_BUFFER_SIZE=131072
|
||||
|
||||
%install
|
||||
mkdir -p $RPM_BUILD_ROOT/etc
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
|
||||
mkdir -p $RPM_BUILD_ROOT/sbin
|
||||
mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
|
||||
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{5,8}
|
||||
mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
|
||||
mkdir -p $RPM_BUILD_ROOT%{sysdsysunitdir}
|
||||
mkdir -p -m 0755 $RPM_BUILD_ROOT/%{_rundir}/syslogd
|
||||
make install MANDIR=%{_mandir} BINDIR=%{_sbindir} DESTDIR=$RPM_BUILD_ROOT
|
||||
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/syslog
|
||||
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/var/adm/fillup-templates
|
||||
install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/var/adm/fillup-templates
|
||||
install -d $RPM_BUILD_ROOT/%{omc_svcdir}/
|
||||
install -m 600 %{SOURCE4} $RPM_BUILD_ROOT/%{omc_svcdir}/
|
||||
install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{_mandir}/man8/syslog.8
|
||||
install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{sysdsysunitdir}/
|
||||
install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{sysdsysunitdir}/
|
||||
install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{sysdsysunitdir}/
|
||||
install -m 755 %{SOURCE9} $RPM_BUILD_ROOT/%{_sbindir}/
|
||||
install -m 755 %{SOURCE10} $RPM_BUILD_ROOT/sbin/rcsyslog
|
||||
install -m 755 %{SOURCE12} $RPM_BUILD_ROOT/var/adm/fillup-templates
|
||||
for sbin in klogd syslogd ; do
|
||||
ln -sf %{_sbindir}/${sbin} $RPM_BUILD_ROOT/sbin/${sbin}
|
||||
done
|
||||
mkdir -p %{buildroot}/etc
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
|
||||
mkdir -p %{buildroot}/sbin
|
||||
mkdir -p %{buildroot}/%{_sbindir}
|
||||
mkdir -p %{buildroot}/%{_mandir}/man{5,8}
|
||||
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
|
||||
mkdir -p %{buildroot}%{_unitdir}
|
||||
mkdir -p -m 0755 %{buildroot}/%{_rundir}/syslogd
|
||||
make install MANDIR=%{_mandir} BINDIR=%{_sbindir} DESTDIR=%{buildroot}
|
||||
install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/syslog
|
||||
install -m 644 %{SOURCE2} %{buildroot}%{_localstatedir}/adm/fillup-templates
|
||||
install -m 644 %{SOURCE3} %{buildroot}%{_localstatedir}/adm/fillup-templates
|
||||
install -m 644 %{SOURCE5} %{buildroot}/%{_mandir}/man8/syslog.8
|
||||
install -m 644 %{SOURCE6} %{buildroot}%{_unitdir}/
|
||||
install -m 644 %{SOURCE7} %{buildroot}%{_unitdir}/
|
||||
install -m 644 %{SOURCE8} %{buildroot}%{_unitdir}/
|
||||
install -m 755 %{SOURCE9} %{buildroot}/%{_sbindir}/
|
||||
install -m 755 %{SOURCE10} %{buildroot}/sbin/rcsyslog
|
||||
install -m 755 %{SOURCE12} %{buildroot}%{_localstatedir}/adm/fillup-templates
|
||||
for sbin in klogd syslogd ; do
|
||||
ln -sf %{_sbindir}/${sbin} %{buildroot}/sbin/${sbin}
|
||||
done
|
||||
%ifarch s390 s390x
|
||||
sed -i 's/^KERNEL_LOGLEVEL=1/KERNEL_LOGLEVEL=7/' \
|
||||
$RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.klogd
|
||||
sed -i 's/^KERNEL_LOGLEVEL=1/KERNEL_LOGLEVEL=7/' \
|
||||
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.klogd
|
||||
%endif
|
||||
|
||||
%if %{defined verify_permissions}
|
||||
%verifyscript
|
||||
%verify_permissions -e /etc/syslog.conf
|
||||
%verify_permissions -e %{_sysconfdir}/syslog.conf
|
||||
%endif
|
||||
|
||||
%pre
|
||||
%service_add_pre syslogd.service
|
||||
|
||||
%post
|
||||
%set_permissions /etc/syslog.conf
|
||||
#
|
||||
%set_permissions %{_sysconfdir}/syslog.conf
|
||||
#
|
||||
# add syslog variables provided by syslogd if needed
|
||||
#
|
||||
%{remove_and_set -n syslog SYSLOG_DAEMON}
|
||||
@ -259,7 +226,7 @@ chown news:news var/log/news/news.notice
|
||||
# force the creation of a syslog.service alias link (bnc#790805).
|
||||
# We do not check the obsolete SYSLOG_DAEMON variable as we want
|
||||
# to switch when installing it and there is a provider conflict.
|
||||
/usr/bin/systemctl -f enable syslogd.service >/dev/null 2>&1 || :
|
||||
%{_bindir}/systemctl -f enable syslogd.service >/dev/null 2>&1 || :
|
||||
|
||||
%preun
|
||||
%service_del_preun syslog.socket
|
||||
@ -277,9 +244,9 @@ chown news:news var/log/news/news.notice
|
||||
%{fillup_only -n boot}
|
||||
# when exists, remove the broken link pointing to the
|
||||
# common syslog.service file, we've provided before...
|
||||
rm -f /etc/systemd/system/multi-user.target.wants/syslog.service
|
||||
rm -f %{_sysconfdir}/systemd/system/multi-user.target.wants/syslog.service
|
||||
%service_add_post klog.service
|
||||
/usr/bin/systemctl -f enable klog.service >/dev/null 2>&1 || :
|
||||
%{_bindir}/systemctl -f enable klog.service >/dev/null 2>&1 || :
|
||||
|
||||
%pre -n syslog-service
|
||||
%service_add_pre klog.service
|
||||
@ -291,7 +258,7 @@ rm -f /etc/systemd/system/multi-user.target.wants/syslog.service
|
||||
%service_add_pre klogd.service
|
||||
|
||||
%post -n klogd
|
||||
#
|
||||
#
|
||||
# add syslog variables provided by klogd if needed
|
||||
#
|
||||
%{remove_and_set -n syslog SYSLOG_DAEMON}
|
||||
@ -310,32 +277,31 @@ rm -f /etc/systemd/system/multi-user.target.wants/syslog.service
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
/var/adm/fillup-templates/sysconfig.syslogd
|
||||
%config %verify(not mode) /etc/syslog.conf
|
||||
%doc %{_mandir}/man5/syslog.conf.5.gz
|
||||
%doc %{_mandir}/man8/syslogd.8.gz
|
||||
%doc %{_mandir}/man8/sysklogd.8.gz
|
||||
%config %{sysdsysunitdir}/syslogd.service
|
||||
%{_localstatedir}/adm/fillup-templates/sysconfig.syslogd
|
||||
%config %verify(not mode) %{_sysconfdir}/syslog.conf
|
||||
%{_mandir}/man5/syslog.conf.5%{ext_man}
|
||||
%{_mandir}/man8/syslogd.8%{ext_man}
|
||||
%{_mandir}/man8/sysklogd.8%{ext_man}
|
||||
%{_unitdir}/syslogd.service
|
||||
%{_sbindir}/syslogd-service-prepare
|
||||
%attr(0755,root,root) %dir %ghost %{_rundir}/syslogd
|
||||
/usr/sbin/syslogd
|
||||
%{_sbindir}/syslogd
|
||||
/sbin/syslogd
|
||||
|
||||
%files -n klogd
|
||||
%defattr(-,root,root)
|
||||
/var/adm/fillup-templates/sysconfig.klogd
|
||||
%config %{sysdsysunitdir}/klogd.service
|
||||
%doc %{_mandir}/man8/klogd.8.gz
|
||||
/usr/sbin/klogd
|
||||
%{_localstatedir}/adm/fillup-templates/sysconfig.klogd
|
||||
%{_unitdir}/klogd.service
|
||||
%{_mandir}/man8/klogd.8%{ext_man}
|
||||
%{_sbindir}/klogd
|
||||
/sbin/klogd
|
||||
|
||||
%files -n syslog-service
|
||||
%defattr(-,root,root)
|
||||
/var/adm/fillup-templates/sysconfig.boot
|
||||
%config(noreplace) /etc/logrotate.d/syslog
|
||||
%config %{sysdsysunitdir}/klog.service
|
||||
%doc %{_mandir}/man8/syslog.8.gz
|
||||
%{omc_svcdir}/syslog.xml
|
||||
%{_localstatedir}/adm/fillup-templates/sysconfig.boot
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/syslog
|
||||
%{_unitdir}/klog.service
|
||||
%{_mandir}/man8/syslog.8%{ext_man}
|
||||
/sbin/rcsyslog
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user