diff options
| author | Yue Tao <Yue.Tao@windriver.com> | 2015-05-26 12:55:42 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-29 10:17:15 +0100 |
| commit | 46bca1b82908a4bfca310b1d8d951c3331924c4d (patch) | |
| tree | 435eaffaa59bf19bfe2b356409896980678efa98 /meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/fix-libnl3-host-contamination.patch | |
| parent | 2d2d5e69776113aa6d8b4b3204d5bc70310d3858 (diff) | |
| download | poky-46bca1b82908a4bfca310b1d8d951c3331924c4d.tar.gz | |
wpa-supplicant: upgrade to 2.4
1. upgrade to 2.4
2. update the checksum, and license checksum since date in it is changed
3. Backport a patch to fix CVE-2015-1863
4. remove two deprecated patches
(From OE-Core rev: fd0880c2b0958b72d641a6821ddd6d6790a92b7a)
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/fix-libnl3-host-contamination.patch')
| -rw-r--r-- | meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/fix-libnl3-host-contamination.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/fix-libnl3-host-contamination.patch b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/fix-libnl3-host-contamination.patch deleted file mode 100644 index e899c1655d..0000000000 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/fix-libnl3-host-contamination.patch +++ /dev/null | |||
| @@ -1,42 +0,0 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 3 | From 37d6b3dd5a737cd67468e4a58b372bddd924a7be Mon Sep 17 00:00:00 2001 | ||
| 4 | From: Andreas Oberritter <obi@opendreambox.org> | ||
| 5 | Date: Fri, 8 Mar 2013 22:55:19 +0100 | ||
| 6 | Subject: [PATCH] Revert "build: Use updated libnl3 header paths" | ||
| 7 | |||
| 8 | This reverts commit e7ecddf33a446072effbc85a27a078a8e582c89e. | ||
| 9 | --- | ||
| 10 | src/drivers/drivers.mak | 2 +- | ||
| 11 | src/drivers/drivers.mk | 2 +- | ||
| 12 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
| 13 | |||
| 14 | diff --git a/src/drivers/drivers.mak b/src/drivers/drivers.mak | ||
| 15 | index 68ff910..1f38f57 100644 | ||
| 16 | --- a/src/drivers/drivers.mak | ||
| 17 | +++ b/src/drivers/drivers.mak | ||
| 18 | @@ -35,7 +35,7 @@ NEED_RFKILL=y | ||
| 19 | ifdef CONFIG_LIBNL32 | ||
| 20 | DRV_LIBS += -lnl-3 | ||
| 21 | DRV_LIBS += -lnl-genl-3 | ||
| 22 | - DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3 | ||
| 23 | + DRV_CFLAGS += -DCONFIG_LIBNL20 | ||
| 24 | ifdef CONFIG_LIBNL3_ROUTE | ||
| 25 | DRV_LIBS += -lnl-route-3 | ||
| 26 | DRV_CFLAGS += -DCONFIG_LIBNL3_ROUTE | ||
| 27 | diff --git a/src/drivers/drivers.mk b/src/drivers/drivers.mk | ||
| 28 | index db8561a..c93e88d 100644 | ||
| 29 | --- a/src/drivers/drivers.mk | ||
| 30 | +++ b/src/drivers/drivers.mk | ||
| 31 | @@ -30,7 +30,7 @@ NEED_RFKILL=y | ||
| 32 | ifdef CONFIG_LIBNL32 | ||
| 33 | DRV_LIBS += -lnl-3 | ||
| 34 | DRV_LIBS += -lnl-genl-3 | ||
| 35 | - DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3 | ||
| 36 | + DRV_CFLAGS += -DCONFIG_LIBNL20 | ||
| 37 | ifdef CONFIG_LIBNL3_ROUTE | ||
| 38 | DRV_LIBS += -lnl-route-3 | ||
| 39 | DRV_CFLAGS += -DCONFIG_LIBNL3_ROUTE | ||
| 40 | -- | ||
| 41 | 1.7.10.4 | ||
| 42 | |||