|
@@ -5,8 +5,8 @@
|
|
|
|
|
|
Summary: Enhanced system logging and kernel message trapping daemon
|
|
Summary: Enhanced system logging and kernel message trapping daemon
|
|
Name: rsyslog
|
|
Name: rsyslog
|
|
-Version: 7.6.7
|
|
+Version: 8.15.0
|
|
-Release: 2%{?_dist_release}
|
|
+Release: 1%{?_dist_release}
|
|
License: GPLv3+
|
|
License: GPLv3+
|
|
Group: System Environment/Daemons
|
|
Group: System Environment/Daemons
|
|
URL: http://www.rsyslog.com/
|
|
URL: http://www.rsyslog.com/
|
|
@@ -15,7 +15,13 @@ Source1: rsyslog.init
|
|
Source2: rsyslog.conf
|
|
Source2: rsyslog.conf
|
|
Source3: rsyslog.sysconfig
|
|
Source3: rsyslog.sysconfig
|
|
Source4: rsyslog.log
|
|
Source4: rsyslog.log
|
|
-Patch0: rsyslog-7.6.3-libpq_pkgconfig.patch
|
|
+
|
|
|
|
+# tweak the upstream service file to honour configuration from /etc/sysconfig/rsyslog
|
|
|
|
+Patch0: rsyslog-8.8.0-sd-service.patch
|
|
|
|
+# prevent modification of trusted properties (proposed upstream)
|
|
|
|
+Patch1: rsyslog-8.8.0-immutable-json-props.patch
|
|
|
|
+
|
|
|
|
+#Patch1000: rsyslog-7.6.3-libpq_pkgconfig.patch
|
|
|
|
|
|
BuildRequires: json-c-devel
|
|
BuildRequires: json-c-devel
|
|
BuildRequires: libestr-devel
|
|
BuildRequires: libestr-devel
|
|
@@ -110,7 +116,10 @@ ability to send syslog messages as SNMPv1 and SNMPv2c traps.
|
|
%prep
|
|
%prep
|
|
%setup -q
|
|
%setup -q
|
|
|
|
|
|
-%patch0 -p1 -b .libpq_pkgconfig
|
|
+%patch0 -p1
|
|
|
|
+%patch1 -p1
|
|
|
|
+
|
|
|
|
+#%patch1000 -p1 -b .libpq_pkgconfig
|
|
|
|
|
|
perl -pi -e 's|^extern char \*strdup.*$||' grammar/lexer.c
|
|
perl -pi -e 's|^extern char \*strdup.*$||' grammar/lexer.c
|
|
|
|
|
|
@@ -180,7 +189,7 @@ fi
|
|
|
|
|
|
%files
|
|
%files
|
|
%defattr(-,root,root,-)
|
|
%defattr(-,root,root,-)
|
|
-%doc AUTHORS COPYING NEWS README ChangeLog doc/*html
|
|
+%doc AUTHORS COPYING NEWS README ChangeLog
|
|
%dir %{_libdir}/rsyslog
|
|
%dir %{_libdir}/rsyslog
|
|
%{_libdir}/rsyslog/imfile.so
|
|
%{_libdir}/rsyslog/imfile.so
|
|
%{_libdir}/rsyslog/imklog.so
|
|
%{_libdir}/rsyslog/imklog.so
|
|
@@ -188,7 +197,6 @@ fi
|
|
%{_libdir}/rsyslog/immark.so
|
|
%{_libdir}/rsyslog/immark.so
|
|
%{_libdir}/rsyslog/imptcp.so
|
|
%{_libdir}/rsyslog/imptcp.so
|
|
%{_libdir}/rsyslog/imtcp.so
|
|
%{_libdir}/rsyslog/imtcp.so
|
|
-%{_libdir}/rsyslog/imttcp.so
|
|
|
|
%{_libdir}/rsyslog/imudp.so
|
|
%{_libdir}/rsyslog/imudp.so
|
|
%{_libdir}/rsyslog/imuxsock.so
|
|
%{_libdir}/rsyslog/imuxsock.so
|
|
%{_libdir}/rsyslog/lmcry_gcry.so
|
|
%{_libdir}/rsyslog/lmcry_gcry.so
|
|
@@ -200,9 +208,9 @@ fi
|
|
%{_libdir}/rsyslog/lmtcpclt.so
|
|
%{_libdir}/rsyslog/lmtcpclt.so
|
|
%{_libdir}/rsyslog/lmtcpsrv.so
|
|
%{_libdir}/rsyslog/lmtcpsrv.so
|
|
%{_libdir}/rsyslog/lmzlibw.so
|
|
%{_libdir}/rsyslog/lmzlibw.so
|
|
|
|
+%{_libdir}/rsyslog/mmexternal.so
|
|
%{_libdir}/rsyslog/omtesting.so
|
|
%{_libdir}/rsyslog/omtesting.so
|
|
%{_libdir}/rsyslog/ommail.so
|
|
%{_libdir}/rsyslog/ommail.so
|
|
-%{_libdir}/rsyslog/omruleset.so
|
|
|
|
%config(noreplace) %{_sysconfdir}/rsyslog.conf
|
|
%config(noreplace) %{_sysconfdir}/rsyslog.conf
|
|
%config(noreplace) %{_sysconfdir}/sysconfig/rsyslog
|
|
%config(noreplace) %{_sysconfdir}/sysconfig/rsyslog
|
|
%config(noreplace) %{_sysconfdir}/logrotate.d/syslog
|
|
%config(noreplace) %{_sysconfdir}/logrotate.d/syslog
|
|
@@ -243,6 +251,10 @@ fi
|
|
%{_libdir}/rsyslog/omsnmp.so
|
|
%{_libdir}/rsyslog/omsnmp.so
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Wed Dec 30 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.15.0-1
|
|
|
|
+- new upstream release.
|
|
|
|
+- built with gnutls-3.4.x.
|
|
|
|
+
|
|
* Tue Jun 30 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.6.7-2
|
|
* Tue Jun 30 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.6.7-2
|
|
- fixed an obsolete expression in rsyslog.conf.
|
|
- fixed an obsolete expression in rsyslog.conf.
|
|
|
|
|