All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/5] libsolv: upgrade 0.7.1 -> 0.7.2
@ 2018-12-20  8:43 Anuj Mittal
  2018-12-20  8:43 ` [PATCH 2/5] libjpeg-turbo: upgrade 2.0.0 -> 2.0.1 Anuj Mittal
                   ` (4 more replies)
  0 siblings, 5 replies; 9+ messages in thread
From: Anuj Mittal @ 2018-12-20  8:43 UTC (permalink / raw)
  To: openembedded-core

From NEWS:

- bug fixes:
  * do not autouninstall packages because of forcebest updates
- new features:
  * support rpm's new '^' version separator
  * support set/get_considered_list in bindings
  * new experimental SOLVER_FLAG_ONLY_NAMESPACE_RECOMMENDED flag

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 .../libsolv/{libsolv_0.7.1.bb => libsolv_0.7.2.bb}              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-extended/libsolv/{libsolv_0.7.1.bb => libsolv_0.7.2.bb} (95%)

diff --git a/meta/recipes-extended/libsolv/libsolv_0.7.1.bb b/meta/recipes-extended/libsolv/libsolv_0.7.2.bb
similarity index 95%
rename from meta/recipes-extended/libsolv/libsolv_0.7.1.bb
rename to meta/recipes-extended/libsolv/libsolv_0.7.2.bb
index 9e0952128e..6e3993b05e 100644
--- a/meta/recipes-extended/libsolv/libsolv_0.7.1.bb
+++ b/meta/recipes-extended/libsolv/libsolv_0.7.2.bb
@@ -12,7 +12,7 @@ SRC_URI_append_libc-musl = " file://0001-Add-fallback-fopencookie-implementation
                              file://0002-Fixes-to-internal-fopencookie-implementation.patch \
                            "
 
-SRCREV = "aae08b819742abba7c44510797077c5f25f3ed00"
+SRCREV = "1c0141962a9eef7f4bc1fdcac7099f3f6a95ec23"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
 
 S = "${WORKDIR}/git"
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH 2/5] libjpeg-turbo: upgrade 2.0.0 -> 2.0.1
  2018-12-20  8:43 [PATCH 1/5] libsolv: upgrade 0.7.1 -> 0.7.2 Anuj Mittal
@ 2018-12-20  8:43 ` Anuj Mittal
  2018-12-20  8:43 ` [PATCH 3/5] atk: upgrade 2.28.1 -> 2.30.0 Anuj Mittal
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 9+ messages in thread
From: Anuj Mittal @ 2018-12-20  8:43 UTC (permalink / raw)
  To: openembedded-core

* For changes, see:
https://github.com/libjpeg-turbo/libjpeg-turbo/blob/master/ChangeLog.md

* Removed upstreamed patch

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 ...1-libjpeg-turbo-fix-package_qa-error.patch |  18 +--
 ...x-wrongly-defined-define-HAVE_STDLIB.patch | 119 ------------------
 ...-turbo_2.0.0.bb => libjpeg-turbo_2.0.1.bb} |   6 +-
 3 files changed, 12 insertions(+), 131 deletions(-)
 delete mode 100644 meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-wrongly-defined-define-HAVE_STDLIB.patch
 rename meta/recipes-graphics/jpeg/{libjpeg-turbo_2.0.0.bb => libjpeg-turbo_2.0.1.bb} (92%)

diff --git a/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch b/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch
index 44c2c768b2..6f3d201b21 100644
--- a/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch
+++ b/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch
@@ -1,4 +1,4 @@
-From 0a24f03a67425a7b58b3fd40d965c0c9801ae7a1 Mon Sep 17 00:00:00 2001
+From ce3bd4f0e46f738a9aec098e7c341ad6deeab9f2 Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Mon, 27 Aug 2018 16:10:55 +0800
 Subject: [PATCH] libjpeg-turbo: fix package_qa error
@@ -10,23 +10,23 @@ usr/bin/cjpeg contains probably-redundant RPATH /usr/lib
 Upstream-Status: Inappropriate[oe-specific]
 
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
 ---
- CMakeLists.txt | 2 --
- 1 file changed, 2 deletions(-)
+ CMakeLists.txt | 4 ----
+ 1 file changed, 4 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1719522..682cef1 100644
+index efeb51a..bbebe55 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -109,8 +109,6 @@ endif()
+@@ -109,10 +109,6 @@ endif()
  
  include(cmakescripts/GNUInstallDirs.cmake)
  
--set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR})
+-if(ENABLE_SHARED)
+-  set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR})
+-endif()
 -
  macro(report_directory var)
    if(CMAKE_INSTALL_${var} STREQUAL CMAKE_INSTALL_FULL_${var})
      message(STATUS "CMAKE_INSTALL_${var} = ${CMAKE_INSTALL_${var}}")
--- 
-2.7.4
-
diff --git a/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-wrongly-defined-define-HAVE_STDLIB.patch b/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-wrongly-defined-define-HAVE_STDLIB.patch
deleted file mode 100644
index 16767ebb6b..0000000000
--- a/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-wrongly-defined-define-HAVE_STDLIB.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From d301019d0f23d12b9666d3d88b0859067a4ade77 Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Thu, 30 Aug 2018 15:08:23 +0800
-Subject: [PATCH] libjpeg-turbo: fix wrongly defined define HAVE_STDLIB_H
-
-when change build system from autotools to cmake, below
-part is replace wrongly:
-
-"#undef HAVE_STDLIB_H"
-should be change to "#cmakedefine HAVE_STDLIB_H 1"
-not "#cmakedefine HAVE_STDLIB_H"
-
-otherwise, even if stdlib.h is found, output file
-of configure_file() will define like: #define HAVE_STDLIB_H
-but we need it as #define HAVE_STDLIB_H 1, since for
-different defination of HAVE_STDLIB_H will cause below error:
-error: "HAVE_STDLIB_H" redefined [-Werror]
-
-Upstream-Status: Submitted[https://github.com/libjpeg-turbo/libjpeg-turbo/pull/275]
-
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
----
- jconfig.h.in    | 28 ++++++++++++++--------------
- jconfigint.h.in |  4 ++--
- 2 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/jconfig.h.in b/jconfig.h.in
-index 2842754..18a69a4 100644
---- a/jconfig.h.in
-+++ b/jconfig.h.in
-@@ -10,16 +10,16 @@
- #define LIBJPEG_TURBO_VERSION_NUMBER  @LIBJPEG_TURBO_VERSION_NUMBER@
- 
- /* Support arithmetic encoding */
--#cmakedefine C_ARITH_CODING_SUPPORTED
-+#cmakedefine C_ARITH_CODING_SUPPORTED 1
- 
- /* Support arithmetic decoding */
--#cmakedefine D_ARITH_CODING_SUPPORTED
-+#cmakedefine D_ARITH_CODING_SUPPORTED 1
- 
- /* Support in-memory source/destination managers */
--#cmakedefine MEM_SRCDST_SUPPORTED
-+#cmakedefine MEM_SRCDST_SUPPORTED 1
- 
- /* Use accelerated SIMD routines. */
--#cmakedefine WITH_SIMD
-+#cmakedefine WITH_SIMD 1
- 
- /*
-  * Define BITS_IN_JSAMPLE as either
-@@ -33,37 +33,37 @@
- #define BITS_IN_JSAMPLE  @BITS_IN_JSAMPLE@      /* use 8 or 12 */
- 
- /* Define to 1 if you have the <locale.h> header file. */
--#cmakedefine HAVE_LOCALE_H
-+#cmakedefine HAVE_LOCALE_H 1
- 
- /* Define to 1 if you have the <stddef.h> header file. */
--#cmakedefine HAVE_STDDEF_H
-+#cmakedefine HAVE_STDDEF_H 1
- 
- /* Define to 1 if you have the <stdlib.h> header file. */
--#cmakedefine HAVE_STDLIB_H
-+#cmakedefine HAVE_STDLIB_H 1
- 
- /* Define if you need to include <sys/types.h> to get size_t. */
--#cmakedefine NEED_SYS_TYPES_H
-+#cmakedefine NEED_SYS_TYPES_H 1
- 
- /* Define if you have BSD-like bzero and bcopy in <strings.h> rather than
-    memset/memcpy in <string.h>. */
--#cmakedefine NEED_BSD_STRINGS
-+#cmakedefine NEED_BSD_STRINGS 1
- 
- /* Define to 1 if the system has the type `unsigned char'. */
--#cmakedefine HAVE_UNSIGNED_CHAR
-+#cmakedefine HAVE_UNSIGNED_CHAR 1
- 
- /* Define to 1 if the system has the type `unsigned short'. */
--#cmakedefine HAVE_UNSIGNED_SHORT
-+#cmakedefine HAVE_UNSIGNED_SHORT 1
- 
- /* Compiler does not support pointers to undefined structures. */
--#cmakedefine INCOMPLETE_TYPES_BROKEN
-+#cmakedefine INCOMPLETE_TYPES_BROKEN 1
- 
- /* Define if your (broken) compiler shifts signed values as if they were
-    unsigned. */
--#cmakedefine RIGHT_SHIFT_IS_UNSIGNED
-+#cmakedefine RIGHT_SHIFT_IS_UNSIGNED 1
- 
- /* Define to 1 if type `char' is unsigned and you are not using gcc.  */
- #ifndef __CHAR_UNSIGNED__
--  #cmakedefine __CHAR_UNSIGNED__
-+  #cmakedefine __CHAR_UNSIGNED__ 1
- #endif
- 
- /* Define to empty if `const' does not conform to ANSI C. */
-diff --git a/jconfigint.h.in b/jconfigint.h.in
-index 55df053..6c898ac 100644
---- a/jconfigint.h.in
-+++ b/jconfigint.h.in
-@@ -17,10 +17,10 @@
- #define SIZEOF_SIZE_T  @SIZE_T@
- 
- /* Define if your compiler has __builtin_ctzl() and sizeof(unsigned long) == sizeof(size_t). */
--#cmakedefine HAVE_BUILTIN_CTZL
-+#cmakedefine HAVE_BUILTIN_CTZL 1
- 
- /* Define to 1 if you have the <intrin.h> header file. */
--#cmakedefine HAVE_INTRIN_H
-+#cmakedefine HAVE_INTRIN_H 1
- 
- #if defined(_MSC_VER) && defined(HAVE_INTRIN_H)
- #if (SIZEOF_SIZE_T == 8)
--- 
-2.7.4
-
diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.0.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.1.bb
similarity index 92%
rename from meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.0.bb
rename to meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.1.bb
index 282bf95e8a..72706be674 100644
--- a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.0.bb
+++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.1.bb
@@ -12,10 +12,10 @@ DEPENDS_append_x86_class-target    = " nasm-native"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
            file://0001-libjpeg-turbo-fix-package_qa-error.patch \
-           file://0001-libjpeg-turbo-fix-wrongly-defined-define-HAVE_STDLIB.patch"
+           "
 
-SRC_URI[md5sum] = "b12a3fcf1d078db38410f27718a91b83"
-SRC_URI[sha256sum] = "778876105d0d316203c928fd2a0374c8c01f755d0a00b12a1c8934aeccff8868"
+SRC_URI[md5sum] = "1b05a66aa9b006fd04ed29f408e68f46"
+SRC_URI[sha256sum] = "e5f86cec31df1d39596e0cca619ab1b01f99025a27dafdfc97a30f3a12f866ff"
 UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/"
 UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/"
 
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH 3/5] atk: upgrade 2.28.1 -> 2.30.0
  2018-12-20  8:43 [PATCH 1/5] libsolv: upgrade 0.7.1 -> 0.7.2 Anuj Mittal
  2018-12-20  8:43 ` [PATCH 2/5] libjpeg-turbo: upgrade 2.0.0 -> 2.0.1 Anuj Mittal
@ 2018-12-20  8:43 ` Anuj Mittal
  2018-12-20  8:43 ` [PATCH 4/5] at-spi2-atk: upgrade 2.26.2 " Anuj Mittal
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 9+ messages in thread
From: Anuj Mittal @ 2018-12-20  8:43 UTC (permalink / raw)
  To: openembedded-core

* For changes, see:
https://github.com/GNOME/atk/blob/ATK_2_30_0/NEWS

* Change in doc and introspection switches and patch refresh.

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 ...ld-enable-introspection-for-cross-compile.patch | 14 +++++++-------
 .../atk/{atk_2.28.1.bb => atk_2.30.0.bb}           | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)
 rename meta/recipes-support/atk/{atk_2.28.1.bb => atk_2.30.0.bb} (79%)

diff --git a/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch b/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch
index c604a984a4..1d814ccdb7 100644
--- a/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch
+++ b/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch
@@ -1,4 +1,4 @@
-From 3838757d29590cc1ef99c97f7268377322fc17e9 Mon Sep 17 00:00:00 2001
+From c3eb5b2e74c38bb8374bc027f84e42d7e94f62f8 Mon Sep 17 00:00:00 2001
 From: Anuj Mittal <anuj.mittal@intel.com>
 Date: Fri, 6 Apr 2018 12:04:00 +0800
 Subject: [PATCH] meson.build: enable introspection for cross-compile
@@ -14,15 +14,15 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/atk/meson.build b/atk/meson.build
-index 7b5a683..855e28f 100644
+index 616a3e6..941ded8 100644
 --- a/atk/meson.build
 +++ b/atk/meson.build
-@@ -139,7 +139,7 @@ libatk_dep = declare_dependency(link_with: libatk,
+@@ -137,7 +137,7 @@ libatk_dep = declare_dependency(link_with: libatk,
+                                 dependencies: gobject_dep,
+                                 sources: atk_enum_h)
  
- disable_introspection = get_option('disable_introspection')
- 
--if not meson.is_cross_build() and not disable_introspection
-+if not disable_introspection
+-if not meson.is_cross_build() and get_option('introspection')
++if get_option('introspection')
    gnome.generate_gir(libatk,
                       sources: atk_sources + atk_headers + [ atk_enum_h ] + [ atk_version_h ],
                       namespace: 'Atk',
diff --git a/meta/recipes-support/atk/atk_2.28.1.bb b/meta/recipes-support/atk/atk_2.30.0.bb
similarity index 79%
rename from meta/recipes-support/atk/atk_2.28.1.bb
rename to meta/recipes-support/atk/atk_2.30.0.bb
index 26b13b69d7..c950862b6f 100644
--- a/meta/recipes-support/atk/atk_2.28.1.bb
+++ b/meta/recipes-support/atk/atk_2.30.0.bb
@@ -14,11 +14,11 @@ DEPENDS = "gettext-native glib-2.0"
 GNOMEBASEBUILDCLASS = "meson"
 inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection
 
-GTKDOC_ENABLE_FLAG = "-Denable_docs=true"
-GTKDOC_DISABLE_FLAG = "-Denable_docs=false"
+GTKDOC_ENABLE_FLAG = "-Ddocs=true"
+GTKDOC_DISABLE_FLAG = "-Ddocs=false"
 
-GI_ENABLE_FLAG = "-Ddisable_introspection=false"
-GI_DISABLE_FLAG = "-Ddisable_introspection=true"
+GI_ENABLE_FLAG = "-Dintrospection=true"
+GI_DISABLE_FLAG = "-Dintrospection=false"
 
 EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \
                                                                                        '${GI_DISABLE_FLAG}', d)} "
@@ -30,8 +30,8 @@ SRC_URI_append = " \
                    file://0001-meson.build-enable-introspection-for-cross-compile.patch \
                    file://0001-Switch-from-filename-to-basename.patch \
                    "
-SRC_URI[archive.md5sum] = "dfb5e7474220afa3f4ca7e45af9f3a11"
-SRC_URI[archive.sha256sum] = "cd3a1ea6ecc268a2497f0cd018e970860de24a6d42086919d6bf6c8e8d53f4fc"
+SRC_URI[archive.md5sum] = "769c85005d392ad17ffbc063f2d26454"
+SRC_URI[archive.sha256sum] = "dd4d90d4217f2a0c1fee708a555596c2c19d26fef0952e1ead1938ab632c027b"
 
 BBCLASSEXTEND = "native"
 
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH 4/5] at-spi2-atk: upgrade 2.26.2 -> 2.30.0
  2018-12-20  8:43 [PATCH 1/5] libsolv: upgrade 0.7.1 -> 0.7.2 Anuj Mittal
  2018-12-20  8:43 ` [PATCH 2/5] libjpeg-turbo: upgrade 2.0.0 -> 2.0.1 Anuj Mittal
  2018-12-20  8:43 ` [PATCH 3/5] atk: upgrade 2.28.1 -> 2.30.0 Anuj Mittal
@ 2018-12-20  8:43 ` Anuj Mittal
  2018-12-20  8:43 ` [PATCH 5/5] libpcap: upgrade 1.8.1 -> 1.9.0 Anuj Mittal
  2018-12-20  9:03 ` ✗ patchtest: failure for "libsolv: upgrade 0.7.1 -> 0.7...." and 4 more Patchwork
  4 siblings, 0 replies; 9+ messages in thread
