From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 04 May 2026 14:54:59 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1wJspA-000tnC-0i for lore@lore.pengutronix.de; Mon, 04 May 2026 14:54:59 +0200 Received: from [127.0.0.1] (helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1wJsp9-00084n-B3; Mon, 04 May 2026 14:54:59 +0200 Received: from mail-germanywestcentralazon11022120.outbound.protection.outlook.com ([40.107.149.120] helo=FR5P281CU006.outbound.protection.outlook.com) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1wJsnm-0006wb-OE for ptxdist@pengutronix.de; Mon, 04 May 2026 14:53:35 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=P6zJ6ueC1qvMKPnUWIRQv2X31KR3Btf1Q+uGszJomU5ve4EgaSUDrZCm3eH3MdNY7pQ9ypu3QRvvjwCDbS34mL03mk/Kt3mZwaDCp6fO0CR5V6cGpy8lbjbxWcsA4nfRpCrhc5e+HGLph3v+qvxBA4KxeQaKoG+VE0N5WI9VHQe/LxOo2oQkBsfTVT66x0QuDmHgN7c4DZ//kuXvuRO7vnZdPnqQQRT2xRowqEBxvgy/ueltriUd1vgdj3j9L9oZjoY6TnlVay6DjZJIhjASpPrgbXjXPcNNnDSdxiBUQJBbc6RWkC1vecjesDBAQFWFzXaL70VmzPme37UDlATRtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=gJSvYH7omtEC3zUK22Vvw2pfDzVZivdAnWLu2gFmark=; b=L0WmGE6jcfwT9QrkZy10lnoh6Ic+YJ+2FbJtAgltj5/I8ky2qnEwq5AntYCcuu9BIkOEFw8s3mNpxPkYtZ6iUGbj5wzQ3CVx9breweMrYLeqUaVrZXbc47ZPFk44vHxnrp5oOoQFgdYut9gZAuavH+IeYfURq5rZ8KOXPlV5oLMrP94Ne0w2Qf0yRxN4Lz9qENFBGTzwHVfN2vKyd42FYIxOtkbnjN+9XqzK0ShCHh1EQmJXdoGkwUjQeM6+kCxwfk/5kyUIPJq5jIHSZ20FyFdoajXsuCYICe7zeZK0xe61fp4BOvp2oGwoY1+iJfMkNOTGgwG1rzhxpn3JVE5eWA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=eckelmann.de; dmarc=pass action=none header.from=eckelmann.de; dkim=pass header.d=eckelmann.de; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eckelmann.de; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gJSvYH7omtEC3zUK22Vvw2pfDzVZivdAnWLu2gFmark=; b=cLL8cojAI4u7vTWrByDrqCpdMD/6hWjnt7AVGC31RvcZreSeKelN1RC+ZuGVq89sZjrroWF233FYP8iBkwN2Nfx7TNBmZ3fwUNKKFWX6Z5Wb3Gk8IbIah18523u7MqfAZSEuvx0LFN0PaIEHvE9w2toH7JfktEtd6jT+hjMTOOQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=eckelmann.de; Received: from FR4P281MB3510.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:da::13) by FR4P281MB4735.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:143::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9870.25; Mon, 4 May 2026 12:53:33 +0000 Received: from FR4P281MB3510.DEUP281.PROD.OUTLOOK.COM ([fe80::b702:622d:f947:9d55]) by FR4P281MB3510.DEUP281.PROD.OUTLOOK.COM ([fe80::b702:622d:f947:9d55%6]) with mapi id 15.20.9870.023; Mon, 4 May 2026 12:53:33 +0000 From: Thorsten Scherer To: ptxdist@pengutronix.de Date: Mon, 4 May 2026 14:53:31 +0200 Message-ID: <20260504125331.64700-1-t.scherer@eckelmann.de> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260504121331.57729-1-t.scherer@eckelmann.de> References: <20260504121331.57729-1-t.scherer@eckelmann.de> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: FRYP281CA0014.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10::24) To FR4P281MB3510.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:da::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: FR4P281MB3510:EE_|FR4P281MB4735:EE_ X-MS-Office365-Filtering-Correlation-Id: ea678724-2837-4824-6aef-08dea9dc263f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|366016|376014|10070799003|18002099003|22082099003|56012099003; X-Microsoft-Antispam-Message-Info: PtojM11/Mf3hTWd60rTRe79c04uBjumnV9TfXqx2gosS4n+57wpwYNiq/SR2WThXz0yWdMSsfxsGlCH9hE3NbBmnAxZCNLpKM/NzsXhP+Hhbhj/+6c1VpvSOVcmtmFQt0Iq3fvZQb5oMpJUFKFrXc4hZfAJ6tWkIbbiLT3qv6HBxJnah9MCZoUs3IcszOH+AxMyyqeVtZQ2ibNaYTPboBFwMEVRnAKzlo2HuTgVM6FqVV/WrtRWO+VLULFyEYEvxp13aeuSR7DqAA4CorOZ3kpa8YFXBG1iB1rqYUpekY7/iJOqidjbLPEy4Ko4WUjD4bzzP/EM2moMgpLTGcpD5DfOE+DnMRkGxb8Z9HF91TaHNftc+cAH64M4eB9dr+MW0y2fJzn1oUpaxK3f1i66oFnCTDGgtMUbeClg4KlbKloK8mQgtqxwfYVBx2XmmTSasrw2TEK6K6wKLv2m3wEj1glJk8RhjKXl8dZ/iTZ5oTtseSxx69X8hPKBfG4Y4kJ1buXBlEucrw/NzVXdbhEj1AQy7n5TsG4zRA8A7gP0QJAlDT1JfGiO6Hr1NKiH+adaVgJQgXV/1PtUU2eEOwSJNuRF6of+7LlGA+Skqn+aEde5ijj1LO1NSPNL1KnimOAAuXG3HBOZmE7q3QRGYBX1gp8M2gucA7CzaNnUR9hWR7s6JzIgvR3DjEKy/Qu3+uF/7 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:FR4P281MB3510.DEUP281.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014)(10070799003)(18002099003)(22082099003)(56012099003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/AjAGmRHuIL4q7gxjT/ayvpLgl6/II/B6ibl6kMZcwaVTMiTQIY0zqGL4Bnt?= =?us-ascii?Q?r14xBBzkSG4kCUbRpkbVh2ePKoTj8S3mb1mmneH91UsO9Bk0mzbgDzAT8mw7?= =?us-ascii?Q?kGSYHZ3+W1wNm2nCFErbjfoKQGpLM7XxKVM3xgNKklum5cyAKihCEB3jbe3h?= =?us-ascii?Q?1IoEyZD4mwyhejHowdwsxAy8k6rmpTCC7Jv6udZPU1f7iudftnhoJI1gVbft?= =?us-ascii?Q?H/UNtD/8tkhZ08fppeAv5LeDqL6PnTuO8wFevXdaLvgylYIqesnwEIMInI5e?= =?us-ascii?Q?LD4UTKneYV7tOLr4GGSLdrMVxXO00d15SNc2BhGCdmx9jJgaGKHsIVmvOhuY?= =?us-ascii?Q?/D+90iy3Q/MPQXKnJ/rugpcXS3BHPRHBxlaSKqOVc9bqezUeqJ0X5kRbs1UV?= =?us-ascii?Q?FyoV43j2LBBMgieORTPydzvzQwnXW+ls2sSViMrUNdrAWvpgswXqcRjR40iD?= =?us-ascii?Q?3b2PsXJfn+Eh5WVgiAX1BJoLQas28alizb+cwA/s5HUSNrNLcD1LZM1TJ0VD?= =?us-ascii?Q?oJ33LKKmTCHo+RUqkow4c44qG/+ma+QalIAjykBybbFSPJUjo7pstiMjWeG+?= =?us-ascii?Q?/X2LDGgkEmduCrknYA/M1YULCKkzrT/2VmObqtHPal3je9MFLO7QEIBgE7/E?= =?us-ascii?Q?T6/pnhbEcaoPRl1oXVH7szlvxBZI5aNTBWoP+4XNJZCYbNX+Uu59jFunLPj1?= =?us-ascii?Q?RNpnFXFoYtO/VzJM3iShawQnAvapUKARhgxac5X5zC2lV7+9or3LuEppza2W?= =?us-ascii?Q?eaFZyyd8bTfkN17BnM8ZzTqAnt4pQvNUIsUrr15JfQLhV9MlGrUzcMmbvYau?= =?us-ascii?Q?IDyFzpE1dLsARzYvLZqZR8sxJCcXw18/aFkWmY8KW74P5nk6+93wNd5LlQtw?= =?us-ascii?Q?gOIzyG32zMeczaN3c7IJN+p0CQ9DOCR+u9hcd+/t2oW4n4Tkkc6SZr4jCc/L?= =?us-ascii?Q?PAahgqd4og0pHE5JaOLYgph/1/wBELUTnZZcjNQU54VpGHV1YgRXw7BAgQTz?= =?us-ascii?Q?XMh+GpXGgRTPdAxatrohnEWxrc9XsXYYBY5I5j1dansUqyEMkxXXw157qeH9?= =?us-ascii?Q?3H/HmBnmbaM4KSr61vQQ6rvSW7swY6SfNSzgUS6+zC/u+ELKfVU8e6k1/pmR?= =?us-ascii?Q?KL9edFOOH5XELGZ5odZHl0jNWImAQU5EkMAwg9Cs1+vaw+CsmCJaO2kK9g+x?= =?us-ascii?Q?PI7y6z0P7FjXD2DVJpvizOM8YoE/LEM46HTNnXawrihb+Q8/CmlAdsU/zYfa?= =?us-ascii?Q?MgScZ2tQ//3rgYJtOIVkc9j3yBLWf2tNS9nMuRqdRySMwugX2dP51w+Pbvcb?= =?us-ascii?Q?k2owpkLHcyljNeUiptBpiLs92NronQXZ+RUyJfp/mZHnov0hu7CIA0TP+FnK?= =?us-ascii?Q?w3by7wnpkocaFkPbdB4tHCcUomcW+/6RxamNE9eaGcW3GzrLrCZLYtsjwleZ?= =?us-ascii?Q?4001Hd1zVF17NWT04b7OrEdaLr/nrUqT5DmhkfH8Dbau6sfCMgv7O5124diP?= =?us-ascii?Q?nPsbfH143+rO4u0UfaylqPzP5TwO/gF3YKJO4XQTR7tSeYRnSxCEAcQRIyCH?= =?us-ascii?Q?QgYzScNqcomePAqvYRQC4TaJxcfrRBNgLCwk767MLGxDc+fIGIpOf3CU3Zho?= =?us-ascii?Q?cutbH9TdRXJtiBoM1e9PNRTvfwkqHvwKmL2EWFawqaHGBWHbeoO9uI4Qi9Cr?= =?us-ascii?Q?v68KmBqFhPXO5mZmFarP2e9RNuSwsfsGayJjiT98RBMb15Z5SPuhOK4AgGlh?= =?us-ascii?Q?ArHjsOpTWRGS9zidA/fLreyUVxzqnujTIoY2q4UKCD1axUHkXdJood6SXodU?= X-MS-Exchange-AntiSpam-MessageData-1: djooXXM+hwlCGw== X-OriginatorOrg: eckelmann.de X-MS-Exchange-CrossTenant-Network-Message-Id: ea678724-2837-4824-6aef-08dea9dc263f X-MS-Exchange-CrossTenant-AuthSource: FR4P281MB3510.DEUP281.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2026 12:53:33.3894 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 62e24f58-823c-4d73-8ff2-db0a5f20156c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: xdY1mhOJLohMYQYihf2D8CtmfRHfzeoK8L2msZ/tPf0Uzd0QEqtVhxN4DMhopTX1T9OfMgQcqV1GBziebSLtkg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: FR4P281MB4735 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-102.3 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,USER_IN_WELCOMELIST, USER_IN_WHITELIST autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH 39/42] wireshark: Remove after one year in staging 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 Cc: Thorsten Scherer 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.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Signed-off-by: Thorsten Scherer --- ...1-help_url-add-forgotten-HAVE_EXTCAP.patch | 25 ---- patches/wireshark-2.0.3/series | 4 - rules/wireshark.in | 25 ---- rules/wireshark.make | 120 ------------------ 4 files changed, 174 deletions(-) delete mode 100644 patches/wireshark-2.0.3/0001-help_url-add-forgotten-HAVE_EXTCAP.patch delete mode 100644 patches/wireshark-2.0.3/series delete mode 100644 rules/wireshark.in delete mode 100644 rules/wireshark.make diff --git a/patches/wireshark-2.0.3/0001-help_url-add-forgotten-HAVE_EXTCAP.patch b/patches/wireshark-2.0.3/0001-help_url-add-forgotten-HAVE_EXTCAP.patch deleted file mode 100644 index 01f0714dd759..000000000000 --- a/patches/wireshark-2.0.3/0001-help_url-add-forgotten-HAVE_EXTCAP.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Alexander Aring -Date: Wed, 27 Apr 2016 16:51:08 +0200 -Subject: [PATCH] help_url: add forgotten HAVE_EXTCAP - -Signed-off-by: Alexander Aring ---- - ui/help_url.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/ui/help_url.c b/ui/help_url.c -index 7a2b9a026e1c..144eb9855f4c 100644 ---- a/ui/help_url.c -+++ b/ui/help_url.c -@@ -265,9 +265,11 @@ topic_action_url(topic_action_e action) - case(HELP_EXPERT_INFO_DIALOG): - url = user_guide_url("ChAdvExpert.html"); - break; -+#if HAVE_EXTCAP - case(HELP_EXTCAP_OPTIONS_DIALOG): - url = user_guide_url("ChExtcapOptions.html"); - break; -+#endif - case(HELP_STATS_SUMMARY_DIALOG): - url = user_guide_url("ChStatSummary.html"); - break; diff --git a/patches/wireshark-2.0.3/series b/patches/wireshark-2.0.3/series deleted file mode 100644 index 5c72479f6346..000000000000 --- a/patches/wireshark-2.0.3/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-help_url-add-forgotten-HAVE_EXTCAP.patch -# 71fce02a9deb431a1f0a2c4d041df890 - git-ptx-patches magic diff --git a/rules/wireshark.in b/rules/wireshark.in deleted file mode 100644 index d61f556a8817..000000000000 --- a/rules/wireshark.in +++ /dev/null @@ -1,25 +0,0 @@ -## SECTION=staging -## old section: -### SECTION=networking - -config WIRESHARK - tristate - prompt "tshark (cli of wireshark)" - select LIBC_M - select LIBNL3 - select LIBPCAP - select GLIB - select ZLIB - help - TShark is a network protocol analyzer. It lets you capture packet data - from a live network, or read packets from a previously saved capture - file, either printing a decoded form of those packets to the standard - output or writing the packets to a file. TShark's native capture file - format is libpcap format, which is also the format used by tcpdump and - various other tools. TShark is able to detect, read and write the same - capture files that are supported by Wireshark. The gtk frontend wireshark - can open the capture file and display the content of capture. - - STAGING: remove in PTXdist 2026.03.0 - Unmaintained in PTXdist and fails to build with current toolchains. - Needs updating to the latest version. diff --git a/rules/wireshark.make b/rules/wireshark.make deleted file mode 100644 index 454c5d0b5d19..000000000000 --- a/rules/wireshark.make +++ /dev/null @@ -1,120 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2006 by Juergen Beisert -# (C) 2010 by Michael Olbrich -# (C) 2013 by Alexander Aring -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_WIRESHARK) += wireshark - -# -# Paths and names -# -WIRESHARK_VERSION := 2.0.3 -WIRESHARK_MD5 := 62dc20f5a77542feed2e38f18db8ae3b -WIRESHARK := wireshark-$(WIRESHARK_VERSION) -WIRESHARK_SUFFIX := tar.bz2 -WIRESHARK_URL := http://www.wireshark.org/download/src/all-versions/$(WIRESHARK).$(WIRESHARK_SUFFIX) -WIRESHARK_SOURCE := $(SRCDIR)/$(WIRESHARK).$(WIRESHARK_SUFFIX) -WIRESHARK_DIR := $(BUILDDIR)/$(WIRESHARK) - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -# -# autoconf -# -WIRESHARK_CONF_TOOL := autoconf -WIRESHARK_CONF_OPT = \ - $(CROSS_AUTOCONF_USR) \ - $(GLOBAL_LARGE_FILE_OPTION) \ - --disable-usr-local \ - --disable-wireshark \ - --disable-packet-editor \ - --disable-profile-build \ - --disable-gtktest \ - --disable-glibtest \ - --enable-tshark \ - --enable-editcap \ - --enable-capinfos \ - --enable-captype \ - --enable-mergecap \ - --enable-reordercap \ - --disable-text2pcap \ - --disable-dftest \ - --disable-randpkt \ - --disable-airpcap \ - --enable-dumpcap \ - --disable-rawshark \ - --disable-androiddump \ - --disable-androiddump-use-libpcap \ - --disable-echld \ - --disable-tfshark \ - --disable-pcap-ng-default \ - $(GLOBAL_IPV6_OPTION) \ - --disable-setcap-install \ - --disable-setuid-install \ - --without-qt \ - --without-gtk2 \ - --without-gtk3 \ - --without-gnutls \ - --without-gcrypt \ - --with-libnl=3 \ - --without-libsmi \ - --without-osx-integration \ - --with-pcap=$(SYSROOT)/usr \ - --with-zlib \ - --without-lua \ - --without-portaudio \ - --without-libcap \ - --without-ssl \ - --without-krb5 \ - --without-c-ares \ - --without-adns \ - --without-geoip \ - --without-sbc \ - --without-plugins \ - --without-extcap - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/wireshark.targetinstall: - @$(call targetinfo) - - @$(call install_init, wireshark) - @$(call install_fixup, wireshark,PRIORITY,optional) - @$(call install_fixup, wireshark,SECTION,base) - @$(call install_fixup, wireshark,AUTHOR,"Juergen Beisert ") - @$(call install_fixup, wireshark,DESCRIPTION,missing) -# -# executables -# - @$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/capinfos) - @$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/captype) - @$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/dumpcap) - @$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/editcap) - @$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/idl2wrs) - @$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/mergecap) - @$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/reordercap) - @$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/tshark) -# -# libraries used by some of the executables -# - @$(call install_lib, wireshark, 0, 0, 0644, libwireshark) - @$(call install_lib, wireshark, 0, 0, 0644, libwiretap) - @$(call install_lib, wireshark, 0, 0, 0644, libwsutil) - - @$(call install_finish, wireshark) - - @$(call touch) - -# vim: syntax=make -- 2.53.0