aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
AgeCommit message (Collapse)AuthorFilesLines
2018-04-20Windows: add JSON-GLib libraryPascal Quantin2-2/+2
Change-Id: I9b266bffc74779f9d28eabb5642644a2b0afa7cf Reviewed-on: https://code.wireshark.org/review/27049 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-18Remove autotools build system.Dario Lombardo8-139/+2
It has been replaced by cmake. Change-Id: I83a5eddb8645dbbf6bca9f026066d2e995d8e87a Reviewed-on: https://code.wireshark.org/review/26969 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-17More GTK+ removal.Gerald Combs2-115/+5
Remove GTK+ entries from .gitignore and start removing it from packaging. Change-Id: I70391000906e983eab250c8158b486c3dc6d4a16 Reviewed-on: https://code.wireshark.org/review/26988 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-16RPM: restore the bindir in openSUSE before packing.Dario Lombardo1-0/+6
Change-Id: I6e60d1a299528c0f1603b56704a8c47f18c66d08 Reviewed-on: https://code.wireshark.org/review/26926 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16RPM: install wireshark.desktop in /usr/share/applications.Dario Lombardo1-0/+4
The presence of this file in /usr/share/applications in required by suse_update_desktop_file, as described here: https://en.opensuse.org/openSUSE:Packaging_Conventions_RPM_Macros#.25suse_update_desktop_file Change-Id: I88573afca2d4523a1b305bf4dc672c421c2fa1d1 Reviewed-on: https://code.wireshark.org/review/26925 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16RPM: cd into build dir in openSUSE.Dario Lombardo1-0/+6
This step is needed because of the differences in the %cmake macro between Fedora/Centos and openSUSE. Change-Id: I7ac94e560b4c298934f78e96036a814f3eadc4a5 Reviewed-on: https://code.wireshark.org/review/26924 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11RPM: don't give the cmake macro the directory (it has it already).Dario Lombardo1-1/+0
Change-Id: I1c3febf527f16825793a30eb2ab5d43baaa83a57 Reviewed-on: https://code.wireshark.org/review/26880 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11RPM: set the cmake bindir in openSUSE.Dario Lombardo1-0/+5
Change-Id: I41edf52f8021938877bc53dd5eea4ff29cf4827e Reviewed-on: https://code.wireshark.org/review/26878 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11RPM: set ninja executable in %install target.Dario Lombardo1-0/+1
It is not inherited by previous target. Change-Id: I11be59211a900375e02fce8c05cc4164b8dc42e4 Reviewed-on: https://code.wireshark.org/review/26877 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11RPM: fix typo.Dario Lombardo1-1/+1
Change-Id: I2e82fb0696e2e7cb636ec1fdfb72a566e0eca94f Reviewed-on: https://code.wireshark.org/review/26879 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-04-11RPM: don't install doc under guides with make.Dario Lombardo1-2/+2
Change-Id: Iaa8f3d941dcb329bbfff28f6d9417b92d44371e1 Reviewed-on: https://code.wireshark.org/review/26876 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11RPM: Make documentation installation optional.Gerald Combs1-3/+17
Add a "guides" bcond so that we can make Asciidoctor and the HTML guide installation optional. Change-Id: I5f9e6cc59689dba7d600cc721547aed020652f00 Reviewed-on: https://code.wireshark.org/review/26867 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11RPM: support multiple ninja executables.Dario Lombardo1-3/+7
Support ninja and ninja-build (Centos7) so far. Change-Id: I846a0645f24f6cfdc83bd725827d1681a5a1f174 Reviewed-on: https://code.wireshark.org/review/26856 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11RPM: install guides when using make.Dario Lombardo1-0/+1
Change-Id: I89ca826f39dea3f53b94a87ccc2fbe3f9bb4a2b1 Reviewed-on: https://code.wireshark.org/review/26861 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-09Autotools: More Qt4 removal.Gerald Combs1-1/+1
Change-Id: I6609160530d2e2f0ca47c324de48aa659c253bcf Reviewed-on: https://code.wireshark.org/review/26812 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-04-06Remove some references to Qt4.Gerald Combs2-31/+1
Change-Id: I50f5abafb8adf18a5407427f7feb260301df45cc Reviewed-on: https://code.wireshark.org/review/26771 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-05GTK Cmake: Remove the option to build the GTK UI.AndersBroman2-148/+0
Change-Id: If702717b559a727388d83ce82c0fc2967c662ff0 Reviewed-on: https://code.wireshark.org/review/26747 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-04CMake RPM build: Try to get rid of %globals in favor of %bcond.Anders1-18/+16
Change-Id: I051fb722b0c4161b373f04a79288faa41a61c3cc Reviewed-on: https://code.wireshark.org/review/26735 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-26Added Diameter AVP decode details for Override Control AVPs in the Cisco ↵Mike Lugo1-0/+1
Systems XML file. Added a new file for Verizon specific AVPs via Verizon.xml. Added calls to Verizon XML in hte dictional XML file. Change-Id: I30e9d80e6304b1b5c79367a752e239091c6ec171 Reviewed-on: https://code.wireshark.org/review/26594 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-26CMake: Add an rpm-package target.Gerald Combs2-0/+551
Copy the current wireshark.spec.in and update it for use with CMake. Remove the Qt4, GTK+2, and GTK+3 options. Add Ninja and mmdbresolve options. The rpm-package target builds a tarball using git-export-release.sh and therefore must be run from a git checkout. The RPM _prefix macro is set to CMAKE_INSTALL_PREFIX, so you'll probably want to run cmake -DCMAKE_INSTALL_PREFIX=/usr ... Change-Id: Ib014494d8858a0059126404cd91528ded5d8a9f6 Reviewed-on: https://code.wireshark.org/review/26579 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-17NSIS: Link to Npcap.Gerald Combs4-17/+26
Mention Npcap on the WinPcap installer page and add a link to it. Update some other text and tell developers to use NSIS 3.0 while we're here. Change-Id: I64728f014f518439ba4a38eda7a283274d40fcdc Reviewed-on: https://code.wireshark.org/review/26515 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-09Add MaxMindDB 1.3.2 library to WindowsPascal Quantin3-2/+4
Change-Id: I328b6a05cc356be59ac63e80eae55a832bf76a47 Reviewed-on: https://code.wireshark.org/review/26347 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-09spdx: more licenses converted.Dario Lombardo3-39/+3
Change-Id: Ia1650bc02511f7bd47fb90be91b623177f05bcbd Reviewed-on: https://code.wireshark.org/review/26337 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-07More licenses converted to SPDX.Dario Lombardo1-13/+1
Change-Id: Id4f987dcdacf06622d70263f4659a4400e30dc39 Reviewed-on: https://code.wireshark.org/review/26332 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-07NSIS, WiX: Handle the presence or absence of mmdbresolve.Gerald Combs7-8/+24
Only install mmdbresolve if MAXMINDDB_FOUND is true. Fixup the Qt about box and WiX GTK defines while we're here. Change-Id: I7ac3c21ddb4aebc1dae1c3d8cfd2bcafc4139d2e Reviewed-on: https://code.wireshark.org/review/26299 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-06Transition from GeoIP Legacy to MaxMindDB.Gerald Combs8-17/+55
MaxMind is discontinuing its legacy databases in April in favor of GeoIP2, which use a newer database format (MaxMind DB). The reference C library (libmaxminddb) is available under the Apache 2.0 license which isn't quite compatible with ours. Add mmdbresolve, a utility that reads IPv4 and IPv6 addresses on stdin and prints resolved information on stdout. Place it under a liberal license (MIT) so that we can keep libmaxminddb at arm's length. Add epan/maxmind_db.[ch], which spawns mmdbresolve and communicates with it via stdio. Migrate the preferences and documentation to MaxMindDB. Change the IPv4 and IPv6 asnum fields to FT_UINT32s. Change the geographic coordinate fields to FT_DOUBLEs. Bug: 10658 Change-Id: I24aeed637bea1b41d173270bda413af230f4425f Reviewed-on: https://code.wireshark.org/review/26214 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-04Windows: Remove support for MSVC older than VS2015Graham Bloice4-34/+5
Cleanup the support for older versions of Visual Studio Change-Id: Ieb97d56e9bff6a5902433e8d99b27276bc7034f7 Reviewed-on: https://code.wireshark.org/review/26247 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-03WiX: install the other plugin types as wellJaap Keuter2-1/+31
The WiX toolset configuration files have to be extended to handle the new plugin directory structure as well. Apart from the EPAN plugins the wiretap and codec plugins have to be included as well. Change-Id: I173e6b87a88e4ef8aa3283a308e2b5207f0d6ba2 Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-on: https://code.wireshark.org/review/26176 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-02Remove an ipmap remnant.Gerald Combs1-1/+0
Change-Id: I391043aa0fdfce132a552e063d850d17bcf5a4de Reviewed-on: https://code.wireshark.org/review/26230 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-02Remove the endpoint "Map" feature.Gerald Combs4-12/+0
Remove the endpoint map and its button from the Qt and GTK+ UIs. It depends on GeoIP Legacy for coordinate information and those databases are being deprecated in favor of MaxMind DB. We *could* upgrade the code to use mmdbresolve, but according to https://dev.maxmind.com/geoip/geoip2/geolite2/ they're also going to remove coordinate information from GeoLite2: "In addition, in 2019, latitude and longitude coordinates in the GeoLite2 databases will be removed.* Latitude and longitude coordinates will continue to be provided in GeoIP2 databases. Please check back for updates." Change-Id: I43e1593d282a0f1aae897b1f4724117d1496b21e Reviewed-on: https://code.wireshark.org/review/26229 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-02Windows: Update target version infoGraham Bloice2-2/+14
Set the API target level to Win7, along with installer changes to match. Change-Id: Icd93964eadf93018c56218e3efdfed10b9f8959a Reviewed-on: https://code.wireshark.org/review/26218 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2018-02-28L16_mono: Add L16 monaural codec plugin as functional exampleJaap Keuter1-0/+6
This codec plugin serves a dual purpose. First it is to add L16 codec suppport to Wireshark. Second it is an illustration of a basic codec plugin module. Change-Id: I64394dab3257ae49dece0257b16cd969503918e2 Reviewed-on: https://code.wireshark.org/review/26131 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-26Squelch some warning noise when dsymifying.Guy Harris1-1/+5
Change-Id: I1e6c05ce9d2f08abb7e3f86a95cc7b8f8af56ab2 Reviewed-on: https://code.wireshark.org/review/26124 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-26Dsymify binary files.Guy Harris1-0/+28
See if that makes it possible for CrashReporter to fully symbolicate crash dumps, so the user gets line numbers and the like in crash dumps from the OS, and we get them if the user sends a crash dump to us. Change-Id: I8bb48b2d2f6b3e23fea43c1a3bd3a5a9a97a5c2c Reviewed-on: https://code.wireshark.org/review/26123 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-23Get rid of the ipmap.html that got dropped into Contents/MacOS.Guy Harris1-0/+7
Change-Id: Ieb94ca78a92fc5369fe3b396373c2f7a31d8894a Reviewed-on: https://code.wireshark.org/review/26072 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-23The DOCSIS dissector isn't a plugin any more, either.Guy Harris1-1/+1
Change-Id: Ibd4b775af335a34ec27efe7454a460cd47720954 Reviewed-on: https://code.wireshark.org/review/26071 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-23Remove more cruft.Guy Harris1-4/+0
There's no Wireshark.app/Contents/Resources/bin directory; remove the variable containing its path, and the part of an error message that refers to it. Change-Id: Id41cc00a2671925c50b2075dd3e9d0f84d5bd921 Reviewed-on: https://code.wireshark.org/review/26039 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-23Get rid of the -sdkroot option; it doesn't affect anything.Guy Harris1-6/+1
Change-Id: I9797eea30594f5e48b21f1c2daede18777e690b1 Reviewed-on: https://code.wireshark.org/review/26036 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-23Fix stripping of binaries.Guy Harris1-1/+1
Instead of using the never-defined $binpath (undefined going back to at least Wireshark 1.0.0 - is it a leftover from the Inkscape version?), use $bundle_binary_list, to strip all the executables with strip -ur. (Not that we want to strip anything - we don't even want the debugging symbols stripped! - but for cleanliness.) Change-Id: I9c3520ffb418bf9dc206d3ccb55d347c208f3be2 Reviewed-on: https://code.wireshark.org/review/26033 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-23Remove a bunch of obsolete code.Guy Harris1-116/+7
We no longer have the code to create a bundle, as we rely on CMake having done so, at least to the extent of populating the bundle with all the files we've generated. Get rid of the code that used to support it, and the command-line options that are no longer necessary now that we no longer build code bundles. Don't have explicit lists of CLI or extcap binaries; instead, just look for all plain files in Wireshark.app/Contents/MacOS that have read and execute permissions for owner/group/user. That way, we don't have to update the script if we add new binaries or new directories of binaries. Change-Id: I047296a7889bea71165eebde10f34bec6ea96cc5 Reviewed-on: https://code.wireshark.org/review/26032 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-23Don't use find to find files to check for dependencies.Guy Harris1-11/+18
It may find files that aren't Mach-O binary files. Instead, rename cs_binary_list to bundle_binary_list, and use it when checking for dependencies as well as when code-signing binaries. Change-Id: I9d17a4ba137e494fbd38db1b62f5cc7e4b620fc9 Reviewed-on: https://code.wireshark.org/review/26028 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-23Code-sign extcap binaries.Guy Harris1-0/+3
Change-Id: Icfca94774b929767560a06f873fbf90c3d0bebef Reviewed-on: https://code.wireshark.org/review/26024 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-22Check for dependencies in all subdirectories of $pkglib and $pkgexec.Guy Harris1-11/+21
Just use "find" to find plain files under $pkglib and $pkgexec; this avoids trying to run otool on directories, which can cause it to stop looking in $pkgexec/* past the extcap directory, and does try to run it on the Qt frameworks in subdirectories under $pkglib. Add a comment giving more details about the big command to find dependencies. Change-Id: Ife3c3a8493ca0b6ea28f1bb108f63714366abeed Reviewed-on: https://code.wireshark.org/review/26003 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-22Update comments to reflect current reality.Guy Harris1-2/+2
Change-Id: Ie0fcc197ed8841b5f7098a5129b774507646f2de Reviewed-on: https://code.wireshark.org/review/26001 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-22Don't strip debugging symbols from the binaries in the macOS image.Guy Harris1-1/+1
Unstripped binaries should allow better stack traces in the CrashReporter files. Change-Id: Idb2f11cd664dc62331f3394dee09abcd4e88f897 Reviewed-on: https://code.wireshark.org/review/25977 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-21Fix detection of file type.Guy Harris1-1/+1
Some versions of otool print the file name as the first line when you run it with -hv, so that the line containing the file type is the fourth line; others don't print it, so that it's the third line. Instead, look for the line that has MH_MAGIC. Change-Id: Ib14f6b24f14069532263332e53a1e9895663641a Reviewed-on: https://code.wireshark.org/review/25968 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-15Look in %VCToolsRedistDir% for the VC++ redistributable.Gerald Combs2-3/+3
Look in %VCToolsRedistDir% for the redistributable that we ship with the NSIS installer. Clarify a couple of status messages. Change-Id: I965d15947c3d3422d7c722afa581f4f7dfc2725a Reviewed-on: https://code.wireshark.org/review/25804 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-14Wix: Look for merge modules in %VCToolsRedistDir%.Gerald Combs1-0/+6
Add "%VCToolsRedistDir%\MergeModules" to the merge module search path. This is required for Visual Studio 2017 here. Change-Id: I91cd1527ae80c85ed304c1233436cae52aa0a501 Reviewed-on: https://code.wireshark.org/review/25782 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-13Make the DOCSIS dissector a built-in dissector.Guy Harris2-5/+0
Stuff that calls it is built in, and stuff it calls is built in, so there's not much point in having it be a plugin; we already have examples of plugin dissectors. Change-Id: I512e0fda62faedb5f03f476fbece2e267e1d644f Reviewed-on: https://code.wireshark.org/review/25775 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-11Switch from AsciiDoc to Asciidoctor.Gerald Combs1-1/+1
Switch the markup text processor for files in the docbook directory from AsciiDoc to Asciidoctor. Asciidoctor has several useful features (such as direct PDF output) and is actively developed. It's written in Ruby but that dependency can be sidestepped with AsciidoctorJ, a self-contained bundle that only depends on the JRE. The current toolchain targets require Python, AsciiDoc, DocBook XML, DocBook XSL, Java, FOP, xsltproc, lynx, and the HTMLHelp compiler: HTML: AsciiDoc → DocBook XML → xsltproc + DocBook XSL Chunked HTML: AsciiDoc → DocBook XML → xsltproc + DocBook XSL PDF: AsciiDoc → DocBook XML → xsltproc + DocBook XSL → FOP HTMLHelp: AsciiDoc → DocBook XML → xsltproc + DocBook XSL → HHC This change removes the AsciiDoc and FOP requirements and adds either AsciidoctorJ or Asciidoctor + Ruby: HTML: Asciidoctor → DocBook XML → xsltproc + DocBook XSL Chunked HTML: Asciidoctor → DocBook XML → xsltproc + DocBook XSL PDF: Asciidoctor HTMLHelp: Asciidoctor → DocBook XML → xsltproc + DocBook XSL → HHC Ideally we could generate all of these using AsciidoctorJ, Java, and lynx. Unfortunately we're not there yet. The release notes depend on several macros (ws-buglink, ws-salink, cve-idlink, sort-and-group). Add Asciidoctor (Ruby) equivalents. Remove the BUILD_xxx_GUIDES CMake options and add various output targets automatically. This means that you have to build the various documentation targets explicitly. Change-Id: I31930677a656b99b1c6839bb6c33a13db951eb9a Reviewed-on: https://code.wireshark.org/review/25668 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-23 02:46:32 +0000