From patchwork Thu Feb 20 03:42:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1241154 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=KIvDl0ah; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=fUx5Du6H; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48NL5N0VLNz9sRN for ; Thu, 20 Feb 2020 14:42:47 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=2TrpL4cWkn3gb7MP7HK9NxmwaAakbWwG4NCpjX+RW8o=; b=KIvDl0ahoFFQV6 Vq8T5JevtoVQiksHYlu+nKrDYBdekns8S2sF4tldvg9FQ+aW7OKqtFhoM91tWefvWCAbWJmKTIF9S WEuJu/DeugLFWEHI282X4K+lYph9M8WNNy/anu54It152j0oFMcd/LcryIZb6t9tNoePMaYneYFkC pyRxRt9nAtldkZqfc5rUFkgRWiRUnnxmmYhVE6kbrsMjUh9wop65PIZaUYlD2gjQz1r9YsgHF/YwN j0dkAevuOA/QpJQiq1DuZVnfy6L+xMMx6EaIW6HkVS6bQ9MN3VUsfvQxCJcuPjW2d3GzenIwW38xV AAQ2M541Ds3w2lD4UxVA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1j4cjc-0008Mr-7E; Thu, 20 Feb 2020 03:42:44 +0000 Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1j4cjY-0008MM-60 for openwrt-devel@lists.openwrt.org; Thu, 20 Feb 2020 03:42:42 +0000 Received: by mail-pj1-x1030.google.com with SMTP id n96so286195pjc.3 for ; Wed, 19 Feb 2020 19:42:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=cPgJoqo5e5nlBHwz9TuJci0u+/oWK2XtGXU09F2Z2x0=; b=fUx5Du6H9hZ12lZlNU6dIwfFxw3TLvlp900/u5gUAY6ACPq5LWW2puK3hMJIp/HXvr 0qCBrbGCRTixp6D0a8vqHlgq1syJnpnSyE9aV9ARq1k1YsoYJI+DDusiqaeCUVs4rs9I YbvQxccfAkhtNxKIlCUIitKgOx3rW2QpMh4w0YUt9mVyP6ZEAEYa4IgPNd3m4poVNGnW BXB777oatvSLySqhcuNjiE5gCQXkNpNYGhAMMvQT6ONOlHcU01aMkREH4RA2bp7BB4a4 Vdb+hTnlnBmxyFev/glBIcDGYJXOtYRPCPoihMQIb0URT0urQsKi3BBQmlBwj1N8zvDN 47OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=cPgJoqo5e5nlBHwz9TuJci0u+/oWK2XtGXU09F2Z2x0=; b=HayvFZI/78lAYy+9UZZOn4k8xT0DhVsAg7uPPdIOrvxyelBDyQxcsTuAbMDFFg5rbq KviEw6Cx7SUaD6D5Jwz81J9niMPWQ3iFu/uloTU5q/Jx5y/V00Owd7Do7oCfR7m4cWir AJs3h6K+1HefGclYzuplzVFDpG2XEiMfKJKRAdBz03zXS00NDt6+sE0JpXpXPXGwIV7P pdPOukcZv/NGezOQvuAXFVcjY+NhGDPNRQCuUFFugPIHS5m5CUemFyJeaaMEipYUDBac 11FRWzOB/4LmMdkNFfpHb2ChhvtZwKFi+Wj259IHkP8eReSI/K+PELKc0q3DtebO3IVo AaAA== X-Gm-Message-State: APjAAAUNG4se0XNayFjrVHu+fHSo0tP5bj01s4+JIxyhZ7ZaNPtv0E9H cugWy/oV+EH23fS1gu7hyVWEiZMKulo= X-Google-Smtp-Source: APXvYqzZSa4TZU5oRZqoD86f8Ef1ZqlIbKoIbQQPx5yNUgPpCydVIHGvxz2K3GO8M9Uy8iH5MmLYWA== X-Received: by 2002:a17:902:fe8b:: with SMTP id x11mr29821184plm.83.1582170157686; Wed, 19 Feb 2020 19:42:37 -0800 (PST) Received: from localhost.localdomain ([69.42.0.214]) by smtp.gmail.com with ESMTPSA id fh24sm1162165pjb.24.2020.02.19.19.42.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2020 19:42:36 -0800 (PST) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Date: Wed, 19 Feb 2020 19:42:35 -0800 Message-Id: <20200220034235.472105-1-rosenp@gmail.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200219_194240_253711_F2C31607 X-CRM114-Status: GOOD ( 14.03 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rosenp[at]gmail.com] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain Subject: [OpenWrt-Devel] [PATCH] libbsd: update to 0.10.0 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Removed all upstream patches. Added PKG_BUILD_PARALLEL for faster compilation. Small Makefile rearrangements for consistency between packages. Signed-off-by: Rosen Penev --- package/libs/libbsd/Makefile | 11 +- ...1-handle-systems-missing-sys_cdefs.h.patch | 195 ------------------ ...ion_for_glibc_already_providing_them.patch | 65 ------ package/libs/libbsd/patches/010-fix-arc.patch | 30 --- 4 files changed, 6 insertions(+), 295 deletions(-) delete mode 100644 package/libs/libbsd/patches/001-handle-systems-missing-sys_cdefs.h.patch delete mode 100644 package/libs/libbsd/patches/002-fix_function_declaration_protection_for_glibc_already_providing_them.patch delete mode 100644 package/libs/libbsd/patches/010-fix-arc.patch diff --git a/package/libs/libbsd/Makefile b/package/libs/libbsd/Makefile index 63b9ceafc3..26e05f79a1 100644 --- a/package/libs/libbsd/Makefile +++ b/package/libs/libbsd/Makefile @@ -1,19 +1,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libbsd -PKG_VERSION:=0.8.7 -PKG_RELEASE:=3 +PKG_VERSION:=0.10.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_HASH:=f548f10e5af5a08b1e22889ce84315b1ebe41505b015c9596bad03fd13a12b31 PKG_SOURCE_URL:=https://libbsd.freedesktop.org/releases +PKG_HASH:=34b8adc726883d0e85b3118fa13605e179a62b31ba51f676136ecb2d0bc1a887 PKG_LICENSE:=BSD-4-Clause PKG_LICENSE_FILES:=COPYING -include $(INCLUDE_DIR)/package.mk - PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/package.mk define Package/libbsd SECTION:=libs diff --git a/package/libs/libbsd/patches/001-handle-systems-missing-sys_cdefs.h.patch b/package/libs/libbsd/patches/001-handle-systems-missing-sys_cdefs.h.patch deleted file mode 100644 index 108e967722..0000000000 --- a/package/libs/libbsd/patches/001-handle-systems-missing-sys_cdefs.h.patch +++ /dev/null @@ -1,195 +0,0 @@ -From 11ec8f1e5dfa1c10e0c9fb94879b6f5b96ba52dd Mon Sep 17 00:00:00 2001 -From: Guillem Jover -Date: Tue, 6 Mar 2018 01:41:35 +0100 -Subject: Handle systems missing - -This is a non-portable header, and we cannot expect it to be provided by -the system libc (e.g. musl). We just need and rely on declaration that -we have defined ourselves in our own . So we switch to -only ever assume that. - -Fixes: https://bugs.freedesktop.org/105281 ---- - include/bsd/libutil.h | 4 ++++ - include/bsd/md5.h | 4 ++++ - include/bsd/nlist.h | 4 ++++ - include/bsd/readpassphrase.h | 4 ++++ - include/bsd/stdlib.h | 4 ++++ - include/bsd/string.h | 4 ++++ - include/bsd/stringlist.h | 5 +++++ - include/bsd/sys/queue.h | 4 ++++ - include/bsd/sys/tree.h | 4 ++++ - include/bsd/timeconv.h | 4 ++++ - include/bsd/vis.h | 4 ++++ - include/bsd/wchar.h | 4 ++++ - 12 files changed, 49 insertions(+) - ---- a/include/bsd/libutil.h -+++ b/include/bsd/libutil.h -@@ -40,7 +40,11 @@ - #define LIBBSD_LIBUTIL_H - - #include -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - #include - #include ---- a/include/bsd/md5.h -+++ b/include/bsd/md5.h -@@ -27,7 +27,11 @@ typedef struct MD5Context { - uint8_t buffer[MD5_BLOCK_LENGTH]; /* input buffer */ - } MD5_CTX; - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - - __BEGIN_DECLS ---- a/include/bsd/nlist.h -+++ b/include/bsd/nlist.h -@@ -27,7 +27,11 @@ - #ifndef LIBBSD_NLIST_H - #define LIBBSD_NLIST_H - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - - struct nlist { - union { ---- a/include/bsd/readpassphrase.h -+++ b/include/bsd/readpassphrase.h -@@ -31,7 +31,11 @@ - #define RPP_SEVENBIT 0x10 /* Strip the high bit from input. */ - #define RPP_STDIN 0x20 /* Read from stdin, not /dev/tty */ - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - - __BEGIN_DECLS ---- a/include/bsd/stdlib.h -+++ b/include/bsd/stdlib.h -@@ -42,7 +42,11 @@ - #ifndef LIBBSD_STDLIB_H - #define LIBBSD_STDLIB_H - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - #include - ---- a/include/bsd/string.h -+++ b/include/bsd/string.h -@@ -33,7 +33,11 @@ - #ifndef LIBBSD_STRING_H - #define LIBBSD_STRING_H - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - - __BEGIN_DECLS ---- a/include/bsd/stringlist.h -+++ b/include/bsd/stringlist.h -@@ -31,7 +31,12 @@ - - #ifndef LIBBSD_STRINGLIST_H - #define LIBBSD_STRINGLIST_H -+ -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - - /* ---- a/include/bsd/sys/queue.h -+++ b/include/bsd/sys/queue.h -@@ -33,7 +33,11 @@ - #ifndef LIBBSD_SYS_QUEUE_H - #define LIBBSD_SYS_QUEUE_H - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - - /* - * This file defines four types of data structures: singly-linked lists, ---- a/include/bsd/sys/tree.h -+++ b/include/bsd/sys/tree.h -@@ -30,7 +30,11 @@ - #ifndef LIBBSD_SYS_TREE_H - #define LIBBSD_SYS_TREE_H - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - - /* - * This file defines data structures for different types of trees: ---- a/include/bsd/timeconv.h -+++ b/include/bsd/timeconv.h -@@ -41,7 +41,11 @@ - #ifndef LIBBSD_TIMECONV_H - #define LIBBSD_TIMECONV_H - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - #include - ---- a/include/bsd/vis.h -+++ b/include/bsd/vis.h -@@ -72,7 +72,11 @@ - */ - #define UNVIS_END 1 /* no more characters */ - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - - __BEGIN_DECLS - char *vis(char *, int, int, int); ---- a/include/bsd/wchar.h -+++ b/include/bsd/wchar.h -@@ -40,7 +40,11 @@ - #define LIBBSD_WCHAR_H - - #include -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - - __BEGIN_DECLS diff --git a/package/libs/libbsd/patches/002-fix_function_declaration_protection_for_glibc_already_providing_them.patch b/package/libs/libbsd/patches/002-fix_function_declaration_protection_for_glibc_already_providing_them.patch deleted file mode 100644 index 3ce1d654c9..0000000000 --- a/package/libs/libbsd/patches/002-fix_function_declaration_protection_for_glibc_already_providing_them.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 1f8a3f7bccfc84b195218ad0086ebd57049c3490 Mon Sep 17 00:00:00 2001 -From: Guillem Jover -Date: Tue, 6 Mar 2018 01:39:45 +0100 -Subject: Fix function declaration protection for glibc already providing them -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -On non-glibc based systems we cannot unconditionally use the -__GLIBC_PREREQ macro as it gets expanded before evaluation. Instead, -if it is undefined, define it to 0. - -We should also always declare these functions on non-glibc based -systems. And on systems with a new enough glibc, which provides these -functions, we should still provide the declarations if _GNU_SOURCE -is *not* defined. - -Reported-by: Jörg Krause ---- - include/bsd/stdlib.h | 3 ++- - include/bsd/string.h | 3 ++- - include/bsd/sys/cdefs.h | 8 ++++++++ - 3 files changed, 12 insertions(+), 2 deletions(-) - ---- a/include/bsd/stdlib.h -+++ b/include/bsd/stdlib.h -@@ -71,7 +71,8 @@ int sradixsort(const unsigned char **bas - const unsigned char *table, unsigned endbyte); - - void *reallocf(void *ptr, size_t size); --#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26) -+#if !defined(__GLIBC__) || \ -+ (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 26) || !defined(_GNU_SOURCE))) - void *reallocarray(void *ptr, size_t nmemb, size_t size); - #endif - ---- a/include/bsd/string.h -+++ b/include/bsd/string.h -@@ -46,7 +46,8 @@ size_t strlcat(char *dst, const char *sr - char *strnstr(const char *str, const char *find, size_t str_len); - void strmode(mode_t mode, char *str); - --#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25) -+#if !defined(__GLIBC__) || \ -+ (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 25) || !defined(_GNU_SOURCE))) - void explicit_bzero(void *buf, size_t len); - #endif - __END_DECLS ---- a/include/bsd/sys/cdefs.h -+++ b/include/bsd/sys/cdefs.h -@@ -59,6 +59,14 @@ - #endif - - /* -+ * On non-glibc based systems, we cannot unconditionally use the -+ * __GLIBC_PREREQ macro as it gets expanded before evaluation. -+ */ -+#ifndef __GLIBC_PREREQ -+#define __GLIBC_PREREQ(maj, min) 0 -+#endif -+ -+/* - * Some kFreeBSD headers expect those macros to be set for sanity checks. - */ - #ifndef _SYS_CDEFS_H_ diff --git a/package/libs/libbsd/patches/010-fix-arc.patch b/package/libs/libbsd/patches/010-fix-arc.patch deleted file mode 100644 index 64948c6d67..0000000000 --- a/package/libs/libbsd/patches/010-fix-arc.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f60b6777cc2047f9845de2c88cf092b045c160c0 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Fri, 17 May 2019 01:44:56 +0000 -Subject: [PATCH] local-elf: Add ARC support - -Signed-off-by: Rosen Penev ---- - src/local-elf.h | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/local-elf.h b/src/local-elf.h -index 83ca253..b90baf3 100644 ---- a/src/local-elf.h -+++ b/src/local-elf.h -@@ -53,6 +53,12 @@ - #endif - #define ELF_TARG_DATA ELFDATA2LSB - -+#elif defined (__arc__) -+ -+#define ELF_TARG_MACH EM_ARC -+#define ELF_TARG_CLASS ELFCLASS32 -+#define ELF_TARG_DATA ELFDATA2LSB -+ - #elif defined(__arm__) - - #define ELF_TARG_MACH EM_ARM --- -2.18.1 -