aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/dropbear/patches/130-ssh_ignore_x_args.patch
diff options
context:
space:
mode:
authorKonstantin Demin <rockdrilla@gmail.com>2022-04-07 11:33:08 +0300
committerDaniel Golle <daniel@makrotopia.org>2022-04-10 16:26:01 +0100
commitd118e57b35bac5e607845d83dee98c31ee95cc14 (patch)
treecefceed00765b78160c32211b073e0df37e295d0 /package/network/services/dropbear/patches/130-ssh_ignore_x_args.patch
parent53c2874e07233798d63502a19b4a581b15b5bde6 (diff)
downloadupstream-d118e57b35bac5e607845d83dee98c31ee95cc14.tar.gz
upstream-d118e57b35bac5e607845d83dee98c31ee95cc14.tar.bz2
upstream-d118e57b35bac5e607845d83dee98c31ee95cc14.zip
dropbear: bump to 2022.82
- update dropbear to latest stable 2022.82; for the changes see https://matt.ucc.asn.au/dropbear/CHANGES - use $(AUTORELEASE) in PKG_RELEASE - use https for all uris - refresh all patches - rewrite patches: - 100-pubkey_path.patch - 130-ssh_ignore_x_args.patch binary/pkg size changes: - ath79/generic, mips: - binary: 215112 -> 219228 (+4116) - pkg: 111914 -> 113404 (+1490) - ath79/tiny, mips: - binary: 172501 -> 172485 (-16) - pkg: 89871 -> 90904 (+1033) Tested-by: Stijn Segers <foss@volatilesystems.org> Signed-off-by: Konstantin Demin <rockdrilla@gmail.com> (cherry picked from commit 65256aee23a5104eb0c78411fdc73640c0b757ea)
Diffstat (limited to 'package/network/services/dropbear/patches/130-ssh_ignore_x_args.patch')
-rw-r--r--package/network/services/dropbear/patches/130-ssh_ignore_x_args.patch14
1 files changed, 8 insertions, 6 deletions
diff --git a/package/network/services/dropbear/patches/130-ssh_ignore_x_args.patch b/package/network/services/dropbear/patches/130-ssh_ignore_x_args.patch
index 5e736320cc..d7f589801d 100644
--- a/package/network/services/dropbear/patches/130-ssh_ignore_x_args.patch
+++ b/package/network/services/dropbear/patches/130-ssh_ignore_x_args.patch
@@ -1,11 +1,13 @@
--- a/cli-runopts.c
+++ b/cli-runopts.c
-@@ -299,6 +299,8 @@ void cli_getopts(int argc, char ** argv)
- debug_trace = 1;
+@@ -325,6 +325,10 @@ void cli_getopts(int argc, char ** argv)
+ case 'b':
+ next = &bind_arg;
break;
- #endif
+ case 'x':
++ /* compatibility with openssh cli
++ * ("-x" disables X11 forwarding) */
+ break;
- case 'F':
- case 'e':
- #if !DROPBEAR_USER_ALGO_LIST
+ default:
+ fprintf(stderr,
+ "WARNING: Ignoring unknown option -%c\n", c);