aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
AgeCommit message (Collapse)AuthorFilesLines
2015-03-16CMake: Fix an uninstall.exe dependency.Gerald Combs1-6/+14
Make sure building nsis_package doesn't clobber uninstall.exe. Change-Id: I8d00adb7fd3813c48118a0690feccb6a06bf15cb Reviewed-on: https://code.wireshark.org/review/7710 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-12CMake: Add a top-level nsis_package target.Gerald Combs6-383/+548
Add packaging/nsis/CMakeLists.txt and use it to generate each NSIS include file. Add macros to generate packaging-related targets and invoke them from the top-level CMakeLists.txt. Add a top-level "plugins" target. Copy plugins to "plugins" in each of our staging directories instead of "plugins/$VERSION". Add missing files to the copy_data_files and copy_cli_dlls targets. Add all files in the NSIS package from the staging directory. Drop a bunch of no-longer-needed defines, e.g. MSVC_VARIANT. Change-Id: Ib1079260d164c65118050f1431af8e582cd577fa Reviewed-on: https://code.wireshark.org/review/6459 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-03-10Change a lot of http:// URLs to https://.Gerald Combs2-11/+11
Most of our sites are now HTTPS-only. Update URLs accordingly. Update other URLs while we're at it. Remove or comment out dead links. Change-Id: I7c4f323e6585d22760bb90bf28fc0faa6b893a33 Reviewed-on: https://code.wireshark.org/review/7621 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-02-18RADIUS: Add new dicto from FreeRADIUSAlexis La Goutte1-1/+2
commit 6c51e945a73844029f347c3fdaa0de1ec96473f1 Author: Alan T. DeKok <aland@freeradius.org> Date: Tue Feb 10 13:22:39 2015 -0500 New dictionary Change-Id: I60ba21dbadd3e35c1b0b01d7cea14b683f7f2a0c Reviewed-on: https://code.wireshark.org/review/7237 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-18Add an appdata entry for Wireshark.Jeff Morriss1-0/+7
Based on the one from Richard Hughes. A French translation of the description field is included. Links to two screenshots are provided--they are stored in my home directory on wireshark.org (for lack of a better place that I can put them). Bug: 10479 Change-Id: Ida9b9e46c0fb23a7baff50f98afa597b25b8ca54 Reviewed-on: https://code.wireshark.org/review/4178 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-02-04RADIUS: Sync with FreeRADIUS MasterAlexis La Goutte1-0/+2
commit 852f15c72d41c637865776d5b80097e8ffbbb444 Author: Alan T. DeKok <aland@freeradius.org> Date: Mon Jan 26 13:08:21 2015 -0500 As found on the net commit 53bf263d6ca9010acdc004bada894b1bfe0ed676 Author: Tobias Hachmer <tobias@hachmer.de> Date: Mon Jan 26 13:45:04 2015 +0100 add perle dictionary Change-Id: I15dd8705277f3a0cedd2ea12a7cac9974dadf3c0 Reviewed-on: https://code.wireshark.org/review/6835 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-22Add a changelog entry for the license tag change ↵Jeff Morriss1-1/+4
(I82de1bc4ffcb1e962b1a35dc58aaa87aca04ed5e). Change-Id: I5e715579be9b415cd0fd957c66c7bd82319c88b3 Reviewed-on: https://code.wireshark.org/review/6743 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-01-21NSIS: Simplify wireshark.nsi.Gerald Combs2-216/+117
Replace a pile-o-ifdefs with generated include files. This should make it easier to add an NSIS target to CMake. Drop ICONV_DIR and ADNS_DLL. We haven't used either for quite a while. Change-Id: I71b08cccdb9fe2b2a166b63848a9ded5ebc5f873 Reviewed-on: https://code.wireshark.org/review/6717 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-01-21Make the license tag in the RPM more specific: Wireshark is GPLv2+.Jeff Morriss1-1/+1
Change-Id: I82de1bc4ffcb1e962b1a35dc58aaa87aca04ed5e Reviewed-on: https://code.wireshark.org/review/6701 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-21Modernize the description of Wireshark given in the RPM info.Jeff Morriss1-12/+18
The initial suggestions came from Michal Labedzki on https://code.wireshark.org/review/#/c/4178 Change-Id: Iae04d667f70ae73b46d2edc1645c238ef6efc518 Reviewed-on: https://code.wireshark.org/review/6511 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Niels de Vos <devos@fedoraproject.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-01-19Updated company name from Nokia Siemens Networks to Nokia Solutions and ↵Josip Medved1-1/+1
Networks. Change-Id: I93782facc2e3f9ff6358cf617968fac30bac1f7a Reviewed-on: https://code.wireshark.org/review/6647 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: Anders Broman <a.broman58@gmail.com>
2015-01-06NSIS: Quote all paths in config.nsh.Gerald Combs2-19/+20
Fix the MAKEDIR substitution. Add config.nsh to .gitignore. Change-Id: I9c5f6469569e826e4a8036b9b1b483c16558f788 Reviewed-on: https://code.wireshark.org/review/6351 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06$(MSVCR_DLL) might contain spaces, so we need to quote that sed expression.Guy Harris1-1/+1
Change-Id: Ia3aca07a5aa8adcc99d17fa559662d79659f46ca Reviewed-on: https://code.wireshark.org/review/6348 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-06NSIS: Move definitions to their own file.Gerald Combs4-90/+195
Convert the pile-o-makensis-flags to a pile-o-sed-commands which creates a "config.nsh" file. This should hopefully make it easier to port the "packaging" target to CMake. Change-Id: I439fea5721c5b209a753044a8e9e8ac6fc5291c3 Reviewed-on: https://code.wireshark.org/review/6345 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-05Attempt to fix "make distcheck" on Ubuntu buildbotStephen Fisher1-2/+2
Change-Id: I6e7ea1e2aaf839fdb3af8a3a5a47aabbb12056ef Reviewed-on: https://code.wireshark.org/review/6326 Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2015-01-05Get rid of some GNU make extensions so users can build withStephen Fisher1-1/+1
the make that comes with *BSD and other systems now. Change-Id: Ib2eee8d37e7029202675bac35839b1c0d5fc5131 Reviewed-on: https://code.wireshark.org/review/6320 Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2015-01-03It is also 2015 for Mac OS X :-)Alexis La Goutte1-2/+2
Change-Id: Idbd5e09ac80015feee7ddd30b9569219fde596e1 Reviewed-on: https://code.wireshark.org/review/6269 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-03Info.plist : fix indent (use tabs)Alexis La Goutte1-1/+1
Change-Id: I241c124fa341ae5d6126a189374d69dea1a08d96 Reviewed-on: https://code.wireshark.org/review/6268 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-04Fix building of RPMs and get RPM builds working with a prefix other than ↵Jeff Morriss1-23/+25
/usr again. (Change I567269d8e45e6543d9e39dbedc49830adf7edb9f made the desktop files install outside of /usr/share/ .) RPMs now build and work regardless of the prefix but the desktop integration stuff only works if the prefix is /usr or (if you're lucky) /usr/local . Change-Id: If20e0127a044eac1ba099f959a90d068c4bb2ae5 Reviewed-on: https://code.wireshark.org/review/5600 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-12-04Tell the loader where to find our libraries if we're being installedJeff Morriss1-9/+14
someplace other than /usr . Change-Id: I42cbe98bcfc0e8ba2aa08f651044db051d31205c (cherry picked from commit 25d9695cb3536b672f4cd8bc280e2a3c816a0d8a) Conflicts: packaging/rpm/SPECS/wireshark.spec.in Reviewed-on: https://code.wireshark.org/review/5605 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-12-03Don't run gtk-update-icon-cache when uninstalling the Qt package. But do runJeff Morriss1-2/+5
it when installing the gnome package. Change-Id: I0bbd9c0edc3fb6fe0e672aa3dbea5ba23d847d87 Reviewed-on: https://code.wireshark.org/review/5598 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-11-28RADIUS: Sync with FreeRADIUS MasterAlexis La Goutte1-0/+2
commit 30dac6d3dc87aaaa9c29ecdb33874fa57c2bcbc6 Author: Alan T. DeKok <aland@freeradius.org> Date: Tue Nov 25 16:45:45 2014 -0500 as found on the net commit ee79c59d3a1cae76fcb1940710d9a0f7fbdf8427 Author: Arran Cudbard-Bell <a.cudbardb@freeradius.org> Date: Thu Nov 13 17:39:46 2014 -0500 Add memcached rlm_cache_driver commit 6277960bc830891123b00400af56912e51d4d311 Author: Alan T. DeKok <aland@freeradius.org> Date: Tue Oct 28 17:01:49 2014 -0400 Add FreeRADIUS-Response-Delay-USec Change-Id: I705d0e852d38eaace4f71cfc0a38ecdd41c0b58f Reviewed-on: https://code.wireshark.org/review/5510 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>
2014-11-17PortableApps: ensure that the personal folder is set to the App directoryPascal Quantin1-0/+3
Otherwise the portable version ends up loading the user local personal profile Change-Id: Ib670c065319b0dd9673f239ae9459f6ee530f69e Reviewed-on: https://code.wireshark.org/review/5351 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-11-03[Radius] Update dictionaries from freeradius 3.0.4Anish Bhatt1-2/+49
Update includes all new/renamed dictionaries in radius, but does not cover any differences in already included dictionaries, which will be handled in a separate update. Change-Id: I6d1e1cc1815423fb71ec940366964a366ab41a25 Reviewed-on: https://code.wireshark.org/review/4947 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-02Fix syntax.Guy Harris1-1/+0
Change-Id: Icc18cd7369bae21629aafd5631a373485ef75dea Reviewed-on: https://code.wireshark.org/review/5081 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-02Handle packagemaker being an ordinary command in /usr/bin.Guy Harris1-0/+4
Change-Id: Ic804a0fdb4dc450683f57be4814a347e20ecd401 Reviewed-on: https://code.wireshark.org/review/5079 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-02Fix syntax, add a check for failure to find PackageMaker, make sure it's a file.Guy Harris1-6/+12
Change-Id: Id5bb23a8c5ebd8a63a51029de541cd32e484029c Reviewed-on: https://code.wireshark.org/review/5078 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-02Handle PackageMaker a bit better.Guy Harris1-8/+19
Look for the binary in various places, rather than looking for particular directories and adding them to the path. That lets us use the PackageMaker binary from the PackageMaker.app bundle (it can either be run as a GUI app or from the command line), so you don't have to have a symlink to it from one of the directories in question. Change-Id: I1ad701291698544f96d419663f0b4a669876d2f1 Reviewed-on: https://code.wireshark.org/review/5077 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-30Add a missing backslash.Gerald Combs1-1/+1
Change-Id: Iac79c885fe10805b61512ed2c02cd652f1c3fd7a Reviewed-on: https://code.wireshark.org/review/5010 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-30OS X: Don't add libtool control files to the app bundle.Gerald Combs1-1/+3
According to https://developer.apple.com/library/mac/technotes/tn2206 the Contents/PlugIns directory should *only* contain executable files. Only copy .so (and in case we need them) .dylib files. Change-Id: I01f077735018733926db92e7576f6f4fecb68862 Reviewed-on: https://code.wireshark.org/review/5008 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-23OS X: Integrate CMake and osx-app.shGerald Combs1-196/+219
Add a -cb/--create-bundle option to osx-app.sh which builds the application bundle. Use it in Autotools. (CMake does this by default.) Copy over linker flags from configure.ac to CMakeLists.txt to support rpathification and code signing. Add an osx-app custom target to CMake. Change-Id: I6c20a1c27f8954aaea62904b7425b9312d994803 Reviewed-on: https://code.wireshark.org/review/4918 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-22OS X: Fix osx-dmg.sh bundle binary path.Gerald Combs1-1/+1
Change-Id: Ia7c59de4f8b59dda9dbc484b8fa9ae0c3d88d594 Reviewed-on: https://code.wireshark.org/review/4905 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-21osx-app.sh: Add verbosity.Gerald Combs1-1/+1
Change-Id: I3cd1c49909af34badd0d5c5f29bfcddb753ef2bf Reviewed-on: https://code.wireshark.org/review/4902 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-21Make the "-qt" option the default in the OS X packaging scripts.Gerald Combs2-10/+22
Change-Id: I1e404c342d06381be71735ff6fbc47e9b2b13899 Reviewed-on: https://code.wireshark.org/review/4895 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-20OS X: Add retina / hidpi support to Info.plist.Gerald Combs1-64/+66
This should partially fix the problem described at https://ask.wireshark.org/questions/37177/pixelated-ui-on-mac-os-x-with-development-1990 Change-Id: I436aae0d5b681e9ff549d257c2244ee67448ab07 Reviewed-on: https://code.wireshark.org/review/4876 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-14NSIS: Wireshark GTK is Wireshark legacy (and no Wireshark 1...) !Alexis La Goutte2-5/+5
Change-Id: I3b4f4ca28bc7d363474bc888b6a3a8ddbdb7dab9 Reviewed-on: https://code.wireshark.org/review/3867 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-13Add Kerberos 3.2.2 package for Win64Pascal Quantin2-3/+6
Change-Id: If02469aa1a01972d2032478dce3bf872802f37cb Reviewed-on: https://code.wireshark.org/review/4661 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-13Upgrade Win64 GTK2 package to 2.24.23-3.39Pascal Quantin1-1/+0
Change-Id: I0f5f27aa2fc13f38af73a42e1c6e4a36636d2fc7 Reviewed-on: https://code.wireshark.org/review/4656 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-09-03Don't override the PA package naming convention. Use our full version inGerald Combs3-20/+11
the package name. Set a minimum OS version (Vista). Update some comments. Change-Id: I28096276d2588993136b008a307dbcc7983496b0 Reviewed-on: https://code.wireshark.org/review/3974 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-03Fix dist. Remove unused files.Gerald Combs4-151/+3
Change-Id: I44b2dbfa3859841c67e933d8e7c510834b7cc2ee Reviewed-on: https://code.wireshark.org/review/3967 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-03OS X packaging fix.Gerald Combs1-1/+1
Change-Id: I82936bb1dcfa3a7ca1aea8a3ded388015aa37531 Reviewed-on: https://code.wireshark.org/review/3966 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-03Fix the PortableApps package name.Gerald Combs3-207/+4
Remove Installer.nsi while we're here. Change-Id: I739d5d825fd76eac9b50d26fab2d44e853dc83f9 Reviewed-on: https://code.wireshark.org/review/3965 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-03PortableApps: Remove invalid makefile commands.Gerald Combs1-2/+0
Change-Id: I6ed0f72a6915cd12d7866c978dce0d25c328dffd Reviewed-on: https://code.wireshark.org/review/3964 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-02OS X packaging fix: wireshark-qt → wireshark.Gerald Combs1-2/+2
Change-Id: Ie95c28ca47baf453335abab23eb7baba63d52f47 Reviewed-on: https://code.wireshark.org/review/3963 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-02Fix PortableApps packaging.Gerald Combs8-352/+139
Our Windows portable packaging environment has a lot of cruft which is no longer relevant. We removed support for U3 packages and the method we use to generate PortableApps packages has been deprecated for a while. Create PortableApps packages using current file formats (AppInfo v3.0) and tools. Generate the PA launcher using the PortableApps.com Launcher generator. Copy files and directories from the top level instead of using a manifest derived from the NSIS installer. The manifest is a good idea, but we should create a central manifest and use that to generate the NSIS and PortableApps packages instead of trying to parse wireshark.nsi. The new package still needs a bit of work but it installs and runs in the current version of the PA Platform. Remove the define for MAKENSIS_UNICODE. It doesn't look like we were using it. Start tearing down makefiles and scripts that we no longer use. Ping-Bug: 4191 Change-Id: Ib7173eec887d0abf69bb176a1e3f943a5a63bee4 Reviewed-on: https://code.wireshark.org/review/3962 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-02Simplify ./configure logic for telling rpmbuild which GUI(s) we're building.Jeff Morriss1-3/+15
Rather than checking for all the "--with" arguments just use the "$have_xxx" variables. Don't allow rpmbuild's ./configure to decide to build a GUI just because it's available: make it build only what was ./configure'd. Change-Id: I68582b4c13da7b52d56591dce68ac426e9f607f1 Reviewed-on: https://code.wireshark.org/review/3958 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-09-02Qt → wireshark. GTK+ → wireshark-gtk.Gerald Combs5-63/+70
Make sure the Qt UI is named "Wireshark" and its executable is named "wireshark" or "wireshark.exe". Make sure the GTK+ UI is named "Wireshark 1" or "Wireshark (GTK+)" depending on how much the target audience is likely to care about UI toolkits. Make sure the GTK+ executable is named "wireshark-gtk" or "wireshark-gtk.exe". It looks like moving to Qt 5.3 (g978faf3) broke the PortableApps package. It's likely even more broken now. Autotools out-of-tree builds also broke on Ubuntu 12.02 (automake 1.11.3) at some point. The first attempt to compile in ui/qt returns "error: source_file.cpp: No such file or directory". The second attempt works. Out-of-tree builds work fine on Ubuntu 14.04 (automake 1.14.1). Tested: - Nmake builds - NSIS packaging - CMake builds (Windows, OS X) - Autotools build and distcheck - RPM packaging To do: - Test Debian packaging - Fix PortableApps Change-Id: I66429870e05fd2d6fc901942477959ed6164fce2 Reviewed-on: https://code.wireshark.org/review/3919 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-29Consolidate several 3GPP Diameter xml files into one.Jeff Morriss1-6/+1
Change-Id: If6ef48fbcceaf0b3a3591086015b021c6a80956b Reviewed-on: https://code.wireshark.org/review/3911 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-28Add 3GPP2 Tx AVPs. Move all the 3GPP2 stuff into its own XML file.Jeff Morriss1-0/+1
Change-Id: I7197f84472139c99bafa5b68f724abaab0453faa Reviewed-on: https://code.wireshark.org/review/3908 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-21Extcap Capture InterfaceRoland Knall1-0/+2
Extcap is a plugin interface, which allows for the usage of external capture interfaces via pipes using a predefined configuration language which results in a graphical gui. This implementation seeks for a generic implementation, which results in a seamless integration with the current system, and does add all external interfaces as simple interfaces. Windows Note: Due to limitations with GTK and Windows, a gspawn-winXX-helper.exe, respective gspawn-winXX-helper-console.exe is needed, which is part of any GTK windows installation. The default installation directory from the build is an extcap subdirectory underneath the run directory. The folder used by extcap may be viewed in the folders tab of the about dialog. The default installation directory for extcap plugins with a pre-build or installer version of wireshark is the extcap subdirectory underneath the main wireshark directory. For more information see: http://youtu.be/Nn84T506SwU bug #9009 Also take a look in doc/extcap_example.py for a Python-example and in extcap.pod for the arguments grammer. Todo: - Integrate with Qt - currently no GUI is generated, but the interfaces are still usable Change-Id: I4f1239b2f1ebd8b2969f73af137915f5be1ce50f Signed-off-by: Mike Ryan <mikeryan+wireshark@lacklustre.net> Signed-off-by: Mike Kershaw <dragorn@kismetwireless.net> Signed-off-by: Roland Knall <rknall@gmail.com> Reviewed-on: https://code.wireshark.org/review/359 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>