diff options
5 files changed, 146 insertions, 0 deletions
diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams/04_signed_request.diff b/meta-oe/recipes-connectivity/wvdial/wvstreams/04_signed_request.diff new file mode 100644 index 0000000000..5ab633bc3d --- /dev/null +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/04_signed_request.diff @@ -0,0 +1,13 @@ +Index: wvstreams-4.6/crypto/wvx509.cc +=================================================================== +--- wvstreams-4.6.orig/crypto/wvx509.cc 2009-07-29 11:58:16.000000000 -0400 ++++ wvstreams-4.6/crypto/wvx509.cc 2009-07-29 11:58:43.000000000 -0400 +@@ -325,7 +325,7 @@ + } + + int verify_result = X509_REQ_verify(certreq, pk); +- if (verify_result == 0) ++ if (verify_result == 0 || verify_result == -1) + { + debug(WvLog::Warning, "Self signed request failed"); + X509_REQ_free(certreq); diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams/05_gcc.diff b/meta-oe/recipes-connectivity/wvdial/wvstreams/05_gcc.diff new file mode 100644 index 0000000000..8e4fd03298 --- /dev/null +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/05_gcc.diff @@ -0,0 +1,41 @@ +Index: wvstreams-4.6.1/crypto/wvx509.cc +=================================================================== +--- wvstreams-4.6.1.orig/crypto/wvx509.cc 2011-05-20 00:02:38.119136584 +0200 ++++ wvstreams-4.6.1/crypto/wvx509.cc 2011-05-20 00:02:26.035136589 +0200 +@@ -1157,7 +1157,7 @@ + + if (ext) + { +- X509V3_EXT_METHOD *method = X509V3_EXT_get(ext); ++ X509V3_EXT_METHOD *method = (X509V3_EXT_METHOD *)X509V3_EXT_get(ext); + if (!method) + { + WvDynBuf buf; +Index: wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc +=================================================================== +--- wvstreams-4.6.1.orig/ipstreams/wvunixdgsocket.cc 2011-05-20 00:02:38.391136584 +0200 ++++ wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc 2011-05-20 00:02:35.283136585 +0200 +@@ -1,8 +1,6 @@ + #include "wvunixdgsocket.h" +-#ifdef MACOS + #include <sys/types.h> + #include <sys/stat.h> +-#endif + + WvUnixDGSocket::WvUnixDGSocket(WvStringParm filename, bool _server, int perms) + : socketfile(filename) +Index: wvstreams-4.6.1/streams/wvatomicfile.cc +=================================================================== +--- wvstreams-4.6.1.orig/streams/wvatomicfile.cc 2011-05-20 00:02:38.223136584 +0200 ++++ wvstreams-4.6.1/streams/wvatomicfile.cc 2011-05-20 00:02:31.619136587 +0200 +@@ -10,10 +10,7 @@ + #include "wvatomicfile.h" + #include "wvfileutils.h" + #include "wvstrutils.h" +- +-#ifdef MACOS + #include <sys/stat.h> +-#endif + + WvAtomicFile::WvAtomicFile(WvStringParm filename, int flags, mode_t create_mode) + : tmp_file(WvString::null) diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams/06_gcc-4.7.diff b/meta-oe/recipes-connectivity/wvdial/wvstreams/06_gcc-4.7.diff new file mode 100644 index 0000000000..a75067a108 --- /dev/null +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/06_gcc-4.7.diff @@ -0,0 +1,18 @@ +Description: Fix FTBFS with gcc-4.7 + Small header include change. This is borderlinde cosmetic, but still needed + to prevent the FTBFS. +Author: Paul Tagliamonte <paultag@ubuntu.com> +Origin: vendor +Bug-Debian: http://bugs.debian.org/667418 +Last-Update: 2012-04-13 + +--- wvstreams-4.6.1.orig/utils/wvuid.cc ++++ wvstreams-4.6.1/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-oe/recipes-connectivity/wvdial/wvstreams/07_buildflags.diff b/meta-oe/recipes-connectivity/wvdial/wvstreams/07_buildflags.diff new file mode 100644 index 0000000000..ec99dcd36a --- /dev/null +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/07_buildflags.diff @@ -0,0 +1,32 @@ +Index: b/gen-cc +=================================================================== +--- a/gen-cc ++++ b/gen-cc +@@ -15,6 +15,11 @@ + shift + shift + ++ echo $CC \$MODE -o \$BASE.o \$BASE.$EXT \\ ++ -MMD -MF \$DEPFILE -MP -MQ \$BASE.o \\ ++ $CPPFLAGS \\ ++ $CFLAGS \\ ++ "\$@" + $CC \$MODE -o \$BASE.o \$BASE.$EXT \\ + -MMD -MF \$DEPFILE -MP -MQ \$BASE.o \\ + $CPPFLAGS \\ +Index: b/wvrules-posix.mk +=================================================================== +--- a/wvrules-posix.mk ++++ b/wvrules-posix.mk +@@ -35,11 +35,6 @@ + # Default compiler we use for linking + WVLINK_CC = $(CXX) + +-ifneq ("$(enable_optimization)", "no") +- CXXFLAGS+=-O2 +- CFLAGS+=-O2 +-endif +- + ifneq ("$(enable_warnings)", "no") + CXXFLAGS+=-Wall -Woverloaded-virtual + CFLAGS+=-Wall diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb b/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb new file mode 100644 index 0000000000..ce2b337406 --- /dev/null +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb @@ -0,0 +1,42 @@ +HOMEPAGE = "http://alumnit.ca/wiki/index.php?page=WvStreams" +DESCRIPTION = "WvStreams is a network programming library in C++" + +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=55ca817ccb7d5b5b66355690e9abc605" + +DEPENDS = "zlib openssl (>= 0.9.8)" + +SRC_URI = "http://${PN}.googlecode.com/files/${PN}-${PV}.tar.gz \ + file://04_signed_request.diff \ + file://05_gcc.diff \ + file://06_gcc-4.7.diff \ + file://07_buildflags.diff \ + " + +SRC_URI[md5sum] = "2760dac31a43d452a19a3147bfde571c" +SRC_URI[sha256sum] = "8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633" + +inherit autotools pkgconfig + +PARALLEL_MAKE = "" + +LDFLAGS_append = " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib" + +EXTRA_OECONF = " --without-tcl --without-qt --without-pam --without-valgrind" + +PACKAGES_prepend = "libuniconf libuniconf-dbg " +PACKAGES_prepend = "uniconfd uniconfd-dbg " +PACKAGES_prepend = "libwvstreams-base libwvstreams-base-dbg " +PACKAGES_prepend = "libwvstreams-extras libwvstreams-extras-dbg " + +FILES_libuniconf = "${libdir}/libuniconf.so.*" +FILES_libuniconf-dbg = "${libdir}/.debug/libuniconf.so.*" + +FILES_uniconfd = "${sbindir}/uniconfd ${sysconfdir}/uniconf.conf ${localstatedir}/uniconf" +FILES_uniconfd-dbg = "${sbindir}/.debug/uniconfd" + +FILES_libwvstreams-base = "${libdir}/libwvutils.so.*" +FILES_libwvstreams-base-dbg = "${libdir}/.debug/libwvutils.so.*" + +FILES_libwvstreams-extras = "${libdir}/libwvbase.so.* ${libdir}/libwvstreams.so.*" +FILES_libwvstreams-extras-dbg = "${libdir}/.debug/libwvbase.so.* ${libdir}/.debug/libwvstreams.so.*" |