merge of 444d1a1c1d3bc630ab21c03a79787f3d2351a40b

     and dac5598f960dc940e35412e5c4235baf09f4afbf

5 files changed, 54 insertions, 5 deletions

diff --git a/packages/libetpan/libetpan-0.38/.mtn2git_empty b/packages/libetpan/libetpan-0.38/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libetpan/libetpan-0.38/.mtn2git_empty
diff --git a/packages/libetpan/libetpan-0.38/etpan_suffix.patch b/packages/libetpan/libetpan-0.38/etpan_suffix.patch
new file mode 100644
index 0000000000..901615c416
--- /dev/null
+++ b/packages/libetpan/libetpan-0.38/etpan_suffix.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- libetpan/configure.in~etpan_suffix
++++ libetpan/configure.in
+@@ -371,7 +371,7 @@
+   REENTRANT=1
+ else
+   REENTRANT=0
+-  LIBSUFFIX=-no-mt
++  LIBSUFFIX=
+ fi
+ AC_SUBST(LIBSUFFIX)
+ AC_SUBST(REENTRANT)
diff --git a/packages/libetpan/libetpan_0.38.bb b/packages/libetpan/libetpan_0.38.bb
new file mode 100644
index 0000000000..9dcb318b0c
--- /dev/null
+++ b/packages/libetpan/libetpan_0.38.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "libetpan is a library for communicating with mail and news servers using \
+SMTP, POP, IMAP and NNTP"
+SECTION = "libs"
+DEPENDS = "gnutls"
+LICENSE = "BSD"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \
+          file://etpan_suffix.patch;patch=1 "
+
+inherit autotools pkgconfig gettext
+
+EXTRA_OECONF = "--without-openssl --with-gnutls --disable-db --disable-threads"
+
+do_stage () {
+	oe_runmake install includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} bindir=${STAGING_BINDIR}
+}
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig"
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/msleep-vs-mdelay.patch b/packages/wlan-ng/wlan-ng-modules-0.2.2/msleep-vs-mdelay.patch
new file mode 100644
index 0000000000..d98116b07c
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-modules-0.2.2/msleep-vs-mdelay.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- linux-wlan-ng-0.2.2/src/prism2/driver/prism2_usb.c~msleep-vs-mdelay
++++ linux-wlan-ng-0.2.2/src/prism2/driver/prism2_usb.c
+@@ -279,7 +279,7 @@
+ 		 * is "wake up", so that's easy.
+ 		 * (I'd like a better way to do this, really.)
+ 		 */
+-		msleep(100);
++		mdelay(100);
+ 
+ 		/* Now delete the CTLXs, because no-one else can now. */
+ 		list_for_each_safe(entry, temp, &cleanlist) {
diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.2.bb b/packages/wlan-ng/wlan-ng-modules_0.2.2.bb
index 23bd888650..9a482447c6 100644
--- a/packages/wlan-ng/wlan-ng-modules_0.2.2.bb
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.2.bb
@@ -4,15 +4,13 @@ SECTION = "kernel/modules"
 DEPENDS = "virtual/kernel"
 RRECOMMENDS = "wlan-ng-utils"
 LICENSE = "GPL"
-PR = "r0"
-
-# missing symbols on module load
-DEFAULT_PREFERENCE = "-1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
 	file://no-compat.patch;patch=1 \
+	file://msleep-vs-mdelay.patch;patch=1 \
 	file://only-the-modules.patch;patch=1 \
-        file://compile-fix-HACK.patch;patch=1 \
+	file://compile-fix-HACK.patch;patch=1 \
 	file://config.in"
 S = "${WORKDIR}/linux-wlan-ng-${PV}"