Commit graph

849 commits

Author SHA1 Message Date
Jeff Morriss
7f6fe7a1fd Reorganize some of the Diameter XML files, taking advantage of the fact that
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-29 11:37:29 +00:00
Jeff Morriss
9abd4a288e Add Tekelec (now Oracle) AVPs.
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-20 06:38:44 +00:00
Gerald Combs
3d7b728173 Make androiddump loadable on OS X.
Make sure the target location for extcap executables and extcap_dir
match on OS X.

Set the extcap directory to Contents/MacOS/extcap. The Mac Developer
Library documentation doesn't explicitly define "Resources", but
examples include data files and not executables. It does state that
executables shouldn't go into PlugIns.

Make sure we rpathify androiddump.

Change-Id: If36c762e2a1991c26e5c01a870deaf191bcf9f94
Reviewed-on: https://code.wireshark.org/review/8093
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-17 18:08:36 +00:00
Pascal Quantin
a8efae3be5 Do not package debug files when building PortableApps.com installer with (the soon to be dead) nmake
Change-Id: Ifd6fc71cebe6db06923e2d764cb415bf5b2ed025
Reviewed-on: https://code.wireshark.org/review/8106
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-17 08:40:38 +00:00
Alexis La Goutte
4171f5590b RADIUS: Sync with FreeRADIUS Master
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-16 13:23:35 +00:00
Gerald Combs
973b2884c6 Revert "CMake: Try not to clobber our gspawn exes."
This accidentally reverted code from g40ce324. Will try again shortly.

This reverts commit 8d9fdda991.

Change-Id: I0bf7f351b926f1ce4b0c9e19fe0367add1dfee1e
Reviewed-on: https://code.wireshark.org/review/8081
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-15 23:22:34 +00:00
Gerald Combs
8d9fdda991 CMake: Try not to clobber our gspawn exes.
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-15 22:19:47 +00:00
Gerald Combs
40ce324f4d Set the extcap working directory on Windows.
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-15 20:26:13 +00:00
Gerald Combs
6a41349132 CMake: Fix an NSIS dependency.
Change-Id: I514243727da1fed52c78a4cbd8c82c68bf724c8a
Reviewed-on: https://code.wireshark.org/review/8070
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-14 21:39:40 +00:00
Gerald Combs
495740f801 CMake: Initial PortableApps targets.
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-14 19:11:50 +00:00
Guy Harris
502eef945b Fix the path for androiddump.
The androiddump binary ends up in the top-level source directory, not
the extcap subdirectory.

Change-Id: Ia306b35211b885b817802a6a22ed9dbbe07f2532
Reviewed-on: https://code.wireshark.org/review/8037
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-12 21:57:14 +00:00
Pascal Quantin
0c700d8958 Windows: fix generation of PortableApps.com installer
Change-Id: I249268ce21ddfbdc7f149609a950736b4fe2ae07
Reviewed-on: https://code.wireshark.org/review/8036
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-04-12 21:30:54 +00:00
Pascal Quantin
4ef6e241c4 Windows: do not install androiddump by default
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-12 17:44:06 +00:00
Michal Labedzki
56470cc801 Add missing androiddump stuff
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-12 16:34:46 +00:00
Gerald Combs
0394b01479 Retire ws-manifest.pl.
We haven't used it in a while and we won't use in the CMake environment.

Change-Id: Iecfb8c418bddf1ed1fcd38b189babf082101662e
Reviewed-on: https://code.wireshark.org/review/8014
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-10 22:10:34 +00:00
Gerald Combs
fd72024bc2 Move the PortabaleApps packaging up one level.
Update the PA section of the Developer's Guide.

