Skip to contentSkip to conversation

dropbear: upgrade 2022.83 -> 2024.84

PATCH New [email protected] 1 participant 2 messages Apr 10, 2024

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 dropbear: upgrade 2022.83 -> 2024.84

From: Wang Mingyu <[email protected]>

0001-urandom-xauth-changes-to-options.h.patch
dropbear-disable-weak-ciphers.patch
0005-dropbear-enable-pam.patch
0006-dropbear-configuration-file.patch
refreshed for 2024.84

CVE-2023-36328.patch
removed since it's included in 2024.84

---
 ...1-urandom-xauth-changes-to-options.h.patch |  14 +-
 .../dropbear/0005-dropbear-enable-pam.patch   |   8 +-
 .../0006-dropbear-configuration-file.patch    |   8 +-
 .../dropbear/dropbear/CVE-2023-36328.patch    | 144 ------------------
 .../dropbear-disable-weak-ciphers.patch       |   8 +-
 ...ropbear_2022.83.bb => dropbear_2024.84.bb} |   3 +-
 6 files changed, 20 insertions(+), 165 deletions(-)
 delete mode 100644 meta/recipes-core/dropbear/dropbear/CVE-2023-36328.patch
 rename meta/recipes-core/dropbear/{dropbear_2022.83.bb => dropbear_2024.84.bb} (97%)
meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch +7 -7
index 99adcfd770..c74f09e484 100644
@@ -2,14 +2,14 @@ Subject: [PATCH 1/6] urandom-xauth-changes-to-options.h
 
 Upstream-Status: Inappropriate [configuration]
 ---
- default_options.h | 2 +-
+ src/default_options.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/default_options.h b/default_options.h
-index 349338c..5ffac25 100644
---- a/default_options.h
-+++ b/default_options.h
-@@ -289,7 +289,7 @@ group1 in Dropbear server too */
+diff --git a/src/default_options.h b/src/default_options.h
+index 6e970bb..ccc8b47 100644
+--- a/src/default_options.h
++++ b/src/default_options.h
+@@ -311,7 +311,7 @@ group1 in Dropbear server too */
  
  /* The command to invoke for xauth when using X11 forwarding.
   * "-q" for quiet */
@@ -19,5 +19,5 @@ index 349338c..5ffac25 100644
  
  /* If you want to enable running an sftp server (such as the one included with
 -- 
-2.25.1
+2.34.1
 
meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch +4 -4
index 32c3ea5f08..fe667ddc25 100644
@@ -11,13 +11,13 @@ Upstream-Status: Pending
 Signed-off-by: Xiaofeng Yan <[email protected]>
 Signed-off-by: Jussi Kukkonen <[email protected]>
 ---
- default_options.h | 4 ++--
+ src/default_options.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/default_options.h b/default_options.h
+diff --git a/src/default_options.h b/src/default_options.h
 index 0e3d027..349338c 100644
---- a/default_options.h
-+++ b/default_options.h
+--- a/src/default_options.h
++++ b/src/default_options.h
 @@ -210,7 +210,7 @@ group1 in Dropbear server too */
  
  /* Authentication Types - at least one required.
meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch +4 -4
index deed78ffb9..f54f634a4e 100644
@@ -12,13 +12,13 @@ Signed-off-by: Maxin B. John <[email protected]>
 Signed-off-by: Xiaofeng Yan <[email protected]>
 Signed-off-by: Mingli Yu <[email protected]>
 ---
- svr-authpam.c | 2 +-
+ src/svr-authpam.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/svr-authpam.c b/svr-authpam.c
+diff --git a/srec/svr-authpam.c b/src/svr-authpam.c
 index d201bc9..165ec5c 100644
---- a/svr-authpam.c
-+++ b/svr-authpam.c
+--- a/src/svr-authpam.c
++++ b/src/svr-authpam.c
 @@ -223,7 +223,7 @@ void svr_auth_pam(int valid_user) {
  	}
  
meta/recipes-core/dropbear/dropbear/CVE-2023-36328.patch deleted +0 -144

144 lines not on this page · raw message

meta/recipes-core/dropbear/dropbear/dropbear-disable-weak-ciphers.patch +4 -4
index 5c60868ed8..f998caa255 100644
@@ -10,13 +10,13 @@ and we want to support the stong algorithms.
 Upstream-Status: Inappropriate [configuration]
 Signed-off-by: Joseph Reynolds <[email protected]>
 ---
- default_options.h | 2 +-
+ src/default_options.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/default_options.h b/default_options.h
+diff --git a/src/default_options.h b/src/default_options.h
 index d417588..bc5200f 100644
---- a/default_options.h
-+++ b/default_options.h
+--- a/src/default_options.h
++++ b/src/default_options.h
 @@ -180,7 +180,7 @@ IMPORTANT: Some options will require "make clean" after changes */
   * Small systems should generally include either curve25519 or ecdh for performance.
   * curve25519 is less widely supported but is faster
meta/recipes-core/dropbear/dropbear_2024.84.bb renamed from meta/recipes-core/dropbear/dropbear_2022.83.bb +1 -2
similarity index 97%
rename from meta/recipes-core/dropbear/dropbear_2022.83.bb
rename to meta/recipes-core/dropbear/dropbear_2024.84.bb
index 528eff1a10..69c7b04c55 100644
@@ -21,10 +21,9 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
            file://dropbear.default \
            ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
            ${@bb.utils.contains('PACKAGECONFIG', 'disable-weak-ciphers', 'file://dropbear-disable-weak-ciphers.patch', '', d)} \
-           file://CVE-2023-36328.patch \
            "
 
-SRC_URI[sha256sum] = "bc5a121ffbc94b5171ad5ebe01be42746d50aa797c9549a4639894a16749443b"
+SRC_URI[sha256sum] = "16e22b66b333d6b7e504c43679d04ed6ca30f2838db40a21f935c850dfc01009"
 
 PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \
                file://0006-dropbear-configuration-file.patch \
Signature · 1 line
2.34.1
#1 lore raw

PATCH v2 1/1 python3-pycparser: upgrade 2.21 -> 2.22

From: Wang Mingyu <[email protected]>

License-Update:
===============
Slightly tweak the LICENSE file to be more canonical:
- Copyright year updated to 2022.
- "Eli Bendersky: changed to "the copyright holder"

Changelog:
===========
-Add missing SCHAR limit defines
-Use proper SPDX identifier
-Add Python 3.11 as a supported version
-Fix multi-pragma/single statement blocks (#479)
-Add an encoding parameter to parse_file
-Feature/add pragma support
-Set up permissions to ci.yml
-_build_tables: Invalidate cache before importing generated modules -Upgrade GitHub Actions
-Create a Security Policy
-New example to generate AST from scratch
-Add support for Python 3.12
-ply: Make generated lextab.py deterministic

---
 .../{python3-pycparser_2.21.bb => python3-pycparser_2.22.bb}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python3-pycparser_2.21.bb => python3-pycparser_2.22.bb} (69%)
meta/recipes-devtools/python/python3-pycparser_2.22.bb renamed from meta/recipes-devtools/python/python3-pycparser_2.21.bb +2 -2
similarity index 69%
rename from meta/recipes-devtools/python/python3-pycparser_2.21.bb
rename to meta/recipes-devtools/python/python3-pycparser_2.22.bb
index 00deceebf9..9a5abc42bd 100644
@@ -1,9 +1,9 @@
 SUMMARY = "Parser of the C language, written in pure Python"
 HOMEPAGE = "https://github.com/eliben/pycparser"
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2c28cdeabcb88f5843d934381b4b4fea"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=9761c3ffee7ba99c60dca0408fd3262b"
 
-SRC_URI[sha256sum] = "e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"
+SRC_URI[sha256sum] = "491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6"
 
 inherit pypi setuptools3
 
Signature · 1 line
2.34.1