summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-12-17 15:10:32 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2013-12-17 15:10:32 +0100
commitccbd4f9bdb8d4a72281ae403e7150816ddca6f07 (patch)
tree7e207215dd68676ea39300ee964a1a4b54e937ab /package
parent0fc1d605ffc85952238ddda017f79158a36a0826 (diff)
parent3cd4a03f27da57d2317c5b285cf8ad1990bcdac2 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
-rw-r--r--package/dropbear/Makefile2
-rw-r--r--package/dropbear/files/dropbear.init8
-rw-r--r--package/xbmc/Makefile2
3 files changed, 10 insertions, 2 deletions
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 5a07ea5c5..503efa1e5 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= dropbear
PKG_VERSION:= 2013.62
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= ca2c7932a1399cf361f795aaa3843998
PKG_DESCR:= SSH 2 server/client designed for embedded systems
PKG_SECTION:= net/security
diff --git a/package/dropbear/files/dropbear.init b/package/dropbear/files/dropbear.init
index 11b91db49..955ae33c3 100644
--- a/package/dropbear/files/dropbear.init
+++ b/package/dropbear/files/dropbear.init
@@ -31,6 +31,14 @@ start)
echo "dropbear: key generation exited with code $?"
fi
fi
+ if test ! -f /etc/dropbear/dropbear_ecdsa_host_key; then
+ # take it easy here, since above already catched the worst cases
+ if test -x /usr/bin/dropbearkey; then
+ echo "dropbear: generating SSH private key (ECDSA)"
+ /usr/bin/dropbearkey -f /etc/dropbear/dropbear_ecdsa_host_key -t ecdsa
+ echo "dropbear: key generation exited with code $?"
+ fi
+ fi
/usr/sbin/dropbear $dropbear_flags
;;
stop)
diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
index 5eacadcc9..aa971d872 100644
--- a/package/xbmc/Makefile
+++ b/package/xbmc/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 3
PKG_MD5SUM:= 489f3877decae4e265ece54f9eaef0ba
PKG_DESCR:= software media player
PKG_SECTION:= multimedia
-PKG_DEPENDS:= boost libffmpeg python2 libstdcxx
+PKG_DEPENDS:= boost libffmpeg python2 libstdcxx bcm2835-vc
PKG_DEPENDS+= libglew mesalib libass libmpeg2 libmad dbus
PKG_DEPENDS+= libjpeg libogg libvorbis libmodplug libcurl
PKG_DEPENDS+= libflac libopenssl libbz2 libtiff liblzo