osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Linux: rename metadata according to spec 

https://www.freedesktop.org/software/appstream/docs/sect-Metadata-Application.html

https://specifications.freedesktop.org/desktop-entry-spec/latest/ar01s02.html#desktop-file-id
This commit is contained in:
Peter Eszlari 2020-12-06 15:38:41 +01:00 committed by Jörg Mayer
parent 9a46fabf52
commit 42a09ad02e
8 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@ -3150,7 +3150,7 @@ if(LINUXDEPLOYQT_EXECUTABLE AND APPIMAGETOOL_EXECUTABLE)
# https://github.com/probonopd/linuxdeployqt/wiki/Custom-wrapper-script-instead-of-AppRun # https://github.com/probonopd/linuxdeployqt/wiki/Custom-wrapper-script-instead-of-AppRun
add_custom_target(appimage-prep add_custom_target(appimage-prep
COMMAND ${LINUXDEPLOYQT_EXECUTABLE} COMMAND ${LINUXDEPLOYQT_EXECUTABLE}
"${_ai_appdir}/usr/share/applications/wireshark.desktop" "${_ai_appdir}/usr/share/applications/org.wireshark.Wireshark.desktop"
${_exe_args} ${_exe_args}
COMMAND rm -f "${_ai_appdir}/AppRun" COMMAND rm -f "${_ai_appdir}/AppRun"
COMMAND install COMMAND install
@ -3233,28 +3233,28 @@ install(FILES ${SHARK_PUBLIC_HEADERS}
# Install icons and other desktop files for Freedesktop.org-compliant desktops. # Install icons and other desktop files for Freedesktop.org-compliant desktops.
if((BUILD_wireshark AND QT_FOUND) AND NOT (WIN32 OR APPLE)) if((BUILD_wireshark AND QT_FOUND) AND NOT (WIN32 OR APPLE))
install(FILES wireshark-mime-package.xml install(FILES org.wireshark.Wireshark-mime.xml
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/mime/packages" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/mime/packages"
RENAME wireshark.xml RENAME org.wireshark.Wireshark.xml
) )
install(FILES wireshark.appdata.xml install(FILES org.wireshark.Wireshark.metainfo.xml
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo"
) )
if(BUILD_wireshark AND QT_FOUND) if(BUILD_wireshark AND QT_FOUND)
install(FILES wireshark.desktop install(FILES org.wireshark.Wireshark.desktop
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
endif() endif()
foreach(size 16 24 32 48 64 128 256) foreach(size 16 24 32 48 64 128 256)
install(FILES image/wsicon${size}.png install(FILES image/wsicon${size}.png
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${size}x${size}/apps" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${size}x${size}/apps"
RENAME wireshark.png) RENAME org.wireshark.Wireshark.png)
install(FILES image/WiresharkDoc-${size}.png install(FILES image/WiresharkDoc-${size}.png
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${size}x${size}/mimetypes" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${size}x${size}/mimetypes"
RENAME application-wireshark-doc.png) RENAME org.wireshark.Wireshark-mimetype.png)
endforeach() endforeach()
install(FILES image/wsicon.svg install(FILES image/wsicon.svg
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps"
RENAME wireshark.svg) RENAME org.wireshark.Wireshark.svg)
endif() endif()
install( install(

2
debian/wireshark-qt.install vendored
View File

@ -1,2 +1,2 @@
usr/bin/wireshark usr/bin/wireshark
usr/share/applications/wireshark.desktop usr/share/applications/org.wireshark.Wireshark.desktop

36
wireshark-mime-package.xml → org.wireshark.Wireshark-mime.xml
View File

@ -24,13 +24,13 @@
NOTE: if you do add a MIME type here, don't forget to add it to the list NOTE: if you do add a MIME type here, don't forget to add it to the list
of MIME types handled by Wireshark in wireshark.desktop. of MIME types handled by Wireshark in org.wireshark.Wireshark.desktop.
--> -->
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
<mime-type type="application/vnd.tcpdump.pcap"> <mime-type type="application/vnd.tcpdump.pcap">
<comment>Packet Capture (PCAP)</comment> <comment>Packet Capture (PCAP)</comment>
<generic-icon name="application-wireshark-doc"/> <generic-icon name="org.wireshark.Wireshark-mimetype"/>
<alias type="application/x-pcap"/> <alias type="application/x-pcap"/>
<alias type="application/pcap"/> <alias type="application/pcap"/>
<magic> <magic>
@ -47,7 +47,7 @@
<mime-type type="application/x-pcapng"> <mime-type type="application/x-pcapng">
<comment>Packet Capture (PCAPNG)</comment> <comment>Packet Capture (PCAPNG)</comment>
<generic-icon name="application-wireshark-doc"/> <generic-icon name="org.wireshark.Wireshark-mimetype"/>
<magic> <magic>
<match type="big32" offset="0" value="0x0a0d0d0a"> <match type="big32" offset="0" value="0x0a0d0d0a">
<match type="big32" offset="8" value="0x1a2b3c4d"/> <match type="big32" offset="8" value="0x1a2b3c4d"/>
@ -64,7 +64,7 @@
<mime-type type="application/x-snoop"> <mime-type type="application/x-snoop">
<comment>Packet Capture (Snoop)</comment> <comment>Packet Capture (Snoop)</comment>
<generic-icon name="application-wireshark-doc"/> <generic-icon name="org.wireshark.Wireshark-mimetype"/>
<magic> <magic>
<match type="string" offset="0" value="snoop"/> <match type="string" offset="0" value="snoop"/>
</magic> </magic>
@ -74,7 +74,7 @@
<mime-type type="application/x-iptrace"> <mime-type type="application/x-iptrace">
<comment>Packet Capture (AIX iptrace)</comment> <comment>Packet Capture (AIX iptrace)</comment>
<generic-icon name="application-wireshark-doc"/> <generic-icon name="org.wireshark.Wireshark-mimetype"/>
<magic> <magic>
<match type="string" offset="0" value="iptrace 1.0"/> <match type="string" offset="0" value="iptrace 1.0"/>
<match type="string" offset="0" value="iptrace 2.0"/> <match type="string" offset="0" value="iptrace 2.0"/>
@ -83,7 +83,7 @@
<mime-type type="application/x-lanalyzer"> <mime-type type="application/x-lanalyzer">
<comment>Packet Capture (Novell LANalyzer)</comment> <comment>Packet Capture (Novell LANalyzer)</comment>
<generic-icon name="application-wireshark-doc"/> <generic-icon name="org.wireshark.Wireshark-mimetype"/>
<magic> <magic>
<match type="little16" offset="0" value="0x1001"/> <match type="little16" offset="0" value="0x1001"/>
<match type="little16" offset="0" value="0x1007"/> <match type="little16" offset="0" value="0x1007"/>
@ -94,7 +94,7 @@
<mime-type type="application/x-nettl"> <mime-type type="application/x-nettl">
<comment>Packet Capture (HP-UX nettl)</comment> <comment>Packet Capture (HP-UX nettl)</comment>
<generic-icon name="application-wireshark-doc"/> <generic-icon name="org.wireshark.Wireshark-mimetype"/>
<magic> <magic>
<match type="string" offset="0" value="\x54\x52\x00\x64\x00"/> <match type="string" offset="0" value="\x54\x52\x00\x64\x00"/>
</magic> </magic>
@ -106,7 +106,7 @@
<mime-type type="application/x-radcom"> <mime-type type="application/x-radcom">
<comment>Packet Capture (Radcom WAN/LAN Analyzer)</comment> <comment>Packet Capture (Radcom WAN/LAN Analyzer)</comment>
<generic-icon name="application-wireshark-doc"/> <generic-icon name="org.wireshark.Wireshark-mimetype"/>
<magic> <magic>
<match type="string" offset="0" value="\x42\xd2\x00\x34\x12\x66\x22\x88"/> <match type="string" offset="0" value="\x42\xd2\x00\x34\x12\x66\x22\x88"/>
</magic> </magic>
@ -114,7 +114,7 @@
<mime-type type="application/x-etherpeek"> <mime-type type="application/x-etherpeek">
<comment>Packet Capture (Savvius/Etherpeek/Airopeek tagged/v9)</comment> <comment>Packet Capture (Savvius/Etherpeek/Airopeek tagged/v9)</comment>
<generic-icon name="application-wireshark-doc"/> <generic-icon name="org.wireshark.Wireshark-mimetype"/>
<magic> <magic>
<match type="string" offset="0" value="\177ver"/> <match type="string" offset="0" value="\177ver"/>
</magic> </magic>
@ -130,7 +130,7 @@
<mime-type type="application/x-visualnetworks"> <mime-type type="application/x-visualnetworks">
<comment>Packet Capture (Visual Networks)</comment> <comment>Packet Capture (Visual Networks)</comment>
<generic-icon name="application-wireshark-doc"/> <generic-icon name="org.wireshark.Wireshark-mimetype"/>
<magic> <magic>
<match type="string" offset="0" value="\x05VNF"/> <match type="string" offset="0" value="\x05VNF"/>
</magic> </magic>
@ -138,7 +138,7 @@
<mime-type type="application/x-netinstobserver"> <mime-type type="application/x-netinstobserver">
<comment>Packet Capture (Network Instruments Observer)</comment> <comment>Packet Capture (Network Instruments Observer)</comment>
<generic-icon name="application-wireshark-doc"/> <generic-icon name="org.wireshark.Wireshark-mimetype"/>
<magic> <magic>
<match type="string" offset="0" value="ObserverPktBuffe"/> <match type="string" offset="0" value="ObserverPktBuffe"/>
</magic> </magic>
@ -148,7 +148,7 @@
<mime-type type="application/x-5view"> <mime-type type="application/x-5view">
<comment>Packet Capture (Accellent/InfoVista 5view)</comment> <comment>Packet Capture (Accellent/InfoVista 5view)</comment>
<generic-icon name="application-wireshark-doc"/> <generic-icon name="org.wireshark.Wireshark-mimetype"/>
<magic> <magic>
<match type="string" offset="0" value="\xaa\xaa\xaa\xaa"/> <match type="string" offset="0" value="\xaa\xaa\xaa\xaa"/>
</magic> </magic>
@ -158,7 +158,7 @@
<mime-type type="application/x-tektronix-rf5"> <mime-type type="application/x-tektronix-rf5">
<comment>Packet Capture (Tektronix rf5)</comment> <comment>Packet Capture (Tektronix rf5)</comment>
<generic-icon name="application-wireshark-doc"/> <generic-icon name="org.wireshark.Wireshark-mimetype"/>
<magic> <magic>
<match type="string" offset="0" value="\x00\x00\x02\x00\x12\x05\x00\x10"/> <match type="string" offset="0" value="\x00\x00\x02\x00\x12\x05\x00\x10"/>
</magic> </magic>
@ -168,7 +168,7 @@
<mime-type type="application/x-micropross-mplog"> <mime-type type="application/x-micropross-mplog">
<comment>Packet Capture (Micropross mplog)</comment> <comment>Packet Capture (Micropross mplog)</comment>
<generic-icon name="application-wireshark-doc"/> <generic-icon name="org.wireshark.Wireshark-mimetype"/>
<magic> <magic>
<match type="string" offset="0" value="MPCSII"/> <match type="string" offset="0" value="MPCSII"/>
</magic> </magic>
@ -178,21 +178,21 @@
<mime-type type="application/x-apple-packetlogger"> <mime-type type="application/x-apple-packetlogger">
<comment>Packet Capture (macOS PacketLogger)</comment> <comment>Packet Capture (macOS PacketLogger)</comment>
<generic-icon name="application-wireshark-doc"/> <generic-icon name="org.wireshark.Wireshark-mimetype"/>
<glob pattern="*.pklg"/> <glob pattern="*.pklg"/>
<glob pattern="*.pklg.gz"/> <glob pattern="*.pklg.gz"/>
</mime-type> </mime-type>
<mime-type type="application/x-endace-erf"> <mime-type type="application/x-endace-erf">
<comment>Packet Capture (Endace ERF)</comment> <comment>Packet Capture (Endace ERF)</comment>
<generic-icon name="application-wireshark-doc"/> <generic-icon name="org.wireshark.Wireshark-mimetype"/>
<glob pattern="*.erf"/> <glob pattern="*.erf"/>
<glob pattern="*.erf.gz"/> <glob pattern="*.erf.gz"/>
</mime-type> </mime-type>
<mime-type type="application/ipfix"> <mime-type type="application/ipfix">
<comment>Packet Capture (IPFIX)</comment> <comment>Packet Capture (IPFIX)</comment>
<generic-icon name="application-wireshark-doc"/> <generic-icon name="org.wireshark.Wireshark-mimetype"/>
<glob pattern="*.ipfix"/> <glob pattern="*.ipfix"/>
<glob pattern="*.ipfix.gz"/> <glob pattern="*.ipfix.gz"/>
<!-- Don't register for .pfx: that extension has another (more common) use --> <!-- Don't register for .pfx: that extension has another (more common) use -->
@ -200,7 +200,7 @@
<mime-type type="application/x-ixia-vwr"> <mime-type type="application/x-ixia-vwr">
<comment>Packet Capture (Ixia IxVeriWave)</comment> <comment>Packet Capture (Ixia IxVeriWave)</comment>
<generic-icon name="application-wireshark-doc"/> <generic-icon name="org.wireshark.Wireshark-mimetype"/>
<glob pattern="*.vwr"/> <glob pattern="*.vwr"/>
<glob pattern="*.vwr.gz"/> <glob pattern="*.vwr.gz"/>
</mime-type> </mime-type>

2
wireshark.desktop → org.wireshark.Wireshark.desktop
View File

@ -101,7 +101,7 @@ Comment[sl]=Preučevalnik omrežnega prometa
Comment[tr]=Ağ trafiği çözümleyicisi Comment[tr]=Ağ trafiği çözümleyicisi
Comment[vi]=Trình phân tích giao thông mạng Comment[vi]=Trình phân tích giao thông mạng
Comment[uk]=Аналізатор мережевого трафіку Comment[uk]=Аналізатор мережевого трафіку
Icon=wireshark Icon=org.wireshark.Wireshark
TryExec=wireshark TryExec=wireshark
Exec=wireshark %f Exec=wireshark %f
Terminal=false Terminal=false

2
wireshark.appdata.xml → org.wireshark.Wireshark.metainfo.xml
View File

@ -2,7 +2,7 @@
<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> --> <!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
<application> <application>
<id type="desktop">wireshark.desktop</id> <id type="desktop">org.wireshark.Wireshark</id>
<name>Wireshark</name> <name>Wireshark</name>
<summary>Wireshark is the world's foremost protocol analyzer</summary> <summary>Wireshark is the world's foremost protocol analyzer</summary>
<content_rating type="oars-1.1"/> <content_rating type="oars-1.1"/>

12
packaging/rpm/wireshark.spec.in
View File

@ -205,7 +205,7 @@ Requires(pre): shadow-utils
BuildRequires: rpm >= 4.7.0 BuildRequires: rpm >= 4.7.0
%endif %endif
# NOTE: the below description has been copied to wireshark.appdata.xml (in the # NOTE: the below description has been copied to org.wireshark.Wireshark.metainfo.xml (in the
# top-level directory). # top-level directory).
%description %description
Wireshark allows you to examine protocol data stored in files or as it is Wireshark allows you to examine protocol data stored in files or as it is
@ -426,12 +426,12 @@ cd -
# SUSE's packaging conventions # SUSE's packaging conventions
# (https://en.opensuse.org/openSUSE:Packaging_Conventions_RPM_Macros#.25suse_update_desktop_file) # (https://en.opensuse.org/openSUSE:Packaging_Conventions_RPM_Macros#.25suse_update_desktop_file)
# require this: # require this:
install -Dm 0644 %{buildroot}/usr/local/share/applications/wireshark.desktop %{buildroot}/usr/share/applications/wireshark.desktop install -Dm 0644 %{buildroot}/usr/local/share/applications/org.wireshark.Wireshark.desktop %{buildroot}/usr/share/applications/org.wireshark.Wireshark.desktop
%suse_update_desktop_file %{name} %suse_update_desktop_file %{name}
%else %else
# Fedora's packaging guidelines (https://fedoraproject.org/wiki/Packaging:Guidelines) # Fedora's packaging guidelines (https://fedoraproject.org/wiki/Packaging:Guidelines)
# require this (at least if desktop-file-install was not used to install it). # require this (at least if desktop-file-install was not used to install it).
desktop-file-validate %{buildroot}%{_datadir}/applications/wireshark.desktop desktop-file-validate %{buildroot}%{_datadir}/applications/org.wireshark.Wireshark.desktop
%endif %endif
%endif %endif
@ -519,11 +519,11 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%if %{with qt5} %if %{with qt5}
%files qt %files qt
%defattr(-,root,root) %defattr(-,root,root)
%{_datadir}/applications/wireshark.desktop %{_datadir}/applications/org.wireshark.Wireshark.desktop
%if 0%{?suse_version} %if 0%{?suse_version}
/usr/share/applications/wireshark.desktop /usr/share/applications/org.wireshark.Wireshark.desktop
%endif %endif
%{_datadir}/appdata/wireshark.appdata.xml %{_datadir}/appdata/org.wireshark.Wireshark.metainfo.xml
%{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/hicolor/*/apps/*
%{_datadir}/icons/hicolor/*/mimetypes/* %{_datadir}/icons/hicolor/*/mimetypes/*
%{_datadir}/mime/packages/wireshark.xml %{_datadir}/mime/packages/wireshark.xml

10
tools/update-appdata.py
View File

@ -1,16 +1,16 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# #
# update-appdata.py - Update the <releases/> section of wireshark.appdata.xml. # update-appdata.py - Update the <releases/> section of org.wireshark.Wireshark.metainfo.xml.
# #
# Wireshark - Network traffic analyzer # Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org> # By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs # Copyright 1998 Gerald Combs
# #
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
'''Update the <release> tag in wireshark.appdata.xml '''Update the <release> tag in org.wireshark.Wireshark.metainfo.xml
According to https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html According to https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
the <releases/> tag in wireshark.appdata.xml should contain release the <releases/> tag in org.wireshark.Wireshark.metainfo.xml should contain release
information sorted newest to oldest. information sorted newest to oldest.
As part of our release process, when we create release tag x.y.z, we tag As part of our release process, when we create release tag x.y.z, we tag
@ -22,7 +22,7 @@ v3.0.1 2019-04-08 release tag
v3.0.2rc0 2019-04-08 next commit after v3.0.1 v3.0.2rc0 2019-04-08 next commit after v3.0.1
Find a list of release versions based on our most recent rc0 tag and Find a list of release versions based on our most recent rc0 tag and
update the <releases/> section of wireshark.appdata.xml accordingly. update the <releases/> section of org.wireshark.Wireshark.metainfo.xml accordingly.
Assume that the tag for the most recent release doesn't exist and use Assume that the tag for the most recent release doesn't exist and use
today's date for it. today's date for it.
''' '''
@ -41,7 +41,7 @@ def main():
sys.exit(2) sys.exit(2)
this_dir = os.path.dirname(__file__) this_dir = os.path.dirname(__file__)
appdata_xml = os.path.join(this_dir, '..', 'wireshark.appdata.xml') appdata_xml = os.path.join(this_dir, '..', 'org.wireshark.Wireshark.metainfo.xml')
try: try:
tag_cp = subprocess.run( tag_cp = subprocess.run(

2
wiretap/file_access.c
View File

@ -341,7 +341,7 @@ wtap_get_all_capture_file_extensions_list(void)
* NOTE: when adding file formats to this list you may also want to add them * NOTE: when adding file formats to this list you may also want to add them
* to the following files so that the various desktop environments will * to the following files so that the various desktop environments will
* know that Wireshark can open the file: * know that Wireshark can open the file:
* 1) wireshark-mime-package.xml (for freedesktop.org environments) * 1) org.wireshark.Wireshark-mime.xml (for freedesktop.org environments)
* 2) packaging/macosx/Info.plist.in (for macOS) * 2) packaging/macosx/Info.plist.in (for macOS)
* 3) packaging/nsis/AdditionalTasksPage.ini, packaging/nsis/common.nsh, * 3) packaging/nsis/AdditionalTasksPage.ini, packaging/nsis/common.nsh,
* and packaging/wix/ComponentGroups.wxi (for Windows) * and packaging/wix/ComponentGroups.wxi (for Windows)