Hello community, here is the log from the commit of package prelude-manager for openSUSE:Factory checked in at 2017-04-11 09:36:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/prelude-manager (Old) and /work/SRC/openSUSE:Factory/.prelude-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "prelude-manager" Tue Apr 11 09:36:58 2017 rev:2 rq:483905 version:3.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/prelude-manager/prelude-manager.changes 2016-09-16 11:02:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.prelude-manager.new/prelude-manager.changes 2017-04-11 09:37:03.765738482 +0200 @@ -1,0 +2,7 @@ +Sun Nov 27 20:16:55 UTC 2016 - [email protected] + +- Update to 3.1.0 (Prelude 3.1.0 released on 14 Sept 2016) +- Spec-Cleaner +- Add a patch to fix dirs permissions (prelude-manager-fix_dir_perms.patch) + +------------------------------------------------------------------- Old: ---- prelude-manager-3.0.0.tar.gz New: ---- prelude-manager-3.1.0.tar.gz prelude-manager-fix_dir_perms.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ prelude-manager.spec ++++++ --- /var/tmp/diff_new_pack.5AQzpM/_old 2017-04-11 09:37:04.441643002 +0200 +++ /var/tmp/diff_new_pack.5AQzpM/_new 2017-04-11 09:37:04.445642437 +0200 @@ -1,7 +1,7 @@ # # spec file for package prelude-manager # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,22 +15,29 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: prelude-manager -Version: 3.0.0 +Version: 3.1.0 Release: 0 Summary: Bus communication for all Prelude modules -License: GPL-3.0+ -Group: Applications/Internet +# Prelude is GPL-2.0+ +# libmissing is LGPL-2.1+ +# libmissing/test is GPL-3.0+ +License: GPL-2.0+ and LGPL-2.1 and GPL-3.0+ +Group: Productivity/Networking/Security Url: https://www.prelude-siem.org -Source0: https://www.prelude-siem.org/pkg/src/3.0.0/%{name}-%{version}.tar.gz +Source0: https://www.prelude-siem.org/pkg/src/%{version}/%{name}-%{version}.tar.gz Source1: prelude-manager.service Source2: prelude-manager.run +# Fix run dir for Systemd Patch0: prelude-manager-run-dir.patch +# Fix dirs permissions +Patch1: prelude-manager-fix_dir_perms.patch BuildRequires: libgnutls-devel -BuildRequires: pkg-config BuildRequires: libprelude-devel BuildRequires: libpreludedb-devel BuildRequires: libxml2-devel +BuildRequires: pkgconfig BuildRequires: systemd BuildRequires: tcpd-devel %{?systemd_requires} @@ -54,7 +61,7 @@ %package db-plugin Summary: Database report plugin for Prelude Manager -Group: Applications/Internet +Group: Productivity/Networking/Security Requires: %{name} = %{version}-%{release} %description db-plugin @@ -62,7 +69,7 @@ %package xml-plugin Summary: XML report plugin for Prelude Manager -Group: Applications/Internet +Group: Productivity/Networking/Security Requires: %{name} = %{version}-%{release} %description xml-plugin @@ -70,7 +77,7 @@ %package smtp-plugin Summary: SMTP alert plugin for Prelude Manager -Group: Applications/Internet +Group: Productivity/Networking/Security Requires: %{name} = %{version}-%{release} %description smtp-plugin @@ -78,33 +85,47 @@ %prep %setup -q -%patch0 -p0 +%patch0 +%patch1 %build -%configure --with-libwrap +%configure \ + --disable-static \ + --enable-shared make %{?_smp_mflags} %install mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version} -mkdir -p %{buildroot}/%{_localstatedir}/spool/prelude/%{name}/ -make install DESTDIR=%{buildroot} INSTALL="%{__install} -c -p" -rm -f %{buildroot}/%{_libdir}/%{name}/reports/*.la -rm -f %{buildroot}/%{_libdir}/%{name}/filters/*.la -rm -f %{buildroot}/%{_libdir}/%{name}/decodes/*.la +%make_install + +find %{buildroot} -type f -name "*.la" -delete -print + +mkdir -p %{buildroot}%{_localstatedir}/spool/%{name}/scheduler +mkdir -p %{buildroot}%{_localstatedir}/spool/%{name}/failover +mkdir -p %{buildroot}%{_localstatedir}/lib/%{name} +mkdir -p %{buildroot}%{_sysconfdir}/prelude/profile/%{name} + rm -f %{buildroot}/%{_defaultdocdir}/../%{name}/smtp/template.example mkdir -p %{buildroot}/%{_sbindir} -ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name} + +# Empty dir but kept by debuginfo +rm -rf src/.libs + +# Service +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} +install -D -m 444 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service + +# Tmpfiles install -d -m 0755 %{buildroot}/%{_tmpfilesdir} install -m 0644 %{SOURCE2} %{buildroot}/%{_tmpfilesdir}/%{name}.conf rm -rf %{buildroot}/%{_localstatedir}/run/%{name} -install -D -m 444 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service %pre %service_add_pre %{name}.service %post /sbin/ldconfig -/usr/bin/systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf +%{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf %service_add_post %{name}.service %preun @@ -117,25 +138,28 @@ %files %defattr(-,root,root,-) %doc COPYING -%attr(0750,-,-) %dir %{_sysconfdir}/%{name}/ -%config(noreplace) %attr(0640,-,-) %{_sysconfdir}/%{name}/%{name}.conf +%{_unitdir}/%{name}.service +%{_sbindir}/rc%{name} %{_bindir}/%{name} -%dir %{_libdir}/%{name}/ -%dir %{_libdir}/%{name}/filters/ -%{_libdir}/%{name}/filters/*.so -%dir %{_libdir}/%{name}/reports/ +%dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/decodes +%dir %{_libdir}/%{name}/filters +%dir %{_libdir}/%{name}/reports +%{_libdir}/%{name}/filters/idmef-criteria.so +%{_libdir}/%{name}/filters/thresholding.so %{_libdir}/%{name}/reports/debug.so %{_libdir}/%{name}/reports/textmod.so -%dir %{_libdir}/%{name}/decodes/ -%{_libdir}/%{name}/decodes/*.so -%attr(0711,-,-) %dir %{_localstatedir}/spool/prelude -%attr(0750,-,-) %dir %{_localstatedir}/spool/prelude/%{name}/ -%attr(0750,-,-) %dir %{_datadir}/%{name}/ -%attr(0644,-,-) %{_mandir}/man1/%{name}.1.gz -%{_sbindir}/rc%{name} +%{_libdir}/%{name}/decodes/normalize.so +%attr(0750,-,-) %dir %{_localstatedir}/spool/%{name} +%attr(0750,-,-) %dir %{_localstatedir}/spool/%{name}/scheduler +%attr(0750,-,-) %dir %{_localstatedir}/spool/%{name}/failover %dir %{_tmpfilesdir} %{_tmpfilesdir}/%{name}.conf -%{_unitdir}/%{name}.service +%attr(0750,-,-) %dir %{_datadir}/%{name}/ +%attr(0750,-,-) %dir %{_sysconfdir}/%{name}/ +%config(noreplace) %attr(0640,-,-) %{_sysconfdir}/%{name}/%{name}.conf +%dir %ghost /run/%{name} +%attr(0644,-,-) %{_mandir}/man1/%{name}.1%{ext_man} %files db-plugin %defattr(-,root,root,-) ++++++ prelude-manager-3.0.0.tar.gz -> prelude-manager-3.1.0.tar.gz ++++++ ++++ 13202 lines of diff (skipped) ++++++ prelude-manager-fix_dir_perms.patch ++++++ From: Thomas Andrejak <[email protected]> Date: 2017-02-27 23:25:00 +0100 References: http://prelude-siem.org/issues/870 Upstream: submitted Subject: Fix Prelude Manager dirs permissions --- Makefile.in 2016-09-15 09:02:20.863000884 +0200 +++ Makefile.in 2017-01-30 00:38:41.513780569 +0100 @@ -1613,12 +1613,12 @@ install-data-local: - $(INSTALL) -d -m 700 $(DESTDIR)$(configdir); - $(INSTALL) -d -m 700 $(DESTDIR)$(manager_run_dir); - $(INSTALL) -d -m 700 $(DESTDIR)$(manager_scheduler_dir); - $(INSTALL) -d -m 700 $(DESTDIR)$(manager_failover_dir); + $(INSTALL) -d -m 755 $(DESTDIR)$(configdir); + $(INSTALL) -d -m 755 $(DESTDIR)$(manager_run_dir); + $(INSTALL) -d -m 755 $(DESTDIR)$(manager_scheduler_dir); + $(INSTALL) -d -m 755 $(DESTDIR)$(manager_failover_dir); @if test -f $(DESTDIR)$(configdir)/prelude-manager.conf; then \ - $(INSTALL) -m 600 $(top_builddir)/prelude-manager.conf $(DESTDIR)$(configdir)/prelude-manager.conf-dist; \ + $(INSTALL) -m 644 $(top_builddir)/prelude-manager.conf $(DESTDIR)$(configdir)/prelude-manager.conf-dist; \ echo "********************************************************************************"; \ echo; \ echo "$(DESTDIR)$(configdir)/prelude-manager.conf already exist..."; \ @@ -1626,7 +1626,7 @@ echo; \ echo "********************************************************************************"; \ else \ - $(INSTALL) -m 600 $(top_builddir)/prelude-manager.conf $(DESTDIR)$(configdir)/; \ + $(INSTALL) -m 644 $(top_builddir)/prelude-manager.conf $(DESTDIR)$(configdir)/; \ fi uninstall-local: ++++++ prelude-manager-run-dir.patch ++++++ --- /var/tmp/diff_new_pack.5AQzpM/_old 2017-04-11 09:37:04.757598369 +0200 +++ /var/tmp/diff_new_pack.5AQzpM/_new 2017-04-11 09:37:04.761597804 +0200 @@ -1,6 +1,12 @@ +From: Thomas Andrejak <[email protected]> +Date: 2017-02-27 23:25:00 +0100 +References: http://prelude-siem.org/issues/878 +Upstream: submitted +Subject: Fix Prelude Manager run dir for Systemd + --- configure 2016-04-23 00:32:48.541000362 +0200 -+++ configure.new 2016-04-26 15:21:31.816028013 +0200 -@@ -31047,7 +31047,7 @@ ++++ configure 2016-04-26 15:21:31.816028013 +0200 +@@ -31054,7 +31054,7 @@ manager_failover_dir=$LOCALSTATEDIR/spool/prelude-manager/failover manager_scheduler_dir=$LOCALSTATEDIR/spool/prelude-manager/scheduler @@ -9,9 +15,9 @@ cat >>confdefs.h <<_ACEOF ---- configure.in 2016-04-22 23:27:29.451000362 +0200 -+++ configure.in.new 2016-04-26 15:21:41.811800293 +0200 -@@ -304,7 +304,7 @@ +--- configure.ac 2016-04-22 23:27:29.451000362 +0200 ++++ configure.ac 2016-04-26 15:21:41.811800293 +0200 +@@ -337,7 +337,7 @@ manager_failover_dir=$LOCALSTATEDIR/spool/prelude-manager/failover manager_scheduler_dir=$LOCALSTATEDIR/spool/prelude-manager/scheduler
