From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 13 Jan 2023 11:26:12 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pGHGG-00AgFx-V1 for lore@lore.pengutronix.de; Fri, 13 Jan 2023 11:26:12 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1pGHGF-0001bt-3U; Fri, 13 Jan 2023 11:26:11 +0100 Received: from mail-am0eur02on2052.outbound.protection.outlook.com ([40.107.247.52] helo=EUR02-AM0-obe.outbound.protection.outlook.com) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pGHFl-0001bB-Oe for ptxdist@pengutronix.de; Fri, 13 Jan 2023 11:25:42 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YkLDEntjIbSgT71usBDALqYdq4R/awi92gMKo0X9d0yTLpIALkZznZBs612aIbB09lNvgf/0ZkomtCfIBQHC/7wlHIBY4HLy8CfRvL5Mrubx3Z8CNea68MHCRvDhiMyiZ0tR6miIJGBnIKJKymvpQDZUqfdbBtksRYWzZHGqbqndwh8kJV8LTL1aBfUvlt0x6dKclNrOsPRPQAH3nZqHj9FuwsmkEDb2n6EZh2FbikIZjMViB1yzmZE7EvTJKTM725ys/fe60PVdGMZzjHSgCqtDOPFQ8ECyyCuVrtnQFocrVfNRXWDFMdNatldrbvWNzteD+ZNhwQbKBhvN1uASdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jP8EI/BLltKJJTzKJ27KNT3+NpbpRtj0ach6kXfm3f4=; b=C78FZHVFE76f1JfcTYcB0ZkcmupZVJDjIf6sshbTJ7SHeopZPldNnWpem5ugYcafRhrn2dGNst81XO5TEJ5EyRk21xYTCHRMeMdNHHZVk2NLorl8baK5CNA5oQG+sifMTUGGY04KFD7eeg/ldCuT6RwZl5/guujoB+75jCSNMnYUfefVdy00zGgyvzpkiZmZSaGM1eusUXCqWqVPq8vlVwjDC5jkvPBNopWSzcvWMMGOji0H/pOGg9fkWPcok435/0dn1jlxyI2Vzw5Bo+mOUI2ly5IWMLAgnCzhtVuf3shODIJEOphRQYJouBwBeuC6Lnf9fg+upy3Ehw/peSuI6A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=t2data.com; dmarc=pass action=none header.from=t2data.com; dkim=pass header.d=t2data.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=t2datacom.onmicrosoft.com; s=selector1-t2datacom-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jP8EI/BLltKJJTzKJ27KNT3+NpbpRtj0ach6kXfm3f4=; b=fY1Vj7HVzIJLg6UOuobwf2iFhqVDqqxS32mEQvtQpk5UNNtex6QiUpDYrNHFVja7gfgWoHy3SNzsUA/uaVtdzoIBX3CqKLmgmv2xNnBbNLau5u36xbjWZP+uL6mOp5Vd7YPU+owqQFybvouw53YTjO0NS66AKJBKvSg1bIzYmJc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=t2data.com; Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) by PRAP251MB0707.EURP251.PROD.OUTLOOK.COM (2603:10a6:102:298::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5986.18; Fri, 13 Jan 2023 10:25:35 +0000 Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::d8cf:bdbe:3526:aa50]) by DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::d8cf:bdbe:3526:aa50%6]) with mapi id 15.20.5986.018; Fri, 13 Jan 2023 10:25:35 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Fri, 13 Jan 2023 11:25:12 +0100 Message-Id: <20230113102512.4181930-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.34.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: GV3P280CA0070.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:a::25) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9P251MB0618:EE_|PRAP251MB0707:EE_ X-MS-Office365-Filtering-Correlation-Id: 7ffe5976-f65a-4fcc-3771-08daf55081ae X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OvXLX5EpbpsNoLObXAtOHC98Vg5+wRvhiZYip4t0h/HJBfUXw+UHq8TO2CJ1FJlT1cmOkrB20f+wqjXZ7pls31HYBZMjWqk9QYUuOL6QuYC424JfvxG/wYlF8BAOobmoCH8Xhepg1SGxcbFOubZ4hUp0cb+DCV8aXXV3NZ7kmv7e+oD37J/JGDAJeVxyCJwp1mbBvjIQSzxCGtzo9nCtRAxovjfH0Pxo4zfaYbICeZPxKJaVJ1w0AbjYRH/IlHO25Ic3NBRGcvP1OCyR2uRevmJw+/MfnDbdzB0K/Ax4VlHRrGuYfsUNPFNwG2nDAmScVhs45Hp1ibFaq7YuA52HfVaXI+yZ9lUVyabUJ3RUSShhcre/AYRudRA3ufXVfuy/A0jK6molc19nnSSeZqJl/r56ez9cPaRUnbIlNyQEoHYy5td/UTfe8h2eZd95t7xxsGWU0hG1iSq6hI5XriqMaJzh/LwtDpyxaqTaITESvgFVF/N2ouAkFXm3vtUQmf31W1OPreESoxYCtdJJ+Lxuh54mlJUFZfc5mamUVuUHd+66bXNij9NqrQh0fb37RZQ6M5fR4yC6Ub7Avh8ZoSI8Eb68/MoEs+2cpKexrDSL1hFMztJQBWY/6mnWv1U4O9JGLp5ECwDe9xwDZnSY88lIlc/zcfro82K7izrNwor39/4staEsXMdRsfrNVRwOyJUx+QVXaOtw76OueF6cykzrpQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9P251MB0618.EURP251.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230022)(376002)(346002)(39830400003)(396003)(366004)(136003)(451199015)(36756003)(86362001)(8676002)(66946007)(83380400001)(66556008)(41300700001)(66476007)(38350700002)(38100700002)(6916009)(52116002)(6506007)(26005)(6486002)(186003)(966005)(6666004)(5660300002)(8936002)(316002)(478600001)(2906002)(44832011)(6512007)(2616005)(1076003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?604wpM/IQ+fLkZsBbBOUayBpl7AQxr8k8H2wdzoGG2qxyC7f21jBjJuC/xCt?= =?us-ascii?Q?Dy6dBI7Lzb1TXAvMTcs6jbIqSxHnMrjt6N/0VgVlX1OYPzsLv6Z/F5XB0z21?= =?us-ascii?Q?CBN1WAxJVidaneeCePGzNOa8IH4THpE3IteveWfkUMquLQAOXnqQMo7v2Dpw?= =?us-ascii?Q?hiDT0dgdBztOm0P3XcvSI4TmWSWrnih3rKQRciWc6PT89g2W/lLyE+qhsS7c?= =?us-ascii?Q?2W9fu+jqMifPGrVoehhnLPtsVUMzdnJskGGTpgAqlZ7u5BMgR6nt3ELm/WyI?= =?us-ascii?Q?7EMlrhKXlfYytYmNImd2HCRF0u3zc4WxFTUFWd4BeA+Q1hqMG9xzqDJtWcrU?= =?us-ascii?Q?m8ic/QyTE8izMiZ0PSrKlVwSEUN9BKlTBnYVpiWJpXP/xIDdZiNqqUMvJZyW?= =?us-ascii?Q?jSRO23APnsTUbOIZ+sAcg/8gSXwoBUMkPNRdbKOtd7AKedtAK3sNPbqp8iQ+?= =?us-ascii?Q?Ynoiuf2392RrcNPWca8tyE1QurKmFGo3c6tvUjGkKn8IH4pD62S7VSfYeJnJ?= =?us-ascii?Q?E67TEt1W8Mk/u2HvKyRhIBE0bbq/D24PsYCPBMPebfWKtXebWT8zOvFDMf0j?= =?us-ascii?Q?wk6Q9sf9DOrV1SUU0DwzynZhgUfkbXubgO6QolP8M9v4N3Qeach5dYB+hoKW?= =?us-ascii?Q?afqdjFPevaIuOy+r++xAjfo+eDOxdIrH7IsOR3ASg+DQG/ul2ihE5aQ9RDWl?= =?us-ascii?Q?Dd0X+9HBdWrxXnwnEvP56PEXqhFlswUoO8Pgz0oJ2osQu0mvWCu1Uc0153BC?= =?us-ascii?Q?kydQdob7VAM2w52/q4mFd0Enoxf0i5iTxP0CitdLwCL8BRuIlwf7lo2+eX+H?= =?us-ascii?Q?QjdX1gLyEdz/FVf8N6Vba7dsOtJWPGS4b4P5TEwWb0chvI5U0te7p/Gi3/R9?= =?us-ascii?Q?/18RS0UMcyEC46Dg8J6FL/zSYLNmzVKf+VdFU0QSOob7RNDW/QALH7YmgKW7?= =?us-ascii?Q?sBF2R+8ZS2ifEw3PaipObr4+0fF/mJJ2FKegPogBBw//bgU2TxvoHTHhc7Xp?= =?us-ascii?Q?BdB7qjo1rrVe60ojrSlrxiAjNQMBrDlc38/ExFwqCeEC1m/ZueOqyRAmAp7m?= =?us-ascii?Q?KdHiebBrWZmAL76YV1vpfxgjMYqedmYY53IQaaIGYNxih3vkhzWu+TAe2ua4?= =?us-ascii?Q?v0aR1iI5SBI7gmE8Iv4Iy2ZILd4owTbbzOswqlNxTjS4Kv+U8AlgO9WdeMT1?= =?us-ascii?Q?ZFmbN4lO7OGh8ku6mjwvLYOoywdKB4tEnpOQNZKE4cRhQPC+SoQvgM551S0O?= =?us-ascii?Q?pIsBPo948E89o+AhNWHdPWqz5+UJvI+hpnY6iggGFNXtG5k19zJu3IAwaqms?= =?us-ascii?Q?5QOooqEgoymo2ntbk6PwZReC5Rk+y3LaJdMt7tyr05l0DlbYtMqtjz4quQs3?= =?us-ascii?Q?uNPtgDV9d3Hw48T9dtugKnFywIs/63TngctrKODZvrvboY/pjVb34zRQkt5L?= =?us-ascii?Q?WY+moFVFRfxmj24C4r54tEWB491jRw0ax1Ae1bWhwvu5cfDPlOpKLt9pgXVw?= =?us-ascii?Q?utIKRTkVuNwX9PTi+aM6amsBwf97CwozNoUsyWcbQF2hNXmREI8KPQw0bVkw?= =?us-ascii?Q?Ontm+HttCkUvClWqFySbL72IHGtyz3Njtw3W1s9T1/gI4JTpBOIWeUfKeYoq?= =?us-ascii?Q?Rg=3D=3D?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7ffe5976-f65a-4fcc-3771-08daf55081ae X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jan 2023 10:25:34.9932 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 27928da5-aacd-4ba1-9566-c748a6863e6c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Dle+ma6F1ualmcrX0YrzUI97grGLjqjvItmgul93KHrC3ZppXBLyci8OdGslwxg5XR/sqlvI2HR+tFd3XBYDC6svoRYNv8apLDxu9uNScoE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PRAP251MB0707 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] iptables: Version bump. 1.8.8 -> 1.8.9 plus cleanups. X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Afaics, nothing overly exciting. Some behind the scenes work with mergeing extensions etc. https://www.netfilter.org/projects/iptables/files/changes-iptables-1.8.9.txt * Compression format for tarballs changed to xz. * Be explicit about new configure option and disable it. * Move for loops for installing libraries into an install_glob. install_copy was duplicating links as files, resulting in duplication on target. Plus, less code bloat. * Remove a bunch of rather obvious comments. * Minor whitespace fixes. * Mark termination of larger encompassing endifs Signed-off-by: Christian Melki --- rules/iptables.make | 42 +++++++++++------------------------------- 1 file changed, 11 insertions(+), 31 deletions(-) diff --git a/rules/iptables.make b/rules/iptables.make index 9440a6a82..b9dd5d90b 100644 --- a/rules/iptables.make +++ b/rules/iptables.make @@ -19,10 +19,10 @@ PACKAGES-$(PTXCONF_IPTABLES) += iptables # # Paths and names # -IPTABLES_VERSION := 1.8.8 -IPTABLES_MD5 := 93da73116b7934a8da940b95a5f3e590 +IPTABLES_VERSION := 1.8.9 +IPTABLES_MD5 := ffa00f68d63e723c21b8a091c5c0271b IPTABLES := iptables-$(IPTABLES_VERSION) -IPTABLES_SUFFIX := tar.bz2 +IPTABLES_SUFFIX := tar.xz IPTABLES_URL := http://ftp.netfilter.org/pub/iptables/$(IPTABLES).$(IPTABLES_SUFFIX) IPTABLES_SOURCE := $(SRCDIR)/$(IPTABLES).$(IPTABLES_SUFFIX) IPTABLES_DIR := $(BUILDDIR)/$(IPTABLES) @@ -47,6 +47,7 @@ IPTABLES_CONF_OPT := \ --disable-nfsynproxy \ --$(call ptx/endis, PTXCONF_IPTABLES_NFTABLES_COMPAT)-nftables \ --disable-connlabel \ + --disable-profiling \ --with-kernel=$(KERNEL_HEADERS_DIR) \ --with-xtlibdir=/usr/$(CROSS_LIB_DIR) @@ -74,61 +75,44 @@ $(STATEDIR)/iptables.targetinstall: @$(call install_fixup, iptables,AUTHOR,"Robert Schwebel ") @$(call install_fixup, iptables,DESCRIPTION,missing) -# # install the basic libraries @$(call install_lib, iptables, 0, 0, 0644, libxtables) ifdef PTXCONF_IPTABLES_LIBIPQ @$(call install_lib, iptables, 0, 0, 0644, libipq) endif - - @cd $(IPTABLES_PKGDIR)/usr/$(CROSS_LIB_DIR) && \ - for file in libxt_*.so; do \ - $(call install_copy, iptables, 0, 0, 0644, -,\ - /usr/$(CROSS_LIB_DIR)/$$file); \ - done + @$(call install_glob, iptables, 0, 0, -, /usr/$(CROSS_LIB_DIR), */libxt_*.so,) ifdef PTXCONF_IPTABLES_IPV6 -# # install the IPv6 relevant shared libraries - @cd $(IPTABLES_PKGDIR)/usr/$(CROSS_LIB_DIR) && \ - for file in libip6t_*.so; do \ - $(call install_copy, iptables, 0, 0, 0644, -, \ - /usr/$(CROSS_LIB_DIR)/$$file); \ - done + @$(call install_glob, iptables, 0, 0, -, /usr/$(CROSS_LIB_DIR), */libip6t_*.so,) @$(call install_lib, iptables, 0, 0, 0644, libip6tc) endif ifdef PTXCONF_IPTABLES_IPV4 -# # install the IPv4 relevant shared libraries - @cd $(IPTABLES_PKGDIR)/usr/$(CROSS_LIB_DIR) && \ - for file in libipt_*.so; do \ - $(call install_copy, iptables, 0, 0, 0644, -,\ - /usr/$(CROSS_LIB_DIR)/$$file); \ - done + @$(call install_glob, iptables, 0, 0, -, /usr/$(CROSS_LIB_DIR), */libipt_*.so,) @$(call install_lib, iptables, 0, 0, 0644, libip4tc) endif ifdef PTXCONF_IPTABLES_INSTALL_TOOLS @$(call install_copy, iptables, 0, 0, 0755, -, /usr/sbin/xtables-legacy-multi) @$(call install_link, iptables, ../sbin/xtables-legacy-multi, /usr/bin/iptables-xml) + ifdef PTXCONF_IPTABLES_LIBNFNETLINK @$(call install_copy, iptables, 0, 0, 0755, -, /usr/sbin/nfnl_osf) endif + ifdef PTXCONF_IPTABLES_IPV6 -# # IPv6 part @$(call install_link, iptables, xtables-legacy-multi, /usr/sbin/ip6tables) @$(call install_link, iptables, xtables-legacy-multi, /usr/sbin/ip6tables-restore) @$(call install_link, iptables, xtables-legacy-multi, /usr/sbin/ip6tables-save) endif ifdef PTXCONF_IPTABLES_IPV4 -# # IPv4 part @$(call install_link, iptables, xtables-legacy-multi, /usr/sbin/iptables) @$(call install_link, iptables, xtables-legacy-multi, /usr/sbin/iptables-restore) @$(call install_link, iptables, xtables-legacy-multi, /usr/sbin/iptables-save) endif ifdef PTXCONF_IPTABLES_IPV6_SYSTEMD_UNIT -# # IPv6 systemd service unit part @$(call install_alternative, iptables, 0, 0, 0644, /etc/iptables/rules.v6) @$(call install_alternative, iptables, 0, 0, 0755, /usr/sbin/ip6tables-flush) @$(call install_alternative, iptables, 0, 0, 0644, \ @@ -138,7 +122,6 @@ ifdef PTXCONF_IPTABLES_IPV6_SYSTEMD_UNIT endif ifdef PTXCONF_IPTABLES_IPV4_SYSTEMD_UNIT -# # IPv4 systemd service unit part @$(call install_alternative, iptables, 0, 0, 0644, /etc/iptables/rules.v4) @$(call install_alternative, iptables, 0, 0, 0755, /usr/sbin/iptables-flush) @$(call install_alternative, iptables, 0, 0, 0644, \ @@ -147,25 +130,22 @@ ifdef PTXCONF_IPTABLES_IPV4_SYSTEMD_UNIT /usr/lib/systemd/system/multi-user.target.wants/iptables.service) endif -endif +endif # PTXCONF_IPTABLES_INSTALL_TOOLS ifdef PTXCONF_IPTABLES_INSTALL_IPTABLES_APPLY @$(call install_copy, iptables, 0, 0, 0755, -, /usr/sbin/iptables-apply) endif -# # compatibility layer for nftables ifdef PTXCONF_IPTABLES_NFTABLES_COMPAT @$(call install_copy, iptables, 0, 0, 0755, -, /usr/sbin/xtables-nft-multi) ifdef PTXCONF_IPTABLES_IPV4 -# # IPv4 part @$(call install_link, iptables, xtables-nft-multi, /usr/sbin/iptables-nft) @$(call install_link, iptables, xtables-nft-multi, /usr/sbin/iptables-nft-save) @$(call install_link, iptables, xtables-nft-multi, /usr/sbin/iptables-nft-restore) endif ifdef PTXCONF_IPTABLES_IPV6 -# # IPv6 part @$(call install_link, iptables, xtables-nft-multi, /usr/sbin/ip6tables-nft) @$(call install_link, iptables, xtables-nft-multi, /usr/sbin/ip6tables-nft-save) @$(call install_link, iptables, xtables-nft-multi, /usr/sbin/ip6tables-nft-restore) @@ -173,7 +153,7 @@ endif @$(call install_link, iptables, xtables-nft-multi, /usr/sbin/arptables-nft) @$(call install_link, iptables, xtables-nft-multi, /usr/sbin/ebtables-nft) -endif +endif # PTXCONF_IPTABLES_NFTABLES_COMPAT @$(call install_finish, iptables) -- 2.34.1