From patchwork Mon Nov 9 07:17:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1396525 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=2opS1zBR; 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=iBb5YS/O; 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 4CV2RL6LR6z9sRR for ; Mon, 9 Nov 2020 18:18:54 +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:MIME-Version:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Message-Id:Date:Subject: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=WzF0u5vxt44V94Z7iJ44689S5DdKiy8C707oo2Izb+k=; b=2opS1zBRYODo4pNpqsuZRbBlE9 dBXGb5zDdlDy7ZhdYxz6OKbm9c16/hwKYKPVYpndEITibArHKCpYX7yke9yZQCnP4fddBvyHBqWpD vOsCR0++hQCncVpP+15O6I4wwfGiVgnw6eQCdDxigGKgP32oJmQPsmji91hleHF/WDPaUGs470zYr RhyH5qkcWxe/Mnqxqg6omDAezzItOYMQQUCPdW8dyztN4qwJzxhv3hGytvNBeSVFkADCy5qdVyZJy rIyo6dukRHd0utha1yaunvt6vasZeB69n+fdnJWW556Koy/zyfAYtu/ctkRaF4cCwqISAVNfg5M4A R8JJOTyw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kc1Qf-0000kt-8c; Mon, 09 Nov 2020 07:17:29 +0000 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kc1Qc-0000kM-CL for openwrt-devel@lists.openwrt.org; Mon, 09 Nov 2020 07:17:27 +0000 Received: by mail-pf1-x434.google.com with SMTP id g7so7268951pfc.2 for ; Sun, 08 Nov 2020 23:17:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=1qnZK2OXuqWkH8a0B+wG2a6cp9cXEcUUIPgn9xiveaU=; b=iBb5YS/OPPJGQRcaDhsX0kabZTUOFVxFsH6Ilj5+Vwm3onkVnZVgjvY1FqFn4cw80q Ey/B4OOMXfrdwH/c2oxg7o1tH2LemW6bHP1Wpm6Bk+L+lUh3/Z8VdGYjPAc7BC1uwEhy wopAztGhqADMlC7vsTqrhbJqNHVkys97WAJ5HuqZbBS/TJkIStpgCIJBbeW76laXqzUL AmXRjEci6LVKyFRWJyeBfNy0Vz7ewp3WPSVKh8PEAbmifA3u9iZc+Nex+xm06NZbttmb gIhnR06YX33ASOFkjIIN4R/C5s6DdFIBNOCZsABqodX8Om5wmdR3Me8b36EFwZ1vOIyz fbtw== 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; bh=1qnZK2OXuqWkH8a0B+wG2a6cp9cXEcUUIPgn9xiveaU=; b=BYLE5sMsTLwF/8ZcMsQJGIQrU+I9awRIU582QZfMRO6hQdBcKde9GzyNYYJtDMhthc bpxmB1RDIvz+7xYQ52znVk6Lr7NSp53kOXZyHoJLB3KLXDxT9Mw48evuBY1PB8I86z4w 9Zz0XC7pCoA5u4AflWPWak3oLNCt1GL6aFgjMGiv8GhwxwJInFFEIkh829kXL2WkkmtQ /vkjprq1haTd4ow1JTAoFi4/ROcqhGfAU4F3CfG4fKPuJC6DI2ZaJr/E0dNa05CctvK0 rK8Js4J0swc11tMDIYFxGA4MrVx2LQ3GkOb6PQd9gPzquzf3xdDR8DJ2baC7IL7KkanO EPcw== X-Gm-Message-State: AOAM5312h3o4b/y3m6wRRlUciEa6vyjS9h3Si+/VnCT5PnEjBBkSe/XA HNdPHSHXt/aKhwOVp53I5lmj5TZxTelKLw== X-Google-Smtp-Source: ABdhPJyy+Qv/t5gDURD/V3BUY8UoCcEnZ/tAlFJIeUUVOVeIsCrbTF+bj7f8WPOhhmog+bPMGM+gsA== X-Received: by 2002:a17:90a:470f:: with SMTP id h15mr11206918pjg.185.1604906236732; Sun, 08 Nov 2020 23:17:16 -0800 (PST) Received: from DESKTOP-VIRSTQA.lan ([2001:470:1f05:79e:6c6a:da96:40ba:c749]) by smtp.gmail.com with ESMTPSA id q16sm9831440pfj.117.2020.11.08.23.17.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 23:17:16 -0800 (PST) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Subject: [PATCH] libnetfilter-queue: update to 1.0.5 Date: Sun, 8 Nov 2020 23:17:14 -0800 Message-Id: <20201109071714.30206-1-rosenp@gmail.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201109_021726_534738_55A96B0B X-CRM114-Status: GOOD ( 14.83 ) 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 [2607:f8b0:4864:20:0:0:0:434 listed in] [list.dnswl.org] -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_AU Message has a valid DKIM or DK signature from author's domain -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 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: , MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Switch to normal tarballs for simplicity. Removed upstream patch. Fixed license information. Signed-off-by: Rosen Penev --- package/libs/libnetfilter-queue/Makefile | 18 +-- .../patches/100-checksum_computation.patch | 113 ------------------ 2 files changed, 9 insertions(+), 122 deletions(-) delete mode 100644 package/libs/libnetfilter-queue/patches/100-checksum_computation.patch diff --git a/package/libs/libnetfilter-queue/Makefile b/package/libs/libnetfilter-queue/Makefile index 38f148ef07..01ce1f80d1 100644 --- a/package/libs/libnetfilter-queue/Makefile +++ b/package/libs/libnetfilter-queue/Makefile @@ -8,18 +8,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libnetfilter_queue -PKG_RELEASE:=2 +PKG_VERSION:=1.0.5 +PKG_RELEASE:=1 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL=https://git.netfilter.org/libnetfilter_queue -PKG_SOURCE_DATE:=2017-06-27 -PKG_SOURCE_VERSION:=601abd1c71ccdf90753cf294c120ad43fb25dc54 -PKG_MIRROR_HASH:=283b99cfe5856dc87fd6bab8f78c0c59b72462d6b4f2b13111f928cf33020eb3 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=https://www.netfilter.org/projects/libnetfilter_queue/files +PKG_HASH:=f9ff3c11305d6e03d81405957bdc11aea18e0d315c3e3f48da53a24ba251b9f5 -PKG_FIXUP:=autoreconf -PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE:=GPL-2.0-or-later +PKG_LICENSE_FILES:=COPYING PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk @@ -28,7 +28,7 @@ define Package/libnetfilter-queue CATEGORY:=Libraries DEPENDS:=+libmnl +libnfnetlink TITLE:=Userspace API to packets queued by kernel packet filter - URL:=http://www.netfilter.org/projects/libnetfilter_queue/ + URL:=https://www.netfilter.org/projects/libnetfilter_queue/ ABI_VERSION:=1 endef diff --git a/package/libs/libnetfilter-queue/patches/100-checksum_computation.patch b/package/libs/libnetfilter-queue/patches/100-checksum_computation.patch deleted file mode 100644 index 92e750d510..0000000000 --- a/package/libs/libnetfilter-queue/patches/100-checksum_computation.patch +++ /dev/null @@ -1,113 +0,0 @@ ---- a/src/extra/checksum.c -+++ b/src/extra/checksum.c -@@ -11,6 +11,7 @@ - - #include - #include -+#include - #include - #include - #include -@@ -26,8 +27,13 @@ uint16_t nfq_checksum(uint32_t sum, uint - sum += *buf++; - size -= sizeof(uint16_t); - } -- if (size) -- sum += *(uint8_t *)buf; -+ if (size) { -+#if __BYTE_ORDER == __BIG_ENDIAN -+ sum += (uint16_t)*(uint8_t *)buf << 8; -+#else -+ sum += (uint16_t)*(uint8_t *)buf; -+#endif -+ } - - sum = (sum >> 16) + (sum & 0xffff); - sum += (sum >>16); -@@ -35,7 +41,7 @@ uint16_t nfq_checksum(uint32_t sum, uint - return (uint16_t)(~sum); - } - --uint16_t nfq_checksum_tcpudp_ipv4(struct iphdr *iph) -+uint16_t nfq_checksum_tcpudp_ipv4(struct iphdr *iph, uint16_t protocol_id) - { - uint32_t sum = 0; - uint32_t iph_len = iph->ihl*4; -@@ -46,13 +52,13 @@ uint16_t nfq_checksum_tcpudp_ipv4(struct - sum += (iph->saddr) & 0xFFFF; - sum += (iph->daddr >> 16) & 0xFFFF; - sum += (iph->daddr) & 0xFFFF; -- sum += htons(IPPROTO_TCP); -+ sum += htons(protocol_id); - sum += htons(len); - - return nfq_checksum(sum, (uint16_t *)payload, len); - } - --uint16_t nfq_checksum_tcpudp_ipv6(struct ip6_hdr *ip6h, void *transport_hdr) -+uint16_t nfq_checksum_tcpudp_ipv6(struct ip6_hdr *ip6h, void *transport_hdr, uint16_t protocol_id) - { - uint32_t sum = 0; - uint32_t hdr_len = (uint32_t *)transport_hdr - (uint32_t *)ip6h; -@@ -68,7 +74,7 @@ uint16_t nfq_checksum_tcpudp_ipv6(struct - sum += (ip6h->ip6_dst.s6_addr16[i] >> 16) & 0xFFFF; - sum += (ip6h->ip6_dst.s6_addr16[i]) & 0xFFFF; - } -- sum += htons(IPPROTO_TCP); -+ sum += htons(protocol_id); - sum += htons(ip6h->ip6_plen); - - return nfq_checksum(sum, (uint16_t *)payload, len); ---- a/src/extra/tcp.c -+++ b/src/extra/tcp.c -@@ -96,7 +96,7 @@ nfq_tcp_compute_checksum_ipv4(struct tcp - { - /* checksum field in header needs to be zero for calculation. */ - tcph->check = 0; -- tcph->check = nfq_checksum_tcpudp_ipv4(iph); -+ tcph->check = nfq_checksum_tcpudp_ipv4(iph, IPPROTO_TCP); - } - EXPORT_SYMBOL(nfq_tcp_compute_checksum_ipv4); - -@@ -110,7 +110,7 @@ nfq_tcp_compute_checksum_ipv6(struct tcp - { - /* checksum field in header needs to be zero for calculation. */ - tcph->check = 0; -- tcph->check = nfq_checksum_tcpudp_ipv6(ip6h, tcph); -+ tcph->check = nfq_checksum_tcpudp_ipv6(ip6h, tcph, IPPROTO_TCP); - } - EXPORT_SYMBOL(nfq_tcp_compute_checksum_ipv6); - ---- a/src/extra/udp.c -+++ b/src/extra/udp.c -@@ -96,7 +96,7 @@ nfq_udp_compute_checksum_ipv4(struct udp - { - /* checksum field in header needs to be zero for calculation. */ - udph->check = 0; -- udph->check = nfq_checksum_tcpudp_ipv4(iph); -+ udph->check = nfq_checksum_tcpudp_ipv4(iph, IPPROTO_UDP); - } - EXPORT_SYMBOL(nfq_udp_compute_checksum_ipv4); - -@@ -115,7 +115,7 @@ nfq_udp_compute_checksum_ipv6(struct udp - { - /* checksum field in header needs to be zero for calculation. */ - udph->check = 0; -- udph->check = nfq_checksum_tcpudp_ipv6(ip6h, udph); -+ udph->check = nfq_checksum_tcpudp_ipv6(ip6h, udph, IPPROTO_UDP); - } - EXPORT_SYMBOL(nfq_udp_compute_checksum_ipv6); - ---- a/src/internal.h -+++ b/src/internal.h -@@ -15,8 +15,8 @@ struct iphdr; - struct ip6_hdr; - - uint16_t nfq_checksum(uint32_t sum, uint16_t *buf, int size); --uint16_t nfq_checksum_tcpudp_ipv4(struct iphdr *iph); --uint16_t nfq_checksum_tcpudp_ipv6(struct ip6_hdr *ip6h, void *transport_hdr); -+uint16_t nfq_checksum_tcpudp_ipv4(struct iphdr *iph, uint16_t protocol_id); -+uint16_t nfq_checksum_tcpudp_ipv6(struct ip6_hdr *ip6h, void *transport_hdr, uint16_t protocol_id); - - struct pkt_buff { - uint8_t *mac_header;