6 files changed, 2 insertions, 58 deletions
diff --git a/dropbear/dropbear-0.43+0.44test3/allow-nopw.patch b/dropbear/dropbear-0.43+0.44test4/allow-nopw.patch
index e69de29bb2..e69de29bb2 100644
--- a/dropbear/dropbear-0.43+0.44test3/allow-nopw.patch
+++ b/dropbear/dropbear-0.43+0.44test4/allow-nopw.patch
diff --git a/dropbear/dropbear-0.43+0.44test3/configure.patch b/dropbear/dropbear-0.43+0.44test4/configure.patch
index e69de29bb2..e69de29bb2 100644
--- a/dropbear/dropbear-0.43+0.44test3/configure.patch
+++ b/dropbear/dropbear-0.43+0.44test4/configure.patch
diff --git a/dropbear/dropbear-0.43+0.44test3/multi-binary.patch b/dropbear/dropbear-0.43+0.44test4/multi-binary.patch
index e69de29bb2..e69de29bb2 100644
--- a/dropbear/dropbear-0.43+0.44test3/multi-binary.patch
+++ b/dropbear/dropbear-0.43+0.44test4/multi-binary.patch
diff --git a/dropbear/dropbear_0.43+0.44test3.oe b/dropbear/dropbear_0.43+0.44test3.oe
deleted file mode 100644
index 8a08e48f0a..0000000000
--- a/dropbear/dropbear_0.43+0.44test3.oe
+++ /dev/null
@@ -1,58 +0,0 @@
-DESCRIPTION = "Dropbear SSH Implementation"
-LICENSE = "MIT"
-DEPENDS = "zlib ncurses"
-PR = "r3"
-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_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+0.44test4.oe b/dropbear/dropbear_0.43+0.44test4.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/dropbear/dropbear_0.43+0.44test4.oe
diff --git a/libqpe/libqpe-opie_cvs.oe b/libqpe/libqpe-opie_cvs.oe
index 882b688999..68c3fad08f 100644
--- a/libqpe/libqpe-opie_cvs.oe
+++ b/libqpe/libqpe-opie_cvs.oe
@@ -6,6 +6,7 @@ LICENSE = "GPL"
 DEPENDS = "uicmoc-native qte-for-opie"
 PROVIDES = "virtual/libqpe"
 PV = "1.1.5-cvs-${CVSDATE}"
+PR = "r1"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/library"
 S = "${WORKDIR}/library"
@@ -16,6 +17,7 @@ QMAKE_PROFILES = "library.pro"
 
 export QTDIR = "${STAGING_LIBDIR}/.."
 export OPIEDIR = "${STAGING_LIBDIR}/.."
+EXTRA_QMAKEVARS_PRE  = "CONFIG+=LIBQPE_WITHROHFEEDBACK"
 EXTRA_QMAKEVARS_POST = "DESTDIR="
 
 CXXFLAGS_append = " -DQWS -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC  -fno-rtti -fno-exceptions"