| 1 |
commit: a39d07f15cdd7f35dad39c7187d551580672e926 |
| 2 |
Author: Thomas Andrejak <thomas.andrejak <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Nov 7 01:36:36 2019 +0000 |
| 4 |
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 24 21:54:16 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a39d07f1 |
| 7 |
|
| 8 |
dev-libs/libprelude: Bump version 5.1 |
| 9 |
|
| 10 |
Signed-off-by: Göktürk Yüksek <gokturk <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-libs/libprelude/Manifest | 1 + |
| 13 |
.../files/libprelude-5.1.0-fix_awk_error.patch | 112 +++++++++++++++++++++ |
| 14 |
.../files/libprelude-5.1.0-fix_gtkdoc_1.32.patch | 13 +++ |
| 15 |
.../files/libprelude-5.1.0-fix_py38.patch | 11 ++ |
| 16 |
dev-libs/libprelude/libprelude-5.1.1.ebuild | 101 +++++++++++++++++++ |
| 17 |
5 files changed, 238 insertions(+) |
| 18 |
|
| 19 |
diff --git a/dev-libs/libprelude/Manifest b/dev-libs/libprelude/Manifest |
| 20 |
index d853c53840b..79c0b481ccf 100644 |
| 21 |
--- a/dev-libs/libprelude/Manifest |
| 22 |
+++ b/dev-libs/libprelude/Manifest |
| 23 |
@@ -2,3 +2,4 @@ DIST libprelude-3.0.0.tar.gz 2900153 BLAKE2B dd03b46a11b673252dc36701e4568c445fe |
| 24 |
DIST libprelude-3.1.0.tar.gz 2949462 BLAKE2B 52764791766c54e2c1baa96231c6578f06219a6d1c48a97ad318fc8445fc64f90a63019654f7350d65ec4e0a336eef66bd449484321c590d1ee4596a6a386724 SHA512 f2878b19b4ba3cc74b0530f8741525ecf1425540d30356d182c4e0a797dbb5f4023792351bd059105dafc6b7818d4caa2e9c8b39be9a7039a89680244fcf1239 |
| 25 |
DIST libprelude-4.0.0.tar.gz 2864402 BLAKE2B 2e51eb1af74b63140bc66a358b112a753c1a0fd86d6bb8bb43ccddca4cd396e34566168edca55a626a0b43ba56e676301f3792247c25f64c7a31430af3708311 SHA512 5d88e8f211b09cc3e43dbe299e935d8f11575ae3f1894059793966cd14a8e47177ef8963d45305e1a24f9efc4048520329b31681301a21815909bd38606c2ce7 |
| 26 |
DIST libprelude-4.1.0.tar.gz 2852916 BLAKE2B a18babb24795d17d72eb1c0755f4b0330125c8b289af0b52753f6f69b5e820f0f972019b57eaded3abfc45c69bd75c0d120fe29982887e55d75f2c4c8b6486f7 SHA512 073307ca070794b47643e2ef2db4788fa92374735558b466441f0663f420cab45aecc7a1d99bb487ad23ebe602d5668369ffa6ab29fa3b0504356420ab3a7878 |
| 27 |
+DIST libprelude-5.1.1.tar.gz 2898350 BLAKE2B accc8610e8551f1c62156ea87748fa1dba2bd7d8bc0813782b2a91fde1cda5d64b404003846cd17af030486654cf48889dec5cf27c64874ac07c9cd905eb13ec SHA512 eddd6e1cf4fc4b2fa79a5132316576cc7205915fa19bf3a2a68cbc4eaf5abf50e5c594384aa1742d620304916da634e113a7c33e4ebca2bcee96e35c9796ed5f |
| 28 |
|
| 29 |
diff --git a/dev-libs/libprelude/files/libprelude-5.1.0-fix_awk_error.patch b/dev-libs/libprelude/files/libprelude-5.1.0-fix_awk_error.patch |
| 30 |
new file mode 100644 |
| 31 |
index 00000000000..c3dca1b93d1 |
| 32 |
--- /dev/null |
| 33 |
+++ b/dev-libs/libprelude/files/libprelude-5.1.0-fix_awk_error.patch |
| 34 |
@@ -0,0 +1,112 @@ |
| 35 |
+--+ a/src/libprelude-error/Makefile.am |
| 36 |
++++ b/src/libprelude-error/Makefile.am |
| 37 |
+@@ -53,7 +53,7 @@ |
| 38 |
+ |
| 39 |
+ errnos-sym.h: Makefile mkstrtable.awk errnos.in |
| 40 |
+ LANG="" $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ |
| 41 |
+- -v prefix=PRELUDE_ERROR_ -v namespace=errnos_ \ |
| 42 |
++ -v prefix=PRELUDE_ERROR_ -v pkg_namespace=errnos_ \ |
| 43 |
+ $(srcdir)/errnos.in >$@ |
| 44 |
+ |
| 45 |
+ prelude-error.h: Makefile mkheader.awk err-sources.h.in err-codes.h.in errnos.in prelude-error.h.in |
| 46 |
+--+ a/src/libprelude-error/Makefile.in |
| 47 |
++++ b/src/libprelude-error/Makefile.in |
| 48 |
+@@ -1834,7 +1834,7 @@ |
| 49 |
+ |
| 50 |
+ errnos-sym.h: Makefile mkstrtable.awk errnos.in |
| 51 |
+ LANG="" $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ |
| 52 |
+- -v prefix=PRELUDE_ERROR_ -v namespace=errnos_ \ |
| 53 |
++ -v prefix=PRELUDE_ERROR_ -v pkg_namespace=errnos_ \ |
| 54 |
+ $(srcdir)/errnos.in >$@ |
| 55 |
+ |
| 56 |
+ prelude-error.h: Makefile mkheader.awk err-sources.h.in err-codes.h.in errnos.in prelude-error.h.in |
| 57 |
+--+ a/src/libprelude-error/mkerrcodes.awk |
| 58 |
++++ b/src/libprelude-error/mkerrcodes.awk |
| 59 |
+@@ -78,7 +78,7 @@ |
| 60 |
+ } |
| 61 |
+ |
| 62 |
+ !header { |
| 63 |
+- sub (/\#.+/, ""); |
| 64 |
++ sub (/#.+/, ""); |
| 65 |
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters. |
| 66 |
+ |
| 67 |
+ if (/^$/) |
| 68 |
+--+ a/src/libprelude-error/mkerrcodes1.awk |
| 69 |
++++ b/src/libprelude-error/mkerrcodes1.awk |
| 70 |
+@@ -78,7 +78,7 @@ |
| 71 |
+ } |
| 72 |
+ |
| 73 |
+ !header { |
| 74 |
+- sub (/\#.+/, ""); |
| 75 |
++ sub (/#.+/, ""); |
| 76 |
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters. |
| 77 |
+ |
| 78 |
+ if (/^$/) |
| 79 |
+--+ a/src/libprelude-error/mkerrcodes2.awk |
| 80 |
++++ b/src/libprelude-error/mkerrcodes2.awk |
| 81 |
+@@ -91,7 +91,7 @@ |
| 82 |
+ } |
| 83 |
+ |
| 84 |
+ !header { |
| 85 |
+- sub (/\#.+/, ""); |
| 86 |
++ sub (/#.+/, ""); |
| 87 |
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters. |
| 88 |
+ |
| 89 |
+ if (/^$/) |
| 90 |
+--+ a/src/libprelude-error/mkerrnos.awk |
| 91 |
++++ b/src/libprelude-error/mkerrnos.awk |
| 92 |
+@@ -80,7 +80,7 @@ |
| 93 |
+ } |
| 94 |
+ |
| 95 |
+ !header { |
| 96 |
+- sub (/\#.+/, ""); |
| 97 |
++ sub (/#.+/, ""); |
| 98 |
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters. |
| 99 |
+ |
| 100 |
+ if (/^$/) |
| 101 |
+--+ a/src/libprelude-error/mkstrtable.awk |
| 102 |
++++ b/src/libprelude-error/mkstrtable.awk |
| 103 |
+@@ -77,7 +77,7 @@ |
| 104 |
+ # |
| 105 |
+ # The variable prefix can be used to prepend a string to each message. |
| 106 |
+ # |
| 107 |
+-# The variable namespace can be used to prepend a string to each |
| 108 |
++# The variable pkg_namespace can be used to prepend a string to each |
| 109 |
+ # variable and macro name. |
| 110 |
+ |
| 111 |
+ BEGIN { |
| 112 |
+@@ -102,7 +102,7 @@ |
| 113 |
+ print "/* The purpose of this complex string table is to produce"; |
| 114 |
+ print " optimal code with a minimum of relocations. */"; |
| 115 |
+ print ""; |
| 116 |
+- print "static const char " namespace "msgstr[] = "; |
| 117 |
++ print "static const char " pkg_namespace "msgstr[] = "; |
| 118 |
+ header = 0; |
| 119 |
+ } |
| 120 |
+ else |
| 121 |
+@@ -110,7 +110,7 @@ |
| 122 |
+ } |
| 123 |
+ |
| 124 |
+ !header { |
| 125 |
+- sub (/\#.+/, ""); |
| 126 |
++ sub (/#.+/, ""); |
| 127 |
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters. |
| 128 |
+ |
| 129 |
+ if (/^$/) |
| 130 |
+@@ -150,14 +150,14 @@ |
| 131 |
+ else |
| 132 |
+ print " gettext_noop (\"" prefix last_msgstr "\");"; |
| 133 |
+ print ""; |
| 134 |
+- print "static const int " namespace "msgidx[] ="; |
| 135 |
++ print "static const int " pkg_namespace "msgidx[] ="; |
| 136 |
+ print " {"; |
| 137 |
+ for (i = 0; i < coded_msgs; i++) |
| 138 |
+ print " " pos[i] ","; |
| 139 |
+ print " " pos[coded_msgs]; |
| 140 |
+ print " };"; |
| 141 |
+ print ""; |
| 142 |
+- print "#define " namespace "msgidxof(code) (0 ? -1 \\"; |
| 143 |
++ print "#define " pkg_namespace "msgidxof(code) (0 ? -1 \\"; |
| 144 |
+ |
| 145 |
+ # Gather the ranges. |
| 146 |
+ skip = code[0]; |
| 147 |
|
| 148 |
diff --git a/dev-libs/libprelude/files/libprelude-5.1.0-fix_gtkdoc_1.32.patch b/dev-libs/libprelude/files/libprelude-5.1.0-fix_gtkdoc_1.32.patch |
| 149 |
new file mode 100644 |
| 150 |
index 00000000000..3495ebf62cc |
| 151 |
--- /dev/null |
| 152 |
+++ b/dev-libs/libprelude/files/libprelude-5.1.0-fix_gtkdoc_1.32.patch |
| 153 |
@@ -0,0 +1,13 @@ |
| 154 |
+--- a/docs/api/libprelude-docs.xml |
| 155 |
++++ b/docs/api/libprelude-docs.xml |
| 156 |
+@@ -51,10 +51,6 @@ |
| 157 |
+ <xi:include href="xml/idmef-value.xml"/> |
| 158 |
+ |
| 159 |
+ </chapter> |
| 160 |
+- <chapter id="object-tree"> |
| 161 |
+- <title>Object Hierarchy</title> |
| 162 |
+- <xi:include href="xml/tree_index.sgml"/> |
| 163 |
+- </chapter> |
| 164 |
+ <index id="api-index-full"> |
| 165 |
+ <title>API Index</title> |
| 166 |
+ <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include> |
| 167 |
|
| 168 |
diff --git a/dev-libs/libprelude/files/libprelude-5.1.0-fix_py38.patch b/dev-libs/libprelude/files/libprelude-5.1.0-fix_py38.patch |
| 169 |
new file mode 100644 |
| 170 |
index 00000000000..079a90125df |
| 171 |
--- /dev/null |
| 172 |
+++ b/dev-libs/libprelude/files/libprelude-5.1.0-fix_py38.patch |
| 173 |
@@ -0,0 +1,11 @@ |
| 174 |
+--- a/bindings/python/_prelude.cxx |
| 175 |
++++ b/bindings/python/_prelude.cxx |
| 176 |
+@@ -3132,7 +3132,7 @@ |
| 177 |
+ |
| 178 |
+ SWIGINTERN void |
| 179 |
+ SwigPyStaticVar_dealloc(PyDescrObject *descr) { |
| 180 |
+- _PyObject_GC_UNTRACK(descr); |
| 181 |
++ PyObject_GC_UnTrack(descr); |
| 182 |
+ Py_XDECREF(PyDescr_TYPE(descr)); |
| 183 |
+ Py_XDECREF(PyDescr_NAME(descr)); |
| 184 |
+ PyObject_GC_Del(descr); |
| 185 |
|
| 186 |
diff --git a/dev-libs/libprelude/libprelude-5.1.1.ebuild b/dev-libs/libprelude/libprelude-5.1.1.ebuild |
| 187 |
new file mode 100644 |
| 188 |
index 00000000000..67027e58a7e |
| 189 |
--- /dev/null |
| 190 |
+++ b/dev-libs/libprelude/libprelude-5.1.1.ebuild |
| 191 |
@@ -0,0 +1,101 @@ |
| 192 |
+# Copyright 1999-2019 Gentoo Authors |
| 193 |
+# Distributed under the terms of the GNU General Public License v2 |
| 194 |
+ |
| 195 |
+EAPI=7 |
| 196 |
+ |
| 197 |
+PYTHON_COMPAT=( python3_{5,6,7} ) |
| 198 |
+USE_RUBY="ruby24 ruby25 ruby26" |
| 199 |
+DISTUTILS_OPTIONAL=1 |
| 200 |
+ |
| 201 |
+inherit autotools distutils-r1 ruby-single |
| 202 |
+ |
| 203 |
+DESCRIPTION="Prelude-SIEM Framework Library" |
| 204 |
+HOMEPAGE="https://www.prelude-siem.org" |
| 205 |
+SRC_URI="https://www.prelude-siem.org/pkg/src/5.1.0/${P}.tar.gz" |
| 206 |
+ |
| 207 |
+LICENSE="GPL-2+" |
| 208 |
+SLOT="0" |
| 209 |
+KEYWORDS="~amd64 ~x86" |
| 210 |
+IUSE="lua perl python ruby" |
| 211 |
+ |
| 212 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 213 |
+ |
| 214 |
+RDEPEND="net-libs/gnutls:= |
| 215 |
+ lua? ( dev-lang/lua:* ) |
| 216 |
+ perl? ( dev-lang/perl:= ) |
| 217 |
+ python? ( ${PYTHON_DEPS} ) |
| 218 |
+ ruby? ( ${RUBY_DEPS} )" |
| 219 |
+ |
| 220 |
+DEPEND="${RDEPEND}" |
| 221 |
+ |
| 222 |
+BDEPEND=">=dev-lang/swig-3.0.11 |
| 223 |
+ dev-util/gtk-doc-am |
| 224 |
+ sys-devel/flex |
| 225 |
+ lua? ( dev-lang/lua:* ) |
| 226 |
+ perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker ) |
| 227 |
+ python? ( ${PYTHON_DEPS} ) |
| 228 |
+ ruby? ( ${RUBY_DEPS} ) |
| 229 |
+ virtual/pkgconfig |
| 230 |
+ virtual/yacc" |
| 231 |
+ |
| 232 |
+PATCHES=( |
| 233 |
+ "${FILESDIR}/${PN}-4.0.0-fix-python-bindings.patch" |
| 234 |
+ "${FILESDIR}/${PN}-5.1.0-fix_awk_error.patch" |
| 235 |
+ "${FILESDIR}/${PN}-5.1.0-fix_gtkdoc_1.32.patch" |
| 236 |
+ "${FILESDIR}/${PN}-5.1.0-fix_py38.patch" |
| 237 |
+) |
| 238 |
+ |
| 239 |
+src_prepare() { |
| 240 |
+ default |
| 241 |
+ |
| 242 |
+ # Avoid null runpaths in Perl bindings. |
| 243 |
+ sed -e 's/ LD_RUN_PATH=""//' -i "${S}/bindings/Makefile.am" || die "sed failed" |
| 244 |
+ |
| 245 |
+ eautoreconf |
| 246 |
+ |
| 247 |
+ if use python; then |
| 248 |
+ cd bindings/python || die |
| 249 |
+ distutils-r1_src_prepare |
| 250 |
+ fi |
| 251 |
+} |
| 252 |
+ |
| 253 |
+src_configure() { |
| 254 |
+ local myconf=( |
| 255 |
+ --enable-easy-bindings |
| 256 |
+ --with-swig |
| 257 |
+ $(use_with lua) |
| 258 |
+ $(use_with perl) |
| 259 |
+ $(usex perl '--with-perl-installdirs=vendor' '') |
| 260 |
+ $(use_with ruby) |
| 261 |
+ ) |
| 262 |
+ |
| 263 |
+ if use python; then |
| 264 |
+ python_setup |
| 265 |
+ if python_is_python3; then |
| 266 |
+ myconf+=(--without-python2 --with-python3="${EPYTHON}") |
| 267 |
+ else |
| 268 |
+ myconf+=(--without-python3 --with-python2="${EPYTHON}") |
| 269 |
+ fi |
| 270 |
+ else |
| 271 |
+ myconf+=(--without-python2 --without-python3) |
| 272 |
+ fi |
| 273 |
+ |
| 274 |
+ econf "${myconf[@]}" |
| 275 |
+} |
| 276 |
+ |
| 277 |
+src_compile() { |
| 278 |
+ default |
| 279 |
+ if use python; then |
| 280 |
+ cd bindings/python || die |
| 281 |
+ distutils-r1_src_compile |
| 282 |
+ fi |
| 283 |
+} |
| 284 |
+ |
| 285 |
+src_install() { |
| 286 |
+ default |
| 287 |
+ find "${D}" -name '*.la' -delete || die |
| 288 |
+ if use python; then |
| 289 |
+ cd bindings/python || die |
| 290 |
+ distutils-r1_src_install |
| 291 |
+ fi |
| 292 |
+} |
Archives