meta-openembedded: subtree update:c986cbed93..e0daf6f8e0
Adrian Bunk (19):
lldpd: Upgrade 1.0.3 -> 1.0.4
usrsctp: Upgrade to a more recent git snapshot
cim-schema: Remove duplicate file
dovecot: Upgrade 2.2.36.3 -> 2.2.36.4
flashrom: Upgrade 1.0 -> 1.1
doxygen: Upgrade 1.8.15 -> 1.8.16
nodejs: Upgrade 10.16.3 -> 10.17.0
php: Upgrade 7.3.9 -> 7.3.11
libdivecomputer: Upgrade to 0.6.0
libnss-nisplus: Upgrade to the latest upstream git
pegtl: Upgrade 2.1.4 -> 2.8.1
openwsman: Upgrade 2.6.9 -> 2.6.11
cgdb: Upgrade 0.6.8 -> 0.7.1
packagegroup-meta-networking: Exclude nonbuilding recipes with musl
xf86-input-tslib: Upgrade 0.0.6 -> 0.0.7
libmicrohttpd: Upgrade 0.9.66 -> 0.9.67
poco: Upgrade 1.9.0 -> 1.9.4
libgphoto2: Remove obsolete HAL files
mdns: Mark as incompatible with musl
Andreas Müller (5):
unicode-ucd: initial add 12.1.0
unicode-ucd: Set correct SUMMARY and HOMEPAGE
colord: initial add 1.4.4
colord-gtk: initial add 0.2.0
ibus: initial add 1.5.21
André Draszik (3):
nodejs: allow use of system c-ares (and make default)
libuv: update to 1.33.1
nodejs: allow use of system libuv (and make default)
Carlos Rafael Giani (1):
opencv: Enable pkg-config .pc file generation
Khem Raj (5):
miniupnpd: Update to 2.1.20191006
miniupnpd: Build config.h before full build
poco: Fix build on risc-v
python-docutils: Upgrade to 0.15.2
iwd: Use python3 variant of docutils during build
Luca Boccassi (1):
dbus-broker: build with libaudit if selinux is enabled
Martin Siegumfeldt (1):
libiio: add python3 packageconfig
Paul Eggleton (1):
python3-pillow: update to 6.2.1
Slater, Joseph (2):
syslog-ng: add volatile directory init for systemd
syslog-ng: change conf files to version 3.19
Trevor Gamblin (4):
python-priority: add recipe
python-h2: add recipe
python-hyperframe: add recipe
python-hpack: add recipe
Yi Zhao (1):
freeradius: set CLEANBROKEN
Zang Ruochen (22):
poppler: upgrade 0.80.0 -> 0.82.0
gmime: upgrade 3.2.3 -> 3.2.4
autofs: upgrade 5.1.5 -> 5.1.6
python-simplejson: enable native and nativesdk
python-dnspython: upgrade 1.15.0 -> 1.16.0
python-engineio: upgrade 3.9.3 -> 3.10.0
python-evdev: upgrade 0.7.0 -> 1.2.0
python-future: upgrade 0.16.0 -> 0.18.2
python-intervals: upgrade 1.5.4 -> 1.10.0
python-isort: upgrade 4.3.4 -> 4.3.21
python-javaobj-py3: upgrade 0.2.4 -> 0.3.0
python-lazy-object-proxy: upgrade 1.3.1 -> 1.4.3
python-parse: upgrade 1.8.4 -> 1.12.1
python-pathlib2: upgrade 2.3.4 -> 2.3.5
python-periphery: upgrade 1.1.1 -> 2.0.0
python-pint: upgrade 0.8.1 -> 0.9
python-progress: upgrade 1.4 -> 1.5
python-prompt-toolkit: upgrade 2.0.4 -> 2.0.10
python-pybind11: upgrade 2.2.3 -> 2.4.3
python-pycryptodome: upgrade 3.4.11 -> 3.9.0
python-pyexpect: upgrade 1.0.17 -> 1.0.19
python-pyfirmata: upgrade 1.0.3 -> 1.1.0
Zheng Ruoqin (23):
pure-ftpd: upgrade 1.0.47 -> 1.0.49
grpc: upgrade 1.24.1 -> 1.24.3
corosync: upgrade 2.4.4 -> 2.4.5
dhcpcd: upgrade 8.0.2 -> 8.1.1
iscsi-initiator-utils: upgrade 2.0.877 -> 2.0.878
znc: upgrade 1.7.4 -> 1.7.5
babeld: upgrade 1.8.4 -> 1.9.1
htpdate: upgrade 1.2.1 -> 1.2.2
nbd: upgrade 3.19 -> 3.20
unbound: upgrade 1.9.2 -> 1.9.4
wireshark: upgrade 3.0.3 -> 3.0.6
mtr: upgrade 0.92 -> 0.93
libowfat: upgrade 0.31 -> 0.32
iozone3: upgrade 484 -> 487
libhugetlbfs: upgrade 2.21 -> 2.22
phoronix-test-suite: upgrade 8.8.1 -> 9.0.1
lmsensors: upgrade 3.5.0 -> 3.6.0
paho-mqtt-c: upgrade 1.3.0 -> 1.3.1
rtorrent: upgrade 0.9.7 -> 0.9.8
zabbix: upgrade 4.2.6 -> 4.2.7
iwd: upgrade 0.20 -> 0.23
libtorrent: upgrade 0.13.7 -> 0.13.8
ledmon: upgrade to 0.93
Change-Id: I66f0f395da9087e46899cf882e36d9cc50718c62
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus.bb b/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus.bb
index 3a0a87e..c9d259b 100644
--- a/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus.bb
@@ -15,10 +15,9 @@
PV = "1.3+git${SRCPV}"
-SRCREV = "c6934373c7bac91499ff7bbe7d2439599325ca63"
+SRCREV = "116219e215858f4af9370171d3ead63baca8fdb4"
SRC_URI = "git://github.com/thkukuk/libnss_nisplus \
- file://0001-nisplus-hosts-Remove-use-of-RES_USE_INET6.patch \
"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus/0001-nisplus-hosts-Remove-use-of-RES_USE_INET6.patch b/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus/0001-nisplus-hosts-Remove-use-of-RES_USE_INET6.patch
deleted file mode 100644
index cf380dd..0000000
--- a/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus/0001-nisplus-hosts-Remove-use-of-RES_USE_INET6.patch
+++ /dev/null
@@ -1,245 +0,0 @@
-From 184bda40e05053cd2df61c28bec0baa7353697bb Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 28 Aug 2019 09:49:10 -0700
-Subject: [PATCH] nisplus-hosts: Remove use of RES_USE_INET6
-
-Upstream glibc dropped it starting glibc 2.30
-see
-https://sourceware.org/git/?p=glibc.git;a=commit;h=3f8b44be0a658266adff5ece1e4bc3ce097a5dbe
-
-Upstream-Status: Submitted [https://github.com/thkukuk/libnss_nisplus/pull/2]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/Makefile.am | 3 +-
- src/mapv4v6addr.h | 69 ---------------------------------------------
- src/nisplus-hosts.c | 58 ++++++++-----------------------------
- 3 files changed, 13 insertions(+), 117 deletions(-)
- delete mode 100644 src/mapv4v6addr.h
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index e879d5c..37ef86c 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -15,8 +15,7 @@ AM_CPPFLAGS = -I$(srcdir) @TIRPC_CFLAGS@ @LIBNSL_CFLAGS@
-
- lib_LTLIBRARIES = libnss_nisplus.la
-
--noinst_HEADERS = libc-lock.h nss-nisplus.h netgroup.h nisplus-parser.h \
-- mapv4v6addr.h
-+noinst_HEADERS = libc-lock.h nss-nisplus.h netgroup.h nisplus-parser.h
- check_PROGRAMS = nss_loader-test
- nss_loader_test_LDADD = -ldl
-
-diff --git a/src/mapv4v6addr.h b/src/mapv4v6addr.h
-deleted file mode 100644
-index 7f85f7d..0000000
---- a/src/mapv4v6addr.h
-+++ /dev/null
-@@ -1,69 +0,0 @@
--/*
-- * ++Copyright++ 1985, 1988, 1993
-- * -
-- * Copyright (c) 1985, 1988, 1993
-- * The Regents of the University of California. All rights reserved.
-- *
-- * Redistribution and use in source and binary forms, with or without
-- * modification, are permitted provided that the following conditions
-- * are met:
-- * 1. Redistributions of source code must retain the above copyright
-- * notice, this list of conditions and the following disclaimer.
-- * 2. Redistributions in binary form must reproduce the above copyright
-- * notice, this list of conditions and the following disclaimer in the
-- * documentation and/or other materials provided with the distribution.
-- * 4. Neither the name of the University nor the names of its contributors
-- * may be used to endorse or promote products derived from this software
-- * without specific prior written permission.
-- *
-- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-- * SUCH DAMAGE.
-- * -
-- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
-- *
-- * Permission to use, copy, modify, and distribute this software for any
-- * purpose with or without fee is hereby granted, provided that the above
-- * copyright notice and this permission notice appear in all copies, and that
-- * the name of Digital Equipment Corporation not be used in advertising or
-- * publicity pertaining to distribution of the document or software without
-- * specific, written prior permission.
-- *
-- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
-- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
-- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT
-- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
-- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-- * SOFTWARE.
-- * -
-- * --Copyright--
-- */
--
--#include <string.h>
--#include <arpa/nameser.h>
--
--static void
--map_v4v6_address (const char *src, char *dst)
--{
-- u_char *p = (u_char *) dst;
-- int i;
--
-- /* Move the IPv4 part to the right position. */
-- memcpy (dst + 12, src, INADDRSZ);
--
-- /* Mark this ipv6 addr as a mapped ipv4. */
-- for (i = 0; i < 10; i++)
-- *p++ = 0x00;
-- *p++ = 0xff;
-- *p = 0xff;
--}
-diff --git a/src/nisplus-hosts.c b/src/nisplus-hosts.c
-index cc00aa2..d37b209 100644
---- a/src/nisplus-hosts.c
-+++ b/src/nisplus-hosts.c
-@@ -42,14 +42,9 @@ static u_long tablename_len;
- #define NISENTRYLEN(idx, col, res) \
- (NIS_RES_OBJECT (res)[idx].EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len)
-
--/* Get implementation for some internal functions. */
--#include "mapv4v6addr.h"
--
--
- static int
- _nss_nisplus_parse_hostent (nis_result *result, int af, struct hostent *host,
-- char *buffer, size_t buflen, int *errnop,
-- int flags)
-+ char *buffer, size_t buflen, int *errnop)
- {
- unsigned int i;
- char *first_unused = buffer;
-@@ -66,8 +61,7 @@ _nss_nisplus_parse_hostent (nis_result *result, int af, struct hostent *host,
-
- char *data = first_unused;
-
-- if (room_left < (af != AF_INET || (flags & AI_V4MAPPED) != 0
-- ? IN6ADDRSZ : INADDRSZ))
-+ if (room_left < INADDRSZ)
- {
- no_more_room:
- *errnop = ERANGE;
-@@ -78,18 +72,8 @@ _nss_nisplus_parse_hostent (nis_result *result, int af, struct hostent *host,
- if (af != AF_INET6
- && inet_pton (AF_INET, NISENTRYVAL (0, 2, result), data) > 0)
- {
-- assert ((flags & AI_V4MAPPED) == 0 || af != AF_UNSPEC);
-- if (flags & AI_V4MAPPED)
-- {
-- map_v4v6_address (data, data);
-- host->h_addrtype = AF_INET6;
-- host->h_length = IN6ADDRSZ;
-- }
-- else
-- {
-- host->h_addrtype = AF_INET;
-- host->h_length = INADDRSZ;
-- }
-+ host->h_addrtype = AF_INET;
-+ host->h_length = INADDRSZ;
- }
- else if (af != AF_INET
- && inet_pton (AF_INET6, NISENTRYVAL (0, 2, result), data) > 0)
-@@ -319,12 +303,8 @@ internal_nisplus_gethostent_r (struct hostent *host, char *buffer,
- }
- }
-
-- if (_res.options & RES_USE_INET6)
-- parse_res = _nss_nisplus_parse_hostent (result, AF_INET6, host, buffer,
-- buflen, errnop, AI_V4MAPPED);
-- else
-- parse_res = _nss_nisplus_parse_hostent (result, AF_INET, host, buffer,
-- buflen, errnop, 0);
-+ parse_res = _nss_nisplus_parse_hostent (result, AF_INET, host, buffer,
-+ buflen, errnop);
-
- if (parse_res == -1)
- {
-@@ -379,7 +359,7 @@ get_tablename (int *herrnop)
- static enum nss_status
- internal_gethostbyname2_r (const char *name, int af, struct hostent *host,
- char *buffer, size_t buflen, int *errnop,
-- int *herrnop, int flags)
-+ int *herrnop)
- {
- if (tablename_val == NULL)
- {
-@@ -454,7 +434,7 @@ internal_gethostbyname2_r (const char *name, int af, struct hostent *host,
- }
-
- int parse_res = _nss_nisplus_parse_hostent (result, af, host, buffer,
-- buflen, errnop, flags);
-+ buflen, errnop);
-
- nis_freeresult (result);
-
-@@ -485,8 +465,7 @@ _nss_nisplus_gethostbyname2_r (const char *name, int af, struct hostent *host,
- }
-
- return internal_gethostbyname2_r (name, af, host, buffer, buflen, errnop,
-- herrnop,
-- ((_res.options & RES_USE_INET6) ? AI_V4MAPPED : 0));
-+ herrnop);
- }
-
-
-@@ -495,19 +474,8 @@ _nss_nisplus_gethostbyname_r (const char *name, struct hostent *host,
- char *buffer, size_t buflen, int *errnop,
- int *h_errnop)
- {
-- if (_res.options & RES_USE_INET6)
-- {
-- enum nss_status status;
--
-- status = internal_gethostbyname2_r (name, AF_INET6, host, buffer,
-- buflen, errnop, h_errnop,
-- AI_V4MAPPED);
-- if (status == NSS_STATUS_SUCCESS)
-- return status;
-- }
--
- return internal_gethostbyname2_r (name, AF_INET, host, buffer,
-- buflen, errnop, h_errnop, 0);
-+ buflen, errnop, h_errnop);
- }
-
-
-@@ -555,9 +523,7 @@ _nss_nisplus_gethostbyaddr_r (const void *addr, socklen_t addrlen, int af,
- }
-
- parse_res = _nss_nisplus_parse_hostent (result, af, host,
-- buffer, buflen, errnop,
-- ((_res.options & RES_USE_INET6)
-- ? AI_V4MAPPED : 0));
-+ buffer, buflen, errnop);
- nis_freeresult (result);
-
- if (parse_res > 0)
-@@ -584,7 +550,7 @@ _nss_nisplus_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat,
-
- enum nss_status status = internal_gethostbyname2_r (name, AF_UNSPEC, &host,
- buffer, buflen,
-- errnop, herrnop, 0);
-+ errnop, herrnop);
- if (status == NSS_STATUS_SUCCESS)
- {
- if (*pat == NULL)
---
-2.23.0
-