[wvdial, wvstreams] update to lastest version in oe-core.

diff --git a/meta-openvuplus/recipes-connectivity/wvdial/wvdial-1.60/wvdial-vuplus_001.patch b/meta-openvuplus/recipes-connectivity/wvdial/wvdial-1.60/wvdial-vuplus_001.patch
deleted file mode 100644 (file)
index f897a5c..0000000
--- a/meta-openvuplus/recipes-connectivity/wvdial/wvdial-1.60/wvdial-vuplus_001.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/wvmodemscan.cc b/wvmodemscan.cc
-index bf59924..ef5ab87 100644
---- a/wvmodemscan.cc
-+++ b/wvmodemscan.cc
-@@ -485,6 +485,7 @@ const char *WvModemScan::is_isdn() const
- 
- static int fileselect(const struct dirent *e)
- {
-+#if 0
-     return !strncmp(e->d_name, "ttyS", 4)             // serial
-        || !strncmp(e->d_name, "ttyLT", 5)     // Lucent WinModem
-        || !strncmp(e->d_name, "ttyACM", 6)      // USB acm Modems
-@@ -493,6 +494,13 @@ static int fileselect(const struct dirent *e)
-        || !strncmp(e->d_name, "ttySL", 5);    // SmartLink WinModem
- 
-       // (no internal ISDN support)   || !strncmp(e->d_name, "ttyI", 4);
-+#else
-+    return !strncmp(e->d_name, "ttyLT", 5)      // Lucent WinModem
-+       || !strncmp(e->d_name, "ttyACM", 6)      // USB acm Modems
-+       || !strncmp(e->d_name, "ttyUSB", 6)      // Modems on USB RS232
-+       || !strncmp(e->d_name, "ircomm", 6)      // Handys over IrDA
-+       || !strncmp(e->d_name, "ttySL", 5);      // SmartLink WinModem
-+#endif
- }
- 
- 

diff --git a/meta-openvuplus/recipes-connectivity/wvdial/wvdial-1.60/wvdial_fileselect.patch b/meta-openvuplus/recipes-connectivity/wvdial/wvdial-1.60/wvdial_fileselect.patch
deleted file mode 100644 (file)
index 467cbec..0000000
--- a/meta-openvuplus/recipes-connectivity/wvdial/wvdial-1.60/wvdial_fileselect.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/wvmodemscan.cc b/wvmodemscan.cc
-index ef5ab87..f97581e 100644
---- a/wvmodemscan.cc
-+++ b/wvmodemscan.cc
-@@ -503,11 +503,16 @@ static int fileselect(const struct dirent *e)
- #endif
- }
- 
--
-+#if defined(__GLIBC__) && __GLIBC_PREREQ(2, 10)
-+static int filesort(const struct dirent **e1, const struct dirent **e2)
-+#else
- static int filesort(const void *_e1, const void *_e2)
-+#endif
- {
-+#if !(defined(__GLIBC__) && __GLIBC_PREREQ(2, 10))
-     dirent const * const *e1 = (dirent const * const *)_e1;
-     dirent const * const *e2 = (dirent const * const *)_e2;
-+#endif
-     const char *p1, *p2;
-     int diff;
-     

diff --git a/meta-openvuplus/recipes-connectivity/wvdial/wvdial-1.61/wvdial-vuplus_001.patch b/meta-openvuplus/recipes-connectivity/wvdial/wvdial-1.61/wvdial-vuplus_001.patch
new file mode 100644 (file)
index 0000000..51e4ab7
--- /dev/null
+++ b/meta-openvuplus/recipes-connectivity/wvdial/wvdial-1.61/wvdial-vuplus_001.patch
@@ -0,0 +1,26 @@
+diff --git a/wvmodemscan.cc b/wvmodemscan.cc
+index de1c34a..17687aa 100644
+--- a/wvmodemscan.cc
++++ b/wvmodemscan.cc
+@@ -485,6 +485,7 @@ const char *WvModemScan::is_isdn() const
+ 
+ static int fileselect(const struct dirent *e)
+ {
++#if 0
+     return !strncmp(e->d_name, "ttyS", 4)             // serial
+        || !strncmp(e->d_name, "ttyLT", 5)     // Lucent WinModem
+        || !strncmp(e->d_name, "ttyACM", 6)      // USB acm Modems
+@@ -493,6 +494,13 @@ static int fileselect(const struct dirent *e)
+        || !strncmp(e->d_name, "ttySL", 5);    // SmartLink WinModem
+ 
+       // (no internal ISDN support)   || !strncmp(e->d_name, "ttyI", 4);
++#else
++    return !strncmp(e->d_name, "ttyLT", 5)      // Lucent WinModem
++       || !strncmp(e->d_name, "ttyACM", 6)      // USB acm Modems
++       || !strncmp(e->d_name, "ttyUSB", 6)      // Modems on USB RS232
++       || !strncmp(e->d_name, "ircomm", 6)      // Handys over IrDA
++       || !strncmp(e->d_name, "ttySL", 5);      // SmartLink WinModem
++#endif
+ }
+ 
+ #if defined(__GLIBC__) && __GLIBC_PREREQ(2, 10)

diff --git a/meta-openvuplus/recipes-connectivity/wvdial/wvdial_1.60.bb b/meta-openvuplus/recipes-connectivity/wvdial/wvdial_1.60.bb
deleted file mode 100644 (file)
index 86e82c1..0000000
--- a/meta-openvuplus/recipes-connectivity/wvdial/wvdial_1.60.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-HOMEPAGE = "http://www.alumnit.ca/wiki/?WvDial"
-DESCRIPTION = "WvDial is a program that makes it easy to connect your Linux workstation to the Internet."
-
-PR = "r4"
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605"
-
-SRC_URI = "\
-       http://www.alumnit.ca/download/wvdial-1.60.tar.gz \
-       file://wvdial-vuplus_001.patch \
-       file://wvdial_fileselect.patch \
-       "
-
-DEPENDS = "wvstreams ppp"
-RDEPENDS_${PN} = "ppp wvstreams"
-
-inherit autotools-brokensep pkgconfig
-
-CFLAGS += " -Wno-write-strings "
-LDFLAGS = " -L ${CROSS_DIR}/${TARGET_SYS}/usr/lib -luniconf -lwvstreams -lwvbase -lwvutils "
-
-EXTRA_OEMAKE = ""
-export CC="${CXX}"
-
-do_compile() {
-        oe_runmake
-}
-
-do_install() {
-    install -d ${D}/etc/ppp/peers
-    oe_runmake prefix=${D}/usr PPPDIR=${D}/etc/ppp/peers install
-}
-
-SRC_URI[md5sum] = "27fbbde89f8fd9f6e735a8efa5217fc9"
-SRC_URI[sha256sum] = "0c65ea807950fab32e659d1869a7167ff978502bd5d0159dbe9de90eb6c2e16b"
-

diff --git a/meta-openvuplus/recipes-connectivity/wvdial/wvdial_1.61.bbappend b/meta-openvuplus/recipes-connectivity/wvdial/wvdial_1.61.bbappend
new file mode 100644 (file)
index 0000000..9291b67
--- /dev/null
+++ b/meta-openvuplus/recipes-connectivity/wvdial/wvdial_1.61.bbappend
@@ -0,0 +1,8 @@
+PR .= "-vuplus0"
+
+SRC_URI += " \
+           file://wvdial-vuplus_001.patch \
+          "
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
+

diff --git a/meta-openvuplus/recipes-connectivity/wvstream/wvstreams-4.6/vuplus-wvstreams-build-fix.patch b/meta-openvuplus/recipes-connectivity/wvstream/wvstreams-4.6/vuplus-wvstreams-build-fix.patch
deleted file mode 100644 (file)
index af9724c..0000000
--- a/meta-openvuplus/recipes-connectivity/wvstream/wvstreams-4.6/vuplus-wvstreams-build-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/ipstreams/wvunixdgsocket.cc b/ipstreams/wvunixdgsocket.cc
-index 41d2911..e881ac0 100644
---- a/ipstreams/wvunixdgsocket.cc
-+++ b/ipstreams/wvunixdgsocket.cc
-@@ -2,6 +2,9 @@
- #ifdef MACOS
- #include <sys/types.h>
- #include <sys/stat.h>
-+#else
-+#include <sys/types.h>
-+#include <sys/stat.h>
- #endif
- 
- WvUnixDGSocket::WvUnixDGSocket(WvStringParm filename, bool _server, int perms)
-diff --git a/streams/wvatomicfile.cc b/streams/wvatomicfile.cc
-index 65ae202..db9df88 100644
---- a/streams/wvatomicfile.cc
-+++ b/streams/wvatomicfile.cc
-@@ -13,6 +13,8 @@
- 
- #ifdef MACOS
- #include <sys/stat.h>
-+#else
-+#include <sys/stat.h>
- #endif
- 
- WvAtomicFile::WvAtomicFile(WvStringParm filename, int flags, mode_t create_mode)

diff --git a/meta-openvuplus/recipes-connectivity/wvstream/wvstreams-4.6/vuplus-wvstreams-build-fix_getuid.patch b/meta-openvuplus/recipes-connectivity/wvstream/wvstreams-4.6/vuplus-wvstreams-build-fix_getuid.patch
deleted file mode 100644 (file)
index 8ef08de..0000000
--- a/meta-openvuplus/recipes-connectivity/wvstream/wvstreams-4.6/vuplus-wvstreams-build-fix_getuid.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/utils/wvuid.cc b/utils/wvuid.cc
-index 7fa1035..709a484 100644
---- a/utils/wvuid.cc
-+++ b/utils/wvuid.cc
-@@ -33,6 +33,7 @@ wvuid_t wvgetuid()
- 
- #else // not WIN32
- 
-+#include <unistd.h>
- 
- WvString wv_username_from_uid(wvuid_t uid)
- {

diff --git a/meta-openvuplus/recipes-connectivity/wvstream/wvstreams_4.6.bb b/meta-openvuplus/recipes-connectivity/wvstream/wvstreams_4.6.bb
deleted file mode 100644 (file)
index d7aa83b..0000000
--- a/meta-openvuplus/recipes-connectivity/wvstream/wvstreams_4.6.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-HOMEPAGE = "http://alumnit.ca/wiki/index.php?page=WvStreams"
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=55ca817ccb7d5b5b66355690e9abc605"
-
-DESCRIPTION = "WvStreams is a network programming library in C++"
-DEPENDS = "zlib openssl (>= 0.9.8) dbus (>  1.2.14)"
-
-PR = "r1"
-
-SRC_URI = "http://wvstreams.googlecode.com/files/${PN}-${PV}.tar.gz \
-       file://vuplus-wvstreams-build-fix.patch \
-       file://vuplus-wvstreams-build-fix_getuid.patch \
-       "
-
-inherit autotools-brokensep pkgconfig
-
-LDFLAGS_append = " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib"
-EXTRA_OECONF = " --without-tcl --without-qt --without-pam "
-
-PARALLEL_MAKE = ""
-
-do_configure() {
-        autoreconf
-        oe_runconf
-}
-
-do_install() {
-       oe_runmake DESTDIR=${D} install
-}
-
-#FILES_${PN} = "/"
-FILES__${PN} = ""
-FILES__${PN} += "${libdir}/libuniconf.so.*"
-FILES__${PN} += "${sbindir}/uniconfd ${sysconfdir}/uniconf.conf ${localstatedir}/uniconf"
-FILES__${PN} += "${libdir}/libwvutils.so.*"
-FILES__${PN} += "${libdir}/libwvbase.so.* ${libdir}/libwvstreams.so.*"
-
-
-SRC_URI[md5sum] = "4ee8ccfe6dfc29bf952d58fa23626c97"
-SRC_URI[sha256sum] = "171df8e545b53edb3efbd65b9bc2b35549d05249bd0c92776701f9d8da77ed6f"
-