Merge bk://openembedded@openembedded.bkbits.net/packages

into marcinj.local:/home/hrw/zaurus/oe/packages

2004/09/01 15:12:06+02:00 local!hrw
dropbear: undo one change to get keys generated

BKrev: 4135cabeby0DFHYBnIAhgOQTgAZpTw

2 files changed, 76 insertions, 8 deletions

diff --git a/dropbear/dropbear_0.43+0.44test3.oe b/dropbear/dropbear_0.43+0.44test3.oe
index e69de29bb2..0fc8736f0d 100644
--- a/dropbear/dropbear_0.43+0.44test3.oe
+++ b/dropbear/dropbear_0.43+0.44test3.oe
@@ -0,0 +1,69 @@
+DESCRIPTION = "Dropbear SSH Implementation"
+LICENSE = "MIT"
+DEPENDS = "zlib ncurses"
+PR = "r2"
+RV = "0.44test3"
+
+SRC_URI = "http://matt.ucc.asn.au/dropbear/testing/dropbear-${RV}.tar.bz2 \
+	   file://configure.patch;patch=1 \
+	   file://allow-nopw.patch;patch=1 \
+	   file://init"
+S = "${WORKDIR}/dropbear-${RV}"
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "dropbear"
+INITSCRIPT_PARAMS = "defaults 10"
+
+CFLAGS_prepend = "-I. "
+LD = "${CC}"
+
+SBINCOMMANDS = "dropbear dropbearkey dropbearconvert"
+BINCOMMANDS = "dbclient ssh scp"
+EXTRA_OEMAKE = 'STATIC=1 MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
+
+do_install () {
+	install -d ${D}/${sysconfdir} \
+		   ${D}/${sysconfdir}/init.d \
+		   ${D}/${sysconfdir}/default \
+		   ${D}/${sysconfdir}/dropbear \
+                   ${D}/${bindir} \
+		   ${D}/${sbindir} \
+		   ${D}/${localstatedir}
+
+	install -m 0755 staticdropbearmulti ${D}/${sbindir}/
+	for i in ${BINCOMMANDS}
+	do
+		ln -s ${sbindir}/staticdropbearmulti ${D}/${bindir}/$i
+	done
+	for i in ${SBINCOMMANDS}
+	do
+		ln -s ./staticdropbearmulti ${D}/${sbindir}/$i
+	done
+	cat ${WORKDIR}/init | sed -e 's,/etc,${sysconfdir},g' \
+				  -e 's,/usr/sbin,${sbindir},g' \
+				  -e 's,/var,${localstatedir},g' \
+				  -e 's,/usr/bin,${bindir},g' \
+				  -e 's,/usr,${prefix},g' > ${D}/${sysconfdir}/init.d/dropbear
+	chmod 755 ${D}/${sysconfdir}/init.d/dropbear
+}
+
+pkg_postinst_append () {
+
+if [ ! -n "$D"  ]; then
+if [ ! -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
+        dropbearkey -t rsa -f ${sysconfdir}/dropbear/dropbear_rsa_host_key
+fi
+#if [ ! -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then
+#       dropbearkey -t dss -f ${sysconfdir}/dropbear/dropbear_dss_host_key
+#fi
+}
+
+pkg_postrm_append () {
+  if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
+        rm ${sysconfdir}/dropbear/dropbear_rsa_host_key
+  fi
+  if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then
+        rm ${sysconfdir}/dropbear/dropbear_dss_host_key
+  fi
+}
diff --git a/dropbear/dropbear_0.43.oe b/dropbear/dropbear_0.43.oe
index ba9d28238c..1c4330c382 100644
--- a/dropbear/dropbear_0.43.oe
+++ b/dropbear/dropbear_0.43.oe
@@ -1,7 +1,7 @@
 DESCRIPTION = "Dropbear SSH Implementation"
 LICENSE = "MIT"
 DEPENDS = "zlib ncurses"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1 \
@@ -42,14 +42,13 @@ do_install () {
 }
 pkg_postinst_append () {
 
-if [ ! -n "$D"  ]; then
-	if [ ! -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
-		dropbearkey -t rsa -f ${sysconfdir}/dropbear/dropbear_rsa_host_key
-	fi
-	#if [ ! -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then
-	#	dropbearkey -t dss -f ${sysconfdir}/dropbear/dropbear_dss_host_key
-	#fi
+if [ -n "$D"  ]; then exit 1; fi
+if [ ! -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
+	dropbearkey -t rsa -f ${sysconfdir}/dropbear/dropbear_rsa_host_key
 fi
+#if [ ! -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then
+#	dropbearkey -t dss -f ${sysconfdir}/dropbear/dropbear_dss_host_key
+#fi
 }
 
 pkg_postrm_append () {