From e9627feb884439053efdabf0ff81121f7bc26537 Mon Sep 17 00:00:00 2001 From: Thomas Andrejak Date: Apr 24 2018 20:51:40 +0000 Subject: Bump version 4.1.1 --- diff --git a/.gitignore b/.gitignore index 2adaba4..7cae522 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/prelude-manager-4.0.0.tar.gz +/prelude-manager-4.1.1.tar.gz diff --git a/prelude-manager-4.0.0-fix_etc_perms.patch b/prelude-manager-4.0.0-fix_etc_perms.patch deleted file mode 100644 index b7eaef5..0000000 --- a/prelude-manager-4.0.0-fix_etc_perms.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- ./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: diff --git a/prelude-manager-4.0.0-gnutls_priority_init.patch b/prelude-manager-4.0.0-gnutls_priority_init.patch deleted file mode 100644 index 06c4560..0000000 --- a/prelude-manager-4.0.0-gnutls_priority_init.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- ./src/manager-auth.c 2016-09-15 08:49:17.621000884 +0200 -+++ ./src/manager-auth.c 2017-01-30 00:34:26.922258220 +0100 -@@ -557,7 +557,7 @@ - int ret; - const char *errptr; - -- ret = gnutls_priority_init(&tls_priority, (tlsopts) ? tlsopts : "NORMAL", &errptr); -+ ret = gnutls_priority_init(&tls_priority, (tlsopts) ? tlsopts : "@SYSTEM", &errptr); - if ( ret < 0 ) { - prelude_log(PRELUDE_LOG_ERR, "TLS priority error: %s: '%s'.\n", gnutls_strerror(ret), errptr); - return -2; ---- ./prelude-manager.conf.in 2016-09-15 08:49:17.620000884 +0200 -+++ ./prelude-manager.conf.in 2017-02-07 01:12:13.221471869 +0100 -@@ -96,8 +96,8 @@ - # Note that much more settings might be enabled or disabled using this - # option: please see gnutls_priority_init(3) for more details. - # --# The default settings is "NORMAL". --# tls-options = NORMAL -+# The default settings is "@SYSTEM". -+# tls-options = @SYSTEM - - - # diff --git a/prelude-manager-4.1.1-fix_etc_perms.patch b/prelude-manager-4.1.1-fix_etc_perms.patch new file mode 100644 index 0000000..b7eaef5 --- /dev/null +++ b/prelude-manager-4.1.1-fix_etc_perms.patch @@ -0,0 +1,29 @@ +--- ./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: diff --git a/prelude-manager-4.1.1-gnutls_priority_init.patch b/prelude-manager-4.1.1-gnutls_priority_init.patch new file mode 100644 index 0000000..06c4560 --- /dev/null +++ b/prelude-manager-4.1.1-gnutls_priority_init.patch @@ -0,0 +1,24 @@ +--- ./src/manager-auth.c 2016-09-15 08:49:17.621000884 +0200 ++++ ./src/manager-auth.c 2017-01-30 00:34:26.922258220 +0100 +@@ -557,7 +557,7 @@ + int ret; + const char *errptr; + +- ret = gnutls_priority_init(&tls_priority, (tlsopts) ? tlsopts : "NORMAL", &errptr); ++ ret = gnutls_priority_init(&tls_priority, (tlsopts) ? tlsopts : "@SYSTEM", &errptr); + if ( ret < 0 ) { + prelude_log(PRELUDE_LOG_ERR, "TLS priority error: %s: '%s'.\n", gnutls_strerror(ret), errptr); + return -2; +--- ./prelude-manager.conf.in 2016-09-15 08:49:17.620000884 +0200 ++++ ./prelude-manager.conf.in 2017-02-07 01:12:13.221471869 +0100 +@@ -96,8 +96,8 @@ + # Note that much more settings might be enabled or disabled using this + # option: please see gnutls_priority_init(3) for more details. + # +-# The default settings is "NORMAL". +-# tls-options = NORMAL ++# The default settings is "@SYSTEM". ++# tls-options = @SYSTEM + + + # diff --git a/prelude-manager.spec b/prelude-manager.spec index 77154f6..11ed7d8 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-4.0.0-gnutls_priority_init.patch +# prelude-manager-4.1.1-gnutls_priority_init.patch Name: prelude-manager -Version: 4.0.0 -Release: 3%{?dist} +Version: 4.1.1 +Release: 1%{?dist} Summary: Bus communicator for Prelude modules and other IDMEF agents # Prelude is GPL-2.0+ # libmissing is LGPL-2.1+ @@ -14,16 +14,16 @@ 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-4.0.0-gnutls_priority_init.patch +Patch0: prelude-manager-4.1.1-gnutls_priority_init.patch # https://www.prelude-siem.org/issues/870 -Patch1: prelude-manager-4.0.0-fix_etc_perms.patch +Patch1: prelude-manager-4.1.1-fix_etc_perms.patch BuildRequires: systemd BuildRequires: libgcrypt-devel BuildRequires: libgpg-error-devel BuildRequires: pkgconfig(gnutls) -BuildRequires: pkgconfig(libprelude) >= %{version} +BuildRequires: pkgconfig(libprelude) >= 4.1.0 BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: libpreludedb-devel >= %{version} +BuildRequires: libpreludedb-devel >= 4.1.0 %{?systemd_requires} Requires: prelude-tools @@ -33,9 +33,9 @@ BuildRequires: valgrind %endif # Upstream do not use explicit version of gnulib, just checkout -# and update files. In libprelude 4.0.0, the checkout has been done -# on 2017-01-05 -Provides: bundled(gnulib) = 20170105 +# and update files. In libprelude 4.1.0, the checkout has been done +# on 2017-07-10 +Provides: bundled(gnulib) = 20170710 %description Prelude Manager is the main program of the Prelude SIEM suite. It is a @@ -169,6 +169,9 @@ make check %doc %{_docdir}/%{name}/smtp/template.example %changelog +* Tue Apr 24 2018 Thomas Andrejak - 4.1.1-1 +- Bump version 4.1.1 + * Fri Feb 09 2018 Fedora Release Engineering - 4.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index c4cc087..a009052 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (prelude-manager-4.0.0.tar.gz) = 793ed37c71eb4884cbbb49b11c7388ee291a35252255458ceadb4ce10d1392e8bad423f95e31bff4550a9cf1d04139e43729352554fd847048b6c8d14f813a8a +SHA512 (prelude-manager-4.1.1.tar.gz) = 4e9d09b56eb7ec55144caa06a04e458bf0462d8c0064a34aac5aa0fb96a30fbefe5a4956185b606ec58fc410e4cbcac8721e521b3396303b3bff88808042a966