Skip to contentSkip to conversation

libfastjson: add recipe

PATCH New [email protected] 1 participant 3 messages Oct 24, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 libfastjson: add recipe

From: Chen Qi <[email protected]>

This is a project under rsyslog. Add its recipe as it's needed by new version of rsyslog.

---
 meta-oe/recipes-extended/rsyslog/libfastjson_0.99.4.bb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 meta-oe/recipes-extended/rsyslog/libfastjson_0.99.4.bb
meta-oe/recipes-extended/rsyslog/libfastjson_0.99.4.bb new file +15 -0
new file mode 100644
index 0000000..2e23d7e
@@ -0,0 +1,15 @@
+SUMMARY = "A fork of json-c library"
+HOMEPAGE = "https://github.com/rsyslog/libfastjson"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a958bb07122368f3e1d9b2efe07d231f"
+
+DEPENDS = ""
+
+SRC_URI = "git://github.com/rsyslog/libfastjson.git;protocol=https"
+
+SRCREV = "6e057a094cb225c9d80d8d6e6b1f36ca88a942dd"
+
+S = "${WORKDIR}/git"
+
+inherit autotools
Signature · 1 line
1.9.1
#1 lore raw

PATCH 2/3 librelp: add recipe

From: Chen Qi <[email protected]>

This is a project under rsyslog. Add its recipe as it's needed by the new version of rsyslog.

---
 meta-oe/recipes-extended/rsyslog/librelp_1.2.12.bb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 meta-oe/recipes-extended/rsyslog/librelp_1.2.12.bb
meta-oe/recipes-extended/rsyslog/librelp_1.2.12.bb new file +15 -0
new file mode 100644
index 0000000..84c2583
@@ -0,0 +1,15 @@
+SUMMARY = "A reliable logging library"
+HOMEPAGE = "https://github.com/rsyslog/libfastjson"
+
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1fb9c10ed9fd6826757615455ca893a9"
+
+DEPENDS = "gmp nettle libidn zlib gnutls"
+
+SRC_URI = "git://github.com/rsyslog/librelp.git;protocol=https"
+
+SRCREV = "02c3be4f5c39fec59d05cd8b75b08dbba04098ad"
+
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig
Signature · 1 line
1.9.1
#2 lore raw

PATCH 3/3 rsyslog: upgrade to 8.22.0

In reply to [email protected]

From: Chen Qi <[email protected]>

enable_tls_ptests.patch is removed as the problem has been fixed in new version.

fix_build_with_musl.patch is removed as it's no longer suitable. The file it fixes is not even there any more.

Several necessary runtime dependencies are added to rsyslog-ptest.

---
 ...include-config.h-before-any-other-headers.patch |  51 ------
 .../rsyslog/rsyslog/enable_tls_ptests.patch        |  28 ----
 .../rsyslog/rsyslog/fix_build_with_musl.patch      |  62 -------
 .../rsyslog/rsyslog/json-0.12-fix.patch            |  47 ------
 .../replace_deprecated_GnuTLS_functions.patch      |  73 ---------
 ...icate_type_set_priority_only_if_available.patch |  79 ---------
 meta-oe/recipes-extended/rsyslog/rsyslog_7.6.7.bb  | 180 ---------------------
 meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb | 172 ++++++++++++++++++++
 8 files changed, 172 insertions(+), 520 deletions(-)
 delete mode 100644 meta-oe/recipes-extended/rsyslog/rsyslog/bugfix-include-config.h-before-any-other-headers.patch
 delete mode 100644 meta-oe/recipes-extended/rsyslog/rsyslog/enable_tls_ptests.patch
 delete mode 100644 meta-oe/recipes-extended/rsyslog/rsyslog/fix_build_with_musl.patch
 delete mode 100644 meta-oe/recipes-extended/rsyslog/rsyslog/json-0.12-fix.patch
 delete mode 100644 meta-oe/recipes-extended/rsyslog/rsyslog/replace_deprecated_GnuTLS_functions.patch
 delete mode 100644 meta-oe/recipes-extended/rsyslog/rsyslog/use_gnutls_certificate_type_set_priority_only_if_available.patch
 delete mode 100644 meta-oe/recipes-extended/rsyslog/rsyslog_7.6.7.bb
 create mode 100644 meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb
