diff --git a/.gitignore b/.gitignore index 8a4efdd..4770754 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /prelude-correlator-4.0.0.tar.gz +/prelude-correlator-4.1.1.tar.gz diff --git a/prelude-correlator-4.1.1-fix_python3_support.patch b/prelude-correlator-4.1.1-fix_python3_support.patch new file mode 100644 index 0000000..f099c5f --- /dev/null +++ b/prelude-correlator-4.1.1-fix_python3_support.patch @@ -0,0 +1,22 @@ +Description: Fix python3 compatibility +Author: Thomas Andrejak +Last-Update: 2018-03-13 + +--- prelude-correlator-4.1.1/preludecorrelator/config.py 2018-03-13 17:09:13.349628509 -0400 ++++ prelude-correlator-4.1.1/preludecorrelator/config.py 2018-03-13 19:41:40.697404692 -0400 +@@ -19,7 +19,7 @@ + + import os + import glob +-import StringIO ++from io import StringIO + try: + import configparser + except: +@@ -77,5 +77,5 @@ + f = open(fname, 'r') + except IOError: + continue +- self.readfp(StringIO.StringIO('[prelude]\n' + f.read())) ++ self.readfp(StringIO('[prelude]\n' + f.read())) + f.close() diff --git a/prelude-correlator.spec b/prelude-correlator.spec index 6c950a2..02bfeab 100644 --- a/prelude-correlator.spec +++ b/prelude-correlator.spec @@ -1,20 +1,19 @@ Name: prelude-correlator -Version: 4.0.0 -Release: 2%{?dist} +Version: 4.1.1 +Release: 1%{?dist} Summary: Real time correlator of events received by Prelude Manager License: GPLv2+ URL: https://www.prelude-siem.org/ -Source0: https://www.prelude-siem.org/pkg/src/%{version}/%{name}-%{version}.tar.gz +Source0: https://www.prelude-siem.org/pkg/src/4.1.0/%{name}-%{version}.tar.gz Source1: %{name}.service +Patch0: prelude-correlator-4.1.1-fix_python3_support.patch BuildRequires: systemd -BuildRequires: pkgconfig(libprelude) >= %{version} -BuildRequires: python2-setuptools -BuildRequires: python2-devel +BuildRequires: pkgconfig(libprelude) >= 4.1.0 BuildRequires: python3-setuptools BuildRequires: python3-devel %{?systemd_requires} -Requires: python3-%{name} >= %{version} +Requires: python3-%{name} >= 4.1.0 # Since mass rebuild, debugpackage wont works for prelude-correlator %define debug_package %{nil} @@ -28,23 +27,6 @@ correlation alert then appears within the Prewikka interface and indicates the potential target information via the set of correlation rules. -%package -n python2-%{name} -Summary: Real time correlator of events received by Prelude Manager -Requires: %{name} = %{version}-%{release} -Requires: python2-prelude >= %{version} -Requires: python2-netaddr -%{?python_provide:%python_provide python2-%{name}} - -%description -n python2-%{name} -Prelude-Correlator allows conducting multi-stream correlations -thanks to a powerful programming language for writing correlation -rules. With any type of alert able to be correlated, event -analysis becomes simpler, quicker and more incisive. This -correlation alert then appears within the Prewikka interface -and indicates the potential target information via the set of -correlation rules. - - %package -n python3-%{name} Summary: Real time correlator of events received by Prelude Manager Requires: %{name} = %{version}-%{release} @@ -65,19 +47,15 @@ correlation rules. %autosetup -p1 %build -%py2_build %py3_build %install install -d -m 0755 %{buildroot}%{_sbindir} -# We have to use this because py2_install do other things and siteconfig.py +# We have to use this because py3_install do other things and siteconfig.py # will be not installed -%{__python2} setup.py install --root=%{buildroot} -mv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_sbindir}/%{name}-%{python2_version} %{__python3} setup.py install --root=%{buildroot} mv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_sbindir}/%{name}-%{python3_version} -ln -s ./%{name}-%{python2_version} %{buildroot}%{_sbindir}/%{name}-2 ln -s ./%{name}-%{python3_version} %{buildroot}%{_sbindir}/%{name}-3 ln -s ./%{name}-3 %{buildroot}%{_sbindir}/%{name} @@ -106,12 +84,6 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service %{_localstatedir}/lib/%{name}/ %{_unitdir}/%{name}.service -%files -n python2-%{name} -%{_sbindir}/%{name}-2 -%{_sbindir}/%{name}-%{python2_version} -%{python2_sitelib}/preludecorrelator/ -%{python2_sitelib}/prelude_correlator-%{version}-py%{python2_version}.egg-info - %files -n python3-%{name} %{_sbindir}/%{name} %{_sbindir}/%{name}-3 @@ -120,6 +92,10 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service %{python3_sitelib}/prelude_correlator-%{version}-py%{python3_version}.egg-info %changelog +* Wed Apr 25 2018 Thomas Andrejak - 4.1.1-1 +- Bump version 4.1.1 +- Remove Python2 support + * Fri Feb 09 2018 Fedora Release Engineering - 4.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 21056bc..561d68e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (prelude-correlator-4.0.0.tar.gz) = aeeb5d1e29a464afa41b8a04f5324e0915b8450eceea68a07cb6d8bb61823ab8da8df51e1a331f5a66fd295bd2a514f484da5c396e0508c4fc5634c98382779b +SHA512 (prelude-correlator-4.1.1.tar.gz) = ac6eb554ab8d20325afbe49fcec9e238d84579cb68ee5731e6ec7d1da11c1b745e60117fade76d8747c93f57d4ae91461fd6e82160f659f88a0bb545e4990597