* [meta-oe][PATCH 1/3] crash: Upgrade to 7.2.5
@ 2019-03-12 8:34 mingli.yu
2019-03-12 8:34 ` [meta-oe][PATCH 2/3] librelp: Upgrade to 1.4.0 mingli.yu
2019-03-12 8:34 ` [meta-oe][PATCH 3/3] krb5: Upgrade to 1.17 mingli.yu
0 siblings, 2 replies; 7+ messages in thread
From: mingli.yu @ 2019-03-12 8:34 UTC (permalink / raw)
To: openembedded-devel, raj.khem
From: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
.../recipes-kernel/crash/{crash_7.2.4.bb => crash_7.2.5.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-kernel/crash/{crash_7.2.4.bb => crash_7.2.5.bb} (97%)
diff --git a/meta-oe/recipes-kernel/crash/crash_7.2.4.bb b/meta-oe/recipes-kernel/crash/crash_7.2.5.bb
similarity index 97%
rename from meta-oe/recipes-kernel/crash/crash_7.2.4.bb
rename to meta-oe/recipes-kernel/crash/crash_7.2.5.bb
index c72b1a321..0b2335682 100644
--- a/meta-oe/recipes-kernel/crash/crash_7.2.4.bb
+++ b/meta-oe/recipes-kernel/crash/crash_7.2.5.bb
@@ -25,8 +25,8 @@ SRC_URI = "https://github.com/crash-utility/${BPN}/archive/${PV}.tar.gz;download
file://0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch \
file://0003-crash-detect-the-sysroot-s-glibc-header-file.patch \
"
-SRC_URI[md5sum] = "4f66eb0e9a82ff83de06ac2b37501f5c"
-SRC_URI[sha256sum] = "85ca2e93f1ee628ef2499ab9c78623f8b04500bdf7378c09de19283f6a7a698f"
+SRC_URI[md5sum] = "3f6e18d38821bb326700f1d6d43bcaec"
+SRC_URI[sha256sum] = "114a83ca27c91e4321f6399d637a9d2270f72b9327e56d687c5fb139e903069b"
SRC_URI[gdb.md5sum] = "a9836707337e5f7bf76a009a8904f470"
SRC_URI[gdb.sha256sum] = "8070389a5dcc104eb0be483d582729f98ed4d761ad19cedd3f17b5d2502faa36"
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [meta-oe][PATCH 2/3] librelp: Upgrade to 1.4.0
2019-03-12 8:34 [meta-oe][PATCH 1/3] crash: Upgrade to 7.2.5 mingli.yu
@ 2019-03-12 8:34 ` mingli.yu
2019-03-12 9:10 ` Mittal, Anuj
2019-03-12 8:34 ` [meta-oe][PATCH 3/3] krb5: Upgrade to 1.17 mingli.yu
1 sibling, 1 reply; 7+ messages in thread
From: mingli.yu @ 2019-03-12 8:34 UTC (permalink / raw)
To: openembedded-devel, raj.khem
From: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
.../rsyslog/{librelp_1.2.18.bb => librelp_1.4.0.bb} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename meta-oe/recipes-extended/rsyslog/{librelp_1.2.18.bb => librelp_1.4.0.bb} (100%)
diff --git a/meta-oe/recipes-extended/rsyslog/librelp_1.2.18.bb b/meta-oe/recipes-extended/rsyslog/librelp_1.4.0.bb
similarity index 100%
rename from meta-oe/recipes-extended/rsyslog/librelp_1.2.18.bb
rename to meta-oe/recipes-extended/rsyslog/librelp_1.4.0.bb
--
2.17.1
^ permalink raw reply [flat|nested] 7+ messages in thread
* [meta-oe][PATCH 3/3] krb5: Upgrade to 1.17
2019-03-12 8:34 [meta-oe][PATCH 1/3] crash: Upgrade to 7.2.5 mingli.yu
2019-03-12 8:34 ` [meta-oe][PATCH 2/3] librelp: Upgrade to 1.4.0 mingli.yu
@ 2019-03-12 8:34 ` mingli.yu
1 sibling, 0 replies; 7+ messages in thread
From: mingli.yu @ 2019-03-12 8:34 UTC (permalink / raw)
To: openembedded-devel, raj.khem
From: Mingli Yu <mingli.yu@windriver.com>
License-Update: Copyright year updated to 2019.
Remove one backported patch.
Fix below do_package issue:
ERROR: krb5-1.17-r0 do_package: QA Issue: krb5: Files/directories were installed but not shipped in any package:
/usr/lib/krb5/plugins/preauth/spake.so
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
...ord-attributes-for-S4U2Self-requests.patch | 80 -------------------
.../krb5/{krb5_1.16.2.bb => krb5_1.17.bb} | 9 ++-
2 files changed, 5 insertions(+), 84 deletions(-)
delete mode 100644 meta-oe/recipes-connectivity/krb5/krb5/0001-Ignore-password-attributes-for-S4U2Self-requests.patch
rename meta-oe/recipes-connectivity/krb5/{krb5_1.16.2.bb => krb5_1.17.bb} (95%)
diff --git a/meta-oe/recipes-connectivity/krb5/krb5/0001-Ignore-password-attributes-for-S4U2Self-requests.patch b/meta-oe/recipes-connectivity/krb5/krb5/0001-Ignore-password-attributes-for-S4U2Self-requests.patch
deleted file mode 100644
index 8d1e14358..000000000
--- a/meta-oe/recipes-connectivity/krb5/krb5/0001-Ignore-password-attributes-for-S4U2Self-requests.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 6fad7d45701234c8e81300d50dd5b8037d846d11 Mon Sep 17 00:00:00 2001
-From: Isaac Boukris <iboukris@gmail.com>
-Date: Wed, 27 Feb 2019 23:59:59 -0800
-Subject: [PATCH] Ignore password attributes for S4U2Self requests
-
-For consistency with Windows KDCs, allow protocol transition to work
-even if the password has expired or needs changing.
-
-Also, when looking up an enterprise principal with an AS request,
-treat ERR_KEY_EXP as confirmation that the client is present in the
-realm.
-
-[ghudson@mit.edu: added comment in kdc_process_s4u2self_req(); edited
-commit message]
-
-ticket: 8763 (new)
-tags: pullup
-target_version: 1.17
-
-Upsteam-Status: Backport [https://github.com/krb5/krb5/commit/5e6d1796106df8ba6bc1973ee0917c170d929086]
-CVE: CVE-2018-20217
-
-Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com>
----
- src/kdc/kdc_util.c | 5 +++++
- src/lib/krb5/krb/s4u_creds.c | 2 +-
- src/tests/gssapi/t_s4u.py | 8 ++++++++
- 3 files changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c
-index 754570c..034c979 100644
---- a/src/kdc/kdc_util.c
-+++ b/src/kdc/kdc_util.c
-@@ -1574,6 +1574,11 @@ kdc_process_s4u2self_req(kdc_realm_t *kdc_active_realm,
-
- memset(&no_server, 0, sizeof(no_server));
-
-+ /* Ignore password expiration and needchange attributes (as Windows
-+ * does), since S4U2Self is not password authentication. */
-+ princ->pw_expiration = 0;
-+ clear(princ->attributes, KRB5_KDB_REQUIRES_PWCHANGE);
-+
- code = validate_as_request(kdc_active_realm, request, *princ,
- no_server, kdc_time, status, &e_data);
- if (code) {
-diff --git a/src/lib/krb5/krb/s4u_creds.c b/src/lib/krb5/krb/s4u_creds.c
-index 91c02aa..2037984 100644
---- a/src/lib/krb5/krb/s4u_creds.c
-+++ b/src/lib/krb5/krb/s4u_creds.c
-@@ -117,7 +117,7 @@ s4u_identify_user(krb5_context context,
- code = k5_get_init_creds(context, &creds, client, NULL, NULL, 0, NULL,
- opts, krb5_get_as_key_noop, &userid, &use_master,
- NULL);
-- if (code == 0 || code == KRB5_PREAUTH_FAILED) {
-+ if (!code || code == KRB5_PREAUTH_FAILED || code == KRB5KDC_ERR_KEY_EXP) {
- *canon_user = userid.user;
- userid.user = NULL;
- code = 0;
-diff --git a/src/tests/gssapi/t_s4u.py b/src/tests/gssapi/t_s4u.py
-index 3da6544..ba0469e 100755
---- a/src/tests/gssapi/t_s4u.py
-+++ b/src/tests/gssapi/t_s4u.py
-@@ -20,6 +20,14 @@ pservice2 = 'p:' + service2
- # Get forwardable creds for service1 in the default cache.
- realm.kinit(service1, None, ['-f', '-k'])
-
-+# Try S4U2Self for user with a restricted password.
-+realm.run([kadminl, 'modprinc', '+needchange', realm.user_princ])
-+realm.run(['./t_s4u', 'e:user', '-'])
-+realm.run([kadminl, 'modprinc', '-needchange',
-+ '-pwexpire', '1/1/2000', realm.user_princ])
-+realm.run(['./t_s4u', 'e:user', '-'])
-+realm.run([kadminl, 'modprinc', '-pwexpire', 'never', realm.user_princ])
-+
- # Try krb5 -> S4U2Proxy with forwardable user creds. This should fail
- # at the S4U2Proxy step since the DB2 back end currently has no
- # support for allowing it.
---
-2.17.1
-
diff --git a/meta-oe/recipes-connectivity/krb5/krb5_1.16.2.bb b/meta-oe/recipes-connectivity/krb5/krb5_1.17.bb
similarity index 95%
rename from meta-oe/recipes-connectivity/krb5/krb5_1.16.2.bb
rename to meta-oe/recipes-connectivity/krb5/krb5_1.17.bb
index 1d3ef8a34..e29c52783 100644
--- a/meta-oe/recipes-connectivity/krb5/krb5_1.16.2.bb
+++ b/meta-oe/recipes-connectivity/krb5/krb5_1.17.bb
@@ -14,7 +14,7 @@ DESCRIPTION = "Kerberos is a system for authenticating users and services on a n
HOMEPAGE = "http://web.mit.edu/Kerberos/"
SECTION = "console/network"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${S}/../NOTICE;md5=7f95bc3d8d0351aa481d56d5e9de20c3"
+LIC_FILES_CHKSUM = "file://${S}/../NOTICE;md5=aff541e7261f1926ac6a2a9a7bbab839"
DEPENDS = "bison-native ncurses util-linux e2fsprogs e2fsprogs-native openssl"
inherit autotools-brokensep binconfig perlnative systemd update-rc.d
@@ -30,10 +30,9 @@ SRC_URI = "http://web.mit.edu/kerberos/dist/${BPN}/${SHRT_VER}/${BP}.tar.gz \
file://etc/default/krb5-admin-server \
file://krb5-kdc.service \
file://krb5-admin-server.service \
- file://0001-Ignore-password-attributes-for-S4U2Self-requests.patch;striplevel=2 \
"
-SRC_URI[md5sum] = "ffd52595e969fb700d37313606e4dc3d"
-SRC_URI[sha256sum] = "9f721e1fe593c219174740c71de514c7228a97d23eb7be7597b2ae14e487f027"
+SRC_URI[md5sum] = "3b729d89eb441150e146780c4138481b"
+SRC_URI[sha256sum] = "5a6e2284a53de5702d3dc2be3b9339c963f9b5397d3fbbc53beb249380a781f5"
CVE_PRODUCT = "kerberos"
@@ -105,6 +104,7 @@ PACKAGES =+ "${PN}-admin-server \
${PN}-kpropd \
${PN}-otp \
${PN}-pkinit \
+ ${PN}-spake \
${PN}-user \
libgssapi-krb5 \
libgssrpc \
@@ -151,6 +151,7 @@ FILES_${PN}-kdc-ldap = "${libdir}/krb5/libkdb_ldap${SOLIBS} \
FILES_${PN}-kpropd = "${sbindir}/kpropd"
FILES_${PN}-otp = "${libdir}/krb5/plugins/preauth/otp.so"
FILES_${PN}-pkinit = "${libdir}/krb5/plugins/preauth/pkinit.so"
+FILES_${PN}-spake = "${libdir}/krb5/plugins/preauth/spake.so"
FILES_${PN}-user = "${bindir}/k*"
FILES_libgssapi-krb5 = "${libdir}/libgssapi_krb5${SOLIBS}"
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [meta-oe][PATCH 2/3] librelp: Upgrade to 1.4.0
2019-03-12 8:34 ` [meta-oe][PATCH 2/3] librelp: Upgrade to 1.4.0 mingli.yu
@ 2019-03-12 9:10 ` Mittal, Anuj
2019-03-12 9:33 ` Yu, Mingli
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Mittal, Anuj @ 2019-03-12 9:10 UTC (permalink / raw)
To: mingli.yu, openembedded-devel, raj.khem
> .../rsyslog/{librelp_1.2.18.bb => librelp_1.4.0.bb} | 0
> 1 file changed, 0 insertions(+), 0 deletions(-) rename meta-oe/recipes-
> extended/rsyslog/{librelp_1.2.18.bb => librelp_1.4.0.bb} (100%)
>
> diff --git a/meta-oe/recipes-extended/rsyslog/librelp_1.2.18.bb b/meta-oe/recipes-
> extended/rsyslog/librelp_1.4.0.bb
> similarity index 100%
> rename from meta-oe/recipes-extended/rsyslog/librelp_1.2.18.bb
> rename to meta-oe/recipes-extended/rsyslog/librelp_1.4.0.bb
You forgot to bump SRCREV to point to this revision.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [meta-oe][PATCH 2/3] librelp: Upgrade to 1.4.0
2019-03-12 9:10 ` Mittal, Anuj
@ 2019-03-12 9:33 ` Yu, Mingli
2019-03-12 9:39 ` [meta-oe][PATCH 2/3 v2] " mingli.yu
2019-03-12 9:46 ` [meta-oe][PATCH 2/3 v3] " mingli.yu
2 siblings, 0 replies; 7+ messages in thread
From: Yu, Mingli @ 2019-03-12 9:33 UTC (permalink / raw)
To: Mittal, Anuj, openembedded-devel, raj.khem
On 2019年03月12日 17:10, Mittal, Anuj wrote:
>> .../rsyslog/{librelp_1.2.18.bb => librelp_1.4.0.bb} | 0
>> 1 file changed, 0 insertions(+), 0 deletions(-) rename meta-oe/recipes-
>> extended/rsyslog/{librelp_1.2.18.bb => librelp_1.4.0.bb} (100%)
>>
>> diff --git a/meta-oe/recipes-extended/rsyslog/librelp_1.2.18.bb b/meta-oe/recipes-
>> extended/rsyslog/librelp_1.4.0.bb
>> similarity index 100%
>> rename from meta-oe/recipes-extended/rsyslog/librelp_1.2.18.bb
>> rename to meta-oe/recipes-extended/rsyslog/librelp_1.4.0.bb
>
> You forgot to bump SRCREV to point to this revision.
Sorry, the change exists locally in my env, will send V2 to fix it.
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [meta-oe][PATCH 2/3 v2] librelp: Upgrade to 1.4.0
2019-03-12 9:10 ` Mittal, Anuj
2019-03-12 9:33 ` Yu, Mingli
@ 2019-03-12 9:39 ` mingli.yu
2019-03-12 9:46 ` [meta-oe][PATCH 2/3 v3] " mingli.yu
2 siblings, 0 replies; 7+ messages in thread
From: mingli.yu @ 2019-03-12 9:39 UTC (permalink / raw)
To: openembedded-devel, raj.khem, anuj.mittal
From: Mingli Yu <mingli.yu@windriver.com>
Remove one backported patch.
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
.../librelp/0001-testbench-improvements.patch | 164 ------------------
.../{librelp_1.2.18.bb => librelp_1.4.0.bb} | 3 +-
2 files changed, 1 insertion(+), 166 deletions(-)
delete mode 100644 meta-oe/recipes-extended/rsyslog/librelp/0001-testbench-improvements.patch
rename meta-oe/recipes-extended/rsyslog/{librelp_1.2.18.bb => librelp_1.4.0.bb} (76%)
diff --git a/meta-oe/recipes-extended/rsyslog/librelp/0001-testbench-improvements.patch b/meta-oe/recipes-extended/rsyslog/librelp/0001-testbench-improvements.patch
deleted file mode 100644
index 6b60bd748..000000000
--- a/meta-oe/recipes-extended/rsyslog/librelp/0001-testbench-improvements.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From 1e6be18ed243dc562ff2976b46850bfd2e576664 Mon Sep 17 00:00:00 2001
-From: Rainer Gerhards <rgerhards@adiscon.com>
-Date: Thu, 15 Nov 2018 12:23:41 +0100
-Subject: [PATCH] testbench improvements
-
-Most importantly, the test receiver process is now terminated
-gracefully. Without that, gcov can never pick up correct
-coverage data.
-
-Upstream-Status: Backport[https://github.com/rsyslog/librelp/commit/1e6be18ed243dc562ff2976b46850bfd2e576664]
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- src/tcp.c | 4 ++--
- tests/Makefile.am | 3 ++-
- tests/receive.c | 29 +++++++++++++++++++++++++++--
- tests/selftest_receive_usage.sh | 5 +++++
- tests/test-framework.sh | 4 ++--
- 5 files changed, 38 insertions(+), 7 deletions(-)
- create mode 100755 tests/selftest_receive_usage.sh
-
-diff --git a/src/tcp.c b/src/tcp.c
-index f10a720..0ea92ea 100644
---- a/src/tcp.c
-+++ b/src/tcp.c
-@@ -3027,7 +3027,7 @@ relpTcpConnect(relpTcp_t *const pThis,
- struct addrinfo hints;
- struct addrinfo *reslocal = NULL;
- struct pollfd pfd;
-- char errmsg[1024];
-+ char errmsg[1424];
- int so_error;
- socklen_t len = sizeof so_error;
- int r;
-@@ -3067,7 +3067,7 @@ relpTcpConnect(relpTcp_t *const pThis,
- }
- if(connect(pThis->sock, res->ai_addr, res->ai_addrlen) == -1) {
- if(errno != EINPROGRESS) {
-- char errStr[1024];
-+ char errStr[1200];
- _relpEngine_strerror_r(errno, errStr, sizeof(errStr));
- snprintf(errmsg, sizeof(errmsg), "error connecting: '%s'", errStr);
- callOnErr(pThis, errmsg, RELP_RET_IO_ERR);
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 64deb19..51fd78f 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -25,7 +25,8 @@ TESTS= basic.sh \
- long-msg.sh \
- oversize-msg-abort-errmsg.sh \
- oversize-msg-accept-errmsg.sh \
-- truncate-oversize-msg.sh
-+ truncate-oversize-msg.sh \
-+ selftest_receive_usage.sh
- # OpenSSL tests only!
- if ENABLE_TLS_OPENSSL
- TESTS += tls-wrong-permittedPeer.sh \
-diff --git a/tests/receive.c b/tests/receive.c
-index e56e59c..4b69c99 100644
---- a/tests/receive.c
-+++ b/tests/receive.c
-@@ -1,6 +1,7 @@
- /* A minimal RELP receiver using librelp
- *
- * Copyright 2014 Mathias Nyman
-+ * Copyright 2018 Adiscon GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -24,6 +25,7 @@
- #include <string.h>
- #include <limits.h>
- #include <errno.h>
-+#include <signal.h>
- #include "librelp.h"
-
- #define TRY(f) if(f != RELP_RET_OK) { fprintf(stderr, "receive.c: FAILURE in '%s'\n", #f); ret = 1; goto done; }
-@@ -31,6 +33,24 @@
- static FILE *errFile = NULL;
- static relpEngine_t *pRelpEngine;
-
-+static void
-+hdlr_enable(int sig, void (*hdlr)())
-+{
-+ struct sigaction sigAct;
-+ memset(&sigAct, 0, sizeof (sigAct));
-+ sigemptyset(&sigAct.sa_mask);
-+ sigAct.sa_handler = hdlr;
-+ sigaction(sig, &sigAct, NULL);
-+}
-+
-+void
-+terminate(int sig)
-+{
-+ fprintf(stderr, "terminating on signal %d\n", sig);
-+ relpEngineSetStop(pRelpEngine);
-+}
-+
-+
- static void __attribute__((format(printf, 1, 2)))
- dbgprintf(char *fmt, ...)
- {
-@@ -237,6 +257,8 @@ int main(int argc, char *argv[]) {
- }
- }
-
-+ hdlr_enable(SIGTERM, terminate);
-+
- TRY(relpEngineConstruct(&pRelpEngine));
- TRY(relpEngineSetDbgprint(pRelpEngine, verbose ? dbgprintf : NULL));
- TRY(relpEngineSetEnableCmd(pRelpEngine, (unsigned char*) "syslog", eRelpCmdState_Required));
-@@ -294,11 +316,14 @@ int main(int argc, char *argv[]) {
- fclose(fp);
- }
-
-- TRY(relpEngineRun(pRelpEngine)); /* Abort with ctrl-c */
-+ TRY(relpEngineRun(pRelpEngine)); /* Abort via SIGHUP */
-
-- TRY(relpEngineSetStop(pRelpEngine));
- TRY(relpEngineDestruct(&pRelpEngine));
-
-+ if(pidFileName != NULL) {
-+ unlink(pidFileName);
-+ }
-+
- done:
- return ret;
- }
-diff --git a/tests/selftest_receive_usage.sh b/tests/selftest_receive_usage.sh
-new file mode 100755
-index 0000000..c4ac8bb
---- /dev/null
-+++ b/tests/selftest_receive_usage.sh
-@@ -0,0 +1,5 @@
-+#!/bin/bash
-+. ${srcdir:=$(pwd)}/test-framework.sh
-+./receive &>librelp.out.log
-+check_output "Port is missing"
-+terminate
-diff --git a/tests/test-framework.sh b/tests/test-framework.sh
-index 6abdcf2..d4ab3ec 100644
---- a/tests/test-framework.sh
-+++ b/tests/test-framework.sh
-@@ -32,7 +32,7 @@ function wait_process_startup_via_pidfile() {
- # start receiver WITH valgrind, add receiver command line parameters after function name
- function startup_receiver_valgrind() {
- printf 'Starting Receiver...\n'
-- $valgrind ./receive -p $TESTPORT -F receive.pid $OPT_VERBOSE $* 1>>librelp.out.log &
-+ $valgrind ./receive -p $TESTPORT -F receive.pid $OPT_VERBOSE $* 1>librelp.out.log &
- export RECEIVE_PID=$!
- printf "got receive pid $RECEIVE_PID\n"
- wait_process_startup_via_pidfile receive.pid
-@@ -43,7 +43,7 @@ function startup_receiver_valgrind() {
- # start receiver, add receiver command line parameters after function name
- function startup_receiver() {
- printf 'Starting Receiver...\n'
-- ./receive -p $TESTPORT -F receive.pid $OPT_VERBOSE $* 1>>librelp.out.log &
-+ ./receive -p $TESTPORT -F receive.pid $OPT_VERBOSE $* 1>librelp.out.log &
- export RECEIVE_PID=$!
- printf "got receive pid $RECEIVE_PID\n"
- wait_process_startup_via_pidfile receive.pid
---
-2.17.1
-
diff --git a/meta-oe/recipes-extended/rsyslog/librelp_1.2.18.bb b/meta-oe/recipes-extended/rsyslog/librelp_1.4.0.bb
similarity index 76%
rename from meta-oe/recipes-extended/rsyslog/librelp_1.2.18.bb
rename to meta-oe/recipes-extended/rsyslog/librelp_1.4.0.bb
index e4838fa5b..5b5b3b6a3 100644
--- a/meta-oe/recipes-extended/rsyslog/librelp_1.2.18.bb
+++ b/meta-oe/recipes-extended/rsyslog/librelp_1.4.0.bb
@@ -7,10 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1fb9c10ed9fd6826757615455ca893a9"
DEPENDS = "gmp nettle libidn zlib gnutls"
SRC_URI = "git://github.com/rsyslog/librelp.git;protocol=https \
- file://0001-testbench-improvements.patch \
"
-SRCREV = "4b6a81061bccf68cba6fddd27f99fb5dc0d0c3a3"
+SRCREV = "e96443dda3c080fa991decec26bc4ac98d24b9a2"
S = "${WORKDIR}/git"
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [meta-oe][PATCH 2/3 v3] librelp: Upgrade to 1.4.0
2019-03-12 9:10 ` Mittal, Anuj
2019-03-12 9:33 ` Yu, Mingli
2019-03-12 9:39 ` [meta-oe][PATCH 2/3 v2] " mingli.yu
@ 2019-03-12 9:46 ` mingli.yu
2 siblings, 0 replies; 7+ messages in thread
From: mingli.yu @ 2019-03-12 9:46 UTC (permalink / raw)
To: openembedded-devel, raj.khem, anuj.mittal
From: Mingli Yu <mingli.yu@windriver.com>
Remove one backported patch.
Add openssl to Depends.
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
.../librelp/0001-testbench-improvements.patch | 164 ------------------
.../{librelp_1.2.18.bb => librelp_1.4.0.bb} | 5 +-
2 files changed, 2 insertions(+), 167 deletions(-)
delete mode 100644 meta-oe/recipes-extended/rsyslog/librelp/0001-testbench-improvements.patch
rename meta-oe/recipes-extended/rsyslog/{librelp_1.2.18.bb => librelp_1.4.0.bb} (66%)
diff --git a/meta-oe/recipes-extended/rsyslog/librelp/0001-testbench-improvements.patch b/meta-oe/recipes-extended/rsyslog/librelp/0001-testbench-improvements.patch
deleted file mode 100644
index 6b60bd748..000000000
--- a/meta-oe/recipes-extended/rsyslog/librelp/0001-testbench-improvements.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From 1e6be18ed243dc562ff2976b46850bfd2e576664 Mon Sep 17 00:00:00 2001
-From: Rainer Gerhards <rgerhards@adiscon.com>
-Date: Thu, 15 Nov 2018 12:23:41 +0100
-Subject: [PATCH] testbench improvements
-
-Most importantly, the test receiver process is now terminated
-gracefully. Without that, gcov can never pick up correct
-coverage data.
-
-Upstream-Status: Backport[https://github.com/rsyslog/librelp/commit/1e6be18ed243dc562ff2976b46850bfd2e576664]
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- src/tcp.c | 4 ++--
- tests/Makefile.am | 3 ++-
- tests/receive.c | 29 +++++++++++++++++++++++++++--
- tests/selftest_receive_usage.sh | 5 +++++
- tests/test-framework.sh | 4 ++--
- 5 files changed, 38 insertions(+), 7 deletions(-)
- create mode 100755 tests/selftest_receive_usage.sh
-
-diff --git a/src/tcp.c b/src/tcp.c
-index f10a720..0ea92ea 100644
---- a/src/tcp.c
-+++ b/src/tcp.c
-@@ -3027,7 +3027,7 @@ relpTcpConnect(relpTcp_t *const pThis,
- struct addrinfo hints;
- struct addrinfo *reslocal = NULL;
- struct pollfd pfd;
-- char errmsg[1024];
-+ char errmsg[1424];
- int so_error;
- socklen_t len = sizeof so_error;
- int r;
-@@ -3067,7 +3067,7 @@ relpTcpConnect(relpTcp_t *const pThis,
- }
- if(connect(pThis->sock, res->ai_addr, res->ai_addrlen) == -1) {
- if(errno != EINPROGRESS) {
-- char errStr[1024];
-+ char errStr[1200];
- _relpEngine_strerror_r(errno, errStr, sizeof(errStr));
- snprintf(errmsg, sizeof(errmsg), "error connecting: '%s'", errStr);
- callOnErr(pThis, errmsg, RELP_RET_IO_ERR);
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 64deb19..51fd78f 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -25,7 +25,8 @@ TESTS= basic.sh \
- long-msg.sh \
- oversize-msg-abort-errmsg.sh \
- oversize-msg-accept-errmsg.sh \
-- truncate-oversize-msg.sh
-+ truncate-oversize-msg.sh \
-+ selftest_receive_usage.sh
- # OpenSSL tests only!
- if ENABLE_TLS_OPENSSL
- TESTS += tls-wrong-permittedPeer.sh \
-diff --git a/tests/receive.c b/tests/receive.c
-index e56e59c..4b69c99 100644
---- a/tests/receive.c
-+++ b/tests/receive.c
-@@ -1,6 +1,7 @@
- /* A minimal RELP receiver using librelp
- *
- * Copyright 2014 Mathias Nyman
-+ * Copyright 2018 Adiscon GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -24,6 +25,7 @@
- #include <string.h>
- #include <limits.h>
- #include <errno.h>
-+#include <signal.h>
- #include "librelp.h"
-
- #define TRY(f) if(f != RELP_RET_OK) { fprintf(stderr, "receive.c: FAILURE in '%s'\n", #f); ret = 1; goto done; }
-@@ -31,6 +33,24 @@
- static FILE *errFile = NULL;
- static relpEngine_t *pRelpEngine;
-
-+static void
-+hdlr_enable(int sig, void (*hdlr)())
-+{
-+ struct sigaction sigAct;
-+ memset(&sigAct, 0, sizeof (sigAct));
-+ sigemptyset(&sigAct.sa_mask);
-+ sigAct.sa_handler = hdlr;
-+ sigaction(sig, &sigAct, NULL);
-+}
-+
-+void
-+terminate(int sig)
-+{
-+ fprintf(stderr, "terminating on signal %d\n", sig);
-+ relpEngineSetStop(pRelpEngine);
-+}
-+
-+
- static void __attribute__((format(printf, 1, 2)))
- dbgprintf(char *fmt, ...)
- {
-@@ -237,6 +257,8 @@ int main(int argc, char *argv[]) {
- }
- }
-
-+ hdlr_enable(SIGTERM, terminate);
-+
- TRY(relpEngineConstruct(&pRelpEngine));
- TRY(relpEngineSetDbgprint(pRelpEngine, verbose ? dbgprintf : NULL));
- TRY(relpEngineSetEnableCmd(pRelpEngine, (unsigned char*) "syslog", eRelpCmdState_Required));
-@@ -294,11 +316,14 @@ int main(int argc, char *argv[]) {
- fclose(fp);
- }
-
-- TRY(relpEngineRun(pRelpEngine)); /* Abort with ctrl-c */
-+ TRY(relpEngineRun(pRelpEngine)); /* Abort via SIGHUP */
-
-- TRY(relpEngineSetStop(pRelpEngine));
- TRY(relpEngineDestruct(&pRelpEngine));
-
-+ if(pidFileName != NULL) {
-+ unlink(pidFileName);
-+ }
-+
- done:
- return ret;
- }
-diff --git a/tests/selftest_receive_usage.sh b/tests/selftest_receive_usage.sh
-new file mode 100755
-index 0000000..c4ac8bb
---- /dev/null
-+++ b/tests/selftest_receive_usage.sh
-@@ -0,0 +1,5 @@
-+#!/bin/bash
-+. ${srcdir:=$(pwd)}/test-framework.sh
-+./receive &>librelp.out.log
-+check_output "Port is missing"
-+terminate
-diff --git a/tests/test-framework.sh b/tests/test-framework.sh
-index 6abdcf2..d4ab3ec 100644
---- a/tests/test-framework.sh
-+++ b/tests/test-framework.sh
-@@ -32,7 +32,7 @@ function wait_process_startup_via_pidfile() {
- # start receiver WITH valgrind, add receiver command line parameters after function name
- function startup_receiver_valgrind() {
- printf 'Starting Receiver...\n'
-- $valgrind ./receive -p $TESTPORT -F receive.pid $OPT_VERBOSE $* 1>>librelp.out.log &
-+ $valgrind ./receive -p $TESTPORT -F receive.pid $OPT_VERBOSE $* 1>librelp.out.log &
- export RECEIVE_PID=$!
- printf "got receive pid $RECEIVE_PID\n"
- wait_process_startup_via_pidfile receive.pid
-@@ -43,7 +43,7 @@ function startup_receiver_valgrind() {
- # start receiver, add receiver command line parameters after function name
- function startup_receiver() {
- printf 'Starting Receiver...\n'
-- ./receive -p $TESTPORT -F receive.pid $OPT_VERBOSE $* 1>>librelp.out.log &
-+ ./receive -p $TESTPORT -F receive.pid $OPT_VERBOSE $* 1>librelp.out.log &
- export RECEIVE_PID=$!
- printf "got receive pid $RECEIVE_PID\n"
- wait_process_startup_via_pidfile receive.pid
---
-2.17.1
-
diff --git a/meta-oe/recipes-extended/rsyslog/librelp_1.2.18.bb b/meta-oe/recipes-extended/rsyslog/librelp_1.4.0.bb
similarity index 66%
rename from meta-oe/recipes-extended/rsyslog/librelp_1.2.18.bb
rename to meta-oe/recipes-extended/rsyslog/librelp_1.4.0.bb
index e4838fa5b..9e57dd520 100644
--- a/meta-oe/recipes-extended/rsyslog/librelp_1.2.18.bb
+++ b/meta-oe/recipes-extended/rsyslog/librelp_1.4.0.bb
@@ -4,13 +4,12 @@ HOMEPAGE = "https://github.com/rsyslog/librelp"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=1fb9c10ed9fd6826757615455ca893a9"
-DEPENDS = "gmp nettle libidn zlib gnutls"
+DEPENDS = "gmp nettle libidn zlib gnutls openssl"
SRC_URI = "git://github.com/rsyslog/librelp.git;protocol=https \
- file://0001-testbench-improvements.patch \
"
-SRCREV = "4b6a81061bccf68cba6fddd27f99fb5dc0d0c3a3"
+SRCREV = "e96443dda3c080fa991decec26bc4ac98d24b9a2"
S = "${WORKDIR}/git"
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-03-12 9:47 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-12 8:34 [meta-oe][PATCH 1/3] crash: Upgrade to 7.2.5 mingli.yu
2019-03-12 8:34 ` [meta-oe][PATCH 2/3] librelp: Upgrade to 1.4.0 mingli.yu
2019-03-12 9:10 ` Mittal, Anuj
2019-03-12 9:33 ` Yu, Mingli
2019-03-12 9:39 ` [meta-oe][PATCH 2/3 v2] " mingli.yu
2019-03-12 9:46 ` [meta-oe][PATCH 2/3 v3] " mingli.yu
2019-03-12 8:34 ` [meta-oe][PATCH 3/3] krb5: Upgrade to 1.17 mingli.yu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.