From: Anuj Mittal @ 2018-12-20  8:43 UTC (permalink / raw)
  To: openembedded-core

For changes, see:
https://github.com/GNOME/at-spi2-atk/blob/AT_SPI2_ATK_2_30_0/NEWS

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 .../atk/{at-spi2-atk_2.26.2.bb => at-spi2-atk_2.30.0.bb}      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/atk/{at-spi2-atk_2.26.2.bb => at-spi2-atk_2.30.0.bb} (79%)

diff --git a/meta/recipes-support/atk/at-spi2-atk_2.26.2.bb b/meta/recipes-support/atk/at-spi2-atk_2.30.0.bb
similarity index 79%
rename from meta/recipes-support/atk/at-spi2-atk_2.26.2.bb
rename to meta/recipes-support/atk/at-spi2-atk_2.30.0.bb
index 16d8e45ee4..eb4be6b6d8 100644
--- a/meta/recipes-support/atk/at-spi2-atk_2.26.2.bb
+++ b/meta/recipes-support/atk/at-spi2-atk_2.30.0.bb
@@ -3,8 +3,8 @@ HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus"
 LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886"
 
-SRC_URI[archive.md5sum] = "355c7916a69513490cb83ad34016b169"
-SRC_URI[archive.sha256sum] = "61891f0abae1689f6617a963105a3f1dcdab5970c4a36ded9c79a7a544b16a6e"
+SRC_URI[archive.md5sum] = "1ad754b90bcb14244b73ca4d0c14d274"
+SRC_URI[archive.sha256sum] = "e2e1571004ea7b105c969473ce455a95be4038fb2541471714aeb33a26da8a9a"
 
 DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2"
 
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH 5/5] libpcap: upgrade 1.8.1 -> 1.9.0
  2018-12-20  8:43 [PATCH 1/5] libsolv: upgrade 0.7.1 -> 0.7.2 Anuj Mittal
                   ` (2 preceding siblings ...)
  2018-12-20  8:43 ` [PATCH 4/5] at-spi2-atk: upgrade 2.26.2 " Anuj Mittal
