Skip to contentSkip to conversation

dropbear: add 0.53.1

PATCH Superseded Eric Bénard 4 participants 10 messages Mar 5, 2011 – Apr 27, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 dropbear: add 0.53.1

* 0.53.1 brings some improvements over 0.52 which was released more than 2 years ago. For more details, check the changelog here :
http://matt.ucc.asn.au/dropbear/CHANGES
* Please note that DROPBEAR_SMALL_CODEis now disabled which may increase the size of the binaries.

---
 recipes/dropbear/dropbear-0.53.1/allow-nopw.patch  |   40 ++++++++++++++++++++
 recipes/dropbear/dropbear-0.53.1/configure.patch   |   27 +++++++++++++
 .../dropbear/dropbear-0.53.1/fix-2kb-keys.patch    |   12 ++++++
 .../dropbear/dropbear-0.53.1/no-host-lookup.patch  |   12 ++++++
 .../urandom-xauth-changes-to-options.h.patch       |   13 ++++++
 recipes/dropbear/dropbear_0.53.1.bb                |    9 ++++
 6 files changed, 113 insertions(+), 0 deletions(-)
 create mode 100644 recipes/dropbear/dropbear-0.53.1/allow-nopw.patch
 create mode 100644 recipes/dropbear/dropbear-0.53.1/configure.patch
 create mode 100644 recipes/dropbear/dropbear-0.53.1/fix-2kb-keys.patch
 create mode 100644 recipes/dropbear/dropbear-0.53.1/no-host-lookup.patch
 create mode 100644 recipes/dropbear/dropbear-0.53.1/urandom-xauth-changes-to-options.h.patch
 create mode 100644 recipes/dropbear/dropbear_0.53.1.bb
