Browse code
Update syslog-ng
Change-Id: I14b36a3facd5a2ac90271cc023371e43758a95d0
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2431
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Priyesh Padmavilasom <ppadmavilasom@vmware.com>
Vinay Kulkarni authored on 2017/04/14 13:30:33Showing 1 changed files
| ... | ... |
@@ -1,24 +1,28 @@ |
| 1 | 1 |
Summary: Next generation system logger facilty |
| 2 | 2 |
Name: syslog-ng |
| 3 |
-Version: 3.6.4 |
|
| 4 |
-Release: 6%{?dist}
|
|
| 3 |
+Version: 3.9.1 |
|
| 4 |
+Release: 1%{?dist}
|
|
| 5 | 5 |
License: GPL + LGPL |
| 6 |
-URL: https://www.balabit.com/network-security/syslog-ng/opensource-logging-system |
|
| 6 |
+URL: https://syslog-ng.org/ |
|
| 7 | 7 |
Group: System Environment/Daemons |
| 8 |
-Vendor: VMware, Inc. |
|
| 8 |
+Vendor: VMware, Inc. |
|
| 9 | 9 |
Distribution: Photon |
| 10 |
-Source0: http://my.balabit.com/downloads/syslog-ng/open-source-edition/%{version}/source/%{name}_%{version}.tar.gz
|
|
| 11 |
-%define sha1 syslog-ng=53b14cae037a5ca996fd7b67cf16d29970afedf9 |
|
| 12 |
-Source1: 60-syslog-ng-journald.conf |
|
| 10 |
+Source0: https://github.com/balabit/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
|
|
| 11 |
+%define sha1 syslog-ng=1ca437393d8895654452bef8ac0b996fe73284f8 |
|
| 12 |
+Source1: 60-syslog-ng-journald.conf |
|
| 13 | 13 |
Requires: glib |
| 14 |
+Requires: json-glib |
|
| 15 |
+Requires: json-c |
|
| 14 | 16 |
Requires: eventlog |
| 15 | 17 |
Requires: python2 |
| 16 | 18 |
Requires: systemd |
| 17 | 19 |
BuildRequires: eventlog |
| 18 | 20 |
BuildRequires: glib-devel |
| 21 |
+BuildRequires: json-glib-devel |
|
| 22 |
+BuildRequires: json-c-devel |
|
| 19 | 23 |
BuildRequires: python2-libs |
| 20 | 24 |
BuildRequires: python2-devel |
| 21 |
-BuildRequires: systemd |
|
| 25 |
+BuildRequires: systemd-devel |
|
| 22 | 26 |
|
| 23 | 27 |
%description |
| 24 | 28 |
The syslog-ng application is a flexible and highly scalable |
| ... | ... |
@@ -29,12 +33,19 @@ BuildRequires: systemd |
| 29 | 29 |
%package devel |
| 30 | 30 |
Summary: Header and development files for syslog-ng |
| 31 | 31 |
Requires: %{name} = %{version}
|
| 32 |
-%description devel |
|
| 32 |
+%description devel |
|
| 33 | 33 |
syslog-ng-devel package contains header files, pkfconfig files, and libraries |
| 34 | 34 |
needed to build applications using syslog-ng APIs. |
| 35 | 35 |
|
| 36 |
+%package python |
|
| 37 |
+Summary: python interface for syslog-ng |
|
| 38 |
+Requires: %{name} = %{version}
|
|
| 39 |
+%description python |
|
| 40 |
+ This packages has the python interface to syslog-ng |
|
| 41 |
+ |
|
| 36 | 42 |
%prep |
| 37 | 43 |
%setup -q |
| 44 |
+ |
|
| 38 | 45 |
%build |
| 39 | 46 |
./configure \ |
| 40 | 47 |
CFLAGS="%{optflags}" \
|
| ... | ... |
@@ -42,27 +53,21 @@ Requires: %{name} = %{version}
|
| 42 | 42 |
--disable-silent-rules \ |
| 43 | 43 |
--prefix=%{_prefix} \
|
| 44 | 44 |
--bindir=%{_bindir} \
|
| 45 |
+ --includedir=%{_includedir} \
|
|
| 45 | 46 |
--libdir=%{_libdir} \
|
| 46 | 47 |
--sysconfdir=/etc/syslog-ng \ |
| 48 |
+ --enable-systemd \ |
|
| 49 |
+ --with-systemdsystemunitdir=%{_libdir}/systemd/system \
|
|
| 50 |
+ --enable-json=yes \ |
|
| 51 |
+ --with-jsonc=system \ |
|
| 52 |
+ --disable-java \ |
|
| 53 |
+ --disable-redis \ |
|
| 47 | 54 |
PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/ |
| 48 | 55 |
make %{?_smp_mflags}
|
| 49 | 56 |
|
| 50 | 57 |
%install |
| 51 | 58 |
[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
|
| 52 | 59 |
make DESTDIR=%{buildroot} install
|
| 53 |
-mkdir -p %{buildroot}/etc/systemd/system/
|
|
| 54 |
-cat << EOF >> %{buildroot}/etc/systemd/system/syslog-ng.service
|
|
| 55 |
-[Unit] |
|
| 56 |
-Description=Next generation system logger facility |
|
| 57 |
- |
|
| 58 |
-[Service] |
|
| 59 |
-Type=forking |
|
| 60 |
-ExecStart=/usr/sbin/syslog-ng |
|
| 61 |
- |
|
| 62 |
-[Install] |
|
| 63 |
-WantedBy=multi-user.target |
|
| 64 |
-EOF |
|
| 65 |
- |
|
| 66 | 60 |
find %{buildroot} -name "*.la" -exec rm -f {} \;
|
| 67 | 61 |
rm %{buildroot}/%{_libdir}/pkgconfig/syslog-ng-test.pc
|
| 68 | 62 |
rm %{buildroot}/%{_libdir}/syslog-ng/libtest/libsyslog-ng-test.a
|
| ... | ... |
@@ -93,53 +98,48 @@ rm -rf %{buildroot}/*
|
| 93 | 93 |
%defattr(-,root,root) |
| 94 | 94 |
%config(noreplace) %{_sysconfdir}/syslog-ng/syslog-ng.conf
|
| 95 | 95 |
%config(noreplace) %{_sysconfdir}/syslog-ng/scl.conf
|
| 96 |
-%{_sysconfdir}/systemd/system/syslog-ng.service
|
|
| 96 |
+%{_sysconfdir}/systemd/journald.conf.d/*
|
|
| 97 |
+%{_libdir}/systemd/system/syslog-ng.service
|
|
| 97 | 98 |
/usr/bin/* |
| 98 |
-/usr/lib/libsyslog-ng* |
|
| 99 |
-/usr/lib/syslog-ng/lib*.so |
|
| 100 | 99 |
/usr/sbin/syslog-ng |
| 101 | 100 |
/usr/sbin/syslog-ng-ctl |
| 102 |
-/usr/share/include/scl/* |
|
| 103 |
-/usr/share/tools/* |
|
| 104 |
-/usr/share/man/* |
|
| 105 |
-%{_sysconfdir}/systemd/journald.conf.d/*
|
|
| 101 |
+%{_libdir}/libsyslog-ng-3.9.so.*
|
|
| 102 |
+%{_libdir}/syslog-ng/lib*.so
|
|
| 103 |
+/usr/share/syslog-ng/* |
|
| 106 | 104 |
|
| 107 | 105 |
%files devel |
| 108 |
-/usr/include/syslog-ng/*.h |
|
| 109 |
-/usr/include/syslog-ng/compat/*.h |
|
| 110 |
-/usr/include/syslog-ng/control/*.h |
|
| 111 |
-/usr/include/syslog-ng/filter/*.h |
|
| 112 |
-/usr/include/syslog-ng/ivykis/*.h |
|
| 113 |
-/usr/include/syslog-ng/libtest/*.h |
|
| 114 |
-/usr/include/syslog-ng/logproto/*.h |
|
| 115 |
-/usr/include/syslog-ng/parser/*.h |
|
| 116 |
-/usr/include/syslog-ng/rewrite/*.h |
|
| 117 |
-/usr/include/syslog-ng/stats/*.h |
|
| 118 |
-/usr/include/syslog-ng/template/*.h |
|
| 119 |
-/usr/include/syslog-ng/transport/*.h |
|
| 120 |
-/usr/lib/pkgconfig/syslog-ng.pc |
|
| 106 |
+%defattr(-,root,root) |
|
| 107 |
+%{_includedir}/syslog-ng/*
|
|
| 108 |
+%{_libdir}/libsyslog-ng.so
|
|
| 109 |
+%{_libdir}/libsyslog-ng-native-connector.a
|
|
| 110 |
+%{_libdir}/pkgconfig/*
|
|
| 111 |
+ |
|
| 112 |
+%files python |
|
| 113 |
+%defattr(-,root,root) |
|
| 114 |
+/usr/lib/python2.7/site-packages/* |
|
| 121 | 115 |
|
| 122 | 116 |
%changelog |
| 123 |
-* Mon Oct 04 2016 ChangLee <changlee@vmware.com> 3.6.4-6 |
|
| 124 |
-- Modified %check |
|
| 117 |
+* Tue Apr 11 2017 Vinay Kulkarni <kulkarniv@vmware.com> 3.9.1-1 |
|
| 118 |
+- Update to version 3.9.1 |
|
| 119 |
+* Tue Oct 04 2016 ChangLee <changlee@vmware.com> 3.6.4-6 |
|
| 120 |
+- Modified %check |
|
| 125 | 121 |
* Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com> 3.6.4-5 |
| 126 |
-- Fixed logic to restart the active services after upgrade |
|
| 127 |
-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.6.4-4 |
|
| 128 |
-- GA - Bump release of all rpms |
|
| 129 |
-* Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.6.4-3 |
|
| 130 |
-- Fix for upgrade issues |
|
| 131 |
-* Wed Feb 17 2016 Anish Swaminathan <anishs@vmware.com> 3.6.4-2 |
|
| 132 |
-- Add journald conf file. |
|
| 133 |
-* Wed Jan 20 2016 Anish Swaminathan <anishs@vmware.com> 3.6.4-1 |
|
| 134 |
-- Upgrade version. |
|
| 135 |
-* Tue Jan 12 2016 Anish Swaminathan <anishs@vmware.com> 3.6.2-5 |
|
| 136 |
-- Change config file attributes. |
|
| 137 |
-* Wed Dec 09 2015 Mahmoud Bassiouny <mbassiouny@vmware.com> 3.6.2-4 |
|
| 138 |
-- Moving files from devel rpm to the main package. |
|
| 139 |
-* Wed Aug 05 2015 Kumar Kaushik <kaushikk@vmware.com> 3.6.2-3 |
|
| 140 |
-- Adding preun section. |
|
| 141 |
-* Sat Jul 18 2015 Vinay Kulkarni <kulkarniv@vmware.com> 3.6.2-2 |
|
| 142 |
-- Split headers and unshared libs over to devel package. |
|
| 143 |
-* Thu Jun 4 2015 Vinay Kulkarni <kulkarniv@vmware.com> 3.6.2-1 |
|
| 144 |
-- Add syslog-ng support to photon. |
|
| 145 |
- |
|
| 122 |
+- Fixed logic to restart the active services after upgrade |
|
| 123 |
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.6.4-4 |
|
| 124 |
+- GA - Bump release of all rpms |
|
| 125 |
+* Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.6.4-3 |
|
| 126 |
+- Fix for upgrade issues |
|
| 127 |
+* Wed Feb 17 2016 Anish Swaminathan <anishs@vmware.com> 3.6.4-2 |
|
| 128 |
+- Add journald conf file. |
|
| 129 |
+* Wed Jan 20 2016 Anish Swaminathan <anishs@vmware.com> 3.6.4-1 |
|
| 130 |
+- Upgrade version. |
|
| 131 |
+* Tue Jan 12 2016 Anish Swaminathan <anishs@vmware.com> 3.6.2-5 |
|
| 132 |
+- Change config file attributes. |
|
| 133 |
+* Wed Dec 09 2015 Mahmoud Bassiouny <mbassiouny@vmware.com> 3.6.2-4 |
|
| 134 |
+- Moving files from devel rpm to the main package. |
|
| 135 |
+* Wed Aug 05 2015 Kumar Kaushik <kaushikk@vmware.com> 3.6.2-3 |
|
| 136 |
+- Adding preun section. |
|
| 137 |
+* Sat Jul 18 2015 Vinay Kulkarni <kulkarniv@vmware.com> 3.6.2-2 |
|
| 138 |
+- Split headers and unshared libs over to devel package. |
|
| 139 |
+* Thu Jun 4 2015 Vinay Kulkarni <kulkarniv@vmware.com> 3.6.2-1 |
|
| 140 |
+- Add syslog-ng support to photon. |