diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-06 17:05:09 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-06 17:05:09 +0200 |
| commit | 208807cc63754f699107bbad24687b3ae1d326fe (patch) | |
| tree | 749ada25a27d3659f1b24ae245fe6a416eeb7dae /package/dropbear/patches/patch-options_h | |
| parent | f0b814dddb1b74c91fd54af412ad356fc68be4a2 (diff) | |
| parent | b03ac31608c2ee5349a5d098980105957a4a6bca (diff) | |
fix conflict
Diffstat (limited to 'package/dropbear/patches/patch-options_h')
| -rw-r--r-- | package/dropbear/patches/patch-options_h | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/package/dropbear/patches/patch-options_h b/package/dropbear/patches/patch-options_h index 00914dda2..c6fbe7871 100644 --- a/package/dropbear/patches/patch-options_h +++ b/package/dropbear/patches/patch-options_h @@ -1,20 +1,8 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- dropbear-0.52.orig/options.h 2008-11-11 15:13:50.000000000 +0100 -+++ dropbear-0.52/options.h 2010-03-14 23:30:26.277667006 +0100 -@@ -10,6 +10,11 @@ - * parts are to allow for commandline -DDROPBEAR_XXX options etc. - ******************************************************************/ - -+#if !defined(DROPBEAR_CLIENT) && !defined(DROPBEAR_SERVER) -+#define DROPBEAR_SERVER -+#define DROPBEAR_CLIENT -+#endif -+ - #ifndef DROPBEAR_DEFPORT - #define DROPBEAR_DEFPORT "22" +--- dropbear-0.53.1.orig/options.h 2011-03-02 14:23:36.000000000 +0100 ++++ dropbear-0.53.1/options.h 2011-08-02 20:03:13.000000000 +0200 +@@ -144,7 +144,7 @@ much traffic. */ #endif -@@ -129,7 +134,7 @@ etc) slower (perhaps by 50%). Recommende - /* #define DSS_PROTOK */ /* Whether to do reverse DNS lookups. */ -#define DO_HOST_LOOKUP @@ -22,11 +10,11 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ /* Whether to print the message of the day (MOTD). This doesn't add much code * size */ -@@ -220,7 +225,7 @@ etc) slower (perhaps by 50%). Recommende +@@ -236,7 +236,7 @@ much traffic. */ /* The command to invoke for xauth when using X11 forwarding. * "-q" for quiet */ #ifndef XAUTH_COMMAND --#define XAUTH_COMMAND "/usr/X11R6/bin/xauth -q" +-#define XAUTH_COMMAND "/usr/bin/X11/xauth -q" +#define XAUTH_COMMAND "/usr/bin/xauth -q" #endif |