diff options
| author |   Martin Jansa <martin.jansa@gmail.com> | 2019-05-19 15:06:11 +0000 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2019-05-20 09:49:01 -0700 |
| commit | 74aeba20e5b5a47de4bdf7c3851f8f141364aeaa (patch) | |
| tree | 270e205094c6538c87f251d0a1f9aaa9212bcb10 /meta-networking | |
| parent | f3018013ffbf7277ecc618787eca92455285f667 (diff) | |
| download | meta-openembedded-contrib-74aeba20e5b5a47de4bdf7c3851f8f141364aeaa.tar.gz | |
igmpproxy: remove 0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch and _GNU_SOURCE
* it was upgraded to 0.2.1 in:
commit 50979151e69e5707580b2f3d263a9b36b6a190d5
Author: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Date: Sat Mar 16 18:22:59 2019 +0100
igmpproxy: update to 0.2.1
* which includes _GNU_SOURCE:
https://github.com/pali/igmpproxy/commit/7d790aa2f16afad63418e573db13ea39d76ed141
* and includes sys/types.h in os-linux.h:
https://github.com/pali/igmpproxy/commit/6f92242b23178e979f4a806abe4ac9652b51c593
* and the patch doesn't apply cleanly:
ERROR: Fuzz detected:
checking file src/igmpproxy.h
Hunk #1 succeeded at 51 with fuzz 2 (offset 5 lines).
patching file src/igmpproxy.h
Hunk #1 succeeded at 51 with fuzz 2 (offset 5 lines).
The context lines in the patches can be updated with devtool:
devtool modify lib32-igmpproxy
devtool finish --force-patch-refresh lib32-igmpproxy <layer_path>
Don't forget to review changes done by devtool!
ERROR: QA Issue: Patch log indicates that patches do not apply cleanly. [patch-fuzz]
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking')
| -rw-r--r-- | meta-networking/recipes-daemons/igmpproxy/igmpproxy/0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch | 25 | ||||
| -rw-r--r-- | meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.2.1.bb | 6 |
2 files changed, 1 insertions, 30 deletions
diff --git a/meta-networking/recipes-daemons/igmpproxy/igmpproxy/0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch b/meta-networking/recipes-daemons/igmpproxy/igmpproxy/0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch deleted file mode 100644 index 82cdc36ac4..0000000000 --- a/meta-networking/recipes-daemons/igmpproxy/igmpproxy/0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a557651a08e21e3c7c7f5eca9f5405f86624903f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 14 Jul 2017 22:42:51 -0700 -Subject: [PATCH] src/igmpproxy.h: Include sys/types.h for u_short/u_init - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/igmpproxy.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/igmpproxy.h b/src/igmpproxy.h -index 4dabd1c..4454729 100644 ---- a/src/igmpproxy.h -+++ b/src/igmpproxy.h -@@ -46,6 +46,7 @@ - #include <stdbool.h> - - #include <sys/socket.h> -+#include <sys/types.h> - #include <sys/un.h> - #include <sys/time.h> - #include <sys/ioctl.h> --- -2.13.3 - diff --git a/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.2.1.bb b/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.2.1.bb index c99ebe0e9c..db96d487bf 100644 --- a/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.2.1.bb +++ b/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.2.1.bb @@ -4,12 +4,8 @@ HOMEPAGE = "http://sourceforge.net/projects/igmpproxy/" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=432040ff3a55670c1dec0c32b209ad69" -SRC_URI = "https://github.com/pali/igmpproxy/releases/download/${PV}/igmpproxy-${PV}.tar.gz \ - file://0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch \ -" +SRC_URI = "https://github.com/pali/igmpproxy/releases/download/${PV}/${BP}.tar.gz" SRC_URI[md5sum] = "3a9c2cb42c1f5ee0cb769a4884545641" SRC_URI[sha256sum] = "d351e623037390f575c1203d9cbb7ba33a8bdef85a3c5e1d2901c5a2a38449a1" inherit autotools pkgconfig - -CFLAGS += "-D_GNU_SOURCE" |