From: John Hodge <tpg@mutabah.net>
Date: Sat, 27 Jul 2013 11:05:45 +0000 (+0800)
Subject: Externals/dropbear - Disabled X forwarding
X-Git-Tag: rel0.15~318
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=bc164a02c6f5f9fdcc66bd66d2d6a02dcfff8bec;p=tpg%2Facess2.git

Externals/dropbear - Disabled X forwarding
---

diff --git a/Externals/core.mk b/Externals/core.mk
index 3b788de7..4e39cf57 100644
--- a/Externals/core.mk
+++ b/Externals/core.mk
@@ -12,7 +12,7 @@ ifeq ($(ARCH),x86)
 else ifeq ($(ARCH),x86_64)
  BFD := x86_64
 else
- $(error No BFD translation for $(ARCH) in Externals/common.mk)
+ $(error No BFD translation for $(ARCH) in Externals/core.mk)
 endif
 
 #PREFIX=$(ACESSDIR)/Externals/Output
diff --git a/Externals/dropbear/Makefile b/Externals/dropbear/Makefile
index 3aeb8379..2ae2894c 100644
--- a/Externals/dropbear/Makefile
+++ b/Externals/dropbear/Makefile
@@ -9,8 +9,8 @@ TARBALL_TO_DIR_L := %.tar.bz2
 TARBALL_TO_DIR_R := %
 PATCHES := options.h
 CONFIGURE_ARGS = --with-zlib=$(PREFIX) --disable-utmp --disable-wtmp --disable-lastlog
-BTARGETS = dbclient
-ITARGETS = inst_dbclient
+BTARGETS = dbclient dropbear
+ITARGETS = inst_dbclient inst_dropbear
 
 include ../common.mk
 
diff --git a/Externals/dropbear/patches/options.h.patch b/Externals/dropbear/patches/options.h.patch
index a0c5379a..9ff95cb3 100644
--- a/Externals/dropbear/patches/options.h.patch
+++ b/Externals/dropbear/patches/options.h.patch
@@ -1,5 +1,9 @@
 --- options.h
 +++ options.h
+@@ -54,2 +54,2 @@
+ /* Enable X11 Forwarding - server only */
+-#define ENABLE_X11FWD
++//#define ENABLE_X11FWD
 @@ -217,2 +217,2 @@
   * rsa/dss key generation */
 -#define DROPBEAR_URANDOM_DEV "/dev/urandom"