Change-Id: I14391f8e6bf0710286fbc2ca3342d94a8872f178
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4551
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
Tested-by: Anish Swaminathan <anishs@vmware.com>
... | ... |
@@ -1,33 +1,33 @@ |
1 |
-Summary: Rocket-fast system for log processing |
|
2 |
-Name: rsyslog |
|
3 |
-Version: 8.15.0 |
|
4 |
-Release: 7%{?dist} |
|
5 |
-License: GPLv3+ and ASL 2.0 |
|
6 |
-URL: http://www.rsyslog.com/ |
|
7 |
-Source0: http://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz |
|
8 |
-%define sha1 rsyslog=e1d5ff63c96bce9945dc65581c8e195950256d3c |
|
1 |
+Summary: Rocket-fast system for log processing |
|
2 |
+Name: rsyslog |
|
3 |
+Version: 8.15.0 |
|
4 |
+Release: 8%{?dist} |
|
5 |
+License: GPLv3+ and ASL 2.0 |
|
6 |
+URL: http://www.rsyslog.com/ |
|
7 |
+Source0: http://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz |
|
8 |
+%define sha1 rsyslog=e1d5ff63c96bce9945dc65581c8e195950256d3c |
|
9 | 9 |
Source1: rsyslog.service |
10 | 10 |
Source2: 50-rsyslog-journald.conf |
11 | 11 |
# Downloaded patch from https://github.com/rsyslog/rsyslog/pull/1565 |
12 |
-Patch0: CVE-2017-12588.patch |
|
13 |
-Group: System Environment/Base |
|
14 |
-Vendor: VMware, Inc. |
|
15 |
-Distribution: Photon |
|
16 |
-BuildRequires: systemd |
|
17 |
-BuildRequires: libestr-devel |
|
18 |
-BuildRequires: json-c-devel |
|
19 |
-BuildRequires: libgcrypt-devel |
|
20 |
-BuildRequires: liblogging-devel |
|
21 |
-BuildRequires: librelp-devel |
|
12 |
+Patch0: CVE-2017-12588.patch |
|
13 |
+Group: System Environment/Base |
|
14 |
+Vendor: VMware, Inc. |
|
15 |
+Distribution: Photon |
|
16 |
+BuildRequires: systemd |
|
17 |
+BuildRequires: libestr-devel |
|
18 |
+BuildRequires: json-c-devel |
|
19 |
+BuildRequires: libgcrypt-devel |
|
20 |
+BuildRequires: liblogging-devel |
|
21 |
+BuildRequires: librelp-devel |
|
22 | 22 |
BuildRequires: autogen |
23 | 23 |
BuildRequires: gnutls-devel |
24 |
-Requires: gnutls |
|
25 |
-Requires: systemd |
|
26 |
-Requires: libestr |
|
27 |
-Requires: json-c |
|
28 |
-Requires: libgcrypt |
|
29 |
-Requires: liblogging |
|
30 |
-Requires: librelp |
|
24 |
+Requires: gnutls |
|
25 |
+Requires: systemd |
|
26 |
+Requires: libestr |
|
27 |
+Requires: json-c |
|
28 |
+Requires: libgcrypt |
|
29 |
+Requires: liblogging |
|
30 |
+Requires: librelp |
|
31 | 31 |
%description |
32 | 32 |
RSYSLOG is the rocket-fast system for log processing. |
33 | 33 |
It offers high-performance, great security features and a modular design. While it started as a regular syslogd, rsyslog has evolved into a kind of swiss army knife of logging, being able to accept inputs from a wide variety of sources, transform them, and output to the results to diverse destinations. |
... | ... |
@@ -36,13 +36,13 @@ It offers high-performance, great security features and a modular design. While |
36 | 36 |
%patch0 -p1 |
37 | 37 |
%build |
38 | 38 |
./configure \ |
39 |
- --prefix=%{_prefix} \ |
|
40 |
- --enable-relp \ |
|
41 |
- --enable-gnutls\ |
|
42 |
- --enable-imfile \ |
|
43 |
- --enable-imjournal \ |
|
44 |
- --enable-impstats \ |
|
45 |
- --enable-imptcp |
|
39 |
+ --prefix=%{_prefix} \ |
|
40 |
+ --enable-relp \ |
|
41 |
+ --enable-gnutls\ |
|
42 |
+ --enable-imfile \ |
|
43 |
+ --enable-imjournal \ |
|
44 |
+ --enable-impstats \ |
|
45 |
+ --enable-imptcp |
|
46 | 46 |
|
47 | 47 |
make %{?_smp_mflags} |
48 | 48 |
%install |
... | ... |
@@ -75,20 +75,22 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck} |
75 | 75 |
%{_libdir}/systemd/system/rsyslog.service |
76 | 76 |
%{_sysconfdir}/systemd/journald.conf.d/* |
77 | 77 |
%changelog |
78 |
-* Feb Dec 15 2017 Anish Swaminathan <anishs@vmware.com> 8.15.0-7 |
|
79 |
-- Remove kill SIGHUP from service file |
|
80 |
-* Tue Aug 15 2017 Dheeraj Shetty <dheerajs@vmware.com> 8.15.0-6 |
|
81 |
-- Fixed CVE-2017-12588 |
|
82 |
-* Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com> 8.15.0-5 |
|
83 |
-- Fixed logic to restart the active services after upgrade |
|
84 |
-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.15.0-4 |
|
85 |
-- GA - Bump release of all rpms |
|
86 |
-* Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.15.0-3 |
|
87 |
-- Use systemd macros for post, preun and postun to respect upgrades |
|
88 |
-* Wed Feb 17 2016 Anish Swaminathan <anishs@vmware.com> 8.15.0-2 |
|
89 |
-- Add journald conf and new service file. |
|
90 |
-* Mon Jan 11 2016 Xiaolin Li <xiaolinl@vmware.com> 8.15.0-1 |
|
91 |
-- Update rsyslog to 8.15.0 |
|
92 |
-* Wed Jun 17 2015 Divya Thaluru <dthaluru@vmware.com> 8.10.0-1 |
|
93 |
-- Initial build. First version |
|
78 |
+* Thu Dec 21 2017 Xiaolin Li <xiaolinl@vmware.com> 8.15.0-8 |
|
79 |
+- Fix typos in change log. |
|
80 |
+* Fri Dec 15 2017 Anish Swaminathan <anishs@vmware.com> 8.15.0-7 |
|
81 |
+- Remove kill SIGHUP from service file |
|
82 |
+* Tue Aug 15 2017 Dheeraj Shetty <dheerajs@vmware.com> 8.15.0-6 |
|
83 |
+- Fixed CVE-2017-12588 |
|
84 |
+* Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com> 8.15.0-5 |
|
85 |
+- Fixed logic to restart the active services after upgrade |
|
86 |
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.15.0-4 |
|
87 |
+- GA - Bump release of all rpms |
|
88 |
+* Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.15.0-3 |
|
89 |
+- Use systemd macros for post, preun and postun to respect upgrades |
|
90 |
+* Wed Feb 17 2016 Anish Swaminathan <anishs@vmware.com> 8.15.0-2 |
|
91 |
+- Add journald conf and new service file. |
|
92 |
+* Mon Jan 11 2016 Xiaolin Li <xiaolinl@vmware.com> 8.15.0-1 |
|
93 |
+- Update rsyslog to 8.15.0 |
|
94 |
+* Wed Jun 17 2015 Divya Thaluru <dthaluru@vmware.com> 8.10.0-1 |
|
95 |
+- Initial build. First version |
|
94 | 96 |
|