aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
AgeCommit message (Collapse)AuthorFilesLines
2017-10-15autotools: make maintainer-clean should allow rerunning 'configure'João Valverde6-15/+1
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-10-02Remove the SVR4 packaging assets.Gerald Combs5-155/+1
Remove the svr4-package and solaris-package targets along with their associated files and directories. We used to use this to build Solaris packages but we haven't shipped those in years. Given that the last substantive change to packaging/svr4 was in 2008 it's likely that this has been unused for a while. Change-Id: Ib9153c99f503200ea8c48d3ef81ad688ee55c09f Reviewed-on: https://code.wireshark.org/review/23808 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-01Fix WiX installerJoão Valverde1-1/+0
Change-Id: I27af4758393c12962edab10267ae41bd2f11a07e Reviewed-on: https://code.wireshark.org/review/23804 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-01Unsplit "m2m" plugin (wimax mac-to-mac encapsulation)João Valverde2-4/+0
... not to be confused with "machine-to-machine". M2M seems to be a simple Wimax encapsulation protocol developed by Intel. It's not documented publicly anywhere that I can find. The boilerplate to code ratio is huge and it even includes a complete source file from the Wimax dissector (yuck). Put it in the Wimax plugin instead. Minor version number bump for wimax plugin. Change-Id: I2694339dfe89be334093b257a5b34d1577f4dc20 Reviewed-on: https://code.wireshark.org/review/23790 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-28PortableApps: Don't ship development files.Gerald Combs1-0/+2
Exclude .exp and .lib files when we run xcopy. Change-Id: I913a1360507a8812a678efcd35d9afe58167d11b Reviewed-on: https://code.wireshark.org/review/23777 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-09-24Windows: fix NSIS and WiX installersPascal Quantin2-28/+28
Change-Id: I10f21de6ee9cf403690c66d02cbbd43ebb9d52bc Reviewed-on: https://code.wireshark.org/review/23689 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-09-23Add lcap file extension to nsis and wix installers.Joerg Mayer4-3/+40
Also add ntar file extention to wix installer to match nsis Change-Id: Idb6f660fda27c6ad3c3cd70acd482eafa2c14307 Reviewed-on: https://code.wireshark.org/review/23656 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2017-09-23plugins: Fixups for g9260461f4fJoão Valverde3-5/+7
Put plugins in CMake build dir with a version subdir. This avoids some weird special cases, however running with autotools from build dir displays the wrong global folder in about->folders. Unfortunately the hack to run from the autotools build dir is troublesome. Various fixes for Windows builds. Try to fix also build dir issue loading plugins on macOS with ENABLE_APPLICATION_BUNDLE (blind). Change-Id: Ic3c7c21f5850c12a53844202d61fa0592b45739c Reviewed-on: https://code.wireshark.org/review/23657 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-22nsis: Always create the extcap directoryStig Bjørlykke1-1/+3
Change-Id: I6955c242036c3aa76be4ceb545905ffeef906518 Reviewed-on: https://code.wireshark.org/review/23654 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-08-27Update USBPcap to 1.2.0.3Pascal Quantin3-3/+3
Change-Id: Ie5dbe818e214738ea8e82fe7d72fc8a20b30691b Reviewed-on: https://code.wireshark.org/review/23221 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-08-16CMake: Switch back to shipping README.txt on Windows.Gerald Combs1-4/+4
Instead of trying to ship README.md, convert its line endings and make sure the result is named README.txt. Change-Id: I4e081587c73342b01633b3a31ea03068e3fc1733 Reviewed-on: https://code.wireshark.org/review/23098 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-16Fix build.Guy Harris1-1/+1
That's a separate README file for this directory, and its name is README, not README.md like the top-level README file. Change-Id: I9ec920de6a844441e00d4608608563bc4ddd8349 Reviewed-on: https://code.wireshark.org/review/23096 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-15Convert README to README.md.Gerald Combs2-5/+5
Convert the contents of the top-level README to Markdown and give it a .md extension. Most of our documentation is plain text or AsciiDoc, but the top-level README file in a Git repository is special in that many online browsers will show the README contents along with the directory listing and those browsers tend to favor Markdown. This is true of GitHub (which we're currently mirroring to), Gerrit via its Gitiles plugin (which we're not yet using but likely will), and other places. Add "foreign" to AM_INIT_AUTOMAKE. There is probably a joke to be made here about the FSF and border walls. Change-Id: I87c306d74864e1f0a432225b160a1b4483ee946c Reviewed-on: https://code.wireshark.org/review/23049 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-07nsis: Fix typo in installerStig Bjørlykke1-1/+1
Change-Id: Ic958729517dda653fc3f511379aa48956d87d225 Reviewed-on: https://code.wireshark.org/review/22986 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-08-01Update USBPcap to 1.2.0.2Pascal Quantin3-3/+3
Change-Id: I0f318cdd3644ef4eb2195bed3d0bd561dde7f6dc Reviewed-on: https://code.wireshark.org/review/22903 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-30Add G.729 decoding based on bcg729 libraryPascal Quantin3-3/+14
Bug: 13635 Change-Id: Ic22a0719a59da13e51425aeb747e88caca0d6512 Reviewed-on: https://code.wireshark.org/review/22808 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-23Put the well-known addresses into a separate file from OUIsJoão Valverde3-0/+6
Having two distinct logical concepts (OUI and Well Known Address) concatenated to a single "manuf" file is needlessly obfuscating the WKA feature. Have a distinct "wka" file instead and just skip the cat. Change-Id: I46f53b0015a37331d65f8cfac7cbbd499dd0c5b8 Reviewed-on: https://code.wireshark.org/review/22742 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-15Rename enterprises to enterprises.tsv and ship it.Gerald Combs3-0/+8
Rename "enterprises" to "enterprises.tsv" so that its format is a bit more obvious and so that double-clicking the file might do something useful. Add it to the Windows packages. Change-Id: I5ef54a04ce1b4926aa4535e756e04b3e2a56d463 Reviewed-on: https://code.wireshark.org/review/22616 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-27WiX: More merge module fixups.Gerald Combs1-7/+13
Look for our merge module using find_path. This should be more reliable and doesn't assume our build and target platforms are the same. Change-Id: I95a4454a063af2f978550b8cf1f1624c4aeb5ebc Reviewed-on: https://code.wireshark.org/review/22426 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-23Add dftest to Windows installer.Michael Mann4-1/+26
Bug: 13825 Change-Id: Ibda27599739a26a388e1c66ae813ff5c2c8339be Reviewed-on: https://code.wireshark.org/review/22367 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-17WiX: Fixup merge module configuration.Gerald Combs2-5/+15
Set the merge module path based on our platform and version of Visual Studio. Change-Id: Ic866447f36d5264d61fc988f3f9d8b4d2e5c0827 Reviewed-on: https://code.wireshark.org/review/22192 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-09NSIS: Add support for Visual Studio 2017.Gerald Combs1-6/+24
Also fixes a bug where vcredist was found in C:\Program Files\Wireshark Change-Id: I0bc5c7410a95677d21c2e28ba66d6a9d186fe2a9 Reviewed-on: https://code.wireshark.org/review/22044 Petri-Dish: Anders Broman <a.broman58@gmail.com> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-07WiX: Switch to Visual Studio 2015.Gerald Combs2-4/+4
The Windows builders now use Visual Studio 2015. Change-Id: I0fe4defd090930a0b8531e544d03ad4f3b36dac1 Reviewed-on: https://code.wireshark.org/review/22018 Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 316d09a5aee68904ba0348c2017647b4dea3aab1) Reviewed-on: https://code.wireshark.org/review/22019
2017-05-31Sort the RADIUS dictionaries and account for a rename of one of them.Guy Harris1-9/+9
Change-Id: Ieea5349a38366a68cd313e70c8f1d28828982d7b Reviewed-on: https://code.wireshark.org/review/21862 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-31Fix nsis intallerGraham Bloice1-1/+1
The radius erx disctionary has been renamed to unisphere. Change-Id: I3d8a4b9d8f6a5340f3a92274816e66bdaa55ffd3 Reviewed-on: https://code.wireshark.org/review/21858 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2017-05-30Add Inovar specific Diameter AVP codesMichael Mann1-0/+1
Bug: 13349 Change-Id: I2a06ee3bd7ab1f81414ad8e4155c1430a7287644 Reviewed-on: https://code.wireshark.org/review/21778 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-05-29radius: Sync with FreeRADIUSAlexis La Goutte1-0/+1
add Dell EMC dictonary commit 2b2a7dc5654abf740ff7ffb52fc0807a5e0f1781 Author: Alan T. DeKok <aland@freeradius.org> Date: Wed May 24 15:55:05 2017 -0400 as posted to the list Change-Id: If3e7e7f401c6f1eca5292f0f323c2cd86dfd3fcc Reviewed-on: https://code.wireshark.org/review/21787 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-12Windows: update LZ4 to 1.7.5 and USBPcap to 1.2.0.1Pascal Quantin3-3/+3
Change-Id: I02eb4c255a0794b650f566abdadcac16e97196af Reviewed-on: https://code.wireshark.org/review/21609 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-19[Diameter] Add Juniper SCG AVPsGuy Davies1-0/+1
Change-Id: I832a82b4edbfce26e3edceb0f6baed3b7a1c8b62 Reviewed-on: https://code.wireshark.org/review/21190 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-19Add libxml2 as optional dependencyAhmad Fatoum3-3/+16
This can be used by dissectors that need to parse out-of-band configuration. Change-Id: I13c0a2f408fb5c21bad7ab3d7971e0fa8ed7d783 Reviewed-on: https://code.wireshark.org/review/20912 Reviewed-by: Roland Knall <rknall@gmail.com>
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>
2017-02-26Remove executable bit, from not executable files.Jakub Zawadzki2-0/+0
Change-Id: I8afa246172cd8d5a86513ade2f482566e3f9957a Reviewed-on: https://code.wireshark.org/review/20272 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2017-02-26RADIUS: add cnergee dictionary (from FreeRADIUS)Alexis La Goutte1-0/+1
commit e37987492b0d575a8ef41900ef916244112b2468 Author: Alan T. DeKok <aland@freeradius.org> Date: Sat Feb 18 12:11:05 2017 -0500 Dictionary from cnergee. Which modifications so that the names don't conflict with existing ones. Change-Id: I4fed7f38300dd8bcf526e5a07eec6c7812991d95 Reviewed-on: https://code.wireshark.org/review/20258 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-04Revert "Another change required for that."Guy Harris1-1/+1
This reverts commit 3cfa4f760276bf995aca2479166a2128451fd402. Nope, *not* needed, and not wanted, either. Change-Id: I71ac174a9b9b19980d0a6f44088d0a66f71ef99b Reviewed-on: https://code.wireshark.org/review/19538 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04Another change required for that.Guy Harris1-1/+1
Bug: 13270 Change-Id: I86e779c8f7b89ca928556d8b1acc1015b96f9100 Reviewed-on: https://code.wireshark.org/review/19537 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04Running Wireshark through a symlink doesn't work.Guy Harris3-21/+22
We can't just symbolically link to the executables, as that means that the executable won't be in Contents/MacOS, which means that all @executable_path-relative references will go to the wrong place if we run the executables using the symlink, which means that the executables could fail (they *do* fail to find the Cocoa Qt plugin, for example). So, instead, we go back to the old version of the utility launcher, and put that in Contents/Resources/bin as well as, if the user requests the CLI utilities, /usr/local/bin. Maybe PackageMaker will find that acceptable and include them in the installer package. Bug: 13270 Change-Id: I4016b58c9ce0df05d78525d35e53431750c2b4d9 Reviewed-on: https://code.wireshark.org/review/19536 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04Oops, source and target are the other way around.Guy Harris1-2/+2
Bug: 13270 Change-Id: Ibeddb435acca298c90f2d6b9c0228e8a9a747b38 Reviewed-on: https://code.wireshark.org/review/19534 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04Create the Content/Resources/bin directory if necessary.Guy Harris1-0/+4
Bug: 13270 Change-Id: Idc4223a24d6d2037d13a85331ce63e5a24168d3a Reviewed-on: https://code.wireshark.org/review/19533 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04Remove trailing whitespace.Guy Harris1-1/+1
Change-Id: Ifdea8516ccce7a72c88470913ce36b9226dfcb54 Reviewed-on: https://code.wireshark.org/review/19532 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04Put symlinks to the executables in Contents/Resources/bin.Guy Harris1-1/+13
PackageMaker appears not to put them into the installer package, so construct them in the Wireshark post-install script. Bug: 13270 Change-Id: Idfa10d4d123d2c0e2f7b3ad65888e075fbfd27a7 Reviewed-on: https://code.wireshark.org/review/19531 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-01Happy new Year 2017 !Alexis La Goutte1-2/+2
Change-Id: I8ae8a1fdc8d0df0779ef119c527f41dac9e0dbdb Reviewed-on: https://code.wireshark.org/review/19476 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-28macosx: Update Read me first.rtf with some additional install/deinstall notesJim Young1-6/+20
Report that files /etc/paths.d/Wireshark and /etc/manpaths.d/Wireshark are added and should be removed. Change-Id: I2f9d3aea0dd4f86cb9a86065108a3948e28d3001 Reviewed-on: https://code.wireshark.org/review/19436 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-12-25Wireshark doesn't require X11 any more.Guy Harris1-1/+1
Change-Id: Ib5ba38e5103f31f115608b92dd32f3ce1e5eec67 Reviewed-on: https://code.wireshark.org/review/19424 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-21[rpm-build] Add an option to exclude extcap.AndersBroman1-0/+9
Change-Id: Ibe16ad31986818fcd6e1bfbcfdd38ecc7663dd39 Reviewed-on: https://code.wireshark.org/review/19360 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-12-16Add symlinks to Wireshark binaries in Resources/bin, and point there.Guy Harris3-30/+33
That way, $PATH points to .../Wireshark.app/Contents/Resources/bin, so the man command will look in .../Wireshark.app/Contents/Resources/share/man. This also may obviate the need to install the wrapper scripts in /usr/local/bin, although those scripts obviate the need to re-set PATH after installing Wireshark. Change-Id: I7202b5a0fe5d2b90c956dc0db2af073f6c08b00d Reviewed-on: https://code.wireshark.org/review/19296 Reviewed-by: Guy Harris <guy@alum.mit.edu>