summaryrefslogtreecommitdiff
path: root/package/dropbear
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-05-24 20:15:39 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2009-05-24 20:15:39 +0200
commit57f1ccba214ee4d658fe2bcd61ef51651ade3225 (patch)
treeb18a2c5f6d6fc42a9228daa4cf671f517e5a4a43 /package/dropbear
parentf3e84309257b915cb8820917a8dd5578f02fe974 (diff)
parent6f63961c83bdb1791779975a36ebd28a0de247d6 (diff)
Merge branch 'master' of ssh://openadk.org/git/openadk
fic conflicts Conflicts: package/gnutls/Makefile package/mrd6/Makefile
Diffstat (limited to 'package/dropbear')
-rw-r--r--package/dropbear/Makefile13
-rw-r--r--package/dropbear/patches/patch-svr-main_c15
2 files changed, 17 insertions, 11 deletions
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 63b3e54e7..a7177388c 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -14,8 +14,8 @@ MASTER_SITES:= http://matt.ucc.asn.au/dropbear/releases/ \
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-pam \
@@ -42,14 +42,6 @@ do-build:
cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} \
PROGRAMS=dropbearconvert
-# evaluate startup options according to menuconfig selection
-DROPBEAR-OPTS-y = -g
-DROPBEAR-OPTS-$(ADK_RUNTIME_SSH_DISABLE_NOTHING) =
-DROPBEAR-OPTS-$(ADK_RUNTIME_SSH_DISABLE_PASSWORD_FOR_ROOT) = -g
-DROPBEAR-OPTS-$(ADK_RUNTIME_SSH_DISABLE_PASSWORD) = -s
-DROPBEAR-OPTS-$(ADK_RUNTIME_SSH_DISABLE_ROOT) = -w
-DROPBEAR-OPTS-$(ADK_RUNTIME_SSH_DISABLE_ROOT_AND_PASSWORD) = -w -s
-
do-install:
# main package
$(INSTALL_DIR) $(IDIR_DROPBEAR)/etc/init.d
@@ -63,7 +55,6 @@ do-install:
ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/dropbearkey
$(INSTALL_DATA) ./files/dropbear.init \
$(IDIR_DROPBEAR)/etc/init.d/dropbear
- $(SED) "s/@OPTIONS@/$(DROPBEAR-OPTS-y)/g" $(IDIR_DROPBEAR)/CONTROL/postinst
# subpackage dropbearconvert
$(INSTALL_DIR) $(IDIR_DBCONVERT)/usr/bin
$(INSTALL_BIN) $(WRKBUILD)/dropbearconvert \
diff --git a/package/dropbear/patches/patch-svr-main_c b/package/dropbear/patches/patch-svr-main_c
new file mode 100644
index 000000000..eaf066158
--- /dev/null
+++ b/package/dropbear/patches/patch-svr-main_c
@@ -0,0 +1,15 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+
+ * bzero is obsolete, use memset
+
+--- dropbear-0.52.orig/svr-main.c 2008-11-11 15:09:03.000000000 +0100
++++ dropbear-0.52/svr-main.c 2009-05-23 16:13:30.569366604 +0200
+@@ -133,7 +133,7 @@ void main_noinetd() {
+ for (i = 0; i < MAX_UNAUTH_CLIENTS; i++) {
+ childpipes[i] = -1;
+ }
+- bzero(preauth_addrs, sizeof(preauth_addrs));
++ memset(preauth_addrs, 0, sizeof(preauth_addrs));
+
+ /* Set up the listening sockets */
+ listensockcount = listensockets(listensocks, MAX_LISTEN_ADDR, &maxsock);