Hello community, here is the log from the commit of package libprelude for openSUSE:Factory checked in at 2017-11-13 14:02:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libprelude (Old) and /work/SRC/openSUSE:Factory/.libprelude.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libprelude" Mon Nov 13 14:02:33 2017 rev:4 rq:541095 version:4.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libprelude/libprelude.changes 2017-05-08 19:04:14.965673115 +0200 +++ /work/SRC/openSUSE:Factory/.libprelude.new/libprelude.changes 2017-11-13 14:05:52.510278012 +0100 @@ -1,0 +2,21 @@ +Wed Oct 04 07:00:00 UTC 2017 - thomas.andre...@gmail.com + +- Bump to libprelude 4.0.0 +- Add patchs: + - libprelude-disable_gnulib_test_lock.patch: Known bug on gnulib side and + will be fixed + - libprelude-fix_prelude_tests_timer.patch: Wrong test + - libprelude-fix_pthread_atfork.patch: pthread_atfork was automatically + linked before but not anymore + - libprelude-fix_timegm.patch: Fix time comparaison + - libprelude-fsf-address.patch: Wrong FSF address + - libprelude-gtk-doc.patch: gtk-doc removed gtkdoc-tmpl so gtk-doc.make and + gtk-doc.m4 need to be updated + - libprelude-linking.patch: Correctly link for Perl bindings + - libprelude-fix_compatibility_gnutls_3_6.patch: Fix compatibility with + GnuTLS 3.6 +- Remove libgcrypt-devel from BuildRequires since upstream totally move to + gnutls +- Rename python-prelude to python2-prelude + +------------------------------------------------------------------- Old: ---- libprelude-3.1.0.tar.gz New: ---- libprelude-4.0.0.tar.gz libprelude-disable_gnulib_test_lock.patch libprelude-fix_compatibility_gnutls_3_6.patch libprelude-fix_prelude_tests_timer.patch libprelude-fix_pthread_atfork.patch libprelude-fix_timegm.patch libprelude-fsf-address.patch libprelude-gtk-doc.patch libprelude-linking.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libprelude.spec ++++++ --- /var/tmp/diff_new_pack.1spjxt/_old 2017-11-13 14:05:54.450208230 +0100 +++ /var/tmp/diff_new_pack.1spjxt/_new 2017-11-13 14:05:54.450208230 +0100 @@ -24,19 +24,34 @@ %define sover 23 %define sover_cpp 8 Name: libprelude -Version: 3.1.0 +Version: 4.0.0 Release: 0 Summary: Secure Connections between all Sensors and the Prelude Manager +License: GPL-2.0+ and LGPL-2.1 and GPL-3.0+ +Group: Productivity/Networking/Security # Prelude is GPL-2.0+ # libmissing is LGPL-2.1+ # libmissing/test is GPL-3.0+ -License: GPL-2.0+ and LGPL-2.1 and GPL-3.0+ -Group: Productivity/Networking/Security Url: https://www.prelude-siem.org -Source0: https://www.prelude-siem.org/pkg/src/3.1.0/%{name}-%{version}.tar.gz +Source0: https://www.prelude-siem.org/pkg/src/%{version}/%{name}-%{version}.tar.gz +# Known bug on gnulib side and will be fixed +Patch0: libprelude-disable_gnulib_test_lock.patch +# Wrong test +Patch1: libprelude-fix_prelude_tests_timer.patch +# pthread_atfork was automatically linked before but not anymore +Patch2: libprelude-fix_pthread_atfork.patch +# Fix time comparaison +Patch3: libprelude-fix_timegm.patch +# Wrong FSF address +Patch4: libprelude-fsf-address.patch +# gtk-doc removed gtkdoc-tmpl so gtk-doc.make and gtk-doc.m4 need to be updated +Patch5: libprelude-gtk-doc.patch +# Correctly link for Perl bindings +Patch6: libprelude-linking.patch +# Fix compatibility with GnuTLS 3.6 +Patch7: libprelude-fix_compatibility_gnutls_3_6.patch BuildRequires: gcc-c++ BuildRequires: gtk-doc -BuildRequires: libgcrypt-devel BuildRequires: libgnutls-devel BuildRequires: libgpg-error-devel BuildRequires: lua-devel @@ -131,14 +146,16 @@ the saving and re-transmission of data in times of temporary interruption of one of the components of the system. -%package -n python-%{name} -Summary: Python bindings for libprelude +%package -n python2-%{name} +Summary: Python 2 bindings for libprelude Group: Development/Languages/Python +Provides: python-%{name} = %version +Obsoletes: python-%{name} < %version Requires: libprelude%{sover} = %{version} Requires: python = %{py_ver} -%description -n python-%{name} -Python bindings for libprelude generated by SWIG. +%description -n python2-%{name} +Python 2 bindings for libprelude generated by SWIG. %package -n perl-%{name} Summary: Perl bindings for libprelude @@ -186,6 +203,14 @@ %prep %setup -q +%patch0 +%patch1 +%patch2 +%patch3 +%patch4 +%patch5 +%patch6 +%patch7 %build %configure --disable-static \ @@ -255,7 +280,7 @@ %dir %{_datadir}/libprelude%{sover}/swig/ruby/ %{_datadir}/libprelude%{sover}/swig/ruby/libpreludecpp-ruby.i -%files -n python-%{name} +%files -n python2-%{name} %defattr(-,root,root) %{python_sitearch}/* ++++++ libprelude-3.1.0.tar.gz -> libprelude-4.0.0.tar.gz ++++++ ++++ 210921 lines of diff (skipped) ++++++ libprelude-disable_gnulib_test_lock.patch ++++++ From: Thomas Andrejak <thomas.andre...@gmail.com> Date: 2017-10-04 07:00:00 +0100 References: http://prelude-siem.org/issues/886 Upstream: submitted Subject: Known bug on gnulib side and will be fixed --- ./libmissing/tests/Makefile.in 2017-07-17 12:03:50.381000000 +0200 +++ ./libmissing/tests/Makefile.in 2017-09-17 17:27:31.901783351 +0200 @@ -127,7 +127,7 @@ test-isblank$(EXEEXT) test-langinfo$(EXEEXT) \ test-limits-h$(EXEEXT) test-listen$(EXEEXT) \ test-locale$(EXEEXT) test-localeconv$(EXEEXT) \ - test-localename$(EXEEXT) test-lock$(EXEEXT) test-lseek.sh \ + test-localename$(EXEEXT) test-lseek.sh \ test-lstat$(EXEEXT) test-malloca$(EXEEXT) test-mbrtowc1.sh \ test-mbrtowc2.sh test-mbrtowc3.sh test-mbrtowc4.sh \ test-mbrtowc5.sh test-mbrtowc-w32-1.sh test-mbrtowc-w32-2.sh \ @@ -191,7 +191,7 @@ test-isblank$(EXEEXT) test-langinfo$(EXEEXT) \ test-limits-h$(EXEEXT) test-listen$(EXEEXT) \ test-locale$(EXEEXT) test-localeconv$(EXEEXT) \ - test-localename$(EXEEXT) test-lock$(EXEEXT) \ + test-localename$(EXEEXT) \ test-lseek$(EXEEXT) test-lstat$(EXEEXT) test-malloca$(EXEEXT) \ test-mbrtowc$(EXEEXT) test-mbrtowc-w32$(EXEEXT) \ test-mbsinit$(EXEEXT) test-memchr$(EXEEXT) \ @@ -736,9 +736,6 @@ test_localename_OBJECTS = test-localename.$(OBJEXT) test_localename_DEPENDENCIES = $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_1) -test_lock_SOURCES = test-lock.c -test_lock_OBJECTS = test-lock.$(OBJEXT) -test_lock_DEPENDENCIES = $(am__DEPENDENCIES_2) test_lseek_SOURCES = test-lseek.c test_lseek_OBJECTS = test-lseek.$(OBJEXT) test_lseek_LDADD = $(LDADD) @@ -1128,7 +1125,7 @@ test-gettimeofday.c test-ignore-value.c test-inet_ntop.c \ test-inet_pton.c test-intprops.c test-inttypes.c test-ioctl.c \ test-isblank.c test-langinfo.c test-limits-h.c test-listen.c \ - test-locale.c test-localeconv.c test-localename.c test-lock.c \ + test-locale.c test-localeconv.c test-localename.c \ test-lseek.c test-lstat.c test-malloca.c test-mbrtowc.c \ test-mbrtowc-w32.c test-mbsinit.c test-memchr.c test-memmem.c \ test-netdb.c test-netinet_in.c test-nl_langinfo.c test-open.c \ @@ -1165,7 +1162,7 @@ test-gettimeofday.c test-ignore-value.c test-inet_ntop.c \ test-inet_pton.c test-intprops.c test-inttypes.c test-ioctl.c \ test-isblank.c test-langinfo.c test-limits-h.c test-listen.c \ - test-locale.c test-localeconv.c test-localename.c test-lock.c \ + test-locale.c test-localeconv.c test-localename.c \ test-lseek.c test-lstat.c test-malloca.c test-mbrtowc.c \ test-mbrtowc-w32.c test-mbsinit.c test-memchr.c test-memmem.c \ test-netdb.c test-netinet_in.c test-nl_langinfo.c test-open.c \ @@ -2550,7 +2547,7 @@ test-isblank.c signature.h macros.h test-langinfo.c \ test-limits-h.c test-listen.c signature.h macros.h \ test-locale.c test-localeconv.c signature.h macros.h \ - localename.h test-localename.c macros.h test-lock.c \ + localename.h test-localename.c macros.h \ test-lseek.c test-lseek.sh signature.h macros.h lstat.c \ test-lstat.h test-lstat.c signature.h macros.h malloca.h \ malloca.valgrind test-malloca.c test-mbrtowc1.sh \ @@ -2994,10 +2991,6 @@ @rm -f test-localename$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_localename_OBJECTS) $(test_localename_LDADD) $(LIBS) -test-lock$(EXEEXT): $(test_lock_OBJECTS) $(test_lock_DEPENDENCIES) $(EXTRA_test_lock_DEPENDENCIES) - @rm -f test-lock$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_lock_OBJECTS) $(test_lock_LDADD) $(LIBS) - test-lseek$(EXEEXT): $(test_lseek_OBJECTS) $(test_lseek_DEPENDENCIES) $(EXTRA_test_lseek_DEPENDENCIES) @rm -f test-lseek$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_lseek_OBJECTS) $(test_lseek_LDADD) $(LIBS) @@ -3359,7 +3352,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-locale.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-localeconv.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-localename.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-lock.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-lseek.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-lstat.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-malloca.Po@am__quote@ @@ -4154,13 +4146,6 @@ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test-lock.log: test-lock$(EXEEXT) - @p='test-lock$(EXEEXT)'; \ - b='test-lock'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) test-lseek.sh.log: test-lseek.sh @p='test-lseek.sh'; \ --- ./libmissing/tests/Makefile.am 2017-07-17 12:03:05.700000000 +0200 +++ ./libmissing/tests/Makefile.am 2017-09-17 17:25:12.229809581 +0200 @@ -721,15 +721,6 @@ ## end gnulib module localename-tests -## begin gnulib module lock-tests - -TESTS += test-lock -check_PROGRAMS += test-lock -test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@ -EXTRA_DIST += test-lock.c - -## end gnulib module lock-tests - ## begin gnulib module lseek-tests TESTS += test-lseek.sh ++++++ libprelude-fix_compatibility_gnutls_3_6.patch ++++++ From: Thomas Andrejak <thomas.andre...@gmail.com> Date: 2017-10-04 07:00:00 +0100 References: http://prelude-siem.org/issues/911 Upstream: submitted Subject: Fix compatibility with GnuTLS 3.6 --- ./prelude-admin/tls-register.c 2017-07-17 12:03:05.762000000 +0200 +++ ./prelude-admin/tls-register.c2 2017-10-09 09:37:26.874129389 +0200 @@ -409,7 +409,7 @@ goto err; } - ret = gnutls_x509_crt_sign(crt, ca_crt, ca_key); + ret = gnutls_x509_crt_sign2(crt, ca_crt, ca_key, GNUTLS_DIG_SHA256, 0); if ( ret < 0 ) { fprintf(stderr, "error signing certificate: %s.\n", gnutls_strerror(ret)); goto err; @@ -445,7 +445,7 @@ gnutls_x509_crt_set_ca_status(crt, 1); gnutls_x509_crt_set_key_usage(crt, usage); - ret = gnutls_x509_crt_sign(crt, crt, key); + ret = gnutls_x509_crt_sign2(crt, crt, key, GNUTLS_DIG_SHA256, 0); if ( ret < 0 ) { fprintf(stderr, "error self-signing certificate: %s.\n", gnutls_strerror(ret)); gnutls_x509_crt_deinit(crt); ++++++ libprelude-fix_prelude_tests_timer.patch ++++++ From: Thomas Andrejak <thomas.andre...@gmail.com> Date: 2017-10-04 07:00:00 +0100 References: http://prelude-siem.org/issues/887 Upstream: submitted Subject: Wrong test --- ./tests/prelude-timer.c 2016-09-15 08:49:10.810000884 +0200 +++ ./tests/prelude-timer.c 2017-05-16 07:18:40.763829280 +0200 @@ -31,7 +31,8 @@ test_timer_t *timer = data; unsigned int elapsed = time(NULL) - timer->start_time; - assert(elapsed == prelude_timer_get_expire(&timer->timer)); + assert(elapsed >= prelude_timer_get_expire(&timer->timer)); + assert(elapsed <= prelude_timer_get_expire(&timer->timer)+1); prelude_timer_destroy(&timer->timer); free(timer); ++++++ libprelude-fix_pthread_atfork.patch ++++++ From: Thomas Andrejak <thomas.andre...@gmail.com> Date: 2017-10-04 07:00:00 +0100 References: http://prelude-siem.org/issues/885 Upstream: submitted Subject: pthread_atfork was automatically linked before but not anymore --- ./prelude-admin/Makefile.am 2016-09-15 08:49:10.785000884 +0200 +++ ./prelude-admin/Makefile.am 2017-04-25 23:55:55.141482528 +0200 @@ -7,7 +7,7 @@ $(top_builddir)/src/variable.lo \ $(top_builddir)/src/libprelude.la \ @PRELUDE_ADMIN_LIBS@ \ - ../libmissing/libmissing.la $(GETADDRINFO_LIB) $(GETHOSTNAME_LIB) $(HOSTENT_LIB) $(INET_NTOP_LIB) $(INET_PTON_LIB) $(LIBSOCKET) $(LIB_POLL) $(LIB_SELECT) $(LTLIBINTL) $(LTLIBTHREAD) $(SERVENT_LIB) + ../libmissing/libmissing.la $(GETADDRINFO_LIB) $(GETHOSTNAME_LIB) $(HOSTENT_LIB) $(INET_NTOP_LIB) $(INET_PTON_LIB) $(LIBSOCKET) $(LIB_POLL) $(LIB_SELECT) $(LTLIBINTL) $(LTLIBMULTITHREAD) $(SERVENT_LIB) prelude_admin_SOURCES = \ --- ./src/Makefile.am 2016-09-15 08:49:10.786000884 +0200 +++ ./src/Makefile.am 2017-04-25 23:56:31.085664831 +0200 @@ -9,7 +9,7 @@ libpreludeincludedir = $(includedir)/ libprelude_la_LIBADD = @LIBPRELUDE_LIBS@ $(LIBLTDL) $(top_builddir)/libmissing/libmissing.la libprelude-error/libprelude-error.la -libprelude_la_LDFLAGS = $(GETADDRINFO_LIB) $(GETHOSTNAME_LIB) $(HOSTENT_LIB) $(INET_NTOP_LIB) $(INET_PTON_LIB) $(LIBSOCKET) $(LIB_POLL) $(LIB_SELECT) $(LTLIBINTL) $(LTLIBTHREAD) $(SERVENT_LIB) -no-undefined -version-info @LIBPRELUDE_SONAME@ -export-symbols-regex "^(idmef|_?prelude)_" +libprelude_la_LDFLAGS = $(GETADDRINFO_LIB) $(GETHOSTNAME_LIB) $(HOSTENT_LIB) $(INET_NTOP_LIB) $(INET_PTON_LIB) $(LIBSOCKET) $(LIB_POLL) $(LIB_SELECT) $(LTLIBINTL) $(LTLIBMULTITHREAD) $(SERVENT_LIB) -no-undefined -version-info @LIBPRELUDE_SONAME@ -export-symbols-regex "^(idmef|_?prelude)_" -Wl,-u,pthread_atfork lib_LTLIBRARIES = libprelude.la BUILT_SOURCES = $(LTDLDEPS) --- ./src/libprelude-error/Makefile.am 2016-09-15 08:49:10.805000884 +0200 +++ ./src/libprelude-error/Makefile.am 2017-04-25 23:57:02.636949645 +0200 @@ -14,7 +14,7 @@ nodist_include_HEADERS = prelude-error.h noinst_LTLIBRARIES = libprelude-error.la -libprelude_error_la_LIBADD = @LTLIBTHREAD@ +libprelude_error_la_LIBADD = $(LTLIBMULTITHREAD) libprelude_error_la_LDFLAGS = -no-undefined libprelude_error_la_SOURCES = prelude-error.h prelude-error.c strsource.c strerror.c --- ./src/libprelude-error/Makefile.in 2016-09-15 08:51:19.590000884 +0200 +++ ./src/libprelude-error/Makefile.in 2017-04-26 08:06:29.762178749 +0200 @@ -912,7 +912,7 @@ LIBS = @LIBS@ LIBSOCKET = @LIBSOCKET@ LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ -LIBTHREAD = @LIBTHREAD@ +LIBMULTITHREAD = @LIBMULTITHREAD@ LIBTOOL = @LIBTOOL@ LIB_POLL = @LIB_POLL@ LIB_SELECT = @LIB_SELECT@ @@ -933,7 +933,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ LTLIBOBJS = @LTLIBOBJS@ LTLIBPTH = @LTLIBPTH@ -LTLIBTHREAD = @LTLIBTHREAD@ +LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ LT_CONFIG_H = @LT_CONFIG_H@ LT_DLLOADERS = @LT_DLLOADERS@ LT_DLPREOPEN = @LT_DLPREOPEN@ @@ -1323,7 +1323,7 @@ nodist_include_HEADERS = prelude-error.h noinst_LTLIBRARIES = libprelude-error.la -libprelude_error_la_LIBADD = @LTLIBTHREAD@ +libprelude_error_la_LIBADD = $(LTLIBMULTITHREAD) libprelude_error_la_LDFLAGS = -no-undefined libprelude_error_la_SOURCES = prelude-error.h prelude-error.c strsource.c strerror.c all: $(BUILT_SOURCES) --- ./src/Makefile.in 2016-09-15 08:51:19.299000884 +0200 +++ ./src/Makefile.in 2017-04-26 08:05:59.685853138 +0200 @@ -978,7 +978,7 @@ LIBS = @LIBS@ LIBSOCKET = @LIBSOCKET@ LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ -LIBTHREAD = @LIBTHREAD@ +LIBMULTITHREAD = @LIBMULTITHREAD@ LIBTOOL = @LIBTOOL@ LIB_POLL = @LIB_POLL@ LIB_SELECT = @LIB_SELECT@ @@ -999,7 +999,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ LTLIBOBJS = @LTLIBOBJS@ LTLIBPTH = @LTLIBPTH@ -LTLIBTHREAD = @LTLIBTHREAD@ +LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ LT_CONFIG_H = @LT_CONFIG_H@ LT_DLLOADERS = @LT_DLLOADERS@ LT_DLPREOPEN = @LT_DLPREOPEN@ @@ -1386,7 +1386,7 @@ DISTCLEANFILES = $(pkgconfig_DATA) idmef-criteria-string.yac.h idmef-criteria-string.lex.c idmef-criteria-string.yac.c libpreludeincludedir = $(includedir)/ libprelude_la_LIBADD = @LIBPRELUDE_LIBS@ $(LIBLTDL) $(top_builddir)/libmissing/libmissing.la libprelude-error/libprelude-error.la -libprelude_la_LDFLAGS = $(GETADDRINFO_LIB) $(GETHOSTNAME_LIB) $(HOSTENT_LIB) $(INET_NTOP_LIB) $(INET_PTON_LIB) $(LIBSOCKET) $(LIB_POLL) $(LIB_SELECT) $(LTLIBINTL) $(LTLIBTHREAD) $(SERVENT_LIB) -no-undefined -version-info @LIBPRELUDE_SONAME@ -export-symbols-regex "^(idmef|_?prelude)_" +libprelude_la_LDFLAGS = $(GETADDRINFO_LIB) $(GETHOSTNAME_LIB) $(HOSTENT_LIB) $(INET_NTOP_LIB) $(INET_PTON_LIB) $(LIBSOCKET) $(LIB_POLL) $(LIB_SELECT) $(LTLIBINTL) $(LTLIBMULTITHREAD) $(SERVENT_LIB) -no-undefined -version-info @LIBPRELUDE_SONAME@ -export-symbols-regex "^(idmef|_?prelude)_" -Wl,-u,pthread_atfork lib_LTLIBRARIES = libprelude.la BUILT_SOURCES = $(LTDLDEPS) AM_YFLAGS = -d --- ./prelude-admin/Makefile.in 2016-09-15 08:51:19.173000884 +0200 +++ ./prelude-admin/Makefile.in 2017-04-26 08:05:48.262109285 +0200 @@ -922,7 +922,7 @@ LIBS = @LIBS@ LIBSOCKET = @LIBSOCKET@ LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ -LIBTHREAD = @LIBTHREAD@ +LIBMULTITHREAD = @LIBMULTITHREAD@ LIBTOOL = @LIBTOOL@ LIB_POLL = @LIB_POLL@ LIB_SELECT = @LIB_SELECT@ @@ -943,7 +943,7 @@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ LTLIBOBJS = @LTLIBOBJS@ LTLIBPTH = @LTLIBPTH@ -LTLIBTHREAD = @LTLIBTHREAD@ +LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ LT_CONFIG_H = @LT_CONFIG_H@ LT_DLLOADERS = @LT_DLLOADERS@ LT_DLPREOPEN = @LT_DLPREOPEN@ @@ -1327,7 +1327,7 @@ $(top_builddir)/src/variable.lo \ $(top_builddir)/src/libprelude.la \ @PRELUDE_ADMIN_LIBS@ \ - ../libmissing/libmissing.la $(GETADDRINFO_LIB) $(GETHOSTNAME_LIB) $(HOSTENT_LIB) $(INET_NTOP_LIB) $(INET_PTON_LIB) $(LIBSOCKET) $(LIB_POLL) $(LIB_SELECT) $(LTLIBINTL) $(LTLIBTHREAD) $(SERVENT_LIB) + ../libmissing/libmissing.la $(GETADDRINFO_LIB) $(GETHOSTNAME_LIB) $(HOSTENT_LIB) $(INET_NTOP_LIB) $(INET_PTON_LIB) $(LIBSOCKET) $(LIB_POLL) $(LIB_SELECT) $(LTLIBINTL) $(LTLIBMULTITHREAD) $(SERVENT_LIB) prelude_admin_SOURCES = \ prelude-admin.c \ ++++++ libprelude-fix_timegm.patch ++++++ From: Thomas Andrejak <thomas.andre...@gmail.com> Date: 2017-10-04 07:00:00 +0100 References: http://prelude-siem.org/issues/865 Upstream: submitted Subject: Fix time comparaison --- ./src/idmef-criterion-value.c 2016-12-04 22:36:21.364349964 +0100 +++ ./src/idmef-criterion-value.c 2016-12-04 22:37:40.770573582 +0100 @@ -194,22 +194,22 @@ /* * Apply mask */ - if ( comp.tm_sec < 0 ) lt.tm_sec = -1; + if ( comp.tm_sec < 0 ) comp.tm_sec = lt.tm_sec; else need_full_compare = TRUE; - if ( comp.tm_min < 0 ) lt.tm_min = -1; + if ( comp.tm_min < 0 ) comp.tm_min = lt.tm_min; else need_full_compare = TRUE; - if ( comp.tm_mon < 0 ) lt.tm_mon = -1; + if ( comp.tm_mon < 0 ) comp.tm_mon = lt.tm_mon; else need_full_compare = TRUE; - if ( comp.tm_hour < 0 ) lt.tm_hour = -1; + if ( comp.tm_hour < 0 ) comp.tm_hour = lt.tm_hour; else need_full_compare = TRUE; - if ( comp.tm_mday < 0 ) lt.tm_mday = -1; + if ( comp.tm_mday < 0 ) comp.tm_mday = lt.tm_mday; else need_full_compare = TRUE; - if ( comp.tm_year < 0 ) lt.tm_year = -1; + if ( comp.tm_year < 0 ) comp.tm_year = lt.tm_year; else need_full_compare = TRUE; if ( comp.tm_wday < 0 ) lt.tm_wday = -1; ++++++ libprelude-fsf-address.patch ++++++ From: Thomas Andrejak <thomas.andre...@gmail.com> Date: 2017-10-04 07:00:00 +0100 References: http://prelude-siem.org/issues/863 Upstream: submitted Subject: Wrong FSF address diff -ru ./src/libprelude-error/err-codes.h ./src/libprelude-error/err-codes.h --- ./src/libprelude-error/err-codes.h 2016-09-15 08:51:51.964000884 +0200 +++ ./src/libprelude-error/err-codes.h 2016-12-02 07:37:52.786070647 +0100 @@ -15,10 +15,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General Public - License along with libgpg-error; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /* The purpose of this complex string table is to produce diff -ru ./src/libprelude-error/err-codes.h.in ./src/libprelude-error/err-codes.h.in --- ./src/libprelude-error/err-codes.h.in 2016-09-15 08:49:10.805000884 +0200 +++ ./src/libprelude-error/err-codes.h.in 2016-12-02 07:38:08.252722176 +0100 @@ -14,10 +14,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General Public - License along with libgpg-error; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ # Everything up to the first line that starts with a number in the # first column is copied into the output verbatim. Then, empty lines diff -ru ./src/libprelude-error/errnos.in ./src/libprelude-error/errnos.in --- ./src/libprelude-error/errnos.in 2016-09-15 08:49:10.806000884 +0200 +++ ./src/libprelude-error/errnos.in 2016-12-02 07:38:23.777372399 +0100 @@ -14,10 +14,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General Public - License along with libgpg-error; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ # Everything up to the first line that starts with a number in the # first column is copied into the output verbatim. Then, empty lines diff -ru ./src/libprelude-error/err-sources.h ./src/libprelude-error/err-sources.h --- ./src/libprelude-error/err-sources.h 2016-09-15 08:51:51.961000884 +0200 +++ ./src/libprelude-error/err-sources.h 2016-12-02 07:38:32.605173508 +0100 @@ -15,10 +15,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General Public - License along with libgpg-error; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /* The purpose of this complex string table is to produce diff -ru ./src/libprelude-error/err-sources.h.in ./src/libprelude-error/err-sources.h.in --- ./src/libprelude-error/err-sources.h.in 2016-09-15 08:49:10.806000884 +0200 +++ ./src/libprelude-error/err-sources.h.in 2016-12-02 07:39:14.072239231 +0100 @@ -14,10 +14,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General Public - License along with libgpg-error; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ # Everything up to the first line that starts with a number in the # first column is copied into the output verbatim. Then, empty lines diff -ru ./src/libprelude-error/mkerrcodes1.awk ./src/libprelude-error/mkerrcodes1.awk --- ./src/libprelude-error/mkerrcodes1.awk 2016-09-15 08:49:10.806000884 +0200 +++ ./src/libprelude-error/mkerrcodes1.awk 2016-12-02 07:40:41.671265585 +0100 @@ -11,9 +11,9 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # As a special exception, g10 Code GmbH gives unlimited permission to # copy, distribute and modify the C source files that are the output diff -ru ./src/libprelude-error/mkerrcodes2.awk ./src/libprelude-error/mkerrcodes2.awk --- ./src/libprelude-error/mkerrcodes2.awk 2016-09-15 08:49:10.806000884 +0200 +++ ./src/libprelude-error/mkerrcodes2.awk 2016-12-02 07:40:57.327912836 +0100 @@ -11,9 +11,9 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # As a special exception, g10 Code GmbH gives unlimited permission to # copy, distribute and modify the C source files that are the output diff -ru ./src/libprelude-error/mkerrcodes.awk ./src/libprelude-error/mkerrcodes.awk --- ./src/libprelude-error/mkerrcodes.awk 2016-09-15 08:49:10.806000884 +0200 +++ ./src/libprelude-error/mkerrcodes.awk 2016-12-02 07:41:21.451369320 +0100 @@ -11,9 +11,9 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # As a special exception, g10 Code GmbH gives unlimited permission to # copy, distribute and modify the C source files that are the output diff -ru ./src/libprelude-error/mkerrcodes.c ./src/libprelude-error/mkerrcodes.c --- ./src/libprelude-error/mkerrcodes.c 2016-09-15 08:49:10.806000884 +0200 +++ ./src/libprelude-error/mkerrcodes.c 2016-12-02 07:42:27.668877410 +0100 @@ -13,10 +13,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General Public - License along with libgpg-error; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /* This file must not include config.h, as that is for the host system, while this file will be run on the build system. */ @@ -40,10 +39,9 @@ " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n" " Lesser General Public License for more details.\n" "\n" -" You should have received a copy of the GNU Lesser General Public\n" -" License along with libgpg-error; if not, write to the Free\n" -" Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n" -" 02111-1307, USA. */\n" +" You should have received a copy of the GNU General Public License along\n" +" with this program; if not, write to the Free Software Foundation,\n" +" Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */\n" "\n"; int diff -ru ./src/libprelude-error/mkerrnos.awk ./src/libprelude-error/mkerrnos.awk --- ./src/libprelude-error/mkerrnos.awk 2016-09-15 08:49:10.806000884 +0200 +++ ./src/libprelude-error/mkerrnos.awk 2016-12-02 07:42:46.332456910 +0100 @@ -11,9 +11,9 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # As a special exception, g10 Code GmbH gives unlimited permission to # copy, distribute and modify the C source files that are the output diff -ru ./src/libprelude-error/mkheader.awk ./src/libprelude-error/mkheader.awk --- ./src/libprelude-error/mkheader.awk 2016-09-15 08:49:10.806000884 +0200 +++ ./src/libprelude-error/mkheader.awk 2016-12-02 07:42:59.250165869 +0100 @@ -11,9 +11,9 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # As a special exception, g10 Code GmbH gives unlimited permission to # copy, distribute and modify the C source files that are the output diff -ru ./src/libprelude-error/mkstrtable.awk ./src/libprelude-error/mkstrtable.awk --- ./src/libprelude-error/mkstrtable.awk 2016-09-15 08:49:10.806000884 +0200 +++ ./src/libprelude-error/mkstrtable.awk 2016-12-02 07:43:08.552956273 +0100 @@ -11,9 +11,9 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # As a special exception, g10 Code GmbH gives unlimited permission to # copy, distribute and modify the C source files that are the output diff -ru ./src/libprelude-error/strerror.c ./src/libprelude-error/strerror.c --- ./src/libprelude-error/strerror.c 2016-09-15 08:49:10.806000884 +0200 +++ ./src/libprelude-error/strerror.c 2016-12-02 07:44:11.256543536 +0100 @@ -13,10 +13,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General Public - License along with libgpg-error; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "config.h" diff -ru ./src/libprelude-error/strsource.c ./src/libprelude-error/strsource.c --- ./src/libprelude-error/strsource.c 2016-09-15 08:49:10.806000884 +0200 +++ ./src/libprelude-error/strsource.c 2016-12-02 07:44:26.455201104 +0100 @@ -13,10 +13,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General Public - License along with libgpg-error; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "config.h" ++++++ libprelude-gtk-doc.patch ++++++ ++++ 978 lines (skipped) ++++++ libprelude-linking.patch ++++++ From: Thomas Andrejak <thomas.andre...@gmail.com> Date: 2017-10-04 07:00:00 +0100 References: http://prelude-siem.org/issues/859 Upstream: submitted Subject: Correctly link for Perl bindings diff -up ./bindings/perl/Makefile.PL.in.orig ./bindings/perl/Makefile.PL.in --- ./bindings/perl/Makefile.PL.in.orig 2016-10-16 17:13:27.006400921 +0300 +++ ./bindings/perl/Makefile.PL.in 2016-10-16 17:14:39.521628420 +0300 @@ -26,8 +26,8 @@ use Cwd "abs_path"; my %attributs = (NAME => 'Prelude', 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', - LIBS => ["-L@top_builddir@/src/.libs -lprelude -L@top_builddir@/bindings/c++/.libs -lpreludecpp", "-L$ENV{LIBDIR} -lprelude @LIBPRELUDE_LIBS@ @LIBADD_DL@ @LTLIBTHREAD@" ], - LDDLFLAGS => "-L@top_builddir@/src/.libs $Config{lddlflags} @LDFLAGS@,-rpath"); + LIBS => ["-L@top_builddir@/src/.libs -lprelude -L@top_builddir@/bindings/c++/.libs -lpreludecpp -L$ENV{LIBDIR} -lstdc++ -lm @LIBPRELUDE_LIBS@ @LIBADD_DL@ @LTLIBTHREAD@" ], + LDDLFLAGS => "-L@top_builddir@/src/.libs $Config{lddlflags} @LDFLAGS@"); if ( abs_path("@top_srcdir@") ne abs_path("@top_builddir@") ) { foreach my $filename ( qw/Prelude.cxx Prelude.pm/ ) {
