Hello community, here is the log from the commit of package libpreludedb for openSUSE:Factory checked in at 2020-10-29 09:23:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libpreludedb (Old) and /work/SRC/openSUSE:Factory/.libpreludedb.new.3463 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libpreludedb" Thu Oct 29 09:23:08 2020 rev:10 rq:844632 version:5.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libpreludedb/libpreludedb.changes 2020-03-19 19:54:09.808277392 +0100 +++ /work/SRC/openSUSE:Factory/.libpreludedb.new.3463/libpreludedb.changes 2020-10-29 09:23:11.566738752 +0100 @@ -1,0 +2,12 @@ +Sun Oct 25 18:06:12 UTC 2020 - Andreas Stieger <andreas.stie...@gmx.de> + +- libpreludedb 5.2.0: + * build system fixes + * Python 3.7/3.8 support + * Update to SWIG 4.0.1 + * Escaping fixes with LIKE operator +- drop upstreamed patches: + * libpreludedb-fix_py38.patch +- add upstream signing key and verify source signature + +------------------------------------------------------------------- Old: ---- libpreludedb-5.1.0.tar.gz libpreludedb-fix_py38.patch New: ---- libpreludedb-5.2.0.tar.gz libpreludedb-5.2.0.tar.gz.sig libpreludedb.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpreludedb.spec ++++++ --- /var/tmp/diff_new_pack.m9EG8Y/_old 2020-10-29 09:23:12.506739653 +0100 +++ /var/tmp/diff_new_pack.m9EG8Y/_new 2020-10-29 09:23:12.510739657 +0100 @@ -20,7 +20,7 @@ %define sover 7 %define sover_cpp 2 Name: libpreludedb -Version: 5.1.0 +Version: 5.2.0 Release: 0 Summary: Framework to easy access to the Prelude database # Prelude is GPL-2.0+ @@ -30,25 +30,25 @@ Group: Productivity/Networking/Security URL: https://www.prelude-siem.org Source0: https://www.prelude-siem.org/pkg/src/%{version}/%{name}-%{version}.tar.gz +Source1: https://www.prelude-siem.org/pkg/src/%{version}/%{name}-%{version}.tar.gz.sig +Source2: https://www.prelude-siem.org/attachments/download/233/RPM-GPG-KEY-Prelude-IDS#/%{name}.keyring # Fix undefined non weak symbol Patch0: libpreludedb-undefined_non_weak_symbol.patch Patch1: libpreludedb-fix_gtkdoc_1.32.patch -Patch2: libpreludedb-fix_py38.patch Patch3: libpreludedb-force_preludedb_admin_with_py3.patch Patch4: libpreludedb-update_m4_postgresql.patch BuildRequires: gcc-c++ BuildRequires: gtk-doc -BuildRequires: libprelude-devel +BuildRequires: libprelude-devel >= 5.2.0 BuildRequires: mysql-devel BuildRequires: pkgconfig BuildRequires: postgresql-devel +BuildRequires: python3-devel +BuildRequires: sqlite-devel >= 3.0.0 +Requires: libprelude-tools >= 5.2.0 %if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200 BuildRequires: postgresql-server-devel %endif -BuildRequires: python3-devel -BuildRequires: sqlite-devel -Requires: libprelude-tools -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The PreludeDB Library provides an abstraction layer upon the type and the @@ -83,7 +83,7 @@ Summary: Development files for libpreludedb Group: Development/Libraries/C and C++ Requires: automake -Requires: libprelude-devel +Requires: libprelude-devel >= 5.2.0 Requires: libpreludedb%{sover} = %{version} Requires: libpreludedbcpp%{sover_cpp} = %{version} Requires: mysql-devel @@ -177,7 +177,6 @@ %setup -q %patch0 %patch1 -%patch2 %patch3 %patch4 @@ -190,7 +189,7 @@ sed -i.rpath -e 's|LD_RUN_PATH=""||' bindings/Makefile sed -i.rpath -e 's|^sys_lib_dlsearch_path_spec="/lib %{_prefix}/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool -make %{?_smp_mflags} +%make_build %install %make_install @@ -206,35 +205,35 @@ %postun -n libpreludedbcpp%{sover_cpp} -p /sbin/ldconfig %files -n %{name}%{sover} -%defattr(-,root,root) +%license COPYING %{_libdir}/libpreludedb.so.%{sover}* %files -n %{name}cpp%{sover_cpp} -%defattr(-,root,root) +%license COPYING %{_libdir}/libpreludedbcpp.so.%{sover_cpp}* %files -n preludedb-tools -%defattr(-,root,root) -%{_mandir}/man1/preludedb-admin.1%{ext_man} +%license COPYING +%{_mandir}/man1/preludedb-admin.1%{?ext_man} %{_bindir}/preludedb-admin %files plugins -%defattr(-,root,root) +%license COPYING %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/plugins %{_libdir}/%{name}/plugins/formats/ %files devel -%defattr(-,root,root) +%license COPYING %{_bindir}/libpreludedb-config %{_includedir}/libpreludedb %{_libdir}/libpreludedb.so %{_libdir}/libpreludedbcpp.so %{_datadir}/aclocal/libpreludedb.m4 -%{_mandir}/man1/libpreludedb-config.1%{ext_man} +%{_mandir}/man1/libpreludedb-config.1%{?ext_man} %files devel-bindings -%defattr(-,root,root) +%license COPYING %dir %{_datadir}/libpreludedb%{sover}/ %dir %{_datadir}/libpreludedb%{sover}/swig/ %{_datadir}/libpreludedb%{sover}/swig/libpreludedbcpp.i @@ -242,10 +241,11 @@ %{_datadir}/libpreludedb%{sover}/swig/python/libpreludedbcpp-python.i %files -n python3-%{name} -%defattr(-,root,root) +%license COPYING %{python_sitearch3}/* %files mysql +%license COPYING %defattr(0755,root,root) %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/plugins @@ -257,7 +257,7 @@ %attr(0755,root,root) %{_datadir}/%{name}/classic/*.sh %files sqlite -%defattr(-,root,root) +%license COPYING %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/plugins %dir %{_libdir}/%{name}/plugins/sql @@ -267,7 +267,7 @@ %{_datadir}/%{name}/classic/sqlite* %files pgsql -%defattr(-,root,root) +%license COPYING %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/plugins %dir %{_libdir}/%{name}/plugins/sql @@ -277,9 +277,8 @@ %{_datadir}/%{name}/classic/pgsql* %files doc -%defattr(-,root,root) -%doc %{_docdir}/%{name}-%{version} %license COPYING LICENSE.README +%doc %{_docdir}/%{name}-%{version} %doc ChangeLog README NEWS HACKING.README %changelog ++++++ libpreludedb-5.1.0.tar.gz -> libpreludedb-5.2.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/ChangeLog new/libpreludedb-5.2.0/ChangeLog --- old/libpreludedb-5.1.0/ChangeLog 2019-09-16 00:05:48.322000000 +0200 +++ new/libpreludedb-5.2.0/ChangeLog 2020-09-09 16:37:57.565000000 +0200 @@ -1,5 +1,210 @@ # Generated by Makefile. Do not edit. +commit b82df2fbb3a505fa2a21e58752a9cb7b5563a198 +Author: Antoine LUONG <antoine.lu...@c-s.fr> +Date: Wed Sep 9 13:27:49 2020 +0200 + + Update NEWS, bump version + + Change-Id: Ia479dddbece217eb44d5df265436bcd31ae5f4a1 + + NEWS | 8 ++++++++ + configure.ac | 6 +++--- + 2 files changed, 11 insertions(+), 3 deletions(-) + +commit b0a21bc8aadb58b3b3f118261742d457d188c53f +Author: Antoine LUONG <antoine.lu...@c-s.fr> +Date: Thu Jul 30 20:00:10 2020 +0200 + + [#4084] Change company name + + Change-Id: Ic1719ac5d3151b94495001b8abd447318e0022c3 + + HACKING.README | 4 ++-- + LICENSE.README | 4 ++-- + README | 6 +++--- + bindings/c++/include/preludedb-error.hxx | 2 +- + bindings/c++/preludedb-error.cxx | 2 +- + bindings/libpreludedbcpp.i | 2 +- + bindings/python/setup.py.in | 4 ++-- + docs/manpages/libpreludedb-config.1 | 2 +- + docs/manpages/preludedb-admin.1 | 2 +- + plugins/format/classic/classic-delete.c | 2 +- + plugins/format/classic/classic-get.c | 2 +- + plugins/format/classic/classic-insert.c | 2 +- + plugins/format/classic/classic-path-resolve.c | 2 +- + plugins/format/classic/classic-sql-join.c | 2 +- + plugins/format/classic/classic.c | 2 +- + plugins/format/classic/include/classic-delete.h | 2 +- + plugins/format/classic/include/classic-get.h | 2 +- + plugins/format/classic/include/classic-insert.h | 2 +- + plugins/format/classic/include/classic-path-resolve.h | 2 +- + plugins/format/classic/include/classic-sql-join.h | 2 +- + plugins/sql/mysql/mysql.c | 2 +- + plugins/sql/pgsql/pgsql.c | 2 +- + plugins/sql/sqlite3/sqlite3.c | 2 +- + preludedb-admin | 2 +- + src/include/preludedb-error.h | 2 +- + src/include/preludedb-path-selection.h | 2 +- + src/include/preludedb-plugin-format-prv.h | 2 +- + src/include/preludedb-plugin-format.h | 2 +- + src/include/preludedb-plugin-sql.h | 2 +- + src/include/preludedb-sql-select.h | 2 +- + src/include/preludedb-sql-settings.h | 2 +- + src/include/preludedb-sql.h | 2 +- + src/include/preludedb-version.h.in | 2 +- + src/include/preludedb.h | 2 +- + src/preludedb-error.c | 2 +- + src/preludedb-path-selection-parser.lex.c | 2 +- + src/preludedb-path-selection-parser.lex.l | 2 +- + src/preludedb-path-selection-parser.yac.y | 2 +- + src/preludedb-path-selection.c | 2 +- + src/preludedb-plugin-format.c | 2 +- + src/preludedb-plugin-sql.c | 2 +- + src/preludedb-sql-select.c | 2 +- + src/preludedb-sql-settings.c | 2 +- + src/preludedb-sql.c | 2 +- + src/preludedb-version.c | 2 +- + src/preludedb.c | 2 +- + 46 files changed, 51 insertions(+), 51 deletions(-) + +commit 601cd5f9880c4e50d881504d25e8a8c810ea4784 +Author: Antoine LUONG <antoine.lu...@c-s.fr> +Date: Thu Jul 23 15:17:01 2020 +0200 + + Update NEWS, bump version + + Change-Id: I455c0b96be58782bcccc64c288677f5f2eafe110 + + NEWS | 1 + + configure.ac | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit f5267cd2059480335ccd5b80b703e1ca360fe494 +Author: Antoine LUONG <antoine.lu...@c-s.fr> +Date: Tue Jun 30 16:51:24 2020 +0200 + + Update NEWS, bump version + + Change-Id: I98d4307670d0fe4d90f78c7addd90b3c123b897b + + NEWS | 6 ++++++ + configure.ac | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit f2279d218981ff861fefb26123f89038b1b8c53c +Author: Antoine LUONG <antoine.lu...@c-s.fr> +Date: Sat Jun 20 15:03:17 2020 +0200 + + Update NEWS, bump version + + Change-Id: Iff7195b1203c42ffdbd1c82e8436efba7873f8a0 + + NEWS | 18 ++++++++++++++++++ + configure.ac | 10 +++++----- + 2 files changed, 23 insertions(+), 5 deletions(-) + +commit 63996691d0cb0e4aaa5ff82f4990a17302cdba87 +Author: Francois POIROTTE <francois.poiro...@c-s.fr> +Date: Wed Jan 8 11:04:14 2020 +0100 + + [#3875] Remove superfluous brackets in AC_INIT + + Change-Id: Ibbc2014a98fdbc360478a2c168f574bb2c10c17a + + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f4c484cb4fc8bd1c194ed9cfe5301f841573db3a +Author: Antoine LUONG <antoine.lu...@c-s.fr> +Date: Wed Jan 15 12:09:07 2020 +0100 + + [#3878] Copyright year update + + Change-Id: I6352e43e7bc0773861fe4341efaa9564ce5a478e + + LICENSE.README | 2 +- + bindings/c++/include/preludedb-error.hxx | 2 +- + bindings/c++/preludedb-error.cxx | 2 +- + bindings/libpreludedbcpp.i | 2 +- + bindings/python/setup.py.in | 2 +- + docs/manpages/preludedb-admin.1 | 2 +- + plugins/format/classic/classic-delete.c | 2 +- + plugins/format/classic/classic-get.c | 2 +- + plugins/format/classic/classic-insert.c | 2 +- + plugins/format/classic/classic-path-resolve.c | 2 +- + plugins/format/classic/classic-sql-join.c | 2 +- + plugins/format/classic/classic.c | 2 +- + plugins/format/classic/include/classic-delete.h | 2 +- + plugins/format/classic/include/classic-get.h | 2 +- + plugins/format/classic/include/classic-insert.h | 2 +- + plugins/format/classic/include/classic-path-resolve.h | 2 +- + plugins/format/classic/include/classic-sql-join.h | 2 +- + plugins/sql/mysql/mysql.c | 2 +- + plugins/sql/pgsql/pgsql.c | 2 +- + plugins/sql/sqlite3/sqlite3.c | 2 +- + preludedb-admin | 2 +- + src/include/preludedb-error.h | 2 +- + src/include/preludedb-path-selection.h | 2 +- + src/include/preludedb-plugin-format-prv.h | 2 +- + src/include/preludedb-plugin-format.h | 2 +- + src/include/preludedb-plugin-sql.h | 2 +- + src/include/preludedb-sql-select.h | 2 +- + src/include/preludedb-sql-settings.h | 2 +- + src/include/preludedb-sql.h | 2 +- + src/include/preludedb-version.h.in | 2 +- + src/include/preludedb.h | 2 +- + src/preludedb-error.c | 2 +- + src/preludedb-path-selection-parser.lex.c | 2 +- + src/preludedb-path-selection-parser.lex.l | 2 +- + src/preludedb-path-selection-parser.yac.y | 2 +- + src/preludedb-path-selection.c | 2 +- + src/preludedb-plugin-format.c | 2 +- + src/preludedb-plugin-sql.c | 2 +- + src/preludedb-sql-select.c | 2 +- + src/preludedb-sql-settings.c | 2 +- + src/preludedb-sql.c | 2 +- + src/preludedb-version.c | 2 +- + src/preludedb.c | 2 +- + 43 files changed, 43 insertions(+), 43 deletions(-) + +commit 0507fffa849f15887b4a9ac4e23ed84f7d6591d5 +Author: Antoine LUONG <antoine.lu...@c-s.fr> +Date: Tue Oct 15 14:22:55 2019 +0200 + + [#3809] Add Python 3.7/3.8 support + + Change-Id: Iac074a09d89763cef3221ae544b7366815ba08bb + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5f6d1c1b322e54f67c2774d50577cb713f79ffab +Author: Antoine LUONG <antoine.lu...@c-s.fr> +Date: Fri Oct 18 12:05:37 2019 +0200 + + [#3809] Update to SWIG 4.0.1 + + Change-Id: I06fb2b8947135b3a68e29b74dcf8fef6ec1c2623 + + bindings/python/_preludedb.cxx | 18 ++++++------------ + bindings/python/preludedb.py | 35 +++-------------------------------- + 2 files changed, 9 insertions(+), 44 deletions(-) + +commit 2235984bf8081d4eb6a679606e84587253cac6ed +Author: Yoann Vandoorselaere <yoa...@gmail.com> +Date: Thu Sep 12 09:33:22 2019 +0200 + + [#rel3743] Escaping fixes + + - Properly map special LIKE _ character to ? + - \* is mapped to *, \? to ? + + Change-Id: I1451a2e781b773ecc6f41720885e751152cbe36d + + src/preludedb-sql.c | 26 ++++++++++++++++++++------ + 1 file changed, 20 insertions(+), 6 deletions(-) + commit c7e68a283e8e2cc73315000c03f6a3acf63f9382 Author: Antoine LUONG <antoine.lu...@c-s.fr> Date: Fri Sep 13 09:36:33 2019 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/HACKING.README new/libpreludedb-5.2.0/HACKING.README --- old/libpreludedb-5.1.0/HACKING.README 2019-09-16 00:01:32.743000000 +0200 +++ new/libpreludedb-5.2.0/HACKING.README 2020-09-09 16:36:50.052000000 +0200 @@ -2,9 +2,9 @@ the Prelude database. Changes: if you wish to contribute a change which is a significant one -in terms of the amount of code changes, please be aware that CS-SI wishes +in terms of the amount of code changes, please be aware that CS GROUP - France wishes to retain copyright of the PreludeDB library. Therefore you will have to -sign over copyright ownership of your code to CS-SI before we can include +sign over copyright ownership of your code to CS GROUP - France before we can include your changes in the main source tree. Before you start modifying anything for real, you should probably join diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/LICENSE.README new/libpreludedb-5.2.0/LICENSE.README --- old/libpreludedb-5.1.0/LICENSE.README 2019-09-16 00:01:35.253000000 +0200 +++ new/libpreludedb-5.2.0/LICENSE.README 2020-09-09 16:36:50.052000000 +0200 @@ -1,7 +1,7 @@ This directory and its children contain LibPreludeDB, a library for using the Prelude database. -Copyright (C) 2005-2019 CS-SI. All rights reserved. +Copyright (C) 2005-2020 CS GROUP - France. All rights reserved. This library is made available under a dual licensing scheme. @@ -14,7 +14,7 @@ 02110-1301, USA. For any other uses of LibPreludeDB, you must first obtain a commercial license -from CS-SI. Please send a mail to contact.prel...@c-s.fr for +from CS GROUP - France. Please send a mail to contact.prel...@csgroup.eu for information about commercial licensing. Please also read the information in the file HACKING.README. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/Makefile.in new/libpreludedb-5.2.0/Makefile.in --- old/libpreludedb-5.1.0/Makefile.in 2019-09-16 00:04:53.771000000 +0200 +++ new/libpreludedb-5.2.0/Makefile.in 2020-09-09 16:37:24.208000000 +0200 @@ -85,8 +85,7 @@ $(top_srcdir)/configure $(am__configure_deps) \ $(srcdir)/config.h.in $(srcdir)/libpreludedb-config.in \ $(dist_bin_SCRIPTS) COPYING ar-lib compile config.guess \ - config.rpath config.sub depcomp install-sh missing ylwrap \ - ltmain.sh + config.rpath config.sub install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/libmissing/m4/00gnulib.m4 \ $(top_srcdir)/libmissing/m4/absolute-header.m4 \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/NEWS new/libpreludedb-5.2.0/NEWS --- old/libpreludedb-5.1.0/NEWS 2019-09-16 00:01:35.254000000 +0200 +++ new/libpreludedb-5.2.0/NEWS 2020-09-09 16:36:50.053000000 +0200 @@ -1,3 +1,36 @@ +* 2020-09-09, libpreludedb-5.2.0: + +Author: Antoine Luong + +- Change company name + + + +* 2020-07-23, libpreludedb-5.2.0rc1: +* 2020-06-30, libpreludedb-5.2.0beta2: + +No new changes. + + + +* 2020-06-19, libpreludedb-5.2.0beta1: + +Author: Francois Poirotte + +- Remove superfluous brackets in AC_INIT + +Author: Antoine Luong + +- Python 3.7/3.8 support + +- Update to SWIG 4.0.1 + +Author: Yoann Vandoorselaere + +- Escaping fixes with LIKE operator + + + * 2019-09-13, libpreludedb-5.1.0: No new changes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/README new/libpreludedb-5.2.0/README --- old/libpreludedb-5.1.0/README 2019-09-16 00:01:32.750000000 +0200 +++ new/libpreludedb-5.2.0/README 2020-09-09 16:36:50.053000000 +0200 @@ -1,5 +1,5 @@ PreludeDB Library (https://www.prelude-siem.org) -PreludeDB is brought to you by CS-SI (http://www.c-s.fr). +PreludeDB is brought to you by CS GROUP (http://www.csgroup.eu). PreludeDB Library Overview @@ -47,8 +47,8 @@ https://www.prelude-siem.org/projects/prelude/boards -Commercial Support is available through the CS-SI company: - http://www.prelude-siem.com, contact.prel...@c-s.fr +Commercial Support is available through the CS GROUP - France company: + https://www.prelude-siem.com, contact.prel...@csgroup.eu diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/bindings/c++/include/preludedb-error.hxx new/libpreludedb-5.2.0/bindings/c++/include/preludedb-error.hxx --- old/libpreludedb-5.1.0/bindings/c++/include/preludedb-error.hxx 2019-09-16 00:01:35.256000000 +0200 +++ new/libpreludedb-5.2.0/bindings/c++/include/preludedb-error.hxx 2020-09-09 16:36:50.054000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2014-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2014-2020 CS GROUP - France. All Rights Reserved. * Author: Yoann Vandoorselaere <yo...@prelude-ids.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/bindings/c++/preludedb-error.cxx new/libpreludedb-5.2.0/bindings/c++/preludedb-error.cxx --- old/libpreludedb-5.1.0/bindings/c++/preludedb-error.cxx 2019-09-16 00:01:35.267000000 +0200 +++ new/libpreludedb-5.2.0/bindings/c++/preludedb-error.cxx 2020-09-09 16:36:50.054000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2014-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2014-2020 CS GROUP - France. All Rights Reserved. * Author: Yoann Vandoorselaere <yo...@prelude-ids.com> * * This file is part of the Prelude library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/bindings/libpreludedbcpp.i new/libpreludedb-5.2.0/bindings/libpreludedbcpp.i --- old/libpreludedb-5.1.0/bindings/libpreludedbcpp.i 2019-09-16 00:01:35.273000000 +0200 +++ new/libpreludedb-5.2.0/bindings/libpreludedbcpp.i 2020-09-09 16:36:50.055000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2014-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2014-2020 CS GROUP - France. All Rights Reserved. * Author: Yoann Vandoorselaere <yoan...@prelude-ids.com> * * This file is part of the Prelude library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/bindings/python/_preludedb.cxx new/libpreludedb-5.2.0/bindings/python/_preludedb.cxx --- old/libpreludedb-5.1.0/bindings/python/_preludedb.cxx 2019-09-16 00:01:35.276000000 +0200 +++ new/libpreludedb-5.2.0/bindings/python/_preludedb.cxx 2020-09-09 16:36:50.061000000 +0200 @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 4.0.0 + * Version 4.0.1 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -1255,7 +1255,7 @@ } /* A functor is a function object with one single object argument */ -#define SWIG_Python_CallFunctor(functor, obj) PyObject_CallFunction(functor, (char *)"O", obj); +#define SWIG_Python_CallFunctor(functor, obj) PyObject_CallFunctionObjArgs(functor, obj, NULL); /* Helper for static pointer initialization for both C and C++ code, for example @@ -2762,7 +2762,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); @@ -3484,7 +3484,7 @@ #endif #define SWIG_name "_preludedb" -#define SWIGVERSION 0x040000 +#define SWIGVERSION 0x040001 #define SWIG_VERSION SWIGVERSION @@ -5140,19 +5140,13 @@ return const_reference(_seq, n); } - bool check(bool set_err = true) const + bool check() const { Py_ssize_t s = size(); for (Py_ssize_t i = 0; i < s; ++i) { swig::SwigVar_PyObject item = PySequence_GetItem(_seq, i); - if (!swig::check<value_type>(item)) { - if (set_err) { - char msg[1024]; - sprintf(msg, "in sequence element %d", (int)i); - SWIG_Error(SWIG_RuntimeError, msg); - } + if (!swig::check<value_type>(item)) return false; - } } return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/bindings/python/preludedb.py new/libpreludedb-5.2.0/bindings/python/preludedb.py --- old/libpreludedb-5.1.0/bindings/python/preludedb.py 2019-09-16 00:01:35.278000000 +0200 +++ new/libpreludedb-5.2.0/bindings/python/preludedb.py 2020-09-09 16:36:50.062000000 +0200 @@ -1,17 +1,17 @@ # This file was automatically generated by SWIG (http://www.swig.org). -# Version 4.0.0 +# Version 4.0.1 # # Do not make changes to this file unless you know what you are doing--modify # the SWIG interface file instead. from sys import version_info as _swig_python_version_info if _swig_python_version_info < (2, 7, 0): - raise RuntimeError('Python 2.7 or later required') + raise RuntimeError("Python 2.7 or later required") import prelude # Pull in all the attributes from the low-level C/C++ module -if __package__ or '.' in __name__: +if __package__ or "." in __name__: from ._preludedb import * else: from _preludedb import * @@ -21,35 +21,6 @@ except ImportError: import __builtin__ -def _swig_setattr_nondynamic(self, class_type, name, value, static=1): - if name == "thisown": - return self.this.own(value) - if name == "this": - if type(value).__name__ == 'SwigPyObject': - self.__dict__[name] = value - return - method = class_type.__swig_setmethods__.get(name, None) - if method: - return method(self, value) - if not static: - object.__setattr__(self, name, value) - else: - raise AttributeError("You cannot add attributes to %s" % self) - - -def _swig_setattr(self, class_type, name, value): - return _swig_setattr_nondynamic(self, class_type, name, value, 0) - - -def _swig_getattr(self, class_type, name): - if name == "thisown": - return self.this.own() - method = class_type.__swig_getmethods__.get(name, None) - if method: - return method(self) - raise AttributeError("'%s' object has no attribute '%s'" % (class_type.__name__, name)) - - def _swig_repr(self): try: strthis = "proxy of " + self.this.__repr__() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/bindings/python/setup.py.in new/libpreludedb-5.2.0/bindings/python/setup.py.in --- old/libpreludedb-5.1.0/bindings/python/setup.py.in 2019-09-16 00:01:35.284000000 +0200 +++ new/libpreludedb-5.2.0/bindings/python/setup.py.in 2020-09-09 16:36:50.062000000 +0200 @@ -1,5 +1,5 @@ # -# Copyright (C) 2005-2019 CS-SI. All Rights Reserved. +# Copyright (C) 2005-2020 CS GROUP - France. All Rights Reserved. # Author: Yoann Vandoorselaere <yoan...@prelude-ids.com> # # This file is part of the Prelude library. @@ -99,7 +99,7 @@ setup(name="preludedb", version="@VERSION@", description="Python bindings for the PreludeDB Library", - author="CS-SI", + author="CS GROUP - France", url="https://www.prelude-siem.org";, license="GPL V2.1", package_dir={'preludedb': '@top_srcdir@/bindings/python'}, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/configure new/libpreludedb-5.2.0/configure --- old/libpreludedb-5.1.0/configure 2019-09-16 00:04:52.249000000 +0200 +++ new/libpreludedb-5.2.0/configure 2020-09-09 16:37:20.347000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libpreludedb 5.1.0. +# Generated by GNU Autoconf 2.69 for libpreludedb 5.2.0. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='libpreludedb' PACKAGE_TARNAME='libpreludedb' -PACKAGE_VERSION='5.1.0' -PACKAGE_STRING='libpreludedb 5.1.0' +PACKAGE_VERSION='5.2.0' +PACKAGE_STRING='libpreludedb 5.2.0' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -2101,7 +2101,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libpreludedb 5.1.0 to adapt to many kinds of systems. +\`configure' configures libpreludedb 5.2.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2172,7 +2172,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpreludedb 5.1.0:";; + short | recursive ) echo "Configuration of libpreludedb 5.2.0:";; esac cat <<\_ACEOF @@ -2323,7 +2323,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpreludedb configure 5.1.0 +libpreludedb configure 5.2.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3092,7 +3092,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libpreludedb $as_me 5.1.0, which was +It was created by libpreludedb $as_me 5.2.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3462,18 +3462,18 @@ LIBPRELUDEDB_MAJOR_VERSION=5 -LIBPRELUDEDB_MINOR_VERSION=1 +LIBPRELUDEDB_MINOR_VERSION=2 LIBPRELUDEDB_MICRO_VERSION=0 LIBPRELUDEDB_LEVEL_VERSION=LIBPRELUDEDB_RELEASE_LEVEL_FINAL LIBPRELUDEDB_SERIAL_VERSION=0 libpreludedb_current=11 -libpreludedb_revision=0 +libpreludedb_revision=1 libpreludedb_age=4 LIBPRELUDEDB_SONAME=$libpreludedb_current:$libpreludedb_revision:$libpreludedb_age libpreludedbcpp_current=6 -libpreludedbcpp_revision=0 +libpreludedbcpp_revision=1 libpreludedbcpp_age=4 LIBPRELUDEDBCPP_SONAME=$libpreludedbcpp_current:$libpreludedbcpp_revision:$libpreludedbcpp_age @@ -4105,7 +4105,7 @@ # Define the identity of the package. PACKAGE='libpreludedb' - VERSION='5.1.0' + VERSION='5.2.0' cat >>confdefs.h <<_ACEOF @@ -18237,7 +18237,7 @@ fi fi - min_libprelude_version=5.1.0 + min_libprelude_version=5.2.0 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libprelude - version >= $min_libprelude_version" >&5 $as_echo_n "checking for libprelude - version >= $min_libprelude_version... " >&6; } no_libprelude="" @@ -19134,7 +19134,7 @@ if test x$with_python3 != xno; then - for ac_prog in $with_python3 "python3.6" "python3.5" "python3.4" "python3.3" "python3.2" "python3.1" "python3.0" + for ac_prog in $with_python3 "python3.8" "python3.7" "python3.6" "python3.5" "python3.4" "python3.3" "python3.2" "python3.1" "python3.0" do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -31001,7 +31001,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libpreludedb $as_me 5.1.0, which was +This file was extended by libpreludedb $as_me 5.2.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -31067,7 +31067,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libpreludedb config.status 5.1.0 +libpreludedb config.status 5.2.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/configure.ac new/libpreludedb-5.2.0/configure.ac --- old/libpreludedb-5.1.0/configure.ac 2019-09-16 00:01:35.284000000 +0200 +++ new/libpreludedb-5.2.0/configure.ac 2020-09-09 16:36:50.063000000 +0200 @@ -1,5 +1,5 @@ m4_define([libpreludedb_major_version], [5]) -m4_define([libpreludedb_minor_version], [1]) +m4_define([libpreludedb_minor_version], [2]) m4_define([libpreludedb_micro_version], [0]) m4_define([libpreludedb_level_version], [LIBPRELUDEDB_RELEASE_LEVEL_FINAL]) m4_define([libpreludedb_serial_version], [0]) @@ -16,8 +16,8 @@ ifelse(libpreludedb_serial_version, 0, , .libpreludedb_serial_version), libpreludedb_serial_version)) -AC_INIT(libpreludedb, m4_join([.], [libpreludedb_major_version], - [libpreludedb_minor_version], +AC_INIT(libpreludedb, m4_join([.], libpreludedb_major_version, + libpreludedb_minor_version, m4_join([], libpreludedb_micro_version, serial_string))) LIBPRELUDEDB_MAJOR_VERSION=libpreludedb_major_version @@ -30,12 +30,12 @@ dnl * Library soname (https://www.sourceware.org/autobook/autobook/autobook_61.html#Library-Versioning) dnl ********************************************************** libpreludedb_current=11 -libpreludedb_revision=0 +libpreludedb_revision=1 libpreludedb_age=4 LIBPRELUDEDB_SONAME=$libpreludedb_current:$libpreludedb_revision:$libpreludedb_age libpreludedbcpp_current=6 -libpreludedbcpp_revision=0 +libpreludedbcpp_revision=1 libpreludedbcpp_age=4 LIBPRELUDEDBCPP_SONAME=$libpreludedbcpp_current:$libpreludedbcpp_revision:$libpreludedbcpp_age @@ -132,7 +132,7 @@ dnl * Check for libprelude * dnl ************************************************** -AM_PATH_LIBPRELUDE(5.1.0, , AC_MSG_ERROR(Cannot find libprelude: Is libprelude-config in the path?), no) +AM_PATH_LIBPRELUDE(5.2.0, , AC_MSG_ERROR(Cannot find libprelude: Is libprelude-config in the path?), no) dnl *************************************************** @@ -248,7 +248,7 @@ [python3_required=true; if test x$withval = xyes; then with_python3="python3"; fi], with_python3="python3") if test x$with_python3 != xno; then - AC_PATH_PROGS(PYTHON3, $with_python3 "python3.6" "python3.5" "python3.4" "python3.3" "python3.2" "python3.1" "python3.0", no, `dirname $with_python3`:$PATH) + AC_PATH_PROGS(PYTHON3, $with_python3 "python3.8" "python3.7" "python3.6" "python3.5" "python3.4" "python3.3" "python3.2" "python3.1" "python3.0", no, `dirname $with_python3`:$PATH) if test x$PYTHON3 = xno; then if test x$python3_required = xtrue; then AC_MSG_ERROR([Could not find $with_python3 binary]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/docs/api/html/libpreludedb-preludedb-plugin-format.html new/libpreludedb-5.2.0/docs/api/html/libpreludedb-preludedb-plugin-format.html --- old/libpreludedb-5.1.0/docs/api/html/libpreludedb-preludedb-plugin-format.html 2019-09-16 00:05:47.111000000 +0200 +++ new/libpreludedb-5.2.0/docs/api/html/libpreludedb-preludedb-plugin-format.html 2020-09-09 16:37:56.473000000 +0200 @@ -336,7 +336,7 @@ <span class="c_punctuation">(</span>*preludedb_plugin_format_get_values_func_t<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb.html#preludedb-t" title="preludedb_t"><span class="type">preludedb_t</span></a> *db</code></em>, <em class="parameter"><code><a class="link" href="libpreludedb-preludedb-path-selection.html#preludedb-path-selection-t" title="preludedb_path_selection_t"><span class="type">preludedb_path_selection_t</span></a> *selection</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-idmef-criteria.html#idmef-criteria-t";><span class="type">idmef_criteria_t</span></a> *criteria</code></em>, + <em class="parameter"><code><span class="type">idmef_criteria_t</span> *criteria</code></em>, <em class="parameter"><code><span class="type">int</span> distinct</code></em>, <em class="parameter"><code><span class="type">int</span> limit</code></em>, <em class="parameter"><code><span class="type">int</span> offset</code></em>, @@ -348,7 +348,7 @@ <pre class="programlisting"><span class="returnvalue">int</span> <span class="c_punctuation">(</span>*preludedb_plugin_format_get_alert_idents_func_t<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb.html#preludedb-t" title="preludedb_t"><span class="type">preludedb_t</span></a> *db</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-idmef-criteria.html#idmef-criteria-t";><span class="type">idmef_criteria_t</span></a> *criteria</code></em>, + <em class="parameter"><code><span class="type">idmef_criteria_t</span> *criteria</code></em>, <em class="parameter"><code><span class="type">int</span> limit</code></em>, <em class="parameter"><code><span class="type">int</span> offset</code></em>, <em class="parameter"><code>const <a class="link" href="libpreludedb-preludedb-path-selection.html#preludedb-path-selection-t" title="preludedb_path_selection_t"><span class="type">preludedb_path_selection_t</span></a> *order</code></em>, @@ -360,7 +360,7 @@ <pre class="programlisting"><span class="returnvalue">int</span> <span class="c_punctuation">(</span>*preludedb_plugin_format_delete_alert_func_t<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb.html#preludedb-t" title="preludedb_t"><span class="type">preludedb_t</span></a> *db</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-prelude-inttypes.html#uint64-t";><span class="type">uint64_t</span></a> ident</code></em>);</pre> + <em class="parameter"><code><span class="type">uint64_t</span> ident</code></em>);</pre> </div> <hr> <div class="refsect2"> @@ -374,7 +374,7 @@ <pre class="programlisting"><span class="returnvalue">int</span> <span class="c_punctuation">(</span>*preludedb_plugin_format_get_heartbeat_idents_func_t<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb.html#preludedb-t" title="preludedb_t"><span class="type">preludedb_t</span></a> *db</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-idmef-criteria.html#idmef-criteria-t";><span class="type">idmef_criteria_t</span></a> *criteria</code></em>, + <em class="parameter"><code><span class="type">idmef_criteria_t</span> *criteria</code></em>, <em class="parameter"><code><span class="type">int</span> limit</code></em>, <em class="parameter"><code><span class="type">int</span> offset</code></em>, <em class="parameter"><code>const <a class="link" href="libpreludedb-preludedb-path-selection.html#preludedb-path-selection-t" title="preludedb_path_selection_t"><span class="type">preludedb_path_selection_t</span></a> *order</code></em>, @@ -393,8 +393,8 @@ <pre class="programlisting"><span class="returnvalue">int</span> <span class="c_punctuation">(</span>*preludedb_plugin_format_get_alert_func_t<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb.html#preludedb-t" title="preludedb_t"><span class="type">preludedb_t</span></a> *db</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-prelude-inttypes.html#uint64-t";><span class="type">uint64_t</span></a> ident</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-idmef-tree-wrap.html#idmef-message-t";><span class="type">idmef_message_t</span></a> **message</code></em>);</pre> + <em class="parameter"><code><span class="type">uint64_t</span> ident</code></em>, + <em class="parameter"><code><span class="type">idmef_message_t</span> **message</code></em>);</pre> </div> <hr> <div class="refsect2"> @@ -402,8 +402,8 @@ <pre class="programlisting"><span class="returnvalue">int</span> <span class="c_punctuation">(</span>*preludedb_plugin_format_get_heartbeat_func_t<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb.html#preludedb-t" title="preludedb_t"><span class="type">preludedb_t</span></a> *db</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-prelude-inttypes.html#uint64-t";><span class="type">uint64_t</span></a> ident</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-idmef-tree-wrap.html#idmef-message-t";><span class="type">idmef_message_t</span></a> **message</code></em>);</pre> + <em class="parameter"><code><span class="type">uint64_t</span> ident</code></em>, + <em class="parameter"><code><span class="type">idmef_message_t</span> **message</code></em>);</pre> </div> <hr> <div class="refsect2"> @@ -418,7 +418,7 @@ <pre class="programlisting"><span class="returnvalue">int</span> <span class="c_punctuation">(</span>*preludedb_plugin_format_insert_message_func_t<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb.html#preludedb-t" title="preludedb_t"><span class="type">preludedb_t</span></a> *db</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-idmef-tree-wrap.html#idmef-message-t";><span class="type">idmef_message_t</span></a> *message</code></em>);</pre> + <em class="parameter"><code><span class="type">idmef_message_t</span> *message</code></em>);</pre> </div> <hr> <div class="refsect2"> @@ -440,7 +440,7 @@ <pre class="programlisting"><span class="returnvalue">int</span> <span class="c_punctuation">(</span>*preludedb_plugin_format_delete_heartbeat_func_t<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb.html#preludedb-t" title="preludedb_t"><span class="type">preludedb_t</span></a> *db</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-prelude-inttypes.html#uint64-t";><span class="type">uint64_t</span></a> ident</code></em>);</pre> + <em class="parameter"><code><span class="type">uint64_t</span> ident</code></em>);</pre> </div> <hr> <div class="refsect2"> @@ -448,7 +448,7 @@ <pre class="programlisting"><span class="returnvalue">ssize_t</span> <span class="c_punctuation">(</span>*preludedb_plugin_format_delete_alert_from_list_func_t<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb.html#preludedb-t" title="preludedb_t"><span class="type">preludedb_t</span></a> *db</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-prelude-inttypes.html#uint64-t";><span class="type">uint64_t</span></a> *idents</code></em>, + <em class="parameter"><code><span class="type">uint64_t</span> *idents</code></em>, <em class="parameter"><code><span class="type">size_t</span> size</code></em>);</pre> </div> <hr> @@ -465,7 +465,7 @@ <pre class="programlisting"><span class="returnvalue">ssize_t</span> <span class="c_punctuation">(</span>*preludedb_plugin_format_delete_heartbeat_from_list_func_t<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb.html#preludedb-t" title="preludedb_t"><span class="type">preludedb_t</span></a> *db</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-prelude-inttypes.html#uint64-t";><span class="type">uint64_t</span></a> *idents</code></em>, + <em class="parameter"><code><span class="type">uint64_t</span> *idents</code></em>, <em class="parameter"><code><span class="type">size_t</span> size</code></em>);</pre> </div> <hr> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/docs/api/html/libpreludedb-preludedb-plugin-sql.html new/libpreludedb-5.2.0/docs/api/html/libpreludedb-preludedb-plugin-sql.html --- old/libpreludedb-5.1.0/docs/api/html/libpreludedb-preludedb-plugin-sql.html 2019-09-16 00:05:47.113000000 +0200 +++ new/libpreludedb-5.2.0/docs/api/html/libpreludedb-preludedb-plugin-sql.html 2020-09-09 16:37:56.476000000 +0200 @@ -351,7 +351,7 @@ <a name="preludedb-plugin-sql-get-operator-string-func-t"></a><h3>preludedb_plugin_sql_get_operator_string_func_t ()</h3> <pre class="programlisting">const <span class="returnvalue">char</span> * <span class="c_punctuation">(</span>*preludedb_plugin_sql_get_operator_string_func_t<span class="c_punctuation">)</span> - (<em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-idmef-criteria.html#idmef-criterion-operator-t";><span class="type">idmef_criterion_operator_t</span></a> operator</code></em>);</pre> + (<em class="parameter"><code><span class="type">idmef_criterion_operator_t</span> operator</code></em>);</pre> </div> <hr> <div class="refsect2"> @@ -359,9 +359,9 @@ <pre class="programlisting"><span class="returnvalue">int</span> <span class="c_punctuation">(</span>*preludedb_plugin_sql_build_constraint_string_func_t<span class="c_punctuation">)</span> (<em class="parameter"><code><span class="type">void</span> *session</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-prelude-string.html#prelude-string-t";><span class="type">prelude_string_t</span></a> *out</code></em>, + <em class="parameter"><code><span class="type">prelude_string_t</span> *out</code></em>, <em class="parameter"><code>const <span class="type">char</span> *field</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-idmef-criteria.html#idmef-criterion-operator-t";><span class="type">idmef_criterion_operator_t</span></a> operator</code></em>, + <em class="parameter"><code><span class="type">idmef_criterion_operator_t</span> operator</code></em>, <em class="parameter"><code>const <span class="type">char</span> *value</code></em>);</pre> </div> <hr> @@ -419,7 +419,7 @@ (<em class="parameter"><code><span class="type">void</span> *session</code></em>, <em class="parameter"><code><span class="type">int</span> limit</code></em>, <em class="parameter"><code><span class="type">int</span> offset</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-prelude-string.html#prelude-string-t";><span class="type">prelude_string_t</span></a> *output</code></em>);</pre> + <em class="parameter"><code><span class="type">prelude_string_t</span> *output</code></em>);</pre> </div> <hr> <div class="refsect2"> @@ -435,7 +435,7 @@ <pre class="programlisting"><span class="returnvalue">int</span> <span class="c_punctuation">(</span>*preludedb_plugin_sql_build_time_interval_string_func_t<span class="c_punctuation">)</span> (<em class="parameter"><code><span class="type">void</span> *session</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-prelude-string.html#prelude-string-t";><span class="type">prelude_string_t</span></a> *output</code></em>, + <em class="parameter"><code><span class="type">prelude_string_t</span> *output</code></em>, <em class="parameter"><code>const <span class="type">char</span> *field</code></em>, <em class="parameter"><code>const <span class="type">char</span> *value</code></em>, <em class="parameter"><code><span class="type">preludedb_selected_object_interval_t</span> unit</code></em>);</pre> @@ -478,10 +478,10 @@ <pre class="programlisting"><span class="returnvalue">int</span> <span class="c_punctuation">(</span>*preludedb_plugin_sql_build_time_constraint_string_func_t<span class="c_punctuation">)</span> (<em class="parameter"><code><span class="type">void</span> *session</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-prelude-string.html#prelude-string-t";><span class="type">prelude_string_t</span></a> *output</code></em>, + <em class="parameter"><code><span class="type">prelude_string_t</span> *output</code></em>, <em class="parameter"><code>const <span class="type">char</span> *field</code></em>, <em class="parameter"><code><a class="link" href="libpreludedb-preludedb-sql.html#preludedb-sql-time-constraint-type-t" title="enum preludedb_sql_time_constraint_type_t"><span class="type">preludedb_sql_time_constraint_type_t</span></a> type</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-idmef-criteria.html#idmef-criterion-operator-t";><span class="type">idmef_criterion_operator_t</span></a> operator</code></em>, + <em class="parameter"><code><span class="type">idmef_criterion_operator_t</span> operator</code></em>, <em class="parameter"><code><span class="type">int</span> value</code></em>, <em class="parameter"><code><span class="type">int</span> gmt_offset</code></em>);</pre> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/docs/api/html/libpreludedb-preludedb-sql.html new/libpreludedb-5.2.0/docs/api/html/libpreludedb-preludedb-sql.html --- old/libpreludedb-5.1.0/docs/api/html/libpreludedb-preludedb-sql.html 2019-09-16 00:05:47.117000000 +0200 +++ new/libpreludedb-5.2.0/docs/api/html/libpreludedb-preludedb-sql.html 2020-09-09 16:37:56.483000000 +0200 @@ -700,7 +700,7 @@ (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb-sql.html#preludedb-sql-t" title="preludedb_sql_t"><span class="type">preludedb_sql_t</span></a> *sql</code></em>, <em class="parameter"><code><span class="type">int</span> limit</code></em>, <em class="parameter"><code><span class="type">int</span> offset</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-prelude-string.html#prelude-string-t";><span class="type">prelude_string_t</span></a> *output</code></em>);</pre> + <em class="parameter"><code><span class="type">prelude_string_t</span> *output</code></em>);</pre> <p>Build a limit/offset string for a SQL query, depending on the underlying type of database.</p> <div class="refsect3"> <a name="preludedb-sql-build-limit-offset-string.parameters"></a><h4>Parameters</h4> @@ -1333,56 +1333,56 @@ <a name="preludedb-sql-field-to-int8"></a><h3>preludedb_sql_field_to_int8 ()</h3> <pre class="programlisting"><span class="returnvalue">int</span> preludedb_sql_field_to_int8 (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb-sql.html#preludedb-sql-field-t" title="preludedb_sql_field_t"><span class="type">preludedb_sql_field_t</span></a> *field</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-prelude-inttypes.html#int8-t";><span class="type">int8_t</span></a> *value</code></em>);</pre> + <em class="parameter"><code><span class="type">int8_t</span> *value</code></em>);</pre> </div> <hr> <div class="refsect2"> <a name="preludedb-sql-field-to-uint8"></a><h3>preludedb_sql_field_to_uint8 ()</h3> <pre class="programlisting"><span class="returnvalue">int</span> preludedb_sql_field_to_uint8 (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb-sql.html#preludedb-sql-field-t" title="preludedb_sql_field_t"><span class="type">preludedb_sql_field_t</span></a> *field</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-prelude-inttypes.html#uint8-t";><span class="type">uint8_t</span></a> *value</code></em>);</pre> + <em class="parameter"><code><span class="type">uint8_t</span> *value</code></em>);</pre> </div> <hr> <div class="refsect2"> <a name="preludedb-sql-field-to-int16"></a><h3>preludedb_sql_field_to_int16 ()</h3> <pre class="programlisting"><span class="returnvalue">int</span> preludedb_sql_field_to_int16 (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb-sql.html#preludedb-sql-field-t" title="preludedb_sql_field_t"><span class="type">preludedb_sql_field_t</span></a> *field</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-prelude-inttypes.html#int16-t";><span class="type">int16_t</span></a> *value</code></em>);</pre> + <em class="parameter"><code><span class="type">int16_t</span> *value</code></em>);</pre> </div> <hr> <div class="refsect2"> <a name="preludedb-sql-field-to-uint16"></a><h3>preludedb_sql_field_to_uint16 ()</h3> <pre class="programlisting"><span class="returnvalue">int</span> preludedb_sql_field_to_uint16 (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb-sql.html#preludedb-sql-field-t" title="preludedb_sql_field_t"><span class="type">preludedb_sql_field_t</span></a> *field</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-prelude-inttypes.html#uint16-t";><span class="type">uint16_t</span></a> *value</code></em>);</pre> + <em class="parameter"><code><span class="type">uint16_t</span> *value</code></em>);</pre> </div> <hr> <div class="refsect2"> <a name="preludedb-sql-field-to-int32"></a><h3>preludedb_sql_field_to_int32 ()</h3> <pre class="programlisting"><span class="returnvalue">int</span> preludedb_sql_field_to_int32 (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb-sql.html#preludedb-sql-field-t" title="preludedb_sql_field_t"><span class="type">preludedb_sql_field_t</span></a> *field</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-prelude-inttypes.html#int32-t";><span class="type">int32_t</span></a> *value</code></em>);</pre> + <em class="parameter"><code><span class="type">int32_t</span> *value</code></em>);</pre> </div> <hr> <div class="refsect2"> <a name="preludedb-sql-field-to-uint32"></a><h3>preludedb_sql_field_to_uint32 ()</h3> <pre class="programlisting"><span class="returnvalue">int</span> preludedb_sql_field_to_uint32 (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb-sql.html#preludedb-sql-field-t" title="preludedb_sql_field_t"><span class="type">preludedb_sql_field_t</span></a> *field</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-prelude-inttypes.html#uint32-t";><span class="type">uint32_t</span></a> *value</code></em>);</pre> + <em class="parameter"><code><span class="type">uint32_t</span> *value</code></em>);</pre> </div> <hr> <div class="refsect2"> <a name="preludedb-sql-field-to-int64"></a><h3>preludedb_sql_field_to_int64 ()</h3> <pre class="programlisting"><span class="returnvalue">int</span> preludedb_sql_field_to_int64 (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb-sql.html#preludedb-sql-field-t" title="preludedb_sql_field_t"><span class="type">preludedb_sql_field_t</span></a> *field</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-prelude-inttypes.html#int64-t";><span class="type">int64_t</span></a> *value</code></em>);</pre> + <em class="parameter"><code><span class="type">int64_t</span> *value</code></em>);</pre> </div> <hr> <div class="refsect2"> <a name="preludedb-sql-field-to-uint64"></a><h3>preludedb_sql_field_to_uint64 ()</h3> <pre class="programlisting"><span class="returnvalue">int</span> preludedb_sql_field_to_uint64 (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb-sql.html#preludedb-sql-field-t" title="preludedb_sql_field_t"><span class="type">preludedb_sql_field_t</span></a> *field</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-prelude-inttypes.html#uint64-t";><span class="type">uint64_t</span></a> *value</code></em>);</pre> + <em class="parameter"><code><span class="type">uint64_t</span> *value</code></em>);</pre> </div> <hr> <div class="refsect2"> @@ -1403,7 +1403,7 @@ <a name="preludedb-sql-field-to-string"></a><h3>preludedb_sql_field_to_string ()</h3> <pre class="programlisting"><span class="returnvalue">int</span> preludedb_sql_field_to_string (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb-sql.html#preludedb-sql-field-t" title="preludedb_sql_field_t"><span class="type">preludedb_sql_field_t</span></a> *field</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-prelude-string.html#prelude-string-t";><span class="type">prelude_string_t</span></a> *output</code></em>);</pre> + <em class="parameter"><code><span class="type">prelude_string_t</span> *output</code></em>);</pre> <p>Get the string value of <em class="parameter"><code>field</code></em> .</p> <div class="refsect3"> @@ -1438,10 +1438,10 @@ <a name="preludedb-sql-build-criterion-string"></a><h3>preludedb_sql_build_criterion_string ()</h3> <pre class="programlisting"><span class="returnvalue">int</span> preludedb_sql_build_criterion_string (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb-sql.html#preludedb-sql-t" title="preludedb_sql_t"><span class="type">preludedb_sql_t</span></a> *sql</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-prelude-string.html#prelude-string-t";><span class="type">prelude_string_t</span></a> *output</code></em>, + <em class="parameter"><code><span class="type">prelude_string_t</span> *output</code></em>, <em class="parameter"><code>const <span class="type">char</span> *field</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-idmef-criteria.html#idmef-criterion-operator-t";><span class="type">idmef_criterion_operator_t</span></a> idmef_operator</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-idmef-criterion-value.html#idmef-criterion-value-t";><span class="type">idmef_criterion_value_t</span></a> *value</code></em>);</pre> + <em class="parameter"><code><span class="type">idmef_criterion_operator_t</span> idmef_operator</code></em>, + <em class="parameter"><code><span class="type">idmef_criterion_value_t</span> *value</code></em>);</pre> <p>Build a sql "field operator value" string.</p> <div class="refsect3"> <a name="preludedb-sql-build-criterion-string.parameters"></a><h4>Parameters</h4> @@ -1489,10 +1489,10 @@ <div class="refsect2"> <a name="preludedb-sql-time-from-timestamp"></a><h3>preludedb_sql_time_from_timestamp ()</h3> <pre class="programlisting"><span class="returnvalue">int</span> -preludedb_sql_time_from_timestamp (<em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-idmef-time.html#idmef-time-t";><span class="type">idmef_time_t</span></a> *time</code></em>, +preludedb_sql_time_from_timestamp (<em class="parameter"><code><span class="type">idmef_time_t</span> *time</code></em>, <em class="parameter"><code>const <span class="type">char</span> *time_buf</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-prelude-inttypes.html#int32-t";><span class="type">int32_t</span></a> gmtoff</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-prelude-inttypes.html#uint32-t";><span class="type">uint32_t</span></a> usec</code></em>);</pre> + <em class="parameter"><code><span class="type">int32_t</span> gmtoff</code></em>, + <em class="parameter"><code><span class="type">uint32_t</span> usec</code></em>);</pre> <p>Set an idmef time using the timestamp, GMT offset and microseconds given in input.</p> <div class="refsect3"> <a name="preludedb-sql-time-from-timestamp.parameters"></a><h4>Parameters</h4> @@ -1536,7 +1536,7 @@ <a name="preludedb-sql-time-to-timestamp"></a><h3>preludedb_sql_time_to_timestamp ()</h3> <pre class="programlisting"><span class="returnvalue">int</span> preludedb_sql_time_to_timestamp (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb-sql.html#preludedb-sql-t" title="preludedb_sql_t"><span class="type">preludedb_sql_t</span></a> *sql</code></em>, - <em class="parameter"><code>const <a href="http://[SERVER]/libprelude/libprelude-idmef-time.html#idmef-time-t";><span class="type">idmef_time_t</span></a> *time</code></em>, + <em class="parameter"><code>const <span class="type">idmef_time_t</span> *time</code></em>, <em class="parameter"><code><span class="type">char</span> *time_buf</code></em>, <em class="parameter"><code><span class="type">size_t</span> time_buf_size</code></em>, <em class="parameter"><code><span class="type">char</span> *gmtoff_buf</code></em>, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/docs/api/html/libpreludedb-preludedb-version.html new/libpreludedb-5.2.0/docs/api/html/libpreludedb-preludedb-version.html --- old/libpreludedb-5.1.0/docs/api/html/libpreludedb-preludedb-version.html 2019-09-16 00:05:47.118000000 +0200 +++ new/libpreludedb-5.2.0/docs/api/html/libpreludedb-preludedb-version.html 2020-09-09 16:37:56.484000000 +0200 @@ -101,7 +101,7 @@ <a name="libpreludedb-preludedb-version.other_details"></a><h2>Types and Values</h2> <div class="refsect2"> <a name="LIBPRELUDEDB-VERSION:CAPS"></a><h3>LIBPRELUDEDB_VERSION</h3> -<pre class="programlisting">#define LIBPRELUDEDB_VERSION "5.1.0" +<pre class="programlisting">#define LIBPRELUDEDB_VERSION "5.2.0" </pre> </div> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/docs/api/html/libpreludedb-preludedb.html new/libpreludedb-5.2.0/docs/api/html/libpreludedb-preludedb.html --- old/libpreludedb-5.1.0/docs/api/html/libpreludedb-preludedb.html 2019-09-16 00:05:47.121000000 +0200 +++ new/libpreludedb-5.2.0/docs/api/html/libpreludedb-preludedb.html 2020-09-09 16:37:56.488000000 +0200 @@ -585,7 +585,7 @@ <a name="preludedb-insert-message"></a><h3>preludedb_insert_message ()</h3> <pre class="programlisting"><span class="returnvalue">int</span> preludedb_insert_message (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb.html#preludedb-t" title="preludedb_t"><span class="type">preludedb_t</span></a> *db</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-idmef-tree-wrap.html#idmef-message-t";><span class="type">idmef_message_t</span></a> *message</code></em>);</pre> + <em class="parameter"><code><span class="type">idmef_message_t</span> *message</code></em>);</pre> <p>Insert an IDMEF message into the database.</p> <div class="refsect3"> <a name="preludedb-insert-message.parameters"></a><h4>Parameters</h4> @@ -619,7 +619,7 @@ <a name="preludedb-get-alert-idents"></a><h3>preludedb_get_alert_idents ()</h3> <pre class="programlisting"><span class="returnvalue">int</span> preludedb_get_alert_idents (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb.html#preludedb-t" title="preludedb_t"><span class="type">preludedb_t</span></a> *db</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-idmef-criteria.html#idmef-criteria-t";><span class="type">idmef_criteria_t</span></a> *criteria</code></em>, + <em class="parameter"><code><span class="type">idmef_criteria_t</span> *criteria</code></em>, <em class="parameter"><code><span class="type">int</span> limit</code></em>, <em class="parameter"><code><span class="type">int</span> offset</code></em>, <em class="parameter"><code><a class="link" href="libpreludedb-preludedb.html#preludedb-result-idents-order-t" title="enum preludedb_result_idents_order_t"><span class="type">preludedb_result_idents_order_t</span></a> order</code></em>, @@ -677,7 +677,7 @@ <a name="preludedb-get-heartbeat-idents"></a><h3>preludedb_get_heartbeat_idents ()</h3> <pre class="programlisting"><span class="returnvalue">int</span> preludedb_get_heartbeat_idents (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb.html#preludedb-t" title="preludedb_t"><span class="type">preludedb_t</span></a> *db</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-idmef-criteria.html#idmef-criteria-t";><span class="type">idmef_criteria_t</span></a> *criteria</code></em>, + <em class="parameter"><code><span class="type">idmef_criteria_t</span> *criteria</code></em>, <em class="parameter"><code><span class="type">int</span> limit</code></em>, <em class="parameter"><code><span class="type">int</span> offset</code></em>, <em class="parameter"><code><a class="link" href="libpreludedb-preludedb.html#preludedb-result-idents-order-t" title="enum preludedb_result_idents_order_t"><span class="type">preludedb_result_idents_order_t</span></a> order</code></em>, @@ -735,8 +735,8 @@ <a name="preludedb-get-alert"></a><h3>preludedb_get_alert ()</h3> <pre class="programlisting"><span class="returnvalue">int</span> preludedb_get_alert (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb.html#preludedb-t" title="preludedb_t"><span class="type">preludedb_t</span></a> *db</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-prelude-inttypes.html#uint64-t";><span class="type">uint64_t</span></a> ident</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-idmef-tree-wrap.html#idmef-message-t";><span class="type">idmef_message_t</span></a> **message</code></em>);</pre> + <em class="parameter"><code><span class="type">uint64_t</span> ident</code></em>, + <em class="parameter"><code><span class="type">idmef_message_t</span> **message</code></em>);</pre> <div class="refsect3"> <a name="preludedb-get-alert.parameters"></a><h4>Parameters</h4> <div class="informaltable"><table width="100%" border="0"> @@ -774,8 +774,8 @@ <a name="preludedb-get-heartbeat"></a><h3>preludedb_get_heartbeat ()</h3> <pre class="programlisting"><span class="returnvalue">int</span> preludedb_get_heartbeat (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb.html#preludedb-t" title="preludedb_t"><span class="type">preludedb_t</span></a> *db</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-prelude-inttypes.html#uint64-t";><span class="type">uint64_t</span></a> ident</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-idmef-tree-wrap.html#idmef-message-t";><span class="type">idmef_message_t</span></a> **message</code></em>);</pre> + <em class="parameter"><code><span class="type">uint64_t</span> ident</code></em>, + <em class="parameter"><code><span class="type">idmef_message_t</span> **message</code></em>);</pre> <div class="refsect3"> <a name="preludedb-get-heartbeat.parameters"></a><h4>Parameters</h4> <div class="informaltable"><table width="100%" border="0"> @@ -813,7 +813,7 @@ <a name="preludedb-delete-alert"></a><h3>preludedb_delete_alert ()</h3> <pre class="programlisting"><span class="returnvalue">int</span> preludedb_delete_alert (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb.html#preludedb-t" title="preludedb_t"><span class="type">preludedb_t</span></a> *db</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-prelude-inttypes.html#uint64-t";><span class="type">uint64_t</span></a> ident</code></em>);</pre> + <em class="parameter"><code><span class="type">uint64_t</span> ident</code></em>);</pre> <p>Delete an alert.</p> <div class="refsect3"> <a name="preludedb-delete-alert.parameters"></a><h4>Parameters</h4> @@ -847,7 +847,7 @@ <a name="preludedb-delete-heartbeat"></a><h3>preludedb_delete_heartbeat ()</h3> <pre class="programlisting"><span class="returnvalue">int</span> preludedb_delete_heartbeat (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb.html#preludedb-t" title="preludedb_t"><span class="type">preludedb_t</span></a> *db</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-prelude-inttypes.html#uint64-t";><span class="type">uint64_t</span></a> ident</code></em>);</pre> + <em class="parameter"><code><span class="type">uint64_t</span> ident</code></em>);</pre> <p>Delete an heartbeat.</p> <div class="refsect3"> <a name="preludedb-delete-heartbeat.parameters"></a><h4>Parameters</h4> @@ -881,7 +881,7 @@ <a name="preludedb-delete-alert-from-list"></a><h3>preludedb_delete_alert_from_list ()</h3> <pre class="programlisting"><span class="returnvalue">ssize_t</span> preludedb_delete_alert_from_list (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb.html#preludedb-t" title="preludedb_t"><span class="type">preludedb_t</span></a> *db</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-prelude-inttypes.html#uint64-t";><span class="type">uint64_t</span></a> *idents</code></em>, + <em class="parameter"><code><span class="type">uint64_t</span> *idents</code></em>, <em class="parameter"><code><span class="type">size_t</span> isize</code></em>);</pre> <p>Delete all alerts from ident stored within <em class="parameter"><code>idents</code></em> .</p> @@ -959,7 +959,7 @@ <a name="preludedb-delete-heartbeat-from-list"></a><h3>preludedb_delete_heartbeat_from_list ()</h3> <pre class="programlisting"><span class="returnvalue">ssize_t</span> preludedb_delete_heartbeat_from_list (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb.html#preludedb-t" title="preludedb_t"><span class="type">preludedb_t</span></a> *db</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-prelude-inttypes.html#uint64-t";><span class="type">uint64_t</span></a> *idents</code></em>, + <em class="parameter"><code><span class="type">uint64_t</span> *idents</code></em>, <em class="parameter"><code><span class="type">size_t</span> isize</code></em>);</pre> <p>Delete all heartbeat from ident stored within <em class="parameter"><code>idents</code></em> .</p> @@ -1038,8 +1038,8 @@ <pre class="programlisting"><span class="returnvalue">int</span> preludedb_get_values (<em class="parameter"><code><a class="link" href="libpreludedb-preludedb.html#preludedb-t" title="preludedb_t"><span class="type">preludedb_t</span></a> *db</code></em>, <em class="parameter"><code><a class="link" href="libpreludedb-preludedb-path-selection.html#preludedb-path-selection-t" title="preludedb_path_selection_t"><span class="type">preludedb_path_selection_t</span></a> *path_selection</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-idmef-criteria.html#idmef-criteria-t";><span class="type">idmef_criteria_t</span></a> *criteria</code></em>, - <em class="parameter"><code><a href="http://[SERVER]/libprelude/libprelude-prelude-inttypes.html#prelude-bool-t";><span class="type">prelude_bool_t</span></a> distinct</code></em>, + <em class="parameter"><code><span class="type">idmef_criteria_t</span> *criteria</code></em>, + <em class="parameter"><code><span class="type">prelude_bool_t</span> distinct</code></em>, <em class="parameter"><code><span class="type">int</span> limit</code></em>, <em class="parameter"><code><span class="type">int</span> offset</code></em>, <em class="parameter"><code><a class="link" href="libpreludedb-preludedb.html#preludedb-result-values-t" title="preludedb_result_values_t"><span class="type">preludedb_result_values_t</span></a> **result</code></em>);</pre> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/docs/manpages/libpreludedb-config.1 new/libpreludedb-5.2.0/docs/manpages/libpreludedb-config.1 --- old/libpreludedb-5.1.0/docs/manpages/libpreludedb-config.1 2019-09-16 00:01:35.291000000 +0200 +++ new/libpreludedb-5.2.0/docs/manpages/libpreludedb-config.1 2020-09-09 16:36:50.066000000 +0200 @@ -71,4 +71,4 @@ .B \-\-plugin\-dir Print the directory where libpreludedb plugins are installed. .SH AUTHOR -This man page has been written by CS-SI +This man page has been written by CS GROUP - France diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/docs/manpages/preludedb-admin.1 new/libpreludedb-5.2.0/docs/manpages/preludedb-admin.1 --- old/libpreludedb-5.1.0/docs/manpages/preludedb-admin.1 2019-09-16 00:01:35.291000000 +0200 +++ new/libpreludedb-5.2.0/docs/manpages/preludedb-admin.1 2020-09-09 16:36:50.066000000 +0200 @@ -94,7 +94,7 @@ .SH AUTHOR This manpage was Written by Pierre Chifflier. .SH COPYRIGHT -Copyright \(co 2006-2019 CS-SI. +Copyright \(co 2006-2020 CS GROUP - France. .br This is free software. You may redistribute copies of it under the terms of the GNU General Public License <http://www.gnu.org/licenses/gpl.html>. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/plugins/format/classic/classic-delete.c new/libpreludedb-5.2.0/plugins/format/classic/classic-delete.c --- old/libpreludedb-5.1.0/plugins/format/classic/classic-delete.c 2019-09-16 00:01:35.303000000 +0200 +++ new/libpreludedb-5.2.0/plugins/format/classic/classic-delete.c 2020-09-09 16:36:50.113000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2003-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2003-2020 CS GROUP - France. All Rights Reserved. * Author: Nicolas Delon <nicolas.de...@prelude-ids.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/plugins/format/classic/classic-get.c new/libpreludedb-5.2.0/plugins/format/classic/classic-get.c --- old/libpreludedb-5.1.0/plugins/format/classic/classic-get.c 2019-09-16 00:01:35.309000000 +0200 +++ new/libpreludedb-5.2.0/plugins/format/classic/classic-get.c 2020-09-09 16:36:50.114000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2003-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2003-2020 CS GROUP - France. All Rights Reserved. * Author: Nicolas Delon <nicolas.de...@prelude-ids.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/plugins/format/classic/classic-insert.c new/libpreludedb-5.2.0/plugins/format/classic/classic-insert.c --- old/libpreludedb-5.1.0/plugins/format/classic/classic-insert.c 2019-09-16 00:01:35.310000000 +0200 +++ new/libpreludedb-5.2.0/plugins/format/classic/classic-insert.c 2020-09-09 16:36:50.114000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2003-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2003-2020 CS GROUP - France. All Rights Reserved. * Author: Nicolas Delon <nicolas.de...@prelude-ids.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/plugins/format/classic/classic-path-resolve.c new/libpreludedb-5.2.0/plugins/format/classic/classic-path-resolve.c --- old/libpreludedb-5.1.0/plugins/format/classic/classic-path-resolve.c 2019-09-16 00:01:35.311000000 +0200 +++ new/libpreludedb-5.2.0/plugins/format/classic/classic-path-resolve.c 2020-09-09 16:36:50.115000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2005-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2005-2020 CS GROUP - France. All Rights Reserved. * Author: Nicolas Delon <nicolas.de...@prelude-ids.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/plugins/format/classic/classic-sql-join.c new/libpreludedb-5.2.0/plugins/format/classic/classic-sql-join.c --- old/libpreludedb-5.1.0/plugins/format/classic/classic-sql-join.c 2019-09-16 00:01:35.319000000 +0200 +++ new/libpreludedb-5.2.0/plugins/format/classic/classic-sql-join.c 2020-09-09 16:36:50.115000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2005-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2005-2020 CS GROUP - France. All Rights Reserved. * Author: Nicolas Delon <nicolas.de...@prelude-ids.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/plugins/format/classic/classic.c new/libpreludedb-5.2.0/plugins/format/classic/classic.c --- old/libpreludedb-5.1.0/plugins/format/classic/classic.c 2019-09-16 00:01:35.322000000 +0200 +++ new/libpreludedb-5.2.0/plugins/format/classic/classic.c 2020-09-09 16:36:50.115000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2003-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2003-2020 CS GROUP - France. All Rights Reserved. * Author: Nicolas Delon <nicolas.de...@prelude-ids.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/plugins/format/classic/include/classic-delete.h new/libpreludedb-5.2.0/plugins/format/classic/include/classic-delete.h --- old/libpreludedb-5.1.0/plugins/format/classic/include/classic-delete.h 2019-09-16 00:01:35.322000000 +0200 +++ new/libpreludedb-5.2.0/plugins/format/classic/include/classic-delete.h 2020-09-09 16:36:50.116000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2003-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2003-2020 CS GROUP - France. All Rights Reserved. * Author: Nicolas Delon <nicolas.de...@prelude-ids.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/plugins/format/classic/include/classic-get.h new/libpreludedb-5.2.0/plugins/format/classic/include/classic-get.h --- old/libpreludedb-5.1.0/plugins/format/classic/include/classic-get.h 2019-09-16 00:01:35.326000000 +0200 +++ new/libpreludedb-5.2.0/plugins/format/classic/include/classic-get.h 2020-09-09 16:36:50.116000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2003-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2003-2020 CS GROUP - France. All Rights Reserved. * Author: Nicolas Delon <nicolas.de...@prelude-ids.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/plugins/format/classic/include/classic-insert.h new/libpreludedb-5.2.0/plugins/format/classic/include/classic-insert.h --- old/libpreludedb-5.1.0/plugins/format/classic/include/classic-insert.h 2019-09-16 00:01:35.332000000 +0200 +++ new/libpreludedb-5.2.0/plugins/format/classic/include/classic-insert.h 2020-09-09 16:36:50.116000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2001-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2001-2020 CS GROUP - France. All Rights Reserved. * Author: Yoann Vandoorselaere <yo...@mandrakesoft.com> * Author: Nicolas Delon <nico...@prelude-ids.org> * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/plugins/format/classic/include/classic-path-resolve.h new/libpreludedb-5.2.0/plugins/format/classic/include/classic-path-resolve.h --- old/libpreludedb-5.1.0/plugins/format/classic/include/classic-path-resolve.h 2019-09-16 00:01:35.332000000 +0200 +++ new/libpreludedb-5.2.0/plugins/format/classic/include/classic-path-resolve.h 2020-09-09 16:36:50.116000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2005-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2005-2020 CS GROUP - France. All Rights Reserved. * Author: Nicolas Delon <nicolas.de...@prelude-ids.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/plugins/format/classic/include/classic-sql-join.h new/libpreludedb-5.2.0/plugins/format/classic/include/classic-sql-join.h --- old/libpreludedb-5.1.0/plugins/format/classic/include/classic-sql-join.h 2019-09-16 00:01:35.333000000 +0200 +++ new/libpreludedb-5.2.0/plugins/format/classic/include/classic-sql-join.h 2020-09-09 16:36:50.116000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2005-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2005-2020 CS GROUP - France. All Rights Reserved. * Author: Nicolas Delon <nicolas.de...@prelude-ids.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/plugins/sql/mysql/mysql.c new/libpreludedb-5.2.0/plugins/sql/mysql/mysql.c --- old/libpreludedb-5.1.0/plugins/sql/mysql/mysql.c 2019-09-16 00:01:35.336000000 +0200 +++ new/libpreludedb-5.2.0/plugins/sql/mysql/mysql.c 2020-09-09 16:36:50.121000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2003-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2003-2020 CS GROUP - France. All Rights Reserved. * Author: Nicolas Delon <nicolas.de...@prelude-ids.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/plugins/sql/pgsql/pgsql.c new/libpreludedb-5.2.0/plugins/sql/pgsql/pgsql.c --- old/libpreludedb-5.1.0/plugins/sql/pgsql/pgsql.c 2019-09-16 00:01:35.339000000 +0200 +++ new/libpreludedb-5.2.0/plugins/sql/pgsql/pgsql.c 2020-09-09 16:36:50.122000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2003-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2003-2020 CS GROUP - France. All Rights Reserved. * Author: Nicolas Delon <nicolas.de...@prelude-ids.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/plugins/sql/sqlite3/sqlite3.c new/libpreludedb-5.2.0/plugins/sql/sqlite3/sqlite3.c --- old/libpreludedb-5.1.0/plugins/sql/sqlite3/sqlite3.c 2019-09-16 00:01:35.340000000 +0200 +++ new/libpreludedb-5.2.0/plugins/sql/sqlite3/sqlite3.c 2020-09-09 16:36:50.123000000 +0200 @@ -1,6 +1,6 @@ /***** * - * Copyright (C) 2005-2019 CS-SI. All Rights Reserved. + * Copyright (C) 2005-2020 CS GROUP - France. All Rights Reserved. * Author: Rob Holland <r...@inversepath.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/preludedb-admin new/libpreludedb-5.2.0/preludedb-admin --- old/libpreludedb-5.1.0/preludedb-admin 2019-09-16 00:01:35.340000000 +0200 +++ new/libpreludedb-5.2.0/preludedb-admin 2020-09-09 16:36:50.123000000 +0200 @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright (C) 2019 CS-SI. All Rights Reserved. +# Copyright (C) 2019-2020 CS GROUP - France. All Rights Reserved. # Author: Yoann Vandoorselaere <yoa...@gmail.com> # # This file is part of the preludedb-admin program. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/src/include/preludedb-error.h new/libpreludedb-5.2.0/src/include/preludedb-error.h --- old/libpreludedb-5.1.0/src/include/preludedb-error.h 2019-09-16 00:01:35.344000000 +0200 +++ new/libpreludedb-5.2.0/src/include/preludedb-error.h 2020-09-09 16:36:50.124000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2005-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2005-2020 CS GROUP - France. All Rights Reserved. * Author: Nicolas Delon <nicolas.de...@prelude-ids.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/src/include/preludedb-path-selection.h new/libpreludedb-5.2.0/src/include/preludedb-path-selection.h --- old/libpreludedb-5.1.0/src/include/preludedb-path-selection.h 2019-09-16 00:01:35.344000000 +0200 +++ new/libpreludedb-5.2.0/src/include/preludedb-path-selection.h 2020-09-09 16:36:50.124000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2003-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2003-2020 CS GROUP - France. All Rights Reserved. * Author: Nicolas Delon <nicolas.de...@prelude-ids.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/src/include/preludedb-plugin-format-prv.h new/libpreludedb-5.2.0/src/include/preludedb-plugin-format-prv.h --- old/libpreludedb-5.1.0/src/include/preludedb-plugin-format-prv.h 2019-09-16 00:01:35.345000000 +0200 +++ new/libpreludedb-5.2.0/src/include/preludedb-plugin-format-prv.h 2020-09-09 16:36:50.124000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2005-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2005-2020 CS GROUP - France. All Rights Reserved. * Author: Yoann Vandoorselaere <yoan...@prelude-ids.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/src/include/preludedb-plugin-format.h new/libpreludedb-5.2.0/src/include/preludedb-plugin-format.h --- old/libpreludedb-5.1.0/src/include/preludedb-plugin-format.h 2019-09-16 00:01:35.345000000 +0200 +++ new/libpreludedb-5.2.0/src/include/preludedb-plugin-format.h 2020-09-09 16:36:50.125000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2005-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2005-2020 CS GROUP - France. All Rights Reserved. * Author: Yoann Vandoorselaere <yoan...@prelude-ids.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/src/include/preludedb-plugin-sql.h new/libpreludedb-5.2.0/src/include/preludedb-plugin-sql.h --- old/libpreludedb-5.1.0/src/include/preludedb-plugin-sql.h 2019-09-16 00:01:35.346000000 +0200 +++ new/libpreludedb-5.2.0/src/include/preludedb-plugin-sql.h 2020-09-09 16:36:50.125000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2005-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2005-2020 CS GROUP - France. All Rights Reserved. * Author: Yoann Vandoorselaere <yoan...@prelude-ids.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/src/include/preludedb-sql-select.h new/libpreludedb-5.2.0/src/include/preludedb-sql-select.h --- old/libpreludedb-5.1.0/src/include/preludedb-sql-select.h 2019-09-16 00:01:35.351000000 +0200 +++ new/libpreludedb-5.2.0/src/include/preludedb-sql-select.h 2020-09-09 16:36:50.125000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2005-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2005-2020 CS GROUP - France. All Rights Reserved. * Author: Yoann Vandoorselaere <yoa...@gmail.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/src/include/preludedb-sql-settings.h new/libpreludedb-5.2.0/src/include/preludedb-sql-settings.h --- old/libpreludedb-5.1.0/src/include/preludedb-sql-settings.h 2019-09-16 00:01:35.354000000 +0200 +++ new/libpreludedb-5.2.0/src/include/preludedb-sql-settings.h 2020-09-09 16:36:50.125000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2005-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2005-2020 CS GROUP - France. All Rights Reserved. * Author: Nicolas Delon <nicolas.de...@prelude-ids.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/src/include/preludedb-sql.h new/libpreludedb-5.2.0/src/include/preludedb-sql.h --- old/libpreludedb-5.1.0/src/include/preludedb-sql.h 2019-09-16 00:01:35.355000000 +0200 +++ new/libpreludedb-5.2.0/src/include/preludedb-sql.h 2020-09-09 16:36:50.125000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2003-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2003-2020 CS GROUP - France. All Rights Reserved. * Author: Nicolas Delon <nicolas.de...@prelude-ids.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/src/include/preludedb-version.h new/libpreludedb-5.2.0/src/include/preludedb-version.h --- old/libpreludedb-5.1.0/src/include/preludedb-version.h 2019-09-16 00:05:22.008000000 +0200 +++ new/libpreludedb-5.2.0/src/include/preludedb-version.h 2020-09-09 16:37:48.671000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2005-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2005-2020 CS GROUP - France. All Rights Reserved. * Author: Yoann Vandoorselaere <yoan...@prelude-ids.com> * * This file is part of the PreludeDB library. @@ -28,7 +28,7 @@ extern "C" { #endif -#define LIBPRELUDEDB_VERSION "5.1.0" +#define LIBPRELUDEDB_VERSION "5.2.0" #define LIBPRELUDEDB_RELEASE_LEVEL_ALPHA 0xa #define LIBPRELUDEDB_RELEASE_LEVEL_BETA 0xb @@ -36,7 +36,7 @@ #define LIBPRELUDEDB_RELEASE_LEVEL_FINAL 0xf #define LIBPRELUDEDB_MAJOR_VERSION 5 -#define LIBPRELUDEDB_MINOR_VERSION 1 +#define LIBPRELUDEDB_MINOR_VERSION 2 #define LIBPRELUDEDB_MICRO_VERSION 0 #define LIBPRELUDEDB_LEVEL_VERSION LIBPRELUDEDB_RELEASE_LEVEL_FINAL #define LIBPRELUDEDB_SERIAL_VERSION 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/src/include/preludedb-version.h.in new/libpreludedb-5.2.0/src/include/preludedb-version.h.in --- old/libpreludedb-5.1.0/src/include/preludedb-version.h.in 2019-09-16 00:01:35.355000000 +0200 +++ new/libpreludedb-5.2.0/src/include/preludedb-version.h.in 2020-09-09 16:36:50.126000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2005-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2005-2020 CS GROUP - France. All Rights Reserved. * Author: Yoann Vandoorselaere <yoan...@prelude-ids.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/src/include/preludedb.h new/libpreludedb-5.2.0/src/include/preludedb.h --- old/libpreludedb-5.1.0/src/include/preludedb.h 2019-09-16 00:01:35.361000000 +0200 +++ new/libpreludedb-5.2.0/src/include/preludedb.h 2020-09-09 16:36:50.126000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2003-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2003-2020 CS GROUP - France. All Rights Reserved. * Author: Nicolas Delon <nicolas.de...@prelude-ids.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/src/preludedb-error.c new/libpreludedb-5.2.0/src/preludedb-error.c --- old/libpreludedb-5.1.0/src/preludedb-error.c 2019-09-16 00:01:35.361000000 +0200 +++ new/libpreludedb-5.2.0/src/preludedb-error.c 2020-09-09 16:36:50.126000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2005-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2005-2020 CS GROUP - France. All Rights Reserved. * Author: Nicolas Delon <nicolas.de...@prelude-ids.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/src/preludedb-path-selection-parser.lex.c new/libpreludedb-5.2.0/src/preludedb-path-selection-parser.lex.c --- old/libpreludedb-5.1.0/src/preludedb-path-selection-parser.lex.c 2019-09-16 00:01:35.362000000 +0200 +++ new/libpreludedb-5.2.0/src/preludedb-path-selection-parser.lex.c 2020-09-09 16:36:50.127000000 +0200 @@ -758,7 +758,7 @@ #line 1 "preludedb-path-selection-parser.lex.l" /***** * -* Copyright (C) 2015-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2015-2020 CS GROUP - France. All Rights Reserved. * Author: Yoann Vandoorselaere <yoa...@gmail.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/src/preludedb-path-selection-parser.lex.l new/libpreludedb-5.2.0/src/preludedb-path-selection-parser.lex.l --- old/libpreludedb-5.1.0/src/preludedb-path-selection-parser.lex.l 2019-09-16 00:01:35.365000000 +0200 +++ new/libpreludedb-5.2.0/src/preludedb-path-selection-parser.lex.l 2020-09-09 16:36:50.127000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2015-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2015-2020 CS GROUP - France. All Rights Reserved. * Author: Yoann Vandoorselaere <yoa...@gmail.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/src/preludedb-path-selection-parser.yac.y new/libpreludedb-5.2.0/src/preludedb-path-selection-parser.yac.y --- old/libpreludedb-5.1.0/src/preludedb-path-selection-parser.yac.y 2019-09-16 00:01:35.366000000 +0200 +++ new/libpreludedb-5.2.0/src/preludedb-path-selection-parser.yac.y 2020-09-09 16:36:50.128000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2015-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2015-2020 CS GROUP - France. All Rights Reserved. * Author: Yoann Vandoorselaere <yoa...@gmail.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/src/preludedb-path-selection.c new/libpreludedb-5.2.0/src/preludedb-path-selection.c --- old/libpreludedb-5.1.0/src/preludedb-path-selection.c 2019-09-16 00:01:35.366000000 +0200 +++ new/libpreludedb-5.2.0/src/preludedb-path-selection.c 2020-09-09 16:36:50.129000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2003-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2003-2020 CS GROUP - France. All Rights Reserved. * Author: Nicolas Delon <nicolas.de...@prelude-ids.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/src/preludedb-plugin-format.c new/libpreludedb-5.2.0/src/preludedb-plugin-format.c --- old/libpreludedb-5.1.0/src/preludedb-plugin-format.c 2019-09-16 00:01:35.371000000 +0200 +++ new/libpreludedb-5.2.0/src/preludedb-plugin-format.c 2020-09-09 16:36:50.129000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2005-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2005-2020 CS GROUP - France. All Rights Reserved. * Author: Yoann Vandoorselaere <yoan...@prelude-ids.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/src/preludedb-plugin-sql.c new/libpreludedb-5.2.0/src/preludedb-plugin-sql.c --- old/libpreludedb-5.1.0/src/preludedb-plugin-sql.c 2019-09-16 00:01:35.373000000 +0200 +++ new/libpreludedb-5.2.0/src/preludedb-plugin-sql.c 2020-09-09 16:36:50.129000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2005-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2005-2020 CS GROUP - France. All Rights Reserved. * Author: Yoann Vandoorselaere <yoan...@prelude-ids.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/src/preludedb-sql-select.c new/libpreludedb-5.2.0/src/preludedb-sql-select.c --- old/libpreludedb-5.1.0/src/preludedb-sql-select.c 2019-09-16 00:01:35.373000000 +0200 +++ new/libpreludedb-5.2.0/src/preludedb-sql-select.c 2020-09-09 16:36:50.129000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2005-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2005-2020 CS GROUP - France. All Rights Reserved. * Author: Yoann Vandoorselaere <yoa...@gmail.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/src/preludedb-sql-settings.c new/libpreludedb-5.2.0/src/preludedb-sql-settings.c --- old/libpreludedb-5.1.0/src/preludedb-sql-settings.c 2019-09-16 00:01:35.378000000 +0200 +++ new/libpreludedb-5.2.0/src/preludedb-sql-settings.c 2020-09-09 16:36:50.130000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2005-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2005-2020 CS GROUP - France. All Rights Reserved. * Author: Nicolas Delon <nicolas.de...@prelude-ids.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/src/preludedb-sql.c new/libpreludedb-5.2.0/src/preludedb-sql.c --- old/libpreludedb-5.1.0/src/preludedb-sql.c 2019-09-16 00:01:35.379000000 +0200 +++ new/libpreludedb-5.2.0/src/preludedb-sql.c 2020-09-09 16:36:50.130000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2003-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2003-2020 CS GROUP - France. All Rights Reserved. * Author: Nicolas Delon <nicolas.de...@prelude-ids.com> * * This file is part of the PreludeDB library. @@ -1595,7 +1595,6 @@ idmef_data_t *data; prelude_string_t *outbuf; const prelude_string_t *string; - prelude_bool_t escape_next = FALSE; if ( idmef_value_get_type(value) == IDMEF_VALUE_TYPE_DATA ) { data = idmef_value_get_data(value); @@ -1626,22 +1625,37 @@ return ret; for ( i = 0; i < len; i++ ) { - /* - * Always escape %, since these are SQL specific. + * Always escape % and _, since they are SQL specific. */ if ( *input == '%' ) prelude_string_cat(outbuf, "\\%"); + else if ( *input == '_' ) + prelude_string_cat(outbuf, "\\_"); + + else if ( *input == '\\' && (i + 1 < len) ) { + input++; + i++; + if ( *input == '*' || *input == '?' ) { + prelude_string_ncat(outbuf, input, 1); + } + else { + char buf[2] = { '\\', *input }; + prelude_string_ncat(outbuf, buf, 2); + } + } /* * Convert unescaped * to % character. */ - else if ( *input == '*' && ! escape_next ) + else if ( *input == '*' ) prelude_string_cat(outbuf, "%"); + else if ( *input == '?' ) + prelude_string_cat(outbuf, "_"); + else prelude_string_ncat(outbuf, input, 1); - escape_next = (! escape_next && *input == '\\') ? TRUE : FALSE; input++; } @@ -1703,7 +1717,7 @@ return ret; } - ret = preludedb_sql_escape(sql, prelude_string_get_string(string), &escaped); + ret = preludedb_sql_escape_fast(sql, prelude_string_get_string(string), prelude_string_get_len(string), &escaped); prelude_string_destroy(string); if ( ret < 0 ) return ret; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/src/preludedb-version.c new/libpreludedb-5.2.0/src/preludedb-version.c --- old/libpreludedb-5.1.0/src/preludedb-version.c 2019-09-16 00:01:35.379000000 +0200 +++ new/libpreludedb-5.2.0/src/preludedb-version.c 2020-09-09 16:36:50.130000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2005-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2005-2020 CS GROUP - France. All Rights Reserved. * Author: Yoann Vandoorselaere <yoan...@prelude-ids.com> * * This file is part of the PreludeDB library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libpreludedb-5.1.0/src/preludedb.c new/libpreludedb-5.2.0/src/preludedb.c --- old/libpreludedb-5.1.0/src/preludedb.c 2019-09-16 00:01:35.382000000 +0200 +++ new/libpreludedb-5.2.0/src/preludedb.c 2020-09-09 16:36:50.131000000 +0200 @@ -1,6 +1,6 @@ /***** * -* Copyright (C) 2003-2019 CS-SI. All Rights Reserved. +* Copyright (C) 2003-2020 CS GROUP - France. All Rights Reserved. * Author: Nicolas Delon <nicolas.de...@prelude-ids.com> * * This file is part of the PreludeDB library. ++++++ libpreludedb-force_preludedb_admin_with_py3.patch ++++++ --- /var/tmp/diff_new_pack.m9EG8Y/_old 2020-10-29 09:23:12.758739895 +0100 +++ /var/tmp/diff_new_pack.m9EG8Y/_new 2020-10-29 09:23:12.758739895 +0100 @@ -2,11 +2,13 @@ Author: Thomas Andrejak <thomas.andre...@gmail.com> Last-Update: 2019-09-20 ---- ./preludedb-admin 2019-09-17 19:29:40.157500525 -0400 -+++ ./preludedb-admin 2019-09-22 08:41:53.217541434 -0400 +Index: preludedb-admin +=================================================================== +--- preludedb-admin.orig ++++ preludedb-admin @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # - # Copyright (C) 2019 CS-SI. All Rights Reserved. + # Copyright (C) 2019-2020 CS GROUP - France. All Rights Reserved. # Author: Yoann Vandoorselaere <yoa...@gmail.com>
