vars/build.vars: updates sed to v4.4, adds dropbear v2017.75 (via Redfoxmoon.)

patches/{dropbear-2017.75.local,dropbear/dropbear-shell-detection-hack}.patch: added (via Redfoxmoon.)

2 files changed, 94 insertions, 0 deletions

diff --git a/patches/dropbear-2017.75.local.patch b/patches/dropbear-2017.75.local.patch
new file mode 100644
index 00000000..8f8f7b1b
--- /dev/null
+++ b/patches/dropbear-2017.75.local.patch
@@ -0,0 +1,83 @@
+diff -ru dropbear-2017.75.orig/configure dropbear-2017.75/configure
+--- dropbear-2017.75.orig/configure	2017-05-18 16:47:03.000000000 +0200
++++ dropbear-2017.75/configure	2017-08-23 17:34:07.708548199 +0200
+@@ -6793,20 +6793,22 @@
+ 
+ fi
+ 
+-
+-# Solaris needs ptmx
+-if test -z "$no_ptmx_check" ; then
+-	if test x"$cross_compiling" = x"no" ; then
+-		if test -e /dev/ptmx ; then
+-
++#Why no config.cache checking?!
+ $as_echo "#define USE_DEV_PTMX /**/" >>confdefs.h
+ 
+-		fi
+-	else
+-		{ $as_echo "$as_me:${as_lineno-$LINENO}: Not checking for /dev/ptmx, we're cross-compiling" >&5
+-$as_echo "$as_me: Not checking for /dev/ptmx, we're cross-compiling" >&6;}
+-	fi
+-fi
++# Solaris needs ptmx
++#if test -z "$no_ptmx_check" ; then
++#	if test x"$cross_compiling" = x"no" ; then
++#		if test -e /dev/ptmx ; then
++#
++#$as_echo "#define USE_DEV_PTMX /**/" >>confdefs.h
++#
++#		fi
++#	else
++#		{ $as_echo "$as_me:${as_lineno-$LINENO}: Not checking for /dev/ptmx, we're cross-compiling" >&5
++#$as_echo "$as_me: Not checking for /dev/ptmx, we're cross-compiling" >&6;}
++#	fi
++#fi
+ 
+ if test -z "$no_ptc_check" ; then
+ 	if test x"$cross_compiling" = x"no" ; then
+diff -ru dropbear-2017.75.orig/includes.h dropbear-2017.75/includes.h
+--- dropbear-2017.75.orig/includes.h	2017-05-18 16:47:02.000000000 +0200
++++ dropbear-2017.75/includes.h	2017-08-23 17:23:59.379752797 +0200
+@@ -156,7 +156,7 @@
+ typedef u_int32_t uint32_t;
+ #endif /* HAVE_UINT32_T */
+ 
+-#ifdef SO_PRIORITY
++#if defined(SO_PRIORITY) && !defined(__midipix__)
+ #include <linux/types.h>
+ #include <linux/pkt_sched.h>
+ #endif
+diff -ru dropbear-2017.75.orig/netio.c dropbear-2017.75/netio.c
+--- dropbear-2017.75.orig/netio.c	2017-05-18 16:47:02.000000000 +0200
++++ dropbear-2017.75/netio.c	2017-08-23 17:25:34.759249812 +0200
+@@ -333,7 +333,7 @@
+ 	}
+ #endif
+ 
+-#ifdef SO_PRIORITY
++#if defined(SO_PRIORITY) && !defined(__midipix__)
+ 	if (prio == DROPBEAR_PRIO_LOWDELAY) {
+ 		so_prio_val = TC_PRIO_INTERACTIVE;
+ 	} else if (prio == DROPBEAR_PRIO_BULK) {
+diff -ru dropbear-2017.75.orig/options.h dropbear-2017.75/options.h
+--- dropbear-2017.75.orig/options.h	2017-05-18 16:47:02.000000000 +0200
++++ dropbear-2017.75/options.h	2017-08-23 17:27:15.962716376 +0200
+@@ -52,7 +52,7 @@
+ several kB in binary size however will make the symmetrical ciphers and hashes
+ slower, perhaps by 50%. Recommended for small systems that aren't doing
+ much traffic. */
+-#define DROPBEAR_SMALL_CODE
++/*#define DROPBEAR_SMALL_CODE*/ /* NO! */
+ 
+ /* Enable X11 Forwarding - server only */
+ #define ENABLE_X11FWD
+@@ -347,7 +347,7 @@
+ #define DEFAULT_IDLE_TIMEOUT 0
+ 
+ /* The default path. This will often get replaced by the shell */
+-#define DEFAULT_PATH "/usr/bin:/bin"
++#define DEFAULT_PATH "/bin"
+ 
+ /* Some other defines (that mostly should be left alone) are defined
+  * in sysoptions.h */
diff --git a/patches/dropbear/dropbear-shell-detection-hack.patch b/patches/dropbear/dropbear-shell-detection-hack.patch
new file mode 100644
index 00000000..fe520c4d
--- /dev/null
+++ b/patches/dropbear/dropbear-shell-detection-hack.patch
@@ -0,0 +1,11 @@
+diff -ru dropbear-2017.75.orig/svr-auth.c dropbear-2017.75/svr-auth.c
+--- dropbear-2017.75.orig/svr-auth.c	2017-05-18 16:47:02.000000000 +0200
++++ dropbear-2017.75/svr-auth.c	2017-08-23 17:38:21.843211002 +0200
+@@ -300,6 +300,7 @@
+ 	}
+ 	/* no matching shell */
+ 	endusershell();
++	return DROPBEAR_SUCCESS;
+ 	TRACE(("no matching shell"))
+ 	dropbear_log(LOG_WARNING, "User '%s' has invalid shell, rejected",
+ 				ses.authstate.pw_name);