diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-05-29 23:52:06 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-06-02 04:02:52 +0300 |
commit | 2ee498a2ac22fe5c3eb083ef883628f319b86421 (patch) | |
tree | d928eb6bc306c7571f58fd58f9c0b1b94db4f9f7 /meta-openembedded/meta-networking/recipes-support/dnsmasq | |
parent | 8f7ab9e8f3c2d9ac9992f31fbda4678742d1c5c3 (diff) | |
download | openbmc-2ee498a2ac22fe5c3eb083ef883628f319b86421.tar.xz |
meta-openembedded: subtree update:7c02c7d411..713e70bd25
Adam Miartus (1):
toybox: bump version to 0.8.3
Adrian Bunk (7):
libhandy: Remove, moved to OE-core
unicode-ucd: Stop broken license downloading
python3-docutils: Remove, moved to OE-core
python3-dbusmock: Remove, moved to OE-core
python3-cython: Remove, moved to OE-core
python3-pyparsing: Remove, moved to OE-core
postfix: Upgrade 3.4.10 -> 3.4.12
Alistair Francis (1):
openocd: Update libjaylink
Andreas Müller (4):
libusb-compat: upgrade 0.1.5 -> 0.1.7
hidapi: upgrade 0.7.99+ -> 0.9.0
gexiv2: upgrade 0.12.0 -> 0.12.1
thunar: upgrade 1.8.14 -> 1.8.15
Andrew Geissler (1):
nlohmann-json: backport gcc10 fix
Armin Kuster (1):
tremor: update SRC_URI as project moved to gitlab
Beniamin Sandu (1):
rasdaemon: create recipe for version 0.6.5
Changqing Li (1):
apache2: fix service start fail
Christoph Steiger (1):
python-periphery: Add python-mmap to RDEPENDS
Denys Dmytriyenko (2):
python3-pycryptodome(x): moved to OE-Core, remove from meta-python
python3-pyelftools: moved to OE-Core, remove from meta-python
Domarys Correa (18):
python3-argh: Add recipe version 0.26.2
python3-graphviz: Add recipe version 0.14
python3-aiohttp-jinja2: Add recipe version 1.2.0
python3-py-ubjson: Add recipe version 0.16.1
python3-trafaret: Add recipe version 2.0.2
python3-trafaret-config: Add recipe version 2.0.2
python3-txaio: Add recipe version 20.4.1
python3-u-msgpack-python: Add recipe version 2.6.0
python3-xmodem: Add recipe version 0.4.6
python3-multidict: Update 4.7.4 -> 4.7.5
python3-lz4: Add recipe version 3.0.2
python3-autobahn: Add recipe version 20.4.3
python3-snappy: Add recipe version 0.5.4
python3-cbor2: Add recipe version 5.1.0
python3-pathtools3: Add recipe version 0.2.1
python3-watchdog: Add recipe version 0.10.2
python3-jinja2: Update 2.11.1 -> 2.11.2
python3-ansicolors: Add recipe version 1.1.8
Emmanuel Roullit (1):
appstream-glib: update 0.7.16 -> 0.7.17
Honggyu Kim (1):
uftrace: add PV to update the package version
Kai Kang (4):
garcon: 0.6.4 -> 0.7.0
xfconf: 4.14.2 -> 4.14.3
thunar: 1.8.12 -> 1.8.14
catfish: 1.4.11 -> 1.4.13
Khem Raj (5):
gtkwave: Disable mime update during install
netplan: Depend on systemd if it is in distro
postfix: Upgrade to 3.4.10 and compile with -fcommon
uim: Add patch to fix -fno-common link error
safec: Update to latest on 3.5.1 release tags
Leon Anavi (17):
transmission: Add version 2.94
pamela: Upgrade 0.3.0 -> 1.0.0
python3-absl: Upgrade to 0.9.0
python3-gmqtt: Upgrade to 0.6.5
python3-appdirs: Upgrade to 1.4.4
python3-aiofiles: Upgrade to 0.5.0
python3-markdown: Upgrade to 3.2.2
python3-luma-core: Upgrade to 1.14.0
python3-pandas: Upgrade 1.0.1 -> 1.0.3
python3-parallax: Upgrade 1.0.5 -> 1.0.6
python3-openpyxl: Upgrade 2.6.3 -> 3.0.3
python3-setuptools-scm: Upgrade 3.3.3 -> 3.5.0
python3-toml: Extend with native build variants
python3-zipp: Upgrade 0.6.0 -> 3.1.0
python3-ujson: Upgrade 1.35 -> 2.0.3
python3-webcolors: Upgrade 1.8.1 -> 1.11.1
python3-pid: Upgrade 2.2.5 -> 3.0.3
Michael Haener (2):
cockpit: upgrade 218 -> 219
cockpit: rt-deps for storaged
Paul Barker (1):
mplayer-common: Drop obsolete recipe
Pierre-Jean Texier (4):
iwd: upgrade 1.6 -> 1.7
librsync: upgrade 2.3.0 -> 2.3.1
ser2net: fix upstream check URL
ser2net: upgrade 4.1.5 -> 4.1.8
Robert P. J. Day (1):
meta-python: delete superfluous python-mako.inc
Sean Nyekjaer (2):
gpsd: fix build on aarch64
gpsd: mark CLEANBROKEN
Trevor Gamblin (2):
meta-python: add self as maintainer
python3-iso8601: add python3-numbers to RDEPENDS
Wang Mingyu (6):
modemmanager: upgrade 1.12.8 -> 1.12.10
python3-pyroute2: upgrade 0.5.11 -> 0.5.12
jansson: upgrade 2.12 -> 2.13.1
openldap: upgrade 2.4.49 -> 2.4.50
python3-pycparser: upgrade 2.19 -> 2.20
cryptsetup: upgrade 2.3.1 -> 2.3.2
William A. Kennington III (1):
cli11: upgrade 1.8.0 -> 1.9.0
Yanfei Xu (1):
turbostat: fix the build failure for new v5.7-rc6 kernel
Yi Zhao (3):
libldb: upgrade 1.5.6 -> 1.5.7
samba: upgrade 4.10.13 -> 4.10.15
apache2: create log/run directory via pkg_postinst
Zang Ruochen (2):
dnsmasq: upgrade 2.80 -> 2.81
fetchmail: upgrade 6.4.3 -> 6.4.4
Zheng Ruoqin (3):
dstat: Fix runtime error that depend python.
kea: upgrade 1.7.6 -> 1.7.7
libqmi: upgrade 1.24.8 -> 1.24.12
Change-Id: Ib7baf9b4dadc540df133bcd2d18d5b446b3e2e89
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-support/dnsmasq')
4 files changed, 8 insertions, 90 deletions
diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-build-against-5.2-headers.patch b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-build-against-5.2-headers.patch deleted file mode 100644 index 844a70985..000000000 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-build-against-5.2-headers.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 52f4b58c14a2788ca08b7d8884d586724d86fc66 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@gmail.com> -Date: Mon, 19 Aug 2019 14:46:02 +0000 -Subject: [PATCH] dnsmasq: fix build against 5.2 headers - -Upstream linux y2038 work has moved some definitions SIOCGSTAMP is -defined in linux/sockios.h, not asm/sockios.h now. So we need to -add that include to fix the build. - -Upstream-status: backport of http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=3052ce208acf602f0163166dcefb7330d537cedb - -Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ---- - a/src/dnsmasq.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/build/tmp/work/core2-64-poky-linux/dnsmasq/2.80-r0/dnsmasq-2.80/src/dnsmasq.h b/build/tmp/work/core2-64-poky-linux/dnsmasq/2.80-r0/dnsmasq-2.80/src/dnsmasq.h -index f53e9a5be6..d9225ea473 100644 ---- a/src/dnsmasq.h -+++ b/src/dnsmasq.h -@@ -138,6 +138,7 @@ typedef unsigned long long u64; - #endif - - #if defined(HAVE_LINUX_NETWORK) -+#include <linux/sockios.h> - #include <linux/capability.h> - /* There doesn't seem to be a universally-available - userspace header for these. */ --- -2.19.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-memory-leak-in-helper-c.patch b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-memory-leak-in-helper-c.patch deleted file mode 100644 index ccd6f82ae..000000000 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-memory-leak-in-helper-c.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 69bc94779c2f035a9fffdb5327a54c3aeca73ed5 Mon Sep 17 00:00:00 2001 -From: Simon Kelley <simon@thekelleys.org.uk> -Date: Wed, 14 Aug 2019 20:44:50 +0100 -Subject: [PATCH] Fix memory leak in helper.c - -Thanks to Xu Mingjie <xumingjie1995@outlook.com> for spotting this. - -CVE: CVE-2019-14834 -Upstream-Status: Backport -Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> ---- - src/helper.c | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/src/helper.c b/src/helper.c -index 33ba120..c392eec 100644 ---- a/src/helper.c -+++ b/src/helper.c -@@ -82,7 +82,8 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd) - pid_t pid; - int i, pipefd[2]; - struct sigaction sigact; -- -+ unsigned char *alloc_buff = NULL; -+ - /* create the pipe through which the main program sends us commands, - then fork our process. */ - if (pipe(pipefd) == -1 || !fix_fd(pipefd[1]) || (pid = fork()) == -1) -@@ -188,11 +189,16 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd) - struct script_data data; - char *p, *action_str, *hostname = NULL, *domain = NULL; - unsigned char *buf = (unsigned char *)daemon->namebuff; -- unsigned char *end, *extradata, *alloc_buff = NULL; -+ unsigned char *end, *extradata; - int is6, err = 0; - int pipeout[2]; - -- free(alloc_buff); -+ /* Free rarely-allocated memory from previous iteration. */ -+ if (alloc_buff) -+ { -+ free(alloc_buff); -+ alloc_buff = NULL; -+ } - - /* we read zero bytes when pipe closed: this is our signal to exit */ - if (!read_write(pipefd[0], (unsigned char *)&data, sizeof(data), 1)) --- -1.7.10.4 diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.80.bb b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.80.bb deleted file mode 100644 index 827565051..000000000 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.80.bb +++ /dev/null @@ -1,10 +0,0 @@ -require dnsmasq.inc - -SRC_URI[dnsmasq-2.80.md5sum] = "1f071fd11454e1cffea73bdadcf70b21" -SRC_URI[dnsmasq-2.80.sha256sum] = "9e4a58f816ce0033ce383c549b7d4058ad9b823968d352d2b76614f83ea39adc" -SRC_URI += "\ - file://lua.patch \ - file://0001-dnsmasq-fix-build-against-5.2-headers.patch \ - file://0001-dnsmasq-fix-memory-leak-in-helper-c.patch \ -" - diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.81.bb b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.81.bb new file mode 100644 index 000000000..92415386c --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.81.bb @@ -0,0 +1,8 @@ +require dnsmasq.inc + +SRC_URI[dnsmasq-2.81.md5sum] = "e43808177a773014b5892ccba238f7a8" +SRC_URI[dnsmasq-2.81.sha256sum] = "3c28c68c6c2967c3a96e9b432c0c046a5df17a426d3a43cffe9e693cf05804d0" +SRC_URI += "\ + file://lua.patch \ +" + |