diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
| commit | f96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch) | |
| tree | edb17ec2c4ea13c5acb1c7350957a249a820e28d /dropbear/dropbear-0.43 | |
| parent | b6588aa6851fb220cedc387d21c51513ef8d67f4 (diff) | |
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'dropbear/dropbear-0.43')
| -rw-r--r-- | dropbear/dropbear-0.43/allow-nopw.patch | 39 | ||||
| -rw-r--r-- | dropbear/dropbear-0.43/configure.patch | 31 | ||||
| -rw-r--r-- | dropbear/dropbear-0.43/multi-binary.patch | 11 |
3 files changed, 81 insertions, 0 deletions
diff --git a/dropbear/dropbear-0.43/allow-nopw.patch b/dropbear/dropbear-0.43/allow-nopw.patch index e69de29bb2..cc916a8242 100644 --- a/dropbear/dropbear-0.43/allow-nopw.patch +++ b/dropbear/dropbear-0.43/allow-nopw.patch @@ -0,0 +1,39 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- dropbear-0.41/auth.c~allow-nopw ++++ dropbear-0.41/auth.c +@@ -225,6 +225,7 @@ + } + + /* check for an empty password */ ++#ifdef DISALLOW_EMPTY_PW + if (ses.authstate.pw->pw_passwd[0] == '\0') { + TRACE(("leave checkusername: empty pword")); + dropbear_log(LOG_WARNING, "user '%s' has blank password, rejected", +@@ -232,6 +233,7 @@ + send_msg_userauth_failure(0, 1); + return DROPBEAR_FAILURE; + } ++#endif + + TRACE(("shell is %s", ses.authstate.pw->pw_shell)); + +--- dropbear-0.41/authpasswd.c~allow-nopw ++++ dropbear-0.41/authpasswd.c +@@ -65,9 +65,13 @@ + * since the shadow password may differ to that tested + * in auth.c */ + if (passwdcrypt[0] == '\0') { ++#ifdef DISALLOW_EMPTY_PASSWD + dropbear_log(LOG_WARNING, "user '%s' has blank password, rejected", + ses.authstate.printableuser); + send_msg_userauth_failure(0, 1); ++#else ++ send_msg_userauth_success(); ++#endif + return; + } + diff --git a/dropbear/dropbear-0.43/configure.patch b/dropbear/dropbear-0.43/configure.patch index e69de29bb2..cfc15f826b 100644 --- a/dropbear/dropbear-0.43/configure.patch +++ b/dropbear/dropbear-0.43/configure.patch @@ -0,0 +1,31 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- dropbear-0.40/configure.in~configure ++++ dropbear-0.40/configure.in +@@ -125,15 +125,20 @@ + AC_MSG_RESULT(Not using openpty) + else + AC_MSG_RESULT(Using openpty if available) +- AC_SEARCH_LIBS(openpty, util, [AC_DEFINE(HAVE_OPENPTY,,Have openpty() function)]) ++ AC_SEARCH_LIBS(openpty, util, [dropbear_cv_func_have_openpty=yes]) + fi + ], + [ + AC_MSG_RESULT(Using openpty if available) +- AC_SEARCH_LIBS(openpty, util, [AC_DEFINE(HAVE_OPENPTY)]) ++ AC_SEARCH_LIBS(openpty, util, [dropbear_cv_func_have_openpty=yes]) + ] + ) +- ++ ++if test "x$dropbear_cv_func_have_openpty" = "xyes"; then ++ AC_DEFINE(HAVE_OPENPTY,,Have openpty() function) ++ no_ptc_check=yes ++ no_ptmx_check=yes ++fi + + AC_ARG_ENABLE(syslog, + [ --disable-syslog Don't include syslog support], diff --git a/dropbear/dropbear-0.43/multi-binary.patch b/dropbear/dropbear-0.43/multi-binary.patch index e69de29bb2..280ebf0128 100644 --- a/dropbear/dropbear-0.43/multi-binary.patch +++ b/dropbear/dropbear-0.43/multi-binary.patch @@ -0,0 +1,11 @@ +--- dropbear-0.42/options.h.orig 2004-06-16 07:08:27.000000000 +0200 ++++ dropbear-0.42/options.h 2004-07-04 22:41:25.000000000 +0200 +@@ -184,7 +184,7 @@ + * "make clean; make dropbearmulti". You'll need to install the binary + * manually, see MULTI for details */ + +-/* #define DROPBEAR_MULTI */ ++#define DROPBEAR_MULTI + + /* The three multi binaries: dropbear, dropbearkey, dropbearconvert + * Comment out these if you don't want some of them */ |