diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-08-26 08:32:28 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-08-26 08:32:33 +0300 |
commit | 665fd026517259031fd55bcfb2a9dab0d9f3582a (patch) | |
tree | 4152d42430b07cd519c82b91d9c1abc88b5a5a6a /meta-openembedded/meta-networking | |
parent | 36166cd035bf51c6830b977e48316d708daa62b5 (diff) | |
download | openbmc-665fd026517259031fd55bcfb2a9dab0d9f3582a.tar.xz |
meta-openembedded: subtree update:509d40153d..1e8bc46e55
Adrian Bunk (5):
networkmanager: musl now supports secure_getenv
libuser: musl now supports secure_getenv
libgit2: Upgrade 0.27.8 -> 0.27.9
poppler: Stop using USE_FIXEDPOINT
networkmanager: Upgrade 1.18.0 -> 1.18.2
Andreas Müller (10):
xfce4-time-out-plugin: upgrade 1.0.2 -> 1.0.3
xfce4-battery-plugin: 1.1.2 -> 1.1.3
xfce4-smartbookmark-plugin: upgrade 0.5.0 -> 0.5.1
xfce4-wavelan-plugin: upgrade 0.6.0 -> 0.6.1
xfce4-netload-plugin: upgrade 1.3.1 -> 1.3.2
xfce4-systemload-plugin: upgrade 1.2.2 -> 1.2.3
xfce4-mpc-plugin: upgrade 0.5.1 -> 0.5.2
xfce4-fsguard-plugin: upgrade 1.1.0 -> 1.1.1
xfce4-diskperf-plugin: upgrade 2.6.1 -> 2.6.2
gigolo: upgrade 0.4.2 -> 0.5.0
Anuj Mittal (2):
clinfo: add recipe
ade: add recipe
Hongxu Jia (1):
lvm2: fix circular dependencies while systemd enable cryptsetup
Jan Kaisrlik (1):
networkd-dispatcher: service file is using different location of binary
Johannes Pointner (1):
libtinyxml2: update to 7.1.0
Martin Jansa (1):
python-socketio: prevent python2 socketio depending on python3-aiohttp
Piotr Tworek (3):
libgee: Update to version 0.20.2
gnome-bluetooth: Update to version 3.32.1.
gnome-keyring: Update to version 3.28.2
Yi Zhao (1):
apache2: upgrade 2.4.39 -> 2.4.41
Yuan Chao (5):
libnftnl: upgrade 1.1.3 -> 1.1.4
libtdb: upgrade 1.4.0 -> 1.4.1
python-flask-pymongo: upgrade 0.5.1 -> 2.3.0
xfsprogs: upgrade 5.2.0 -> 5.2.1
python-protobuf: upgrade 3.9.0 -> 3.9.1
Zang Ruochen (1):
cryptsetup: upgrade 2.1.0 -> 2.2.0.
Change-Id: I4db480893fc3b39cc7e014dbca0adc9c5317abf1
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-networking')
-rw-r--r-- | meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.2.bb (renamed from meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.0.bb) | 14 | ||||
-rw-r--r-- | meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.0.1.bb | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl/0002-avoid-naming-local-function-as-one-of-printf-family.patch | 54 | ||||
-rw-r--r-- | meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.4.bb (renamed from meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.3.bb) | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.1.bb (renamed from meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.0.bb) | 4 |
5 files changed, 46 insertions, 30 deletions
diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.2.bb index 58968dfb0..b760a40c3 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.2.bb @@ -5,7 +5,6 @@ SECTION = "net/misc" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \ file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \ - file://docs/api/html/license.html;md5=233931303ef80eded167add1f60a50c1 \ " DEPENDS = " \ @@ -31,8 +30,8 @@ SRC_URI_append_libc-musl = " \ file://musl/0001-Fix-build-with-musl-systemd-specific.patch \ file://musl/0002-Fix-build-with-musl.patch \ " -SRC_URI[md5sum] = "c8c27116a8083bab5d5fcca0d03e988a" -SRC_URI[sha256sum] = "c6e8df25e5a3c7309bc17664be8971689314884cdd08afdd6b0847d29d2a8ba6" +SRC_URI[md5sum] = "ca1e6175c6ba97ca1adf65a67861ccd9" +SRC_URI[sha256sum] = "4dd97ca974cd1f97990746527258f551f4257cbf011fecd01d10b7d74a6fa5c3" UPSTREAM_CHECK_URI = "${GNOME_MIRROR}/NetworkManager/1.16/" UPSTREAM_CHECK_REGEX = "NetworkManager\-(?P<pver>1\.10(\.\d+)+).tar.xz" @@ -51,17 +50,8 @@ EXTRA_OECONF = " \ # stolen from https://github.com/void-linux/void-packages/blob/master/srcpkgs/NetworkManager/template # avoids: # | ../NetworkManager-1.16.0/libnm-core/nm-json.c:106:50: error: 'RTLD_DEEPBIND' undeclared (first use in this function); did you mean 'RTLD_DEFAULT'? -# -# and -# -# | In file included from ../NetworkManager-1.16.0/src/systemd/nm-sd-utils-core.c:25: -# | ../NetworkManager-1.16.0/src/systemd/sd-adapt-core/nm-sd-adapt-core.h:68:6: error: #error neither secure_getenv nor __secure_getenv is available -# | # error neither secure_getenv nor __secure_getenv is available -# | ^~~~~ CFLAGS_append_libc-musl = " \ -DRTLD_DEEPBIND=0 \ - -DHAVE_SECURE_GETENV \ - -Dsecure_getenv=getenv \ " do_compile_prepend() { diff --git a/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.0.1.bb b/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.0.1.bb index affd0aae0..008a7ac9a 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.0.1.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.0.1.bb @@ -24,7 +24,7 @@ do_configure[noexec] = "1" do_compile[noexec] = "1" do_install() { - install -D -m 0755 ${S}/networkd-dispatcher ${D}${sbindir}/networkd-dispatcher + install -D -m 0755 ${S}/networkd-dispatcher ${D}${bindir}/networkd-dispatcher install -D -m 0644 ${S}/networkd-dispatcher.service ${D}/${systemd_system_unitdir}/networkd-dispatcher.service install -D -m 0644 ${S}/networkd-dispatcher.conf ${D}/${sysconfdir}/conf.d/networkd-dispatcher.conf } diff --git a/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl/0002-avoid-naming-local-function-as-one-of-printf-family.patch b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl/0002-avoid-naming-local-function-as-one-of-printf-family.patch index 561f0e554..e64091b50 100644 --- a/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl/0002-avoid-naming-local-function-as-one-of-printf-family.patch +++ b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl/0002-avoid-naming-local-function-as-one-of-printf-family.patch @@ -1,6 +1,6 @@ -From 9e2c810ebc3c917ea7483205178416e9eaf952fe Mon Sep 17 00:00:00 2001 -From: Alex Kiernan <alex.kiernan@gmail.com> -Date: Wed, 7 Nov 2018 19:41:54 +0000 +From 373e13e28e34b4d415fc096e1c7175f4ecfbf0da Mon Sep 17 00:00:00 2001 +From: Yuan Chao <yuanc.fnst@cn.fujitsu.com> +Date: Wed, 21 Aug 2019 11:18:56 +0900 Subject: [PATCH] avoid naming local function as one of printf family Fixes build issues with clang @@ -8,6 +8,8 @@ error: no member named '__builtin___snprintf_chk' in 'struct expr_ops' Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> + +Signed-off-by: Yuan Chao <yuanc.fnst@cn.fujitsu.com> --- include/expr_ops.h | 2 +- include/obj.h | 2 +- @@ -44,11 +46,13 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> src/expr/reject.c | 2 +- src/expr/rt.c | 2 +- src/expr/socket.c | 2 +- + src/expr/synproxy.c | 2 +- src/expr/target.c | 2 +- src/expr/tproxy.c | 2 +- src/expr/tunnel.c | 2 +- src/expr/xfrm.c | 2 +- src/obj/counter.c | 2 +- + src/obj/ct_expect.c | 2 +- src/obj/ct_helper.c | 2 +- src/obj/ct_timeout.c | 2 +- src/obj/limit.c | 2 +- @@ -56,7 +60,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> src/obj/secmark.c | 2 +- src/obj/tunnel.c | 2 +- src/object.c | 2 +- - 47 files changed, 48 insertions(+), 48 deletions(-) + 49 files changed, 50 insertions(+), 50 deletions(-) diff --git a/include/expr_ops.h b/include/expr_ops.h index a7f1b9a..d2946de 100644 @@ -72,10 +76,10 @@ index a7f1b9a..d2946de 100644 struct expr_ops *nftnl_expr_ops_lookup(const char *name); diff --git a/include/obj.h b/include/obj.h -index 35b5c40..decd1ce 100644 +index 9394d79..08610d7 100644 --- a/include/obj.h +++ b/include/obj.h -@@ -92,7 +92,7 @@ struct obj_ops { +@@ -99,7 +99,7 @@ struct obj_ops { const void *(*get)(const struct nftnl_obj *e, uint16_t type, uint32_t *data_len); int (*parse)(struct nftnl_obj *e, struct nlattr *attr); void (*build)(struct nlmsghdr *nlh, const struct nftnl_obj *e); @@ -157,10 +161,10 @@ index 89a602e..a32a69e 100644 + .snprintf_ = nftnl_expr_counter_snprintf, }; diff --git a/src/expr/ct.c b/src/expr/ct.c -index b9ca2dc..6fbed1d 100644 +index 124de9d..7bde179 100644 --- a/src/expr/ct.c +++ b/src/expr/ct.c -@@ -272,5 +272,5 @@ struct expr_ops expr_ops_ct = { +@@ -273,5 +273,5 @@ struct expr_ops expr_ops_ct = { .get = nftnl_expr_ct_get, .parse = nftnl_expr_ct_parse, .build = nftnl_expr_ct_build, @@ -190,10 +194,10 @@ index 68115ba..6e43bb4 100644 + .snprintf_ = nftnl_expr_dynset_snprintf, }; diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c -index bef453e..f2696d6 100644 +index e5f714b..e68792b 100644 --- a/src/expr/exthdr.c +++ b/src/expr/exthdr.c -@@ -271,5 +271,5 @@ struct expr_ops expr_ops_exthdr = { +@@ -276,5 +276,5 @@ struct expr_ops expr_ops_exthdr = { .get = nftnl_expr_exthdr_get, .parse = nftnl_expr_exthdr_parse, .build = nftnl_expr_exthdr_build, @@ -311,10 +315,10 @@ index 4fa74b2..249c6b5 100644 + .snprintf_ = nftnl_expr_match_snprintf, }; diff --git a/src/expr/meta.c b/src/expr/meta.c -index ffcc896..5eaeb68 100644 +index 73f6efa..35d5ec5 100644 --- a/src/expr/meta.c +++ b/src/expr/meta.c -@@ -222,5 +222,5 @@ struct expr_ops expr_ops_meta = { +@@ -226,5 +226,5 @@ struct expr_ops expr_ops_meta = { .get = nftnl_expr_meta_get, .parse = nftnl_expr_meta_parse, .build = nftnl_expr_meta_build, @@ -453,6 +457,17 @@ index 96550d5..2394dbf 100644 - .snprintf = nftnl_expr_socket_snprintf, + .snprintf_ = nftnl_expr_socket_snprintf, }; +diff --git a/src/expr/synproxy.c b/src/expr/synproxy.c +index 245f4fb..9721029 100644 +--- a/src/expr/synproxy.c ++++ b/src/expr/synproxy.c +@@ -166,5 +166,5 @@ struct expr_ops expr_ops_synproxy = { + .get = nftnl_expr_synproxy_get, + .parse = nftnl_expr_synproxy_parse, + .build = nftnl_expr_synproxy_build, +- .snprintf = nftnl_expr_synproxy_snprintf, ++ .snprintf_ = nftnl_expr_synproxy_snprintf, + }; diff --git a/src/expr/target.c b/src/expr/target.c index 9100038..7180085 100644 --- a/src/expr/target.c @@ -508,6 +523,17 @@ index 1baba4e..3710bce 100644 - .snprintf = nftnl_obj_counter_snprintf, + .snprintf_ = nftnl_obj_counter_snprintf, }; +diff --git a/src/obj/ct_expect.c b/src/obj/ct_expect.c +index c0bb5ba..953c08c 100644 +--- a/src/obj/ct_expect.c ++++ b/src/obj/ct_expect.c +@@ -209,5 +209,5 @@ struct obj_ops obj_ops_ct_expect = { + .get = nftnl_obj_ct_expect_get, + .parse = nftnl_obj_ct_expect_parse, + .build = nftnl_obj_ct_expect_build, +- .snprintf = nftnl_obj_ct_expect_snprintf, ++ .snprintf_ = nftnl_obj_ct_expect_snprintf, + }; diff --git a/src/obj/ct_helper.c b/src/obj/ct_helper.c index d91f636..2037461 100644 --- a/src/obj/ct_helper.c @@ -575,10 +601,10 @@ index 7ffade8..800eb3e 100644 + .snprintf_ = nftnl_obj_tunnel_snprintf, }; diff --git a/src/object.c b/src/object.c -index 5c8d183..d489cdd 100644 +index d8c87ee..5307d7e 100644 --- a/src/object.c +++ b/src/object.c -@@ -369,7 +369,7 @@ static int nftnl_obj_snprintf_dflt(char *buf, size_t size, +@@ -370,7 +370,7 @@ static int nftnl_obj_snprintf_dflt(char *buf, size_t size, SNPRINTF_BUFFER_SIZE(ret, remain, offset); if (obj->ops) { diff --git a/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.3.bb b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.4.bb index 00bf88dab..705b6a6c3 100644 --- a/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.3.bb +++ b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.4.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=79808397c3355f163c012616125c9e26" SECTION = "libs" DEPENDS = "libmnl" -SRCREV = "d819a832e0214a3bec3679345f542644596a2850" +SRCREV = "7c19dc01a88dbcf9a45fa791cd27a51b563bcf29" SRC_URI = "git://git.netfilter.org/libnftnl \ file://0001-Move-exports-before-symbol-definition.patch \ file://0002-avoid-naming-local-function-as-one-of-printf-family.patch \ diff --git a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.0.bb b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.1.bb index 6c191fbde..d25c3fa65 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.1.bb @@ -11,8 +11,8 @@ SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \ file://0001-waf-add-support-of-cross_compile.patch \ " -SRC_URI[md5sum] = "c4c2f8cf9e691244a7f2ecfa3baadecc" -SRC_URI[sha256sum] = "c1a0729c5400fb495465fa4bd953ae290db43c28dacd0506aef50dc482132d35" +SRC_URI[md5sum] = "d1d0a5d43614add17d1e41bbdb209446" +SRC_URI[sha256sum] = "dd4ecd9678e8d3ea772623bd81fe49b43363a2f970a76fb5468322753787aa4b" PACKAGECONFIG ??= "\ ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ |