From 7357bfc3c310f2c6dcf4c77e9fe4988c3d4e6b37 Mon Sep 17 00:00:00 2001
From: Thomas Andrejak <thomas.andrejak@gmail.com>
Date: Sep 18 2017 10:12:19 +0000
Subject: Bump version 4.0.0


---

diff --git a/.gitignore b/.gitignore
index dae86d7..1c4738c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/libprelude-3.1.0.tar.gz
+/libprelude-4.0.0.tar.gz
diff --git a/libprelude-3.1.0-disable_gnulib_test_lock.patch b/libprelude-3.1.0-disable_gnulib_test_lock.patch
deleted file mode 100644
index 2203d02..0000000
--- a/libprelude-3.1.0-disable_gnulib_test_lock.patch
+++ /dev/null
@@ -1,101 +0,0 @@
---- ./libmissing/tests/Makefile.am	2016-09-15 08:49:10.764000884 +0200
-+++ ./libmissing/tests/Makefile.am	2017-05-14 12:03:01.912530446 +0200
-@@ -689,15 +689,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
---- ./libmissing/tests/Makefile.in	2016-09-15 08:51:18.969000884 +0200
-+++ ./libmissing/tests/Makefile.in	2017-05-14 12:04:03.624207164 +0200
-@@ -82,7 +82,7 @@
- 	test-inttypes$(EXEEXT) test-ioctl$(EXEEXT) \
- 	test-langinfo$(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 \
-@@ -145,7 +145,7 @@
- 	test-inttypes$(EXEEXT) test-ioctl$(EXEEXT) \
- 	test-langinfo$(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) \
-@@ -668,9 +668,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)
-@@ -1039,7 +1036,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-langinfo.c test-listen.c test-locale.c test-localeconv.c \
--	test-localename.c test-lock.c test-lseek.c test-lstat.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 \
-@@ -1076,7 +1073,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-langinfo.c test-listen.c test-locale.c test-localeconv.c \
--	test-localename.c test-lock.c test-lseek.c test-lstat.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 \
-@@ -2222,7 +2219,7 @@
- 	inttypes.in.h test-inttypes.c test-ioctl.c signature.h \
- 	macros.h test-langinfo.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 \
-@@ -2333,7 +2330,6 @@
- test_inet_pton_LDADD = $(LDADD) @INET_PTON_LIB@
- test_listen_LDADD = $(LDADD) @LIBSOCKET@
- test_localename_LDADD = $(LDADD) @INTL_MACOSX_LIBS@ $(LIBTHREAD)
--test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@
- test_poll_LDADD = $(LDADD) $(LIB_POLL) @LIBSOCKET@ $(INET_PTON_LIB)
- test_regex_LDADD = $(LDADD) @LIBINTL@ $(LIBTHREAD) $(LIB_PTHREAD)
- test_select_LDADD = $(LDADD) @LIB_SELECT@ @LIBSOCKET@ $(INET_PTON_LIB)
-@@ -2595,9 +2591,6 @@
- test-localename$(EXEEXT): $(test_localename_OBJECTS) $(test_localename_DEPENDENCIES) 
- 	@rm -f test-localename$(EXEEXT)
- 	$(LINK) $(test_localename_OBJECTS) $(test_localename_LDADD) $(LIBS)
--test-lock$(EXEEXT): $(test_lock_OBJECTS) $(test_lock_DEPENDENCIES) 
--	@rm -f test-lock$(EXEEXT)
--	$(LINK) $(test_lock_OBJECTS) $(test_lock_LDADD) $(LIBS)
- test-lseek$(EXEEXT): $(test_lseek_OBJECTS) $(test_lseek_DEPENDENCIES) 
- 	@rm -f test-lseek$(EXEEXT)
- 	$(LINK) $(test_lseek_OBJECTS) $(test_lseek_LDADD) $(LIBS)
-@@ -2888,7 +2881,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@
diff --git a/libprelude-3.1.0-fix_prelude_tests_timer.patch b/libprelude-3.1.0-fix_prelude_tests_timer.patch
deleted file mode 100644
index abc744a..0000000
--- a/libprelude-3.1.0-fix_prelude_tests_timer.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./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);
diff --git a/libprelude-3.1.0-fix_pthread_atfork.patch b/libprelude-3.1.0-fix_pthread_atfork.patch
deleted file mode 100644
index 1e11af3..0000000
--- a/libprelude-3.1.0-fix_pthread_atfork.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- ./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		\
diff --git a/libprelude-3.1.0-fix_timegm.patch b/libprelude-3.1.0-fix_timegm.patch
deleted file mode 100644
index d9ede2e..0000000
--- a/libprelude-3.1.0-fix_timegm.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- ./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;
diff --git a/libprelude-3.1.0-fsf_address.patch b/libprelude-3.1.0-fsf_address.patch
deleted file mode 100644
index 59037e2..0000000
--- a/libprelude-3.1.0-fsf_address.patch
+++ /dev/null
@@ -1,246 +0,0 @@
-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"
diff --git a/libprelude-3.1.0-gnutls_priority_set_direct.patch b/libprelude-3.1.0-gnutls_priority_set_direct.patch
deleted file mode 100644
index 35c6675..0000000
--- a/libprelude-3.1.0-gnutls_priority_set_direct.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- ./prelude-admin/server.c	2016-09-15 08:49:10.785000884 +0200
-+++ ./prelude-admin/server.c	2017-02-05 10:29:25.051965998 +0100
-@@ -152,9 +152,9 @@
- #endif
- 
- #ifdef GNUTLS_SRP_ENABLED
--        const char *pstring = "NORMAL:+SRP:+SRP-DSS:+SRP-RSA:" TLS_DH_STR;
-+        const char *pstring = "@SYSTEM:+SRP:+SRP-DSS:+SRP-RSA:" TLS_DH_STR;
- #else
--        const char *pstring = "NORMAL:" TLS_DH_STR;
-+        const char *pstring = "@SYSTEM:" TLS_DH_STR;
- #endif
- 
-         gnutls_init(&session, GNUTLS_SERVER);
---- ./prelude-admin/prelude-admin.c	2016-09-15 08:49:10.785000884 +0200
-+++ ./prelude-admin/prelude-admin.c	2017-02-05 10:30:02.507127046 +0100
-@@ -897,9 +897,9 @@
- #endif
- 
- #ifdef GNUTLS_SRP_ENABLED
--        const char *pstring = "NORMAL:+SRP:+SRP-DSS:+SRP-RSA:" TLS_DH_STR;
-+        const char *pstring = "@SYSTEM:+SRP:+SRP-DSS:+SRP-RSA:" TLS_DH_STR;
- #else
--        const char *pstring = "NORMAL:" TLS_DH_STR;
-+        const char *pstring = "@SYSTEM:" TLS_DH_STR;
- #endif
- 
-         gnutls_init(&session, GNUTLS_CLIENT);
---- ./client.conf.in	2016-09-15 08:49:10.732000884 +0200
-+++ ./client.conf.in	2017-02-05 10:32:07.132334930 +0100
-@@ -58,7 +58,7 @@
- # Sets priorities for the ciphers, key exchange methods, macs and
- # compression methods.
- #
--# "NORMAL" option enables all "secure" ciphersuites. The 256-bit
-+# "@SYSTEM" option enables all "secure" ciphersuites. The 256-bit
- # ciphers are included as a fallback only. The ciphers are sorted by
- # security margin.
- #
-@@ -77,5 +77,5 @@
- # Note that much more settings might be enabled or disabled using this
- # option: please see gnutls_priority_init(3) for more details.
- #
--# The default settings is "NORMAL".
--# tls-options = NORMAL
-+# The default settings is "@SYSTEM".
-+# tls-options = @SYSTEM
---- ./src/tls-auth.c	2016-09-15 08:49:10.809000884 +0200
-+++ ./src/tls-auth.c	2017-02-05 10:31:14.194521137 +0100
-@@ -232,7 +232,7 @@
-                 int ret;
-                 const char *errptr;
- 
--                ret = gnutls_priority_init(&tls_priority, (tlsopts) ? tlsopts : "NORMAL", &errptr);
-+                ret = gnutls_priority_init(&tls_priority, (tlsopts) ? tlsopts : "@SYSTEM", &errptr);
-                 if ( ret < 0 )
-                         return prelude_error_verbose_make(PRELUDE_ERROR_SOURCE_CLIENT, PRELUDE_ERROR_TLS,
-                                                           "TLS options '%s': %s", errptr, gnutls_strerror(ret));
diff --git a/libprelude-3.1.0-linking.patch b/libprelude-3.1.0-linking.patch
deleted file mode 100644
index 3ece439..0000000
--- a/libprelude-3.1.0-linking.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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/ ) {
diff --git a/libprelude-3.1.0-ruby_vendorarchdir.patch b/libprelude-3.1.0-ruby_vendorarchdir.patch
deleted file mode 100644
index 0dddd98..0000000
--- a/libprelude-3.1.0-ruby_vendorarchdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure	2016-09-15 08:51:15.490000884 +0200
-+++ ./configure.new	2016-10-31 20:01:06.731235733 +0100
-@@ -21874,7 +21874,7 @@
- if ${am_cv_ruby_rbexecdir+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
--  am_cv_ruby_rbexecdir=`$RUBY -rrbconfig -e "drive = File::PATH_SEPARATOR == ';' ? /\A\w:/ : /\A/; prefix = Regexp.new('\\A' + Regexp.quote(RbConfig::CONFIG['prefix'])); \\$prefix = RbConfig::CONFIG['prefix'].sub(drive, ''); \\$sitearchdir = RbConfig::CONFIG['sitearchdir'].sub(prefix, '\\$(prefix)').sub(drive, ''); print \\$sitearchdir;" 2>/dev/null || echo "${RUBY_EXEC_PREFIX}/local/lib/site_ruby/${RUBY_VERSION}/${RUBY_PLATFORM}"`
-+  am_cv_ruby_rbexecdir=`$RUBY -rrbconfig -e "drive = File::PATH_SEPARATOR == ';' ? /\A\w:/ : /\A/; prefix = Regexp.new('\\A' + Regexp.quote(RbConfig::CONFIG['prefix'])); \\$prefix = RbConfig::CONFIG['prefix'].sub(drive, ''); \\$sitearchdir = RbConfig::CONFIG['vendorarchdir'].sub(prefix, '\\$(prefix)').sub(drive, ''); print \\$sitearchdir;" 2>/dev/null || echo "${RUBY_EXEC_PREFIX}/local/lib/site_ruby/${RUBY_VERSION}/${RUBY_PLATFORM}"`
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ruby_rbexecdir" >&5
- $as_echo "$am_cv_ruby_rbexecdir" >&6; }
diff --git a/libprelude-4.0.0-disable_gnulib_test_lock.patch b/libprelude-4.0.0-disable_gnulib_test_lock.patch
new file mode 100644
index 0000000..cd64e8e
--- /dev/null
+++ b/libprelude-4.0.0-disable_gnulib_test_lock.patch
@@ -0,0 +1,108 @@
+--- ./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
diff --git a/libprelude-4.0.0-fix_prelude_tests_timer.patch b/libprelude-4.0.0-fix_prelude_tests_timer.patch
new file mode 100644
index 0000000..abc744a
--- /dev/null
+++ b/libprelude-4.0.0-fix_prelude_tests_timer.patch
@@ -0,0 +1,12 @@
+--- ./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);
diff --git a/libprelude-4.0.0-fix_pthread_atfork.patch b/libprelude-4.0.0-fix_pthread_atfork.patch
new file mode 100644
index 0000000..1e11af3
--- /dev/null
+++ b/libprelude-4.0.0-fix_pthread_atfork.patch
@@ -0,0 +1,120 @@
+--- ./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		\
diff --git a/libprelude-4.0.0-fix_timegm.patch b/libprelude-4.0.0-fix_timegm.patch
new file mode 100644
index 0000000..d9ede2e
--- /dev/null
+++ b/libprelude-4.0.0-fix_timegm.patch
@@ -0,0 +1,31 @@
+--- ./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;
diff --git a/libprelude-4.0.0-fsf_address.patch b/libprelude-4.0.0-fsf_address.patch
new file mode 100644
index 0000000..59037e2
--- /dev/null
+++ b/libprelude-4.0.0-fsf_address.patch
@@ -0,0 +1,246 @@
+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"
diff --git a/libprelude-4.0.0-gnutls_priority_set_direct.patch b/libprelude-4.0.0-gnutls_priority_set_direct.patch
new file mode 100644
index 0000000..35c6675
--- /dev/null
+++ b/libprelude-4.0.0-gnutls_priority_set_direct.patch
@@ -0,0 +1,58 @@
+--- ./prelude-admin/server.c	2016-09-15 08:49:10.785000884 +0200
++++ ./prelude-admin/server.c	2017-02-05 10:29:25.051965998 +0100
+@@ -152,9 +152,9 @@
+ #endif
+ 
+ #ifdef GNUTLS_SRP_ENABLED
+-        const char *pstring = "NORMAL:+SRP:+SRP-DSS:+SRP-RSA:" TLS_DH_STR;
++        const char *pstring = "@SYSTEM:+SRP:+SRP-DSS:+SRP-RSA:" TLS_DH_STR;
+ #else
+-        const char *pstring = "NORMAL:" TLS_DH_STR;
++        const char *pstring = "@SYSTEM:" TLS_DH_STR;
+ #endif
+ 
+         gnutls_init(&session, GNUTLS_SERVER);
+--- ./prelude-admin/prelude-admin.c	2016-09-15 08:49:10.785000884 +0200
++++ ./prelude-admin/prelude-admin.c	2017-02-05 10:30:02.507127046 +0100
+@@ -897,9 +897,9 @@
+ #endif
+ 
+ #ifdef GNUTLS_SRP_ENABLED
+-        const char *pstring = "NORMAL:+SRP:+SRP-DSS:+SRP-RSA:" TLS_DH_STR;
++        const char *pstring = "@SYSTEM:+SRP:+SRP-DSS:+SRP-RSA:" TLS_DH_STR;
+ #else
+-        const char *pstring = "NORMAL:" TLS_DH_STR;
++        const char *pstring = "@SYSTEM:" TLS_DH_STR;
+ #endif
+ 
+         gnutls_init(&session, GNUTLS_CLIENT);
+--- ./client.conf.in	2016-09-15 08:49:10.732000884 +0200
++++ ./client.conf.in	2017-02-05 10:32:07.132334930 +0100
+@@ -58,7 +58,7 @@
+ # Sets priorities for the ciphers, key exchange methods, macs and
+ # compression methods.
+ #
+-# "NORMAL" option enables all "secure" ciphersuites. The 256-bit
++# "@SYSTEM" option enables all "secure" ciphersuites. The 256-bit
+ # ciphers are included as a fallback only. The ciphers are sorted by
+ # security margin.
+ #
+@@ -77,5 +77,5 @@
+ # Note that much more settings might be enabled or disabled using this
+ # option: please see gnutls_priority_init(3) for more details.
+ #
+-# The default settings is "NORMAL".
+-# tls-options = NORMAL
++# The default settings is "@SYSTEM".
++# tls-options = @SYSTEM
+--- ./src/tls-auth.c	2016-09-15 08:49:10.809000884 +0200
++++ ./src/tls-auth.c	2017-02-05 10:31:14.194521137 +0100
+@@ -232,7 +232,7 @@
+                 int ret;
+                 const char *errptr;
+ 
+-                ret = gnutls_priority_init(&tls_priority, (tlsopts) ? tlsopts : "NORMAL", &errptr);
++                ret = gnutls_priority_init(&tls_priority, (tlsopts) ? tlsopts : "@SYSTEM", &errptr);
+                 if ( ret < 0 )
+                         return prelude_error_verbose_make(PRELUDE_ERROR_SOURCE_CLIENT, PRELUDE_ERROR_TLS,
+                                                           "TLS options '%s': %s", errptr, gnutls_strerror(ret));
diff --git a/libprelude-4.0.0-linking.patch b/libprelude-4.0.0-linking.patch
new file mode 100644
index 0000000..3ece439
--- /dev/null
+++ b/libprelude-4.0.0-linking.patch
@@ -0,0 +1,14 @@
+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/ ) {
diff --git a/libprelude-4.0.0-ruby_vendorarchdir.patch b/libprelude-4.0.0-ruby_vendorarchdir.patch
new file mode 100644
index 0000000..0dddd98
--- /dev/null
+++ b/libprelude-4.0.0-ruby_vendorarchdir.patch
@@ -0,0 +1,11 @@
+--- ./configure	2016-09-15 08:51:15.490000884 +0200
++++ ./configure.new	2016-10-31 20:01:06.731235733 +0100
+@@ -21874,7 +21874,7 @@
+ if ${am_cv_ruby_rbexecdir+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_ruby_rbexecdir=`$RUBY -rrbconfig -e "drive = File::PATH_SEPARATOR == ';' ? /\A\w:/ : /\A/; prefix = Regexp.new('\\A' + Regexp.quote(RbConfig::CONFIG['prefix'])); \\$prefix = RbConfig::CONFIG['prefix'].sub(drive, ''); \\$sitearchdir = RbConfig::CONFIG['sitearchdir'].sub(prefix, '\\$(prefix)').sub(drive, ''); print \\$sitearchdir;" 2>/dev/null || echo "${RUBY_EXEC_PREFIX}/local/lib/site_ruby/${RUBY_VERSION}/${RUBY_PLATFORM}"`
++  am_cv_ruby_rbexecdir=`$RUBY -rrbconfig -e "drive = File::PATH_SEPARATOR == ';' ? /\A\w:/ : /\A/; prefix = Regexp.new('\\A' + Regexp.quote(RbConfig::CONFIG['prefix'])); \\$prefix = RbConfig::CONFIG['prefix'].sub(drive, ''); \\$sitearchdir = RbConfig::CONFIG['vendorarchdir'].sub(prefix, '\\$(prefix)').sub(drive, ''); print \\$sitearchdir;" 2>/dev/null || echo "${RUBY_EXEC_PREFIX}/local/lib/site_ruby/${RUBY_VERSION}/${RUBY_PLATFORM}"`
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ruby_rbexecdir" >&5
+ $as_echo "$am_cv_ruby_rbexecdir" >&6; }
diff --git a/libprelude.spec b/libprelude.spec
index 08e2b71..5fc61a8 100644
--- a/libprelude.spec
+++ b/libprelude.spec
@@ -3,40 +3,37 @@
 
 # Notes about rpmlint
 # - crypto-policy-non-compliance-gnutls-{1,2} fixed with patch
-#   libprelude-3.1.0-gnutls_priority_set_direct.patch
+#   libprelude-4.0.0-gnutls_priority_set_direct.patch
 
 Name:           libprelude
-Version:        3.1.0
-Release:        34%{?dist}
+Version:        4.0.0
+Release:        1%{?dist}
 Summary:        Secure Connections between all Sensors and the Prelude Manager
 # Prelude is GPL-2.0+
 # libmissing is LGPL-2.1+
 License:        GPLv2+
 Group:          System Environment/Libraries
 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
 # https://www.prelude-siem.org/issues/859
-Patch0:         libprelude-3.1.0-linking.patch
+Patch0:         libprelude-4.0.0-linking.patch
 # https://www.prelude-siem.org/issues/860
-Patch1:         libprelude-3.1.0-ruby_vendorarchdir.patch
+Patch1:         libprelude-4.0.0-ruby_vendorarchdir.patch
 # https://www.prelude-siem.org/issues/862
-Patch2:         libprelude-3.1.0-gnutls_priority_set_direct.patch
+Patch2:         libprelude-4.0.0-gnutls_priority_set_direct.patch
 # https://www.prelude-siem.org/issues/863
-Patch3:         libprelude-3.1.0-fsf_address.patch
+Patch3:         libprelude-4.0.0-fsf_address.patch
 # https://www.prelude-siem.org/issues/865
-Patch4:         libprelude-3.1.0-fix_timegm.patch
+Patch4:         libprelude-4.0.0-fix_timegm.patch
 # https://www.prelude-siem.org/issues/885
-Patch5:         libprelude-3.1.0-fix_pthread_atfork.patch
+Patch5:         libprelude-4.0.0-fix_pthread_atfork.patch
 # https://www.prelude-siem.org/issues/887
-Patch6:         libprelude-3.1.0-fix_prelude_tests_timer.patch
-# https://www.prelude-siem.org/issues/886
-Patch7:         libprelude-3.1.0-disable_gnulib_test_lock.patch
+Patch6:         libprelude-4.0.0-fix_prelude_tests_timer.patch
 BuildRequires:  bison
 BuildRequires:  chrpath
 BuildRequires:  flex
 BuildRequires:  gtk-doc
 BuildRequires:  swig
-BuildRequires:  libgcrypt-devel
 BuildRequires:  libgpg-error-devel
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  perl-devel
@@ -53,9 +50,9 @@ BuildRequires:  valgrind
 %endif
 
 # Upstream do not use explicit version of gnulib, just checkout
-# and update files. In libprelude 3.1.0, the checkout has been done
-# on 2016-06-16
-Provides:       bundled(gnulib) = 20160616
+# and update files. In libprelude 4.0.0, the checkout has been done
+# on 2017-01-04
+Provides:       bundled(gnulib) = 20170104
 
 %description
 Libprelude is a collection of generic functions providing communication
@@ -172,7 +169,7 @@ find %{buildroot} -name 'perllocal.pod' -delete
 find %{buildroot} -name '.packlist' -delete
 
 %check
-make distcheck
+make check
 
 %post -n %{name} -p /sbin/ldconfig
 %postun -n %{name} -p /sbin/ldconfig
@@ -239,6 +236,9 @@ make distcheck
 %doc AUTHORS ChangeLog README NEWS
 
 %changelog
+* Sat Sep 16 2017 Thomas Andrejak <thomas.andrejak@gmail.com> - 4.0.0-1
+- Bump version 4.0.0
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-34
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
diff --git a/sources b/sources
index ca34412..e312ff4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2e1a5d7cbf98a2d57fbb367a578dbf8c  libprelude-3.1.0.tar.gz
+SHA512 (libprelude-4.0.0.tar.gz) = 5d88e8f211b09cc3e43dbe299e935d8f11575ae3f1894059793966cd14a8e47177ef8963d45305e1a24f9efc4048520329b31681301a21815909bd38606c2ce7