aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
AgeCommit message (Collapse)AuthorFilesLines
2016-04-26NSIS: Pass /install to vcredist_xNN.exe.Gerald Combs1-6/+2
Explicitly pass /install to the Visual C++ redistributable installer. A few people have reported issues with missing or incorrect redistributable files after installing Wireshark but unfortunately haven't provided much in the way of further detail. Is it possible that the installer sometimes goes into /repair, /layout, or /uninstall modes? Remove checks for old, unsupported compilers while we're here. Change-Id: I4e24dbe562c8aeb6ce63ec98ea1601cba5256806 Reviewed-on: https://code.wireshark.org/review/15120 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2016-04-25Another fix for RPM spec file version stringJoão Valverde1-1/+1
Change-Id: I424640867173ccd5655b4cefb457d76f845e7966 Reviewed-on: https://code.wireshark.org/review/15111 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-04-25Compile sshdump and ciscodump for WindowsPascal Quantin4-17/+19
Use libSSH 0.7.2 compiled with MinGW(32|64) and linked with zlib and gcrypt support Change-Id: I7c17d1ba3dd1890e2f83c119f5ea851834807e43 Reviewed-on: https://code.wireshark.org/review/12117 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-23autotools: Fix rpm-package targetJoão Valverde1-4/+6
Change-Id: I6012199370a17d534ba7633509cd95c8a81aaebd Reviewed-on: https://code.wireshark.org/review/15062 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-04-14Update the RPM packaging to use the new Gtk ./configure optionsJeff Morriss1-5/+4
Follow-up to I0a6cd56f92b0f7dc8f06aa93f36622887d506fb5. Change-Id: Ie5bcffb84b1d6298b2d0f93205491c9a10b603c5 Reviewed-on: https://code.wireshark.org/review/14907 Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-04-09Update USBPcap installer packaged in our Windows installer and add a warningPascal Quantin4-5/+30
The newer version creates a system restore point during installation Also add an explicit note in Wireshark installer explaining that USBPcap is experimental and some hints on how to recover in case of issue Bug: 12316 Change-Id: Ifb15ee98bf9db843debe5878f3df8c78f846d8d0 Reviewed-on: https://code.wireshark.org/review/14854 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: Anders Broman <a.broman58@gmail.com>
2016-04-08Fix CMake VC Redist messageGraham Bloice1-1/+1
The usage message was using the wrong variable Change-Id: I5ca261240db49134f3d48a5e322d9272f8af7adf Reviewed-on: https://code.wireshark.org/review/14865 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2016-04-08Fix a typoAndersBroman1-1/+1
Change-Id: I32c551fc39ef496e8bbaba288c4ad4dafa2412c9 Reviewed-on: https://code.wireshark.org/review/14862 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-08[MSVC2015] Fix finding of vcredist when using MSVC2015.AndersBroman1-7/+9
Change-Id: I23ddc8c7601e61c7c092a258e4e540bc475e020a Reviewed-on: https://code.wireshark.org/review/14831 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-21Remove ADNS supportJoão Valverde1-8/+0
Relevant mailing list message: https://www.wireshark.org/lists/wireshark-dev/201503/msg00007.html Change-Id: I0cff6d4d64fb52a651bcf6b28c183e43653b1cc2 Reviewed-on: https://code.wireshark.org/review/14519 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-14OS X: Remove GTK+ packaging.Gerald Combs52-4029/+46
Remove the GTK+-specific bits from packaging/macosx. Change-Id: I8f7d909f971e60723e421005fdf46de967c69533 Reviewed-on: https://code.wireshark.org/review/14431 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-11Remove the last remnants of U3 support.Gerald Combs1-3/+1
Change-Id: Ide4c177e67a77c5f9495b3b4c0f817f40e6dde30 Reviewed-on: https://code.wireshark.org/review/14425 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-11OS X packaging: Remove some unused files.Gerald Combs4-1370/+0
Change-Id: Id01af6460828338bd3d0ac59e20000e93999ca7b Reviewed-on: https://code.wireshark.org/review/14424 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-02-15Build the extcap programs in the extcap directory.Guy Harris1-10/+49
That lets the version of Wireshark built with autotools find the extcap programs. Don't install the extcap programs under ${datadir} - that puts it under a share directory, and share directories are for platform-independent files, which executable images aren't (they're instruction-set dependent, hence platform-dependent). Change-Id: I992eeb984bdbe6b3476777f7114628c83df6080f Reviewed-on: https://code.wireshark.org/review/13943 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-11autotools: Add more silent build rulesJoão Valverde1-1/+1
Change-Id: I4abff8880d5b3ff439e6abc9cf3c2d17897501ea Reviewed-on: https://code.wireshark.org/review/13816 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>
2016-01-21Revert "Diameter: Add Redknee AVPs."Jeff Morriss1-1/+0
As requested by the supplier of the data. This reverts commit ab754d6ba4c0bc6d8d00aec137d8b1e97331d1f4. Change-Id: I3f4e19a0a7f4c75da0e2e2b5a01b187692ebf0a9 Reviewed-on: https://code.wireshark.org/review/13468 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-01Welcome in 2016, part 2Stig Bjørlykke1-2/+2
Change-Id: I75f87b78ecec0859d0ebecee39ec257374f86541 Reviewed-on: https://code.wireshark.org/review/12993 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-01-01CPack: WiX updates.Gerald Combs1-0/+101
WiX prefers rich text license files. Add an RTF version of the GPLv2. It was created by converting the "standalone HTML" version of the license at http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html to RTF using Pandoc 1.11. Start splitting CPackConfig.txt into Win32 and non-Win32 sections. Add a WiX section. Change-Id: Ifcb233053c8a2158f087b69c69de7df869af65aa Reviewed-on: https://code.wireshark.org/review/12980 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-12-23Diameter: Add Redknee AVPs.Jeff Morriss1-0/+1
Also add a couple Verizon Wireless and Wimax AVPs. All taken from the attachments to bug 11907. Change-Id: Ie45935f421c4797783f616a75ef35486447ff950 Reviewed-on: https://code.wireshark.org/review/12833 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-22extcap: add randpktdump, a random packet generator.Dario Lombardo4-0/+13
This new extcap is for testing and educational purpose. It relies on rankpkt-core functions to generate random packets. Change-Id: If6890f0673545682995a2079458108edc0913b30 Reviewed-on: https://code.wireshark.org/review/11764 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>
2015-12-12Update USBPcap installer packagedPascal Quantin1-2/+2
NSIS script modified to: - check for KB 3033929 presence on Windows 7 / 2008R2 (as we sign drivers with a SHA2 certificate) - do not delete the installation folder if not empty Bug: 11766 Change-Id: I5c7b6378b0775bb75c1b9e58e503997176c12213 Reviewed-on: https://code.wireshark.org/review/12546 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>
2015-12-04CMake+PortableApps: Include the VC runtime (second try).Gerald Combs2-15/+16
Move the code that finds the Visual C++ redistributable DLLs to its own module. Run it before we create our NSIS and PortableApps targets. Add a PortableApps target that copies the redistributable This reverts commit 403fa9fbe0cdba3f443ec4674cda40092525ffe4. Bug: 11800 Change-Id: I081d8fd3f5f37dd590659ca8f2bd309642a9a9df Reviewed-on: https://code.wireshark.org/review/12431 Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 5b580834aeeee8477039bc099c49c21aeeb3b71f) Reviewed-on: https://code.wireshark.org/review/12432 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2015-12-03Change codecs from static to dynamic libraryPascal Quantin2-1/+2
This allows to properly register codecs plugins. See https://www.wireshark.org/lists/wireshark-dev/201511/msg00202.html for details. Change-Id: Ibc13a19936abb7a2e81b86582a75fa424351565b Reviewed-on: https://code.wireshark.org/review/12385 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-01Removed some remaining svn Id tagsStig Bjørlykke3-3/+0
Change-Id: I7ffbf59099132cde55995bde991d1c6a5dd224b0 Reviewed-on: https://code.wireshark.org/review/12330 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-11-26NSIS: refuse to install on Windows XP or Server 2003Gerald Combs2-47/+146
Warn the user when installing on Windows Server 2003 along with XP. CMake builds are not targeting them, and their support was officially dropped with Wireshark 1.12. Update our copy of GetWindowsVersion.nsh with "Alternate Script With Server Versions" from http://nsis.sourceforge.net/Get_Windows_version. Change-Id: I762859ea13e1ecd91757eeab360a39d1e6116144 Reviewed-on: https://code.wireshark.org/review/11972 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-21Fix OSX 10.5 autotools package for missing sshdumpGraham Bloice1-1/+5
Make sshdump addition to the package conditional depending on whether it is actually built. Change-Id: Ifeaa134fdb3dcd88e48ff0c796f0c21c804eba77 Reviewed-on: https://code.wireshark.org/review/12023 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-11-19nmake: fix char in commentDario Lombardo1-2/+2
Change-Id: I463f1641fd199cc58be0f88668e40064b9fce120 Reviewed-on: https://code.wireshark.org/review/11970 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-19osx: fix build when binary list is not fully compiled.Dario Lombardo1-1/+3
It can happen that the $binary_list contains apps that are not compiled (eg. for the lack of a lib). In this case the binary can't be added to the package. Fixed checking that the binary going to be signed is present. Change-Id: Iefd9438de972302523ba28596e905b11513a4fea Reviewed-on: https://code.wireshark.org/review/11968 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-19extcap: add sshdump.Dario Lombardo4-0/+19
sshdump is an extcap module that allows dumping from a remote host using an ssh connection. It goes with the existing extcap plugin interface. Change-Id: I8987614fdd817b8173a50130812bc643a4833bca Reviewed-on: https://code.wireshark.org/review/11402 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-16Don't include wireshark-gtk.desktop in RPMs.Jeff Morriss1-2/+4
The RPMs use 'alternatives' to determine which GUI is used so it doesn't make sense to have 2 desktop entries: one for 'wireshark' (Qt or Gtk GUI, depending on configuration) and one for 'wireshark-gtk' (the Gtk GUI). (Maybe it makes sense to just not use 'alternatives' and allow the user to pick which GUI is used via the menu system. But then if they wanted to run the Gtk+ GUI from the command line they'd need to remember to run 'wireshark-gtk' even if that's the only GUI installed...) Change-Id: I9d3fe13bb01eab87caad4ad21c6571ef6288b110 Reviewed-on: https://code.wireshark.org/review/11780 Reviewed-by: Balint Reczey <balint@balintreczey.hu> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-11-11CMake: set WinPcap version in top CMakeLists.txt file like for NMakePascal Quantin1-1/+1
This allows displaying the WinPcap version in about dialog Change-Id: Ic3f4256d81db68314a158fc55682dfd9dbf799a0 Reviewed-on: https://code.wireshark.org/review/11726 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-11-11Rename the wireshark-gnome RPM package wireshark-gtk.Jeff Morriss1-5/+13
This was mentioned a while ago in another change but I forgot about it until seeing Gerald's recent release-notes change (which indicates that the RPM and Debian package names for the old GUI are wireshark-gtk). Change-Id: I2a39fce38086d3716c8ef2a07eb8f23bb91a25fa Reviewed-on: https://code.wireshark.org/review/11709 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-11-11GTK: Add separate working desktop file for GTK+ Wireshark GUIBalint Reczey1-0/+3
Change-Id: I52a749b7e2b9a4a5cb2968409e140b9d5f2002f6 Reviewed-on: https://code.wireshark.org/review/11696 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-11-10Apple calls it just "OS X" these days.Guy Harris4-6/+6
Change-Id: I98905988ceb394d27307d1cbe883d8fe95ac23e4 Reviewed-on: https://code.wireshark.org/review/11703 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-07NSIS: clear errors before checking WinPcap uninstall registry entryPascal Quantin1-2/+4
Otherwise it can lead to a false verdict in after the check for Wireshark uninstall registry entry Bug: 10867 Change-Id: I213ac8ffadfb3578b05d33b996540bd4330a0ec5 Reviewed-on: https://code.wireshark.org/review/11621 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-22Try to fix osx-app.sh bundle creation.Gerald Combs1-0/+1
Change-Id: I6d96974fae3956a017a007988a1ed145f08d4647 Reviewed-on: https://code.wireshark.org/review/11220 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-22osx-app.sh: Make sure we sign the Wireshark executable.Gerald Combs1-1/+1
Change-Id: Ib94bfd5fb8579d8bd824109806d340ee3e4f2f1c Reviewed-on: https://code.wireshark.org/review/11217 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-22osx-app.sh: Fix bundling.Gerald Combs1-2/+9
When creating a bundle using osx-app.sh (i.e. when we're using Autotools), make sure we copy androiddump to the extcap subdirectory. Change-Id: Iabb24ae969ae77856f15dd94120cc6e395311198 Reviewed-on: https://code.wireshark.org/review/11215 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-22osx-app.sh: Make sure we sign our binaries.Gerald Combs1-0/+16
Throw an error if we don't. Change-Id: I7967fe8903f989e6e1a1e8193fb65c6ce086595b Ping-Bug: 11620 Reviewed-on: https://code.wireshark.org/review/11213 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-22osx-app.sh fixups.Gerald Combs1-77/+129
For libraries, instead of prefixing dependent library paths with @executable_path/../Framework, prefix them with @rpath. This should let us load them from different directory depths. Remove any LC_RPATH not in an allowed list of prefixes. This should keep us from leaking paths specific to the build environment and user, and should make any portability problems more obvious. Add either @executable_path/../Frameworks or @executable_path/../../Frameworks as an LC_RPATH depending on which actually exists. This lets us place androiddump in the extcap subdirectory. Add error checking in a few places and make sure we detect failures in subshells. Add a macdeployqt buglink. Bug: 11620 Change-Id: I43ef02ecc6f741761fcb9827c0b0b7b2ef16fa9a Reviewed-on: https://code.wireshark.org/review/11205 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-15Fix pathname (they're relative to the directory containing Makefile.am).Guy Harris1-1/+1
Change-Id: Ib3d5aae5f813c4fa5fbad420cd96c0daa3e935dc Reviewed-on: https://code.wireshark.org/review/11069 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-15Add missing CMake files to the tarball.Gerald Combs2-3/+6
Make sure we can build from the tarball using CMake. Tested on Windows. Change-Id: Iffc1ac964279e573aa2a8280b9bb4e799f10a974 Reviewed-on: https://code.wireshark.org/review/11066 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-08Blind attempt trying to fix CMake based installerPascal Quantin1-0/+2
Looks like Petri-Dish does not generate it Change-Id: I90823d82ac9d223d840ab20331a856550dffdc87 Reviewed-on: https://code.wireshark.org/review/10872 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-08Add USBPcapPage.ini file to distributionPascal Quantin3-1/+4
Change-Id: I05ed2c561818fd4293543199063551dd65fb5c55 Reviewed-on: https://code.wireshark.org/review/10871 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-08Add USBPcap 1.1.0.0-g794bf26 to Windows installerPascal Quantin4-0/+149
Change-Id: Idb88cd41436e49b7a29bd4a8e896c92d8489318d Reviewed-on: https://code.wireshark.org/review/10868 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: Anders Broman <a.broman58@gmail.com>
2015-10-03Windows: add missing folders to uninstallerPascal Quantin1-0/+8
Change-Id: I1f3ff0aff3233b4eec708208cb533b8a027a4db7 Reviewed-on: https://code.wireshark.org/review/10763 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>
2015-10-01CMake: OS X packaging updates.Gerald Combs1-0/+1
Add a dmg_package_prep target as an alias to app_bundle. Rename the osx-dmg target to dmg_package. This matches the Windows packaging target names. In osx-app.sh, make sure we rpathify the bundle plugin directory. Change-Id: If41195c9d405ad6bff865625500a8227b77e8092 Reviewed-on: https://code.wireshark.org/review/10734 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-01OS X: Integrate CMake and osx-dmg.shGerald Combs2-8/+20
Change-Id: Ide608f5e73ecd40c67a6b1c0e16f11233cd49c9d Reviewed-on: https://code.wireshark.org/review/10694 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-28Cosmetic tidy up for the projects in the Visual Studio solutionGraham Bloice1-0/+1
Change-Id: Ie4ed28ee7e59def2e8a15433334988b4d0225d1d Reviewed-on: https://code.wireshark.org/review/10675 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-09-16Don't force Lua support in RPMs (some distros don't ship a compatible LuaJeff Morriss1-12/+17
anymore). Also make the RPM follow configure's qt4-vs-qt5 choice. Change-Id: I832af99e055d42b92f3a7c8e4378c7a9d5d628b9 Reviewed-on: https://code.wireshark.org/review/10532 Reviewed-by: Jeffrey Smith <whydoubt@gmail.com> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 05:56:17 +0000