Compare commits
14 Commits
Author | SHA1 | Date |
---|---|---|
Thomas Andrejak | da0bf23c9f | |
Thomas Andrejak | f060cbe759 | |
Thomas Andrejak | c92c218c06 | |
Thomas Andrejak | cb3aeabe25 | |
Thomas Andrejak | 189d1c2ace | |
Thomas Andrejak | 18f169f030 | |
Troy Dawson | ceef256c30 | |
Troy Dawson | e9c05b3893 | |
Thomas Andrejak | a1f10eacf6 | |
Thomas Andrejak | 8e1f6ae8d1 | |
Thomas Andrejak | e5478508fb | |
Thomas Andrejak | 307db3b8c9 | |
Thomas Andrejak | 5b41b8c032 | |
Thomas Andrejak | 589a67fc8c |
|
@ -1 +1 @@
|
|||
/libprelude-3.1.0.tar.gz
|
||||
/libprelude-5.2.0.tar.gz
|
||||
|
|
|
@ -1,37 +0,0 @@
|
|||
--- ./prelude-admin/server.c 2016-11-21 16:52:01.839000884 +0100
|
||||
+++ ./prelude-admin/server.c 2016-11-26 11:48:52.695000891 +0100
|
||||
@@ -145,22 +145,10 @@
|
||||
gnutls_session_t session;
|
||||
const char *err;
|
||||
|
||||
-#if defined LIBGNUTLS_VERSION_MAJOR && LIBGNUTLS_VERSION_MAJOR >= 3
|
||||
-# define TLS_DH_STR "+ANON-ECDH:+ANON-DH"
|
||||
-#else
|
||||
-# define TLS_DH_STR "+ANON-DH"
|
||||
-#endif
|
||||
-
|
||||
-#ifdef GNUTLS_SRP_ENABLED
|
||||
- const char *pstring = "NORMAL:+SRP:+SRP-DSS:+SRP-RSA:" TLS_DH_STR;
|
||||
-#else
|
||||
- const char *pstring = "NORMAL:" TLS_DH_STR;
|
||||
-#endif
|
||||
-
|
||||
gnutls_init(&session, GNUTLS_SERVER);
|
||||
gnutls_set_default_priority(session);
|
||||
|
||||
- ret = gnutls_priority_set_direct(session, pstring, &err);
|
||||
+ ret = gnutls_priority_set_direct(session, "@SYSTEM", &err);
|
||||
if (ret < 0) {
|
||||
fprintf(stderr, "TLS priority syntax error at: %s\n", err);
|
||||
return NULL;
|
||||
--- ./src/tls-auth.c 2016-09-15 08:49:10.809000884 +0200
|
||||
+++ ./src/tls-auth.c 2016-11-30 23:08:58.649439656 +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));
|
|
@ -0,0 +1,28 @@
|
|||
Description: Remove unneeded libraries from libprelude-config --libs
|
||||
Author: Orion Poplawski <orion@nwra.com>
|
||||
Last-Update: 2020-18-09
|
||||
|
||||
diff -up libprelude-5.2.0/libprelude-config.in.config libprelude-5.2.0/libprelude-config.in
|
||||
--- libprelude-5.2.0/libprelude-config.in.config 2020-09-09 08:30:32.658000000 -0600
|
||||
+++ libprelude-5.2.0/libprelude-config.in 2020-09-18 19:10:11.786743848 -0600
|
||||
@@ -104,7 +104,10 @@ fi
|
||||
|
||||
|
||||
if test $want_libs = yes; then
|
||||
- libdirs=-L@libdir@
|
||||
+ libdirs=
|
||||
+ if test @libdir@ != /usr/lib -a @libdir@ != /usr/lib64 ; then
|
||||
+ libdirs=-L@libdir@
|
||||
+ fi
|
||||
cpplibs=""
|
||||
if test $cpp_set = yes; then
|
||||
cpplibs="$libdirs -lpreludecpp"
|
||||
@@ -116,7 +119,7 @@ if test $want_libs = yes; then
|
||||
thrlibs="@LTLIBTHREAD@"
|
||||
fi
|
||||
|
||||
- echo $cpplibs $libdirs -lprelude @LIBPRELUDE_LIBS@ @LIBLTDL_DECL@ @LIBADD_DL@ $thrlibs @GETADDRINFO_LIB@ @GETHOSTNAME_LIB@ @HOSTENT_LIB@ @INET_NTOP_LIB@ @INET_PTON_LIB@ @LIBSOCKET@ @LIB_POLL@ @LIB_SELECT@ @LTLIBINTL@ @SERVENT_LIB@
|
||||
+ echo $cpplibs $libdirs -lprelude $thrlibs @GETADDRINFO_LIB@ @GETHOSTNAME_LIB@ @HOSTENT_LIB@ @INET_NTOP_LIB@ @INET_PTON_LIB@ @LIBSOCKET@ @LIB_POLL@ @LIB_SELECT@ @LTLIBINTL@ @SERVENT_LIB@
|
||||
fi
|
||||
|
||||
exit 0
|
|
@ -0,0 +1,112 @@
|
|||
--- ./src/libprelude-error/Makefile.am 2018-12-23 21:59:17.340000000 +0100
|
||||
+++ ./src/libprelude-error/Makefile.am 2019-07-11 17:33:18.537430699 +0200
|
||||
@@ -53,7 +53,7 @@
|
||||
|
||||
errnos-sym.h: Makefile mkstrtable.awk errnos.in
|
||||
LANG="" $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
|
||||
- -v prefix=PRELUDE_ERROR_ -v namespace=errnos_ \
|
||||
+ -v prefix=PRELUDE_ERROR_ -v pkg_namespace=errnos_ \
|
||||
$(srcdir)/errnos.in >$@
|
||||
|
||||
prelude-error.h: Makefile mkheader.awk err-sources.h.in err-codes.h.in errnos.in prelude-error.h.in
|
||||
--- ./src/libprelude-error/Makefile.in 2018-12-23 22:01:05.090000000 +0100
|
||||
+++ ./src/libprelude-error/Makefile.in 2019-07-11 17:33:10.202599542 +0200
|
||||
@@ -1834,7 +1834,7 @@
|
||||
|
||||
errnos-sym.h: Makefile mkstrtable.awk errnos.in
|
||||
LANG="" $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
|
||||
- -v prefix=PRELUDE_ERROR_ -v namespace=errnos_ \
|
||||
+ -v prefix=PRELUDE_ERROR_ -v pkg_namespace=errnos_ \
|
||||
$(srcdir)/errnos.in >$@
|
||||
|
||||
prelude-error.h: Makefile mkheader.awk err-sources.h.in err-codes.h.in errnos.in prelude-error.h.in
|
||||
--- ./src/libprelude-error/mkerrcodes.awk 2018-12-23 21:59:17.340000000 +0100
|
||||
+++ ./src/libprelude-error/mkerrcodes.awk 2019-07-11 17:34:56.482462208 +0200
|
||||
@@ -78,7 +78,7 @@
|
||||
}
|
||||
|
||||
!header {
|
||||
- sub (/\#.+/, "");
|
||||
+ sub (/#.+/, "");
|
||||
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
|
||||
|
||||
if (/^$/)
|
||||
--- ./src/libprelude-error/mkerrcodes1.awk 2018-12-23 21:59:17.341000000 +0100
|
||||
+++ ./src/libprelude-error/mkerrcodes1.awk 2019-07-11 17:35:02.737336699 +0200
|
||||
@@ -78,7 +78,7 @@
|
||||
}
|
||||
|
||||
!header {
|
||||
- sub (/\#.+/, "");
|
||||
+ sub (/#.+/, "");
|
||||
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
|
||||
|
||||
if (/^$/)
|
||||
--- ./src/libprelude-error/mkerrcodes2.awk 2018-12-23 21:59:17.341000000 +0100
|
||||
+++ ./src/libprelude-error/mkerrcodes2.awk 2019-07-11 17:35:08.595219159 +0200
|
||||
@@ -91,7 +91,7 @@
|
||||
}
|
||||
|
||||
!header {
|
||||
- sub (/\#.+/, "");
|
||||
+ sub (/#.+/, "");
|
||||
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
|
||||
|
||||
if (/^$/)
|
||||
--- ./src/libprelude-error/mkerrnos.awk 2019-07-11 17:41:09.385940916 +0200
|
||||
+++ ./src/libprelude-error/mkerrnos.awk 2019-07-11 17:41:22.455671539 +0200
|
||||
@@ -80,7 +80,7 @@
|
||||
}
|
||||
|
||||
!header {
|
||||
- sub (/\#.+/, "");
|
||||
+ sub (/#.+/, "");
|
||||
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
|
||||
|
||||
if (/^$/)
|
||||
--- ./src/libprelude-error/mkstrtable.awk 2018-12-23 21:59:17.341000000 +0100
|
||||
+++ ./src/libprelude-error/mkstrtable.awk 2019-07-11 17:38:41.588950860 +0200
|
||||
@@ -77,7 +77,7 @@
|
||||
#
|
||||
# The variable prefix can be used to prepend a string to each message.
|
||||
#
|
||||
-# The variable namespace can be used to prepend a string to each
|
||||
+# The variable pkg_namespace can be used to prepend a string to each
|
||||
# variable and macro name.
|
||||
|
||||
BEGIN {
|
||||
@@ -102,7 +102,7 @@
|
||||
print "/* The purpose of this complex string table is to produce";
|
||||
print " optimal code with a minimum of relocations. */";
|
||||
print "";
|
||||
- print "static const char " namespace "msgstr[] = ";
|
||||
+ print "static const char " pkg_namespace "msgstr[] = ";
|
||||
header = 0;
|
||||
}
|
||||
else
|
||||
@@ -110,7 +110,7 @@
|
||||
}
|
||||
|
||||
!header {
|
||||
- sub (/\#.+/, "");
|
||||
+ sub (/#.+/, "");
|
||||
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
|
||||
|
||||
if (/^$/)
|
||||
@@ -150,14 +150,14 @@
|
||||
else
|
||||
print " gettext_noop (\"" prefix last_msgstr "\");";
|
||||
print "";
|
||||
- print "static const int " namespace "msgidx[] =";
|
||||
+ print "static const int " pkg_namespace "msgidx[] =";
|
||||
print " {";
|
||||
for (i = 0; i < coded_msgs; i++)
|
||||
print " " pos[i] ",";
|
||||
print " " pos[coded_msgs];
|
||||
print " };";
|
||||
print "";
|
||||
- print "#define " namespace "msgidxof(code) (0 ? -1 \\";
|
||||
+ print "#define " pkg_namespace "msgidxof(code) (0 ? -1 \\";
|
||||
|
||||
# Gather the ranges.
|
||||
skip = code[0];
|
|
@ -0,0 +1,13 @@
|
|||
--- ./docs/api/libprelude-docs.xml 2019-09-14 18:27:52.635435171 -0400
|
||||
+++ ./docs/api/libprelude-docs.xml 2019-09-15 03:25:47.491163135 -0400
|
||||
@@ -51,10 +51,6 @@
|
||||
<xi:include href="xml/idmef-value.xml"/>
|
||||
|
||||
</chapter>
|
||||
- <chapter id="object-tree">
|
||||
- <title>Object Hierarchy</title>
|
||||
- <xi:include href="xml/tree_index.sgml"/>
|
||||
- </chapter>
|
||||
<index id="api-index-full">
|
||||
<title>API Index</title>
|
||||
<xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
|
|
@ -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);
|
|
@ -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/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/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@
|
||||
@@ -1156,7 +1156,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@
|
||||
@@ -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_LDFLAGS = -no-undefined
|
||||
libprelude_error_la_SOURCES = prelude-error.h prelude-error.c strsource.c strerror.c
|
||||
all: $(BUILT_SOURCES)
|
|
@ -0,0 +1,11 @@
|
|||
--- ./bindings/python/_prelude.cxx 2019-07-12 07:19:49.365476420 +0200
|
||||
+++ ./bindings/python/_prelude.cxx 2019-07-12 07:20:02.458213034 +0200
|
||||
@@ -3132,7 +3132,7 @@
|
||||
|
||||
SWIGINTERN void
|
||||
SwigPyStaticVar_dealloc(PyDescrObject *descr) {
|
||||
- _PyObject_GC_UNTRACK(descr);
|
||||
+ PyObject_GC_UnTrack(descr);
|
||||
Py_XDECREF(PyDescr_TYPE(descr));
|
||||
Py_XDECREF(PyDescr_NAME(descr));
|
||||
PyObject_GC_Del(descr);
|
124
libprelude.spec
124
libprelude.spec
|
@ -1,57 +1,58 @@
|
|||
%global major 23
|
||||
%global cppmajor 8
|
||||
%if 0%{?python3_other_pkgversion}
|
||||
%bcond_without python3_other
|
||||
%else
|
||||
%bcond_with python3_other
|
||||
%endif
|
||||
|
||||
# Notes about rpmlint
|
||||
# - crypto-policy-non-compliance-gnutls-{1,2} fixed with patch
|
||||
# libprelude-3.1.0-gnutls_priority_set_direct.patch
|
||||
%global major 28
|
||||
%global cppmajor 12
|
||||
|
||||
Name: libprelude
|
||||
Version: 3.1.0
|
||||
Release: 26%{?dist}
|
||||
Version: 5.2.0
|
||||
Release: 2%{?dist}
|
||||
Summary: Secure Connections between all Sensors and the Prelude Manager
|
||||
# Prelude is GPL-2.0+
|
||||
# libmissing is LGPL-2.1+
|
||||
License: GPLv2+
|
||||
License: LGPL-2.1+
|
||||
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-5.2.0-linking.patch
|
||||
# https://www.prelude-siem.org/issues/860
|
||||
Patch1: libprelude-3.1.0-ruby_vendorarchdir.patch
|
||||
# https://www.prelude-siem.org/issues/862
|
||||
Patch2: libprelude-3.1.0-gnutls_priority_set_direct.patch
|
||||
Patch1: libprelude-5.2.0-ruby_vendorarchdir.patch
|
||||
# https://www.prelude-siem.org/issues/863
|
||||
Patch3: libprelude-3.1.0-fsf_address.patch
|
||||
Patch2: libprelude-5.2.0-fsf_address.patch
|
||||
# https://www.prelude-siem.org/issues/865
|
||||
Patch4: libprelude-3.1.0-fix_timegm.patch
|
||||
Patch3: libprelude-5.2.0-fix_timegm.patch
|
||||
# https://www.prelude-siem.org/issues/885
|
||||
Patch4: libprelude-5.2.0-fix_pthread_atfork.patch
|
||||
# https://www.prelude-siem.org/issues/887
|
||||
Patch5: libprelude-5.2.0-fix_prelude_tests_timer.patch
|
||||
Patch6: libprelude-5.2.0-fix_gtkdoc_1.32.patch
|
||||
Patch7: libprelude-5.2.0-clean_libprelude-config.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
|
||||
BuildRequires: perl-generators
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python%{python3_pkgversion}-devel
|
||||
BuildRequires: pkgconfig(gnutls)
|
||||
BuildRequires: pkgconfig(lua) >= 5.2
|
||||
BuildRequires: pkgconfig(ruby)
|
||||
BuildRequires: pkgconfig(lua) >= 5.1
|
||||
BuildRequires: ruby-devel
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
|
||||
%ifnarch s390
|
||||
%ifnarch s390 ppc64 ppc64le
|
||||
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
|
||||
|
||||
ExcludeArch: ppc64 ppc64le aarch64 armv7hl
|
||||
# and update files. In libprelude 5.2.0, the checkout has been done
|
||||
# on 2018-09-03
|
||||
Provides: bundled(gnulib) = 20180903
|
||||
|
||||
%description
|
||||
Libprelude is a collection of generic functions providing communication
|
||||
|
@ -99,14 +100,27 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
|||
%description -n python2-prelude
|
||||
Provides python 2 bindings for prelude.
|
||||
|
||||
%package -n python3-prelude
|
||||
%package -n python%{python3_pkgversion}-prelude
|
||||
Summary: Python 3 bindings for prelude
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
%{?python_provide:%python_provide python3-prelude}
|
||||
%{?python_provide:%python_provide python%{python3_pkgversion}-prelude}
|
||||
|
||||
%description -n python3-prelude
|
||||
%description -n python%{python3_pkgversion}-prelude
|
||||
Provides python 3 bindings for prelude.
|
||||
|
||||
%if 0%{?with_python3_other}
|
||||
%package -n python%{python3_other_pkgversion}-prelude
|
||||
Summary: Python 3 bindings for prelude
|
||||
BuildRequires: python%{python3_other_pkgversion}-devel
|
||||
BuildRequires: python%{python3_other_pkgversion}-setuptools
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
%{?python_provide:%python_provide python%{python3_other_pkgversion}-prelude}
|
||||
|
||||
%description -n python%{python3_other_pkgversion}-prelude
|
||||
Provides python 3 bindings for prelude.
|
||||
# with_python3_other
|
||||
%endif
|
||||
|
||||
%package -n perl-prelude
|
||||
Summary: Perl bindings for prelude
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
@ -157,9 +171,13 @@ Provides documentation for prelude generated by gtk-doc.
|
|||
--with-html-dir=%{_docdir}/%{name}-devel
|
||||
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
|
||||
%make_build
|
||||
cd %{_builddir}/%{name}-%{version}/bindings/python
|
||||
%{?with_python3_other: %py3_other_build}
|
||||
|
||||
%install
|
||||
%make_install
|
||||
cd %{_builddir}/%{name}-%{version}/bindings/python
|
||||
%{?with_python3_other: %py3_other_install}
|
||||
|
||||
chrpath -d %{buildroot}%{_libdir}/*.so.*
|
||||
|
||||
|
@ -168,7 +186,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
|
||||
|
@ -209,19 +227,32 @@ make distcheck
|
|||
%files -n python2-prelude
|
||||
%{python2_sitearch}/_prelude.*so
|
||||
%{python2_sitearch}/prelude-%{version}-py?.?.egg-info
|
||||
%{python2_sitearch}/prelude.{py,pyc,pyo}
|
||||
%{python2_sitearch}/prelude.py
|
||||
%{python2_sitearch}/prelude.pyc
|
||||
%{python2_sitearch}/prelude.pyo
|
||||
|
||||
%files -n python3-prelude
|
||||
%files -n python%{python3_pkgversion}-prelude
|
||||
%{python3_sitearch}/_prelude.*so
|
||||
%{python3_sitearch}/__pycache__/prelude.cpython-??.*pyc
|
||||
%{python3_sitearch}/prelude-%{version}-py?.?.egg-info
|
||||
%{python3_sitearch}/prelude.py
|
||||
|
||||
%if 0%{?with_python3_other}
|
||||
%files -n python%{python3_other_pkgversion}-prelude
|
||||
%{python3_other_sitearch}/_prelude.*so
|
||||
%{python3_other_sitearch}/__pycache__/prelude.cpython-??.*pyc
|
||||
%{python3_other_sitearch}/__pycache__/prelude.cpython-??.*pyo
|
||||
%{python3_other_sitearch}/prelude-%{version}-py?.?.egg-info
|
||||
%{python3_other_sitearch}/prelude.py
|
||||
# with_python3_other
|
||||
%endif
|
||||
|
||||
%files -n perl-prelude
|
||||
%{perl_vendorarch}/Prelude.pm
|
||||
%dir %{perl_vendorarch}/auto/Prelude
|
||||
# Force attrs because libprelude set it to 555
|
||||
%attr(755, root, root) %{perl_vendorarch}/auto/Prelude/Prelude.so
|
||||
%attr(755, root, root) %{perl_vendorarch}/auto/Prelude/Prelude.bs
|
||||
|
||||
%files -n ruby-prelude
|
||||
%{ruby_vendorarchdir}/Prelude.so
|
||||
|
@ -235,6 +266,33 @@ make distcheck
|
|||
%doc AUTHORS ChangeLog README NEWS
|
||||
|
||||
%changelog
|
||||
* Fri Sep 18 2020 Thomas Andrejak <thomas.andrejak@gmail.com> - 5.2.0-2
|
||||
- Clean libprelude-config
|
||||
|
||||
* Thu Sep 17 2020 Thomas Andrejak <thomas.andrejak@gmail.com> - 5.2.0-1
|
||||
- Bump version 5.2.0
|
||||
|
||||
* Mon Apr 06 2020 Thomas Andrejak <thomas.andrejak@gmail.com> - 5.1.1-1
|
||||
- Bump version 5.1.1
|
||||
|
||||
* Sun Jul 14 2019 Thomas Andrejak <thomas.andrejak@gmail.com> - 5.0.0-1
|
||||
- Bump version 5.0.0
|
||||
|
||||
* Thu Mar 07 2019 Troy Dawson <tdawson@redhat.com> - 4.1.0-3
|
||||
- Rebuilt to change main python from 3.4 to 3.6
|
||||
|
||||
* Fri May 11 2018 Thomas Andrejak <thomas.andrejak@gmail.com> - 4.1.0-2
|
||||
- Rebuild with right sources
|
||||
|
||||
* Sat Mar 10 2018 Thomas Andrejak <thomas.andrejak@gmail.com> - 4.1.0-1
|
||||
- Bump version 4.1.0
|
||||
|
||||
* Sat Sep 16 2017 Thomas Andrejak <thomas.andrejak@gmail.com> - 4.0.0-1
|
||||
- Bump version 4.0.0
|
||||
|
||||
* Thu Feb 02 2017 Thomas Andrejak <thomas.andrejak@gmail.com> - 3.1.0-27
|
||||
- Fix GnuTLS patch
|
||||
|
||||
* Wed Oct 19 2016 Thomas Andrejak <thomas.andrejak@gmail.com> - 3.1.0-26
|
||||
- Bump version
|
||||
|
||||
|
|
Loading…
Reference in New Issue