[oe,meta-networking] tcpdump: refresh local patches to avoid fuzz warnings

Message ID 1522796604-38261-1-git-send-email-denis@denix.org
State New
Headers show
Series
  • [oe,meta-networking] tcpdump: refresh local patches to avoid fuzz warnings
Related show

Commit Message

Denys Dmytriyenko April 3, 2018, 11:03 p.m.
From: Denys Dmytriyenko <denys@ti.com>


Signed-off-by: Denys Dmytriyenko <denys@ti.com>

---
 .../recipes-support/tcpdump/tcpdump/add-ptest.patch   | 13 +++++++------
 .../tcpdump/unnecessary-to-check-libpcap.patch        | 19 ++++++++++---------
 2 files changed, 17 insertions(+), 15 deletions(-)

-- 
2.7.4

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Comments

akuster808 April 3, 2018, 11:25 p.m. | #1
On 04/03/2018 04:03 PM, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@ti.com>

>

> Signed-off-by: Denys Dmytriyenko <denys@ti.com>

> ---

at fix like this is in master-next already.

- armin
>  .../recipes-support/tcpdump/tcpdump/add-ptest.patch   | 13 +++++++------

>  .../tcpdump/unnecessary-to-check-libpcap.patch        | 19 ++++++++++---------

>  2 files changed, 17 insertions(+), 15 deletions(-)

>

> diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch b/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch

> index 196cec7..7a02155 100644

> --- a/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch

> +++ b/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch

> @@ -1,4 +1,4 @@

> -From 7b259580800e259d232229dc89f97058b56e2fe8 Mon Sep 17 00:00:00 2001

> +From 09c310b48f73b62dc6673ce0bdfc638d9ae4bbda Mon Sep 17 00:00:00 2001

>  From: "Hongjun.Yang" <hongjun.yang@windriver.com>

>  Date: Wed, 22 Oct 2014 10:02:48 +0800

>  Subject: [PATCH] Add ptest for tcpdump

> @@ -6,15 +6,16 @@ Subject: [PATCH] Add ptest for tcpdump

>  Upstream-Status: Pending

>  

>  Signed-off-by: Hongjun.Yang <hongjun.yang@windriver.com>

> +

>  ---

>   Makefile.in | 10 +++++++++-

>   1 file changed, 9 insertions(+), 1 deletion(-)

>  

> -Index: tcpdump-4.9.0/Makefile.in

> -===================================================================

> ---- tcpdump-4.9.0.orig/Makefile.in

> -+++ tcpdump-4.9.0/Makefile.in

> -@@ -436,9 +436,17 @@ distclean:

> +diff --git a/Makefile.in b/Makefile.in

> +index 0941f0e..3ce40c6 100644

> +--- a/Makefile.in

> ++++ b/Makefile.in

> +@@ -437,9 +437,17 @@ distclean:

>   	    tests/failure-outputs.txt

>   	rm -rf autom4te.cache tests/DIFF tests/NEW

>   

> diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch b/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch

> index d7a3ac2..c70404c 100644

> --- a/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch

> +++ b/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch

> @@ -1,4 +1,7 @@

> -unnecessary to check libpcap

> +From 66ee5c0d49c3e4a67cd9a691c1313e4a02eafa59 Mon Sep 17 00:00:00 2001

> +From: Roy Li <rongqing.li@windriver.com>

> +Date: Tue, 8 Jul 2014 13:20:47 +0800

> +Subject: [PATCH] unnecessary to check libpcap

>  

>  Upstream-Status: Pending

>  

> @@ -11,23 +14,21 @@ In fact, the libpcap has been added into the tcpdump's DEPENDS, not need to

>  check if libpcap existed.

>  

>  Signed-off-by: Roy Li <rongqing.li@windriver.com>

> +

>  ---

> - configure.in |    2 +-

> + configure.in | 2 +-

>   1 file changed, 1 insertion(+), 1 deletion(-)

>  

>  diff --git a/configure.in b/configure.in

