Skip to content

Commit d681a67

Browse files
benoit-pierrebenoit-pierre
committed
dropbear: update to 2026.94
- https://github.com/mkj/dropbear/releases/tag/DROPBEAR_2026.94 - https://github.com/mkj/dropbear/releases/tag/DROPBEAR_2026.93
1 parent 7d6511c commit d681a67

7 files changed

Lines changed: 20 additions & 20 deletions

File tree

‎thirdparty/dropbear/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ list(APPEND BUILD_CMD make ${PROGRAMS})
7878
append_binary_install_command(INSTALL_CMD ${PROGRAMS})
7979

8080
external_project(
81-
DOWNLOAD URL 26c3e2ea61a8f3bc5b19c78e697ec42c
82-
https://github.com/mkj/dropbear/archive/refs/tags/DROPBEAR_2026.92.tar.gz
81+
DOWNLOAD URL 48f743dbfc9dfaacd678a2045189aa75
82+
https://github.com/mkj/dropbear/archive/refs/tags/DROPBEAR_2026.94.tar.gz
8383
PATCH_FILES ${PATCH_FILES}
8484
CONFIGURE_COMMAND ${CFG_CMD}
8585
BUILD_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/localoptions.h

‎thirdparty/dropbear/dbscp-path.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/src/svr-chansession.c b/src/svr-chansession.c
2-
index a2ea1fc..fb1a726 100644
2+
index a2ea1fcf..fb1a7260 100644
33
--- a/src/svr-chansession.c
44
+++ b/src/svr-chansession.c
55
@@ -692,6 +692,17 @@ static int sessioncommand(struct Channel *channel, struct ChanSess *chansess,

‎thirdparty/dropbear/fix__GNU_SOURCE_warnings.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/src/config.h.in b/src/config.h.in
2-
index 589786e..dd79699 100644
2+
index 589786e7..dd796990 100644
33
--- a/src/config.h.in
44
+++ b/src/config.h.in
55
@@ -450,7 +450,9 @@
@@ -13,7 +13,7 @@ index 589786e..dd79699 100644
1313
/* Define for large files, on AIX-style hosts. */
1414
#undef _LARGE_FILES
1515
diff --git a/src/dbutil.c b/src/dbutil.c
16-
index 8626f20..4e4243c 100644
16+
index a3414131..0cbcd199 100644
1717
--- a/src/dbutil.c
1818
+++ b/src/dbutil.c
1919
@@ -51,7 +51,9 @@
@@ -27,7 +27,7 @@ index 8626f20..4e4243c 100644
2727
#include <sys/syscall.h>
2828
#endif /* __linux */
2929
diff --git a/src/scpmisc.c b/src/scpmisc.c
30-
index c2f053e..bd117b8 100644
30+
index c2f053e1..bd117b84 100644
3131
--- a/src/scpmisc.c
3232
+++ b/src/scpmisc.c
3333
@@ -43,7 +43,9 @@

‎thirdparty/dropbear/nochdir-hack.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/src/svr-main.c b/src/svr-main.c
2-
index 40969ff..19d05db 100644
2+
index a77343cd..f6a5312c 100644
33
--- a/src/svr-main.c
44
+++ b/src/svr-main.c
5-
@@ -185,7 +185,7 @@ static void main_noinetd(int argc, char ** argv, const char* multipath) {
5+
@@ -190,7 +190,7 @@ static void main_noinetd(int argc, char ** argv, const char* multipath) {
66
closefds = 1;
77
}
88
#endif

‎thirdparty/dropbear/nopasswd-hack.patch‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/src/runopts.h b/src/runopts.h
2-
index 166ad4a..d62378b 100644
2+
index 166ad4a7..d62378b3 100644
33
--- a/src/runopts.h
44
+++ b/src/runopts.h
55
@@ -123,6 +123,7 @@ typedef struct svr_runopts {
@@ -11,7 +11,7 @@ index 166ad4a..d62378b 100644
1111
char * authorized_keys_dir;
1212

1313
diff --git a/src/svr-authpasswd.c b/src/svr-authpasswd.c
14-
index 899a8ab..410d53d 100644
14+
index 899a8abb..410d53da 100644
1515
--- a/src/svr-authpasswd.c
1616
+++ b/src/svr-authpasswd.c
1717
@@ -80,6 +80,15 @@ void svr_auth_password(int valid_user) {
@@ -31,26 +31,26 @@ index 899a8ab..410d53d 100644
3131
dropbear_log(LOG_WARNING,
3232
"Too-long password attempt for '%s' from %s",
3333
diff --git a/src/svr-runopts.c b/src/svr-runopts.c
34-
index 74eb0c4..8990264 100644
34+
index 2baec6bd..e286682f 100644
3535
--- a/src/svr-runopts.c
3636
+++ b/src/svr-runopts.c
37-
@@ -110,6 +110,7 @@ static void printhelp(const char * progname) {
37+
@@ -108,6 +108,7 @@ static void printhelp(const char * progname) {
3838
"-l <interface>\n"
3939
" interface to bind on\n"
4040
#endif
4141
+ "-n Disable password checking (/!\\ Hack, don't use this!)\n"
4242
#if INETD_MODE
4343
"-i Start for inetd\n"
4444
#endif
45-
@@ -186,6 +187,7 @@ void svr_getopts(int argc, char ** argv) {
45+
@@ -184,6 +185,7 @@ void svr_getopts(int argc, char ** argv) {
4646
svr_opts.delay_hostkey = 0;
4747
svr_opts.pidfile = expand_homedir_path(DROPBEAR_PIDFILE);
4848
svr_opts.authorized_keys_dir = "~/.ssh";
4949
+ svr_opts.nopasschk = 0;
5050
#if DROPBEAR_SVR_LOCALANYFWD
5151
svr_opts.nolocaltcp = 0;
5252
#endif
53-
@@ -299,6 +301,9 @@ void svr_getopts(int argc, char ** argv) {
53+
@@ -297,6 +299,9 @@ void svr_getopts(int argc, char ** argv) {
5454
case 'P':
5555
next = &svr_opts.pidfile;
5656
break;

‎thirdparty/dropbear/pubkey-hack.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/src/svr-authpubkey.c b/src/svr-authpubkey.c
2-
index 3191c2e..407b095 100644
2+
index 938b52da..86560df5 100644
33
--- a/src/svr-authpubkey.c
44
+++ b/src/svr-authpubkey.c
55
@@ -581,23 +581,7 @@ static int checkpubkeyperms() {
@@ -62,10 +62,10 @@ index 3191c2e..407b095 100644
6262
TRACE(("leave checkfileperm: success"))
6363
return DROPBEAR_SUCCESS;
6464
diff --git a/src/svr-runopts.c b/src/svr-runopts.c
65-
index 8990264..737504f 100644
65+
index e286682f..3c0abeb2 100644
6666
--- a/src/svr-runopts.c
6767
+++ b/src/svr-runopts.c
68-
@@ -186,7 +186,7 @@ void svr_getopts(int argc, char ** argv) {
68+
@@ -184,7 +184,7 @@ void svr_getopts(int argc, char ** argv) {
6969
svr_opts.hostkey = NULL;
7070
svr_opts.delay_hostkey = 0;
7171
svr_opts.pidfile = expand_homedir_path(DROPBEAR_PIDFILE);

‎thirdparty/dropbear/reduce_build_verbosity.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/Makefile.in b/Makefile.in
2-
index a26f011..b72b5b1 100644
2+
index 8f178ee2..571c02fb 100644
33
--- a/Makefile.in
44
+++ b/Makefile.in
55
@@ -168,7 +168,7 @@ $(OBJ_DIR):
@@ -12,7 +12,7 @@ index a26f011..b72b5b1 100644
1212
fuzz/%.o: $(srcdir)/../fuzz/%.c $(HEADERS)
1313
$(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ -c
1414
diff --git a/libtomcrypt/Makefile.in b/libtomcrypt/Makefile.in
15-
index ec135c5..cb77a07 100644
15+
index ec135c5d..cb77a07b 100644
1616
--- a/libtomcrypt/Makefile.in
1717
+++ b/libtomcrypt/Makefile.in
1818
@@ -243,7 +243,7 @@ $(TOBJECTS): $(HEADERS) tests/tomcrypt_test.h
@@ -25,7 +25,7 @@ index ec135c5..cb77a07 100644
2525
#Create libtomcrypt.a
2626
$(LIBMAIN_S): $(OBJECTS)
2727
diff --git a/libtommath/Makefile.in b/libtommath/Makefile.in
28-
index 3cacdd8..7b9c1d4 100644
28+
index 3cacdd83..7b9c1d49 100644
2929
--- a/libtommath/Makefile.in
3030
+++ b/libtommath/Makefile.in
3131
@@ -10,8 +10,6 @@ CFLAGS += -I$(srcdir) -I../libtomcrypt/src/headers/ -I$(srcdir)/../libtomcrypt/s

0 commit comments

Comments
 (0)