[Buildroot] [PATCH 1/4] package/gensio: bump version to 3.0.4
Mattia Narducci <[email protected]>
| Newsgroups | net.busybox.buildroot |
|---|---|
| Message-ID | <[email protected]> |
Changelog: https://sourceforge.net/p/ser2net/news Static builds are no longer supported starting with version 2.6.0 [1] even when compiling all modules (gensios) in the library. Updated licenses hashes due to upstream commit: https://github.com/cminyard/gensio/commit/859e4465cf5788cb99da1002a4c38cd8841c1bb7 Removed patch 0001 which is now upstream. [1] https://github.com/cminyard/gensio/commit/7b3786f5fb733cd593e631a7b75d4b47f5a4b95f Signed-off-by: Mattia Narducci <[email protected]> --- .checkpackageignore | 1 - ...PKEY_ED25519-build-error-on-libressl.patch | 105 ------------------ package/gensio/Config.in | 1 + package/gensio/gensio.hash | 10 +- package/gensio/gensio.mk | 3 +- 5 files changed, 8 insertions(+), 112 deletions(-) delete mode 100644 package/gensio/0001-Fix-missing-EVP_PKEY_ED25519-build-error-on-libressl.patch diff --git a/.checkpackageignore b/.checkpackageignore index c3ec943075..2b61ff3bab 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -380,7 +380,6 @@ package/gdb/17.1/0007-fix-musl-build-on-riscv.patch lib_patch.Upstream package/gdb/17.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch lib_patch.Upstream package/gdb/17.1/0009-gdb-Fix-native-build-on-xtensa.patch lib_patch.Upstream package/genpart/0001-fix-return-code.patch lib_patch.Upstream -package/gensio/0001-Fix-missing-EVP_PKEY_ED25519-build-error-on-libressl.patch lib_patch.Upstream package/gerbera/S99gerbera lib_sysv.Indent package/git-crypt/0001-fix-build-with-libressl-3.5.0.patch lib_patch.Upstream package/glorytun/0001-Add-support-for-Apple-silicon.patch lib_patch.Upstream diff --git a/package/gensio/0001-Fix-missing-EVP_PKEY_ED25519-build-error-on-libressl.patch b/package/gensio/0001-Fix-missing-EVP_PKEY_ED25519-build-error-on-libressl.patch deleted file mode 100644 index e9087aa3e5..0000000000 --- a/package/gensio/0001-Fix-missing-EVP_PKEY_ED25519-build-error-on-libressl.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 1e7071684329f23ee3447310d203d193c283979e Mon Sep 17 00:00:00 2001 -From: James Hilliard <[email protected]> -Date: Wed, 5 Oct 2022 15:30:32 -0600 -Subject: [PATCH] Fix missing EVP_PKEY_ED25519 build error on libressl -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: -gensio_filter_certauth.c: In function ‘v3_certauth_add_challenge_rsp’: -gensio_filter_certauth.c:838:44: error: ‘EVP_PKEY_ED25519’ undeclared (first use in this function); did you mean ‘EVP_PKEY_DSA1’? - 838 | if (EVP_PKEY_base_id(sfilter->pkey) == EVP_PKEY_ED25519) { - | ^~~~~~~~~~~~~~~~ - | EVP_PKEY_DSA1 -gensio_filter_certauth.c:838:44: note: each undeclared identifier is reported only once for each function it appears in -gensio_filter_certauth.c: In function ‘certauth_add_challenge_rsp’: -gensio_filter_certauth.c:901:44: error: ‘EVP_PKEY_ED25519’ undeclared (first use in this function); did you mean ‘EVP_PKEY_DSA1’? - 901 | if (EVP_PKEY_base_id(sfilter->pkey) == EVP_PKEY_ED25519) - | ^~~~~~~~~~~~~~~~ - | EVP_PKEY_DSA1 -gensio_filter_certauth.c: In function ‘certauth_check_challenge’: -gensio_filter_certauth.c:1048:35: error: ‘EVP_PKEY_ED25519’ undeclared (first use in this function); did you mean ‘EVP_PKEY_DSA1’? - 1048 | if (EVP_PKEY_base_id(pkey) == EVP_PKEY_ED25519) - | ^~~~~~~~~~~~~~~~ - | EVP_PKEY_DSA1 - -Signed-off-by: Corey Minyard <[email protected]> -[Retrieved from: -https://github.com/cminyard/gensio/commit/1e7071684329f23ee3447310d203d193c283979e] -Signed-off-by: Fabrice Fontaine <[email protected]> ---- - lib/gensio_filter_certauth.c | 6 ++++++ - tools/gtlssh-keygen.c | 11 ++++++++++- - 2 files changed, 16 insertions(+), 1 deletion(-) - -diff --git a/lib/gensio_filter_certauth.c b/lib/gensio_filter_certauth.c -index 642379b6..c4552e79 100644 ---- a/lib/gensio_filter_certauth.c -+++ b/lib/gensio_filter_certauth.c -@@ -835,11 +835,13 @@ v3_certauth_add_challenge_rsp(struct certauth_filter *sfilter) - unsigned int lenpos, len; - int rv = 0; - -+#ifdef EVP_PKEY_ED25519 - if (EVP_PKEY_base_id(sfilter->pkey) == EVP_PKEY_ED25519) { - gca_log_err(sfilter, - "Remote end or SSL too old to support ed25519 key"); - return GE_KEYINVALID; - } -+#endif - - certauth_write_byte(sfilter, CERTAUTH_CHALLENGE_RSP); - lenpos = sfilter->write_buf_len; -@@ -898,8 +900,10 @@ certauth_add_challenge_rsp(struct certauth_filter *sfilter) - if (sfilter->version < 4 || sfilter->my_version < 4) - return v3_certauth_add_challenge_rsp(sfilter); - -+#ifdef EVP_PKEY_ED25519 - if (EVP_PKEY_base_id(sfilter->pkey) == EVP_PKEY_ED25519) - digest = NULL; -+#endif - - certauth_write_byte(sfilter, CERTAUTH_CHALLENGE_RSP); - lenpos = sfilter->write_buf_len; -@@ -1045,8 +1049,10 @@ certauth_check_challenge(struct certauth_filter *sfilter) - goto out_nomem; - } - -+#ifdef EVP_PKEY_ED25519 - if (EVP_PKEY_base_id(pkey) == EVP_PKEY_ED25519) - digest = NULL; -+#endif - - if (!EVP_DigestVerifyInit(sign_ctx, NULL, digest, NULL, pkey)) { - gca_logs_err(sfilter, "Digest verify init failed"); -diff --git a/tools/gtlssh-keygen.c b/tools/gtlssh-keygen.c -index c8c28937..0779dd78 100644 ---- a/tools/gtlssh-keygen.c -+++ b/tools/gtlssh-keygen.c -@@ -108,7 +108,12 @@ help(const char *progname) - P(" The default is your username for normal certificates and\n"); - P(" the fully qualified domain name for server certificates.\n"); - P(" --algorithm <algname> - Set the algorithm to use for the key,\n"); -- P(" either ed25519, rsa or ec. The default is ed25519.\n"); -+ P(" either ed25519, rsa or ec. "); -+#ifdef EVP_PKEY_ED25519 -+ P("The default is ed25519.\n"); -+#else -+ P("The default is ec.\n"); -+#endif - P(" --force, -f - Don't ask questions, just do the operation. This\n"); - P(" may overwrite data without asking.\n"); - P(" --version - Print the version number and exit.\n"); -@@ -831,7 +836,11 @@ genpkey_ed25519(const char *key) - return rc != 0; - } - -+#ifdef EVP_PKEY_ED25519 - static int (*genpkey)(const char *key) = genpkey_ed25519; -+#else -+static int (*genpkey)(const char *key) = genpkey_ec; -+#endif - - /* - * Create a single key. If name is NULL, it's a server key, otherwise diff --git a/package/gensio/Config.in b/package/gensio/Config.in index fd0e476970..d51ea99109 100644 --- a/package/gensio/Config.in +++ b/package/gensio/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_GENSIO bool "gensio" depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS # dlfcn.h depends on BR2_TOOLCHAIN_HAS_ATOMIC help A library to abstract stream I/O like serial port, TCP, diff --git a/package/gensio/gensio.hash b/package/gensio/gensio.hash index 84af3fdab1..7cbc4fb9ac 100644 --- a/package/gensio/gensio.hash +++ b/package/gensio/gensio.hash @@ -1,7 +1,7 @@ # From https://sourceforge.net/projects/ser2net/files/ser2net/ -md5 c8d65e1809ed5cd1138fa309e3ab0e94 gensio-2.5.5.tar.gz -sha1 076fc8324dedb658972a88c738131a409968e2ba gensio-2.5.5.tar.gz +md5 43a826835c044dada38a7fba6ae2afbe gensio-3.0.4.tar.gz +sha1 76cb782125140db9d9f3c0bfd810c7b94d084a50 gensio-3.0.4.tar.gz +sha256 e28c24fc5d9f3cb90005bc008fec8bb8eedce503753024ab650bed0ac250cbe3 gensio-3.0.4.tar.gz # Locally computed: -sha256 63c5fff536efd080fb7bc7fa084331c19fc64abd42b7f2bec86bd77b4fd10840 gensio-2.5.5.tar.gz -sha256 501f3108e6c03e5a0a5585ebaaa369171aead5319cd0a7a4dc1f66211c1f09f1 COPYING -sha256 dcac7d447dd81ab96d28dce00a07a6486e623f7ded94e2a2a8e83312405cdf89 COPYING.LIB +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/gensio/gensio.mk b/package/gensio/gensio.mk index 2ba1b950d7..8fc21fab01 100644 --- a/package/gensio/gensio.mk +++ b/package/gensio/gensio.mk @@ -4,7 +4,7 @@ # ################################################################################ -GENSIO_VERSION = 2.5.5 +GENSIO_VERSION = 3.0.4 GENSIO_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net GENSIO_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) GENSIO_LICENSE_FILES = COPYING.LIB COPYING @@ -12,6 +12,7 @@ GENSIO_INSTALL_STAGING = YES GENSIO_CONF_OPTS = \ --without-swig \ --without-python +GENSIO_AUTORECONF = YES ifeq ($(BR2_INSTALL_LIBSTDCPP),y) GENSIO_CONF_OPTS += --with-cplusplus -- 2.55.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot