summaryrefslogtreecommitdiff
path: root/packaging/nsis
AgeCommit message (Collapse)AuthorFilesLines
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>
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 Lombardo3-0/+12
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 Combs1-12/+0
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-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-19extcap: add sshdump.Dario Lombardo3-0/+18
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-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-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-15Add missing CMake files to the tarball.Gerald Combs1-0/+1
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-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-08-25win32: add detection of Npcap to Windows installerPascal Quantin2-5/+29
If Npcap is installed without WinPcap API-compatible mode, propose to install WinPcap If Npcap is installed with WinPcap API-compatible mode, do not allow to install Winpcap without manually uninstalling Npcap first Change-Id: I606f8b11c950fd54cf7fdda7f4a1886cc2580d31 Reviewed-on: https://code.wireshark.org/review/10197 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: Yang Luo <hsluoyz@sohu.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-16Win32: fix generation of NSIS installer when compiling with Qt 5.5Pascal Quantin2-1/+25
*.qm files are now in a translations subfolder Change-Id: I233152cd2662aec7072769e27f7a278c6890d8ec Reviewed-on: https://code.wireshark.org/review/9646 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-07-08Fix CMake install of lua scriptsGraham Bloice1-0/+3
The CMake generation of all-manifest.nsh is missing the 3 lua scripts, init.lua, console.lua and dtd_gen.lua. Change-Id: I2d34cfe075c5195d1d8816c0d816015195756fa2 Reviewed-on: https://code.wireshark.org/review/9551 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-06-29Try to fix NSIS packaging dependencies.Gerald Combs1-19/+14
Split the nsis_package target into nsis_package_prep which has dependencies and nsis_package which has no dependencies and as a result blindly builds the package. Remove the nsis_uninstaller target since that's now handled by nsis_package_prep. Nsis_package_prep *should* also take care of the dependencies for portableapps_package, but that hasn't been tested. Update the Developer's Guide. This requires coordination with the Windows buildbots. Change-Id: Ib9e3141832c782355135a1637fba5a07c2ca4ba1 Reviewed-on: https://code.wireshark.org/review/9217 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-29Reorganize some of the Diameter XML files, taking advantage of the fact thatJeff Morriss1-3/+0
AVPs can be grouped by Vendor now (not just by Application). Move a bunch of vendor-specific Application IDs to the vendor's XML file. Delete the (basically empty) SKT.xml, ChinaTelecom.xml, and VerizonWireless.xml files. Fix a typo: 16777224 is 3GPP Gx, not 3GPP Cx. Use (derived) type Enumerated (rather than Unsigned32 or Integer32) when the AVP is of type Enumerated. Change-Id: I7a9702c0c48dc3fe751ad74413d8ecc040984f1f Reviewed-on: https://code.wireshark.org/review/8235 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-20Add Tekelec (now Oracle) AVPs.Jeff Morriss1-0/+1
Untested; taken from the document 910-6828-001 Revision A (found on the web). Change-Id: Ibf312a0a15c5c64ec16e636814febb0e996fe5f2 Reviewed-on: https://code.wireshark.org/review/8110 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-16RADIUS: Sync with FreeRADIUS MasterAlexis La Goutte1-0/+1
commit dec7ff66f34d773d25dee412fe218b4e108d7680 Author: Alan T. DeKok <aland@freeradius.org> Date: Wed Apr 1 13:49:22 2015 -0400 added VALUEs commit 634bdb7b29089ed9fd9548a4ed033bfca82832d2 Author: Alan T. DeKok <aland@freeradius.org> Date: Wed Apr 1 13:34:19 2015 -0400 Added from RFC which has numbers assigned commit 005437d9f260c233f165e5f1a8a0e00ab48d6456 Author: Arran Cudbard-Bell <a.cudbardb@freeradius.org> Date: Thu Mar 26 09:09:13 2015 -0400 Hyphens commit 88332d8e5dc6bae25270500902cdcb511e0e08a6 Author: Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com> Date: Thu Mar 26 12:13:39 2015 +0200 Update dictionary.mikrotik Update dictionary.mikrotik to have new attributes and values mentioned in Mikrotik wiki: http://wiki.mikrotik.com/index.php?title=Manual:RADIUS_Client/vendor_dictionary commit 849336c73dda97ac2a1185f19e21fd2d4d086180 Author: Alan T. DeKok <aland@freeradius.org> Date: Wed Mar 25 15:40:02 2015 -0500 Motorola error message Change-Id: I03ab7666dd64cef75e8ebf088766b6b28497817c Reviewed-on: https://code.wireshark.org/review/7974 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-15Revert "CMake: Try not to clobber our gspawn exes."Gerald Combs1-2/+2
This accidentally reverted code from g40ce324. Will try again shortly. This reverts commit 8d9fdda9913a4773ebaf4fc34401ae8a24b729d7. Change-Id: I0bf7f351b926f1ce4b0c9e19fe0367add1dfee1e Reviewed-on: https://code.wireshark.org/review/8081 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-15CMake: Try not to clobber our gspawn exes.Gerald Combs1-2/+2
Try not to overwrite gspawn*.exe between signing them and packaging them. Change-Id: I9f224b64537c3b0dd6f7f8b94a8837bd427ad2ca Reviewed-on: https://code.wireshark.org/review/8080 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-15Set the extcap working directory on Windows.Gerald Combs2-3/+2
On Windows, prepend the main program directory to %Path% when spawning extcap processes. This lets us place androiddump in extcap while allowing it to locate its DLLs. Change-Id: I406c47ce71323266d5f14fb596931398464e452d Reviewed-on: https://code.wireshark.org/review/8057 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: Gerald Combs <gerald@wireshark.org>
2015-04-14CMake: Fix an NSIS dependency.Gerald Combs1-1/+1
Change-Id: I514243727da1fed52c78a4cbd8c82c68bf724c8a Reviewed-on: https://code.wireshark.org/review/8070 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-14CMake: Initial PortableApps targets.Gerald Combs1-5/+10
Add portableapps_app_dir and portableapps_package targets. Change-Id: Ifea3d952eef0e267de6364999d45807236d99102 Reviewed-on: https://code.wireshark.org/review/8025 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-12Windows: do not install androiddump by defaultPascal Quantin1-8/+8
It adds a delay on startup and is verbose on command line when Android SDK is not installed Change-Id: I165358ff14ef458712ebaa12bd3c7256f657e238 Reviewed-on: https://code.wireshark.org/review/8035 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-12Add missing androiddump stuffMichal Labedzki3-0/+16
Add missing androiddump stuff like: - release notes - documentation - Windows nmake support - running androiddump as a windows application instead of console on Windows - addition of androiddump to the Windows installer Change-Id: I3bc6cc70e4dc96c0cd776f3d965dd2aa0309995d Reviewed-on: https://code.wireshark.org/review/7981 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-07Win32: Restore the versioned plugin installation path.Gerald Combs1-3/+3
Revert parts of g2ef72cb and g7710da4 so that the NSIS installer once again places plugins in $INSTDIR\plugins\$VERSION. This matches the behavior of Autotools and previous Windows installers, and reduces the chances of a version mismatch if the user happens to install a custom plugin. Leave the development plugin path unversioned. Leave the extcap path unversioned for now. Change-Id: I861d4ee12975fba4b642e391871c5e852d92a2fe Reviewed-on: https://code.wireshark.org/review/7976 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-26CMake cleanup for VS solutionGraham Bloice1-0/+2
Add FOLDER properties to targets to tidy up the VS solution Change-Id: Ia42e0e89fb490cd3dcd33b7c5f59eb0a27b74c7a Reviewed-on: https://code.wireshark.org/review/7822 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-03-25Small fixes to Windows installerPascal Quantin4-1/+9
- re-add option to install SNMP MIBs - remove Qt specific folders during uninstall Change-Id: Idb5889cf164e90f4403435d24ae10e3dfe37fe44 Reviewed-on: https://code.wireshark.org/review/7808 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-03-24Since g2ef72cb, plugins are no more stored in plugins/$VERSION folderPascal Quantin2-2/+2
Also update the custom samples to reflect the latest changes done Change-Id: I2ac865fad1acdef5a5c4d68a155cbdf970c306f5 Reviewed-on: https://code.wireshark.org/review/7805 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-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-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 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-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>
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-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>