Skip to contentSkip to conversation

package/micropython: Bug fix release 1.19.1

PATCH In review Chris Packham 2 participants 6 messages Oct 2, 2022 – Oct 14, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/micropython: Bug fix release 1.19.1

This is a bug fix release. The changes are:

- extmod/machine_i2c: only use WRITE1 option if transfer supports it

This fixes the machine.SoftI2C.readfrom_mem() method on esp32, so it writes the address to read from.

---
 package/micropython/micropython.hash | 2 +-
 package/micropython/micropython.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/micropython/micropython.hash +1 -1
index 09bc574ebc..7bff7de4e2 100644
@@ -1,3 +1,3 @@
 #locally computed
-sha256  128b6fb13b518b4d3e75b4f0c04f175dc336c762d8c6360f647e91dc4d25e5d0  micropython-1.19.tar.gz
+sha256  c980ad7e742491df0dc10db2958137dbbf9aa7a8009e102fc75f4c0cac2d6b5e  micropython-1.19.1.tar.gz
 sha256  0f678c2abd7fe2cfca36693630506bbcbdfc219bd04bf4a02fe3b094ae4c666f  LICENSE
package/micropython/micropython.mk +1 -1
index f7af9bfc32..51b45e5e99 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MICROPYTHON_VERSION = 1.19
+MICROPYTHON_VERSION = 1.19.1
 MICROPYTHON_SITE = $(call github,micropython,micropython,v$(MICROPYTHON_VERSION))
 # Micropython has a lot of code copied from other projects, and also a number
 # of submodules for various libs. However, we don't even clone the submodules,
Signature · 6 lines
2.37.3

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

PATCH 2/2 package/syslog-ng: Bump version to 3.38.1

Add new version. Remove patch that has been applied upstream. Update hash for COPYING as it's text has changed to clarify some details but the license remains LGP-2.0+L/GPL-2.0+.

---
 ...-lib-tlscontext.c-fix-libressl-build.patch | 85 -------------------
 package/syslog-ng/syslog-ng.hash              |  4 +-
 package/syslog-ng/syslog-ng.mk                |  2 +-
 3 files changed, 3 insertions(+), 88 deletions(-)
 delete mode 100644 package/syslog-ng/0002-lib-tlscontext.c-fix-libressl-build.patch
