Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/02/23 12:40:33+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/23 12:36:37+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/23 11:34:13+01:00 mn-solutions.de!schurig
Merge http://oe-devel@openembedded.bkbits.net/openembedded
into mnz66.mn-solutions.de:/usr/src/oe/p

2005/02/23 11:33:31+01:00 mn-solutions.de!schurig
fix installation stage

2005/02/23 09:27:44+00:00 (none)!xora
New upstream version of kismet, fixes for compilation problems, and change of maintainer with Brunos permission

2005/02/23 01:11:25+01:00 uni-frankfurt.de!mickeyl
add a sharprom-compatible distro configuration. relies on an external 2.95.3 toolchain (for now... until someone adds it to OE) and needs further work. It's a start for someone interested though.

2005/02/23 01:09:23+01:00 uni-frankfurt.de!mickeyl
bump cvsdate on oz-3.5.3

2005/02/22 17:37:44-06:00 ti.com!kergoth
Fix the quilt PATCHCMD to stop rampantly chmod'ing, which made the CVS directories not executable, thereby screwing up the ability to rm -rf tmp.  Thanks to holger freyther for pointing it out.

BKrev: 421c7b62hBWfitoVhb3IO3ZT5nS71A

3 files changed, 139 insertions, 13 deletions

diff --git a/packages/dropbear/dropbear_0.42.bb b/packages/dropbear/dropbear_0.42.bb
index e69de29bb2..ef76beb172 100644
--- a/packages/dropbear/dropbear_0.42.bb
+++ b/packages/dropbear/dropbear_0.42.bb
@@ -0,0 +1,63 @@
+SECTION = "console/network"
+DESCRIPTION = "Dropbear SSH Implementation"
+LICENSE = "MIT"
+DEPENDS = "zlib"
+PR = "r4"
+
+SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
+	   file://configure.patch;patch=1 \
+	   file://allow-nopw.patch;patch=1 \
+	   file://multi-binary.patch;patch=1 \
+	   file://init"
+S = "${WORKDIR}/dropbear-${PV}"
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "dropbear"
+INITSCRIPT_PARAMS = "defaults 10"
+
+CFLAGS_prepend = "-I. "
+LD = "${CC}"
+
+do_compile () {
+	oe_runmake dropbearmulti
+}
+
+do_install () {
+	install -d ${D}${sysconfdir} \
+		   ${D}${sysconfdir}/init.d \
+		   ${D}${sysconfdir}/default \
+		   ${D}${sysconfdir}/dropbear \
+		   ${D}${sbindir} \
+		   ${D}${localstatedir}
+
+	install -m 0755 dropbearmulti ${D}${sbindir}/
+	cd ${D}${sbindir}/ && ln -s ./dropbearmulti dropbear && ln -s ./dropbearmulti dropbearkey && ln -s ./dropbearmulti dropbearconvert
+#	autotools_do_install
+	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 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 () {
+
+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/packages/dropbear/dropbear_0.43.bb b/packages/dropbear/dropbear_0.43.bb
index e69de29bb2..957b88bc49 100644
--- a/packages/dropbear/dropbear_0.43.bb
+++ b/packages/dropbear/dropbear_0.43.bb
@@ -0,0 +1,63 @@
+SECTION = "console/network"
+DESCRIPTION = "Dropbear SSH Implementation"
+LICENSE = "MIT"
+DEPENDS = "zlib"
+PR = "r6"
+
+SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
+	   file://configure.patch;patch=1 \
+	   file://allow-nopw.patch;patch=1 \
+	   file://multi-binary.patch;patch=1 \
+	   file://init"
+S = "${WORKDIR}/dropbear-${PV}"
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "dropbear"
+INITSCRIPT_PARAMS = "defaults 10"
+
+CFLAGS_prepend = "-I. "
+LD = "${CC}"
+
+do_compile () {
+	oe_runmake dropbearmulti
+}
+
+do_install () {
+	install -d ${D}${sysconfdir} \
+		   ${D}${sysconfdir}/init.d \
+		   ${D}${sysconfdir}/default \
+		   ${D}${sysconfdir}/dropbear \
+		   ${D}${sbindir} \
+		   ${D}${localstatedir}
+
+	install -m 0755 dropbearmulti ${D}${sbindir}/
+	cd ${D}${sbindir}/ && ln -s ./dropbearmulti dropbear && ln -s ./dropbearmulti dropbearkey && ln -s ./dropbearmulti dropbearconvert
+#	autotools_do_install
+	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 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 () {
+
+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/packages/dropbear/dropbear_0.44.bb b/packages/dropbear/dropbear_0.44.bb
index f9b706d6f9..0812c71aa4 100644
--- a/packages/dropbear/dropbear_0.44.bb
+++ b/packages/dropbear/dropbear_0.44.bb
@@ -27,29 +27,29 @@ BINCOMMANDS = "dbclient ssh scp"
 EXTRA_OEMAKE = '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 dropbearmulti ${D}/${sbindir}/
+	install -d ${D}${sysconfdir} \
+		   ${D}${sysconfdir}/init.d \
+		   ${D}${sysconfdir}/default \
+		   ${D}${sysconfdir}/dropbear \
+                   ${D}${bindir} \
+		   ${D}${sbindir} \
+		   ${D}${localstatedir}
+
+	install -m 0755 dropbearmulti ${D}${sbindir}/
 	for i in ${BINCOMMANDS}
 	do
-		ln -s ${sbindir}/dropbearmulti ${D}/${bindir}/$i
+		ln -s ${sbindir}/dropbearmulti ${D}${bindir}/$i
 	done
 	for i in ${SBINCOMMANDS}
 	do
-		ln -s ./dropbearmulti ${D}/${sbindir}/$i
+		ln -s ./dropbearmulti ${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
+				  -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/dropbear
+	chmod 755 ${D}${sysconfdir}/init.d/dropbear
 }
 
 pkg_postrm_append () {