recipes/dropbear/dropbear-0.53.1/allow-nopw.patch new file +40 -0
new file mode 100644
index 0000000..3f3e8b1
@@ -0,0 +1,40 @@
+Index: dropbear-0.51/svr-auth.c
+===================================================================
+--- dropbear-0.51.orig/svr-auth.c
++++ dropbear-0.51/svr-auth.c
+@@ -270,7 +270,7 @@ static int checkusername(unsigned char *
+ 		send_msg_userauth_failure(0, 1);
+ 		return DROPBEAR_FAILURE;
+ 	}
+-
++#ifdef DISALLOW_EMPTY_PW
+ 	/* check for an empty password */
+ 	if (ses.authstate.pw_passwd[0] == '\0') {
+ 		TRACE(("leave checkusername: empty pword"))
+@@ -279,7 +279,7 @@ static int checkusername(unsigned char *
+ 		send_msg_userauth_failure(0, 1);
+ 		return DROPBEAR_FAILURE;
+ 	}
+-
++#endif
+ 	TRACE(("shell is %s", ses.authstate.pw_shell))
+ 
+ 	/* check that the shell is set */
+Index: dropbear-0.51/svr-authpasswd.c
+===================================================================
+--- dropbear-0.51.orig/svr-authpasswd.c
++++ dropbear-0.51/svr-authpasswd.c
+@@ -64,9 +64,13 @@ void svr_auth_password() {
+ 	 * since the shadow password may differ to that tested
+ 	 * in auth.c */
+ 	if (passwdcrypt[0] == '\0') {
++#ifdef DISALLOW_EMPTY_PW
+ 		dropbear_log(LOG_WARNING, "user '%s' has blank password, rejected",
+ 				ses.authstate.pw_name);
+ 		send_msg_userauth_failure(0, 1);
++#else
++		send_msg_userauth_success();
++#endif
+ 		return;
+ 	}
+ 
recipes/dropbear/dropbear-0.53.1/configure.patch new file +27 -0
new file mode 100644
index 0000000..fa24efc
@@ -0,0 +1,27 @@
+Index: dropbear-0.50/configure.in
+===================================================================
+--- dropbear-0.50.orig/configure.in
++++ dropbear-0.50/configure.in
+@@ -164,14 +164,20 @@ AC_ARG_ENABLE(openpty,
+ 			AC_MSG_NOTICE(Not using openpty)
+ 		else
+ 			AC_MSG_NOTICE(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_NOTICE(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,
recipes/dropbear/dropbear-0.53.1/fix-2kb-keys.patch new file +12 -0
new file mode 100644
index 0000000..bb7a4d3
@@ -0,0 +1,12 @@
+Index: dropbear-0.50/kex.h
+===================================================================
+--- dropbear-0.50.orig/kex.h
++++ dropbear-0.50/kex.h
+@@ -59,6 +59,6 @@ struct KEXState {
+ 
+ };
+ 
+-#define MAX_KEXHASHBUF 2000
++#define MAX_KEXHASHBUF 3000
+ 
+ #endif /* _KEX_H_ */
recipes/dropbear/dropbear-0.53.1/no-host-lookup.patch new file +12 -0
new file mode 100644
index 0000000..d7c2ccd
@@ -0,0 +1,12 @@
+diff -urN dropbear-0.51/options.h dropbear-0.51.new/options.h
+--- dropbear-0.51/options.h	2008-03-27 14:34:39.000000000 +0100
++++ dropbear-0.51.new/options.h	2008-06-22 00:22:09.000000000 +0200
+@@ -112,7 +112,7 @@
+ /* #define DSS_PROTOK */
+ 
+ /* Whether to do reverse DNS lookups. */
+-#define DO_HOST_LOOKUP
++/* #define DO_HOST_LOOKUP */
+ 
+ /* Whether to print the message of the day (MOTD). This doesn't add much code
+  * size */
recipes/dropbear/dropbear-0.53.1/urandom-xauth-changes-to-options.h.patch new file +13 -0
new file mode 100644
index 0000000..bd1657d
@@ -0,0 +1,13 @@
+diff --git a/options.h b/options.h
+index d309ab4..7fbe97b 100644
+--- a/options.h
++++ b/options.h
+@@ -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/bin/X11/xauth -q"
++#define XAUTH_COMMAND "xauth -q"
+ #endif
+ 
+ /* if you want to enable running an sftp server (such as the one included with
recipes/dropbear/dropbear_0.53.1.bb new file +9 -0
new file mode 100644
index 0000000..fd6b970
@@ -0,0 +1,9 @@
+require dropbear.inc
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://no-host-lookup.patch"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI[md5sum] = "0284ea239083f04c8b874e08e1aca243"
+SRC_URI[sha256sum] = "e24d3cbecd3bc850b2b336b8eb50c845a285ceef8e22544938a582e163d36393"
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 2/2 qt4: add 4.7.2

* details on the 4.7.2 release are available here :
http://qt.nokia.com/developer/changes/changes-4.7.2/

* please note that x11 versions are not yet tested

---
 recipes/qt4/qt-4.7.2.inc                           |   72 ++++++++++++++++++++
 .../0001-Added-Openembedded-crossarch-option.patch |   44 ++++++++++++
 .../0010-phonon-gstreamer-rgb-endianess.patch      |   23 ++++++
 recipes/qt4/qt-4.7.2/g++.conf                      |   60 ++++++++++++++++
 recipes/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch      |   19 +++++
 recipes/qt4/qt-4.7.2/linux.conf                    |   66 ++++++++++++++++++
 recipes/qt4/qt4-embedded_4.7.2.bb                  |   14 ++++
 recipes/qt4/qt4-tools-native_4.7.2.bb              |   21 ++++++
 recipes/qt4/qt4-tools-sdk_4.7.2.bb                 |    8 ++
 recipes/qt4/qt4-x11-free-gles_4.7.2.bb             |   17 +++++
 recipes/qt4/qt4-x11-free_4.7.2.bb                  |   15 ++++
 11 files changed, 359 insertions(+), 0 deletions(-)
 create mode 100644 recipes/qt4/qt-4.7.2.inc
 create mode 100644 recipes/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch
 create mode 100644 recipes/qt4/qt-4.7.2/0010-phonon-gstreamer-rgb-endianess.patch
 create mode 100644 recipes/qt4/qt-4.7.2/g++.conf
 create mode 100644 recipes/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch
 create mode 100644 recipes/qt4/qt-4.7.2/linux.conf
 create mode 100644 recipes/qt4/qt4-embedded_4.7.2.bb
 create mode 100644 recipes/qt4/qt4-tools-native_4.7.2.bb
 create mode 100644 recipes/qt4/qt4-tools-sdk_4.7.2.bb
 create mode 100644 recipes/qt4/qt4-x11-free-gles_4.7.2.bb
 create mode 100644 recipes/qt4/qt4-x11-free_4.7.2.bb
recipes/qt4/qt-4.7.2.inc new file +72 -0
new file mode 100644
index 0000000..282bc82
@@ -0,0 +1,72 @@
+DEFAULT_PREFERENCE = "-1"
+LICENSE = "LGPLv2.1 GPLv3"
+
+FILESPATHPKG =. "qt-${PV}:"
+
+SRC_URI = "\
+	ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+	file://0004-no-qmake.patch \
+    file://hack-out-pg2-4.7.0.patch \
+	file://0006-freetype-host-includes.patch \
+	file://0001-Added-Openembedded-crossarch-option.patch \
+	file://0010-phonon-gstreamer-rgb-endianess.patch \
+	file://g++.conf \
+	file://linux.conf \
+           "
+# Set necessary variables in the profile
+SRC_URI += "file://qte.sh"
+
+S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
+
+FILES_${QT_BASE_NAME}-tools                += "${bindir}/qml"
+
+do_configure_prepend() {
+    for pro in $(find ${S} -name "*.pro") ; do
+        sed -i 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' $pro
+    done
+
+    sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf
+    sed -i \
+    -e /QMAKE_MOC\ /d \
+    -e /QMAKE_UIC\ /d \
+    -e /QMAKE_UIC3\ /d \
+    -e /QMAKE_RCC\ /d \
+    ${S}/configure
+}
+
+do_configure_append() {
+    sed -e '/QMAKE_TARGET /d' -e '/TARGET /d' -i ${S}/translations/Makefile
+}
+
+QT_GLFLAGS ?= ""
+QT_CONFIG_FLAGS += " -javascript-jit -script -scripttools -declarative -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}"
+
+do_compile() {
+    # Fixup missing wsegl header in some SGX SDKs
+    if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then
+        cp src/3rdparty/powervr/wsegl.h src/plugins/gfxdrivers/powervr/QWSWSEGL/
+    fi
+
+    unset CFLAGS CXXFLAGS
+    install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc
+    install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc
+    install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic
+    install -m 0755 ${STAGING_BINDIR_NATIVE}/lrelease4 ${S}/bin/lrelease
+
+    oe_runmake ${EXTRA_ENV}
+}
+
+do_install_append() {
+	install -d ${D}${bindir}
+	for i in rcc uic moc ; do
+		install -m 0755 ${S}/bin/$i ${D}${bindir}/
+	done
+
+        #Append an E to the qtdemo file
+        if [ -n "${QT_LIBINFIX}" ] ; then
+                mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
+        fi
+}
+
+SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
+SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
recipes/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch new file +44 -0

44 lines not on this page · raw message

recipes/qt4/qt-4.7.2/0010-phonon-gstreamer-rgb-endianess.patch new file +23 -0
new file mode 100644
index 0000000..d43366c
@@ -0,0 +1,23 @@
+--- a/src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp
++++ b/src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp
+@@ -18,6 +18,7 @@
+ #include <QApplication>
+ #include "videowidget.h"
+ #include "qwidgetvideosink.h"
++#include <gst/video/video.h>
+ 
+ QT_BEGIN_NAMESPACE
+ 
+@@ -106,11 +107,7 @@ static GstStaticPadTemplate template_factory_rgb =
+     GST_STATIC_PAD_TEMPLATE("sink",
+                             GST_PAD_SINK,
+                             GST_PAD_ALWAYS,
+-                            GST_STATIC_CAPS("video/x-raw-rgb, "
+-                                            "framerate = (fraction) [ 0, MAX ], "
+-                                            "width = (int) [ 1, MAX ], "
+-                                            "height = (int) [ 1, MAX ],"
+-                                            "bpp = (int) 32"));
++                            GST_STATIC_CAPS(GST_VIDEO_CAPS_xRGB_HOST_ENDIAN));
+ 
+ template <VideoFormat FMT>
+ struct template_factory; 
recipes/qt4/qt-4.7.2/g++.conf new file +60 -0

60 lines not on this page · raw message

recipes/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch new file +19 -0
new file mode 100644
index 0000000..5c588ff
@@ -0,0 +1,19 @@
+Index: qt-everywhere-opensource-src-4.7.0/configure
+===================================================================
+--- qt-everywhere-opensource-src-4.7.0.orig/configure	2010-09-22 15:43:51.191162141 -0400
++++ qt-everywhere-opensource-src-4.7.0/configure	2010-09-22 15:44:35.179981232 -0400
+@@ -4921,10 +4921,10 @@
+         psql)
+             if [ "$CFG_SQL_psql" != "no" ]; then
+                 # Be careful not to use native pg_config when cross building.
+-                if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
+-                    QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
+-                    QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
+-                fi
++#                if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
++#                    QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
++#                    QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
++#                fi
+                 [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
+                 [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
+                 # But, respect PSQL_LIBS if set
recipes/qt4/qt-4.7.2/linux.conf new file +66 -0

66 lines not on this page · raw message

recipes/qt4/qt4-embedded_4.7.2.bb new file +14 -0
new file mode 100644
index 0000000..1cd43a6
@@ -0,0 +1,14 @@
+DEFAULT_PREFERENCE = "-1"
+
+require qt4-embedded.inc
+
+PR = "${INC_PR}.0"
+
+QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
+
+require qt-${PV}.inc
+
+QT_CONFIG_FLAGS += " \
+ -exceptions \
+"
+
recipes/qt4/qt4-tools-native_4.7.2.bb new file +21 -0
new file mode 100644
index 0000000..7dbb569
@@ -0,0 +1,21 @@
+DEFAULT_PREFERENCE = "-1"
+
+require qt4-tools-native.inc
+LICENSE = "LGPLv2.1 GPLv3"
+
+PR = "${INC_PR}.0"
+
+# Find the g++.conf/linux.conf in the right directory.
+FILESPATHPKG =. "qt-${PV}:"
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+           file://qt-config.patch \
+           file://g++.conf \
+           file://linux.conf"
+S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
+
+EXTRA_OECONF += " -no-fast -silent -no-rpath"
+
+TOBUILD := "src/tools/bootstrap ${TOBUILD}"
+
+SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
+SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
recipes/qt4/qt4-tools-sdk_4.7.2.bb new file +8 -0
new file mode 100644
index 0000000..c86ac2a
@@ -0,0 +1,8 @@
+require qt4-tools-sdk.inc
+
+PR = "${INC_PR}.0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
+SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
recipes/qt4/qt4-x11-free-gles_4.7.2.bb new file +17 -0
new file mode 100644
index 0000000..70699ce
@@ -0,0 +1,17 @@
+require qt4-x11-free.inc
+PR = "${INC_PR}.0"
+
+QT_GLFLAGS = "-opengl es2 -depths 16,24,32 "
+
+require qt-${PV}.inc
+
+QT_CONFIG_FLAGS += " \
+ -no-embedded \
+ -xrandr \
+ -x11"
+
+FILESPATHPKG .= ":qt4-x11-free-${PV}:qt4-x11-free"
+
+DEPENDS += "virtual/egl"
+require recipes/egl/egl.inc
+PROVIDES += "qt4-x11-free"
recipes/qt4/qt4-x11-free_4.7.2.bb new file +15 -0
new file mode 100644
index 0000000..79a765e
@@ -0,0 +1,15 @@
+DEFAULT_PREFERENCE = "-1"
+
+require qt4-x11-free.inc
+
+PR = "${INC_PR}.0"
+
+QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
+
+require qt-${PV}.inc
+
+QT_CONFIG_FLAGS += " \
+ -no-embedded \
+ -xrandr \
+ -x11"
+
Signature · 1 line
1.7.0.4
#2 lore raw

Re: [PATCH 2/2] qt4: add 4.7.2

Quoted 1 line · Eric Bénard

 recipes/qt4/qt-4.7.2.inc                           |   72 ++++++++++++++++++++

...

recipes/qt4/qt-4.7.2.inc line 39

Quoted 3 lines
recipes/qt4/qt-4.7.2.inc new file +3 -0
+do_configure_append() {
+    sed -e '/QMAKE_TARGET /d' -e '/TARGET /d' -i ${S}/translations/Makefile
+}

...

It seems as a regression from previous qt4 recipes since we used to have translation support. Eric, can you take a look into that?

Signature · 3 lines
Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
Acked-by on v1 1/2
#3 lore raw
In reply to Eric Bénard
Quoted 5 lines · Eric Bénard

* 0.53.1 brings some improvements over 0.52 which was released more than 2 years ago. For more details, check the changelog here :
http://matt.ucc.asn.au/dropbear/CHANGES
* Please note that DROPBEAR_SMALL_CODEis now disabled which may increase the size of the binaries.

can you compare the sizes of .52 and .53.1 so we know how much it will be

Quoted 2 lines

Patch itself looks ok

Quoted 173 lines

---
 recipes/dropbear/dropbear-0.53.1/allow-nopw.patch  |   40 ++++++++++++++++++++ recipes/dropbear/dropbear-0.53.1/configure.patch   |   27 +++++++++++++ .../dropbear/dropbear-0.53.1/fix-2kb-keys.patch    |   12 ++++++ .../dropbear/dropbear-0.53.1/no-host-lookup.patch  |   12 ++++++ .../urandom-xauth-changes-to-options.h.patch       |   13 ++++++ recipes/dropbear/dropbear_0.53.1.bb                |    9 ++++

 6 files changed, 113 insertions(+), 0 deletions(-)

 create mode 100644 recipes/dropbear/dropbear-0.53.1/allow-nopw.patch
 create mode 100644 recipes/dropbear/dropbear-0.53.1/configure.patch
 create mode 100644 recipes/dropbear/dropbear-0.53.1/fix-2kb-keys.patch
 create mode 100644 recipes/dropbear/dropbear-0.53.1/no-host-lookup.patch create mode 100644 recipes/dropbear/dropbear-0.53.1/urandom-xauth-changes-to-options.h.patch create mode 100644 recipes/dropbear/dropbear_0.53.1.bb

recipes/dropbear/dropbear-0.53.1/allow-nopw.patch new file +40 -0
new file mode 100644
index 0000000..3f3e8b1
@@ -0,0 +1,40 @@
+Index: dropbear-0.51/svr-auth.c
+===================================================================
+--- dropbear-0.51.orig/svr-auth.c
++++ dropbear-0.51/svr-auth.c
+@@ -270,7 +270,7 @@ static int checkusername(unsigned char *
+               send_msg_userauth_failure(0, 1);
+               return DROPBEAR_FAILURE;
+       }
+-
++#ifdef DISALLOW_EMPTY_PW
+       /* check for an empty password */
+       if (ses.authstate.pw_passwd[0] == '\0') {
+               TRACE(("leave checkusername: empty pword"))
+@@ -279,7 +279,7 @@ static int checkusername(unsigned char *
+               send_msg_userauth_failure(0, 1);
+               return DROPBEAR_FAILURE;
+       }
+-
++#endif
+       TRACE(("shell is %s", ses.authstate.pw_shell))
+
+       /* check that the shell is set */
+Index: dropbear-0.51/svr-authpasswd.c
+===================================================================
+--- dropbear-0.51.orig/svr-authpasswd.c
++++ dropbear-0.51/svr-authpasswd.c
+@@ -64,9 +64,13 @@ void svr_auth_password() {
+        * since the shadow password may differ to that tested
+        * in auth.c */
+       if (passwdcrypt[0] == '\0') {
++#ifdef DISALLOW_EMPTY_PW
+               dropbear_log(LOG_WARNING, "user '%s' has blank password, rejected",
+                               ses.authstate.pw_name);
+               send_msg_userauth_failure(0, 1);
++#else
++              send_msg_userauth_success();
++#endif
+               return;
+       }
+
recipes/dropbear/dropbear-0.53.1/configure.patch new file +27 -0
new file mode 100644
index 0000000..fa24efc
@@ -0,0 +1,27 @@
+Index: dropbear-0.50/configure.in
+===================================================================
+--- dropbear-0.50.orig/configure.in
++++ dropbear-0.50/configure.in
+@@ -164,14 +164,20 @@ AC_ARG_ENABLE(openpty,
+                       AC_MSG_NOTICE(Not using openpty)
+               else
+                       AC_MSG_NOTICE(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_NOTICE(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,
recipes/dropbear/dropbear-0.53.1/fix-2kb-keys.patch new file +12 -0
new file mode 100644
index 0000000..bb7a4d3
@@ -0,0 +1,12 @@
+Index: dropbear-0.50/kex.h
+===================================================================
+--- dropbear-0.50.orig/kex.h
++++ dropbear-0.50/kex.h
+@@ -59,6 +59,6 @@ struct KEXState {
+
+ };
+
+-#define MAX_KEXHASHBUF 2000
++#define MAX_KEXHASHBUF 3000
+
+ #endif /* _KEX_H_ */
recipes/dropbear/dropbear-0.53.1/no-host-lookup.patch new file +12 -0
new file mode 100644
index 0000000..d7c2ccd
@@ -0,0 +1,12 @@
+diff -urN dropbear-0.51/options.h dropbear-0.51.new/options.h
+--- dropbear-0.51/options.h    2008-03-27 14:34:39.000000000 +0100
++++ dropbear-0.51.new/options.h        2008-06-22 00:22:09.000000000 +0200
+@@ -112,7 +112,7 @@
+ /* #define DSS_PROTOK */
+
+ /* Whether to do reverse DNS lookups. */
+-#define DO_HOST_LOOKUP
++/* #define DO_HOST_LOOKUP */
+
+ /* Whether to print the message of the day (MOTD). This doesn't add much code
+  * size */
recipes/dropbear/dropbear-0.53.1/urandom-xauth-changes-to-options.h.patch new file +13 -0
new file mode 100644
index 0000000..bd1657d
@@ -0,0 +1,13 @@
+diff --git a/options.h b/options.h
+index d309ab4..7fbe97b 100644
+--- a/options.h
++++ b/options.h
+@@ -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/bin/X11/xauth -q"
++#define XAUTH_COMMAND "xauth -q"
+ #endif
+
+ /* if you want to enable running an sftp server (such as the one included with
recipes/dropbear/dropbear_0.53.1.bb new file +9 -1
new file mode 100644
index 0000000..fd6b970
@@ -0,0 +1,9 @@
+require dropbear.inc
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://no-host-lookup.patch"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI[md5sum] = "0284ea239083f04c8b874e08e1aca243"
+SRC_URI[sha256sum] = "e24d3cbecd3bc850b2b336b8eb50c845a285ceef8e22544938a582e163d36393"
--

1.7.0.4

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

#4 lore raw

Hi Khem,

Quoted 9 lines · Khem Raj
Quoted 5 lines · Eric Bénard

* 0.53.1 brings some improvements over 0.52 which was released more than 2 years ago. For more details, check the changelog here :
http://matt.ucc.asn.au/dropbear/CHANGES
* Please note that DROPBEAR_SMALL_CODEis now disabled which may increase the size of the binaries.

can you compare the sizes of .52 and .53.1 so we know how much it will be

Quoted 1 line

for an armv5 target :
0.53.1 : 228112
0.53.1 + DROPBEAR_SMALL_CODE : 178960
0.52 : 183008

Eric

#5 lore raw
Quoted 10 lines · Eric Benard

Hi Khem,

Quoted 7 lines · Khem Raj
Quoted 5 lines · Eric Bénard

* 0.53.1 brings some improvements over 0.52 which was released more than 2 years ago. For more details, check the changelog here :
http://matt.ucc.asn.au/dropbear/CHANGES
* Please note that DROPBEAR_SMALL_CODEis now disabled which may increase the size of the binaries.

Quoted 6 lines
Quoted 2 lines

can you compare the sizes of .52 and .53.1 so we know how much it will be

Quoted 1 line

for an armv5 target :
0.53.1 : 228112
0.53.1 + DROPBEAR_SMALL_CODE : 178960
0.52 : 183008

Looks like DROPBEAR_SMALL_CODE is still worth having then. Why was it disabled?

p.

#6 lore raw

Hi Phil,

Quoted 13 lines · Phil Blundell
Quoted 12 lines · Eric Benard

Hi Khem,

Quoted 9 lines · Khem Raj
Quoted 5 lines · Eric Bénard

* 0.53.1 brings some improvements over 0.52 which was released more than 2 years ago. For more details, check the changelog here :
http://matt.ucc.asn.au/dropbear/CHANGES
* Please note that DROPBEAR_SMALL_CODEis now disabled which may increase the size of the binaries.

can you compare the sizes of .52 and .53.1 so we know how much it will be

Quoted 1 line
Quoted 8 lines
Quoted 4 lines

for an armv5 target :
0.53.1 : 228112
0.53.1 + DROPBEAR_SMALL_CODE : 178960
0.52 : 183008

Looks like DROPBEAR_SMALL_CODE is still worth having then. Why was it disabled?

the changelog doesn't say it but the comment in option.h says :
/* Set this if you want to use the DROPBEAR_SMALL_CODE option. This can save several kB in binary size, however will make the symmetrical ciphers (AES, DES etc) slower (perhaps by 50%). Recommended for most small systems. */

so maybe they prefered to get performance by default instead of saving 50kB.

We can keep this option by adding this to the recipe :
+do_configure_prepend() {
+ echo "#define DROPBEAR_SMALL_CODE" >>${S}/options.h
+}
+

Eric

#7 lore raw

recipes/dropbear/dropbear-0.53.1/allow-nopw.patch line 21

Quoted 12 lines · Eric Benard

the changelog doesn't say it but the comment in option.h says :
/* Set this if you want to use the DROPBEAR_SMALL_CODE option. This can save several kB in binary size, however will make the symmetrical ciphers (AES, DES etc) slower (perhaps by 50%). Recommended for most small systems. */

so maybe they prefered to get performance by default instead of saving 50kB.

We can keep this option by adding this to the recipe :

recipes/dropbear/dropbear-0.53.1/allow-nopw.patch new file +4 -0
+do_configure_prepend() {
+       echo "#define DROPBEAR_SMALL_CODE" >>${S}/options.h
+}
+

Sounds like a good idea to me. I guess the performance might be an issue if you are doing lots of transfers with scp on a slow machine, but I've never heard anybody complaining about it. So I think we should stick with SMALL_CODE if possible.

p.

#8 lore raw

PATCH v2 1/1 dropbear: add 0.53.1

* 0.53.1 brings some improvements over 0.52 which was released more than 2 years ago. For more details, check the changelog here :
http://matt.ucc.asn.au/dropbear/CHANGES

---
 recipes/dropbear/dropbear-0.53.1/allow-nopw.patch  |   40 ++++++++++++++++++++
 recipes/dropbear/dropbear-0.53.1/configure.patch   |   27 +++++++++++++
 .../dropbear/dropbear-0.53.1/fix-2kb-keys.patch    |   12 ++++++
 .../dropbear/dropbear-0.53.1/no-host-lookup.patch  |   12 ++++++
 .../urandom-xauth-changes-to-options.h.patch       |   13 ++++++
 recipes/dropbear/dropbear_0.53.1.bb                |   13 ++++++
 6 files changed, 117 insertions(+), 0 deletions(-)
 create mode 100644 recipes/dropbear/dropbear-0.53.1/allow-nopw.patch
 create mode 100644 recipes/dropbear/dropbear-0.53.1/configure.patch
 create mode 100644 recipes/dropbear/dropbear-0.53.1/fix-2kb-keys.patch
 create mode 100644 recipes/dropbear/dropbear-0.53.1/no-host-lookup.patch
 create mode 100644 recipes/dropbear/dropbear-0.53.1/urandom-xauth-changes-to-options.h.patch
 create mode 100644 recipes/dropbear/dropbear_0.53.1.bb
recipes/dropbear/dropbear-0.53.1/allow-nopw.patch new file +40 -0
new file mode 100644
index 0000000..3f3e8b1
@@ -0,0 +1,40 @@
+Index: dropbear-0.51/svr-auth.c
+===================================================================
+--- dropbear-0.51.orig/svr-auth.c
++++ dropbear-0.51/svr-auth.c
+@@ -270,7 +270,7 @@ static int checkusername(unsigned char *
+ 		send_msg_userauth_failure(0, 1);
+ 		return DROPBEAR_FAILURE;
+ 	}
+-
++#ifdef DISALLOW_EMPTY_PW
+ 	/* check for an empty password */
+ 	if (ses.authstate.pw_passwd[0] == '\0') {
+ 		TRACE(("leave checkusername: empty pword"))
+@@ -279,7 +279,7 @@ static int checkusername(unsigned char *
+ 		send_msg_userauth_failure(0, 1);
+ 		return DROPBEAR_FAILURE;
+ 	}
+-
++#endif
+ 	TRACE(("shell is %s", ses.authstate.pw_shell))
+ 
+ 	/* check that the shell is set */
+Index: dropbear-0.51/svr-authpasswd.c
+===================================================================
+--- dropbear-0.51.orig/svr-authpasswd.c
++++ dropbear-0.51/svr-authpasswd.c
+@@ -64,9 +64,13 @@ void svr_auth_password() {
+ 	 * since the shadow password may differ to that tested
+ 	 * in auth.c */
+ 	if (passwdcrypt[0] == '\0') {
++#ifdef DISALLOW_EMPTY_PW
+ 		dropbear_log(LOG_WARNING, "user '%s' has blank password, rejected",
+ 				ses.authstate.pw_name);
+ 		send_msg_userauth_failure(0, 1);
++#else
++		send_msg_userauth_success();
++#endif
+ 		return;
+ 	}
+ 
recipes/dropbear/dropbear-0.53.1/configure.patch new file +27 -0
new file mode 100644
index 0000000..fa24efc
@@ -0,0 +1,27 @@
+Index: dropbear-0.50/configure.in
+===================================================================
+--- dropbear-0.50.orig/configure.in
++++ dropbear-0.50/configure.in
+@@ -164,14 +164,20 @@ AC_ARG_ENABLE(openpty,
+ 			AC_MSG_NOTICE(Not using openpty)
+ 		else
+ 			AC_MSG_NOTICE(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_NOTICE(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,
recipes/dropbear/dropbear-0.53.1/fix-2kb-keys.patch new file +12 -0
new file mode 100644
index 0000000..bb7a4d3
@@ -0,0 +1,12 @@
+Index: dropbear-0.50/kex.h
+===================================================================
+--- dropbear-0.50.orig/kex.h
++++ dropbear-0.50/kex.h
+@@ -59,6 +59,6 @@ struct KEXState {
+ 
+ };
+ 
+-#define MAX_KEXHASHBUF 2000
++#define MAX_KEXHASHBUF 3000
+ 
+ #endif /* _KEX_H_ */
recipes/dropbear/dropbear-0.53.1/no-host-lookup.patch new file +12 -0
new file mode 100644
index 0000000..d7c2ccd
@@ -0,0 +1,12 @@
+diff -urN dropbear-0.51/options.h dropbear-0.51.new/options.h
+--- dropbear-0.51/options.h	2008-03-27 14:34:39.000000000 +0100
++++ dropbear-0.51.new/options.h	2008-06-22 00:22:09.000000000 +0200
+@@ -112,7 +112,7 @@
+ /* #define DSS_PROTOK */
+ 
+ /* Whether to do reverse DNS lookups. */
+-#define DO_HOST_LOOKUP
++/* #define DO_HOST_LOOKUP */
+ 
+ /* Whether to print the message of the day (MOTD). This doesn't add much code
+  * size */
recipes/dropbear/dropbear-0.53.1/urandom-xauth-changes-to-options.h.patch new file +13 -0
new file mode 100644
index 0000000..bd1657d
@@ -0,0 +1,13 @@
+diff --git a/options.h b/options.h
+index d309ab4..7fbe97b 100644
+--- a/options.h
++++ b/options.h
+@@ -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/bin/X11/xauth -q"
++#define XAUTH_COMMAND "xauth -q"
+ #endif
+ 
+ /* if you want to enable running an sftp server (such as the one included with
recipes/dropbear/dropbear_0.53.1.bb new file +13 -0
new file mode 100644
index 0000000..d26b9e8
@@ -0,0 +1,13 @@
+require dropbear.inc
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://no-host-lookup.patch"
+
+do_configure_prepend() {
+	echo "#define DROPBEAR_SMALL_CODE" >>${S}/options.h
+}
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI[md5sum] = "0284ea239083f04c8b874e08e1aca243"
+SRC_URI[sha256sum] = "e24d3cbecd3bc850b2b336b8eb50c845a285ceef8e22544938a582e163d36393"
Signature · 1 line
1.7.0.4
Acked-by on v2 1/1
#9 lore raw
Quoted 5 lines · Eric Bénard

* 0.53.1 brings some improvements over 0.52 which was released more than 2 years ago. For more details, check the changelog here :
http://matt.ucc.asn.au/dropbear/CHANGES

a line or two about the define would be nice so people can disable/enable it if they want otherwise it looks better.

Quoted 177 lines

---
 recipes/dropbear/dropbear-0.53.1/allow-nopw.patch  |   40 ++++++++++++++++++++ recipes/dropbear/dropbear-0.53.1/configure.patch   |   27 +++++++++++++ .../dropbear/dropbear-0.53.1/fix-2kb-keys.patch    |   12 ++++++ .../dropbear/dropbear-0.53.1/no-host-lookup.patch  |   12 ++++++ .../urandom-xauth-changes-to-options.h.patch       |   13 ++++++ recipes/dropbear/dropbear_0.53.1.bb                |   13 ++++++

 6 files changed, 117 insertions(+), 0 deletions(-)

 create mode 100644 recipes/dropbear/dropbear-0.53.1/allow-nopw.patch
 create mode 100644 recipes/dropbear/dropbear-0.53.1/configure.patch
 create mode 100644 recipes/dropbear/dropbear-0.53.1/fix-2kb-keys.patch
 create mode 100644 recipes/dropbear/dropbear-0.53.1/no-host-lookup.patch create mode 100644 recipes/dropbear/dropbear-0.53.1/urandom-xauth-changes-to-options.h.patch create mode 100644 recipes/dropbear/dropbear_0.53.1.bb

recipes/dropbear/dropbear-0.53.1/allow-nopw.patch new file +40 -0
new file mode 100644
index 0000000..3f3e8b1
@@ -0,0 +1,40 @@
+Index: dropbear-0.51/svr-auth.c
+===================================================================
+--- dropbear-0.51.orig/svr-auth.c
++++ dropbear-0.51/svr-auth.c
+@@ -270,7 +270,7 @@ static int checkusername(unsigned char *
+               send_msg_userauth_failure(0, 1);
+               return DROPBEAR_FAILURE;
+       }
+-
++#ifdef DISALLOW_EMPTY_PW
+       /* check for an empty password */
+       if (ses.authstate.pw_passwd[0] == '\0') {
+               TRACE(("leave checkusername: empty pword"))
+@@ -279,7 +279,7 @@ static int checkusername(unsigned char *
+               send_msg_userauth_failure(0, 1);
+               return DROPBEAR_FAILURE;
+       }
+-
++#endif
+       TRACE(("shell is %s", ses.authstate.pw_shell))
+
+       /* check that the shell is set */
+Index: dropbear-0.51/svr-authpasswd.c
+===================================================================
+--- dropbear-0.51.orig/svr-authpasswd.c
++++ dropbear-0.51/svr-authpasswd.c
+@@ -64,9 +64,13 @@ void svr_auth_password() {
+        * since the shadow password may differ to that tested
+        * in auth.c */
+       if (passwdcrypt[0] == '\0') {
++#ifdef DISALLOW_EMPTY_PW
+               dropbear_log(LOG_WARNING, "user '%s' has blank password, rejected",
+                               ses.authstate.pw_name);
+               send_msg_userauth_failure(0, 1);
++#else
++              send_msg_userauth_success();
++#endif
+               return;
+       }
+
recipes/dropbear/dropbear-0.53.1/configure.patch new file +27 -0
new file mode 100644
index 0000000..fa24efc
@@ -0,0 +1,27 @@
+Index: dropbear-0.50/configure.in
+===================================================================
+--- dropbear-0.50.orig/configure.in
++++ dropbear-0.50/configure.in
+@@ -164,14 +164,20 @@ AC_ARG_ENABLE(openpty,
+                       AC_MSG_NOTICE(Not using openpty)
+               else
+                       AC_MSG_NOTICE(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_NOTICE(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,
recipes/dropbear/dropbear-0.53.1/fix-2kb-keys.patch new file +12 -0
new file mode 100644
index 0000000..bb7a4d3
@@ -0,0 +1,12 @@
+Index: dropbear-0.50/kex.h
+===================================================================
+--- dropbear-0.50.orig/kex.h
++++ dropbear-0.50/kex.h
+@@ -59,6 +59,6 @@ struct KEXState {
+
+ };
+
+-#define MAX_KEXHASHBUF 2000
++#define MAX_KEXHASHBUF 3000
+
+ #endif /* _KEX_H_ */
recipes/dropbear/dropbear-0.53.1/no-host-lookup.patch new file +12 -0
new file mode 100644
index 0000000..d7c2ccd
@@ -0,0 +1,12 @@
+diff -urN dropbear-0.51/options.h dropbear-0.51.new/options.h
+--- dropbear-0.51/options.h    2008-03-27 14:34:39.000000000 +0100
++++ dropbear-0.51.new/options.h        2008-06-22 00:22:09.000000000 +0200
+@@ -112,7 +112,7 @@
+ /* #define DSS_PROTOK */
+
+ /* Whether to do reverse DNS lookups. */
+-#define DO_HOST_LOOKUP
++/* #define DO_HOST_LOOKUP */
+
+ /* Whether to print the message of the day (MOTD). This doesn't add much code
+  * size */
recipes/dropbear/dropbear-0.53.1/urandom-xauth-changes-to-options.h.patch new file +13 -0
new file mode 100644
index 0000000..bd1657d
@@ -0,0 +1,13 @@
+diff --git a/options.h b/options.h
+index d309ab4..7fbe97b 100644
+--- a/options.h
++++ b/options.h
+@@ -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/bin/X11/xauth -q"
++#define XAUTH_COMMAND "xauth -q"
+ #endif
+
+ /* if you want to enable running an sftp server (such as the one included with
recipes/dropbear/dropbear_0.53.1.bb new file +13 -1
new file mode 100644
index 0000000..d26b9e8
@@ -0,0 +1,13 @@
+require dropbear.inc
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://no-host-lookup.patch"
+
+do_configure_prepend() {
+       echo "#define DROPBEAR_SMALL_CODE" >>${S}/options.h
+}
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI[md5sum] = "0284ea239083f04c8b874e08e1aca243"
+SRC_URI[sha256sum] = "e24d3cbecd3bc850b2b336b8eb50c845a285ceef8e22544938a582e163d36393"
--

1.7.0.4

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel