Hello community, here is the log from the commit of package syslogd for openSUSE:Factory checked in at 2016-07-27 16:08:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/syslogd (Old) and /work/SRC/openSUSE:Factory/.syslogd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "syslogd" Changes: -------- --- /work/SRC/openSUSE:Factory/syslogd/syslogd.changes 2016-02-03 10:17:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.syslogd.new/syslogd.changes 2016-07-27 16:08:20.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Jul 21 10:31:27 UTC 2016 - [email protected] + +- Add requires on klogd, previously in requires(pre); should fix + issue found in sr#412257 + +------------------------------------------------------------------- +Mon Jun 27 12:22:47 UTC 2016 - [email protected] + +- Cleanup various rpmlint warnings +- Use upstream url and sources +- Remove the omv files, not needed + +------------------------------------------------------------------- Old: ---- sysklogd-1.4.1.tar.bz2 syslog.xml New: ---- sysklogd-1.4.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syslogd.spec ++++++ --- /var/tmp/diff_new_pack.tgFwfh/_old 2016-07-27 16:08:21.000000000 +0200 +++ /var/tmp/diff_new_pack.tgFwfh/_new 2016-07-27 16:08:21.000000000 +0200 @@ -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,20 @@ # 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: klogd +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 +90,10 @@ This version of syslogd is similar to the standard Berkeley product, but with a number of compatible extensions. - - -Authors: --------- - Dr. Greg Wettstein <[email protected]> - Stephen Tweedie <[email protected]> - Juha Virtanen <[email protected]> - Shane Alderton <[email protected]> - %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,115 +102,98 @@ This version of klogd will optionally translate kernel addresses to their symbolic equivalents if provided with a system map. - - -Authors: --------- - Dr. Greg Wettstein <[email protected]> - Stephen Tweedie <[email protected]> - Juha Virtanen <[email protected]> - Shane Alderton <[email protected]> - %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 # @@ -259,7 +227,7 @@ # 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 +245,9 @@ %{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 @@ -310,32 +278,31 @@ %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