@ 2018-12-20  8:43 ` Anuj Mittal
  2018-12-20  9:28   ` [PATCH v2] " Anuj Mittal
  2018-12-20  9:03 ` ✗ patchtest: failure for "libsolv: upgrade 0.7.1 -> 0.7...." and 4 more Patchwork
  4 siblings, 1 reply; 9+ messages in thread
From: Anuj Mittal @ 2018-12-20  8:43 UTC (permalink / raw)
  To: openembedded-core

* For changes, see:
https://www.tcpdump.org/libpcap-changes.txt

* Merge inc and bb and remove unnecessary flags.

* Remove all patches, they have either been upstreamed or fixed
differently.

* Compilation with bluez5 works just fine, enable it and remove bluez4
config.

* Backport a commit to fix musl builds.

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 ...te_t.ai-usage-when-INET6-is-not-defi.patch | 41 -----------
 ...-add-missing-limits.h-for-musl-syste.patch | 30 ++++++++
 ...d-missing-compiler_state_t-parameter.patch | 67 -----------------
 .../libpcap/libpcap/disable-remote.patch      | 36 ---------
 .../libpcap/libpcap/fix-grammar-deps.patch    | 29 --------
 .../libpcap/libpcap-pkgconfig-support.patch   | 73 -------------------
 .../libpcap/libpcap_1.8.1.bb                  | 31 --------
 .../libpcap/{libpcap.inc => libpcap_1.9.0.bb} | 29 ++++----
 8 files changed, 46 insertions(+), 290 deletions(-)
 delete mode 100644 meta/recipes-connectivity/libpcap/libpcap/0001-Fix-compiler_state_t.ai-usage-when-INET6-is-not-defi.patch
 create mode 100644 meta/recipes-connectivity/libpcap/libpcap/0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-syste.patch
 delete mode 100644 meta/recipes-connectivity/libpcap/libpcap/0002-Add-missing-compiler_state_t-parameter.patch
 delete mode 100644 meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch
 delete mode 100644 meta/recipes-connectivity/libpcap/libpcap/fix-grammar-deps.patch
 delete mode 100644 meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch
 delete mode 100644 meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
 rename meta/recipes-connectivity/libpcap/{libpcap.inc => libpcap_1.9.0.bb} (58%)

diff --git a/meta/recipes-connectivity/libpcap/libpcap/0001-Fix-compiler_state_t.ai-usage-when-INET6-is-not-defi.patch b/meta/recipes-connectivity/libpcap/libpcap/0001-Fix-compiler_state_t.ai-usage-when-INET6-is-not-defi.patch
deleted file mode 100644
index edb6ae5667..0000000000
--- a/meta/recipes-connectivity/libpcap/libpcap/0001-Fix-compiler_state_t.ai-usage-when-INET6-is-not-defi.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 64aa033a061c43fc15c711f2490ae41d23b868c3 Mon Sep 17 00:00:00 2001
-From: Fabio Berton <fabio.berton@ossystems.com.br>
-Date: Thu, 17 Nov 2016 09:44:42 -0200
-Subject: [PATCH 1/2] Fix compiler_state_t.ai usage when INET6 is not defined
-Organization: O.S. Systems Software LTDA.
-
-Fix error:
-
-/
-| ../libpcap-1.8.1/gencode.c: In function 'pcap_compile':
-| ../libpcap-1.8.1/gencode.c:693:8: error: 'compiler_state_t
-| {aka struct _compiler_state}' has no member named 'ai'
-|   cstate.ai = NULL;
-\
-
-Upstream-Status: Submitted [1]
-
-[1] https://github.com/the-tcpdump-group/libpcap/pull/541
-
-Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
----
- gencode.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/gencode.c b/gencode.c
-index a887f27..e103c70 100644
---- a/gencode.c
-+++ b/gencode.c
-@@ -690,7 +690,9 @@ pcap_compile(pcap_t *p, struct bpf_program *program,
- 	}
- 	initchunks(&cstate);
- 	cstate.no_optimize = 0;
-+#ifdef INET6
- 	cstate.ai = NULL;
-+#endif
- 	cstate.ic.root = NULL;
- 	cstate.ic.cur_mark = 0;
- 	cstate.bpf_pcap = p;
--- 
-2.1.4
-
diff --git a/meta/recipes-connectivity/libpcap/libpcap/0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-syste.patch b/meta/recipes-connectivity/libpcap/libpcap/0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-syste.patch
new file mode 100644
index 0000000000..6c4f12aa63
--- /dev/null
+++ b/meta/recipes-connectivity/libpcap/libpcap/0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-syste.patch
@@ -0,0 +1,30 @@
+From aafa3512b7b742f5e66a5543e41974cc5e7eebfa Mon Sep 17 00:00:00 2001
+From: maxice8 <thinkabit.ukim@gmail.com>
+Date: Sun, 22 Jul 2018 18:54:17 -0300
+Subject: [PATCH] pcap-usb-linux.c: add missing limits.h for musl systems.
+
+fix compilation on musl libc systems like Void Linux and Alpine.
+
+Upstream-Status:
+Backport[https://github.com/the-tcpdump-group/libpcap/commit/d557c98a16dc254aaff03762b694fe624e180bea]
+
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ pcap-usb-linux.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/pcap-usb-linux.c b/pcap-usb-linux.c
+index 6f8adf65..b92c05ea 100644
+--- a/pcap-usb-linux.c
++++ b/pcap-usb-linux.c
+@@ -50,6 +50,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <limits.h>
+ #include <string.h>
+ #include <dirent.h>
+ #include <byteswap.h>
+-- 
+2.17.1
+
diff --git a/meta/recipes-connectivity/libpcap/libpcap/0002-Add-missing-compiler_state_t-parameter.patch b/meta/recipes-connectivity/libpcap/libpcap/0002-Add-missing-compiler_state_t-parameter.patch
deleted file mode 100644
index 032b265f05..0000000000
--- a/meta/recipes-connectivity/libpcap/libpcap/0002-Add-missing-compiler_state_t-parameter.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 50ec0a088d5924a8305b2d70dcba71b0942dee1a Mon Sep 17 00:00:00 2001
-From: Fabio Berton <fabio.berton@ossystems.com.br>
-Date: Thu, 17 Nov 2016 09:47:29 -0200
-Subject: [PATCH 2/2] Add missing compiler_state_t parameter
-Organization: O.S. Systems Software LTDA.
-
-Fix error:
-
-/
-|../libpcap-1.8.1/gencode.c: In function 'gen_gateway':
-|../libpcap-1.8.1/gencode.c:4914:13: error: 'cstate' undeclared
-| (first use in this function)
-|    bpf_error(cstate, "direction applied to 'gateway'");
-\
-
-Upstream-Status: Submitted [1]
-
-[1] https://github.com/the-tcpdump-group/libpcap/pull/541
-
-Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
----
- gencode.c | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/gencode.c b/gencode.c
-index e103c70..f07c0be 100644
---- a/gencode.c
-+++ b/gencode.c
-@@ -523,7 +523,7 @@ static struct block *gen_host6(compiler_state_t *, struct in6_addr *,
-     struct in6_addr *, int, int, int);
- #endif
- #ifndef INET6
--static struct block *gen_gateway(const u_char *, bpf_u_int32 **, int, int);
-+static struct block *gen_gateway(compiler_state_t *, const u_char *, bpf_u_int32 **, int, int);
- #endif
- static struct block *gen_ipfrag(compiler_state_t *);
- static struct block *gen_portatom(compiler_state_t *, int, bpf_int32);
-@@ -4904,11 +4904,12 @@ gen_host6(compiler_state_t *cstate, struct in6_addr *addr,
- 
- #ifndef INET6
- static struct block *
--gen_gateway(eaddr, alist, proto, dir)
--	const u_char *eaddr;
--	bpf_u_int32 **alist;
--	int proto;
--	int dir;
-+gen_gateway(cstate, eaddr, alist, proto, dir)
-+    compiler_state_t *cstate;
-+    const u_char *eaddr;
-+    bpf_u_int32 **alist;
-+    int proto;
-+    int dir;
- {
- 	struct block *b0, *b1, *tmp;
- 
-@@ -6472,7 +6473,7 @@ gen_scode(compiler_state_t *cstate, const char *name, struct qual q)
- 		alist = pcap_nametoaddr(name);
- 		if (alist == NULL || *alist == NULL)
- 			bpf_error(cstate, "unknown host '%s'", name);
--		b = gen_gateway(eaddr, alist, proto, dir);
-+		b = gen_gateway(cstate, eaddr, alist, proto, dir);
- 		free(eaddr);
- 		return b;
- #else
--- 
-2.1.4
-
diff --git a/meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch b/meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch
deleted file mode 100644
index 7e1eea6b1e..0000000000
--- a/meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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/fix-grammar-deps.patch b/meta/recipes-connectivity/libpcap/libpcap/fix-grammar-deps.patch
deleted file mode 100644
index f40e655c44..0000000000
--- a/meta/recipes-connectivity/libpcap/libpcap/fix-grammar-deps.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Fix a missing dependency that can result in:
-
-../libpcap-1.8.1/grammar.y:78:10: fatal error: scanner.h: No such file or directory
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From 0dd90a6bdbce4dca14106859eee63ef643a106e2 Mon Sep 17 00:00:00 2001
-From: Alfredo Alvarez Fernandez <alfredoalvarezernandez@gmail.com>
-Date: Tue, 21 Feb 2017 11:41:43 +0100
-Subject: [PATCH] Makefile.in: Fix missing dependency
-
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 7044f043..f5d443ae 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -465,7 +465,7 @@ grammar.h: grammar.c
- 		$(MAKE) $(MAKEFLAGS) grammar.c; \
- 	fi
- 
--grammar.o: grammar.c
-+grammar.o: grammar.c scanner.h
- 	$(CC) $(FULL_CFLAGS) -c grammar.c
- 
- gencode.o: $(srcdir)/gencode.c grammar.h scanner.h
diff --git a/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch b/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch
deleted file mode 100644
index afaa3bea9b..0000000000
--- a/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 2796129af52901dd68595e5e88a639308541def9 Mon Sep 17 00:00:00 2001
-From: Fabio Berton <fabio.berton@ossystems.com.br>
-Date: Thu, 3 Nov 2016 17:56:29 -0200
-Subject: [PATCH] libpcap: pkgconfig support
-Organization: O.S. Systems Software LTDA.
-
-Adding basic structure to support pkg-config.
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
-Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
----
- Makefile.in   |  5 +++++
- configure.ac  |  1 +
- libpcap.pc.in | 10 ++++++++++
- 3 files changed, 16 insertions(+)
- create mode 100644 libpcap.pc.in
-
-diff --git a/Makefile.in b/Makefile.in
-index e71d973..d7004ed 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -61,6 +61,10 @@ V_RPATH_OPT = @V_RPATH_OPT@
- DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@
- PROG=libpcap
- 
-+# pkgconfig support
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = libpcap.pc
-+
- # Standard CFLAGS
- FULL_CFLAGS = $(CCOPT) $(INCLS) $(DEFS) $(CFLAGS)
- 
-@@ -286,6 +290,7 @@ EXTRA_DIST = \
- 	lbl/os-solaris2.h \
- 	lbl/os-sunos4.h \
- 	lbl/os-ultrix4.h \
-+	libpcap.pc \
- 	missing/getopt.c \
- 	missing/getopt.h \
- 	missing/snprintf.c \
-diff --git a/configure.ac b/configure.ac
-index da2f940..4fc67bf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1805,6 +1805,7 @@ fi
- AC_PROG_INSTALL
- 
- AC_CONFIG_HEADER(config.h)
-+AC_CONFIG_FILES([libpcap.pc])
- 
- AC_OUTPUT_COMMANDS([if test -f .devel; then
- 	echo timestamp > stamp-h
-diff --git a/libpcap.pc.in b/libpcap.pc.in
-new file mode 100644
-index 0000000..4f78ad8
---- /dev/null
-+++ b/libpcap.pc.in
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: libpcap
-+Description: System-independent interface for user-level packet capture.
-+Version: @VERSION@
-+Libs: -L${libdir} -lpcap
-+Cflags: -I${includedir}
--- 
-2.1.4
-
diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb b/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
deleted file mode 100644
index 13dfbd67a8..0000000000
--- a/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-require libpcap.inc
-
-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 \
-    file://fix-grammar-deps.patch \
-"
-
-SRC_URI[md5sum] = "3d48f9cd171ff12b0efd9134b52f1447"
-SRC_URI[sha256sum] = "673dbc69fdc3f5a86fb5759ab19899039a8e5e6c631749e48dcd9c6f0c83541e"
-
-#
-# make install doesn't cover the shared lib
-# make install-shared is just broken (no symlinks)
-#
-
-do_configure_prepend () {
-    #remove hardcoded references to /usr/include
-    sed 's|\([ "^'\''I]\+\)/usr/include/|\1${STAGING_INCDIR}/|g' -i ${S}/configure.ac
-}
-
-do_install_prepend () {
-    install -d ${D}${libdir}
-    install -d ${D}${bindir}
-    oe_runmake install-shared DESTDIR=${D}
-    oe_libinstall -a -so libpcap ${D}${libdir}
-    sed "s|@VERSION@|${PV}|" -i ${B}/libpcap.pc
-    install -D -m 0644 libpcap.pc ${D}${libdir}/pkgconfig/libpcap.pc
-}
diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap_1.9.0.bb
similarity index 58%
rename from meta/recipes-connectivity/libpcap/libpcap.inc
rename to meta/recipes-connectivity/libpcap/libpcap_1.9.0.bb
index e57ea87b37..78361561e6 100644
--- a/meta/recipes-connectivity/libpcap/libpcap.inc
+++ b/meta/recipes-connectivity/libpcap/libpcap_1.9.0.bb
@@ -10,33 +10,36 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5eb289217c160e2920d2e35bddc36453 \
                     file://pcap.h;beginline=1;endline=32;md5=39af3510e011f34b8872f120b1dc31d2"
 DEPENDS = "flex-native bison-native"
 
-INC_PR = "r5"
+SRC_URI = "https://www.tcpdump.org/release/${BP}.tar.gz \
+           file://0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-syste.patch \
+           "
+SRC_URI[md5sum] = "dffd65cb14406ab9841f421732eb0f33"
+SRC_URI[sha256sum] = "2edb88808e5913fdaa8e9c1fcaf272e19b2485338742b5074b9fe44d68f37019"
 
-SRC_URI = "http://www.tcpdump.org/release/${BP}.tar.gz"
+inherit autotools binconfig-disabled pkgconfig bluetooth
 
 BINCONFIG = "${bindir}/pcap-config"
 
-inherit autotools binconfig-disabled pkgconfig bluetooth
-
-EXTRA_OECONF = "--with-pcap=linux"
+# Explicitly disable dag support. We don't have recipe for it and if enabled here,
+# configure script poisons the include dirs with /usr/local/include even when the
+# support hasn't been detected.
+EXTRA_OECONF = " \
+                 --with-pcap=linux \
+                 --without-dag \
+                 "
 EXTRA_AUTORECONF += "--exclude=aclocal"
 
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \
                    ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
 "
-PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4"
-# Add a dummy PACKAGECONFIG for bluez5 since it is not supported by libpcap.
-PACKAGECONFIG[bluez5] = ",,"
+PACKAGECONFIG[bluez5] = "--enable-bluetooth,--disable-bluetooth,bluez5"
 PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
 PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
 PACKAGECONFIG[libnl] = "--with-libnl,--without-libnl,libnl"
 
-CPPFLAGS_prepend = "-I${S} "
-CFLAGS_prepend = "-I${S} "
-CXXFLAGS_prepend = "-I${S} "
-
 do_configure_prepend () {
-    sed -i -e's,^V_RPATH_OPT=.*$,V_RPATH_OPT=,' ${S}/pcap-config.in
+    #remove hardcoded references to /usr/include
+    sed 's|\([ "^'\''I]\+\)/usr/include/|\1${STAGING_INCDIR}/|g' -i ${S}/configure.ac
 }
 
 BBCLASSEXTEND = "native"
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 9+ messages in thread
* ✗ patchtest: failure for "libsolv: upgrade 0.7.1 -> 0.7...." and 4 more
  2018-12-20  8:43 [PATCH 1/5] libsolv: upgrade 0.7.1 -> 0.7.2 Anuj Mittal
                   ` (3 preceding siblings ...)
  2018-12-20  8:43 ` [PATCH 5/5] libpcap: upgrade 1.8.1 -> 1.9.0 Anuj Mittal
@ 2018-12-20  9:03 ` Patchwork
  4 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2018-12-20  9:03 UTC (permalink / raw)
  To: Anuj Mittal; +Cc: openembedded-core

