mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Thorsten Scherer <t.scherer@eckelmann.de>
To: ptxdist@pengutronix.de
Cc: Thorsten Scherer <t.scherer@eckelmann.de>
Subject: [ptxdist] [PATCH 39/42] wireshark: Remove after one year in staging
Date: Mon,  4 May 2026 14:53:31 +0200	[thread overview]
Message-ID: <20260504125331.64700-1-t.scherer@eckelmann.de> (raw)
In-Reply-To: <20260504121331.57729-1-t.scherer@eckelmann.de>

Signed-off-by: Thorsten Scherer <t.scherer@eckelmann.de>
---
 ...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 <aar@pengutronix.de>
-Date: Wed, 27 Apr 2016 16:51:08 +0200
-Subject: [PATCH] help_url: add forgotten HAVE_EXTCAP
-
-Signed-off-by: Alexander Aring <aar@pengutronix.de>
----
- 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 <m.olbrich@pengutronix.de>
-#           (C) 2013 by Alexander Aring <aar@pengutronix.de>
-#
-# 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 <j.beisert@pengutronix.de>")
-	@$(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




  parent reply	other threads:[~2026-05-04 12:54 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-05-04 12:12 [ptxdist] [PATCH 00/42] treewide: " Thorsten Scherer
2026-05-04 12:12 ` [ptxdist] [PATCH 01/42] archivemount: " Thorsten Scherer
2026-05-04 12:12 ` [ptxdist] [PATCH 02/42] argtable2: " Thorsten Scherer
2026-05-04 12:12 ` [ptxdist] [PATCH 03/42] bing: " Thorsten Scherer
2026-05-04 12:12 ` [ptxdist] [PATCH 04/42] calibrator: " Thorsten Scherer
2026-05-04 12:12 ` [ptxdist] [PATCH 05/42] daemonize: " Thorsten Scherer
2026-05-04 12:12 ` [ptxdist] [PATCH 06/42] dhex: " Thorsten Scherer
2026-05-04 12:12 ` [ptxdist] [PATCH 07/42] dialog: " Thorsten Scherer
2026-05-04 12:12 ` [ptxdist] [PATCH 08/42] frodo: " Thorsten Scherer
2026-05-04 12:12 ` [ptxdist] [PATCH 09/42] gnuplot: " Thorsten Scherer
2026-05-04 12:12 ` [ptxdist] [PATCH 10/42] latencytop: " Thorsten Scherer
2026-05-04 12:13 ` [ptxdist] [PATCH 11/42] latrace: " Thorsten Scherer
2026-05-04 12:13 ` [ptxdist] [PATCH 12/42] libcli: " Thorsten Scherer
2026-05-04 12:13 ` [ptxdist] [PATCH 13/42] libgee: " Thorsten Scherer
2026-05-04 12:13 ` [ptxdist] [PATCH 14/42] libiodbc: " Thorsten Scherer
2026-05-04 12:13 ` [ptxdist] [PATCH 15/42] liblockfile: " Thorsten Scherer
2026-05-04 12:13 ` [ptxdist] [PATCH 16/42] libmikmod: " Thorsten Scherer
2026-05-04 12:13 ` [ptxdist] [PATCH 17/42] liburcu: " Thorsten Scherer
2026-05-04 12:13 ` [ptxdist] [PATCH 18/42] links: " Thorsten Scherer
2026-05-04 12:13 ` [ptxdist] [PATCH 19/42] lsuio: " Thorsten Scherer
2026-05-04 12:52 ` [ptxdist] [PATCH 20/42] ltt-control: " Thorsten Scherer
2026-05-04 12:52 ` [ptxdist] [PATCH 21/42] lua-filesystem: " Thorsten Scherer
2026-05-04 12:52 ` [ptxdist] [PATCH 22/42] media-session: " Thorsten Scherer
2026-05-04 12:52 ` [ptxdist] [PATCH 23/42] mtd-oopslog: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 24/42] openct: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 25/42] pcmciautils: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 26/42] pslib: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 27/42] sched_switch: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 28/42] schedtool: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 29/42] sdl-gfx: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 30/42] sdl-ttf: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 31/42] sdl: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 32/42] sdl_image: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 33/42] sdl_mixer: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 34/42] setserial: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 35/42] smtpclient: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 36/42] ssmtp: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 37/42] supertux: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 38/42] utelnetd: " Thorsten Scherer
2026-05-04 12:53 ` Thorsten Scherer [this message]
2026-05-04 12:53 ` [ptxdist] [PATCH 40/42] xerces: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 41/42] xterm: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 42/42] zsync: " Thorsten Scherer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260504125331.64700-1-t.scherer@eckelmann.de \
    --to=t.scherer@eckelmann.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox