public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Peter Lemenkov <lemenkov@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/wireshark] f43: New version 4.6.8
Date: Tue, 22 Sep 2026 19:30:29 GMT [thread overview]
Message-ID: <179010542934.1.6488072672696674423.rpms-wireshark-4d423a48ee8e@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/wireshark
Branch : f43
Commit : 4d423a48ee8e9733e04eed17b9b87578b605fc60
Author : Peter Lemenkov <lemenkov@gmail.com>
Date : 2026-09-09T10:17:55+02:00
Stats : +253/-39 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/wireshark/c/4d423a48ee8e9733e04eed17b9b87578b605fc60?branch=f43
Log:
New version 4.6.8
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
diff --git a/sources b/sources
index 970c3a7..844e3d3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (wireshark-4.6.7.tar.xz) = a776d17815dcf74a7bf9b6e0e516ea20e37a2092515afa68fbae30e22b24793ffa4cd8f9bffa781d0b64683e8c2be84b7d0ec1bcb3ff25d62daf1afe652cbb3f
-SHA512 (SIGNATURES-4.6.7.txt) = 21f8f9e54855a90057e73835fb5d8dfd2e5f5beff1490d5d70435c6f6e3986bcf6a6aa53d126ff0cd6d4f0b7f2afcce564d5f70ef5e6f92d2e16af101f3b2a15
+SHA512 (wireshark-4.6.8.tar.xz) = 4692bd15bebd67475502b6afe106e3be85b90add16f932d7e58c4426fd62b5886e96daa522aafd9ee4a8300bf3e091a738b5b1fa20e3e0721d0d0f3be216f3c8
+SHA512 (SIGNATURES-4.6.8.txt) = 598caa682ac71899465fb82a37445f7141287bbabee964dfd33aedbb4c4c6e0ed9b206d458b9eb2d9a083f9c6db9f8b50d8dcaf11e26dc33bb8baee83ae3f6fa
diff --git a/wireshark-0002-Customize-permission-denied-error.patch b/wireshark-0002-Customize-permission-denied-error.patch
index 5c9d237..4b9580c 100644
--- a/wireshark-0002-Customize-permission-denied-error.patch
+++ b/wireshark-0002-Customize-permission-denied-error.patch
@@ -1,8 +1,14 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "From: Jan Safranek" <jsafrane@redhat.com>
+Date: Wed, 9 Sep 2026 08:53:35 +0200
+Subject: [PATCH] Customize 'permission denied' error.
+
+
diff --git a/capture/capture_sync.c b/capture/capture_sync.c
-index af08b32..2e0fcb7 100644
+index 36a8f3edbe..db8b49b816 100644
--- a/capture/capture_sync.c
+++ b/capture/capture_sync.c
-@@ -1825,8 +1832,16 @@ sync_pipe_input_cb(GIOChannel *pipe_io, capture_session *cap_session)
+@@ -2102,8 +2102,16 @@ sync_pipe_input_cb(GIOChannel *pipe_io, capture_session *cap_session)
if (!ws_strtoi32(buffer, NULL, &exec_errno)) {
ws_warning("Invalid errno: %s", buffer);
}
diff --git a/wireshark-0006-Move-tmp-to-var-tmp.patch b/wireshark-0006-Move-tmp-to-var-tmp.patch
index 93dc4b2..fa13f0e 100644
--- a/wireshark-0006-Move-tmp-to-var-tmp.patch
+++ b/wireshark-0006-Move-tmp-to-var-tmp.patch
@@ -1,7 +1,7 @@
-From e819ed35245a0b9ebda9947f9091401fb70c5533 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Peter Hatina <phatina@redhat.com>
Date: Tue, 24 Sep 2013 10:55:09 +0200
-Subject: [PATCH 1/1] Move /tmp to /var/tmp
+Subject: [PATCH] Move /tmp to /var/tmp
Fedora mounts /tmp on tmpfs, which is backed by RAM, and capture files
are routinely larger than RAM, so the default temporary directory needs
@@ -37,9 +37,6 @@ Setting TMPDIR keeps Peter's intent and drops all of that.
Rewritten-by: Peter Lemenkov <lemenkov@gmail.com>
Assisted-by: Claude
----
- wsutil/filesystem.c | 26 ++++++++++++++++++++++++++
- 1 file changed, 26 insertions(+)
diff --git a/wsutil/filesystem.c b/wsutil/filesystem.c
index f1c7358a97..6ee028cb71 100644
@@ -78,6 +75,3 @@ index f1c7358a97..6ee028cb71 100644
return configuration_init_posix(arg0);
#endif
}
---
-2.55.0
-
diff --git a/wireshark-0009-remove-strato-manpages.patch b/wireshark-0009-remove-strato-manpages.patch
index f61c64e..d8f65e8 100644
--- a/wireshark-0009-remove-strato-manpages.patch
+++ b/wireshark-0009-remove-strato-manpages.patch
@@ -1,44 +1,257 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Tue, 8 Sep 2026 19:49:08 +0200
+Subject: [PATCH] Docs: Build a manual page only when its program is built
+
+The manual pages are added to the build unconditionally, so a build
+configured without a program still generates, installs and packages
+that program's page.
+
+The default configuration shows it. BUILD_stratoshark is OFF by
+default, yet stratoshark(1), strato(1), falcodump(1), sshdig(1) and
+dumpcalls(1) are built and installed anyway, along with the Stratoshark
+release notes, documenting programs that were never compiled. The same
+goes for anything else switched off: randpktdump(1) survives
+-DBUILD_randpktdump=OFF, and etwdump(1) is installed on every platform,
+though the program it describes is built only on Windows.
+
+Guard each page on the condition its program is built under, which is
+what dpauxmon, sdjournal and mmdbresolve already do a few lines further
+down. That means the dependency as well as the option, so sshdump,
+ciscodump, wifidump and sshdig follow LIBSSH_FOUND and falcodump and
+dumpcalls follow SINSP_FOUND, exactly as extcap/CMakeLists.txt builds
+them. Extend the same to the HTML pages in DOC_FILES, where falcodump
+and dumpcalls were already guarded and the rest were not, and to the
+Stratoshark release notes.
+
+sshdig moves to the stratoshark package in the Debian packaging. It is
+a Stratoshark extcap, installed into STRATOSHARK_EXTCAP_INSTALL_LIBDIR
+and shipped with stratoshark, but its manual page was listed in
+wireshark-common. That was already wrong - a default build has no
+sshdig binary in that package - and it becomes a build failure once the
+page is only generated when the program is:
+
+ dh_installman: error: Cannot find (any matches for)
+ "obj-*/doc/man_pages/sshdig.1" (tried in ., debian/tmp)
+
+Pages for things that are always built - wireshark, tshark, capinfos,
+captype, dumpcap, editcap, mergecap, randpkt, rawshark, reordercap,
+sharkd, text2pcap and the section 4 pages - stay unconditional.
+
+Assisted-by: Claude
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2129bd0b22..e467cfdb1f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2281,33 +2281,60 @@ endif()
+
+ if (ASCIIDOCTOR_FOUND)
+ list(APPEND DOC_FILES
+- ${CMAKE_BINARY_DIR}/doc/man_pages/androiddump.html
+- ${CMAKE_BINARY_DIR}/doc/man_pages/udpdump.html
+ ${CMAKE_BINARY_DIR}/doc/man_pages/capinfos.html
+ ${CMAKE_BINARY_DIR}/doc/man_pages/captype.html
+- ${CMAKE_BINARY_DIR}/doc/man_pages/ciscodump.html
+ ${CMAKE_BINARY_DIR}/doc/man_pages/dumpcap.html
+ ${CMAKE_BINARY_DIR}/doc/man_pages/editcap.html
+ ${CMAKE_BINARY_DIR}/doc/man_pages/extcap.html
+ ${CMAKE_BINARY_DIR}/doc/man_pages/mergecap.html
+ ${CMAKE_BINARY_DIR}/doc/man_pages/randpkt.html
+- ${CMAKE_BINARY_DIR}/doc/man_pages/randpktdump.html
+- ${CMAKE_BINARY_DIR}/doc/man_pages/etwdump.html
+ ${CMAKE_BINARY_DIR}/doc/man_pages/rawshark.html
+ ${CMAKE_BINARY_DIR}/doc/man_pages/reordercap.html
+ ${CMAKE_BINARY_DIR}/doc/man_pages/sharkd.html
+- ${CMAKE_BINARY_DIR}/doc/man_pages/sshdig.html
+- ${CMAKE_BINARY_DIR}/doc/man_pages/sshdump.html
+- ${CMAKE_BINARY_DIR}/doc/man_pages/strato.html
+- ${CMAKE_BINARY_DIR}/doc/man_pages/stratoshark.html
+- ${CMAKE_BINARY_DIR}/doc/man_pages/wifidump.html
+ ${CMAKE_BINARY_DIR}/doc/man_pages/text2pcap.html
+ ${CMAKE_BINARY_DIR}/doc/man_pages/tshark.html
+ ${CMAKE_BINARY_DIR}/doc/man_pages/wireshark.html
+ ${CMAKE_BINARY_DIR}/doc/man_pages/wireshark-filter.html
+ "${CMAKE_BINARY_DIR}/doc/Wireshark Release Notes.html"
+- "${CMAKE_BINARY_DIR}/doc/Stratoshark Release Notes.html"
+ )
++
++ #
++ # As with the manual pages themselves, only install the HTML for a
++ # program that is actually built.
++ #
++ if(BUILD_stratoshark)
++ list(APPEND DOC_FILES
++ ${CMAKE_BINARY_DIR}/doc/man_pages/stratoshark.html
++ "${CMAKE_BINARY_DIR}/doc/Stratoshark Release Notes.html"
++ )
++ endif()
++ if(BUILD_strato)
++ list(APPEND DOC_FILES ${CMAKE_BINARY_DIR}/doc/man_pages/strato.html)
++ endif()
++ if(BUILD_androiddump)
++ list(APPEND DOC_FILES ${CMAKE_BINARY_DIR}/doc/man_pages/androiddump.html)
++ endif()
++ if(BUILD_ciscodump AND LIBSSH_FOUND)
++ list(APPEND DOC_FILES ${CMAKE_BINARY_DIR}/doc/man_pages/ciscodump.html)
++ endif()
++ if(BUILD_etwdump AND WIN32)
++ list(APPEND DOC_FILES ${CMAKE_BINARY_DIR}/doc/man_pages/etwdump.html)
++ endif()
++ if(BUILD_randpktdump)
++ list(APPEND DOC_FILES ${CMAKE_BINARY_DIR}/doc/man_pages/randpktdump.html)
++ endif()
++ if(BUILD_sshdig AND LIBSSH_FOUND)
++ list(APPEND DOC_FILES ${CMAKE_BINARY_DIR}/doc/man_pages/sshdig.html)
++ endif()
++ if(BUILD_sshdump AND LIBSSH_FOUND)
++ list(APPEND DOC_FILES ${CMAKE_BINARY_DIR}/doc/man_pages/sshdump.html)
++ endif()
++ if(BUILD_udpdump)
++ list(APPEND DOC_FILES ${CMAKE_BINARY_DIR}/doc/man_pages/udpdump.html)
++ endif()
++ if(BUILD_wifidump AND LIBSSH_FOUND)
++ list(APPEND DOC_FILES ${CMAKE_BINARY_DIR}/doc/man_pages/wifidump.html)
++ endif()
+ if(MAXMINDDB_FOUND)
+ list(APPEND DOC_FILES ${CMAKE_BINARY_DIR}/doc/man_pages/mmdbresolve.html)
+ endif()
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index adcfa0c..fd92872 100644
+index a92ed452fe..7a05821b4c 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
-@@ -40,8 +40,6 @@ endmacro()
+@@ -40,28 +40,70 @@ endmacro()
ADD_MAN_PAGE(wireshark 1)
ADD_MAN_PAGE(tshark 1)
-ADD_MAN_PAGE(stratoshark 1)
-ADD_MAN_PAGE(strato 1)
- ADD_MAN_PAGE(androiddump 1)
+-ADD_MAN_PAGE(androiddump 1)
ADD_MAN_PAGE(capinfos 1)
-@@ -48,13 +46,11 @@ ADD_MAN_PAGE(ciscodump 1)
+ ADD_MAN_PAGE(captype 1)
+-ADD_MAN_PAGE(ciscodump 1)
ADD_MAN_PAGE(dumpcap 1)
ADD_MAN_PAGE(editcap 1)
- ADD_MAN_PAGE(etwdump 1)
+-ADD_MAN_PAGE(etwdump 1)
-ADD_MAN_PAGE(falcodump 1)
ADD_MAN_PAGE(mergecap 1)
ADD_MAN_PAGE(randpkt 1)
- ADD_MAN_PAGE(randpktdump 1)
+-ADD_MAN_PAGE(randpktdump 1)
ADD_MAN_PAGE(rawshark 1)
ADD_MAN_PAGE(reordercap 1)
ADD_MAN_PAGE(sharkd 1)
-ADD_MAN_PAGE(sshdig 1)
- ADD_MAN_PAGE(sshdump 1)
+-ADD_MAN_PAGE(sshdump 1)
ADD_MAN_PAGE(text2pcap 1)
+-ADD_MAN_PAGE(udpdump 1)
+-ADD_MAN_PAGE(wifidump 1)
++
++#
++# A program that is not built should not leave a manual page behind for
++# it. Each of these follows the option that decides whether the program
++# is built, the same way dpauxmon, sdjournal and mmdbresolve do below.
++#
++if(BUILD_stratoshark)
++ ADD_MAN_PAGE(stratoshark 1)
++endif()
++
++if(BUILD_strato)
++ ADD_MAN_PAGE(strato 1)
++endif()
++
++if(BUILD_androiddump)
++ ADD_MAN_PAGE(androiddump 1)
++endif()
++
++if(BUILD_ciscodump AND LIBSSH_FOUND)
++ ADD_MAN_PAGE(ciscodump 1)
++endif()
++
++if(BUILD_dumpcalls AND SINSP_FOUND)
++ ADD_MAN_PAGE(dumpcalls 1)
++endif()
++
++if(BUILD_etwdump AND WIN32)
++ ADD_MAN_PAGE(etwdump 1)
++endif()
++
++if(BUILD_falcodump AND SINSP_FOUND)
++ ADD_MAN_PAGE(falcodump 1)
++endif()
++
++if(BUILD_randpktdump)
++ ADD_MAN_PAGE(randpktdump 1)
++endif()
++
++if(BUILD_sshdig AND LIBSSH_FOUND)
++ ADD_MAN_PAGE(sshdig 1)
++endif()
++
++if(BUILD_sshdump AND LIBSSH_FOUND)
++ ADD_MAN_PAGE(sshdump 1)
++endif()
++
++if(BUILD_udpdump)
++ ADD_MAN_PAGE(udpdump 1)
++endif()
++
++if(BUILD_wifidump AND LIBSSH_FOUND)
++ ADD_MAN_PAGE(wifidump 1)
++endif()
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 71a04e8..a797ad1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2283,11 +2283,8 @@ if (ASCIIDOCTOR_FOUND)
- ${CMAKE_BINARY_DIR}/doc/man_pages/etwdump.html
- ${CMAKE_BINARY_DIR}/doc/man_pages/rawshark.html
- ${CMAKE_BINARY_DIR}/doc/man_pages/reordercap.html
- ${CMAKE_BINARY_DIR}/doc/man_pages/sharkd.html
-- ${CMAKE_BINARY_DIR}/doc/man_pages/sshdig.html
- ${CMAKE_BINARY_DIR}/doc/man_pages/sshdump.html
-- ${CMAKE_BINARY_DIR}/doc/man_pages/strato.html
-- ${CMAKE_BINARY_DIR}/doc/man_pages/stratoshark.html
- ${CMAKE_BINARY_DIR}/doc/man_pages/wifidump.html
- ${CMAKE_BINARY_DIR}/doc/man_pages/text2pcap.html
- ${CMAKE_BINARY_DIR}/doc/man_pages/tshark.html
+ ADD_MAN_PAGE(extcap 4)
+ ADD_MAN_PAGE(wireshark-filter 4)
+@@ -112,13 +154,17 @@ endif()
+ if(ASCIIDOCTOR_FOUND)
+ ASCIIDOCTOR2HTML("Wireshark_Release_Notes.adoc" CONVERT_UNDERSCORES)
+ ASCIIDOCTOR2TXT("Wireshark_Release_Notes.adoc" CONVERT_UNDERSCORES)
+- ASCIIDOCTOR2HTML("Stratoshark_Release_Notes.adoc" CONVERT_UNDERSCORES)
+- ASCIIDOCTOR2TXT("Stratoshark_Release_Notes.adoc" CONVERT_UNDERSCORES)
++ set(RELEASE_NOTES_HTML "${CMAKE_CURRENT_BINARY_DIR}/Wireshark Release Notes.html")
++
++ # Only the release notes for something that was built.
++ if(BUILD_stratoshark)
++ ASCIIDOCTOR2HTML("Stratoshark_Release_Notes.adoc" CONVERT_UNDERSCORES)
++ list(APPEND RELEASE_NOTES_HTML "${CMAKE_CURRENT_BINARY_DIR}/Stratoshark Release Notes.html")
++ endif()
+
+ add_custom_target(release_notes_html
+ DEPENDS
+- "${CMAKE_CURRENT_BINARY_DIR}/Wireshark Release Notes.html"
+- "${CMAKE_CURRENT_BINARY_DIR}/Stratoshark Release Notes.html"
++ ${RELEASE_NOTES_HTML}
+ )
+ set_target_properties(release_notes_html PROPERTIES FOLDER "Documentation")
+
+@@ -166,8 +212,7 @@ if(ASCIIDOCTOR_FOUND)
+ install(
+ FILES
+ ${HTML_INSTALL_FILES}
+- "${CMAKE_CURRENT_BINARY_DIR}/Wireshark Release Notes.html"
+- "${CMAKE_CURRENT_BINARY_DIR}/Stratoshark Release Notes.html"
++ ${RELEASE_NOTES_HTML}
+ DESTINATION
+ ${CMAKE_INSTALL_DOCDIR}
+ COMPONENT "ReleaseNotes"
+diff --git a/packaging/debian/stratoshark.manpages b/packaging/debian/stratoshark.manpages
+index 4f27313b47..f13fa2d55d 100644
+--- a/packaging/debian/stratoshark.manpages
++++ b/packaging/debian/stratoshark.manpages
+@@ -1,2 +1,3 @@
+ usr/share/man/man1/strato.1
+ usr/share/man/man1/stratoshark.1
++usr/share/man/man1/sshdig.1
+diff --git a/packaging/debian/wireshark-common.manpages b/packaging/debian/wireshark-common.manpages
+index 9c7ce5956c..974e970e28 100644
+--- a/packaging/debian/wireshark-common.manpages
++++ b/packaging/debian/wireshark-common.manpages
+@@ -13,7 +13,6 @@ obj-*/doc/man_pages/androiddump.1
+ obj-*/doc/man_pages/ciscodump.1
+ obj-*/doc/man_pages/randpktdump.1
+ obj-*/doc/man_pages/udpdump.1
+-obj-*/doc/man_pages/sshdig.1
+ obj-*/doc/man_pages/sshdump.1
+ obj-*/doc/man_pages/wifidump.1
+ obj-*/doc/man_pages/extcap.4
diff --git a/wireshark.spec b/wireshark.spec
index 7569741..55cddff 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -8,8 +8,8 @@
Summary: Network traffic analyzer
Name: wireshark
-Version: 4.6.7
-Release: 3%{?dist}
+Version: 4.6.8
+Release: 1%{?dist}
Epoch: 1
License: BSD-1-Clause AND BSD-2-Clause AND BSD-3-Clause AND MIT AND GPL-2.0-or-later AND LGPL-2.0-or-later AND Zlib AND ISC AND (BSD-3-Clause OR GPL-2.0-only) AND (GPL-2.0-or-later AND Zlib)
Url: http://www.wireshark.org/
@@ -271,11 +271,9 @@ fi
%{_mandir}/man1/androiddump.*
%{_mandir}/man1/captype.*
%{_mandir}/man1/ciscodump.*
-%{_mandir}/man1/randpktdump.*
%{_mandir}/man1/dpauxmon.*
%{_mandir}/man1/sdjournal.*
%{_mandir}/man1/sharkd.*
-%{_mandir}/man1/etwdump.*
%{_mandir}/man4/extcap.*
%{_datadir}/doc/wireshark/*
@@ -300,6 +298,9 @@ fi
%endif
%changelog
+* Wed Sep 9 2026 Peter Lemenkov <lemenkov@gmail.com> - 1:4.6.8-1
+- New version 4.6.8
+
* Tue Sep 08 2026 Peter Lemenkov <lemenkov@gmail.com> - 1:4.6.7-3
- Rewrite the /var/tmp patch to set TMPDIR in configuration_init() rather
than add wsutil/wstmpdir.{c,h} and rewrite create_tempfile(). TMPDIR is
next reply other threads:[~2026-09-22 19:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-22 19:30 Peter Lemenkov [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-08-18 11:06 [rpms/wireshark] f43: New version 4.6.8 Michal Ruprich
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=179010542934.1.6488072672696674423.rpms-wireshark-4d423a48ee8e@fedoraproject.org \
--to=lemenkov@gmail.com \
--cc=git-commits@fedoraproject.org \
/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