dropbear: upgrade 2020.81 -> 2022.82
PATCH 1/1 dropbear: upgrade 2020.81 -> 2022.82
refresh the following patches for new version:
0001-urandom-xauth-changes-to-options.h.patch
0005-dropbear-enable-pam.patch
dropbear-disable-weak-ciphers.patch
Changelog:
https://github.com/mkj/dropbear/releases/tag/DROPBEAR_2022.82
--- ...1-urandom-xauth-changes-to-options.h.patch | 8 ++++---- .../dropbear/0005-dropbear-enable-pam.patch | 13 ++++++------ .../dropbear-disable-weak-ciphers.patch | 20 ++++++++----------- .../recipes-core/dropbear/dropbear_2020.81.bb | 3 --- .../recipes-core/dropbear/dropbear_2022.82.bb | 3 +++ 5 files changed, 21 insertions(+), 26 deletions(-) delete mode 100644 meta/recipes-core/dropbear/dropbear_2020.81.bb create mode 100644 meta/recipes-core/dropbear/dropbear_2022.82.bb
meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch +4 -4
@@ -6,10 +6,10 @@ Upstream-Status: Inappropriate [configuration] 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default_options.h b/default_options.h -index 3b75eb8..1fd8082 100644 +index 349338c..5ffac25 100644 --- a/default_options.h +++ b/default_options.h -@@ -243,7 +243,7 @@ Homedir is prepended unless path begins with / */ +@@ -289,7 +289,7 @@ group1 in Dropbear server too */ /* The command to invoke for xauth when using X11 forwarding. * "-q" for quiet */
@@ -17,7 +17,7 @@ index 3b75eb8..1fd8082 100644 +#define XAUTH_COMMAND "xauth -q" - /* if you want to enable running an sftp server (such as the one included with + /* If you want to enable running an sftp server (such as the one included with -- -1.7.11.7 +2.25.1
meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch +6 -7
@@ -15,10 +15,10 @@ Signed-off-by: Jussi Kukkonen <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/default_options.h b/default_options.h -index 3b75eb8..8617cd0 100644 +index 0e3d027..349338c 100644 --- a/default_options.h +++ b/default_options.h -@@ -179,7 +179,7 @@ group1 in Dropbear server too */ +@@ -210,7 +210,7 @@ group1 in Dropbear server too */ /* Authentication Types - at least one required. RFC Draft requires pubkey auth, and recommends password */
@@ -27,16 +27,15 @@ index 3b75eb8..8617cd0 100644 /* Note: PAM auth is quite simple and only works for PAM modules which just do * a simple "Login: " "Password: " (you can edit the strings in svr-authpam.c). -@@ -187,7 +187,7 @@ group1 in Dropbear server too */ +@@ -218,7 +218,7 @@ group1 in Dropbear server too */ * but there's an interface via a PAM module. It won't work for more complex * PAM challenge/response. * You can't enable both PASSWORD and PAM. */ -#define DROPBEAR_SVR_PAM_AUTH 0 +#define DROPBEAR_SVR_PAM_AUTH 1 - /* ~/.ssh/authorized_keys authentication */ - #define DROPBEAR_SVR_PUBKEY_AUTH 1 - + /* ~/.ssh/authorized_keys authentication. + * You must define DROPBEAR_SVR_PUBKEY_AUTH in order to use plugins. */ -- -2.1.4 +2.25.1
meta/recipes-core/dropbear/dropbear/dropbear-disable-weak-ciphers.patch +8 -12
@@ -9,27 +9,23 @@ and we want to support the stong algorithms. Upstream-Status: Inappropriate [configuration] Signed-off-by: Joseph Reynolds <[email protected]> - --- - default_options.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + default_options.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default_options.h b/default_options.h -index 1aa2297..7ff1394 100644 +index d417588..bc5200f 100644 --- a/default_options.h +++ b/default_options.h -@@ -163,12 +163,12 @@ IMPORTANT: Some options will require "make clean" after changes */ +@@ -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 - */ + */ -#define DROPBEAR_DH_GROUP14_SHA1 1 +#define DROPBEAR_DH_GROUP14_SHA1 0 #define DROPBEAR_DH_GROUP14_SHA256 1 #define DROPBEAR_DH_GROUP16 0 #define DROPBEAR_CURVE25519 1 - #define DROPBEAR_ECDH 1 --#define DROPBEAR_DH_GROUP1 1 -+#define DROPBEAR_DH_GROUP1 0 - - /* When group1 is enabled it will only be allowed by Dropbear client - not as a server, due to concerns over its strength. Set to 0 to allow +-- +2.25.1 +
meta/recipes-core/dropbear/dropbear_2020.81.bb deleted +0 -3
@@ -1,3 +0,0 @@ -require dropbear.inc - -SRC_URI[sha256sum] = "48235d10b37775dbda59341ac0c4b239b82ad6318c31568b985730c788aac53b"
meta/recipes-core/dropbear/dropbear_2022.82.bb new file +3 -0
@@ -0,0 +1,3 @@ +require dropbear.inc + +SRC_URI[sha256sum] = "3a038d2bbc02bf28bbdd20c012091f741a3ec5cbe460691811d714876aad75d1"
Signature · 1 line
2.25.1
PATCH 1/1 gptfdisk: upgrade 1.0.8 -> 1.0.9
0001-gptcurses-correct-ncurses-6.3-errors.patch
removed since it's included in 1.0.9.
Changelog:
===========
- Added support for aligning partitions' end points. This feature affects the default partition size when using n in gdisk; it affects the default partition size in cgdisk; and it's activated by the new -I option in sgdisk. See the programs' respective man pages for details. This feature is intended to help with LUKS2 encryption, which reacts badly to partitions that are not sized as exact multiples of the encryption block size.
- Added several new partition type codes:
FreeBSD nandfs (0xa506)
Apple APFS Pre-Boot (0xaf0b)
Apple APFS Recovery (0xaf0c)
ChromeOS firmware (0x7f03)
ChromeOS mini-OS (0x7f04)
ChromeOS hibernate (0x7f05)
U-Boot boot loader (0xb000)
27 (!) codes for Fuchsia (0xf100 to 0xf11a)- Added the ability to build sgdisk and cgdisk for Windows.
- Added a check for too-small disks (most likely to be an issue when trying to use a too-small disk image); program now aborts if this happens.
- Removed stray debugging code that caused partNum is x to be printed when changing a partition's name with sgdisk.
- Fixed build problems with recent versions of ncurses.
- Fixed bug that caused cgdisk to report incorrect partition attributes.
---
...gptcurses-correct-ncurses-6.3-errors.patch | 99 -------------------
.../{gptfdisk_1.0.8.bb => gptfdisk_1.0.9.bb} | 3 +-
2 files changed, 1 insertion(+), 101 deletions(-)
delete mode 100644 meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correct-ncurses-6.3-errors.patch
rename meta/recipes-devtools/fdisk/{gptfdisk_1.0.8.bb => gptfdisk_1.0.9.bb} (88%)meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correct-ncurses-6.3-errors.patch deleted +0 -99
@@ -1,99 +0,0 @@ -From e301f7dd650c9e56f954a7c49661d938079e1a9b Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Mon, 25 Oct 2021 17:27:51 +0200 -Subject: [PATCH] gptcurses: correct ncurses 6.3 errors - -Upstream-Status: Submitted [by email to [email protected]] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - gptcurses.cc | 28 ++++++++++++++-------------- - 1 file changed, 14 insertions(+), 14 deletions(-) - -diff --git a/gptcurses.cc b/gptcurses.cc -index d0de024..70be999 100644 ---- a/gptcurses.cc -+++ b/gptcurses.cc -@@ -235,22 +235,22 @@ Space* GPTDataCurses::ShowSpace(int spaceNum, int lineNum) { - ClearLine(lineNum); - if (space->partNum == -1) { // space is empty - move(lineNum, 12); -- printw(BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str()); -+ printw("%s",BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str()); - move(lineNum, 24); -- printw("free space"); -+ printw("%s","free space"); - } else { // space holds a partition - move(lineNum, 3); - printw("%d", space->partNum + 1); - move(lineNum, 12); -- printw(BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str()); -+ printw("%s",BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str()); - move(lineNum, 24); -- printw(space->origPart->GetTypeName().c_str()); -+ printw("%s",space->origPart->GetTypeName().c_str()); - move(lineNum, 50); - #ifdef USE_UTF16 - space->origPart->GetDescription().extract(0, 39, temp, 39); -- printw(temp); -+ printw("%s",temp); - #else -- printw(space->origPart->GetDescription().c_str()); -+ printw("%s",space->origPart->GetDescription().c_str()); - #endif - } // if/else - } // if -@@ -267,10 +267,10 @@ int GPTDataCurses::DisplayParts(int selected) { - - move(lineNum++, 0); - theLine = "Part. # Size Partition Type Partition Name"; -- printw(theLine.c_str()); -+ printw("%s",theLine.c_str()); - move(lineNum++, 0); - theLine = "----------------------------------------------------------------"; -- printw(theLine.c_str()); -+ printw("%s",theLine.c_str()); - numToShow = LINES - RESERVED_TOP - RESERVED_BOTTOM; - pageNum = selected / numToShow; - for (i = pageNum * numToShow; i <= (pageNum + 1) * numToShow - 1; i++) { -@@ -284,7 +284,7 @@ int GPTDataCurses::DisplayParts(int selected) { - } else { - currentSpace = ShowSpace(i, lineNum); - move(lineNum++, 0); -- printw(">"); -+ printw("%s",">"); - } - DisplayOptions(i); - retval = selected; -@@ -632,7 +632,7 @@ void GPTDataCurses::DisplayOptions(char selectedKey) { - } // if/else - } // for - move(LINES - 1, (COLS - optionDesc.length()) / 2); -- printw(optionDesc.c_str()); -+ printw("%s",optionDesc.c_str()); - currentKey = selectedKey; - } // if - } // GPTDataCurses::DisplayOptions() -@@ -744,11 +744,11 @@ void GPTDataCurses::DrawMenu(void) { - - clear(); - move(0, (COLS - title.length()) / 2); -- printw(title.c_str()); -+ printw("%s",title.c_str()); - move(2, (COLS - drive.length()) / 2); -- printw(drive.c_str()); -+ printw("%s",drive.c_str()); - move(3, (COLS - size.str().length()) / 2); -- printw(size.str().c_str()); -+ printw("%s",size.str().c_str()); - DisplayParts(currentSpaceNum); - } // DrawMenu - -@@ -798,7 +798,7 @@ void PromptToContinue(void) { - void Report(string theText) { - clear(); - move(0, 0); -- printw(theText.c_str()); -+ printw("%s", theText.c_str()); - move(LINES - 2, (COLS - 29) / 2); - printw("Press any key to continue...."); - cbreak();
meta/recipes-devtools/fdisk/gptfdisk_1.0.9.bb renamed from meta/recipes-devtools/fdisk/gptfdisk_1.0.8.bb +1 -2
@@ -9,9 +9,8 @@ DEPENDS = "util-linux" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${PV}/${BP}.tar.gz \ file://0001-gptcurses-correctly-include-curses.h.patch \ - file://0001-gptcurses-correct-ncurses-6.3-errors.patch \ " -SRC_URI[sha256sum] = "95d19856f004dabc4b8c342b2612e8d0a9eebdd52004297188369f152e9dc6df" +SRC_URI[sha256sum] = "dafead2693faeb8e8b97832b23407f6ed5b3219bc1784f482dd855774e2d50c2" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/gptfdisk/files/gptfdisk/" UPSTREAM_CHECK_REGEX = "/gptfdisk/(?P<pver>(\d+[\.\-_]*)+)/"
Signature · 1 line
2.25.1
PATCH 1/1 kexec-tools: upgrade 2.0.23 -> 2.0.24
In reply to Wang Mingyurefresh 0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch
---
...bled-check-if-kaslr-seed-dtb-propert.patch | 19 +++++++++++--------
...-tools_2.0.23.bb => kexec-tools_2.0.24.bb} | 2 +-
2 files changed, 12 insertions(+), 9 deletions(-)
rename meta/recipes-kernel/kexec/{kexec-tools_2.0.23.bb => kexec-tools_2.0.24.bb} (97%)meta/recipes-kernel/kexec/kexec-tools/0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch +11 -8
@@ -33,20 +33,20 @@ Upstream-Status: Submitted [http://lists.infradead.org/pipermail/kexec/2020-Nove kexec/arch/arm64/kexec-arm64.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) -Index: kexec-tools-2.0.20/kexec/arch/arm64/kexec-arm64.c -=================================================================== ---- kexec-tools-2.0.20.orig/kexec/arch/arm64/kexec-arm64.c -+++ kexec-tools-2.0.20/kexec/arch/arm64/kexec-arm64.c -@@ -428,7 +428,7 @@ static int setup_2nd_dtb(struct dtb *dtb +diff --git a/kexec/arch/arm64/kexec-arm64.c b/kexec/arch/arm64/kexec-arm64.c +index ec6df4b..10238d9 100644 +--- a/kexec/arch/arm64/kexec-arm64.c ++++ b/kexec/arch/arm64/kexec-arm64.c +@@ -503,7 +503,7 @@ static int setup_2nd_dtb(struct dtb *dtb, char *command_line, int on_crash) int len, range_len; int nodeoffset; int new_size; -- int result, kaslr_seed; -+ int result; +- int i, result, kaslr_seed; ++ int i, result; result = fdt_check_header(dtb->buf); -@@ -499,18 +499,6 @@ static int setup_2nd_dtb(struct dtb *dtb +@@ -576,18 +576,6 @@ static int setup_2nd_dtb(struct dtb *dtb, char *command_line, int on_crash) return result; } } else {
@@ -65,3 +65,6 @@ Index: kexec-tools-2.0.20/kexec/arch/arm64/kexec-arm64.c /* * Invoke the getrandom system call with * GRND_NONBLOCK, to make sure we +-- +2.25.1 +
meta/recipes-kernel/kexec/kexec-tools_2.0.24.bb renamed from meta/recipes-kernel/kexec/kexec-tools_2.0.23.bb +1 -1
@@ -20,7 +20,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz file://0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch \ " -SRC_URI[sha256sum] = "c7dcc59f5b66004d9d91264324e20e0387ea263dbb449708fbf84a4e5ff7decc" +SRC_URI[sha256sum] = "1ff9137327aeac3b2ab922a71bc6eb4655571a0ff77c071cb92783a9a59d4d26" inherit autotools update-rc.d systemd
Signature · 1 line
2.25.1