summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/libpcap
diff options
context:
space:
mode:
authorFabio Berton <fabio.berton@ossystems.com.br>2016-11-22 18:15:59 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-13 22:55:22 (GMT)
commit252898f56e0c4eed9e22e4795d8403ab69dac266 (patch)
tree1113a6acc386512ed2aa9cdd018aa140b6659d79 /meta/recipes-connectivity/libpcap
parent5647a73fb1830abc6d015318af53f09eb8e63b1e (diff)
downloadpoky-252898f56e0c4eed9e22e4795d8403ab69dac266.tar.gz
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. (From OE-Core rev: 4e412234c37efec42b3962c11d44903c0c58c92e) Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/libpcap')
-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 0000000..7e1eea6
--- /dev/null
+++ b/meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch
@@ -0,0 +1,36 @@
1Disable bits of remote capture support inherited from the WinPCAP merge
2which cause applications to FTBFS if they define HAVE_REMOTE.
3
4Patch from:
5https://anonscm.debian.org/cgit/users/rfrancoise/libpcap.git/commit/?
6id=f35949969269dfdcc3549b12fade604755e1e326
7
8Upstream-Status: Pending
9
10--- a/pcap/pcap.h
11+++ b/pcap/pcap.h
12@@ -506,6 +506,11 @@
13 #define MODE_STAT 1
14 #define MODE_MON 2
15
16+#ifdef HAVE_REMOTE
17+ /* Includes most of the public stuff that is needed for the remote capture */
18+ #include <remote-ext.h>
19+#endif /* HAVE_REMOTE */
20+
21 #elif defined(MSDOS)
22
23 /*
24@@ -526,11 +531,6 @@
25
26 #endif /* _WIN32/MSDOS/UN*X */
27
28-#ifdef HAVE_REMOTE
29- /* Includes most of the public stuff that is needed for the remote capture */
30- #include <remote-ext.h>
31-#endif /* HAVE_REMOTE */
32-
33 #ifdef __cplusplus
34 }
35 #endif
36
diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb b/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
index e9db28a..1893e67 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 += " \
4 file://libpcap-pkgconfig-support.patch \ 4 file://libpcap-pkgconfig-support.patch \
5 file://0001-Fix-compiler_state_t.ai-usage-when-INET6-is-not-defi.patch \ 5 file://0001-Fix-compiler_state_t.ai-usage-when-INET6-is-not-defi.patch \
6 file://0002-Add-missing-compiler_state_t-parameter.patch \ 6 file://0002-Add-missing-compiler_state_t-parameter.patch \
7 file://disable-remote.patch \
7" 8"
8 9
9SRC_URI[md5sum] = "3d48f9cd171ff12b0efd9134b52f1447" 10SRC_URI[md5sum] = "3d48f9cd171ff12b0efd9134b52f1447"