Change-Id: I383d2a2405e742eb353390f5a43fd6d6d32cb25b
Reviewed-on: https://code.wireshark.org/review/8012
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-10 17:16:21 +00:00
Gerald Combs
cec99abac9 Win32: Restore the versioned plugin installation path.
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-04-07 23:01:40 +00:00
Gerald Combs
7787c1b464 Fixup our anonsvn URLs.
Change-Id: Id18d392bf7ff948fc78b684d8222c5c3725d302a
Reviewed-on: https://code.wireshark.org/review/7886
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-02 19:21:41 +00:00
Graham Bloice
680dfc1e2f CMake cleanup for VS solution
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-26 10:35:30 +00:00
Pascal Quantin
c94cfad4ae Small fixes to Windows installer
- 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-25 05:10:37 +00:00
Pascal Quantin
7710da4d77 Since g2ef72cb, plugins are no more stored in plugins/$VERSION folder
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-24 20:54:01 +00:00
Gerald Combs
60b4f20c5b CMake: Fix an uninstall.exe dependency.
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-16 22:07:57 +00:00
Gerald Combs
2ef72cb7aa CMake: Add a top-level nsis_package target.
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-12 22:47:42 +00:00
Gerald Combs
cac102eee3 Change a lot of http:// URLs to https://.
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-03-10 19:30:50 +00:00
Alexis La Goutte
fb4252e5a2 RADIUS: Add new dicto from FreeRADIUS
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-18 18:52:32 +00:00
Jeff Morriss
a5aab24321 Add an appdata entry for Wireshark.
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-18 01:50:56 +00:00
Alexis La Goutte
8efe6b7bd6 RADIUS: Sync with FreeRADIUS Master
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-02-04 07:04:30 +00:00
Jeff Morriss
5b55288ae3 Add a changelog entry for the license tag change (I82de1bc4ffcb1e962b1a35dc58aaa87aca04ed5e).
Change-Id: I5e715579be9b415cd0fd957c66c7bd82319c88b3
Reviewed-on: https://code.wireshark.org/review/6743
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-01-22 19:40:54 +00:00
Gerald Combs
fb1e149875 NSIS: Simplify wireshark.nsi.
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-21 18:52:22 +00:00
Jeff Morriss
46fabdcdf3 Make the license tag in the RPM more specific: Wireshark is GPLv2+.
Change-Id: I82de1bc4ffcb1e962b1a35dc58aaa87aca04ed5e
Reviewed-on: https://code.wireshark.org/review/6701
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-21 07:34:36 +00:00
Jeff Morriss
8051657ccb Modernize the description of Wireshark given in the RPM info.
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-21 02:54:03 +00:00
Josip Medved
c8bca4fa9a Updated company name from Nokia Siemens Networks to Nokia Solutions and 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-19 16:53:04 +00:00
Gerald Combs
a6e6deea7f NSIS: Quote all paths in config.nsh.
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 20:41:09 +00:00
Guy Harris
29207bff5f $(MSVCR_DLL) might contain spaces, so we need to quote that sed expression.
Change-Id: Ia3aca07a5aa8adcc99d17fa559662d79659f46ca
Reviewed-on: https://code.wireshark.org/review/6348
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-06 20:09:24 +00:00
Gerald Combs
ea46a44f67 NSIS: Move definitions to their own file.
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-06 19:01:50 +00:00
Stephen Fisher
13dbf52ce3 Attempt to fix "make distcheck" on Ubuntu buildbot
Change-Id: I6e7ea1e2aaf839fdb3af8a3a5a47aabbb12056ef
Reviewed-on: https://code.wireshark.org/review/6326
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2015-01-05 18:40:22 +00:00
Stephen Fisher
cbc5faa06c Get rid of some GNU make extensions so users can build with
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-05 17:47:56 +00:00
Alexis La Goutte
9df73862fb It is also 2015 for Mac OS X :-)
Change-Id: Idbd5e09ac80015feee7ddd30b9569219fde596e1
Reviewed-on: https://code.wireshark.org/review/6269
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-03 22:26:35 +00:00
Alexis La Goutte
9ab44b33bc Info.plist : fix indent (use tabs)
Change-Id: I241c124fa341ae5d6126a189374d69dea1a08d96
Reviewed-on: https://code.wireshark.org/review/6268
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-03 22:25:43 +00:00
Jeff Morriss
1ffe32b165 Fix building of RPMs and get RPM builds working with a prefix other than /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-04 02:24:38 +00:00
Jeff Morriss
44e2716db3 Tell the loader where to find our libraries if we're being installed
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-04 01:19:55 +00:00
Jeff Morriss
7ef5abc818 Don't run gtk-update-icon-cache when uninstalling the Qt package. But do run
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-12-03 22:06:24 +00:00
Alexis La Goutte
3f8576157b RADIUS: Sync with FreeRADIUS Master
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-28 04:43:17 +00:00
Pascal Quantin
cacbffe085 PortableApps: ensure that the personal folder is set to the App directory
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-17 00:58:34 +00:00
Anish Bhatt
7b4215dafa [Radius] Update dictionaries from freeradius 3.0.4
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-03 07:22:58 +00:00
Guy Harris
dab9c85cb3 Fix syntax.
Change-Id: Icc18cd7369bae21629aafd5631a373485ef75dea
Reviewed-on: https://code.wireshark.org/review/5081
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-02 19:26:41 +00:00
Guy Harris
66e204fd93 Handle packagemaker being an ordinary command in /usr/bin.
Change-Id: Ic804a0fdb4dc450683f57be4814a347e20ecd401
Reviewed-on: https://code.wireshark.org/review/5079
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-02 18:38:02 +00:00
Guy Harris
70cab47fe1 Fix syntax, add a check for failure to find PackageMaker, make sure it's a file.
Change-Id: Id5bb23a8c5ebd8a63a51029de541cd32e484029c
Reviewed-on: https://code.wireshark.org/review/5078
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-02 18:10:58 +00:00
Guy Harris
4f94c9e9bf Handle PackageMaker a bit better.
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-11-02 17:26:23 +00:00
Gerald Combs
2e3147524e Add a missing backslash.
Change-Id: Iac79c885fe10805b61512ed2c02cd652f1c3fd7a
Reviewed-on: https://code.wireshark.org/review/5010
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-30 21:36:35 +00:00