== Series Details ==

Series: "libsolv: upgrade 0.7.1 -> 0.7...." and 4 more
Revision: 1
URL   : https://patchwork.openembedded.org/series/15429/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue             Upstream-Status is in incorrect format [test_upstream_status_presence_format] 
  Suggested fix    Fix Upstream-Status format in 0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-syste.patch
  Current          Upstream-Status:
  Standard format  Upstream-Status: <Valid status>
  Valid status     Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where]



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe



^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCH v2] libpcap: upgrade 1.8.1 -> 1.9.0
  2018-12-20  8:43 ` [PATCH 5/5] libpcap: upgrade 1.8.1 -> 1.9.0 Anuj Mittal
@ 2018-12-20  9:28   ` Anuj Mittal
  2019-01-08  7:45     ` Mittal, Anuj
  0 siblings, 1 reply; 9+ messages in thread
From: Anuj Mittal @ 2018-12-20  9:28 UTC (permalink / raw)
  To: openembedded-core

* For changes, see:
https://www.tcpdump.org/libpcap-changes.txt

* Merge inc and bb and remove unnecessary flags.

* Remove all patches, they have either been upstreamed or fixed
differently.

* Compilation with bluez5 works just fine, enable it and remove bluez4
config.

* Backport a commit to fix musl builds.

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 ...te_t.ai-usage-when-INET6-is-not-defi.patch | 41 -----------
 ...-add-missing-limits.h-for-musl-syste.patch | 29 ++++++++
 ...d-missing-compiler_state_t-parameter.patch | 67 -----------------
 .../libpcap/libpcap/disable-remote.patch      | 36 ---------
 .../libpcap/libpcap/fix-grammar-deps.patch    | 29 --------
 .../libpcap/libpcap-pkgconfig-support.patch   | 73 -------------------
 .../libpcap/libpcap_1.8.1.bb                  | 31 --------
 .../libpcap/{libpcap.inc => libpcap_1.9.0.bb} | 29 ++++----
 8 files changed, 45 insertions(+), 290 deletions(-)
 delete mode 100644 meta/recipes-connectivity/libpcap/libpcap/0001-Fix-compiler_state_t.ai-usage-when-INET6-is-not-defi.patch
 create mode 100644 meta/recipes-connectivity/libpcap/libpcap/0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-syste.patch
 delete mode 100644 meta/recipes-connectivity/libpcap/libpcap/0002-Add-missing-compiler_state_t-parameter.patch
 delete mode 100644 meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch
 delete mode 100644 meta/recipes-connectivity/libpcap/libpcap/fix-grammar-deps.patch
 delete mode 100644 meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch
 delete mode 100644 meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
 rename meta/recipes-connectivity/libpcap/{libpcap.inc => libpcap_1.9.0.bb} (58%)

diff --git a/meta/recipes-connectivity/libpcap/libpcap/0001-Fix-compiler_state_t.ai-usage-when-INET6-is-not-defi.patch b/meta/recipes-connectivity/libpcap/libpcap/0001-Fix-compiler_state_t.ai-usage-when-INET6-is-not-defi.patch
deleted file mode 100644
index edb6ae5667..0000000000
--- a/meta/recipes-connectivity/libpcap/libpcap/0001-Fix-compiler_state_t.ai-usage-when-INET6-is-not-defi.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 64aa033a061c43fc15c711f2490ae41d23b868c3 Mon Sep 17 00:00:00 2001
-From: Fabio Berton <fabio.berton@ossystems.com.br>
-Date: Thu, 17 Nov 2016 09:44:42 -0200
-Subject: [PATCH 1/2] Fix compiler_state_t.ai usage when INET6 is not defined
-Organization: O.S. Systems Software LTDA.
-
-Fix error:
-
-/
-| ../libpcap-1.8.1/gencode.c: In function 'pcap_compile':
-| ../libpcap-1.8.1/gencode.c:693:8: error: 'compiler_state_t
-| {aka struct _compiler_state}' has no member named 'ai'
-|   cstate.ai = NULL;
-\
-
-Upstream-Status: Submitted [1]
-
-[1] https://github.com/the-tcpdump-group/libpcap/pull/541
-
-Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
----
- gencode.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/gencode.c b/gencode.c
-index a887f27..e103c70 100644
---- a/gencode.c
-+++ b/gencode.c
-@@ -690,7 +690,9 @@ pcap_compile(pcap_t *p, struct bpf_program *program,
- 	}
- 	initchunks(&cstate);
- 	cstate.no_optimize = 0;
-+#ifdef INET6
- 	cstate.ai = NULL;
-+#endif
- 	cstate.ic.root = NULL;
- 	cstate.ic.cur_mark = 0;
- 	cstate.bpf_pcap = p;
--- 
-2.1.4
-
diff --git a/meta/recipes-connectivity/libpcap/libpcap/0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-syste.patch b/meta/recipes-connectivity/libpcap/libpcap/0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-syste.patch
new file mode 100644
index 0000000000..01773834c7
--- /dev/null
+++ b/meta/recipes-connectivity/libpcap/libpcap/0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-syste.patch
@@ -0,0 +1,29 @@
+From aafa3512b7b742f5e66a5543e41974cc5e7eebfa Mon Sep 17 00:00:00 2001
+From: maxice8 <thinkabit.ukim@gmail.com>
+Date: Sun, 22 Jul 2018 18:54:17 -0300
+Subject: [PATCH] pcap-usb-linux.c: add missing limits.h for musl systems.
+
+fix compilation on musl libc systems like Void Linux and Alpine.
+
+Upstream-Status: Backport [https://github.com/the-tcpdump-group/libpcap/commit/d557c98a16dc254aaff03762b694fe624e180bea]
+
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ pcap-usb-linux.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/pcap-usb-linux.c b/pcap-usb-linux.c
+index 6f8adf65..b92c05ea 100644
+--- a/pcap-usb-linux.c
++++ b/pcap-usb-linux.c
+@@ -50,6 +50,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <limits.h>
+ #include <string.h>
+ #include <dirent.h>
+ #include <byteswap.h>
+-- 
+2.17.1
+
diff --git a/meta/recipes-connectivity/libpcap/libpcap/0002-Add-missing-compiler_state_t-parameter.patch b/meta/recipes-connectivity/libpcap/libpcap/0002-Add-missing-compiler_state_t-parameter.patch
deleted file mode 100644
index 032b265f05..0000000000
--- a/meta/recipes-connectivity/libpcap/libpcap/0002-Add-missing-compiler_state_t-parameter.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 50ec0a088d5924a8305b2d70dcba71b0942dee1a Mon Sep 17 00:00:00 2001
-From: Fabio Berton <fabio.berton@ossystems.com.br>
-Date: Thu, 17 Nov 2016 09:47:29 -0200
-Subject: [PATCH 2/2] Add missing compiler_state_t parameter
-Organization: O.S. Systems Software LTDA.
-
-Fix error:
-
-/
-|../libpcap-1.8.1/gencode.c: In function 'gen_gateway':
-|../libpcap-1.8.1/gencode.c:4914:13: error: 'cstate' undeclared
-| (first use in this function)
-|    bpf_error(cstate, "direction applied to 'gateway'");
-\
-
-Upstream-Status: Submitted [1]
-
-[1] https://github.com/the-tcpdump-group/libpcap/pull/541
-
-Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
----
- gencode.c | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/gencode.c b/gencode.c
-index e103c70..f07c0be 100644
---- a/gencode.c
-+++ b/gencode.c
-@@ -523,7 +523,7 @@ static struct block *gen_host6(compiler_state_t *, struct in6_addr *,
-     struct in6_addr *, int, int, int);
- #endif
- #ifndef INET6
--static struct block *gen_gateway(const u_char *, bpf_u_int32 **, int, int);
-+static struct block *gen_gateway(compiler_state_t *, const u_char *, bpf_u_int32 **, int, int);
- #endif
- static struct block *gen_ipfrag(compiler_state_t *);
- static struct block *gen_portatom(compiler_state_t *, int, bpf_int32);
-@@ -4904,11 +4904,12 @@ gen_host6(compiler_state_t *cstate, struct in6_addr *addr,
- 
- #ifndef INET6
- static struct block *
--gen_gateway(eaddr, alist, proto, dir)
--	const u_char *eaddr;
--	bpf_u_int32 **alist;
--	int proto;
--	int dir;
-+gen_gateway(cstate, eaddr, alist, proto, dir)
-+    compiler_state_t *cstate;
-+    const u_char *eaddr;
-+    bpf_u_int32 **alist;
-+    int proto;
-+    int dir;
- {
- 	struct block *b0, *b1, *tmp;
- 
-@@ -6472,7 +6473,7 @@ gen_scode(compiler_state_t *cstate, const char *name, struct qual q)
- 		alist = pcap_nametoaddr(name);
- 		if (alist == NULL || *alist == NULL)
- 			bpf_error(cstate, "unknown host '%s'", name);
--		b = gen_gateway(eaddr, alist, proto, dir);
-+		b = gen_gateway(cstate, eaddr, alist, proto, dir);
- 		free(eaddr);
- 		return b;
- #else
--- 
-2.1.4
-
diff --git a/meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch b/meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch
deleted file mode 100644
index 7e1eea6b1e..0000000000
--- a/meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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/fix-grammar-deps.patch b/meta/recipes-connectivity/libpcap/libpcap/fix-grammar-deps.patch
deleted file mode 100644
index f40e655c44..0000000000
--- a/meta/recipes-connectivity/libpcap/libpcap/fix-grammar-deps.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Fix a missing dependency that can result in:
-
-../libpcap-1.8.1/grammar.y:78:10: fatal error: scanner.h: No such file or directory
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From 0dd90a6bdbce4dca14106859eee63ef643a106e2 Mon Sep 17 00:00:00 2001
-From: Alfredo Alvarez Fernandez <alfredoalvarezernandez@gmail.com>
-Date: Tue, 21 Feb 2017 11:41:43 +0100
-Subject: [PATCH] Makefile.in: Fix missing dependency
-
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 7044f043..f5d443ae 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -465,7 +465,7 @@ grammar.h: grammar.c
- 		$(MAKE) $(MAKEFLAGS) grammar.c; \
- 	fi
- 
--grammar.o: grammar.c
-+grammar.o: grammar.c scanner.h
- 	$(CC) $(FULL_CFLAGS) -c grammar.c
- 
- gencode.o: $(srcdir)/gencode.c grammar.h scanner.h
diff --git a/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch b/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch
deleted file mode 100644
index afaa3bea9b..0000000000
--- a/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 2796129af52901dd68595e5e88a639308541def9 Mon Sep 17 00:00:00 2001
-From: Fabio Berton <fabio.berton@ossystems.com.br>
-Date: Thu, 3 Nov 2016 17:56:29 -0200
-Subject: [PATCH] libpcap: pkgconfig support
-Organization: O.S. Systems Software LTDA.
-
-Adding basic structure to support pkg-config.
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
-Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
----
- Makefile.in   |  5 +++++
- configure.ac  |  1 +
- libpcap.pc.in | 10 ++++++++++
- 3 files changed, 16 insertions(+)
- create mode 100644 libpcap.pc.in
-
-diff --git a/Makefile.in b/Makefile.in
-index e71d973..d7004ed 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -61,6 +61,10 @@ V_RPATH_OPT = @V_RPATH_OPT@
- DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@
- PROG=libpcap
- 
-+# pkgconfig support
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = libpcap.pc
-+
- # Standard CFLAGS
- FULL_CFLAGS = $(CCOPT) $(INCLS) $(DEFS) $(CFLAGS)
- 
-@@ -286,6 +290,7 @@ EXTRA_DIST = \
- 	lbl/os-solaris2.h \
- 	lbl/os-sunos4.h \
- 	lbl/os-ultrix4.h \
-+	libpcap.pc \
- 	missing/getopt.c \
- 	missing/getopt.h \
- 	missing/snprintf.c \
-diff --git a/configure.ac b/configure.ac
-index da2f940..4fc67bf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1805,6 +1805,7 @@ fi
- AC_PROG_INSTALL
- 
- AC_CONFIG_HEADER(config.h)
-+AC_CONFIG_FILES([libpcap.pc])
- 
- AC_OUTPUT_COMMANDS([if test -f .devel; then
- 	echo timestamp > stamp-h
-diff --git a/libpcap.pc.in b/libpcap.pc.in
-new file mode 100644
-index 0000000..4f78ad8
---- /dev/null
-+++ b/libpcap.pc.in
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: libpcap
-+Description: System-independent interface for user-level packet capture.
-+Version: @VERSION@
-+Libs: -L${libdir} -lpcap
-+Cflags: -I${includedir}
--- 
-2.1.4
-
diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb b/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
deleted file mode 100644
index 13dfbd67a8..0000000000
--- a/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-require libpcap.inc
-
-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 \
-    file://fix-grammar-deps.patch \
-"
-
-SRC_URI[md5sum] = "3d48f9cd171ff12b0efd9134b52f1447"
-SRC_URI[sha256sum] = "673dbc69fdc3f5a86fb5759ab19899039a8e5e6c631749e48dcd9c6f0c83541e"
-
-#
-# make install doesn't cover the shared lib
-# make install-shared is just broken (no symlinks)
-#
-
-do_configure_prepend () {
-    #remove hardcoded references to /usr/include
-    sed 's|\([ "^'\''I]\+\)/usr/include/|\1${STAGING_INCDIR}/|g' -i ${S}/configure.ac
-}
-
-do_install_prepend () {
-    install -d ${D}${libdir}
-    install -d ${D}${bindir}
-    oe_runmake install-shared DESTDIR=${D}
-    oe_libinstall -a -so libpcap ${D}${libdir}
-    sed "s|@VERSION@|${PV}|" -i ${B}/libpcap.pc
-    install -D -m 0644 libpcap.pc ${D}${libdir}/pkgconfig/libpcap.pc
-}
diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap_1.9.0.bb
similarity index 58%
rename from meta/recipes-connectivity/libpcap/libpcap.inc
rename to meta/recipes-connectivity/libpcap/libpcap_1.9.0.bb
index e57ea87b37..78361561e6 100644
--- a/meta/recipes-connectivity/libpcap/libpcap.inc
+++ b/meta/recipes-connectivity/libpcap/libpcap_1.9.0.bb
@@ -10,33 +10,36 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5eb289217c160e2920d2e35bddc36453 \
                     file://pcap.h;beginline=1;endline=32;md5=39af3510e011f34b8872f120b1dc31d2"
 DEPENDS = "flex-native bison-native"
 
-INC_PR = "r5"
+SRC_URI = "https://www.tcpdump.org/release/${BP}.tar.gz \
+           file://0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-syste.patch \
+           "
+SRC_URI[md5sum] = "dffd65cb14406ab9841f421732eb0f33"
+SRC_URI[sha256sum] = "2edb88808e5913fdaa8e9c1fcaf272e19b2485338742b5074b9fe44d68f37019"
 
-SRC_URI = "http://www.tcpdump.org/release/${BP}.tar.gz"
+inherit autotools binconfig-disabled pkgconfig bluetooth
 
 BINCONFIG = "${bindir}/pcap-config"
 
-inherit autotools binconfig-disabled pkgconfig bluetooth
-
-EXTRA_OECONF = "--with-pcap=linux"
+# Explicitly disable dag support. We don't have recipe for it and if enabled here,
+# configure script poisons the include dirs with /usr/local/include even when the
+# support hasn't been detected.
+EXTRA_OECONF = " \
+                 --with-pcap=linux \
+                 --without-dag \
+                 "
 EXTRA_AUTORECONF += "--exclude=aclocal"
 
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \
                    ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
 "
-PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4"
-# Add a dummy PACKAGECONFIG for bluez5 since it is not supported by libpcap.
-PACKAGECONFIG[bluez5] = ",,"
+PACKAGECONFIG[bluez5] = "--enable-bluetooth,--disable-bluetooth,bluez5"
 PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
 PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
 PACKAGECONFIG[libnl] = "--with-libnl,--without-libnl,libnl"
 
-CPPFLAGS_prepend = "-I${S} "
-CFLAGS_prepend = "-I${S} "
-CXXFLAGS_prepend = "-I${S} "
-
 do_configure_prepend () {
-    sed -i -e's,^V_RPATH_OPT=.*$,V_RPATH_OPT=,' ${S}/pcap-config.in
+    #remove hardcoded references to /usr/include
+    sed 's|\([ "^'\''I]\+\)/usr/include/|\1${STAGING_INCDIR}/|g' -i ${S}/configure.ac
 }
 
 BBCLASSEXTEND = "native"
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 9+ messages in thread
* Re: [PATCH v2] libpcap: upgrade 1.8.1 -> 1.9.0
  2018-12-20  9:28   ` [PATCH v2] " Anuj Mittal
