rpms
/
libprelude
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump version 5.0.0

This commit is contained in:
Thomas Andrejak 2019-02-28 07:34:10 +01:00
parent 7c08f314b0
commit b71c0d24ad
14 changed files with 428 additions and 284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
/libprelude-4.1.0.tar.gz
/libprelude-5.0.0.tar.gz

108
libprelude-4.1.0-disable_gnulib_test_lock.patch
View File

@ -1,108 +0,0 @@
--- ./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

20
libprelude-4.1.0-fix_compatibility_gnutls_3_6.patch
View File

@ -1,20 +0,0 @@
--- ./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);

47
libprelude-4.1.0-fix_gnulib_error_with_fseeko.patch
View File

@ -1,47 +0,0 @@
--- ./libmissing/fseeko.c 2017-12-06 01:07:11.202000000 +0100
+++ ./libmissing/fseeko.c 2018-03-10 14:09:13.786668009 +0100
@@ -1,18 +1,18 @@
/* An fseeko() function that, together with fflush(), is POSIX compliant.
- Copyright (C) 2007-2017 Free Software Foundation, Inc.
+ Copyright (C) 2007-2018 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1, or (at your option)
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public License along
- with this program; if not, see <http://www.gnu.org/licenses/>. */
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, see <https://www.gnu.org/licenses/>. */
#include <config.h>
@@ -47,7 +47,8 @@
#endif
/* These tests are based on fpurge.c. */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
+ /* GNU libc, BeOS, Haiku, Linux libc5 */
if (fp->_IO_read_end == fp->_IO_read_ptr
&& fp->_IO_write_ptr == fp->_IO_write_base
&& fp->_IO_save_base == NULL)
@@ -123,7 +124,8 @@
return -1;
}
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
+ /* GNU libc, BeOS, Haiku, Linux libc5 */
fp->_flags &= ~_IO_EOF_SEEN;
fp->_offset = pos;
#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__

14
libprelude-4.1.0-linking.patch
View File

