Hello community,
here is the log from the commit of package prelude-correlator for
openSUSE:Factory checked in at 2017-11-13 13:59:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/prelude-correlator (Old)
and /work/SRC/openSUSE:Factory/.prelude-correlator.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "prelude-correlator"
Mon Nov 13 13:59:33 2017 rev:3 rq:538195 version:4.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/prelude-correlator/prelude-correlator.changes
2017-04-03 11:05:07.747503219 +0200
+++
/work/SRC/openSUSE:Factory/.prelude-correlator.new/prelude-correlator.changes
2017-11-13 13:59:43.987530095 +0100
@@ -1,0 +2,10 @@
+Wed Oct 04 07:00:00 UTC 2017 - thomas.andre...@gmail.com
+
+- Update to 4.0.0
+- Rename source prelude-correlator.run to prelude-correlator-tmpfiles.conf
+- Clean prelude-correlator.service
+- Create python2-prelude-correlator and python3-prelude-correlator
+ packages since prelude-correlator is python 3 compatible
+- Move to Python Singlespec
+
+-------------------------------------------------------------------
Old:
----
prelude-correlator-3.1.0.tar.gz
prelude-correlator.run
New:
----
prelude-correlator-4.0.0.tar.gz
prelude-correlator-tmpfiles.conf
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ prelude-correlator.spec ++++++
--- /var/tmp/diff_new_pack.L5RyXZ/_old 2017-11-13 13:59:44.671505507 +0100
+++ /var/tmp/diff_new_pack.L5RyXZ/_new 2017-11-13 13:59:44.675505364 +0100
@@ -16,8 +16,10 @@
#
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+
Name: prelude-correlator
-Version: 3.1.0
+Version: 4.0.0
Release: 0
Summary: Real time correlator of events received by Prelude Manager
License: GPL-2.0+
@@ -25,19 +27,25 @@
Url: https://www.prelude-siem.org
Source0:
https://www.prelude-siem.org/pkg/src/%{version}/%{name}-%{version}.tar.gz
Source1: %{name}.service
-Source2: %{name}.run
+Source2: %{name}-tmpfiles.conf
# Backport ez_setup to be compatible with old (Open)SuSE
Patch0: prelude-correlator-ez_setup.patch
+BuildRequires: %{python_module setuptools}
+BuildRequires: fdupes
BuildRequires: libprelude-devel
BuildRequires: python-devel
-BuildRequires: python-setuptools
+BuildRequires: python-rpm-macros
+BuildRequires: python3-devel
BuildRequires: systemd
+BuildRequires: pkgconfig(glib-2.0)
+Requires: prelude-correlator-core >= %{version}
Requires: python-libprelude
Requires: python-netaddr
-Requires: python-setuptools
BuildArch: noarch
%{?systemd_requires}
+%python_subpackages
+
%description
Prelude-Correlator allows conducting multi-stream correlations
thanks to a powerful programming language for writing correlation
@@ -47,36 +55,49 @@
and indicates the potential target information via the set of
correlation rules.
+%package -n %{name}-core
+Summary: Prelude Correlator core files
+Group: Productivity/Networking/Security
+
+%description -n %{name}-core
+Core files for Prelude Correlator.
+
%prep
%setup -q
%patch0
%build
-python setup.py build
%install
-python setup.py install --root=%{buildroot}
+%{python_expand $python setup.py install -O1 --force --root %{buildroot}
+mv %{buildroot}%{_bindir}/%{name}
%{buildroot}%{_bindir}/%{name}-%{$python_bin_suffix}
+%fdupes %{buildroot}%{$python_sitelib}/preludecorrelator
+}
+ln -s ./%{name}-%{python3_bin_suffix} %{buildroot}%{_bindir}/%{name}
+
mkdir -p %{buildroot}/%{_sbindir}
+ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
+
install -d -m 0755 %{buildroot}/%{_tmpfilesdir}
install -m 0644 %{SOURCE2} %{buildroot}/%{_tmpfilesdir}/%{name}.conf
-ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
+
rm -rf %{buildroot}/%{_localstatedir}/run/%{name}
install -D -m 444 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
-%pre
+%pre -n %{name}-core
%service_add_pre %{name}.service
-%post
+%post -n %{name}-core
%{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf
%service_add_post %{name}.service
-%preun
+%preun -n %{name}-core
%service_del_preun %{name}.service
-%postun
+%postun -n %{name}-core
%service_del_postun %{name}.service
-%files
+%files -n %{name}-core
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS HACKING.README
%dir %attr(0750,-,-) %{_sysconfdir}/%{name}/
@@ -86,15 +107,18 @@
%config(noreplace) %attr(0640,-,-) %{_sysconfdir}/%{name}/rules/python/*.py
%dir %attr(0750,-,-) %{_sysconfdir}/%{name}/conf.d
%config %attr(0640,-,-) %{_sysconfdir}/%{name}/conf.d/README
-%{_bindir}/%{name}
%dir %{_var}/lib/%{name}
%{_var}/lib/%{name}/*
-%{python_sitelib}/preludecorrelator/
-%{python_sitelib}/prelude_correlator*.egg-info
%{_sbindir}/rc%{name}
%dir %{_tmpfilesdir}
%{_tmpfilesdir}/%{name}.conf
%dir %ghost /run/%{name}
%{_unitdir}/%{name}.service
+%files %{python_files}
+%{python_sitelib}/preludecorrelator/
+%{python_sitelib}/prelude_correlator*.egg-info
+%{_bindir}/prelude-correlator-%{python_bin_suffix}
+%python3_only %{_bindir}/prelude-correlator
+
%changelog
++++++ prelude-correlator-3.1.0.tar.gz -> prelude-correlator-4.0.0.tar.gz ++++++
++++ 71093 lines of diff (skipped)
++++++ prelude-correlator-tmpfiles.conf ++++++
# create a directory with permissions 0770 owned by user foo and group bar
d /run/prelude-correlator 0750 root root
++++++ prelude-correlator.service ++++++
--- /var/tmp/diff_new_pack.L5RyXZ/_old 2017-11-13 13:59:44.875498174 +0100
+++ /var/tmp/diff_new_pack.L5RyXZ/_new 2017-11-13 13:59:44.875498174 +0100
@@ -1,13 +1,9 @@
[Unit]
-Description=Prelude-Correlator service
-DefaultDependencies=no
+Description=Correlator of events received by Prelude
After=remode_fs.target prelude-manager.service
[Service]
-ExecStart=/usr/bin/prelude-correlator -d -P
/run/prelude-correlator/prelude-correlator.pid
-Type=forking
-PIDFile=/run/prelude-correlator/prelude-correlator.pid
-Restart=always
+ExecStart=/usr/bin/prelude-correlator
[Install]
WantedBy=multi-user.target