meta-oe/recipes-extended/rsyslog/rsyslog/bugfix-include-config.h-before-any-other-headers.patch deleted +0 -51
deleted file mode 100644
index 1048b42..0000000
@@ -1,51 +0,0 @@
-Backport below commit for fixing:
-
-lexer.l:34:14: error: expected identifier or '(' before '__extension__'
-
-From 876bdd1c85353f7e254f4b4c3e228484860cea57 Mon Sep 17 00:00:00 2001
-From: Tomas Heinrich <[email protected]>
-Date: Mon, 17 Nov 2014 20:53:22 +0100
-Subject: [PATCH] bugfix: include config.h before any other headers
-
-For some reason, flex used to prepend several standard headers before
-config.h. This prevented some conditional extension in these headers
-from being defined.
-
-The explicit prototype for strdup() shouldn't be required anymore as
-it should be provided by string.h.
-
-Upstream-Status: Backport
----
- grammar/lexer.l | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/grammar/lexer.l b/grammar/lexer.l
-index 359cf9f..c834ef7 100644
---- a/grammar/lexer.l
-+++ b/grammar/lexer.l
-@@ -28,10 +28,12 @@
-   * limitations under the License.
-   */
- 
--%{
-+%top{
- #include "config.h"
-+}
-+
-+%{
- #include "parserif.h"
--extern char *strdup(__const char*); /* somehow we may not get this from string.h... */
- %}
- 
- %option noyywrap nodefault case-insensitive yylineno
-@@ -67,6 +69,7 @@ extern char *strdup(__const char*); /* somehow we may not get this from string.h
- #include <ctype.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <strings.h>
- #include <libestr.h>
- #include "rainerscript.h"
--- 
-2.7.4
-
meta-oe/recipes-extended/rsyslog/rsyslog/enable_tls_ptests.patch deleted +0 -28
deleted file mode 100644
index c858f32..0000000
@@ -1,28 +0,0 @@
-Enable tls ptest
-
-Signed-off-by: Tudor Florea <[email protected]>
-Upstream-Status: Pending
-
---- rsyslog-7.4.4/tests/Makefile.am.orig	2013-08-30 18:30:41.000000000 +0200
-+++ rsyslog-7.4.4/tests/Makefile.am	2015-10-01 09:38:45.176289031 +0200
-@@ -118,15 +118,13 @@
- endif
- 
- if ENABLE_GNUTLS
--# TODO: re-enable in newer version
--#TESTS +=  \
--	#sndrcv_tls_anon.sh \
--	#sndrcv_tls_anon_rebind.sh \
--	#imtcp-tls-basic.sh
-+TESTS +=  \
-+	 imtcp-tls-basic.sh \
-+	 imtcp_conndrop_tls.sh
- if HAVE_VALGRIND
- TESTS += imtcp-tls-basic-vg.sh \
--	 imtcp_conndrop_tls-vg.sh 
--	 manytcp-too-few-tls-vg.sh 
-+	 imtcp_conndrop_tls-vg.sh \
-+	 manytcp-too-few-tls.sh
- endif
- endif
-
meta-oe/recipes-extended/rsyslog/rsyslog/fix_build_with_musl.patch deleted +0 -62

62 lines not on this page · raw message

meta-oe/recipes-extended/rsyslog/rsyslog/json-0.12-fix.patch deleted +0 -47

47 lines not on this page · raw message

meta-oe/recipes-extended/rsyslog/rsyslog/replace_deprecated_GnuTLS_functions.patch deleted +0 -73

73 lines not on this page · raw message

meta-oe/recipes-extended/rsyslog/rsyslog/use_gnutls_certificate_type_set_priority_only_if_available.patch deleted +0 -79

79 lines not on this page · raw message

meta-oe/recipes-extended/rsyslog/rsyslog_7.6.7.bb deleted +0 -180

180 lines not on this page · raw message

meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb new file +172 -0

172 lines not on this page · raw message

Signature · 1 line
1.9.1