@ -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/ ) {

333
libprelude-5.0.0-disable_gnulib_test_lock.patch Normal file
View File

@ -0,0 +1,333 @@
--- ./libmissing/tests/Makefile.in 2018-12-23 22:01:04.381000000 +0100
+++ ./libmissing/tests/Makefile.in 2019-02-27 00:25:12.529345408 +0100
@@ -129,22 +129,21 @@
test-langinfo$(EXEEXT) test-limits-h$(EXEEXT) \
test-listen$(EXEEXT) test-locale$(EXEEXT) \
test-localeconv$(EXEEXT) test-localename$(EXEEXT) \
- test-rwlock1$(EXEEXT) test-lock$(EXEEXT) test-once1$(EXEEXT) \
- test-once2$(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 \
- test-mbrtowc-w32-3.sh test-mbrtowc-w32-4.sh \
- test-mbrtowc-w32-5.sh test-mbsinit.sh test-memchr$(EXEEXT) \
- test-memmem$(EXEEXT) test-nanosleep$(EXEEXT) \
- test-netdb$(EXEEXT) test-netinet_in$(EXEEXT) \
- test-nl_langinfo.sh test-open$(EXEEXT) test-pathmax$(EXEEXT) \
- test-perror.sh test-perror2$(EXEEXT) test-pipe$(EXEEXT) \
- test-poll-h$(EXEEXT) test-poll$(EXEEXT) \
- test-pthread_sigmask1$(EXEEXT) test-pthread_sigmask2$(EXEEXT) \
- test-raise$(EXEEXT) test-regex$(EXEEXT) test-select$(EXEEXT) \
- test-select-in.sh test-select-out.sh test-setenv$(EXEEXT) \
- test-setlocale1.sh test-setlocale2.sh test-setsockopt$(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 test-mbrtowc-w32-3.sh \
+ test-mbrtowc-w32-4.sh test-mbrtowc-w32-5.sh test-mbsinit.sh \
+ test-memchr$(EXEEXT) test-memmem$(EXEEXT) \
+ test-nanosleep$(EXEEXT) test-netdb$(EXEEXT) \
+ test-netinet_in$(EXEEXT) test-nl_langinfo.sh \
+ test-open$(EXEEXT) test-pathmax$(EXEEXT) test-perror.sh \
+ test-perror2$(EXEEXT) test-pipe$(EXEEXT) test-poll-h$(EXEEXT) \
+ test-poll$(EXEEXT) test-pthread_sigmask1$(EXEEXT) \
+ test-pthread_sigmask2$(EXEEXT) test-raise$(EXEEXT) \
+ test-regex$(EXEEXT) test-select$(EXEEXT) test-select-in.sh \
+ test-select-out.sh test-setenv$(EXEEXT) test-setlocale1.sh \
+ test-setlocale2.sh test-setsockopt$(EXEEXT) \
test-sigaction$(EXEEXT) test-signal-h$(EXEEXT) \
test-sigprocmask$(EXEEXT) test-sleep$(EXEEXT) \
test-snprintf$(EXEEXT) test-sockets$(EXEEXT) \
@@ -196,9 +195,8 @@
test-isblank$(EXEEXT) test-langinfo$(EXEEXT) \
test-limits-h$(EXEEXT) test-listen$(EXEEXT) \
test-locale$(EXEEXT) test-localeconv$(EXEEXT) \
- test-localename$(EXEEXT) test-rwlock1$(EXEEXT) \
- test-lock$(EXEEXT) test-once1$(EXEEXT) test-once2$(EXEEXT) \
- test-lseek$(EXEEXT) test-lstat$(EXEEXT) test-malloca$(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) \
test-memmem$(EXEEXT) test-nanosleep$(EXEEXT) \
@@ -774,9 +772,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)
@@ -839,12 +834,6 @@
test_nl_langinfo_DEPENDENCIES = libtests.a \
../../libmissing/libmissing.la libtests.a \
$(am__DEPENDENCIES_1)
-am_test_once1_OBJECTS = test-once.$(OBJEXT)
-test_once1_OBJECTS = $(am_test_once1_OBJECTS)
-test_once1_DEPENDENCIES = $(am__DEPENDENCIES_2)
-am_test_once2_OBJECTS = test-once.$(OBJEXT)
-test_once2_OBJECTS = $(am_test_once2_OBJECTS)
-test_once2_DEPENDENCIES = $(am__DEPENDENCIES_2)
test_open_SOURCES = test-open.c
test_open_OBJECTS = test-open.$(OBJEXT)
test_open_LDADD = $(LDADD)
@@ -893,9 +882,6 @@
test_regex_SOURCES = test-regex.c
test_regex_OBJECTS = test-regex.$(OBJEXT)
test_regex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
-test_rwlock1_SOURCES = test-rwlock1.c
-test_rwlock1_OBJECTS = test-rwlock1.$(OBJEXT)
-test_rwlock1_DEPENDENCIES = $(am__DEPENDENCIES_2)
test_select_SOURCES = test-select.c
test_select_OBJECTS = test-select.$(OBJEXT)
test_select_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
@@ -1207,30 +1193,28 @@
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-localcharset.c \
- test-locale.c test-localeconv.c test-localename.c test-lock.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-nanosleep.c test-netdb.c test-netinet_in.c \
- test-nl_langinfo.c $(test_once1_SOURCES) $(test_once2_SOURCES) \
- test-open.c test-pathmax.c test-perror.c test-perror2.c \
- test-pipe.c test-poll.c test-poll-h.c test-pthread_sigmask1.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-nanosleep.c \
+ test-netdb.c test-netinet_in.c test-nl_langinfo.c test-open.c \
+ test-pathmax.c test-perror.c test-perror2.c test-pipe.c \
+ test-poll.c test-poll-h.c test-pthread_sigmask1.c \
test-pthread_sigmask2.c test-raise.c test-regex.c \
- test-rwlock1.c test-select.c test-select-fd.c \
- test-select-stdin.c test-setenv.c test-setlocale1.c \
- test-setlocale2.c test-setsockopt.c test-sigaction.c \
- test-signal-h.c test-sigprocmask.c test-sleep.c \
- test-snprintf.c test-sockets.c test-stat.c test-stat-time.c \
- test-stdalign.c test-stdbool.c test-stddef.c test-stdint.c \
- test-stdio.c test-stdlib.c test-strcasestr.c test-strerror.c \
- test-strerror_r.c test-string.c test-strings.c test-strnlen.c \
- test-symlink.c test-sys_ioctl.c test-sys_select.c \
- test-sys_socket.c test-sys_stat.c test-sys_time.c \
- test-sys_types.c test-sys_uio.c test-sys_utsname.c \
- test-thread_create.c test-thread_self.c test-time.c test-tls.c \
- test-uname.c test-unistd.c test-unsetenv.c test-usleep.c \
- test-vasnprintf.c test-verify.c test-verify-try.c \
- test-vsnprintf.c test-wchar.c test-wcrtomb.c \
- test-wcrtomb-w32.c test-wctype-h.c test-write.c
+ test-select.c test-select-fd.c test-select-stdin.c \
+ test-setenv.c test-setlocale1.c test-setlocale2.c \
+ test-setsockopt.c test-sigaction.c test-signal-h.c \
+ test-sigprocmask.c test-sleep.c test-snprintf.c test-sockets.c \
+ test-stat.c test-stat-time.c test-stdalign.c test-stdbool.c \
+ test-stddef.c test-stdint.c test-stdio.c test-stdlib.c \
+ test-strcasestr.c test-strerror.c test-strerror_r.c \
+ test-string.c test-strings.c test-strnlen.c test-symlink.c \
+ test-sys_ioctl.c test-sys_select.c test-sys_socket.c \
+ test-sys_stat.c test-sys_time.c test-sys_types.c \
+ test-sys_uio.c test-sys_utsname.c test-thread_create.c \
+ test-thread_self.c test-time.c test-tls.c test-uname.c \
+ test-unistd.c test-unsetenv.c test-usleep.c test-vasnprintf.c \
+ test-verify.c test-verify-try.c test-vsnprintf.c test-wchar.c \
+ test-wcrtomb.c test-wcrtomb-w32.c test-wctype-h.c test-write.c
DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
test-accept.c test-alloca-opt.c test-arpa_inet.c \
test-binary-io.c test-bind.c test-btowc.c test-c-ctype.c \
@@ -1249,30 +1233,28 @@
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-localcharset.c \
- test-locale.c test-localeconv.c test-localename.c test-lock.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-nanosleep.c test-netdb.c test-netinet_in.c \
- test-nl_langinfo.c $(test_once1_SOURCES) $(test_once2_SOURCES) \
- test-open.c test-pathmax.c test-perror.c test-perror2.c \
- test-pipe.c test-poll.c test-poll-h.c test-pthread_sigmask1.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-nanosleep.c \
+ test-netdb.c test-netinet_in.c test-nl_langinfo.c test-open.c \
+ test-pathmax.c test-perror.c test-perror2.c test-pipe.c \
+ test-poll.c test-poll-h.c test-pthread_sigmask1.c \
test-pthread_sigmask2.c test-raise.c test-regex.c \
- test-rwlock1.c test-select.c test-select-fd.c \
- test-select-stdin.c test-setenv.c test-setlocale1.c \
- test-setlocale2.c test-setsockopt.c test-sigaction.c \
- test-signal-h.c test-sigprocmask.c test-sleep.c \
- test-snprintf.c test-sockets.c test-stat.c test-stat-time.c \
- test-stdalign.c test-stdbool.c test-stddef.c test-stdint.c \
- test-stdio.c test-stdlib.c test-strcasestr.c test-strerror.c \
- test-strerror_r.c test-string.c test-strings.c test-strnlen.c \
- test-symlink.c test-sys_ioctl.c test-sys_select.c \
- test-sys_socket.c test-sys_stat.c test-sys_time.c \
- test-sys_types.c test-sys_uio.c test-sys_utsname.c \
- test-thread_create.c test-thread_self.c test-time.c test-tls.c \
- test-uname.c test-unistd.c test-unsetenv.c test-usleep.c \
- test-vasnprintf.c test-verify.c test-verify-try.c \
- test-vsnprintf.c test-wchar.c test-wcrtomb.c \
- test-wcrtomb-w32.c test-wctype-h.c test-write.c
+ test-select.c test-select-fd.c test-select-stdin.c \
+ test-setenv.c test-setlocale1.c test-setlocale2.c \
+ test-setsockopt.c test-sigaction.c test-signal-h.c \
+ test-sigprocmask.c test-sleep.c test-snprintf.c test-sockets.c \
+ test-stat.c test-stat-time.c test-stdalign.c test-stdbool.c \
+ test-stddef.c test-stdint.c test-stdio.c test-stdlib.c \
+ test-strcasestr.c test-strerror.c test-strerror_r.c \
+ test-string.c test-strings.c test-strnlen.c test-symlink.c \
+ test-sys_ioctl.c test-sys_select.c test-sys_socket.c \
+ test-sys_stat.c test-sys_time.c test-sys_types.c \
+ test-sys_uio.c test-sys_utsname.c test-thread_create.c \
+ test-thread_self.c test-time.c test-tls.c test-uname.c \
+ test-unistd.c test-unsetenv.c test-usleep.c test-vasnprintf.c \
+ test-verify.c test-verify-try.c test-vsnprintf.c test-wchar.c \
+ test-wcrtomb.c test-wcrtomb-w32.c test-wctype-h.c test-write.c
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
ctags-recursive dvi-recursive html-recursive info-recursive \
install-data-recursive install-dvi-recursive \
@@ -2672,9 +2654,8 @@
test-langinfo.c test-limits-h.c test-listen.c signature.h \
macros.h test-localcharset.c test-locale.c test-localeconv.c \
signature.h macros.h localename.h test-localename.c macros.h \
- test-rwlock1.c test-lock.c test-once.c test-lseek.c \
- test-lseek.sh signature.h macros.h lstat.c test-lstat.h \
- test-lstat.c signature.h macros.h test-malloca.c \
+ test-lseek.c test-lseek.sh signature.h macros.h lstat.c \
+ test-lstat.h test-lstat.c signature.h macros.h test-malloca.c \
test-mbrtowc1.sh test-mbrtowc2.sh test-mbrtowc3.sh \
test-mbrtowc4.sh test-mbrtowc5.sh test-mbrtowc.c \
test-mbrtowc-w32-1.sh test-mbrtowc-w32-2.sh \
@@ -2767,12 +2748,6 @@
test_inet_pton_LDADD = $(LDADD) @INET_PTON_LIB@
test_listen_LDADD = $(LDADD) @LIBSOCKET@
test_localename_LDADD = $(LDADD) @INTL_MACOSX_LIBS@ $(LIBTHREAD)
-test_rwlock1_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@
-test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@
-test_once1_SOURCES = test-once.c
-test_once1_LDADD = $(LDADD) @LIBTHREAD@
-test_once2_SOURCES = test-once.c
-test_once2_LDADD = $(LDADD) @LIBMULTITHREAD@
test_nanosleep_LDADD = $(LDADD) $(LIB_NANOSLEEP)
test_poll_LDADD = $(LDADD) $(LIB_POLL) @LIBSOCKET@ $(INET_PTON_LIB)
test_pthread_sigmask1_LDADD = $(LDADD) @LIB_PTHREAD_SIGMASK@
@@ -3135,10 +3110,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)
@@ -3187,14 +3158,6 @@
@rm -f test-nl_langinfo$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(test_nl_langinfo_OBJECTS) $(test_nl_langinfo_LDADD) $(LIBS)
-test-once1$(EXEEXT): $(test_once1_OBJECTS) $(test_once1_DEPENDENCIES) $(EXTRA_test_once1_DEPENDENCIES)
- @rm -f test-once1$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_once1_OBJECTS) $(test_once1_LDADD) $(LIBS)
-
-test-once2$(EXEEXT): $(test_once2_OBJECTS) $(test_once2_DEPENDENCIES) $(EXTRA_test_once2_DEPENDENCIES)
- @rm -f test-once2$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_once2_OBJECTS) $(test_once2_LDADD) $(LIBS)
-
test-open$(EXEEXT): $(test_open_OBJECTS) $(test_open_DEPENDENCIES) $(EXTRA_test_open_DEPENDENCIES)
@rm -f test-open$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(test_open_OBJECTS) $(test_open_LDADD) $(LIBS)
@@ -3239,10 +3202,6 @@
@rm -f test-regex$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(test_regex_OBJECTS) $(test_regex_LDADD) $(LIBS)
-test-rwlock1$(EXEEXT): $(test_rwlock1_OBJECTS) $(test_rwlock1_DEPENDENCIES) $(EXTRA_test_rwlock1_DEPENDENCIES)
- @rm -f test-rwlock1$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_rwlock1_OBJECTS) $(test_rwlock1_LDADD) $(LIBS)
-
test-select$(EXEEXT): $(test_select_OBJECTS) $(test_select_DEPENDENCIES) $(EXTRA_test_select_DEPENDENCIES)
@rm -f test-select$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(test_select_OBJECTS) $(test_select_LDADD) $(LIBS)
@@ -3547,7 +3506,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@
@@ -3560,7 +3518,6 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-netdb.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-netinet_in.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-nl_langinfo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-once.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-open.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-pathmax.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-perror.Po@am__quote@
@@ -3572,7 +3529,6 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-pthread_sigmask2.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-raise.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-regex.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-rwlock1.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-select-fd.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-select-stdin.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-select.Po@am__quote@
@@ -4366,34 +4322,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-rwlock1.log: test-rwlock1$(EXEEXT)
- @p='test-rwlock1$(EXEEXT)'; \
- b='test-rwlock1'; \
- $(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-once1.log: test-once1$(EXEEXT)
- @p='test-once1$(EXEEXT)'; \
- b='test-once1'; \
- $(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-once2.log: test-once2$(EXEEXT)
- @p='test-once2$(EXEEXT)'; \
- b='test-once2'; \
- $(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 2018-12-23 21:59:17.836000000 +0100
+++ ./libmissing/tests/Makefile.am 2019-02-27 00:25:24.928094253 +0100
@@ -770,20 +770,6 @@
## end gnulib module localename-tests
-## begin gnulib module lock-tests
-
-TESTS += test-rwlock1 test-lock test-once1 test-once2
-check_PROGRAMS += test-rwlock1 test-lock test-once1 test-once2
-test_rwlock1_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@
-test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@
-test_once1_SOURCES = test-once.c
-test_once1_LDADD = $(LDADD) @LIBTHREAD@
-test_once2_SOURCES = test-once.c
-test_once2_LDADD = $(LDADD) @LIBMULTITHREAD@
-EXTRA_DIST += test-rwlock1.c test-lock.c test-once.c
-
-## end gnulib module lock-tests
-
## begin gnulib module lseek-tests
TESTS += test-lseek.sh

0
libprelude-4.1.0-fix_prelude_tests_timer.patch → libprelude-5.0.0-fix_prelude_tests_timer.patch
View File

152
libprelude-4.1.0-fix_pthread_atfork.patch → libprelude-5.0.0-fix_pthread_atfork.patch
View File

@ -9,17 +9,6 @@
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 @@
@ -31,18 +20,29 @@
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 @@
--- ./src/Makefile.am 2018-12-23 21:59:17.870000000 +0100
+++ ./src/Makefile.am 2019-02-26 23:49:47.973788402 +0100
@@ -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_PTHREAD_SIGMASK) $(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_PTHREAD_SIGMASK) $(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/Makefile.in 2018-12-23 22:01:04.767000000 +0100
+++ ./src/Makefile.in 2019-02-26 23:56:08.385091987 +0100
@@ -1132,7 +1132,7 @@
LIBS = @LIBS@
LIBSOCKET = @LIBSOCKET@
LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@
-LIBTHREAD = @LIBTHREAD@
+LIBMULTITHREAD = @LIBMULTITHREAD@
LIBTOOL = @LIBTOOL@
LIB_NANOSLEEP = @LIB_NANOSLEEP@
LIB_POLL = @LIB_POLL@
LIB_SELECT = @LIB_SELECT@
@@ -933,7 +933,7 @@
@@ -1156,7 +1156,7 @@
LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
@ -51,70 +51,70 @@
LT_CONFIG_H = @LT_CONFIG_H@
LT_DLLOADERS = @LT_DLLOADERS@
LT_DLPREOPEN = @LT_DLPREOPEN@
@@ -1323,7 +1323,7 @@
@@ -1553,7 +1553,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_PTHREAD_SIGMASK) $(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_PTHREAD_SIGMASK) $(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 2019-02-26 23:58:08.154668826 +0100
+++ ./prelude-admin/Makefile.in 2019-02-26 23:57:12.940785905 +0100
@@ -1062,7 +1062,7 @@
LIBS = @LIBS@
LIBSOCKET = @LIBSOCKET@
LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@
+LIBMULTITHREAD = @LIBMULTITHREAD@
-LIBTHREAD = @LIBTHREAD@
LIBTOOL = @LIBTOOL@
LIB_NANOSLEEP = @LIB_NANOSLEEP@
LIB_POLL = @LIB_POLL@
@@ -1086,7 +1086,7 @@
LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
-LTLIBTHREAD = @LTLIBTHREAD@
LT_CONFIG_H = @LT_CONFIG_H@
LT_DLLOADERS = @LT_DLLOADERS@
LT_DLPREOPEN = @LT_DLPREOPEN@
@@ -1480,7 +1480,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) $(LTLIBMULTITHREAD) $(SERVENT_LIB)
- ../libmissing/libmissing.la $(GETADDRINFO_LIB) $(GETHOSTNAME_LIB) $(HOSTENT_LIB) $(INET_NTOP_LIB) $(INET_PTON_LIB) $(LIBSOCKET) $(LIB_POLL) $(LIB_SELECT) $(LTLIBINTL) $(LTLIBTHREAD) $(SERVENT_LIB)
prelude_admin_SOURCES = \
prelude-admin.c \
--- ./src/libprelude-error/Makefile.in 2018-12-23 22:01:05.090000000 +0100
+++ ./src/libprelude-error/Makefile.in 2019-02-27 00:00:34.842539289 +0100
@@ -1053,7 +1053,7 @@
LIBS = @LIBS@
LIBSOCKET = @LIBSOCKET@
LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@
-LIBTHREAD = @LIBTHREAD@
+LIBMULTITHREAD = @LIBMULTITHREAD@
LIBTOOL = @LIBTOOL@
LIB_NANOSLEEP = @LIB_NANOSLEEP@
LIB_POLL = @LIB_POLL@
@@ -1077,7 +1077,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@
@@ -1477,7 +1477,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_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 \

0
libprelude-4.1.0-fix_timegm.patch → libprelude-5.0.0-fix_timegm.patch
View File

0
libprelude-4.1.0-fsf_address.patch → libprelude-5.0.0-fsf_address.patch
View File

0
libprelude-4.1.0-gnutls_priority_set_direct.patch → libprelude-5.0.0-gnutls_priority_set_direct.patch
View File

0
libprelude-4.1.0-ruby_vendorarchdir.patch → libprelude-5.0.0-ruby_vendorarchdir.patch
View File

35
libprelude.spec
View File

@ -1,36 +1,32 @@
%global major 23
%global major 28
%global cppmajor 8
# Notes about rpmlint
# - crypto-policy-non-compliance-gnutls-{1,2} fixed with patch
# libprelude-4.1.0-gnutls_priority_set_direct.patch
# libprelude-5.0.0-gnutls_priority_set_direct.patch
Name: libprelude
Version: 4.1.0
Release: 10%{?dist}
Version: 5.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+
URL: https://www.prelude-siem.org/
Source0: https://www.prelude-siem.org/pkg/src/%{version}/%{name}-%{version}.tar.gz
# https://www.prelude-siem.org/issues/859
Patch0: libprelude-4.1.0-linking.patch
# https://www.prelude-siem.org/issues/860
Patch1: libprelude-4.1.0-ruby_vendorarchdir.patch
Patch0: libprelude-5.0.0-ruby_vendorarchdir.patch
# https://www.prelude-siem.org/issues/862
Patch2: libprelude-4.1.0-gnutls_priority_set_direct.patch
Patch1: libprelude-5.0.0-gnutls_priority_set_direct.patch
# https://www.prelude-siem.org/issues/863
Patch3: libprelude-4.1.0-fsf_address.patch
Patch2: libprelude-5.0.0-fsf_address.patch
# https://www.prelude-siem.org/issues/865
Patch4: libprelude-4.1.0-fix_timegm.patch
Patch3: libprelude-5.0.0-fix_timegm.patch
# https://www.prelude-siem.org/issues/885
Patch5: libprelude-4.1.0-fix_pthread_atfork.patch
Patch4: libprelude-5.0.0-fix_pthread_atfork.patch
# https://www.prelude-siem.org/issues/887
Patch6: libprelude-4.1.0-fix_prelude_tests_timer.patch
# https://www.prelude-siem.org/issues/911
Patch7: libprelude-4.1.0-fix_compatibility_gnutls_3_6.patch
Patch8: libprelude-4.1.0-fix_gnulib_error_with_fseeko.patch
Patch5: libprelude-5.0.0-fix_prelude_tests_timer.patch
Patch6: libprelude-5.0.0-disable_gnulib_test_lock.patch
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: bison
@ -54,9 +50,9 @@ BuildRequires: valgrind
%endif
# Upstream do not use explicit version of gnulib, just checkout
# and update files. In libprelude 4.1.0, the checkout has been done
# on 2017-07-10
Provides: bundled(gnulib) = 20170710
# and update files. In libprelude 5.0.0, the checkout has been done
# on 2018-09-03
Provides: bundled(gnulib) = 20180903
%description
Libprelude is a collection of generic functions providing communication
@ -227,6 +223,9 @@ find %{buildroot} -name '.packlist' -delete
%doc AUTHORS ChangeLog README NEWS
%changelog
* Tue Feb 26 2019 Thomas Andrejak <thomas.andrejak@gmail.com> - 5.0.0-1
- Bump version 5.0.0, Fixing #1629893
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
SHA512 (libprelude-4.1.0.tar.gz) = 073307ca070794b47643e2ef2db4788fa92374735558b466441f0663f420cab45aecc7a1d99bb487ad23ebe602d5668369ffa6ab29fa3b0504356420ab3a7878
SHA512 (libprelude-5.0.0.tar.gz) = 46e639dd04505b2d569ee9d60aa824d65fa31e51150896030a1632c45913257e5c82498a304e48f5f678ed2c75c9df6fbd3cc943ab9703a84d35ca14f2ee7148