aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/nsis/wireshark.nsi
AgeCommit message (Collapse)AuthorFilesLines
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-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-21NSIS: Simplify wireshark.nsi.Gerald Combs1-129/+4
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-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>
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-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-10-13Add Kerberos 3.2.2 package for Win64Pascal Quantin1-3/+3
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-02Qt → wireshark. GTK+ → wireshark-gtk.Gerald Combs1-1/+1
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-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 Goutte1-95/+85
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-02Convert the build and install chapter to AsciiDoc.Gerald Combs1-126/+137
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-07-30Install our Qt DLL directories recursively.Gerald Combs1-1/+2
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-29Use windeployqt with NSIS.Gerald Combs1-13/+1
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-10Revert "A few more changes to remove "lib" from "libwsutil" on Windows."Guy Harris1-1/+1
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 Harris1-1/+1
Change-Id: I4c694bb44ebced3d7ae66c16ec3a3ec58825d451 Reviewed-on: https://code.wireshark.org/review/2970 Reviewed-by: Guy Harris <guy@alum.mit.edu>
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-06Upgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0Pascal Quantin1-4/+10
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 Combs1-17/+23
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 Combs1-0/+9
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-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-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 Goutte1-5/+0
warning: unknown variable/constant "{PROGRAM_NAME_PATH_GTK}" detected, ignoring (macro:MUI_FUNCTION_FINISHPAGE:387) svn path=/trunk/; revision=54634
2014-01-05Fix indent (use 4 spaces)Alexis La Goutte1-162/+162
svn path=/trunk/; revision=54606
2014-01-05Enhance NSIS Windows installer (Wireshark Qt support)Alexis La Goutte1-39/+171
* Add Radiobox to choose File Association (Wireshark GTK or Qt) * Add Checkbox to choose Wireshark Qt icon will be installed (Startup, Desktop...) * Fix unistaller (don't remove all icons...) * ... svn path=/trunk/; revision=54604
2014-01-02Stop building and distributing the asn1 plugin. I bleleve it to be obsolete.Anders Broman1-1/+0
svn path=/trunk/; revision=54559
2013-12-11Be more consistent with the name "Wireshark" and its two UIGerald Combs1-13/+42
flavors. Upgrade the Qt flavor from "experimental" to "alpha". I also apologize in advance to all of the people who installed previous versions of the 1.11.x packages and who will now have extra shortcuts lying around. svn path=/trunk/; revision=53952
2013-12-01- Rename PCAP_VERSION to WINPCAP_VERSION - the version of the underlyingJörg Mayer1-6/+6
pcap probably is different from the WinPcap version. - Set WINPCAP_VERSION for cmake builds to "unknown" - Oh, the NEWS file changed again. svn path=/trunk/; revision=53690
2013-11-14Create a plural-only English translation. Use it to pluralize the FollowGerald Combs1-1/+1
Stream and Flow Graph hint statistics. svn path=/trunk/; revision=53326
2013-11-11From Michael Bean via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9384 :Pascal Quantin1-0/+1
Add support for Alcatel-Lucent 8950 AAA svn path=/trunk/; revision=53258
2013-10-08Use a plain package name even if we're building with GTK3. HopefullyGerald Combs1-4/+0
we're beyond the "experimental" stage now. svn path=/trunk/; revision=52453
2013-09-13Update a link.Chris Maynard1-1/+1
svn path=/trunk/; revision=52026
2013-09-05Per http://nsis.sourceforge.net/Docs/Chapter4.html#4.2.4, we need to use $\n ↵Chris Maynard1-1/+1
for a newline in strings. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9103. #BACKPORT(1.10,1.8) svn path=/trunk/; revision=51788
2013-08-31Qt5 on Windows needs platforms/qwindows.dll as well.Gerald Combs1-4/+6
svn path=/trunk/; revision=51609
2013-08-30Try to fix PortableApps packaging. Note that the Qt definitions shouldGerald Combs1-4/+5
be in config.nmake along with everything else. svn path=/trunk/; revision=51598
2013-08-30Fix NSIS packaging.Gerald Combs1-0/+7
svn path=/trunk/; revision=51583
2013-08-21Make it possible to add custom Diameter AVP .xml files and distribute them ↵Anders Broman1-0/+1
by adding the file name to separate files and leave the "normal" makefiles untouched. svn path=/trunk/; revision=51457
2013-07-25Make it easier to add custom (proprietary) Diameter XML files.Jeff Morriss1-2/+3
svn path=/trunk/; revision=50889
2013-07-18From Anders: add Verizon Wireless dictionaryPascal Quantin1-0/+1
svn path=/trunk/; revision=50726
2013-06-06Have the NSIS installer run the existing uninstaller silently. ThisGerald Combs1-6/+0
should save a few mouse clicks during the installation process. svn path=/trunk/; revision=49813
2013-06-06I suspect "ie4uinit" got its name because "mysterious useful undocumentedGerald Combs1-2/+3
system utility" would have been too obvious. Have UpdateIcons call "ie4uinit -ClearIconCache" and move UpdateIcons to the "-{,Un.}Finally" sections in the installer and uninstaller. svn path=/trunk/; revision=49811
2013-05-01Change the right title this time.Gerald Combs1-1/+1
svn path=/trunk/; revision=49126
2013-05-01Use "Global" to match the other entries.Gerald Combs1-1/+1
svn path=/trunk/; revision=49125
2013-05-01Install and uninstall our global profiles.Gerald Combs1-3/+17
svn path=/trunk/; revision=49123
2013-04-24Add China Telecom AVP:s to Windows installerPascal Quantin1-0/+1
svn path=/trunk/; revision=49018
2013-04-23Install QtShark by default.Gerald Combs1-1/+1
svn path=/trunk/; revision=49001
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 04:02:54 +0000