> -index 06fade1..9125de7 100644

> +index b2305a5..b3b5dbf 100644

>  --- a/configure.in

>  +++ b/configure.in

> -@@ -567,7 +567,7 @@ AC_SEARCH_LIBS(getrpcbynumber, nsl,

> - dnl AC_CHECK_LIB(z, uncompress)

> - dnl AC_CHECK_HEADERS(zlib.h)

> +@@ -418,7 +418,7 @@ dnl Some platforms may need -lnsl for getrpcbynumber.

> + AC_SEARCH_LIBS(getrpcbynumber, nsl,

> +     AC_DEFINE(HAVE_GETRPCBYNUMBER, 1, [define if you have getrpcbynumber()]))

>   

>  -AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS)

>  +#AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS)

>   

>   #

>   # Check for these after AC_LBL_LIBPCAP, so we link with the appropriate

> --- 

> -1.7.9.5

> -


-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch b/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch
index 196cec7..7a02155 100644
--- a/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch
+++ b/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch
@@ -1,4 +1,4 @@ 
-From 7b259580800e259d232229dc89f97058b56e2fe8 Mon Sep 17 00:00:00 2001
+From 09c310b48f73b62dc6673ce0bdfc638d9ae4bbda Mon Sep 17 00:00:00 2001
 From: "Hongjun.Yang" <hongjun.yang@windriver.com>
 Date: Wed, 22 Oct 2014 10:02:48 +0800
 Subject: [PATCH] Add ptest for tcpdump
@@ -6,15 +6,16 @@  Subject: [PATCH] Add ptest for tcpdump
 Upstream-Status: Pending
 
 Signed-off-by: Hongjun.Yang <hongjun.yang@windriver.com>
+
 ---
  Makefile.in | 10 +++++++++-
  1 file changed, 9 insertions(+), 1 deletion(-)
 
-Index: tcpdump-4.9.0/Makefile.in
-===================================================================
---- tcpdump-4.9.0.orig/Makefile.in
-+++ tcpdump-4.9.0/Makefile.in
-@@ -436,9 +436,17 @@ distclean:
+diff --git a/Makefile.in b/Makefile.in
+index 0941f0e..3ce40c6 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -437,9 +437,17 @@ distclean:
  	    tests/failure-outputs.txt
  	rm -rf autom4te.cache tests/DIFF tests/NEW
  
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch b/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch
index d7a3ac2..c70404c 100644
--- a/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch
+++ b/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch
@@ -1,4 +1,7 @@ 
-unnecessary to check libpcap
+From 66ee5c0d49c3e4a67cd9a691c1313e4a02eafa59 Mon Sep 17 00:00:00 2001
+From: Roy Li <rongqing.li@windriver.com>
+Date: Tue, 8 Jul 2014 13:20:47 +0800
+Subject: [PATCH] unnecessary to check libpcap
 
 Upstream-Status: Pending
 
@@ -11,23 +14,21 @@  In fact, the libpcap has been added into the tcpdump's DEPENDS, not need to
 check if libpcap existed.
 
 Signed-off-by: Roy Li <rongqing.li@windriver.com>
+
 ---
- configure.in |    2 +-
+ configure.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.in b/configure.in
-index 06fade1..9125de7 100644
+index b2305a5..b3b5dbf 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -567,7 +567,7 @@ AC_SEARCH_LIBS(getrpcbynumber, nsl,
- dnl AC_CHECK_LIB(z, uncompress)
- dnl AC_CHECK_HEADERS(zlib.h)
+@@ -418,7 +418,7 @@ dnl Some platforms may need -lnsl for getrpcbynumber.
+ AC_SEARCH_LIBS(getrpcbynumber, nsl,
+     AC_DEFINE(HAVE_GETRPCBYNUMBER, 1, [define if you have getrpcbynumber()]))
  
 -AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS)
 +#AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS)
  
  #
  # Check for these after AC_LBL_LIBPCAP, so we link with the appropriate
--- 
-1.7.9.5
-