aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
AgeCommit message (Collapse)AuthorFilesLines
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>
2014-08-15NSIS/Qt: Move Qt version logic to windeployqt-to-nsis.Gerald Combs2-51/+74
Move Qt version checking from packaging/nsis/Makefile.nmake to windeployqt-to-nsis.ps1. Get rid of the -Windeployqt parameter since its absence is a condition we now handle. Change-Id: Ieba86d5a91e8217ed11dbe57e80bedaccd2e99cf Reviewed-on: https://code.wireshark.org/review/3595 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-14Windows: Clean up text file packaging.Gerald Combs2-11/+74
Convert textify.sh to PowerShell. Use PowerShell's built-in line ending conversion so that we don't depend on unix2dos. Only copy the help toc and text files to the staging directory. Add PowerShell to the Developer's Guide. Fixup some other content. (asn1/Makefile.inc.nmake contains a call to u2d. Hopefully that's not a problem.) Change-Id: I61a92aa54820d01015abb9ffa65815558ae31c71 Reviewed-on: https://code.wireshark.org/review/3487 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
2014-08-13Use a wildcard to exclude all Wireshark (GUI) binaries: rpmbuild in RHEL6Jeff Morriss1-4/+2
errors out if you %exclude a file that's not there. Fixes the issue reported by Chris on the -dev list. Change-Id: If8d8b6a9ee69c3d94756b729a809f3c04fc2517f Reviewed-on: https://code.wireshark.org/review/3586 Reviewed-by: Christopher Maynard <Christopher.Maynard@gtech.com> Petri-Dish: Christopher Maynard <Christopher.Maynard@gtech.com>
2014-08-12NSIS: check Windows version before running uninstallerPascal Quantin1-38/+38
Change-Id: Icc8d725bff484c48d14e0a9208c545ca512a9768 Reviewed-on: https://code.wireshark.org/review/3533 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Christopher Maynard <Christopher.Maynard@gtech.com> Petri-Dish: Christopher Maynard <Christopher.Maynard@gtech.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-06NSIS: Fix multiple issues.Alexis La Goutte3-102/+92
Restore the "!include qt-dll-manifest.nsh" clobbered by ga722f83 and which resulted in missing DLL warnings (e.g. QT5PrintSupport.dll). Fix overly aggressive search+replace in wireshark.nsi which broke the WinPcap installation page and GTK+ selection. Try to finish the work on promoting Qt started in ga722f83. Bug: 10349 Change-Id: I7086be7c5272f4ae1b2cc26bbd5d5b725f013573 Reviewed-on: https://code.wireshark.org/review/3428 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-08-05Fix some dates in the changelog; add some recent changes to the changelog.Jeff Morriss1-4/+18
Apparently rpmbuild now verifies the dates (including the day of the week) you entered. Change-Id: I1c67fb3170de3199b5fe5f8c117eaefb4d4d28c7 Reviewed-on: https://code.wireshark.org/review/3442 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-04Fix RPM builds with a prefix other than /usr.Jeff Morriss1-8/+8
The location of update-alternatives does not depend on Wireshark's installation prefix: it's always in /usr/sbin/. Change-Id: I7dda9cebec83bc64133adfeb5ee6af70dc6dc7ab Reviewed-on: https://code.wireshark.org/review/3413 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-02Convert the build and install chapter to AsciiDoc.Gerald Combs2-133/+144
Add OS X content. Remove GTK+ content. Update the names in the NSIS package to match the documentation (untested). Change-Id: Id8fd08982bc26871bb8a319b0319808bcdba878c Reviewed-on: https://code.wireshark.org/review/3366 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-01Remove the old wireshark binary during RPM upgrades.Jeff Morriss1-1/+7
If we have a pre-alternatives wireshark binary out there (e.g., because we're upgrading from wireshark-1.10 to wireshark-1.12), get rid of it in the %pre script. Otherwise the binary gets left there (because it's listed as a %ghost in the new spec file). Change-Id: I5828fcff486af3d269bad8dfe544c7659179bf5e Reviewed-on: https://code.wireshark.org/review/3332 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-07-31Add more files to the release tarball.Guy Harris1-0/+1
Change-Id: I02ce275154979ff56f8f8929e5909f3035f62c47 Reviewed-on: https://code.wireshark.org/review/3286 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-30Fix dist.Gerald Combs1-9/+10
Add ui/cli/tshark-tap.h and packaging/nsis/windeployqt-to-nsis.ps1. Change-Id: I00465aed3f33595ad50be0ba5d0ed0eae54e1137 Reviewed-on: https://code.wireshark.org/review/3268 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-30Install our Qt DLL directories recursively.Gerald Combs4-22/+67
Qwindows.dll at least needs to be in the "platforms" subdirectory. Use a PowerShell script to convert the output of windeployqt to its equivalent NSIS instructions. Give the Qt DLL manifest a .nsh extension. Make sure we uninstall known Qt DLL directories. DLLs now load correctly according to Dependency Walker. Install and uninstall our .qm files while we're here. Change-Id: I06ed279809e6fce0e008c5f278a56b1ae34c8f21 Reviewed-on: https://code.wireshark.org/review/3267 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-30The Visual C++ 2013 redistributable uses /quiet instead of /q.Gerald Combs1-5/+10
Change-Id: I130b1af814b843638498feaecacc7092bacd3b72 Reviewed-on: https://code.wireshark.org/review/3255 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-30Dont force qt-dll-manifest.txt.Gerald Combs1-1/+1
Change-Id: I06781f9b0b89561a96b00c27f938005ebf5b915f Reviewed-on: https://code.wireshark.org/review/3254 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-29Use windeployqt with NSIS.Gerald Combs2-18/+27
If we find windeployqt, use it to create a DLL manifest for NSIS. Fall back to the previous manual lists if we don't. This assumes that your copy of windeployqt works. New bug: The Windows installer is huge when using the official Digia DLLs (around 43 MB for the win 64 package). Change-Id: I1f662381b7a2c5474595b05177dbdfd3138c7e60 Reviewed-on: https://code.wireshark.org/review/3253 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-28Fix download of 3rd party packages when WIRESHARK_TARGET_PLATFORM ↵Pascal Quantin1-1/+1
environment variable is not explicitly set Bug: 10317 Change-Id: Ic7b4ffe2bbe4f69928b91a5151d8cef1ae59f723 Reviewed-on: https://code.wireshark.org/review/3203 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-21One more place with win32-setup.sh -> win-setup.shJoerg Mayer1-2/+2
Change-Id: Id6738d06470da81dd18d0e80e474c9ca64169d03 Reviewed-on: https://code.wireshark.org/review/3145 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-10Revert "A few more changes to remove "lib" from "libwsutil" on Windows."Guy Harris2-2/+2
This reverts commit 2fbedef5d13194c693ed6d0e773de249a6698278. Most of the change to remove "lib" seems to work, but the list of libraries to sign appears not to be in the source repository, so I can't make that step work. Change-Id: I88245c046b1cf1c76c73fc8e4bc13868e0df4e44 Reviewed-on: https://code.wireshark.org/review/2971 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-09A few more changes to remove "lib" from "libwsutil" on Windows.Guy Harris2-2/+2
Change-Id: I4c694bb44ebced3d7ae66c16ec3a3ec58825d451 Reviewed-on: https://code.wireshark.org/review/2970 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-01Get rid of rpath when we're building RPMs.Jeff Morriss1-0/+6
Fedora prohibits it, we don't need it, and it gets in the way some times. Change-Id: I92cee959f471866ff90efe9f96e4fa519c357dd9 Reviewed-on: https://code.wireshark.org/review/2763 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-07-01Fix buildroot.Jeff Morriss1-2/+3
Change-Id: I902db6c69ae5966da1102e4fbcfd9f46867c0b4f Reviewed-on: https://code.wireshark.org/review/2762 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-06-26New HP DTD dictionary fileBasil1-0/+1
Bug: 10206 Change-Id: Ibe056ed37d3619aabfb17d3c2c5e85e67deae4e5 Reviewed-on: https://code.wireshark.org/review/2617 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-24Add quotes around MAKEDIR.Ben Burwell1-1/+1
Bug: 7870 Change-Id: I6cea057c4953f5ecc0a146a24570d089e79f8352 Reviewed-on: https://code.wireshark.org/review/2620 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-18Get rid of the Python stuff, as we've gotten rid of Python plugin support.Guy Harris1-10/+2
Also, update a comment to more accurately describe what a loop is doing, and get rid of an unused variable. Change-Id: I948fc4ad758152b483450bf74f653087c892ad3a Reviewed-on: https://code.wireshark.org/review/2360 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-17When building an OS X package for GTK+, put the libraries in lib.Guy Harris1-5/+10
This reverts to the way we did it prior to the switch to Qt; with GTK+, Contents/MacOS/Wireshark is just a launcher, and the Wireshark binary is in Contents/Resources/bin/wireshark-bin, and the appropriate rpath entry would be @executable_path/../lib - @executable_path/../Frameworks, which works for the Qt version, in which Contents/MacOS/Wireshark is the actual executable, doesn't work for the GTK+ version. This should fix bug 10185. Change-Id: I4e50a4ead8f29a742c97a9001c821aabe1fa5e65 Reviewed-on: https://code.wireshark.org/review/2347 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-07Only nuke the startup item once we've installed the launch daemon.Guy Harris1-2/+2
That way, if we crash in the middle, there's still something installed that will try to set the permissions on the BPF devices. Change-Id: Ie0c32f9eaca08bdbb359d07e47f20c664bc66411 Reviewed-on: https://code.wireshark.org/review/2023 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-07When installing the launch daemon, get rid of the old startup item.Guy Harris1-0/+2
Only one is necessary; get rid of the startup item. Change-Id: I0bd2dabb3fc286ccd0e6634bc112e20602624c86 Reviewed-on: https://code.wireshark.org/review/2016 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-06Get rid of some stuff left over from the days of drag-install.Guy Harris2-28/+1
We're not using the Utilities directory; don't create it and don't fill it in. Change-Id: I7ba66b415a2e5a6aff77d4bdb57b2ca176bcd789 Reviewed-on: https://code.wireshark.org/review/2009 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-06Switch to a launch daemon for ChmodBPF.Guy Harris10-130/+94
"Ah finally blew that varmint to Kingdom Come!" Change-Id: I4ef5f8692924772189af4158eddbc125c1c7d521 Reviewed-on: https://code.wireshark.org/review/2004 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-06Upgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0Pascal Quantin2-4/+12
Change-Id: I7650a3ec31120ac5e7954f4c1ca985ad55d189b4 Reviewed-on: https://code.wireshark.org/review/1978 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-05Windows packaging and release note updates.Gerald Combs3-38/+44
For now, use "Wireshark" and "Wireshark 2 Preview" instead of "Wireshark (GTK+)" and "Wireshark (Qt)" respectively to match the 1.12 installer. Shorten the descriptions of the command line tools. Warn against (but don't prohibit) installing on XP. Change-Id: Ica37ffa5b04eb48cadf41842b6fb9b1431c69803 Reviewed-on: https://code.wireshark.org/review/1988 Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 25bb29a1d65896959bc3f73bcf20b400fe0d32dd) Reviewed-on: https://code.wireshark.org/review/1989
2014-05-16Build with GTK+ 2.24.23.Gerald Combs2-0/+21
Change-Id: Ic5c385c0fcef4d40a8cb9e7a271d14eb80905460 Reviewed-on: https://code.wireshark.org/review/1665 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org>
2014-05-01Remove 'include win32.mak' from certain nmake files when not needed.Bill Meier2-2/+0
Change-Id: I05a505d884abb5fd7fca87bb89af29e3e4502b74 Reviewed-on: https://code.wireshark.org/review/1460 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed :sed -i '/^\/\* \$Id\$ \*\//,+0 d') ( /* $Id */ ) Change-Id: I46e928d7f2a307c35876ed5d34cb6b7cccfcd6e9 Reviewed-on: https://code.wireshark.org/review/886 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte33-63/+0
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^ \$Id\$/,+1 d') (No star only 2 spaces before) Change-Id: Id7b254031769a9dca2941304e4d3a0f4bdbc3f54 Reviewed-on: https://code.wireshark.org/review/883 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^\$Id\$/,+1 d') (No space or star before $Id$) Change-Id: I0801bd7cf234d32487008a8b6dcee64875b07688 Reviewed-on: https://code.wireshark.org/review/876 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-29Upgrade Windows builds to Lua 5.2.1Pascal Quantin1-1/+1
Change-Id: I5d2058673b69beb8393aae0571703cd9dbb79c4e Reviewed-on: https://code.wireshark.org/review/863 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-19The 1.11.x installer puts the global plugins in the wrong place [Mac OS X]Alexis La Goutte1-1/+1
Issue found by rols The installer puts the normal included plugins (e.g. mate, wimax) in /Applications/Wireshark.app/Contents/Frameworks/wireshark/plugins, however the global plugins directory is set to /Applications/Wireshark.app/Contents/Resources/lib/wireshark/plugins (as it was in previous versions) so no plugins load at startup. In order to make them load you have to create this directory and copy the plugins there, or put them in your personal directory. From remark of Gerald, use recommandation of Bundle Programming Guide (use Contents/PlugIns for plugin) https://developer.apple.com/library/mac/documentation/corefoundation/conceptual/cfbundles/BundleTypes/BundleTypes.html#//apple_ref/doc/uid/10000123i-CH101-SW19 Change-Id: Ib1ae7da48a8fa94f7037912cd44c05532a238b71 Closed-bug: 9854 Reviewed-on: https://code.wireshark.org/review/602 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-02Added Cisco Starent Diameter dictionary entries.Josip Medved1-0/+1
Change-Id: Ib7fa98639b6de965148349948ccf86d8c8641fb1 Reviewed-on: https://code.wireshark.org/review/438 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-01-07Fix warning when use make packaging on WindowsAlexis La Goutte2-5/+4
warning: unknown variable/constant "{PROGRAM_NAME_PATH_GTK}" detected, ignoring (macro:MUI_FUNCTION_FINISHPAGE:387) svn path=/trunk/; revision=54634
2014-01-07The capabilities for dumpcap don't need to be inheritable.Guy Harris1-2/+2
See https://bugzilla.redhat.com/show_bug.cgi?id=1022377 svn path=/trunk/; revision=54630
2014-01-05Fix indent (use 4 spaces) and add modelines and remove trailing whitespaceAlexis La Goutte1-54/+67
svn path=/trunk/; revision=54611
2014-01-05Fix build when use PortablesAPPSAlexis La Goutte1-0/+2
svn path=/trunk/; revision=54607
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 10:30:50 +0000