From patchwork Thu Nov 12 17:18:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Dedecker X-Patchwork-Id: 1399133 X-Patchwork-Delegate: dedeckeh@gmail.com 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=2001:8b0:10b:1231::1; helo=merlin.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; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=f0xCd3ki; 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=VOZdJgPa; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (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 4CX7fk5qltz9sSf for ; Fri, 13 Nov 2020 04:21:02 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=LJG5fn5S83n+nacqQ+M9siH8dZkwJyKGKQtpTEgVevA=; b=f0xCd3kiLWclYrJwje0AM0tvNr QT2ooA+xuWmzgLM60wni9p3qd+cg0lvaTezpXRN0QUCR6LHG/Hy+VxUaHSR3J1ou98bxJyc5ACFiz 4GqJzOjcTJG0gzYxSGsgTTASb8qBJ80z7KhtKdSg70FlqKjzdrg4wlB47pidpFE/PD1RBNBus/x+C CCMT1ko5bsQFeKgvxjLB/dMVpiS+jJRzKGbGyine3arzoQJlMuP1YNNnfZGD8PvfuJ3Sy85XMNchc HozT279OEKw5wQyllMqKaQSuZ9Q41Px0F72cJ9GlRSgK1Guxf/BUlIbpKVSLy8Ou2fSZuoGzhEGNV dcKjgGig==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kdGFW-0006HX-0s; Thu, 12 Nov 2020 17:19:06 +0000 Received: from mail-ed1-x542.google.com ([2a00:1450:4864:20::542]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kdGFS-0006GY-D7 for openwrt-devel@lists.openwrt.org; Thu, 12 Nov 2020 17:19:03 +0000 Received: by mail-ed1-x542.google.com with SMTP id b9so7213893edu.10 for ; Thu, 12 Nov 2020 09:19:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=gsWtdza6jCAbYH+zT1GxQJ3xkDUkhpA4rFAadcbs04w=; b=VOZdJgPaQN0Qrakc0YCQFDiZ31Vey36/t9Ctj9VsKvGoy0qbrFvYugldytbLvOgltp EBNLFcUQ209gceG20YabN5sTXndS3+0aaXsINFVQPvJT8E6sPN8/mUw0V7t4MmC4wnxx /7m+Ec31IqacLHdmSCE5Wa7MRsRAXvNVwbVMAAzjsQzPt+48sEWzw8jvfPkt9hWrwRHz AZEagoLEyUnh3S0fapqN9n7/Spci0g8E5DpSCYVhuPwgfVUCYPlG3hFmLoJs1ZF4b2sh 1V+tWo2PflxEaEIsvokDVCn1PQIiAFWC0z6+1KPsgnQoNeoRFoHMvsdnLU0mJ1bVJLql vhvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=gsWtdza6jCAbYH+zT1GxQJ3xkDUkhpA4rFAadcbs04w=; b=enGU7LCPQckLFN1nUuDSX07GtqBj+nCIVfPed6uStFrhRTgg4akCo7bWhUmNb3ZxID nnyh735iVF9ocvSWEH3wVpvINvOcusQbMefAIXQOmzUxUYB9V57DMx1QA0KiaXuNkeB0 +Qmb2VI+Noh5AlZB2IbsKaaDDKHKRyXBjxtneKzTkmtDrvpTS8DEr6PdQQ2IAodN3E2q Mv/J4uxAEENtG5kGPW+J2VmLqj00aeXdTIG0HFq71+XaRtdZsWVZwtE0A+G4XkXTpnx/ xbf0ReNRuWW6H970+Igu8RmPV/sJV6R3aHdvyHn8nw8yL63G6JxiuqZEWVXluDOE8iru WF8Q== X-Gm-Message-State: AOAM532iGuBUukcokpf+WWU6SN/RSyV7SyECRexmPC76yrG8sUFx+qjY rzhLQdyIpPtlKrvYHSnGeXysknIHEahTjA== X-Google-Smtp-Source: ABdhPJzDxfbn3briGMU7D0+zXN0QHlYAsCY1hh4vqDyNpiK1Zf/e6DzDTx5JF8gorYUExbomuiQnCQ== X-Received: by 2002:aa7:df82:: with SMTP id b2mr785424edy.251.1605201540182; Thu, 12 Nov 2020 09:19:00 -0800 (PST) Received: from dedeckeh-Lenovo-V130-15IKB.lan (ptr-fvgfo5u5sppgebd8dtx.18120a2.ip6.access.telenet.be. [2a02:1812:1109:7d00:f112:656f:242c:1105]) by smtp.gmail.com with ESMTPSA id qx6sm2435560ejb.10.2020.11.12.09.18.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 09:18:59 -0800 (PST) From: Hans Dedecker To: openwrt-devel@lists.openwrt.org Subject: [PATCH] iproute2: update to 5.9 Date: Thu, 12 Nov 2020 18:18:52 +0100 Message-Id: <20201112171852.127080-1-dedeckeh@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201112_121902_488482_E20C43A2 X-CRM114-Status: GOOD ( 11.15 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:542 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [dedeckeh[at]gmail.com] -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 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hans Dedecker Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Update iproute2 to latest stable 5.9; for the changes see https://lwn.net/Articles/834755/ Refresh patches Signed-off-by: Hans Dedecker Acked-by: Hauke Mehrtens --- package/network/utils/iproute2/Makefile | 4 ++-- .../utils/iproute2/patches/115-add-config-xtlibdir.patch | 2 +- .../utils/iproute2/patches/175-reduce-dynamic-syms.patch | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index 90f8b59a02..237f84736b 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 -PKG_VERSION:=5.8.0 +PKG_VERSION:=5.9.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2 -PKG_HASH:=cfcd1f890290f8c8afcc91d9444ad929b9252c16f9ab3f286c50dd3c59dc646e +PKG_HASH:=a25dac94bcdcf2f73316c7f812115ea7a5710580bad892b08a83d00c6b33dacf PKG_BUILD_PARALLEL:=1 PKG_BUILD_DEPENDS:=iptables PKG_LICENSE:=GPL-2.0 diff --git a/package/network/utils/iproute2/patches/115-add-config-xtlibdir.patch b/package/network/utils/iproute2/patches/115-add-config-xtlibdir.patch index 03df7809f7..8702d5fd2d 100644 --- a/package/network/utils/iproute2/patches/115-add-config-xtlibdir.patch +++ b/package/network/utils/iproute2/patches/115-add-config-xtlibdir.patch @@ -1,6 +1,6 @@ --- a/tc/Makefile +++ b/tc/Makefile -@@ -127,6 +127,9 @@ CFLAGS += -DCONFIG_GACT -DCONFIG_GACT_PR +@@ -128,6 +128,9 @@ CFLAGS += -DCONFIG_GACT -DCONFIG_GACT_PR ifneq ($(IPT_LIB_DIR),) CFLAGS += -DIPT_LIB_DIR=\"$(IPT_LIB_DIR)\" endif diff --git a/package/network/utils/iproute2/patches/175-reduce-dynamic-syms.patch b/package/network/utils/iproute2/patches/175-reduce-dynamic-syms.patch index e5d5492a35..da961a183b 100644 --- a/package/network/utils/iproute2/patches/175-reduce-dynamic-syms.patch +++ b/package/network/utils/iproute2/patches/175-reduce-dynamic-syms.patch @@ -9,7 +9,7 @@ endif TCLIB := tc_core.o -@@ -143,7 +143,7 @@ MODDESTDIR := $(DESTDIR)$(LIBDIR)/tc +@@ -144,7 +144,7 @@ MODDESTDIR := $(DESTDIR)$(LIBDIR)/tc all: tc $(TCSO) tc: $(TCOBJ) $(LIBNETLINK) libtc.a @@ -18,7 +18,7 @@ libtc.a: $(TCLIB) $(QUIET_AR)$(AR) rcs $@ $^ -@@ -165,6 +165,7 @@ install: all +@@ -166,6 +166,7 @@ install: all clean: rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.tab.h; \ rm -f emp_ematch.tab.* @@ -26,7 +26,7 @@ q_atm.so: q_atm.c $(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fpic -o q_atm.so q_atm.c -latm -@@ -204,4 +205,15 @@ static-syms.h: $(wildcard *.c) +@@ -205,4 +206,15 @@ static-syms.h: $(wildcard *.c) sed -n '/'$$s'[^ ]* =/{s:.* \([^ ]*'$$s'[^ ]*\) .*:extern char \1[] __attribute__((weak)); if (!strcmp(sym, "\1")) return \1;:;p}' $$files ; \ done > $@