From 9b7f5eba5fa07d65188d1f40b5bc244f0a2aa129 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 18 Oct 2009 12:04:02 +0200 Subject: update gcc, binutils, gdb, linux kernel, dnsmasq and alsa WARNING: tested only on qemu-x86 --- package/dropbear/files/dropbear.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/dropbear') diff --git a/package/dropbear/files/dropbear.init b/package/dropbear/files/dropbear.init index b1623c919..09eea25e4 100644 --- a/package/dropbear/files/dropbear.init +++ b/package/dropbear/files/dropbear.init @@ -10,7 +10,7 @@ bothlog() { case $1 in autostop) ;; autostart) - [[ $dropbear_flags = NO ]] && exit 0 + [[ "$dropbear_flags" = "NO" ]] && exit 0 exec sh $0 start ;; start) -- cgit v1.2.3 From eb10ac0e97c1e5e98ce73a1966c97a7cedb9d086 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 1 Dec 2009 19:40:13 +0100 Subject: use pkill for startup scripts - seems to solve the issue, that the same init script get killed otherwise - fine tune dansguardian, squid and iptables package - add default firewall config file (from freewrt) - add an example for transparent proxy via an ethernet bridge --- package/dropbear/files/dropbear.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/dropbear') diff --git a/package/dropbear/files/dropbear.init b/package/dropbear/files/dropbear.init index 09eea25e4..1c4c33745 100644 --- a/package/dropbear/files/dropbear.init +++ b/package/dropbear/files/dropbear.init @@ -30,7 +30,7 @@ start) /usr/sbin/dropbear $dropbear_flags ;; stop) - killall dropbear + pkill dropbear ;; restart) sh $0 stop -- cgit v1.2.3 From d9c9f5dfecc6d6cb24d45d478e0e7147d9c6f2dc Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 6 Dec 2009 11:35:02 +0100 Subject: update some packages, fix some kernel module dependencies - update tinc, openssl and xinetd - fix openssh and dropbear coexistence - fix some kernel module load orders --- package/dropbear/files/dropbear.init | 2 +- package/dropbear/files/dropbear.postinst | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'package/dropbear') diff --git a/package/dropbear/files/dropbear.init b/package/dropbear/files/dropbear.init index 1c4c33745..4a7d7a875 100644 --- a/package/dropbear/files/dropbear.init +++ b/package/dropbear/files/dropbear.init @@ -10,7 +10,7 @@ bothlog() { case $1 in autostop) ;; autostart) - [[ "$dropbear_flags" = "NO" ]] && exit 0 + test x"${dropbear:-NO}" = x"NO" && exit 0 exec sh $0 start ;; start) diff --git a/package/dropbear/files/dropbear.postinst b/package/dropbear/files/dropbear.postinst index b09c34147..11c7923bb 100644 --- a/package/dropbear/files/dropbear.postinst +++ b/package/dropbear/files/dropbear.postinst @@ -1,3 +1,4 @@ #!/bin/sh . $IPKG_INSTROOT/etc/functions.sh add_rcconf '"NO" to disable' dropbear_flags " " +add_rcconf dropbear dropbear YES -- cgit v1.2.3 From 75501a06c2e6b3df982ff3fa03dab9ecc16c9c2f Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sun, 20 Dec 2009 18:26:02 +0059 Subject: =?UTF-8?q?optional=20per-subpackage=20default=20other=20than=20?= =?UTF-8?q?=E2=80=98n=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thorsten Glaser --- package/dropbear/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package/dropbear') diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index 22a5680ac..43a157700 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -20,6 +20,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION})) +PKGDFLT_DROPBEAR:= y if !ADK_TOOLCHAIN_ONLY + CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-pam \ --enable-openpty \ -- cgit v1.2.3 From ce621815fecece2b4d8a4cb7115eb82c1cb7ed44 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 23 Dec 2009 11:37:42 +0100 Subject: remove and ignore autogenerated Config.in files --- package/dropbear/Config.in | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 package/dropbear/Config.in (limited to 'package/dropbear') diff --git a/package/dropbear/Config.in b/package/dropbear/Config.in deleted file mode 100644 index e12ca80f3..000000000 --- a/package/dropbear/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config ADK_PACKAGE_DROPBEAR - prompt "dropbear.......................... Small SSH 2 client/server" - tristate - default y if !ADK_TOOLCHAIN_ONLY - help - A small SSH 2 server/client designed for small memory environments. - - http://matt.ucc.asn.au/dropbear/ - -config ADK_PACKAGE_DBCONVERT - prompt "dropbearconvert................. Utility for converting SSH keys" - tristate - default n - depends on ADK_PACKAGE_DROPBEAR -- cgit v1.2.3 From 749979121e3c8a11c6df2b68c76a7b119d29d6df Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 22 Jan 2010 18:06:02 +0100 Subject: disable dss, fix path to xauth X11 forwarding needs xauth. Package will be ported soon. Fix the path to xauth. Disable DSS, because we only use RSA hostkeys by default. This avoids a errormessage when starting dropbear. --- package/dropbear/patches/patch-options_h | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'package/dropbear') diff --git a/package/dropbear/patches/patch-options_h b/package/dropbear/patches/patch-options_h index c25f10856..b0903f45d 100644 --- a/package/dropbear/patches/patch-options_h +++ b/package/dropbear/patches/patch-options_h @@ -1,6 +1,6 @@ $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 2009-03-19 19:24:46.000000000 +0100 ++++ dropbear-0.52/options.h 2010-01-22 17:55:09.000000000 +0100 @@ -10,6 +10,11 @@ * parts are to allow for commandline -DDROPBEAR_XXX options etc. ******************************************************************/ @@ -13,6 +13,15 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ #ifndef DROPBEAR_DEFPORT #define DROPBEAR_DEFPORT "22" #endif +@@ -115,7 +120,7 @@ etc) slower (perhaps by 50%). Recommende + * Removing either of these won't save very much space. + * SSH2 RFC Draft requires dss, recommends rsa */ + #define DROPBEAR_RSA +-#define DROPBEAR_DSS ++/* #define DROPBEAR_DSS */ + + /* RSA can be vulnerable to timing attacks which use the time required for + * signing to guess the private key. Blinding avoids this attack, though makes @@ -129,7 +134,7 @@ etc) slower (perhaps by 50%). Recommende /* #define DSS_PROTOK */ @@ -22,3 +31,12 @@ $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 + /* 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/xauth -q" + #endif + + /* if you want to enable running an sftp server (such as the one included with -- cgit v1.2.3 From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 7 Feb 2010 20:03:20 +0100 Subject: change defaults for CONFIG/BUILD/INSTALL styles All packages need an update, so here is a very huge commit. Most of the 460 source packages use automatic style for configuration, building and installing. Make these styles default to "auto". If you have a package, which does not conform to this, just use manual style and add a do-$task make target. I added a new style named AUTOTOOL style, which is needed for some broken packages, which needs to be updated via autoconf or automake. I renamed CONFIGURE_STYLE to CONFIG_STYLE. Updates for some packages, which have newer upstream versions. Renaming of all package/*/extra directories. Use the directory src/ to provide overwrites of source files or to add the code, when no upstream package is available or used. src directory will be automatically used. --- package/dropbear/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'package/dropbear') diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index 43a157700..6625cb21c 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -7,22 +7,23 @@ PKG_NAME:= dropbear PKG_VERSION:= 0.52 PKG_RELEASE:= 1 PKG_MD5SUM:= 1c69ec674481d7745452f68f2ea5597e -PKG_DESCR:= SSH 2 server/client designed for small memory environments +PKG_DESCR:= SSH 2 server/client designed for embedded systems PKG_SECTION:= net PKG_URL:= http://matt.ucc.asn.au/dropbear -PKG_SITES:= http://matt.ucc.asn.au/dropbear/releases/ \ - http://www.mirrors.wiretapped.net/security/cryptography/apps/ssh/dropbear/ +PKG_SITES:= http://matt.ucc.asn.au/dropbear/releases/ -PKG_DESCR_1:= Utility for converting SSH keys +PKG_DESCR_UTIL:= Utility for converting SSH keys include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION})) +$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_UTIL},${PKG_SECTION})) PKGDFLT_DROPBEAR:= y if !ADK_TOOLCHAIN_ONLY -CONFIGURE_STYLE= gnu +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + CONFIGURE_ARGS+= --disable-pam \ --enable-openpty \ --enable-syslog \ -- cgit v1.2.3