Commit Graph

1351 Commits

Author SHA1 Message Date
John Thacker 858402d3c7 packaging: Fix RPM -qt subpackage requires
The BuildRequires and Requires for the -qt subpackage need to
go into its %package section, not its %description section.
The dependencies were not being enforced, but instead being added
to the description of the GUI package.
2022-01-06 04:33:00 +00:00
John Thacker 4b5d54f5ea packaging: Bump RPM glib2 version to 2.38
We require glib2 version 2.38 now, increase the version requirement
in the RPM spec file to match.
2022-01-05 10:21:23 -05:00
John Thacker 2cb8f34721 packaging: Remove unnecessary Requires
Automatic dependency generation has been around since RPM 4.0 (September
2000). The BuildRequires are sufficient for all of these; the automatic
dependences for the .so files works and are superior as they are versioned.

Red Hat and SUSE both recommend using automatic dependencies and
avoiding unnecessary Requires in spec files:
https://docs.fedoraproject.org/en-US/packaging-guidelines/#_explicit_requires
https://en.opensuse.org/openSUSE:Package_dependencies
2022-01-05 09:53:17 -05:00
John Thacker 98378d76d0 packaging: ENABLE_RPATH_ORIGIN on Fedora RPM build
Fedora Linux recently turned on some hardcore RPATH hardening
that causes RPM build to fail with a wide variety of prefixes unless
$ORIGIN is enabled.

It builds fine with /usr as the prefix because in that case we disable
the RPATH.

In the long run perhaps we should have the rpm-package target use the
standard prefix of /usr instead of the CMAKE_INSTALL_PREFIX, but even
so we want the spec file to work if /usr/local is set as the prefix.
Fix #17830
2022-01-04 21:48:31 -05:00
John Thacker 007883408f packaging: Fix git-export-release.sh when CI_COMMIT_SHA undefined
Commit 0d820ddc8d added set -u to
the script, so the test for CI_COMMIT_SHA (added in commit
e7296d5208) needs to be changed
so there isn't a fatal error if it is unset.
2022-01-05 01:21:08 +00:00
João Valverde 119473eab3 CMake: Use more consistent naming for options
Having some options use DISABLE_ and others ENABLE_ is inconsistent
and difficult to remember. Use ENABLE_ instead consistently.

Frame-larger-than remains an exception.
2022-01-03 15:55:06 +00:00
Stig Bjørlykke d8474fdee7 Happy New Year 2022 2022-01-01 14:08:38 +01:00
Gerald Combs 797c66cc4c NSIS: Complain about installing a 32-bit Wireshark on 64-bit Windows.
Show a warning messagebox if we're installing a 32-bit executable on
64-bit Windows.
2021-12-29 23:30:55 +00:00
Gerald Combs b62197c283 CMake+GitLab CI: Reduce verbosity.
For various commands, make sure we show warnings and errors, but not
other extraneous information such as filenames.
2021-12-11 13:57:29 -08:00
Pascal Quantin cd752deeac Windows: upgrade Npcap to 1.60 2021-12-09 22:41:07 +01:00
João Valverde 7d6c7e4167 CMake: Try to fix WiX packaging 2021-12-06 09:12:56 +00:00
Gerald Combs 261d223a30 Packaging: Remove a macOS notarization wait.
Older versions of altool couldn't submit uploads concurrently. According
to

https://threadreaderapp.com/thread/1146464491288219653.html

that's no longer the case for version 4.0 and later. Remove our hacky
concurrency check.
2021-12-01 15:43:15 -08:00
Gerald Combs 54ef97cc01 Packaging: Specify host architectures in our macOS Extras packages.
Add 'hostArchitectures="arm64,x86_64"' to the ChmodBPF and path_helper
distribution XML files. "arm64" isn't specified in

https://developer.apple.com/library/archive/documentation/DeveloperTools/Reference/DistributionDefinitionRef/Chapters/Distribution_XML_Ref.html

but seems to be correct:

https://developer.apple.com/forums/thread/667672
https://stackoverflow.com/questions/11487596/making-macos-installer-packages-which-are-developer-id-ready

