aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.am
AgeCommit message (Collapse)AuthorFilesLines
2017-12-21fuzzshark: fix no previous prototype for function ↵Alexis La Goutte1-0/+1
'LLVMFuzzerTestOneInput/LLVMFuzzerInitialize' [-Wmissing-prototypes] Change-Id: If5f425dda3cd793a63a69680c12aba12a20ed12e Reviewed-on: https://code.wireshark.org/review/24917 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-17autotools: Fixup plugins Custom.*.exampleJoão Valverde1-6/+0
plugin_ldadd was removed in 262a84c384353b2a88a6e81cdc499ab94a8316c2. Change-Id: I516aa1be3466433bf8db83ab3d1773bf88082e8c Reviewed-on: https://code.wireshark.org/review/24850 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-12-08Move the frame_set stuff back into the capture_file structure.Guy Harris1-0/+1
libwireshark now expects an epan_t to be created with a pointer to a "packet provider" structure; that structure is opaque within libwireshark, and a pointer to it is passed to the callbacks that provide interface names, interface, descriptions, user comments, and packet time stamps, and that set user comments. The code that calls epan_new() is expected to provide those callbacks, and to define the structure, which can be used by the providers. If none of the callbacks need that extra information, the "packet provider" structure can be null. Have a "file" packet provider for all the programs that provide packets from a file. Change-Id: I4b5709a3dd7b098ebd7d2a7d95bcdd7b5903c1a0 Reviewed-on: https://code.wireshark.org/review/24731 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-07Add fuzzshark to cmake/autotools.Jakub Zawadzki1-2/+19
Add fuzzshark target to make sure that oss-fuzzshark always build. Change-Id: I802b679c18023daa1475a54bae722b5e90c72a59 Reviewed-on: https://code.wireshark.org/review/24716 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-04Put the structure of a capture_file back in cfile.h.Guy Harris1-1/+0
The split isn't necessary now that epan no longer uses the capture_file structure. Change-Id: Ia232712a2fb5db511865805518e8d03509b2167f Reviewed-on: https://code.wireshark.org/review/24693 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-03Add cfile-int.h.Guy Harris1-0/+1
Change-Id: I6132dc0322d3ac85e89ac853ab6139244d610dd5 Reviewed-on: https://code.wireshark.org/review/24687 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-11-21Move the protocol registration routines back into libwiresharkJoão Valverde1-4/+1
Follow-up to b695b3e2f72998d66ca4b7a6826d4ce1688060c8. Change-Id: I7e36519f2c3806c1205d05437671325080974257 Reviewed-on: https://code.wireshark.org/review/24524 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-11-19Fix (and chop) static build optionJoão Valverde1-28/+8
This sets the scope of the static build option to Wireshark support libraries only. Before the patch: Static plugins don't work with CMake and autotools. autotools static build is broken, and most likely will always be, as building Wireshark all-static is difficult and time-consuming. After the patch: For CMake Wireshark will be built with static or shared libraries and dynamic plugins. Everything just works. CMake apparently doesn't want you building static and shared libraries at the same time. For autotools Wireshark will be built with shared libraries by default. --disable-shared and --enable-static options work as usual. Dlopened plugins are not built if --disable-shared is given to configure (to disable shared libraries). This is a limitations imposed by libtool. Tested on Linux. This removes broken support for building plugins statically. Change-Id: Ib8e8176976f136eea93a2ce8f9857b6cf9bec64c Reviewed-on: https://code.wireshark.org/review/24241 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-11-18autotools: Library build products don't need explicit cleaningJoão Valverde1-1/+0
Change-Id: I5d68c05f2844d6c9ae486531b189dbf10bc09cff Reviewed-on: https://code.wireshark.org/review/24484 Reviewed-by: João Valverde <j@v6e.pt>
2017-11-18Begin cleanup of make-dissector-reg.pyJoão Valverde1-2/+4
Move registration code to a new register.c file so it is readable. Dissector load points are stored in a generated function pointer array instead. Simplify python script somewhat by not interleaving the plugin and dissector logic. Change-Id: I5ec21270f4e1550a5c911efa7f0dc4fc7fcb13a5 Reviewed-on: https://code.wireshark.org/review/24474 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-11autotools: rename libui_dirty to libui_generatedJoão Valverde1-1/+1
Change-Id: I382fbc2af5c42772e4feb65f33ea2a326b9b5c62 Reviewed-on: https://code.wireshark.org/review/24351 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-05autotools: Use pkg-config to configure LibsmiJoão Valverde1-1/+1
Change-Id: Icecea743739aa7e1a65753f623f311514260d373 Reviewed-on: https://code.wireshark.org/review/24252 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-11-05autotools: Try to be clearer about --with-ssl and remove cruftJoão Valverde1-1/+0
Change-Id: Iaf8c8a83ead1d6671bb9cadb6add56481ed98aaa Reviewed-on: https://code.wireshark.org/review/24242 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-10-29Diameter: Add Huawei DCC AVPsJeff Dyer1-0/+1
Change-Id: I480e58a1676677bb362bb4e9dc866c5d5f0814e1 Reviewed-on: https://code.wireshark.org/review/24111 Reviewed-by: Jeff Dyer <jmasterfunk@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-26Move the compiler version tests to ws_compiler_tests.h and use them elsewhere.Guy Harris1-6/+7
While we're at it, sort some header file lists, and clean up white space. Change-Id: If737dda45334fedf1df7295d8719ad9381daf7a1 Reviewed-on: https://code.wireshark.org/review/24089 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-22Fix make distcheckJoão Valverde1-0/+1
Change-Id: Ie6b49429a5a72a4ed7b76fa74b1a6f33b6811254 Reviewed-on: https://code.wireshark.org/review/24022 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-22autotools: Build and install user guideJoão Valverde1-3/+3
Installs the WSUG to $docdir, unless the --disable-guides option is given to the configure script. This will open the Help->Contents menu action using the locally installed guide. It will also point to the correct version for this Wireshark release. The wireshark.org link only provides the guide for the master branch. Change-Id: I9dd539c737cb3777dc1351707b9e45a3a6764aaa Reviewed-on: https://code.wireshark.org/review/23906 Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: João Valverde <j@v6e.pt> Tested-by: João Valverde <j@v6e.pt> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-20autotools: Improve SUBDIRS usageJoão Valverde1-2/+10
Change-Id: Ia40970c37f4b60f8b820c334c3c728a0ac33f228 Reviewed-on: https://code.wireshark.org/review/23996 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-10-18autotools: Remove abi-compliance-checker codeJoão Valverde1-5/+0
It's been broken for over a year, needs to be modernized and as implemented it's a maintenance nightmare. Get rid of it. Ping-Bug: 13036 Change-Id: I34a6e4c28b6d3b96dd6550dd21e9cbeaf050d58f Reviewed-on: https://code.wireshark.org/review/23967 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-10-17autotools: Smaller cleanupsJoão Valverde1-66/+17
ps.c is already correctly cleaned in epan/Makefile.am. make distclean also works well with tarballs so I think the other comment can also be removed. ldconfig may be needed for tshark. The installation step seems to do all the right things so just drop the rather verbose description of the XDG Base Directory Spec. Add the MKDIR_P and INSTALL variables for consistency and to address some of the portability concerns raised in the comment (INSTALL usage still needs to follow a standard form common for portable automake). Remove redundant plugin_ldadd else clause. Change-Id: Ic2cb04556f28622a8979b057e0abbe64256ed3c9 Reviewed-on: https://code.wireshark.org/review/23964 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-10-17autotools: remove macOS Frameworks supportJoão Valverde1-18/+5
This treats macOS/OSX like any other Unix-like build target (Darwin), thus removing autotools support for macOS-specific build options. Anyone needing that is advised to use the fully-supported-on-macOS CMake build. Change-Id: I88e2fa7a8eea42241efcf84223ac2362d38b1e12 Reviewed-on: https://code.wireshark.org/review/23951 Petri-Dish: João Valverde <j@v6e.pt> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-10-16autotools: remove some macOS specific build optionsJoão Valverde1-10/+4
This treats macOS/OSX like any other Unix-like build target, thus removing autotools support for macOS-specific build options. Anyone needing that is advised to use the fully-supported-on-macOS CMake build. Change-Id: I631464a90e16e3db89538801c741657a0a4a7451 Reviewed-on: https://code.wireshark.org/review/23911 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-10-15autotools: refresh rpm-package targetJoão Valverde1-17/+1
There's only so much we can/should do here, so dispense with the _topdir test. Change-Id: Ibf1170ea2cbb7c536df901db42d67da668fd64b2 Reviewed-on: https://code.wireshark.org/review/23912 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-15autotools: make maintainer-clean should allow rerunning 'configure'João Valverde1-11/+1
Change-Id: Iedae94ffefe27b13b1967d69cacb757b5aa4576d Reviewed-on: https://code.wireshark.org/review/23928 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-10-15Fix commentJoão Valverde1-1/+1
Change-Id: Idebca52f2dbebbfc9edb132c3e8ca8d6e1ef79f4 Reviewed-on: https://code.wireshark.org/review/23926 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-15autotools: Make some installation hints more visibleJoão Valverde1-19/+6
Change-Id: I347f2983f5d8f11791d0ed0e51ba51de36b1d11f Reviewed-on: https://code.wireshark.org/review/23925 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-15Revert "autotools: dispense with some installation warnings/notes"João Valverde1-0/+44
This reverts commit 79cdf3a8201ca27abf2bea29e9b9c6b3107ea5db. Change-Id: I019a037e399859b613456283e35cf81f5932b21c Reviewed-on: https://code.wireshark.org/review/23924 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-15autotools: dispense with some installation warnings/notesJoão Valverde1-44/+0
These are not (easily) visible during installation and are better suited for documentation anyway, as implied in the Makefile comments. Change-Id: Id2581f6e8dfc05f1a6c0de918a0f687f025e6d12 Reviewed-on: https://code.wireshark.org/review/23910 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-10-15autotools: dispense with desktop-file-installJoão Valverde1-5/+1
Change-Id: I20717e669709bde6c7b1ff7d10f928e2ec2cc263 Reviewed-on: https://code.wireshark.org/review/23909 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-15autotools: dispense if-else shellcheck testJoão Valverde1-7/+1
Change-Id: I1fd63442b27460ef21b2aaf4e3639a7d12c72c6e Reviewed-on: https://code.wireshark.org/review/23908 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-15autotools: remove unused variablesJoão Valverde1-3/+0
Change-Id: I1636358f76c7c230b8b464a17dddf520b723b36b Reviewed-on: https://code.wireshark.org/review/23907 Reviewed-by: Guy Harris <guy@alum.mit.edu> Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-10-06Make osx-app.sh a configured file and remove Autotools targets.Gerald Combs1-42/+0
Rename osx-app.sh to osx-app.sh.in and add the version to the plugin path at configure time. Instead up updating Autotools accordingly just remove the macOS packaging targets. gf61c381b5a removed support for Autotools in osx-app.sh and if anyone wants to build macOS packages I'd prefer that they use the same toolchain as the buildbot. Change-Id: Ide5205265bf8859a85b1afab68fa8f8285952bd3 Reviewed-on: https://code.wireshark.org/review/23839 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-02Remove the SVR4 packaging assets.Gerald Combs1-18/+1
Remove the svr4-package and solaris-package targets along with their associated files and directories. We used to use this to build Solaris packages but we haven't shipped those in years. Given that the last substantive change to packaging/svr4 was in 2008 it's likely that this has been unused for a while. Change-Id: Ib9153c99f503200ea8c48d3ef81ad688ee55c09f Reviewed-on: https://code.wireshark.org/review/23808 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-01Unsplit "m2m" plugin (wimax mac-to-mac encapsulation)João Valverde1-1/+0
... not to be confused with "machine-to-machine". M2M seems to be a simple Wimax encapsulation protocol developed by Intel. It's not documented publicly anywhere that I can find. The boilerplate to code ratio is huge and it even includes a complete source file from the Wimax dissector (yuck). Put it in the Wimax plugin instead. Minor version number bump for wimax plugin. Change-Id: I2694339dfe89be334093b257a5b34d1577f4dc20 Reviewed-on: https://code.wireshark.org/review/23790 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-26Rename "ws_version_info.h", also .cJoão Valverde1-14/+14
It's not installed so like most other files it doesn't need or benefit from the prefix. Change-Id: I01517e06f12b3101fee21b68cba3bc6842bbef5c Reviewed-on: https://code.wireshark.org/review/23751 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-15autotools: Initial work to install headers for the benefit of pluginsJoão Valverde1-31/+22
Install public headers required to build plugins for libwireshark (taps and dissectors). The source tree is organized to serve the CLI/GUI parts of wireshark. Plugins are built in tree. This change is intende to allow plugins to be built out-of-tree but we want to avoid dumping all headers into /usr/include. To be continued incrementally to fix errors and omissions. Change-Id: Iaa0def0ba3de4b456a29114c315544d2d64fa748 Reviewed-on: https://code.wireshark.org/review/23374 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-06plugins: config.h must not be included by public headersJoão Valverde1-1/+2
For a sane plugin build environment. Include config.h as the first header in the .c file instead. Fix by moving required compiler attribute macros to a new "ws_attributes.h" API header. Change-Id: I34f58a927f68c1a0e59686c14d214825149749e1 Reviewed-on: https://code.wireshark.org/review/23400 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-28Remove README.vmwareGerald Combs1-1/+0
The issues it discusses were relevant in 2000 but have long since been fixed. Change-Id: I6284950670eba86849288bf9c88f3d22c622bdd0 Reviewed-on: https://code.wireshark.org/review/23266 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-19Remove support for CPack.Michael Mann1-2/+1
It's very incomplete and we already have installation makers for supported OSes. Change-Id: Ide6332b9b6d69b66e7262662d781b548526ab752 Reviewed-on: https://code.wireshark.org/review/22226 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-15Convert README to README.md.Gerald Combs1-0/+1
Convert the contents of the top-level README to Markdown and give it a .md extension. Most of our documentation is plain text or AsciiDoc, but the top-level README file in a Git repository is special in that many online browsers will show the README contents along with the directory listing and those browsers tend to favor Markdown. This is true of GitHub (which we're currently mirroring to), Gerrit via its Gitiles plugin (which we're not yet using but likely will), and other places. Add "foreign" to AM_INIT_AUTOMAKE. There is probably a joke to be made here about the FSF and border walls. Change-Id: I87c306d74864e1f0a432225b160a1b4483ee946c Reviewed-on: https://code.wireshark.org/review/23049 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-12Sync some CMake and Autotools install behaviors.Gerald Combs1-0/+1
Adjust the following CMake and Autotools behaviors in order to synchronize their respective install behaviors: - Disable tfshark by default in CMakeOptions.txt - Add profiles/Bluetooth/preferences to Makefile.am - Add missing captype and ciscodump entries to doc/Makefile.am - Install help/faq.txt on all platforms in CMakeLists.txt - Add BUILD_corbaidl2wrs, BUILD_dcerpcidl2wrs, and BUILD_xxx2deb options to CMake and use them to adjust the corresponding parts of the build. - Pull the DCERPC idl2wrs build steps into the top-level CMakeLists.txt. This change doesn't sync everything. Some installed content still diverges, including the following: - CMake installs a bunch of modules into lib/wireshark: FindGLIB2.cmake FindWireshark.cmake FindWSWinLibs.cmake LocatePythonModule.cmake UseAsn2Wrs.cmake UseMakeDissectorReg.cmake WiresharkConfig.cmake WiresharkConfigVersion.cmake Do we need any or all of these? If so, should the Autotools behavior be synced accordingly? - Autotools installs libtool .la files. It also installs wireshark-gtk.desktop unconditionally. Change-Id: I7846efe08f7139c31b6ceca6f08a1fa5168b3e22 Reviewed-on: https://code.wireshark.org/review/23041 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-04WSDG: Update the Windows docs and add a CMake section.Gerald Combs1-1/+0
Update the Windows section for Visual Studio 2015. Copy the content from README.cmake to its own WSDG section and remove README.cmake. Remove the PowerShell sections. Our required version (2.0) ships with every supported version of Windows. Remove the sed section. Change-Id: Id37c6e71bacc247a3ed1992adb1408ec13f6a187 Reviewed-on: https://code.wireshark.org/review/22940 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-02Move macosx-setup.sh to tools and remove the "x".Guy Harris1-1/+0
The OS is now called just macOS, and the rest of the setup scripts are in tools, so move this one there as well. Update the documentation to reflect the change. Change-Id: I4d9ebf0797ffe8862e82c4bcfdeec1d2eabae6ae Reviewed-on: https://code.wireshark.org/review/22918 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-24There's no wka.tmpl file any more, it's just wka.Guy Harris1-1/+1
Change-Id: Ia44a02c92995a47357a3fded7131199117ad6425 Reviewed-on: https://code.wireshark.org/review/22779 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-23Put the well-known addresses into a separate file from OUIsJoão Valverde1-1/+1
Having two distinct logical concepts (OUI and Well Known Address) concatenated to a single "manuf" file is needlessly obfuscating the WKA feature. Have a distinct "wka" file instead and just skip the cat. Change-Id: I46f53b0015a37331d65f8cfac7cbbd499dd0c5b8 Reviewed-on: https://code.wireshark.org/review/22742 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-16Another enterprises -> enterprises.tsv rename.Guy Harris1-1/+1
Change-Id: I59dcc7fa066d75ba14f5f7bf645a8eb24839db1c Reviewed-on: https://code.wireshark.org/review/22635 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-15Rename enterprises to enterprises.tsv and ship it.Gerald Combs1-1/+1
Rename "enterprises" to "enterprises.tsv" so that its format is a bit more obvious and so that double-clicking the file might do something useful. Add it to the Windows packages. Change-Id: I5ef54a04ce1b4926aa4535e756e04b3e2a56d463 Reviewed-on: https://code.wireshark.org/review/22616 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-26Parse enterprise-numbers at run timeJoão Valverde1-1/+2
"enterprise-numbers" is converted to tab-separated values and renamed "enterprises". Unused fields are stripped. PENs are stored in a hash table loaded at run-time. User "enterprises" file is loaded from the personal config dir. Misc make-sminmpec.pl improvements and fixes. Note: names of type "Entity (formerly ...)" have the formerly part commented out for a cleaner output. Change-Id: I60c533afbe3e399077fbf432088064471ad3e1e2 Reviewed-on: https://code.wireshark.org/review/22246 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: João Valverde <j@v6e.pt>
2017-06-16Change some names to reflect Apple's new UNIX-for-Macs name.Guy Harris1-3/+3
{OS_X,os_x} -> {MACOS,macos}. Change-Id: Icebea6ab566c65996ee97bacb88fac7e84ec32de Reviewed-on: https://code.wireshark.org/review/22161 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-31Sort the dictionary.* files.Guy Harris1-8/+8
Change-Id: Iad4457cc17f3e6a5b092d8050a0d1cc541efb2a3 Reviewed-on: https://code.wireshark.org/review/21856 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 03:32:45 +0000