From 70ed6550377485fe1e8637af54412c861d52ffc1 Mon Sep 17 00:00:00 2001 From: Thomas Andrejak Date: Mon, 21 Sep 2020 13:45:52 +0200 Subject: [PATCH] Bump version 5.2.0 --- .gitignore | 1 + ...anager-5.2.0-Add_missing_gnutls_deps.patch | 13 ++++ prelude-manager-5.2.0-fix-test-perror2.patch | 38 ++++++++++ ...elude-manager-5.2.0-fix-test_rwlock1.patch | 0 ... prelude-manager-5.2.0-fix_cond_test.patch | 0 ... prelude-manager-5.2.0-fix_etc_perms.patch | 0 ...lude-manager-5.2.0-fix_thread_create.patch | 0 ...e-manager-5.2.0-gnutls_priority_init.patch | 0 prelude-manager.spec | 69 ++++++++++++++++--- sources | 2 +- 10 files changed, 112 insertions(+), 11 deletions(-) create mode 100644 prelude-manager-5.2.0-Add_missing_gnutls_deps.patch create mode 100644 prelude-manager-5.2.0-fix-test-perror2.patch rename prelude-manager-5.1.0-fix-test_rwlock1.patch => prelude-manager-5.2.0-fix-test_rwlock1.patch (100%) rename prelude-manager-5.1.0-fix_cond_test.patch => prelude-manager-5.2.0-fix_cond_test.patch (100%) rename prelude-manager-5.1.0-fix_etc_perms.patch => prelude-manager-5.2.0-fix_etc_perms.patch (100%) rename prelude-manager-5.1.0-fix_thread_create.patch => prelude-manager-5.2.0-fix_thread_create.patch (100%) rename prelude-manager-5.1.0-gnutls_priority_init.patch => prelude-manager-5.2.0-gnutls_priority_init.patch (100%) diff --git a/.gitignore b/.gitignore index 38ab8e7..b0710d3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /prelude-manager-4.1.1.tar.gz /prelude-manager-5.0.0.tar.gz /prelude-manager-5.1.0.tar.gz +/prelude-manager-5.2.0.tar.gz diff --git a/prelude-manager-5.2.0-Add_missing_gnutls_deps.patch b/prelude-manager-5.2.0-Add_missing_gnutls_deps.patch new file mode 100644 index 0000000..efa458a --- /dev/null +++ b/prelude-manager-5.2.0-Add_missing_gnutls_deps.patch @@ -0,0 +1,13 @@ +--- a/configure 2020-09-09 16:42:43.973000000 +0200 ++++ b.configure 2020-09-21 00:04:37.275219968 +0200 +@@ -35352,8 +35352,8 @@ + + + +-CPPFLAGS=$old_CPPFLAGS +-LIBS=$old_LIBS ++CPPFLAGS="$old_CPPFLAGS $LIBGNUTLS_CFLAGS" ++LIBS="$old_LIBS $LIBGNUTLS_LIBS" + + + diff --git a/prelude-manager-5.2.0-fix-test-perror2.patch b/prelude-manager-5.2.0-fix-test-perror2.patch new file mode 100644 index 0000000..2330421 --- /dev/null +++ b/prelude-manager-5.2.0-fix-test-perror2.patch @@ -0,0 +1,38 @@ +--- a/libmissing/tests/test-perror2.c 2020-09-09 16:42:01.078000000 +0200 ++++ b/libmissing/tests/test-perror2.c 2020-09-21 13:24:57.467530985 +0200 +@@ -1,5 +1,5 @@ + /* Test of perror() function. +- Copyright (C) 2011-2018 Free Software Foundation, Inc. ++ Copyright (C) 2011-2020 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by +@@ -79,9 +79,6 @@ + errno = -5; + perror (""); + ASSERT (!ferror (stderr)); +- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1)); +- ASSERT (msg2 == msg4 || STREQ (msg2, str2)); +- ASSERT (msg3 == msg4 || STREQ (msg3, str3)); + ASSERT (STREQ (msg4, str4)); + + free (str1); +--- a/libmissing/tests/test-strerror_r.c 2020-09-09 16:42:01.084000000 +0200 ++++ b/libmissing/tests/test-strerror_r.c 2020-09-21 13:38:26.272383783 +0200 +@@ -1,5 +1,5 @@ + /* Test of strerror_r() function. +- Copyright (C) 2007-2018 Free Software Foundation, Inc. ++ Copyright (C) 2007-2020 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by +@@ -165,9 +165,6 @@ + + strerror_r (EACCES, buf, sizeof buf); + strerror_r (-5, buf, sizeof buf); +- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1)); +- ASSERT (msg2 == msg4 || STREQ (msg2, str2)); +- ASSERT (msg3 == msg4 || STREQ (msg3, str3)); + ASSERT (STREQ (msg4, str4)); + + free (str1); diff --git a/prelude-manager-5.1.0-fix-test_rwlock1.patch b/prelude-manager-5.2.0-fix-test_rwlock1.patch similarity index 100% rename from prelude-manager-5.1.0-fix-test_rwlock1.patch rename to prelude-manager-5.2.0-fix-test_rwlock1.patch diff --git a/prelude-manager-5.1.0-fix_cond_test.patch b/prelude-manager-5.2.0-fix_cond_test.patch similarity index 100% rename from prelude-manager-5.1.0-fix_cond_test.patch rename to prelude-manager-5.2.0-fix_cond_test.patch diff --git a/prelude-manager-5.1.0-fix_etc_perms.patch b/prelude-manager-5.2.0-fix_etc_perms.patch similarity index 100% rename from prelude-manager-5.1.0-fix_etc_perms.patch rename to prelude-manager-5.2.0-fix_etc_perms.patch diff --git a/prelude-manager-5.1.0-fix_thread_create.patch b/prelude-manager-5.2.0-fix_thread_create.patch similarity index 100% rename from prelude-manager-5.1.0-fix_thread_create.patch rename to prelude-manager-5.2.0-fix_thread_create.patch diff --git a/prelude-manager-5.1.0-gnutls_priority_init.patch b/prelude-manager-5.2.0-gnutls_priority_init.patch similarity index 100% rename from prelude-manager-5.1.0-gnutls_priority_init.patch rename to prelude-manager-5.2.0-gnutls_priority_init.patch diff --git a/prelude-manager.spec b/prelude-manager.spec index 621f323..b0b9ea1 100644 --- a/prelude-manager.spec +++ b/prelude-manager.spec @@ -1,10 +1,10 @@ # Notes about rpmlint # - crypto-policy-non-compliance-gnutls-{1,2} fixed with patch -# prelude-manager-5.1.0-gnutls_priority_init.patch +# prelude-manager-5.2.0-gnutls_priority_init.patch Name: prelude-manager -Version: 5.1.0 -Release: 4%{?dist} +Version: 5.2.0 +Release: 1%{?dist} Summary: Bus communicator for Prelude modules and other IDMEF agents # Prelude is GPL-2.0+ # libmissing is LGPL-2.1+ @@ -14,12 +14,14 @@ Source0: https://www.prelude-siem.org/pkg/src/%{version}/%{name}-%{versio Source1: %{name}.service Source2: %{name}-tmpfiles.conf # https://www.prelude-siem.org/issues/862 -Patch0: prelude-manager-5.1.0-gnutls_priority_init.patch +Patch0: prelude-manager-5.2.0-gnutls_priority_init.patch # https://www.prelude-siem.org/issues/870 -Patch1: prelude-manager-5.1.0-fix_etc_perms.patch -Patch2: prelude-manager-5.1.0-fix_cond_test.patch -Patch3: prelude-manager-5.1.0-fix-test_rwlock1.patch -Patch4: prelude-manager-5.1.0-fix_thread_create.patch +Patch1: prelude-manager-5.2.0-fix_etc_perms.patch +Patch2: prelude-manager-5.2.0-fix_cond_test.patch +Patch3: prelude-manager-5.2.0-fix-test_rwlock1.patch +Patch4: prelude-manager-5.2.0-fix_thread_create.patch +Patch5: prelude-manager-5.2.0-Add_missing_gnutls_deps.patch +Patch6: prelude-manager-5.2.0-fix-test-perror2.patch BuildRequires: gcc BuildRequires: systemd BuildRequires: libgcrypt-devel @@ -28,6 +30,7 @@ BuildRequires: pkgconfig(gnutls) BuildRequires: pkgconfig(libprelude) >= %{version} BuildRequires: pkgconfig(libxml-2.0) BuildRequires: libpreludedb-devel >= %{version} +BuildRequires: net-snmp-devel %{?systemd_requires} Requires: prelude-tools @@ -37,7 +40,7 @@ BuildRequires: valgrind %endif # Upstream do not use explicit version of gnulib, just checkout -# and update files. In libprelude 5.1.0, the checkout has been done +# and update files. In prelude-manager 5.2.0, the checkout has been done # on 2018-09-03 Provides: bundled(gnulib) = 20180903 @@ -68,10 +71,36 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description xml-plugin This plugin allows prelude-manager to log into XML files. +%package relaying-plugin +Summary: Relaying plugin for Prelude Manager +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description relaying-plugin +This plugin allows prelude-manager relay IDMEF alerts to another +prelude-manager. + +%package script-plugin +Summary: Script plugin for Prelude Manager +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description script-plugin +This plugin allows prelude-manager to execute scripts. + +%package snmp-plugin +Summary: SNMP plugin for Prelude Manager +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: net-snmp-libs + +%description snmp-plugin +This plugin allows prelude-manager to report alerts through SNMP. + %package devel Summary: Libraries, includes, etc. to develop Prelude Manager plugins Requires: %{name}-db-plugin%{?_isa} = %{version}-%{release} Requires: %{name}-xml-plugin%{?_isa} = %{version}-%{release} +Requires: %{name}-relaying-plugin%{?_isa} = %{version}-%{release} +Requires: %{name}-script-plugin%{?_isa} = %{version}-%{release} +Requires: %{name}-snmp-plugin%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -88,6 +117,13 @@ Provides documentation for prelude-manager. %autosetup -p1 %build +# This package's testsuite seems to mishandle --as-needed for the linker and +# as a result we don't have a DT_NEEDED for libpthread and various symbols +# do not get properly resolved causing testsuite failures. +# There is still a slim chance this is a linker error which we will investigate +# once Nick returns from PTO +%define _lto_cflags %{nil} + %configure \ --disable-static \ --enable-shared @@ -163,6 +199,15 @@ make check %dir %{_datadir}/%{name}/xmlmod %{_datadir}/%{name}/xmlmod/idmef-message.dtd +%files relaying-plugin +%{_libdir}/%{name}/reports/relaying.so + +%files script-plugin +%{_libdir}/%{name}/reports/script.so + +%files snmp-plugin +%{_libdir}/%{name}/reports/snmp.so + %files devel %dir %{_includedir}/%{name} %{_includedir}/%{name}/*.h @@ -171,8 +216,12 @@ make check %license COPYING HACKING.README %doc AUTHORS COPYING ChangeLog HACKING.README NEWS README %doc %{_docdir}/%{name}/smtp/template.example +%doc %{_docdir}/%{name}/snmp/PRELUDE-SIEM-MIB.mib %changelog +* Thu Sep 17 2020 Thomas Andrejak - 5.2.0-1 +- Bump version 5.2.0 + * Sat Aug 01 2020 Fedora Release Engineering - 5.1.0-4 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild @@ -183,7 +232,7 @@ make check * Thu Jan 30 2020 Fedora Release Engineering - 5.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild -* Fri Nov 09 2019 Thomas Andrejak - 5.1.0-1 +* Fri Nov 08 2019 Thomas Andrejak - 5.1.0-1 - Bump version 5.1.0 * Fri Jul 26 2019 Fedora Release Engineering - 5.0.0-2 diff --git a/sources b/sources index b11bc23..2f732b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (prelude-manager-5.1.0.tar.gz) = 1f0e993f9bf684ec65a741db3cdaf537dc47bc2f77652a37c194db422dd5da2aa33b78d3ee454c78b28b44c022eacc7246ee99187b0b8779c12f3a67320d89a3 +SHA512 (prelude-manager-5.2.0.tar.gz) = 49f8fd10c7f3c5c816e6bc49ce8d47abfe56b4b0a1d8a564774f67ef5f0e3058c62ef9c88ca709b1fe2961ed832269fe811ddf57d4118879fa561970561507d6