summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Berton <fabio.berton@ossystems.com.br>2016-11-22 16:15:59 -0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-13 22:47:35 +0000
commit4e412234c37efec42b3962c11d44903c0c58c92e (patch)
tree46e8444e2cfd7968fff45045a1cf76fded48809c
parent83e433769415f79d0e00c07708147e5c977d28bc (diff)
downloadopenembedded-core-contrib-4e412234c37efec42b3962c11d44903c0c58c92e.tar.gz
openembedded-core-contrib-4e412234c37efec42b3962c11d44903c0c58c92e.tar.bz2
openembedded-core-contrib-4e412234c37efec42b3962c11d44903c0c58c92e.zip
libpcap: Disable exposed bits of WinPCAP remote capture support
Disable bits of remote capture support inherited from the WinPCAP merge which cause applications to fails to build if they define HAVE_REMOTE. Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch36
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb1
2 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch b/meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch
new file mode 100644
index 0000000000..7e1eea6b1e
--- /dev/null
+++ b/meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch
@@ -0,0 +1,36 @@
+Disable bits of remote capture support inherited from the WinPCAP merge
+which cause applications to FTBFS if they define HAVE_REMOTE.
+
+Patch from:
+https://anonscm.debian.org/cgit/users/rfrancoise/libpcap.git/commit/?
+id=f35949969269dfdcc3549b12fade604755e1e326
+
+Upstream-Status: Pending
+
+--- a/pcap/pcap.h
++++ b/pcap/pcap.h
+@@ -506,6 +506,11 @@
+ #define MODE_STAT 1
+ #define MODE_MON 2
+
++#ifdef HAVE_REMOTE
++ /* Includes most of the public stuff that is needed for the remote capture */
++ #include <remote-ext.h>
++#endif /* HAVE_REMOTE */
++
+ #elif defined(MSDOS)
+
+ /*
+@@ -526,11 +531,6 @@
+
+ #endif /* _WIN32/MSDOS/UN*X */
+
+-#ifdef HAVE_REMOTE
+- /* Includes most of the public stuff that is needed for the remote capture */
+- #include <remote-ext.h>
+-#endif /* HAVE_REMOTE */
+-
+ #ifdef __cplusplus
+ }
+ #endif
+
diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb b/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
index e9db28a7d7..1893e675b2 100644
--- a/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
+++ b/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
@@ -4,6 +4,7 @@ SRC_URI += " \
file://libpcap-pkgconfig-support.patch \
file://0001-Fix-compiler_state_t.ai-usage-when-INET6-is-not-defi.patch \
file://0002-Add-missing-compiler_state_t-parameter.patch \
+ file://disable-remote.patch \
"
SRC_URI[md5sum] = "3d48f9cd171ff12b0efd9134b52f1447"