@ 2019-01-08  7:45     ` Mittal, Anuj
  2019-01-08 10:30       ` Burton, Ross
  0 siblings, 1 reply; 9+ messages in thread
From: Mittal, Anuj @ 2019-01-08  7:45 UTC (permalink / raw)
  To: Mittal, Anuj, openembedded-core

Ping for the series.

> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org [mailto:openembedded-
> core-bounces@lists.openembedded.org] On Behalf Of Anuj Mittal
> Sent: Thursday, December 20, 2018 05:29 PM
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH v2] libpcap: upgrade 1.8.1 -> 1.9.0
> 
> * For changes, see:
> https://www.tcpdump.org/libpcap-changes.txt
> 
> * Merge inc and bb and remove unnecessary flags.
> 
> * Remove all patches, they have either been upstreamed or fixed differently.
> 
> * Compilation with bluez5 works just fine, enable it and remove bluez4 config.
> 
> * Backport a commit to fix musl builds.
> 
> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
> ---
>  ...te_t.ai-usage-when-INET6-is-not-defi.patch | 41 -----------  ...-add-missing-limits.h-
> for-musl-syste.patch | 29 ++++++++  ...d-missing-compiler_state_t-parameter.patch | 67
> -----------------
>  .../libpcap/libpcap/disable-remote.patch      | 36 ---------
>  .../libpcap/libpcap/fix-grammar-deps.patch    | 29 --------
>  .../libpcap/libpcap-pkgconfig-support.patch   | 73 -------------------
>  .../libpcap/libpcap_1.8.1.bb                  | 31 --------
>  .../libpcap/{libpcap.inc => libpcap_1.9.0.bb} | 29 ++++----
>  8 files changed, 45 insertions(+), 290 deletions(-)  delete mode 100644 meta/recipes-
> connectivity/libpcap/libpcap/0001-Fix-compiler_state_t.ai-usage-when-INET6-is-not-
> defi.patch
>  create mode 100644 meta/recipes-connectivity/libpcap/libpcap/0001-pcap-usb-
> linux.c-add-missing-limits.h-for-musl-syste.patch
>  delete mode 100644 meta/recipes-connectivity/libpcap/libpcap/0002-Add-missing-
> compiler_state_t-parameter.patch
>  delete mode 100644 meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch
>  delete mode 100644 meta/recipes-connectivity/libpcap/libpcap/fix-grammar-
> deps.patch
>  delete mode 100644 meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-
> support.patch
>  delete mode 100644 meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
>  rename meta/recipes-connectivity/libpcap/{libpcap.inc => libpcap_1.9.0.bb} (58%)
> 
> diff --git a/meta/recipes-connectivity/libpcap/libpcap/0001-Fix-compiler_state_t.ai-
> usage-when-INET6-is-not-defi.patch b/meta/recipes-
> connectivity/libpcap/libpcap/0001-Fix-compiler_state_t.ai-usage-when-INET6-is-not-
> defi.patch
> deleted file mode 100644
> index edb6ae5667..0000000000
> --- a/meta/recipes-connectivity/libpcap/libpcap/0001-Fix-compiler_state_t.ai-usage-
> when-INET6-is-not-defi.patch
> +++ /dev/null
> @@ -1,41 +0,0 @@
> -From 64aa033a061c43fc15c711f2490ae41d23b868c3 Mon Sep 17 00:00:00 2001
> -From: Fabio Berton <fabio.berton@ossystems.com.br>
> -Date: Thu, 17 Nov 2016 09:44:42 -0200
> -Subject: [PATCH 1/2] Fix compiler_state_t.ai usage when INET6 is not defined
> -Organization: O.S. Systems Software LTDA.
> -
> -Fix error:
> -
> -/
> -| ../libpcap-1.8.1/gencode.c: In function 'pcap_compile':
> -| ../libpcap-1.8.1/gencode.c:693:8: error: 'compiler_state_t {aka
> -| struct _compiler_state}' has no member named 'ai'
> -|   cstate.ai = NULL;
> -\
> -
> -Upstream-Status: Submitted [1]
> -
> -[1] https://github.com/the-tcpdump-group/libpcap/pull/541
> -
> -Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
> ----
> - gencode.c | 2 ++
> - 1 file changed, 2 insertions(+)
> -
> -diff --git a/gencode.c b/gencode.c
> -index a887f27..e103c70 100644
> ---- a/gencode.c
> -+++ b/gencode.c
> -@@ -690,7 +690,9 @@ pcap_compile(pcap_t *p, struct bpf_program *program,
> - 	}
> - 	initchunks(&cstate);
> - 	cstate.no_optimize = 0;
> -+#ifdef INET6
> - 	cstate.ai = NULL;
> -+#endif
> - 	cstate.ic.root = NULL;
> - 	cstate.ic.cur_mark = 0;
> - 	cstate.bpf_pcap = p;
> ---
> -2.1.4
> -
> diff --git a/meta/recipes-connectivity/libpcap/libpcap/0001-pcap-usb-linux.c-add-
> missing-limits.h-for-musl-syste.patch b/meta/recipes-
> connectivity/libpcap/libpcap/0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-
> syste.patch
> new file mode 100644
> index 0000000000..01773834c7
> --- /dev/null
> +++ b/meta/recipes-connectivity/libpcap/libpcap/0001-pcap-usb-linux.c-ad
> +++ d-missing-limits.h-for-musl-syste.patch
> @@ -0,0 +1,29 @@
> +From aafa3512b7b742f5e66a5543e41974cc5e7eebfa Mon Sep 17 00:00:00 2001
> +From: maxice8 <thinkabit.ukim@gmail.com>
> +Date: Sun, 22 Jul 2018 18:54:17 -0300
> +Subject: [PATCH] pcap-usb-linux.c: add missing limits.h for musl systems.
> +
> +fix compilation on musl libc systems like Void Linux and Alpine.
> +
> +Upstream-Status: Backport
> +[https://github.com/the-tcpdump-group/libpcap/commit/d557c98a16dc254aaf
> +f03762b694fe624e180bea]
> +
> +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
> +---
> + pcap-usb-linux.c | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/pcap-usb-linux.c b/pcap-usb-linux.c index
> +6f8adf65..b92c05ea 100644
> +--- a/pcap-usb-linux.c
> ++++ b/pcap-usb-linux.c
> +@@ -50,6 +50,7 @@
> + #include <stdlib.h>
> + #include <unistd.h>
> + #include <fcntl.h>
> ++#include <limits.h>
> + #include <string.h>
> + #include <dirent.h>
> + #include <byteswap.h>
> +--
> +2.17.1
> +
> diff --git a/meta/recipes-connectivity/libpcap/libpcap/0002-Add-missing-
> compiler_state_t-parameter.patch b/meta/recipes-connectivity/libpcap/libpcap/0002-
> Add-missing-compiler_state_t-parameter.patch
> deleted file mode 100644
> index 032b265f05..0000000000
> --- a/meta/recipes-connectivity/libpcap/libpcap/0002-Add-missing-compiler_state_t-
> parameter.patch
> +++ /dev/null
> @@ -1,67 +0,0 @@
> -From 50ec0a088d5924a8305b2d70dcba71b0942dee1a Mon Sep 17 00:00:00 2001
> -From: Fabio Berton <fabio.berton@ossystems.com.br>
> -Date: Thu, 17 Nov 2016 09:47:29 -0200
> -Subject: [PATCH 2/2] Add missing compiler_state_t parameter
> -Organization: O.S. Systems Software LTDA.
> -
> -Fix error:
> -
> -/
> -|../libpcap-1.8.1/gencode.c: In function 'gen_gateway':
> -|../libpcap-1.8.1/gencode.c:4914:13: error: 'cstate' undeclared  (first
> -|use in this function)
> -|    bpf_error(cstate, "direction applied to 'gateway'");
> -\
> -
> -Upstream-Status: Submitted [1]
> -
> -[1] https://github.com/the-tcpdump-group/libpcap/pull/541
> -
> -Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
> ----
> - gencode.c | 15 ++++++++-------
> - 1 file changed, 8 insertions(+), 7 deletions(-)
> -
> -diff --git a/gencode.c b/gencode.c
> -index e103c70..f07c0be 100644
> ---- a/gencode.c
> -+++ b/gencode.c
> -@@ -523,7 +523,7 @@ static struct block *gen_host6(compiler_state_t *, struct
> in6_addr *,
> -     struct in6_addr *, int, int, int);
> - #endif
> - #ifndef INET6
> --static struct block *gen_gateway(const u_char *, bpf_u_int32 **, int, int);
> -+static struct block *gen_gateway(compiler_state_t *, const u_char *,
> -+bpf_u_int32 **, int, int);
> - #endif
> - static struct block *gen_ipfrag(compiler_state_t *);
> - static struct block *gen_portatom(compiler_state_t *, int, bpf_int32); -@@ -4904,11
> +4904,12 @@ gen_host6(compiler_state_t *cstate, struct in6_addr *addr,
> -
> - #ifndef INET6
> - static struct block *
> --gen_gateway(eaddr, alist, proto, dir)
> --	const u_char *eaddr;
> --	bpf_u_int32 **alist;
> --	int proto;
> --	int dir;
> -+gen_gateway(cstate, eaddr, alist, proto, dir)
> -+    compiler_state_t *cstate;
> -+    const u_char *eaddr;
> -+    bpf_u_int32 **alist;
> -+    int proto;
> -+    int dir;
> - {
> - 	struct block *b0, *b1, *tmp;
> -
> -@@ -6472,7 +6473,7 @@ gen_scode(compiler_state_t *cstate, const char *name,
> struct qual q)
> - 		alist = pcap_nametoaddr(name);
> - 		if (alist == NULL || *alist == NULL)
> - 			bpf_error(cstate, "unknown host '%s'", name);
> --		b = gen_gateway(eaddr, alist, proto, dir);
> -+		b = gen_gateway(cstate, eaddr, alist, proto, dir);
> - 		free(eaddr);
> - 		return b;
> - #else
> ---
> -2.1.4
> -
> diff --git a/meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch
> b/meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch
> deleted file mode 100644
> index 7e1eea6b1e..0000000000
> --- a/meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -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/fix-grammar-deps.patch
> b/meta/recipes-connectivity/libpcap/libpcap/fix-grammar-deps.patch
> deleted file mode 100644
> index f40e655c44..0000000000
> --- a/meta/recipes-connectivity/libpcap/libpcap/fix-grammar-deps.patch
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -Fix a missing dependency that can result in:
> -
> -../libpcap-1.8.1/grammar.y:78:10: fatal error: scanner.h: No such file or directory
> -
> -Upstream-Status: Backport
> -Signed-off-by: Ross Burton <ross.burton@intel.com>
> -
> -From 0dd90a6bdbce4dca14106859eee63ef643a106e2 Mon Sep 17 00:00:00 2001
> -From: Alfredo Alvarez Fernandez <alfredoalvarezernandez@gmail.com>
> -Date: Tue, 21 Feb 2017 11:41:43 +0100
> -Subject: [PATCH] Makefile.in: Fix missing dependency
> -
> ----
> - Makefile.in | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/Makefile.in b/Makefile.in
> -index 7044f043..f5d443ae 100644
> ---- a/Makefile.in
> -+++ b/Makefile.in
> -@@ -465,7 +465,7 @@ grammar.h: grammar.c
> - 		$(MAKE) $(MAKEFLAGS) grammar.c; \
> - 	fi
> -
> --grammar.o: grammar.c
> -+grammar.o: grammar.c scanner.h
> - 	$(CC) $(FULL_CFLAGS) -c grammar.c
> -
> - gencode.o: $(srcdir)/gencode.c grammar.h scanner.h diff --git a/meta/recipes-
> connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch b/meta/recipes-
> connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch
> deleted file mode 100644
> index afaa3bea9b..0000000000
> --- a/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch
> +++ /dev/null
> @@ -1,73 +0,0 @@
> -From 2796129af52901dd68595e5e88a639308541def9 Mon Sep 17 00:00:00 2001
> -From: Fabio Berton <fabio.berton@ossystems.com.br>
> -Date: Thu, 3 Nov 2016 17:56:29 -0200
> -Subject: [PATCH] libpcap: pkgconfig support
> -Organization: O.S. Systems Software LTDA.
> -
> -Adding basic structure to support pkg-config.
> -
> -Upstream-Status: Inappropriate [embedded specific]
> -
> -Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
> -Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
> ----
> - Makefile.in   |  5 +++++
> - configure.ac  |  1 +
> - libpcap.pc.in | 10 ++++++++++
> - 3 files changed, 16 insertions(+)
> - create mode 100644 libpcap.pc.in
> -
> -diff --git a/Makefile.in b/Makefile.in
> -index e71d973..d7004ed 100644
> ---- a/Makefile.in
> -+++ b/Makefile.in
> -@@ -61,6 +61,10 @@ V_RPATH_OPT = @V_RPATH_OPT@
> - DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@
> - PROG=libpcap
> -
> -+# pkgconfig support
> -+pkgconfigdir = $(libdir)/pkgconfig
> -+pkgconfig_DATA = libpcap.pc
> -+
> - # Standard CFLAGS
> - FULL_CFLAGS = $(CCOPT) $(INCLS) $(DEFS) $(CFLAGS)
> -
> -@@ -286,6 +290,7 @@ EXTRA_DIST = \
> - 	lbl/os-solaris2.h \
> - 	lbl/os-sunos4.h \
> - 	lbl/os-ultrix4.h \
> -+	libpcap.pc \
> - 	missing/getopt.c \
> - 	missing/getopt.h \
> - 	missing/snprintf.c \
> -diff --git a/configure.ac b/configure.ac -index da2f940..4fc67bf 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -1805,6 +1805,7 @@ fi
> - AC_PROG_INSTALL
> -
> - AC_CONFIG_HEADER(config.h)
> -+AC_CONFIG_FILES([libpcap.pc])
> -
> - AC_OUTPUT_COMMANDS([if test -f .devel; then
> - 	echo timestamp > stamp-h
> -diff --git a/libpcap.pc.in b/libpcap.pc.in -new file mode 100644 -index
> 0000000..4f78ad8
> ---- /dev/null
> -+++ b/libpcap.pc.in
> -@@ -0,0 +1,10 @@
> -+prefix=@prefix@
> -+exec_prefix=@exec_prefix@
> -+libdir=@libdir@
> -+includedir=@includedir@
> -+
> -+Name: libpcap
> -+Description: System-independent interface for user-level packet capture.
> -+Version: @VERSION@
> -+Libs: -L${libdir} -lpcap
> -+Cflags: -I${includedir}
> ---
> -2.1.4
> -
> diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb b/meta/recipes-
> connectivity/libpcap/libpcap_1.8.1.bb
> deleted file mode 100644
> index 13dfbd67a8..0000000000
> --- a/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -require libpcap.inc
> -
> -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 \
> -    file://fix-grammar-deps.patch \
> -"
> -
> -SRC_URI[md5sum] = "3d48f9cd171ff12b0efd9134b52f1447"
> -SRC_URI[sha256sum] =
> "673dbc69fdc3f5a86fb5759ab19899039a8e5e6c631749e48dcd9c6f0c83541e"
> -
> -#
> -# make install doesn't cover the shared lib -# make install-shared is just broken (no
> symlinks) -#
> -
> -do_configure_prepend () {
> -    #remove hardcoded references to /usr/include
> -    sed 's|\([ "^'\''I]\+\)/usr/include/|\1${STAGING_INCDIR}/|g' -i ${S}/configure.ac
> -}
> -
> -do_install_prepend () {
> -    install -d ${D}${libdir}
> -    install -d ${D}${bindir}
> -    oe_runmake install-shared DESTDIR=${D}
> -    oe_libinstall -a -so libpcap ${D}${libdir}
> -    sed "s|@VERSION@|${PV}|" -i ${B}/libpcap.pc
> -    install -D -m 0644 libpcap.pc ${D}${libdir}/pkgconfig/libpcap.pc
> -}
> diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-
> connectivity/libpcap/libpcap_1.9.0.bb
> similarity index 58%
> rename from meta/recipes-connectivity/libpcap/libpcap.inc
> rename to meta/recipes-connectivity/libpcap/libpcap_1.9.0.bb
> index e57ea87b37..78361561e6 100644
> --- a/meta/recipes-connectivity/libpcap/libpcap.inc
> +++ b/meta/recipes-connectivity/libpcap/libpcap_1.9.0.bb
> @@ -10,33 +10,36 @@ LIC_FILES_CHKSUM =
> "file://LICENSE;md5=5eb289217c160e2920d2e35bddc36453 \
> 
> file://pcap.h;beginline=1;endline=32;md5=39af3510e011f34b8872f120b1dc31d2"
>  DEPENDS = "flex-native bison-native"
> 
> -INC_PR = "r5"
> +SRC_URI = "https://www.tcpdump.org/release/${BP}.tar.gz \
> +           file://0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-syste.patch \
> +           "
> +SRC_URI[md5sum] = "dffd65cb14406ab9841f421732eb0f33"
> +SRC_URI[sha256sum] =
> "2edb88808e5913fdaa8e9c1fcaf272e19b2485338742b5074b9fe44d68f37019"
> 
> -SRC_URI = "http://www.tcpdump.org/release/${BP}.tar.gz"
> +inherit autotools binconfig-disabled pkgconfig bluetooth
> 
>  BINCONFIG = "${bindir}/pcap-config"
> 
> -inherit autotools binconfig-disabled pkgconfig bluetooth
> -
> -EXTRA_OECONF = "--with-pcap=linux"
> +# Explicitly disable dag support. We don't have recipe for it and if
> +enabled here, # configure script poisons the include dirs with
> +/usr/local/include even when the # support hasn't been detected.
> +EXTRA_OECONF = " \
> +                 --with-pcap=linux \
> +                 --without-dag \
> +                 "
>  EXTRA_AUTORECONF += "--exclude=aclocal"
> 
>  PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth',
> '${BLUEZ}', '', d)} \
>                     ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \  "
> -PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4"
> -# Add a dummy PACKAGECONFIG for bluez5 since it is not supported by libpcap.
> -PACKAGECONFIG[bluez5] = ",,"
> +PACKAGECONFIG[bluez5] = "--enable-bluetooth,--disable-bluetooth,bluez5"
>  PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
>  PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
>  PACKAGECONFIG[libnl] = "--with-libnl,--without-libnl,libnl"
> 
> -CPPFLAGS_prepend = "-I${S} "
> -CFLAGS_prepend = "-I${S} "
> -CXXFLAGS_prepend = "-I${S} "
> -
>  do_configure_prepend () {
> -    sed -i -e's,^V_RPATH_OPT=.*$,V_RPATH_OPT=,' ${S}/pcap-config.in
> +    #remove hardcoded references to /usr/include
> +    sed 's|\([ "^'\''I]\+\)/usr/include/|\1${STAGING_INCDIR}/|g' -i
> + ${S}/configure.ac
>  }
> 
>  BBCLASSEXTEND = "native"
> --
> 2.17.1
> 
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core


