diff --git a/.gitignore b/.gitignore index e390fd2..5b4dfca 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -/libpreludedb-4.1.0.tar.gz -/libpreludedb-5.0.0.tar.gz -/libpreludedb-5.1.0.tar.gz +/libpreludedb-5.2.0.tar.gz diff --git a/libpreludedb-5.0.0.tar.gz b/libpreludedb-5.0.0.tar.gz deleted file mode 100644 index b41204f..0000000 Binary files a/libpreludedb-5.0.0.tar.gz and /dev/null differ diff --git a/libpreludedb-5.1.0-fix_py38.patch b/libpreludedb-5.1.0-fix_py38.patch deleted file mode 100644 index 3354cb1..0000000 --- a/libpreludedb-5.1.0-fix_py38.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./bindings/python/_preludedb.cxx 2019-07-13 08:39:59.744285379 +0200 -+++ ./bindings/python/_preludedb.cxx 2019-07-13 08:41:47.364117843 +0200 -@@ -3133,7 +3133,7 @@ - - SWIGINTERN void - SwigPyStaticVar_dealloc(PyDescrObject *descr) { -- _PyObject_GC_UNTRACK(descr); -+ PyObject_GC_UnTrack(descr); - Py_XDECREF(PyDescr_TYPE(descr)); - Py_XDECREF(PyDescr_NAME(descr)); - PyObject_GC_Del(descr); diff --git a/libpreludedb-5.1.0-Add-pkg-config-file.patch b/libpreludedb-5.2.0-Add-pkg-config-file.patch similarity index 100% rename from libpreludedb-5.1.0-Add-pkg-config-file.patch rename to libpreludedb-5.2.0-Add-pkg-config-file.patch diff --git a/libpreludedb-5.2.0-Clean_libpreludedb-config.patch b/libpreludedb-5.2.0-Clean_libpreludedb-config.patch new file mode 100644 index 0000000..ccb511b --- /dev/null +++ b/libpreludedb-5.2.0-Clean_libpreludedb-config.patch @@ -0,0 +1,50 @@ +Description: Clean libpreludedb-config +Author: Thomas Andrejak +Last-Update: 2020-09-20 + +--- a/libpreludedb-config.in 2020-09-09 16:36:50.110000000 +0200 ++++ b/libpreludedb-config.in 2020-09-20 23:30:02.097649400 +0200 +@@ -3,6 +3,7 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + exec_prefix_set=no ++cpp_set=no + want_cflags=no + want_libs=no + thread_set=no +@@ -54,6 +55,10 @@ + echo @LIBPRELUDE_LDFLAGS@ + ;; + ++ --c++) ++ cpp_set=yes ++ ;; ++ + --libs) + want_libs=yes + ;; +@@ -90,7 +95,14 @@ + + + if test $want_libs = yes; then +- libdirs=-L@libdir@ ++ libdirs= ++ if test @libdir@ != /usr/lib -a @libdir@ != /usr/lib64 ; then ++ libdirs=-L@libdir@ ++ fi ++ cpplibs="" ++ if test $cpp_set = yes; then ++ cpplibs="-lpreludedbcpp" ++ fi + + if test $thread_set = yes; then + thrlibs=@LTLIBMULTITHREAD@ +@@ -98,7 +110,7 @@ + thrlibs=@LTLIBTHREAD@ + fi + +- echo $libdirs -lpreludedb @LIBPRELUDE_LIBS@ $thrlibs ++ echo $cpplibs $libdirs -lpreludedb $thrlibs + fi + + exit 0 diff --git a/libpreludedb-5.1.0-Fix_libdir_definition.patch b/libpreludedb-5.2.0-Fix_libdir_definition.patch similarity index 100% rename from libpreludedb-5.1.0-Fix_libdir_definition.patch rename to libpreludedb-5.2.0-Fix_libdir_definition.patch diff --git a/libpreludedb-5.1.0-fix-test_rwlock1.patch b/libpreludedb-5.2.0-fix-test_rwlock1.patch similarity index 100% rename from libpreludedb-5.1.0-fix-test_rwlock1.patch rename to libpreludedb-5.2.0-fix-test_rwlock1.patch diff --git a/libpreludedb-5.1.0-fix_gtkdoc_1.32.patch b/libpreludedb-5.2.0-fix_gtkdoc_1.32.patch similarity index 100% rename from libpreludedb-5.1.0-fix_gtkdoc_1.32.patch rename to libpreludedb-5.2.0-fix_gtkdoc_1.32.patch diff --git a/libpreludedb-5.1.0-fix_thread_create.patch b/libpreludedb-5.2.0-fix_thread_create.patch similarity index 100% rename from libpreludedb-5.1.0-fix_thread_create.patch rename to libpreludedb-5.2.0-fix_thread_create.patch diff --git a/libpreludedb-5.1.0-force_preludedb_admin_with_py3.patch b/libpreludedb-5.2.0-force_preludedb_admin_with_py3.patch similarity index 84% rename from libpreludedb-5.1.0-force_preludedb_admin_with_py3.patch rename to libpreludedb-5.2.0-force_preludedb_admin_with_py3.patch index c0ee8f3..0e502bf 100644 --- a/libpreludedb-5.1.0-force_preludedb_admin_with_py3.patch +++ b/libpreludedb-5.2.0-force_preludedb_admin_with_py3.patch @@ -8,5 +8,5 @@ Last-Update: 2019-09-20 -#!/usr/bin/env python +#!/usr/bin/env python3 # - # Copyright (C) 2019 CS-SI. All Rights Reserved. + # Copyright (C) 2019-2020 CS GROUP - France. All Rights Reserved. # Author: Yoann Vandoorselaere diff --git a/libpreludedb-5.1.0-undefined_non_weak_symbol.patch b/libpreludedb-5.2.0-undefined_non_weak_symbol.patch similarity index 100% rename from libpreludedb-5.1.0-undefined_non_weak_symbol.patch rename to libpreludedb-5.2.0-undefined_non_weak_symbol.patch diff --git a/libpreludedb-5.1.0-update_m4_postgresql.patch b/libpreludedb-5.2.0-update_m4_postgresql.patch similarity index 100% rename from libpreludedb-5.1.0-update_m4_postgresql.patch rename to libpreludedb-5.2.0-update_m4_postgresql.patch diff --git a/libpreludedb.spec b/libpreludedb.spec index 5698aa4..b75b491 100644 --- a/libpreludedb.spec +++ b/libpreludedb.spec @@ -4,8 +4,8 @@ %global cppmajor 2 Name: libpreludedb -Version: 5.1.0 -Release: 5%{?dist} +Version: 5.2.0 +Release: 1%{?dist} Summary: Framework for easy access to the IDMEF database # Prelude is GPL-2.0+ # libmissing is LGPL-2.1+ @@ -13,15 +13,14 @@ License: GPLv2+ URL: https://www.prelude-siem.org/ Source0: https://www.prelude-siem.org/pkg/src/%{version}/%{name}-%{version}.tar.gz # https://www.prelude-siem.org/issues/867 -Patch0: libpreludedb-5.1.0-undefined_non_weak_symbol.patch -Patch1: libpreludedb-5.1.0-fix_py38.patch -Patch2: libpreludedb-5.1.0-fix_gtkdoc_1.32.patch -Patch3: libpreludedb-5.1.0-force_preludedb_admin_with_py3.patch -Patch4: libpreludedb-5.1.0-update_m4_postgresql.patch -Patch5: libpreludedb-5.1.0-Add-pkg-config-file.patch -Patch6: libpreludedb-5.1.0-Fix_libdir_definition.patch -Patch7: libpreludedb-5.1.0-fix-test_rwlock1.patch -Patch8: libpreludedb-5.1.0-fix_thread_create.patch +Patch0: libpreludedb-5.2.0-undefined_non_weak_symbol.patch +Patch1: libpreludedb-5.2.0-fix_gtkdoc_1.32.patch +Patch2: libpreludedb-5.2.0-force_preludedb_admin_with_py3.patch +Patch3: libpreludedb-5.2.0-update_m4_postgresql.patch +Patch4: libpreludedb-5.2.0-Add-pkg-config-file.patch +Patch5: libpreludedb-5.2.0-fix-test_rwlock1.patch +Patch6: libpreludedb-5.2.0-fix_thread_create.patch +Patch7: libpreludedb-5.2.0-Clean_libpreludedb-config.patch BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: bison @@ -29,7 +28,6 @@ BuildRequires: chrpath BuildRequires: flex BuildRequires: gtk-doc BuildRequires: glib2-devel -BuildRequires: swig BuildRequires: pkgconfig(gnutls) BuildRequires: libgpg-error-devel BuildRequires: mariadb-connector-c-devel @@ -51,7 +49,7 @@ Suggests: preludedb-pgsql Suggests: preludedb-sqlite3 # 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 libprelude 5.2.0, the checkout has been done # on 2018-09-03 Provides: bundled(gnulib) = 20180903 @@ -129,7 +127,7 @@ Provides documentation for preludedb generated by gtk-doc. --disable-static \ --enable-shared \ --includedir=%{_includedir}/%{name} \ - --with-swig \ + --without-swig \ --with-perl-installdirs=vendor \ --without-python2 \ --with-python3 \ @@ -209,6 +207,9 @@ chmod +x %{buildroot}%{_datadir}/%{name}/classic/mysql2sqlite.sh %doc ChangeLog README NEWS %changelog +* Thu Sep 17 2020 Thomas Andrejak - 5.2.0-1 +- Bump version 5.2.0 + * Tue Jul 28 2020 Fedora Release Engineering - 5.1.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 46172a9..3380b26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpreludedb-5.1.0.tar.gz) = 9e45e0f7a945eef254f8e59c0c7212c6afca897584ea8f2c88e16478fde448abdeeb991828cc2482373d2c735e1229f1a11fe9780e40da1a8aed867fe158f481 +SHA512 (libpreludedb-5.2.0.tar.gz) = 357e3ce69927ed405bc757774466631d34cad9b53031be6ce456238dd8aef3781471ecbb36ab4a3131468f4686a635095aaf837d23a0efc9db758322298e7744