libpcap: Disable exposed bits of WinPCAP remote capture support

Submitted by Fabio Berton on Nov. 22, 2016, 6:15 p.m. | Patch ID: 134157

Details

Message ID 1479838559-24993-1-git-send-email-fabio.berton@ossystems.com.br
State New
Headers show

Commit Message

Fabio Berton Nov. 22, 2016, 6:15 p.m.
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>
---
 .../libpcap/libpcap/disable-remote.patch           | 36 ++++++++++++++++++++++
 meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch

Patch hide | download patch | download mbox

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 @@ 
+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 9072fe0..8ce18e5 100644
--- a/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
+++ b/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
@@ -2,6 +2,7 @@  require libpcap.inc
 
 SRC_URI += " \
     file://libpcap-pkgconfig-support.patch \
+    file://disable-remote.patch \
 "
 
 SRC_URI[md5sum] = "3d48f9cd171ff12b0efd9134b52f1447"

Comments

leimaohui Dec. 12, 2016, 6:55 a.m.
Hi all

I met the same issue when I build wireshark comes from meta-oe.
Why this patch hasn't been merged yet?

Best regards
Lei


> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org [mailto:openembedded-
> core-bounces@lists.openembedded.org] On Behalf Of Fabio Berton
> Sent: Wednesday, November 23, 2016 2:16 AM
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH] 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>
> ---
>  .../libpcap/libpcap/disable-remote.patch           | 36 ++++++++++++++++++++++
>  meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb |  1 +
>  2 files changed, 37 insertions(+)
>  create mode 100644 meta/recipes-connectivity/libpcap/libpcap/disable-
> remote.patch
> 
> 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 @@
> +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 9072fe0..8ce18e5 100644
> --- a/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
> +++ b/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
> @@ -2,6 +2,7 @@ require libpcap.inc
> 
>  SRC_URI += " \
>      file://libpcap-pkgconfig-support.patch \
> +    file://disable-remote.patch \
>  "
> 
>  SRC_URI[md5sum] = "3d48f9cd171ff12b0efd9134b52f1447"
> --
> 2.1.4
> 
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
Ross Burton Dec. 12, 2016, 1:26 p.m.
On 12 December 2016 at 06:55, Lei, Maohui <leimaohui@cn.fujitsu.com> wrote:

> I met the same issue when I build wireshark comes from meta-oe.
> Why this patch hasn't been merged yet?
>

I had the wrong tag on it locally so it didn't get merged.  In staging now.

Ross