aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/macosx
AgeCommit message (Collapse)AuthorFilesLines
2019-01-11Add captype and reordercap to the list of command-line binaries.Guy Harris1-0/+2
Change-Id: I7e9460960b83d673727aca1783c03952622aabb5 Reviewed-on: https://code.wireshark.org/review/31500 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-01Happy New Year 2019!Stig Bjørlykke1-2/+2
Change-Id: Ic140aafdb32e649e88bf3f00bda3cec9404e555a Reviewed-on: https://code.wireshark.org/review/31284 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-12-21macOS: Make sure we package our own libraries.Gerald Combs1-2/+9
As of 25e1e2c848 we no longer set LIBRARY_OUTPUT_DIRECTORY to Wireshark.app/Contents/Frameworks. As a result we need to copy them into place during our packaging process. Change-Id: Idbdea289dce60e9acf9ab317f4151bfe2c993ddd Reviewed-on: https://code.wireshark.org/review/31160 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-21macOS: Minimize our dsyms.Gerald Combs1-8/+13
Pass --minimize to dsymutil, which reduces the size of our dsyms. Print the name of each file as we dsymify it. Change-Id: Ic8b14daa2ceaa07c2c9ca3162020e5861d165f6d Ping-bug: 15361 Reviewed-on: https://code.wireshark.org/review/31150 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-16macOS: Fix a .dmg build path.Gerald Combs1-1/+1
Fix the "Read me first" path. Change-Id: I6d1a13a26db2023a30b7ae72caca86500d00f5b7 Reviewed-on: https://code.wireshark.org/review/31064 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-15CMake: Make sure we use the same minimum macOS version everywhere.Gerald Combs3-42/+43
Add a MIN_MACOS_VERSION variable. Update it and sanity check it according to CMAKE_OSX_DEPLOYMENT_TARGET and our Qt version. Use it to set our minimum macOS version in various places. Change-Id: Icaf0dbe463f34d182986868021e2b56d2239da38 Reviewed-on: https://code.wireshark.org/review/31048 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-10-30macos: Prevent darkmode from appearingRoland Knall1-0/+2
Prevent dark mode from being used on newer versions of mac os x, as long as Qt does not allow proper dark mode handling Change-Id: Ifee14ec690331689b0a8a7486829dd129a2687b4 Reviewed-on: https://code.wireshark.org/review/30425 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-10-22No need for the debugging output.Guy Harris1-1/+1
The chmods seem to be working. Change-Id: I0f85a1428de511497597a3fd304c700ea1a1f846 Reviewed-on: https://code.wireshark.org/review/30331 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-10-22Fix quoting.Guy Harris1-4/+4
Change-Id: I3a0a8c661b1fec2ea4475eb9fe1d5c8a8ed7bbb5 Reviewed-on: https://code.wireshark.org/review/30328 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-10-22Make the chmod verbose.Guy Harris1-1/+1
For some reason it's *not* taking away write permission; make it verbose to try to debug that. Change-Id: I180309953d36798d2da3a74959cdd934adc5a4a3 Reviewed-on: https://code.wireshark.org/review/30325 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-10-22Don't unload the XQuartzFixer job if it doesn't exist.Guy Harris1-5/+13
But *do* get rid of the pre-launchd XQuartzFixer startup item; it's probably not there, but we might as well leave things as clean as we can. Change-Id: Icfdbe6c0d022cde8cf30bd3c79fbf77896e6fe98 Reviewed-on: https://code.wireshark.org/review/30322 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-10-21More permission fixes.Guy Harris1-1/+3
Take away group write permission for stuff under /Library/Application Support/Wireshark. For some reason, it's getting set; it's not necessary. Change-Id: I4280a635e0c171cf5ad17cb91fe20d746c2daf79 Reviewed-on: https://code.wireshark.org/review/30317 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-10-21Get rid of a launchd daemon we no longer need.Guy Harris1-0/+9
Change-Id: Ic287d6d8a84876da10ca600ef3899b40c8f5663e Reviewed-on: https://code.wireshark.org/review/30310 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-10-21Fix ownership and permissions on /Library/Application Support/Wireshark.Guy Harris1-0/+12
Bug: 14335 Change-Id: I657b024554e1eff01544b7726a7eec74c8da8be1 Reviewed-on: https://code.wireshark.org/review/30307 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-10-21Don't give launchd daemon plists execute permission.Guy Harris1-5/+5
They don't need it; read permission suffices. While we're at it, rename a variable to indicate that it's the path to the plist for ChmodBPF, not the path to the executable for ChmodBPF. Change-Id: Ib7537e26ae3f4477c4110759049a8cd7d2f09cf6 Reviewed-on: https://code.wireshark.org/review/30303 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-06-21CMake+macOS: Make sure we're using the right Qt tools.Gerald Combs1-2/+2
Qt5CoreConfigExtras.cmake sets Qt5::qmake. Use it to find the corresponding path to macdeployqt and use those in osx-app.sh. Change-Id: I2e67f0126e272fc95d40476b9bfc83ab38d73cee Reviewed-on: https://code.wireshark.org/review/28359 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-06-08Fixup a couple of shellcheck "fixes".Gerald Combs1-4/+5
Change-Id: If3e6acf28c22cbc98a26c7e12c449e27fdc1321e Reviewed-on: https://code.wireshark.org/review/28164 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-07Fix a comparison.Gerald Combs1-3/+3
Change-Id: Ibecdf6be6c6957afc176e6eb97f60f19b090b40c Reviewed-on: https://code.wireshark.org/review/28091 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-07More shellcheck checks and fixes.Gerald Combs2-57/+60
Remove a libtool check while we're here. Change-Id: I813add2031480f34ce89f268b541f8939016c2c7 Reviewed-on: https://code.wireshark.org/review/28066 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-02Fix the utility-launcher to look at the name it's run as.Guy Harris1-1/+5
If it's run as "tshark", it should run TShark, not Wireshark. Bug: 14643 Change-Id: I0d4e6fa64e42b7a2e2d4b89b53db62748b4f288d Reviewed-on: https://code.wireshark.org/review/27245 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-04-18Remove autotools build system.Dario Lombardo1-52/+0
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 Combs1-13/+1
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-03-06Transition from GeoIP Legacy to MaxMindDB.Gerald Combs1-0/+1
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-02Remove the endpoint "Map" feature.Gerald Combs1-7/+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-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-04Process all subdirectories of $pkgplugin as directories of plugins.Guy Harris1-3/+5
That way we don't have to change the script if we add new plugin subdirectories. Change-Id: Ic788807c723306e461b7c1f8721b48a46d4fff96 Reviewed-on: https://code.wireshark.org/review/25584 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-03Handle separate directories for libwireshark and libwiretap plugins.Guy Harris1-3/+4
We now have "epan" and "wiretap" subdirectories of the plugin directory, with the first containing libwireshark plugins and the second containing libwiretap plugins. Look for plugins in those directories, rather than in the top-level plugin directory. Bug: 14389 Change-Id: Ia3bd4d27e82215207e7a7dcfc8f91042bbc61737 Reviewed-on: https://code.wireshark.org/review/25577 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-01-11Use an enum for plugin types.Gerald Combs1-1/+1
Make plugins.c the source of truth for plugin names. Where plugins reside and what they do are two different things, so split the plugin directory and description into two separate elements. CMake creates portable[1] builds on Windows and macOS. That is, the build-time directory layout is the same as the installation directory layout. Adjust various plugin paths macOS accordingly. [1] You have to run osx-app.sh on macOS to prepare the application bundle, but the goal is to create a directory/bundle that can be moved or copied to a different system and run in the new location. Change-Id: Icf9d02e61918fdf1404468baf52542910edf2743 Reviewed-on: https://code.wireshark.org/review/25166 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-01-09Use pcapng as the name of the file format.Guy Harris1-1/+1
At one point, I remember a discussion resulting in the official name of the next-generation replacement for pcap format being changed to "pcapng", with no hyphen. Make Wireshark reflect that. Change-Id: Ie66fb13a0fe3a8682143106dab601952e9154e2a Reviewed-on: https://code.wireshark.org/review/25214 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-01-01Happy New Year 2018!Stig Bjørlykke1-2/+2
Change-Id: I61ece8256384786c718fe2c1bc8813560fa372eb Reviewed-on: https://code.wireshark.org/review/25094 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-10-15autotools: make maintainer-clean should allow rerunning 'configure'João Valverde1-2/+0
Change-Id: Iedae94ffefe27b13b1967d69cacb757b5aa4576d Reviewed-on: https://code.wireshark.org/review/23928 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-10-06Make osx-app.sh a configured file and remove Autotools targets.Gerald Combs2-2/+2
Rename osx-app.sh to osx-app.sh.in and add the version to the plugin path at configure time. Instead up updating Autotools accordingly just remove the macOS packaging targets. gf61c381b5a removed support for Autotools in osx-app.sh and if anyone wants to build macOS packages I'd prefer that they use the same toolchain as the buildbot. Change-Id: Ide5205265bf8859a85b1afab68fa8f8285952bd3 Reviewed-on: https://code.wireshark.org/review/23839 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-04Remove unused code from osx-app.shGerald Combs1-98/+0
Remove Autotools-specific code from osx-app.sh. The official builders have used CMake for a while and as far as I know no one else uses our packaging scripts. Change-Id: I6fc20114b42e10dacc69346c379055b68184b85c Reviewed-on: https://code.wireshark.org/review/23833 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-03macOS: Fixup app bundle rpathification.Gerald Combs1-11/+6
rpathify_dir is not recursive so the plugin path fix in g94af9724d1 wasn't sufficient. Make sure $pkgplugin is set to the versioned plugin subdirectory so that both rpathification and code signing work. Find the Qt frameworks directory using qmake while we're here. This should be more reliable than calling pkg-config (which doesn't work on my laptop). Bug: 14096 Change-Id: I0196015f849fd27994a439359cddd88c21106fde Reviewed-on: https://code.wireshark.org/review/23832 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-09-25macOS: Fixup plugin signing.Gerald Combs1-1/+1
Use `find` to find plugins. Change-Id: I6df8877547ecbd19644a846e5cb02e8b65f19e61 Reviewed-on: https://code.wireshark.org/review/23730 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-04-05More OS name cleanups.Guy Harris3-2/+2
Use macOS when not referring to a particular release; use the appropriate name when referring to a particular release. Change-Id: I9293d4db7c91d7c859d7c067c0f0b3c9c482fcc5 Reviewed-on: https://code.wireshark.org/review/20935 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-05A bunch of "{Mac} OS X" -> "macOS" changes.Guy Harris3-8/+8
Avoid anachronisms, however; there was no "macOS 10.0" or even "OS X 10.0", for example. It was "Mac OS X" until 10.8 (although 10.7 was sometimes called "OS X" and sometimes called "Mac OS X"), and it was "OS X" from 10.8 to 10.11. Change-Id: Ie4a848997dcc6c45c2245c1fb84ec526032375c3 Reviewed-on: https://code.wireshark.org/review/20933 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-25 11:10:12 +0000