package/syslog-ng/0002-lib-tlscontext.c-fix-libressl-build.patch deleted +0 -85
deleted file mode 100644
index 2c438627a4..0000000000
@@ -1,85 +0,0 @@
-From 6f93484cea81ff8d45df213d5d2b4cffc4eadcad Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <[email protected]>
-Date: Sat, 16 Jul 2022 18:09:25 +0200
-Subject: [PATCH] lib/tlscontext.c: fix libressl build
-
-Fix the following build failure with libressl raised since version
-3.37.1 and
-https://github.com/syslog-ng/syslog-ng/commit/c7ba645918480da06b9e065c62ebd630312b0c7f:
-
-/nvmedata/autobuild/instance-5/output-1/host/lib/gcc/nios2-buildroot-linux-gnu/10.3.0/../../../../nios2-buildroot-linux-gnu/bin/ld: ./lib/.libs/libsyslog-ng.so: undefined reference to `SSL_CTX_set1_client_sigalgs_list'
-/nvmedata/autobuild/instance-5/output-1/host/lib/gcc/nios2-buildroot-linux-gnu/10.3.0/../../../../nios2-buildroot-linux-gnu/bin/ld: ./lib/.libs/libsyslog-ng.so: undefined reference to `SSL_CTX_set1_sigalgs_list'
-
-Fixes:
- - http://autobuild.buildroot.org/results/84cf9f6a0f6de831a685b73c42eab868952c8b15
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
-[Upstream status: https://github.com/syslog-ng/syslog-ng/pull/4081]
----
- cmake/openssl_functions.cmake | 4 +++-
- configure.ac                  | 2 ++
- lib/tlscontext.c              | 4 ++++
- syslog-ng-config.h.in         | 2 ++
- 4 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/cmake/openssl_functions.cmake b/cmake/openssl_functions.cmake
-index afd7b96bfe..319dcc2e23 100644
---- a/cmake/openssl_functions.cmake
-+++ b/cmake/openssl_functions.cmake
-@@ -42,7 +42,9 @@ function (openssl_set_defines)
-     DH_set0_pqg
-     BN_get_rfc3526_prime_2048
-     SSL_CTX_set_num_tickets
--    SSL_CTX_set_ciphersuites)
-+    SSL_CTX_set_ciphersuites
-+    SSL_CTX_set1_sigalgs_list
-+    SSL_CTX_set1_client_sigalgs_list)
- 
-   foreach (symbol ${symbol_list})
-     string(TOUPPER ${symbol} SYMBOL_UPPERCASE)
-diff --git a/configure.ac b/configure.ac
-index 8cfab2251e..ecffb84f06 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1055,6 +1055,8 @@ AC_CHECK_DECLS([ASN1_STRING_get0_data], [], [], [[#include <openssl/asn1.h>]])
- AC_CHECK_DECLS([DH_set0_pqg], [], [], [[#include <openssl/dh.h>]])
- AC_CHECK_DECLS([BN_get_rfc3526_prime_2048], [], [], [[#include <openssl/bn.h>]])
- AC_CHECK_DECLS([SSL_CTX_set_num_tickets],[], [], [[#include <openssl/ssl.h>]])
-+AC_CHECK_DECLS([SSL_CTX_set1_sigalgs_list],[], [], [[#include <openssl/ssl.h>]])
-+AC_CHECK_DECLS([SSL_CTX_set1_client_sigalgs_list],[], [], [[#include <openssl/ssl.h>]])
- 
- CPPFLAGS="$CPPFLAGS_SAVE"
- 
-diff --git a/lib/tlscontext.c b/lib/tlscontext.c
-index ddde21dcaf..dedcf1ce5a 100644
---- a/lib/tlscontext.c
-+++ b/lib/tlscontext.c
-@@ -598,11 +598,15 @@ tls_context_setup_cipher_suite(TLSContext *self)
- static gboolean
- tls_context_setup_sigalgs(TLSContext *self)
- {
-+#if SYSLOG_NG_HAVE_DECL_SSL_CTX_SET1_SIGALGS_LIST
-   if (self->sigalgs && !SSL_CTX_set1_sigalgs_list(self->ssl_ctx, self->sigalgs))
-     return FALSE;
-+#endif
- 
-+#if SYSLOG_NG_HAVE_DECL_SSL_CTX_SET1_CLIENT_SIGALGS_LIST
-   if (self->client_sigalgs && !SSL_CTX_set1_client_sigalgs_list(self->ssl_ctx, self->client_sigalgs))
-     return FALSE;
-+#endif
- 
-   return TRUE;
- }
-diff --git a/syslog-ng-config.h.in b/syslog-ng-config.h.in
-index 1817deea50..004b0a7be6 100644
---- a/syslog-ng-config.h.in
-+++ b/syslog-ng-config.h.in
-@@ -57,6 +57,8 @@
- #cmakedefine01 SYSLOG_NG_HAVE_DECL_ASN1_STRING_GET0_DATA
- #cmakedefine01 SYSLOG_NG_HAVE_DECL_SSL_CTX_GET0_PARAM
- #cmakedefine01 SYSLOG_NG_HAVE_DECL_SSL_CTX_SET_CIPHERSUITES
-+#cmakedefine01 SYSLOG_NG_HAVE_DECL_SSL_CTX_SET1_SIGALGS_LIST
-+#cmakedefine01 SYSLOG_NG_HAVE_DECL_SSL_CTX_SET1_CLIENT_SIGALGS_LIST
- #cmakedefine01 SYSLOG_NG_HAVE_DECL_X509_STORE_CTX_GET0_CERT
- #cmakedefine01 SYSLOG_NG_HAVE_DECL_X509_GET_EXTENSION_FLAGS
- #cmakedefine01 SYSLOG_NG_HAVE_DECL_DH_SET0_PQG
package/syslog-ng/syslog-ng.hash +2 -2
index 764ff45733..6fce7be996 100644
@@ -1,5 +1,5 @@
 # Locally computed
-sha256  d67a320cb896cd5d62f24d9e1bec138847fa4618ae13a3946cae2b75c528ee14  syslog-ng-3.37.1.tar.gz
-sha256  e912cf1e1c09b81d61c0154eb6c179588622c31ad07bfb4a90c612d07ff09d9b  COPYING
+sha256  5491f686d0b829b69b2e0fc0d66a62f51991aafaee005475bfa38fab399441f7  syslog-ng-3.38.1.tar.gz
+sha256  c75dcbfc17ccf742f12042a370f825a40951085d2352dfc9d07e715dae3ca9bd  COPYING
 sha256  ce3324c9f22299cfc7c281e5a6ab40fbe9c2ea1a67cee87226cb8cd39db1e1d2  GPL.txt
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  LGPL.txt
package/syslog-ng/syslog-ng.mk +1 -1
index 64b3b24498..a7176ad129 100644
@@ -6,7 +6,7 @@
 
 # When updating the version, please check at runtime if the version in
 # syslog-ng.conf header needs to be updated
-SYSLOG_NG_VERSION = 3.37.1
+SYSLOG_NG_VERSION = 3.38.1
 SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOG_NG_VERSION)
 SYSLOG_NG_LICENSE = LGPL-2.1+ (syslog-ng core), GPL-2.0+ (modules)
 SYSLOG_NG_LICENSE_FILES = COPYING GPL.txt LGPL.txt
Signature · 6 lines
2.37.3

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw

Re: [Buildroot] [PATCH 2/2] package/syslog-ng: Bump version to 3.38.1

Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Chris" == Chris Packham <[email protected]> writes:

Add new version. Remove patch that has been applied upstream. Update hash for COPYING as it's text has changed to clarify some details but the license remains LGP-2.0+L/GPL-2.0+.

---
 ...-lib-tlscontext.c-fix-libressl-build.patch | 85 -------------------
 package/syslog-ng/syslog-ng.hash              |  4 +-
 package/syslog-ng/syslog-ng.mk                |  2 +-

Don't you need to update the version in syslog-ng.conf as well?

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#3 lore raw

Re: [Buildroot] [PATCH 2/2] package/syslog-ng: Bump version to 3.38.1

Quoted 6 lines · Peter Korsgaard,
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Chris" == Chris Packham <[email protected]> writes:

Add new version. Remove patch that has been applied upstream. Update hash for COPYING as it's text has changed to clarify some details but the license remains LGP-2.0+L/GPL-2.0+.

Quoted 8 lines
Quoted 5 lines
---
 ...-lib-tlscontext.c-fix-libressl-build.patch | 85 -------------------
 package/syslog-ng/syslog-ng.hash              |  4 +-
 package/syslog-ng/syslog-ng.mk                |  2 +-

Don't you need to update the version in syslog-ng.conf as well?

Oh yes of course. I'll submit a v2 soon.

Quoted 1 line

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#4 lore raw
In reply to Chris Packham
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Chris" == Chris Packham <[email protected]> writes:

This is a bug fix release. The changes are:
- extmod/machine_i2c: only use WRITE1 option if transfer supports it

This fixes the machine.SoftI2C.readfrom_mem() method on esp32, so it writes the address to read from.

Committed, thanks.

Does this mean that it also needs to be backported to 2022.08.x? If this is an esp32-only issue then presumably not?

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#5 lore raw
Quoted 8 lines · Peter Korsgaard,
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Chris" == Chris Packham <[email protected]> writes:

This is a bug fix release. The changes are:
- extmod/machine_i2c: only use WRITE1 option if transfer supports it

This fixes the machine.SoftI2C.readfrom_mem() method on esp32, so it writes the address to read from.

Quoted 7 lines
Quoted 1 line

Committed, thanks.

Does this mean that it also needs to be backported to 2022.08.x? If this is an esp32-only issue then presumably not?

No I don't think it needs to be backported.

Quoted 5 lines

--
Bye, Peter Korsgaard

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot