merge of '15b74f4a5710e603d60db9716cb6cb0619511ac7'

     and '8961e177cdb0b701e3bb0304ec24d5c4a3947254'

13 files changed, 145 insertions, 13 deletions

diff --git a/packages/nonworking/libmikey/.mtn2git_empty b/packages/nonworking/libmikey/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nonworking/libmikey/.mtn2git_empty
diff --git a/packages/nonworking/libmikey/libmikey0_0.3.2.bb b/packages/nonworking/libmikey/libmikey0_0.3.2.bb
new file mode 100644
index 0000000000..214faef40f
--- /dev/null
+++ b/packages/nonworking/libmikey/libmikey0_0.3.2.bb
@@ -0,0 +1,23 @@
+LICENSE = "LGPL"
+
+DESCRIPTION = "C++ implementation of the Multimedia Internet KEYing (RFC3830)"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "libmutil0 openssl"
+
+inherit autotools
+
+SRC_URI = "http://www.minisip.org/snapshots/libmikey-${PV}.tar.gz"
+S="${WORKDIR}/libmikey-${PV}"
+
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = " ${libdir}/libmikey.so.0 ${libdir}/libmikey.so.0.0.0 "
+
+do_stage() {
+	oe_libinstall -a -so libmikey ${STAGING_LIBDIR}
+
+	install -d ${STAGING_INCDIR}/libmikey
+	install -m 0644 ${S}/include/libmikey/* ${STAGING_INCDIR}/libmikey
+}
diff --git a/packages/nonworking/libmikey/libmikey_0.1a.bb b/packages/nonworking/libmikey/libmikey_0.1a.bb
new file mode 100644
index 0000000000..e00ce25594
--- /dev/null
+++ b/packages/nonworking/libmikey/libmikey_0.1a.bb
@@ -0,0 +1,23 @@
+LICENSE = "GPL"
+DESCRIPTION = "libmikey is a C++ library that implements the IETF work-in-progress MIKEY protocol."
+HOMEPAGE = "http://minisip.org/libmikey"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "openssl"
+
+SRC_URI = "http://minisip.org/source/libmikey-${PV}.tar.gz"
+S = "${WORKDIR}/libmikey-0.1"
+
+inherit autotools
+
+do_configure() {
+	gnu-configize
+	oe_runconf
+}
+
+do_stage() {
+	oe_libinstall -so libmikey ${STAGING_LIBDIR}
+
+	install -d ${STAGING_INCDIR}/libmikey
+	install -m 0644 include/libmikey/*.h ${STAGING_INCDIR}/libmikey/
+}
diff --git a/packages/nonworking/libmnetutil/.mtn2git_empty b/packages/nonworking/libmnetutil/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nonworking/libmnetutil/.mtn2git_empty
diff --git a/packages/nonworking/libmnetutil/libmnetutil0_0.2.2.bb b/packages/nonworking/libmnetutil/libmnetutil0_0.2.2.bb
new file mode 100644
index 0000000000..a7866b35ec
--- /dev/null
+++ b/packages/nonworking/libmnetutil/libmnetutil0_0.2.2.bb
@@ -0,0 +1,23 @@
+LICENSE = "LGPL"
+
+DESCRIPTION = "Networking class library for C++ programming"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "libmutil0 openssl"
+
+inherit autotools
+
+SRC_URI = "http://www.minisip.org/snapshots/libmnetutil-${PV}.tar.gz"
+S="${WORKDIR}/libmnetutil-${PV}"
+
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = " ${libdir}/libmnetutil.so.0 ${libdir}/libmnetutil.so.0.0.0 "
+
+do_stage() {
+	oe_libinstall -a -so libmnetutil ${STAGING_LIBDIR}
+
+	install -d ${STAGING_INCDIR}/libmnetutil
+	install -m 0644 ${S}/include/libmnetutil/* ${STAGING_INCDIR}/libmnetutil
+}
diff --git a/packages/nonworking/libmsip/.mtn2git_empty b/packages/nonworking/libmsip/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nonworking/libmsip/.mtn2git_empty
diff --git a/packages/nonworking/libmsip/libmsip0_0.2.2.bb b/packages/nonworking/libmsip/libmsip0_0.2.2.bb
new file mode 100644
index 0000000000..8d8bb905db
--- /dev/null
+++ b/packages/nonworking/libmsip/libmsip0_0.2.2.bb
@@ -0,0 +1,23 @@
+LICENSE = "LGPL"
+
+DESCRIPTION = "C++ implementation Session Initiation Protocol (RFC3261)"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "libmnetutil0 libmutil0"
+
+inherit autotools
+
+SRC_URI = "http://www.minisip.org/snapshots/libmsip-${PV}.tar.gz"
+S="${WORKDIR}/libmsip-${PV}"
+
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = " ${libdir}/libmsip.so.0 ${libdir}/libmsip.so.0.0.0 "
+
+do_stage() {
+	oe_libinstall -a -so libmsip ${STAGING_LIBDIR}
+
+	install -d ${STAGING_INCDIR}/libmsip
+	install -m 0644 ${S}/include/libmsip/* ${STAGING_INCDIR}/libmsip
+}
diff --git a/packages/nonworking/minisip/minisip_0.6.2.bb b/packages/nonworking/minisip/minisip_0.6.2.bb
new file mode 100644
index 0000000000..b85007deef
--- /dev/null
+++ b/packages/nonworking/minisip/minisip_0.6.2.bb
@@ -0,0 +1,21 @@
+LICENSE = "GPL"
+SECTION = "x11/utils"
+PR = "r0"
+
+DESCRIPTION = "SIP user agent, with focus on security"
+DEPENDS = "libglademm libmsip0 libmikey0"
+SRC_URI = "http://www.minisip.org/snapshots/minisip-${PV}.tar.gz"
+
+
+FILES_${PN} += "${datadir}/minisip"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-ipaq"
+
+do_install_append () {
+	install -d ${D}${datadir}/pixmaps
+	install -d ${D}${datadir}/applications
+	install -m 0644 share/minisip.png ${D}${datadir}/pixmaps/minisip.png
+	install -m 0644 share/minisip.desktop ${D}${datadir}/applications/minisip.desktop
+}
diff --git a/packages/nonworking/minisip/minisip_1.0a.bb b/packages/nonworking/minisip/minisip_1.0a.bb
deleted file mode 100644
index 14ce425b0e..0000000000
--- a/packages/nonworking/minisip/minisip_1.0a.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Minisip is a SIP User Agent"
-SECTION = "opie/network"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "libmikey libopie1"
-
-SRC_URI = "http://minisip.org/source/minisip-0.1a.tar.gz"
-S = "${WORKDIR}/minisip-0.1"
-
-inherit autotools
-
-EXTRA_OECONF = "--enable-qte --enable-opie"
-
diff --git a/packages/nonworking/nylon/.mtn2git_empty b/packages/nonworking/nylon/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nonworking/nylon/.mtn2git_empty
diff --git a/packages/nonworking/nylon/simple-firewall.bb b/packages/nonworking/nylon/simple-firewall.bb
new file mode 100644
index 0000000000..fc7c3de6a3
--- /dev/null
+++ b/packages/nonworking/nylon/simple-firewall.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "simple firewall configuratiopn script"
+SECTION = "base"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "virtual/kernel"
+#SRCDATE = "20060114"
+SRCDATE = "20070130"
+#SRCDATE = "${TOMORROW}"
+PV = "cvs${SRCDATE}"
+
+SRC_URI = "svn://gruen.4g/svn/trunk/application;module=${PN};proto=http"
+S = "${WORKDIR}/${PN}"
+
+do_install() {
+	(cd ${S}; tar -c --exclude .svn -f - . ) | tar -C ${D} -xpf -
+}
diff --git a/packages/nonworking/redboot-utils/.mtn2git_empty b/packages/nonworking/redboot-utils/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nonworking/redboot-utils/.mtn2git_empty
diff --git a/packages/nonworking/redboot-utils/fis_1.0.bb b/packages/nonworking/redboot-utils/fis_1.0.bb
new file mode 100644
index 0000000000..d1170b6ba8
--- /dev/null
+++ b/packages/nonworking/redboot-utils/fis_1.0.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Tool to edit the Redboot FIS partition layout from userspace"
+PR = "r2"
+
+SRC_URI = "http://svn.chezphil.org/utils/trunk/fis.c \
+	   svn://svn.chezphil.org/;module=libpbe;proto=http"
+
+do_compile() {
+	${CC} --std=c99 -Os -W -o fis ${WORKDIR}/fis.c
+}
+
+do_install() {
+	${STRIP} ${WORKDIR}/fis-${PV}/fis
+
+	install -d ${D}/${sbindir}
+	install -m 755 ${WORKDIR}/fis-${PV}/fis ${D}/${sbindir}
+}