<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1adfb38fb7d0d0a8cd6341c3e6fb721227ed5d93">https://github.com/macports/macports-ports/commit/1adfb38fb7d0d0a8cd6341c3e6fb721227ed5d93</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 1adfb38fb7d libprelude: Bump version 5.1
</span>1adfb38fb7d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1adfb38fb7d0d0a8cd6341c3e6fb721227ed5d93
</span>Author: Thomas Andrejak <thomas.andrejak@gmail.com>
AuthorDate: Mon Jun 22 01:41:41 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> libprelude: Bump version 5.1
</span>---
security/libprelude/Portfile | 62 ++++++-----
.../files/patch-enable_detection_new_python3.diff | 36 +++++++
.../libprelude/files/patch-fix-test_rwlock1.diff | 20 ++++
security/libprelude/files/patch-fix_awk_error.diff | 116 +++++++++++++++++++++
.../libprelude/files/patch-fix_gtkdoc_1.32.diff | 17 +++
.../libprelude/files/patch-fix_perl_rpath.diff | 15 +++
.../files/patch-fix_prelude_tests_timer.diff | 17 +++
security/libprelude/files/patch-fix_py38.diff | 15 +++
security/libprelude/files/patch-fix_timegm.diff | 36 +++++++
security/libprelude/files/patch-gnutls-extra.diff | 26 -----
.../files/patch-src-include-prelude-plugin.h.diff | 10 --
11 files changed, 308 insertions(+), 62 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/libprelude/Portfile b/security/libprelude/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 143c0a9ddef..caba3d3c52b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/libprelude/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/libprelude/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,39 +3,46 @@
</span> PortSystem 1.0
name libprelude
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.0.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set download_id 241
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories security
license GPL-2+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {gmail.com:thomas.andrejak @ToToL} openmaintainer
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description Prelude Universal SIM - framework library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Secure Connections between all Sensors and the Prelude Manager
</span>
long_description \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Prelude is a Universal "Security Information Management" (SIM) system. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Prelude collects, normalizes, sorts, aggregates, correlates and \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reports all security-related events independently of the product brand \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- or license giving rise to such events. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Libprelude is a library that guarantees secure connections between \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all sensors and the Prelude Manager.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Libprelude is a collection of generic functions providing communication \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ between all Sensors, like IDS (Intrusion Detection System), and the Prelude \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Manager. It provides a convenient interface for sending and receiving IDMEF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (Information and Event Message Exchange Format) alerts to Prelude Manager with \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ transparent SSL, fail-over and replication support, asynchronous events and \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ timer interfaces, an abstracted configuration API (hooking at the command-line, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the configuration line, or wide configuration, available from the Manager), and \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a generic plugin API. It allows you to easily turn your favorite security \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ program into a Prelude sensor.
</span>
homepage https://www.prelude-siem.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}attachments/download/${download_id}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${homepage}pkg/src/5.1.0/
</span> platforms darwin
build.type gnu
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 13f8be3e22f3495847d7f9a125d0b2e07b93df4c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 852d981e7d23e49ec25a96a7f54c19a7ee72cd786a0d02c43a27e3e770d5cb6b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b88e57120e812e16370b95dfdae5d198b5ce9099 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7aff4bf2973cd74b5d4dfce6f27e9835c3c6612b2f8ede7c8a127756aadd0307 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2898350
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:gettext port:gnutls port:libgcrypt port:libgpg-error \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:gettext port:gnutls port:libgpg-error \
</span> port:libiconv port:libtasn1 port:libtool port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# error: conflicting types for ‘lt__PROGRAM__LTX_preloaded_symbols’
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-src-include-prelude-plugin.h.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-gnutls-extra.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-enable_detection_new_python3.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-test_rwlock1.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix_awk_error.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix_gtkdoc_1.32.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix_prelude_tests_timer.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix_py38.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix_timegm.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix_perl_rpath.diff
</span>
configure.args --mandir=${prefix}/share/man \
--with-html-dir=${prefix}/share/doc \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +50,8 @@ configure.args --mandir=${prefix}/share/man \
</span> --without-swig \
--without-lua \
--without-perl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-python \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-python3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-python2 \
</span> RUBY=no \
HAVE_CXX=yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,16 +62,18 @@ destroot.keepdirs \
</span> ${destroot}${prefix}/var/spool/prelude \
${destroot}${prefix}/etc/prelude/profile
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/lib/charset.alias
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant python27 description {python2.7 bindings} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-python=${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --without-python2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-python2=${prefix}/bin/python2.7
</span> depends_lib-append port:python27
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 description {python3.8 bindings} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --without-python3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-python3=${prefix}/bin/python3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant perl description {perl bindings} {
configure.args-delete --without-perl
configure.args-append --with-perl=${prefix}/bin/perl
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/libprelude/files/patch-enable_detection_new_python3.diff b/security/libprelude/files/patch-enable_detection_new_python3.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7f32a581e00
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/libprelude/files/patch-enable_detection_new_python3.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: Forcing python location
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Thomas Andrejak <thomas.andrejak@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Last-Update: 2019-09-13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac 2019-09-15 18:46:14.519240869 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2019-09-20 17:33:47.199427639 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -489,7 +489,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [python3_required=true; if test x$withval = xyes; then with_python3="python3"; fi], with_python3="python3")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test x$with_python3 != xno; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 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)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ python3_asked="${with_python3/,/ }"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 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)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test x$PYTHON3 = xno; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test x$python3_required = xtrue; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_ERROR([Could not find $with_python3 binary])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -502,6 +503,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_HEADER(Python.h, with_python3=yes, with_python3=no)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS="$old_CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test "x$python3_asked" != xyes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PYTHON3_VERS=$python3_asked
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PYTHON3_VERS=@PYTHON3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -755,6 +761,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(LIBPRELUDE_MICRO_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(LIBPRELUDE_LEVEL_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(LIBPRELUDE_SERIAL_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_SUBST(PYTHON3_VERS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(PRELUDE_ADMIN_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(PRELUDE_SPOOL_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(PRELUDE_CONFIG_DIR)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/libprelude/files/patch-fix-test_rwlock1.diff b/security/libprelude/files/patch-fix-test_rwlock1.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9c87d082b47
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/libprelude/files/patch-fix-test_rwlock1.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: Fix test-rwlock1 when --as-needed is the default.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Michael Hudson-Doyle <michael.hudson@ubuntu.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Forwarded: no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Last-Update: 2018-07-25
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libmissing/tests/test-rwlock1.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libmissing/tests/test-rwlock1.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,7 +54,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SUCCEED() exit (0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define FAILURE() exit (1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define UNEXPECTED(n) (fprintf (stderr, "Unexpected outcome %d\n", n), abort ())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* The pointless reference to errno below is to ensure that the test binary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * gets a DT_NEEDED for libpthread even if the link is done with --as-needed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * (which is the default in Ubuntu) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define UNEXPECTED(n) (fprintf (stderr, "Unexpected outcome %d errno %d\n", n, errno), abort ())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* The main thread creates the waiting writer and the requesting reader threads
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ in the default way; this guarantees that they have the same priority.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/libprelude/files/patch-fix_awk_error.diff b/security/libprelude/files/patch-fix_awk_error.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..03ff663c500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/libprelude/files/patch-fix_awk_error.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,116 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: Fix with recents awk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Thomas Andrejak <thomas.andrejak@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Last-Update: 2019-09-13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/libprelude-error/Makefile.am 2018-12-23 21:59:17.340000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/libprelude-error/Makefile.am 2019-07-11 17:33:18.537430699 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,7 +53,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ errnos-sym.h: Makefile mkstrtable.awk errnos.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LANG="" $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -v prefix=PRELUDE_ERROR_ -v namespace=errnos_ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -v prefix=PRELUDE_ERROR_ -v pkg_namespace=errnos_ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(srcdir)/errnos.in >$@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prelude-error.h: Makefile mkheader.awk err-sources.h.in err-codes.h.in errnos.in prelude-error.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/libprelude-error/Makefile.in 2018-12-23 22:01:05.090000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/libprelude-error/Makefile.in 2019-07-11 17:33:10.202599542 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1834,7 +1834,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ errnos-sym.h: Makefile mkstrtable.awk errnos.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LANG="" $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -v prefix=PRELUDE_ERROR_ -v namespace=errnos_ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -v prefix=PRELUDE_ERROR_ -v pkg_namespace=errnos_ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(srcdir)/errnos.in >$@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prelude-error.h: Makefile mkheader.awk err-sources.h.in err-codes.h.in errnos.in prelude-error.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/libprelude-error/mkerrcodes.awk 2018-12-23 21:59:17.340000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/libprelude-error/mkerrcodes.awk 2019-07-11 17:34:56.482462208 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -78,7 +78,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !header {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sub (/\#.+/, "");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sub (/#.+/, "");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (/^$/)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/libprelude-error/mkerrcodes1.awk 2018-12-23 21:59:17.341000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/libprelude-error/mkerrcodes1.awk 2019-07-11 17:35:02.737336699 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -78,7 +78,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !header {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sub (/\#.+/, "");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sub (/#.+/, "");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (/^$/)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/libprelude-error/mkerrcodes2.awk 2018-12-23 21:59:17.341000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/libprelude-error/mkerrcodes2.awk 2019-07-11 17:35:08.595219159 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -91,7 +91,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !header {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sub (/\#.+/, "");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sub (/#.+/, "");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (/^$/)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/libprelude-error/mkerrnos.awk 2019-07-11 17:41:09.385940916 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/libprelude-error/mkerrnos.awk 2019-07-11 17:41:22.455671539 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -80,7 +80,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !header {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sub (/\#.+/, "");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sub (/#.+/, "");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (/^$/)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/libprelude-error/mkstrtable.awk 2018-12-23 21:59:17.341000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/libprelude-error/mkstrtable.awk 2019-07-11 17:38:41.588950860 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,7 +77,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The variable prefix can be used to prepend a string to each message.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# The variable namespace can be used to prepend a string to each
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# The variable pkg_namespace can be used to prepend a string to each
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # variable and macro name.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BEGIN {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -102,7 +102,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "/* The purpose of this complex string table is to produce";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print " optimal code with a minimum of relocations. */";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print "static const char " namespace "msgstr[] = ";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print "static const char " pkg_namespace "msgstr[] = ";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ header = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -110,7 +110,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !header {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sub (/\#.+/, "");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sub (/#.+/, "");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (/^$/)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -150,14 +150,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print " gettext_noop (\"" prefix last_msgstr "\");";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print "static const int " namespace "msgidx[] =";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print "static const int " pkg_namespace "msgidx[] =";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print " {";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; i < coded_msgs; i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print " " pos[i] ",";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print " " pos[coded_msgs];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print " };";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print "#define " namespace "msgidxof(code) (0 ? -1 \\";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print "#define " pkg_namespace "msgidxof(code) (0 ? -1 \\";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Gather the ranges.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ skip = code[0];
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/libprelude/files/patch-fix_gtkdoc_1.32.diff b/security/libprelude/files/patch-fix_gtkdoc_1.32.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2dff88c55b4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/libprelude/files/patch-fix_gtkdoc_1.32.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: Fix building with gtk-doc 1.32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Thomas Andrejak <thomas.andrejak@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Last-Update: 2019-09-13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- docs/api/libprelude-docs.xml 2019-09-14 18:27:52.635435171 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ docs/api/libprelude-docs.xml 2019-09-15 03:25:47.491163135 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,10 +51,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <xi:include href="xml/idmef-value.xml"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </chapter>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <chapter id="object-tree">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <title>Object Hierarchy</title>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <xi:include href="xml/tree_index.sgml"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- </chapter>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <index id="api-index-full">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <title>API Index</title>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/libprelude/files/patch-fix_perl_rpath.diff b/security/libprelude/files/patch-fix_perl_rpath.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8501de18eef
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/libprelude/files/patch-fix_perl_rpath.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: Fix Perl rpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Thomas Andrejak <thomas.andrejak@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Last-Update: 2020-06-20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- bindings/perl/Makefile.PL.in 2019-10-14 22:33:03.107000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ bindings/perl/Makefile.PL.in 2020-06-22 00:21:48.841000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,7 +27,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my %attributs = (NAME => 'Prelude',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INC => '-I@top_builddir@ -I@top_builddir@/src/include -I@top_srcdir@/src/include -I@top_builddir@/src/libprelude-error -I@top_srcdir@/bindings/c++/include',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS => ["-L@top_builddir@/src/.libs -lprelude -L@top_builddir@/bindings/c++/.libs -lpreludecpp", "-L$ENV{LIBDIR} -lprelude @LIBPRELUDE_LIBS@ @LIBADD_DL@ @LTLIBTHREAD@" ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDDLFLAGS => "-L@top_builddir@/src/.libs $Config{lddlflags} @LDFLAGS@,-rpath");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LDDLFLAGS => "-L@top_builddir@/src/.libs $Config{lddlflags} @LDFLAGS@");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( abs_path("@top_srcdir@") ne abs_path("@top_builddir@") ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach my $filename ( qw/Prelude.cxx Prelude.pm/ ) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/libprelude/files/patch-fix_prelude_tests_timer.diff b/security/libprelude/files/patch-fix_prelude_tests_timer.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..32625991b88
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/libprelude/files/patch-fix_prelude_tests_timer.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: Fix Prelude test timer on slow system
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Thomas Andrejak <thomas.andrejak@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Last-Update: 2017-02-28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Forwarded: https://www.prelude-siem.org/issues/887
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tests/prelude-timer.c 2016-09-15 08:49:10.810000884 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tests/prelude-timer.c 2017-05-16 07:18:40.763829280 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,7 +31,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test_timer_t *timer = data;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int elapsed = time(NULL) - timer->start_time;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- assert(elapsed == prelude_timer_get_expire(&timer->timer));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert(elapsed >= prelude_timer_get_expire(&timer->timer));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert(elapsed <= prelude_timer_get_expire(&timer->timer)+1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prelude_timer_destroy(&timer->timer);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(timer);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/libprelude/files/patch-fix_py38.diff b/security/libprelude/files/patch-fix_py38.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3e12cb2bacc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/libprelude/files/patch-fix_py38.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: Fix for python 3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Thomas Andrejak <thomas.andrejak@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Last-Update: 2019-09-13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- bindings/python/_prelude.cxx 2019-07-12 07:19:49.365476420 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ bindings/python/_prelude.cxx 2019-07-12 07:20:02.458213034 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3132,7 +3132,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SWIGINTERN void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SwigPyStaticVar_dealloc(PyDescrObject *descr) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _PyObject_GC_UNTRACK(descr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PyObject_GC_UnTrack(descr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Py_XDECREF(PyDescr_TYPE(descr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Py_XDECREF(PyDescr_NAME(descr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PyObject_GC_Del(descr);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/libprelude/files/patch-fix_timegm.diff b/security/libprelude/files/patch-fix_timegm.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2f4b4912ecd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/libprelude/files/patch-fix_timegm.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: Fix Prelude timegm comparaison
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Thomas Andrejak <thomas.andrejak@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Last-Update: 2017-02-28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Forwarded: https://www.prelude-siem.org/issues/865
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/idmef-criterion-value.c 2016-12-04 22:36:21.364349964 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/idmef-criterion-value.c 2016-12-04 22:37:40.770573582 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -194,22 +194,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Apply mask
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ( comp.tm_sec < 0 ) lt.tm_sec = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ( comp.tm_sec < 0 ) comp.tm_sec = lt.tm_sec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else need_full_compare = TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ( comp.tm_min < 0 ) lt.tm_min = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ( comp.tm_min < 0 ) comp.tm_min = lt.tm_min;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else need_full_compare = TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ( comp.tm_mon < 0 ) lt.tm_mon = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ( comp.tm_mon < 0 ) comp.tm_mon = lt.tm_mon;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else need_full_compare = TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ( comp.tm_hour < 0 ) lt.tm_hour = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ( comp.tm_hour < 0 ) comp.tm_hour = lt.tm_hour;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else need_full_compare = TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ( comp.tm_mday < 0 ) lt.tm_mday = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ( comp.tm_mday < 0 ) comp.tm_mday = lt.tm_mday;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else need_full_compare = TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ( comp.tm_year < 0 ) lt.tm_year = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ( comp.tm_year < 0 ) comp.tm_year = lt.tm_year;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else need_full_compare = TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( comp.tm_wday < 0 ) lt.tm_wday = -1;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/libprelude/files/patch-gnutls-extra.diff b/security/libprelude/files/patch-gnutls-extra.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ce6cc48c678..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/libprelude/files/patch-gnutls-extra.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build with gnutls > 3.0.5 in which the gnutls/extra.h header was merged into the main header
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://www.prelude-ids.org/issues/514
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- prelude-admin/prelude-admin.c.orig 2012-06-01 12:12:22.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ prelude-admin/prelude-admin.c 2012-08-03 19:23:29.998711311 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -57,7 +57,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <errno.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <gnutls/gnutls.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <gnutls/x509.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if GNUTLS_VERSION_NUMBER < 0x030005
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <gnutls/extra.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "common.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "config-engine.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- prelude-admin/server.c.orig 2012-06-01 12:12:22.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ prelude-admin/server.c 2012-08-03 19:23:02.195712002 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,7 +39,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <gcrypt.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <gnutls/gnutls.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if GNUTLS_VERSION_NUMBER < 0x030005
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <gnutls/extra.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "prelude-client.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "prelude-error.h"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/libprelude/files/patch-src-include-prelude-plugin.h.diff b/security/libprelude/files/patch-src-include-prelude-plugin.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ac26da4ae7f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/libprelude/files/patch-src-include-prelude-plugin.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/include/prelude-plugin.h.orig 2010-03-10 06:18:20.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/include/prelude-plugin.h 2012-05-10 21:01:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -63,7 +63,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define lt_preloaded_symbols lt__PROGRAM__LTX_preloaded_symbols
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern const void *lt_preloaded_symbols[];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PRELUDE_PLUGIN_SET_PRELOADED_SYMBOLS() \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- prelude_plugin_set_preloaded_symbols(lt_preloaded_symbols)
</span></pre><pre style='margin:0'>
</pre>