diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rw-r--r-- | libprelude-5.1.0-fix_awk_error.patch | 112 | ||||
| -rw-r--r-- | libprelude-5.1.0-fix_gtkdoc_1.32.patch | 13 | ||||
| -rw-r--r-- | libprelude-5.1.0-fix_py38.patch | 11 |
5 files changed, 158 insertions, 6 deletions
@@ -1,6 +1,6 @@ pkgbase = libprelude pkgdesc = Provides the framework for using the Prelude system - pkgver = 5.0.0 + pkgver = 5.1.1 pkgrel = 1 url = https://www.prelude-siem.org arch = i686 @@ -16,8 +16,14 @@ pkgbase = libprelude backup = etc/prelude/default/global.conf backup = etc/prelude/default/idmef-client.conf backup = etc/prelude/default/tls.conf - source = https://www.prelude-siem.org/pkg/src/5.0.0/libprelude-5.0.0.tar.gz - md5sums = 122cebf2073dc9803eb60e80d3d234a4 + source = https://www.prelude-siem.org/pkg/src/5.1.0/libprelude-5.1.1.tar.gz + source = libprelude-5.1.0-fix_awk_error.patch + source = libprelude-5.1.0-fix_gtkdoc_1.32.patch + source = libprelude-5.1.0-fix_py38.patch + md5sums = 9302c68e1c84a847f77574ab048177e6 + md5sums = 6e68405705b75b0ce25b8165db8c4e2e + md5sums = 25529ffd018e827c07d5dc2b4a5d44ae + md5sums = b63554f1057f054a96d470d70056c668 pkgname = libprelude @@ -3,7 +3,7 @@ # Contributor: Thomas Andrejak <thomas.andrejak@gmail.com> pkgname=libprelude -pkgver=5.0.0 +pkgver=5.1.1 pkgrel=1 pkgdesc="Provides the framework for using the Prelude system" arch=('i686' 'x86_64') @@ -14,7 +14,11 @@ backup=('etc/prelude/default/client.conf' 'etc/prelude/default/global.conf' 'etc/prelude/default/idmef-client.conf' 'etc/prelude/default/tls.conf') -source=("https://www.prelude-siem.org/pkg/src/5.0.0/$pkgname-$pkgver.tar.gz") +source=("https://www.prelude-siem.org/pkg/src/5.1.0/$pkgname-$pkgver.tar.gz" + "libprelude-5.1.0-fix_awk_error.patch" + "libprelude-5.1.0-fix_gtkdoc_1.32.patch" + "libprelude-5.1.0-fix_py38.patch" + ) build() { cd "$srcdir/$pkgname-$pkgver" @@ -22,9 +26,15 @@ build() { make } +prepare() { + patch -p0 <libprelude-5.1.0-fix_awk_error.patch + patch -p0 <libprelude-5.1.0-fix_gtkdoc_1.32.patch + patch -p0 <libprelude-5.1.0-fix_py38.patch +} + package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums=('122cebf2073dc9803eb60e80d3d234a4') +md5sums=('9302c68e1c84a847f77574ab048177e6' '6e68405705b75b0ce25b8165db8c4e2e' '25529ffd018e827c07d5dc2b4a5d44ae' 'b63554f1057f054a96d470d70056c668') diff --git a/libprelude-5.1.0-fix_awk_error.patch b/libprelude-5.1.0-fix_awk_error.patch new file mode 100644 index 000000000000..cc583e320592 --- /dev/null +++ b/libprelude-5.1.0-fix_awk_error.patch @@ -0,0 +1,112 @@ +--- libprelude-5.1.1/src/libprelude-error/Makefile.am 2018-12-23 21:59:17.340000000 +0100 ++++ libprelude-5.1.1/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 +--- libprelude-5.1.1/src/libprelude-error/Makefile.in 2018-12-23 22:01:05.090000000 +0100 ++++ libprelude-5.1.1/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 +--- libprelude-5.1.1/src/libprelude-error/mkerrcodes.awk 2018-12-23 21:59:17.340000000 +0100 ++++ libprelude-5.1.1/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 (/^$/) +--- libprelude-5.1.1/src/libprelude-error/mkerrcodes1.awk 2018-12-23 21:59:17.341000000 +0100 ++++ libprelude-5.1.1/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 (/^$/) +--- libprelude-5.1.1/src/libprelude-error/mkerrcodes2.awk 2018-12-23 21:59:17.341000000 +0100 ++++ libprelude-5.1.1/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 (/^$/) +--- libprelude-5.1.1/src/libprelude-error/mkerrnos.awk 2019-07-11 17:41:09.385940916 +0200 ++++ libprelude-5.1.1/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 (/^$/) +--- libprelude-5.1.1/src/libprelude-error/mkstrtable.awk 2018-12-23 21:59:17.341000000 +0100 ++++ libprelude-5.1.1/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]; diff --git a/libprelude-5.1.0-fix_gtkdoc_1.32.patch b/libprelude-5.1.0-fix_gtkdoc_1.32.patch new file mode 100644 index 000000000000..aee391cfdea7 --- /dev/null +++ b/libprelude-5.1.0-fix_gtkdoc_1.32.patch @@ -0,0 +1,13 @@ +--- libprelude-5.1.1/docs/api/libprelude-docs.xml 2019-09-14 18:27:52.635435171 -0400 ++++ libprelude-5.1.1/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> diff --git a/libprelude-5.1.0-fix_py38.patch b/libprelude-5.1.0-fix_py38.patch new file mode 100644 index 000000000000..7d924bd6d840 --- /dev/null +++ b/libprelude-5.1.0-fix_py38.patch @@ -0,0 +1,11 @@ +--- libprelude-5.1.1/bindings/python/_prelude.cxx 2019-07-12 07:19:49.365476420 +0200 ++++ libprelude-5.1.1/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); |