^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH v2] libpcap: upgrade 1.8.1 -> 1.9.0
  2019-01-08  7:45     ` Mittal, Anuj
@ 2019-01-08 10:30       ` Burton, Ross
  0 siblings, 0 replies; 9+ messages in thread
From: Burton, Ross @ 2019-01-08 10:30 UTC (permalink / raw)
  To: Mittal, Anuj; +Cc: openembedded-core

They're in mut, but haven't been for an autobuilder spin yet.  Today, hopefully.

Ross

On Tue, 8 Jan 2019 at 07:47, Mittal, Anuj <anuj.mittal@intel.com> wrote:
>
> Ping for the series.
>
> > -----Original Message-----
> > From: openembedded-core-bounces@lists.openembedded.org [mailto:openembedded-
> > core-bounces@lists.openembedded.org] On Behalf Of Anuj Mittal
> > Sent: Thursday, December 20, 2018 05:29 PM
> > To: openembedded-core@lists.openembedded.org
> > Subject: [OE-core] [PATCH v2] libpcap: upgrade 1.8.1 -> 1.9.0
> >
> > * For changes, see:
> > https://www.tcpdump.org/libpcap-changes.txt
> >
> > * Merge inc and bb and remove unnecessary flags.
> >
> > * Remove all patches, they have either been upstreamed or fixed differently.
> >
> > * Compilation with bluez5 works just fine, enable it and remove bluez4 config.
> >
> > * Backport a commit to fix musl builds.
> >
> > Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
> > ---
> >  ...te_t.ai-usage-when-INET6-is-not-defi.patch | 41 -----------  ...-add-missing-limits.h-
> > for-musl-syste.patch | 29 ++++++++  ...d-missing-compiler_state_t-parameter.patch | 67
> > -----------------
> >  .../libpcap/libpcap/disable-remote.patch      | 36 ---------
> >  .../libpcap/libpcap/fix-grammar-deps.patch    | 29 --------
> >  .../libpcap/libpcap-pkgconfig-support.patch   | 73 -------------------
> >  .../libpcap/libpcap_1.8.1.bb                  | 31 --------
> >  .../libpcap/{libpcap.inc => libpcap_1.9.0.bb} | 29 ++++----
> >  8 files changed, 45 insertions(+), 290 deletions(-)  delete mode 100644 meta/recipes-
> > connectivity/libpcap/libpcap/0001-Fix-compiler_state_t.ai-usage-when-INET6-is-not-
> > defi.patch
> >  create mode 100644 meta/recipes-connectivity/libpcap/libpcap/0001-pcap-usb-
> > linux.c-add-missing-limits.h-for-musl-syste.patch
> >  delete mode 100644 meta/recipes-connectivity/libpcap/libpcap/0002-Add-missing-
> > compiler_state_t-parameter.patch
> >  delete mode 100644 meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch
> >  delete mode 100644 meta/recipes-connectivity/libpcap/libpcap/fix-grammar-
> > deps.patch
> >  delete mode 100644 meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-
> > support.patch
> >  delete mode 100644 meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
> >  rename meta/recipes-connectivity/libpcap/{libpcap.inc => libpcap_1.9.0.bb} (58%)
> >
> > diff --git a/meta/recipes-connectivity/libpcap/libpcap/0001-Fix-compiler_state_t.ai-
> > usage-when-INET6-is-not-defi.patch b/meta/recipes-
> > connectivity/libpcap/libpcap/0001-Fix-compiler_state_t.ai-usage-when-INET6-is-not-
> > defi.patch
> > deleted file mode 100644
> > index edb6ae5667..0000000000
> > --- a/meta/recipes-connectivity/libpcap/libpcap/0001-Fix-compiler_state_t.ai-usage-
> > when-INET6-is-not-defi.patch
> > +++ /dev/null
> > @@ -1,41 +0,0 @@
> > -From 64aa033a061c43fc15c711f2490ae41d23b868c3 Mon Sep 17 00:00:00 2001
> > -From: Fabio Berton <fabio.berton@ossystems.com.br>
> > -Date: Thu, 17 Nov 2016 09:44:42 -0200
> > -Subject: [PATCH 1/2] Fix compiler_state_t.ai usage when INET6 is not defined
> > -Organization: O.S. Systems Software LTDA.
> > -
> > -Fix error:
> > -
> > -/
> > -| ../libpcap-1.8.1/gencode.c: In function 'pcap_compile':
> > -| ../libpcap-1.8.1/gencode.c:693:8: error: 'compiler_state_t {aka
> > -| struct _compiler_state}' has no member named 'ai'
> > -|   cstate.ai = NULL;
> > -\
> > -
> > -Upstream-Status: Submitted [1]
> > -
> > -[1] https://github.com/the-tcpdump-group/libpcap/pull/541
> > -
> > -Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
> > ----
> > - gencode.c | 2 ++
> > - 1 file changed, 2 insertions(+)
> > -
> > -diff --git a/gencode.c b/gencode.c
> > -index a887f27..e103c70 100644
> > ---- a/gencode.c
> > -+++ b/gencode.c
> > -@@ -690,7 +690,9 @@ pcap_compile(pcap_t *p, struct bpf_program *program,
> > -     }
> > -     initchunks(&cstate);
> > -     cstate.no_optimize = 0;
> > -+#ifdef INET6
> > -     cstate.ai = NULL;
> > -+#endif
> > -     cstate.ic.root = NULL;
> > -     cstate.ic.cur_mark = 0;
> > -     cstate.bpf_pcap = p;
> > ---
> > -2.1.4
> > -
> > diff --git a/meta/recipes-connectivity/libpcap/libpcap/0001-pcap-usb-linux.c-add-
> > missing-limits.h-for-musl-syste.patch b/meta/recipes-
> > connectivity/libpcap/libpcap/0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-
> > syste.patch
> > new file mode 100644
> > index 0000000000..01773834c7
> > --- /dev/null
> > +++ b/meta/recipes-connectivity/libpcap/libpcap/0001-pcap-usb-linux.c-ad
> > +++ d-missing-limits.h-for-musl-syste.patch
> > @@ -0,0 +1,29 @@
> > +From aafa3512b7b742f5e66a5543e41974cc5e7eebfa Mon Sep 17 00:00:00 2001
> > +From: maxice8 <thinkabit.ukim@gmail.com>
> > +Date: Sun, 22 Jul 2018 18:54:17 -0300
> > +Subject: [PATCH] pcap-usb-linux.c: add missing limits.h for musl systems.
> > +
> > +fix compilation on musl libc systems like Void Linux and Alpine.
> > +
> > +Upstream-Status: Backport
> > +[https://github.com/the-tcpdump-group/libpcap/commit/d557c98a16dc254aaf
> > +f03762b694fe624e180bea]
> > +
> > +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
> > +---
> > + pcap-usb-linux.c | 1 +
> > + 1 file changed, 1 insertion(+)
> > +
> > +diff --git a/pcap-usb-linux.c b/pcap-usb-linux.c index
> > +6f8adf65..b92c05ea 100644
> > +--- a/pcap-usb-linux.c
> > ++++ b/pcap-usb-linux.c
> > +@@ -50,6 +50,7 @@
> > + #include <stdlib.h>
> > + #include <unistd.h>
> > + #include <fcntl.h>
> > ++#include <limits.h>
> > + #include <string.h>
> > + #include <dirent.h>
> > + #include <byteswap.h>
> > +--
> > +2.17.1
> > +
> > diff --git a/meta/recipes-connectivity/libpcap/libpcap/0002-Add-missing-
> > compiler_state_t-parameter.patch b/meta/recipes-connectivity/libpcap/libpcap/0002-
> > Add-missing-compiler_state_t-parameter.patch
> > deleted file mode 100644
> > index 032b265f05..0000000000
> > --- a/meta/recipes-connectivity/libpcap/libpcap/0002-Add-missing-compiler_state_t-
> > parameter.patch
> > +++ /dev/null
> > @@ -1,67 +0,0 @@
> > -From 50ec0a088d5924a8305b2d70dcba71b0942dee1a Mon Sep 17 00:00:00 2001
> > -From: Fabio Berton <fabio.berton@ossystems.com.br>
> > -Date: Thu, 17 Nov 2016 09:47:29 -0200
> > -Subject: [PATCH 2/2] Add missing compiler_state_t parameter
> > -Organization: O.S. Systems Software LTDA.
> > -
> > -Fix error:
> > -
> > -/
> > -|../libpcap-1.8.1/gencode.c: In function 'gen_gateway':
> > -|../libpcap-1.8.1/gencode.c:4914:13: error: 'cstate' undeclared  (first
> > -|use in this function)
> > -|    bpf_error(cstate, "direction applied to 'gateway'");
> > -\
> > -
> > -Upstream-Status: Submitted [1]
> > -
> > -[1] https://github.com/the-tcpdump-group/libpcap/pull/541
> > -
> > -Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
> > ----
> > - gencode.c | 15 ++++++++-------
> > - 1 file changed, 8 insertions(+), 7 deletions(-)
> > -
> > -diff --git a/gencode.c b/gencode.c
> > -index e103c70..f07c0be 100644
> > ---- a/gencode.c
> > -+++ b/gencode.c
> > -@@ -523,7 +523,7 @@ static struct block *gen_host6(compiler_state_t *, struct
> > in6_addr *,
> > -     struct in6_addr *, int, int, int);
> > - #endif
> > - #ifndef INET6
> > --static struct block *gen_gateway(const u_char *, bpf_u_int32 **, int, int);
> > -+static struct block *gen_gateway(compiler_state_t *, const u_char *,
> > -+bpf_u_int32 **, int, int);
> > - #endif
> > - static struct block *gen_ipfrag(compiler_state_t *);
> > - static struct block *gen_portatom(compiler_state_t *, int, bpf_int32); -@@ -4904,11
> > +4904,12 @@ gen_host6(compiler_state_t *cstate, struct in6_addr *addr,
> > -
> > - #ifndef INET6
> > - static struct block *
> > --gen_gateway(eaddr, alist, proto, dir)
> > --    const u_char *eaddr;
> > --    bpf_u_int32 **alist;
> > --    int proto;
> > --    int dir;
> > -+gen_gateway(cstate, eaddr, alist, proto, dir)
> > -+    compiler_state_t *cstate;
> > -+    const u_char *eaddr;
> > -+    bpf_u_int32 **alist;
> > -+    int proto;
> > -+    int dir;
> > - {
> > -     struct block *b0, *b1, *tmp;
> > -
> > -@@ -6472,7 +6473,7 @@ gen_scode(compiler_state_t *cstate, const char *name,
> > struct qual q)
> > -             alist = pcap_nametoaddr(name);
> > -             if (alist == NULL || *alist == NULL)
> > -                     bpf_error(cstate, "unknown host '%s'", name);
> > --            b = gen_gateway(eaddr, alist, proto, dir);
> > -+            b = gen_gateway(cstate, eaddr, alist, proto, dir);
> > -             free(eaddr);
> > -             return b;
> > - #else
> > ---
> > -2.1.4
> > -
> > diff --git a/meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch
> > b/meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch
> > deleted file mode 100644
> > index 7e1eea6b1e..0000000000
> > --- a/meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch
> > +++ /dev/null
> > @@ -1,36 +0,0 @@
> > -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/fix-grammar-deps.patch
> > b/meta/recipes-connectivity/libpcap/libpcap/fix-grammar-deps.patch
> > deleted file mode 100644
> > index f40e655c44..0000000000
> > --- a/meta/recipes-connectivity/libpcap/libpcap/fix-grammar-deps.patch
> > +++ /dev/null
> > @@ -1,29 +0,0 @@
> > -Fix a missing dependency that can result in:
> > -
> > -../libpcap-1.8.1/grammar.y:78:10: fatal error: scanner.h: No such file or directory
> > -
> > -Upstream-Status: Backport
> > -Signed-off-by: Ross Burton <ross.burton@intel.com>
> > -
> > -From 0dd90a6bdbce4dca14106859eee63ef643a106e2 Mon Sep 17 00:00:00 2001
> > -From: Alfredo Alvarez Fernandez <alfredoalvarezernandez@gmail.com>
> > -Date: Tue, 21 Feb 2017 11:41:43 +0100
> > -Subject: [PATCH] Makefile.in: Fix missing dependency
> > -
> > ----
> > - Makefile.in | 2 +-
> > - 1 file changed, 1 insertion(+), 1 deletion(-)
> > -
> > -diff --git a/Makefile.in b/Makefile.in
> > -index 7044f043..f5d443ae 100644
> > ---- a/Makefile.in
> > -+++ b/Makefile.in
> > -@@ -465,7 +465,7 @@ grammar.h: grammar.c
> > -             $(MAKE) $(MAKEFLAGS) grammar.c; \
> > -     fi
> > -
> > --grammar.o: grammar.c
> > -+grammar.o: grammar.c scanner.h
> > -     $(CC) $(FULL_CFLAGS) -c grammar.c
> > -
> > - gencode.o: $(srcdir)/gencode.c grammar.h scanner.h diff --git a/meta/recipes-
> > connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch b/meta/recipes-
> > connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch
> > deleted file mode 100644
> > index afaa3bea9b..0000000000
> > --- a/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch
> > +++ /dev/null
> > @@ -1,73 +0,0 @@
> > -From 2796129af52901dd68595e5e88a639308541def9 Mon Sep 17 00:00:00 2001
> > -From: Fabio Berton <fabio.berton@ossystems.com.br>
> > -Date: Thu, 3 Nov 2016 17:56:29 -0200
> > -Subject: [PATCH] libpcap: pkgconfig support
> > -Organization: O.S. Systems Software LTDA.
> > -
> > -Adding basic structure to support pkg-config.
> > -
> > -Upstream-Status: Inappropriate [embedded specific]
> > -
> > -Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
> > -Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
> > ----
> > - Makefile.in   |  5 +++++
> > - configure.ac  |  1 +
> > - libpcap.pc.in | 10 ++++++++++
> > - 3 files changed, 16 insertions(+)
> > - create mode 100644 libpcap.pc.in
> > -
> > -diff --git a/Makefile.in b/Makefile.in
> > -index e71d973..d7004ed 100644
> > ---- a/Makefile.in
> > -+++ b/Makefile.in
> > -@@ -61,6 +61,10 @@ V_RPATH_OPT = @V_RPATH_OPT@
> > - DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@
> > - PROG=libpcap
> > -
> > -+# pkgconfig support
> > -+pkgconfigdir = $(libdir)/pkgconfig
> > -+pkgconfig_DATA = libpcap.pc
> > -+
> > - # Standard CFLAGS
> > - FULL_CFLAGS = $(CCOPT) $(INCLS) $(DEFS) $(CFLAGS)
> > -
> > -@@ -286,6 +290,7 @@ EXTRA_DIST = \
> > -     lbl/os-solaris2.h \
> > -     lbl/os-sunos4.h \
> > -     lbl/os-ultrix4.h \
> > -+    libpcap.pc \
> > -     missing/getopt.c \
> > -     missing/getopt.h \
> > -     missing/snprintf.c \
> > -diff --git a/configure.ac b/configure.ac -index da2f940..4fc67bf 100644
> > ---- a/configure.ac
> > -+++ b/configure.ac
> > -@@ -1805,6 +1805,7 @@ fi
> > - AC_PROG_INSTALL
> > -
> > - AC_CONFIG_HEADER(config.h)
> > -+AC_CONFIG_FILES([libpcap.pc])
> > -
> > - AC_OUTPUT_COMMANDS([if test -f .devel; then
> > -     echo timestamp > stamp-h
> > -diff --git a/libpcap.pc.in b/libpcap.pc.in -new file mode 100644 -index
> > 0000000..4f78ad8
> > ---- /dev/null
> > -+++ b/libpcap.pc.in
> > -@@ -0,0 +1,10 @@
> > -+prefix=@prefix@
> > -+exec_prefix=@exec_prefix@
> > -+libdir=@libdir@
> > -+includedir=@includedir@
> > -+
> > -+Name: libpcap
> > -+Description: System-independent interface for user-level packet capture.
> > -+Version: @VERSION@
> > -+Libs: -L${libdir} -lpcap
> > -+Cflags: -I${includedir}
> > ---
> > -2.1.4
> > -
> > diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb b/meta/recipes-
> > connectivity/libpcap/libpcap_1.8.1.bb
> > deleted file mode 100644
> > index 13dfbd67a8..0000000000
> > --- a/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
> > +++ /dev/null
> > @@ -1,31 +0,0 @@
> > -require libpcap.inc
> > -
> > -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 \
> > -    file://fix-grammar-deps.patch \
> > -"
> > -
> > -SRC_URI[md5sum] = "3d48f9cd171ff12b0efd9134b52f1447"
> > -SRC_URI[sha256sum] =
> > "673dbc69fdc3f5a86fb5759ab19899039a8e5e6c631749e48dcd9c6f0c83541e"
> > -
> > -#
> > -# make install doesn't cover the shared lib -# make install-shared is just broken (no
> > symlinks) -#
> > -
> > -do_configure_prepend () {
> > -    #remove hardcoded references to /usr/include
> > -    sed 's|\([ "^'\''I]\+\)/usr/include/|\1${STAGING_INCDIR}/|g' -i ${S}/configure.ac
> > -}
> > -
> > -do_install_prepend () {
> > -    install -d ${D}${libdir}
> > -    install -d ${D}${bindir}
> > -    oe_runmake install-shared DESTDIR=${D}
> > -    oe_libinstall -a -so libpcap ${D}${libdir}
> > -    sed "s|@VERSION@|${PV}|" -i ${B}/libpcap.pc
> > -    install -D -m 0644 libpcap.pc ${D}${libdir}/pkgconfig/libpcap.pc
> > -}
> > diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-
> > connectivity/libpcap/libpcap_1.9.0.bb
> > similarity index 58%
> > rename from meta/recipes-connectivity/libpcap/libpcap.inc
> > rename to meta/recipes-connectivity/libpcap/libpcap_1.9.0.bb
> > index e57ea87b37..78361561e6 100644
> > --- a/meta/recipes-connectivity/libpcap/libpcap.inc
> > +++ b/meta/recipes-connectivity/libpcap/libpcap_1.9.0.bb
> > @@ -10,33 +10,36 @@ LIC_FILES_CHKSUM =
> > "file://LICENSE;md5=5eb289217c160e2920d2e35bddc36453 \
> >
> > file://pcap.h;beginline=1;endline=32;md5=39af3510e011f34b8872f120b1dc31d2"
> >  DEPENDS = "flex-native bison-native"
> >
> > -INC_PR = "r5"
> > +SRC_URI = "https://www.tcpdump.org/release/${BP}.tar.gz \
> > +           file://0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-syste.patch \
> > +           "
> > +SRC_URI[md5sum] = "dffd65cb14406ab9841f421732eb0f33"
> > +SRC_URI[sha256sum] =
> > "2edb88808e5913fdaa8e9c1fcaf272e19b2485338742b5074b9fe44d68f37019"
> >
> > -SRC_URI = "http://www.tcpdump.org/release/${BP}.tar.gz"
> > +inherit autotools binconfig-disabled pkgconfig bluetooth
> >
> >  BINCONFIG = "${bindir}/pcap-config"
> >
> > -inherit autotools binconfig-disabled pkgconfig bluetooth
> > -
> > -EXTRA_OECONF = "--with-pcap=linux"
> > +# Explicitly disable dag support. We don't have recipe for it and if
> > +enabled here, # configure script poisons the include dirs with
> > +/usr/local/include even when the # support hasn't been detected.
> > +EXTRA_OECONF = " \
> > +                 --with-pcap=linux \
> > +                 --without-dag \
> > +                 "
> >  EXTRA_AUTORECONF += "--exclude=aclocal"
> >
> >  PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth',
> > '${BLUEZ}', '', d)} \
> >                     ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \  "
> > -PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4"
> > -# Add a dummy PACKAGECONFIG for bluez5 since it is not supported by libpcap.
> > -PACKAGECONFIG[bluez5] = ",,"
> > +PACKAGECONFIG[bluez5] = "--enable-bluetooth,--disable-bluetooth,bluez5"
> >  PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
> >  PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
> >  PACKAGECONFIG[libnl] = "--with-libnl,--without-libnl,libnl"
> >
> > -CPPFLAGS_prepend = "-I${S} "
> > -CFLAGS_prepend = "-I${S} "
> > -CXXFLAGS_prepend = "-I${S} "
> > -
> >  do_configure_prepend () {
> > -    sed -i -e's,^V_RPATH_OPT=.*$,V_RPATH_OPT=,' ${S}/pcap-config.in
> > +    #remove hardcoded references to /usr/include
> > +    sed 's|\([ "^'\''I]\+\)/usr/include/|\1${STAGING_INCDIR}/|g' -i
> > + ${S}/configure.ac
> >  }
> >
> >  BBCLASSEXTEND = "native"
> > --
> > 2.17.1
> >
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core


^ permalink raw reply	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2019-01-08 10:30 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-20  8:43 [PATCH 1/5] libsolv: upgrade 0.7.1 -> 0.7.2 Anuj Mittal
2018-12-20  8:43 ` [PATCH 2/5] libjpeg-turbo: upgrade 2.0.0 -> 2.0.1 Anuj Mittal
2018-12-20  8:43 ` [PATCH 3/5] atk: upgrade 2.28.1 -> 2.30.0 Anuj Mittal
2018-12-20  8:43 ` [PATCH 4/5] at-spi2-atk: upgrade 2.26.2 " Anuj Mittal
2018-12-20  8:43 ` [PATCH 5/5] libpcap: upgrade 1.8.1 -> 1.9.0 Anuj Mittal
2018-12-20  9:28   ` [PATCH v2] " Anuj Mittal
2019-01-08  7:45     ` Mittal, Anuj
2019-01-08 10:30       ` Burton, Ross
2018-12-20  9:03 ` ✗ patchtest: failure for "libsolv: upgrade 0.7.1 -> 0.7...." and 4 more Patchwork

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.