Blind attempt at fixing #17757.
2021-11-30 09:24:02 -08:00
Gerald Combs 5e345d390b NSIS: Remove some confusing error message text.
If the Visual C++ Redistributable installation fails, don't point users
to KB2999226. It applied to Windows 8.1 and earlier, and is more likely
to cause confusion than help fix the problem. Ping #17748.
2021-11-28 21:31:35 +00:00
Pascal Quantin 5c8969b5d7 Windows: add PCRE2 DLL to installers 2021-11-15 23:07:15 +01:00
Gerald Combs 64275ff196 macOS: Update some comments in osx-app.sh. 2021-11-15 09:26:20 -08:00
Gerald Combs e3159ae631 macOS: Add a workaround for libpcre2.
Work around an issue with libpcre2 similar to what we do for libsnappy
and libssh.
2021-11-14 17:06:38 -08:00
Martin Mathieson 54ac7b4424 Fix some spelling errors 2021-10-20 10:00:12 +01:00
Gerald Combs 2236009e21 Packaging: Add captype to the Windows installers.
Add captype and its documentation to the NSIS and WiX packages.
2021-10-13 17:54:02 +00:00
Gerald Combs 7f47511653 Try to fix RPM packaging.
Asciidoctor is now required for packaging. Try to make sure it's
installed on CentOS 8 and openSUSE 15.2. Note that CentOS 8 doesn't have
an Asciidoctor package, which complicates our SPEC.
2021-10-01 18:26:24 +00:00
Gerald Combs 84ab55cf75 Docs+Packaging: Convert our man pages to Asciidoctor.
Convert doc/*.pod to Asciidoctor. This:

* Means we use the same markup for our man pages, the guides, and
  release notes.
* Lets us add versions to our man pages.
* Gives us more formatting options, e.g. AsciiDoc supports `commands`,
  nested lists and makes it easy to include version information. The
  manpage backend doesn't seem to support tables very well,
  unfortunately.

Convert our CMake configuration to produce *roff and html man pages
using Asciidoctor. Add a "manarg" block macro which makes our synopses
wrap correctly.

Similar to the release notes, guides, and FAQ, if Asciidoctor isn't
found the man pages won't be generated or installed.

Move Asciidoctor to the list of package build dependencies in various
places.

This commit includes the conversion script (pod2adoc.py), which will be
removed later.

Line count sanity check:

Man page         .pod .adoc
androiddump       260  280
asn2deb            93  105
capinfos          401  471
captype            54   55
ciscodump         241  269
dftest             42   42
dpauxmon          153  169
dumpcap           464  534
editcap           528  583
etwdump           136  156
extcap            157  181
idl2deb            91  103
idl2wrs           120  100
mergecap          206  207
mmdbresolve        75   75
randpkt           107  111
randpktdump       158  184
rawshark          558  610
reordercap         76   78
sdjournal         145  157
sshdump           272  302
text2pcap         274  312
tshark           2135 2360
udpdump           133  151
wireshark-filter  486  479
wireshark        2967 3420
2021-10-01 16:42:34 +00:00
Pascal Quantin 530ee0b365 Windows: upgrade Npcap to 1.55 2021-09-07 23:18:19 +02:00
Chuck Craft eb83421c96 NSIS: expand title area for long program names that wrap
Release candidates (rc blah blah hash) or if WIRESHARK_VERSION_EXTRA
is set for the build, are wrapped/clipped to be unreadable.
2021-09-04 06:19:42 +00:00
Gerald Combs 348d356594 Packaging: Update the macOS notarization failure error message.
Apple provides a status page for various developer services at
https://developer.apple.com/system-status/, including the status of the
Developer ID Notary Service. Show the URL notarization fails so that
troubleshooting is easier.
2021-09-01 10:24:58 -07:00
Chuck Craft eb2037fda4 NSIS: add ntar to AdditionalTasksPage screen 2021-08-29 21:02:09 +00:00
Gerald Combs e7296d5208 Packaging: Try to fix git-export-release.sh.
Attempting to release 3.5.0 failed with

No local changes to save
Creating ./wireshark-3.5.0.tar.xz
fatal: not a valid object name: stash@{0}

Use CI_COMMIT_SHA for our export commit if it exists.
2021-08-27 11:13:45 -07:00
Gerald Combs 28c4c947c0 GitLab CI: Enable macOS Arm notarization.
Enable code signing & notarization in the macOS Arm Package job. Add
"needs: []". Verify the .dmg after notarizing it.
2021-08-25 20:40:29 +00:00
Gerald Combs d2979e1976 GitLab CI: Initial macOS Arm build.
Add a "macOS Arm Package" job to .gitlab-ci.yml. Fixup a check in
osx-dmg.sh.
2021-08-24 21:22:41 +00:00
Gerald Combs 6cb4f17828 NSIS: Add DPI awareness
Set `ManifestDPIAware true` in the NSIS installer and uninstaller. Note
that this trades a better appearance on HiDPI displays for some
oddly-sized controls.
2021-07-16 08:43:31 +00:00
João Valverde ffcfc83ecb Rename version.h to be more descriptive
Version.h is too generic. This is specific to VCSVERSION and that
should be made more obvious and discoverable.
2021-07-09 18:27:41 +00:00
Pascal Quantin fa21433c35 Windows: upgrade Npcap to 1.50 2021-06-26 13:16:49 +02:00
Gerald Combs 6495e7da99 Packaging: Add 64-bit PortableApps packages.
Build WiresharkPortable32 or WiresharkPortable64 as appropriate for our
target platform. Add WiresharkPortable64 steps to the Win64 builder.
Update the Developer's Guide. Fixes #17260.
2021-06-19 22:53:45 +00:00
Gerald Combs 6bfab69d14 Windows: Switch from HTML Help to plain HTML.
Switch from HTML Help to plain HTML files. In the NSIS and WiX installers,
place the help assets in a directory with a friendly name.
2021-06-04 08:57:32 +00:00
Gerald Combs ffc5522a35 Packaging: "Acorn RISC Machine" was a long time ago.
Use "Arm 64" instead of "ARM 64" for our .dmg names.
2021-05-31 07:41:32 +00:00
Gerald Combs a714805628 macOS: Name our .dmgs according to our architecture.
In osx-dmg.sh, add "ARM 64" or "Intel 64" to our .dmg name depending on
the architecture of Wireshark.app/Contents/MacOS/Wireshark.
2021-05-30 17:32:32 +00:00
Anders Broman 9456a85022 NSIS: install all files in the protobuff directory. 2021-05-21 10:38:54 +02:00
Graham Bloice f6ad4812a2 Add SparkplugB dissector
Add a dissector for SparkplugB as a heuristic subdissector of MQTT
and which calls protobuf to dissect the messages payload.
2021-05-14 12:11:03 +01:00
Pascal Quantin 1408db615b Windows: upgrade Npcap to 1.31 2021-04-25 13:08:52 +02:00
Pascal Quantin 0338a7afac Windows: upgrade Npcap to 1.30 2021-04-12 22:54:39 +02:00
João Valverde 5dd15cd56c RPM: Don't install HTML manuals twice
Fixes e4d4814168.
2021-03-30 03:00:17 +01:00
Gerald Combs 5848d8a6f2 RPM: Update the HTML documentation location. 2021-03-29 15:16:36 -07:00
Pascal Quantin f6e0de60db Windows: upgrade Npcap to 1.20 2021-03-17 20:46:52 +00:00
Guy Harris 5d39e36198 doc: Clean up lists of file types.
Add missing entries, regularize the descriptions, etc..

Note that pcap and pcapng are the native formats.

Fix various issues.

Update the editcap -F output to match urrent reality.

While we're at it, sort the libwiretap modules, putting observer.c in
the right place.
2021-03-13 10:02:02 +00:00
Guy Harris e0afa7f2a4 Observer is now a product of Viavi.
JDSU bought Network Instruments, and then split into Viavi and Lumentum,
with Viavi getting Observer.
2021-03-11 20:02:14 +00:00
João Valverde e4b5573ff5 RPM: Fix build using the Unix Makefiles generator 2021-03-06 12:25:14 +00:00
Gerald Combs 45e6575699 WiX: Update the README.
Migrate packaging/wix/README to AsciiDoc and update its contents. Update
a comment in Wireshark.wxs.
2021-01-14 10:36:48 +00:00
Pascal Quantin a07898a280 Windows: add a notice to NSIS in case of BSOD while installing Npcap 2021-01-13 22:02:40 +00:00
Pascal Quantin 511aeaa44a Windows: fix USBPcap page link display in NSIS installer 2021-01-13 22:35:21 +01:00
Gerald Combs 0d820ddc8d Packaging+GitLab CI: Dist tarball updates.
Ninja keeps track of its built files in .ninja_log, so if you copy a
pre-built target into a fresh build directory, Ninja will ignore and
overwrite it. This includes the tarball generated by the 'dist' target.

In get-export-release.sh, check for a preexisting tarball and preserve
it by default. This lets us pass the dist tarball from one GitLab CI
stage to other stages without recreating it. It's also arguably the
right thing to do in general, since we record and publish the tarball
hashes for each release and different contents for the same filename can
cause confusion.

Move the dist tarball to the build directory in .gitlab-ci.yml, and add
a note about using the tarball exclusively.
2021-01-09 19:16:16 +00:00
Dario Lombardo 6b0f2ead7a rpm: disable double dash check on fedora.
Standard naming convention in Wireshark generates a version that
make the rpm build fail on Fedora. Since we've not evidence that
this happens on other platforms, just disable on that one.
2021-01-07 19:03:36 +00:00