aboutsummaryrefslogtreecommitdiffstats
path: root/debian
AgeCommit message (Collapse)AuthorFilesLines
2018-08-24CMake: Change installation path for modulesJoão Valverde1-1/+1
This is one of the CMake standard paths on Unix and avoids polluting the $libdir/wireshark folder. Change-Id: I6e5fd81e95b52e585e92306aca18dfb2426668ca Reviewed-on: https://code.wireshark.org/review/29255 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-08-08wsutil: Add Curve25519 ECDH (X25519) using GcryptPeter Wu1-0/+2
The WireGuard dissector will need X25519 to enable decryption, add a Gcrypt implementation that implements the NaCl/Sodium interface. While inspired by the MPI example in t-cv25519.c, note subtle but important correctness/interoperability fixes: add a check for infinity (gcry_mpi_ec_get_affine) and handle short values from gcry_mpi_print. The last issue is ugly, perhaps the high level API (gcry_pk_decrypt) should be used instead (which < 2% slower than this MPI implementation). (Both issues were found through fuzzing.) As for alternative options, Sodium is superior but would be a new dependency. For some older performance and usability notes (comparing crypto_scalarmult_curve25519_base (note "_base") against others), see https://lists.gnupg.org/pipermail/gcrypt-devel/2018-July/004532.html Performance comparison on Ubuntu 18.04 (i7-3770) between Sodium 1.0.16 against Gcrypt 1.8.3 and Gcrypt 86e5e06a (git master, future 1.9.x) by computing 65536 times X25519(1, 8) via crypto_scalarmult_curve25519: Sodium (sandy2x): 1.4x faster than ref10 Sodium (ref10): 1 (baseline) Gcrypt (git): 5x slower than ref10, 7x slower than sandy2x Gcrypt (1.8.3): 17x ref10, 24x sandy2x (took 65 seconds) Change-Id: Ia54e73cc3cc469a6697554729aff4edd19f55630 Ping-Bug: 15011 Reviewed-on: https://code.wireshark.org/review/28987 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-08-01Revert "Have find_or_create_conversation() use pinfo->conv_endpoint if present."Guy Harris1-1/+1
This reverts commit ba202ef36225b59eb797c5a48b8d4a4665b479c7. Creating endpoints, and corresponding conversations, for protocols atop which TCP or UDP runs can potentially cause attempts to look up the conversation to find the conversation for that protocol rather than for TCP/UDP, which can confuse protocols running atop TCP or UDP. Change-Id: I3ca522e54e67cc4f996d0ee841c6bb40ee6a9976 Reviewed-on: https://code.wireshark.org/review/28912 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-07-31Have find_or_create_conversation() use pinfo->conv_endpoint if present.Guy Harris1-1/+1
Add conversation_new_pinfo(), which uses the endpoint if present, and have find_or_create_conversation() use it rather than conversation_new(). Remove find_or_create_conversation_by_id() - it's no longer needed. Bug: 15018 Change-Id: Ib13e539751af0f071aede4ee0ed751d0cb72ba3f Reviewed-on: https://code.wireshark.org/review/28908 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-07-31Export some more conversation functions.Guy Harris1-0/+4
They're used by built-in dissectors; I see no reason whatsoever to forbid plugins from using them. See https://ask.wireshark.org/question/4366/compile-plugin-with-call-to-conversation_set_port2/ Change-Id: I6a04df961c164a09b88abd8f46a1fe3420a21661 Reviewed-on: https://code.wireshark.org/review/28906 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-07-31For ISDN, don't create an endpoint by ID and then use it.Guy Harris1-0/+1
That isn't working, because it depends on the notion that for every "endpoint type" there's a "port type" for the packet_info structure; that's not true for ISDN channels. The whole point of "use the packet_info structure when trying to find a conversation and create it if it doesn't exist" is to use address information *already filled in by somebody for use by other dissectors*; we don't do that with the ISDN channel number, because there's no *need* to do so. So just add a new find_or_create_conversation_by_id() routine, which passes the packet_info structure to get the frame number, and explicitly passes the endpoint type and ID. Use that in the ISDN dissector. Bug: 15018 Change-Id: Id0e997254b0eaf7cbc9261a2adff639ecbf083c0 Reviewed-on: https://code.wireshark.org/review/28904 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-07-27debian: add lintian-overrides for libwireshark0 (spelling-error-in-binary)Alexis La Goutte1-0/+6
Change-Id: Ic5e2745c0245c343fd6aae13638768fd215d6d60 Reviewed-on: https://code.wireshark.org/review/28860 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-07-06Fix the calculation of a file's "basename".Guy Harris1-0/+1
Strip off only extensions that correspond to file types we know about; QFileInfo::baseName() strips off *all* extensions, where "extension" is "anything preceded by a .", so it turns foo.bar.pcap.gz into foo, not foo.bar. We don't want that; instead, we strip off only those extensions that correspond to file types we know how to read, so we'd strip off .pcap.gz in foo.bar.pcap.gz, and strip off .pcap in foo.bar.pcap, leaving foo.bar in both cases. Change-Id: I5385921ad2f0fef815d52e9902fef15735fd9dae Reviewed-on: https://code.wireshark.org/review/28636 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-07-01Fix handling of DEB_BUILD_OPTIONS=nocheckLars Christensen1-1/+1
When DEB_BUILD_OPTIONS is set to nocheck when running dpkg-buildpackage, tests would not be built but still run. Changed to nether build or run tests when set to nocheck. Change-Id: I2a27025273aab536f0fc0a98cb8efd2d825c5013 Reviewed-on: https://code.wireshark.org/review/28529 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-11Give more detailed information about capture permissions on Debian.Guy Harris1-12/+29
Indicate what you're supposed to do when running dpkg-reconfigure wireshark-common, and indicate that you have to run it as root using sudo. Emphasize in README.Debian, and indicate in the permission failure secondary message, that you have to add users to the "wireshark" group after doing that, and that a user may have to log out and log in again to make this change take effect. Bug: 14847 Change-Id: Ia83ff8e92bd2f00b6c3779272322a40201416da0 Reviewed-on: https://code.wireshark.org/review/28206 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-06-05Debian: Add missing symbols.Gerald Combs1-0/+2
Change-Id: Ie7cc03154c6afcb6ab18b87d73c35be9f79a5f41 Reviewed-on: https://code.wireshark.org/review/28044 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-05Debian: More GNUTLS updates.Gerald Combs1-4/+3
Try to make our libgnutls28-dev / libgnutls-dev dependency work across different OS versions. Change-Id: I673619ae81b15df5bdbe386b4354e5c01f7bba29 Reviewed-on: https://code.wireshark.org/review/28042 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-05Debian: Use libgnutls28-dev.Gerald Combs1-2/+2
Switch Build-Depends from libgnutls-dev to libgnutls28-dev. I'm upgrading the Ubuntu builder to 18.04 and this appears to be required in order to fix the Debian package step. Change-Id: Ib3ab2a1a5dcfbd9ad0c088b22fcac63d81a2a765 Reviewed-on: https://code.wireshark.org/review/28022 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-20[Automatic update for 2018-05-20]Gerald Combs2-2/+2
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ied42aaad58b11ec1796d6c14c4981b8d54258769 Reviewed-on: https://code.wireshark.org/review/27665 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-18Debian: Add a missing symbol.Gerald Combs1-0/+1
Change-Id: Id01abe37b24be701a1b531ef583c9fca2a97338d Reviewed-on: https://code.wireshark.org/review/27617 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-15CMake: require at least CMake 3.5Peter Wu1-1/+1
CMake 3.11 with the Ninja generator started complaining about CMP0058 related to ui/qt/CMakeFiles/qtui_autogen.dir/RCCstock_iconsInfo.cmake amd other files (AUTORCC). While the policy could be set explicitly, let's try to modernize the CMake configuration: - Drop CMP0042, if this gives issues with macOS, then it must be solved in a different way using non-deprecated methods. - Drop CMP0054 and ensure that all if("${foo}") and if(${foo}) are converted to if(foo). - Remove string comparison against "-NOTFOUND", it already evaluates to false in an if condition. - Use CXX_STANDARD/CXX_STANDARD_REQUIRED for Qt 5.7 and newer. - Assume that copy_if_different can accept multiple sources (CMake 3.5). - Consistency: Out of the 60 CMake 3.11 FindXxx.cmake files that use find_library, 34 contain "XXX_LIBRAR" while 16 contain "Xxx_LIBRAR". Let's assume uppercase variables (now custom MaxMindDB include dirs are correctly used). CMake 3.5 was chosen as the next version because of its wide support. Ubuntu 14.04 ships with cmake3 3.5.1, Debian jessie-backports has 3.6.2, EPEL for CentOS/RHEL6 includes cmake3 3.6.1 and SLES12 SP2 has 3.5. Change-Id: I2fa7b94bf8cc78411f414987d17bab3a33dfb360 Reviewed-on: https://code.wireshark.org/review/27444 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-30Test: Add unittests.Gerald Combs1-0/+4
Note that these require the "test-programs" target. Change-Id: I1bea381eaa48504fcd76f88e1c6f2edece0a78a2 Reviewed-on: https://code.wireshark.org/review/27231 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-28lwm2mtlv: Handle String data type as UTF-8Stig Bjørlykke1-0/+1
Display element value as bytes if value is not a valid UTF-8 string. Add a new utility function isprint_utf8_string(). Change-Id: I211d5ed423b53a9fd15eb260bbc6298b0b8f46a0 Reviewed-on: https://code.wireshark.org/review/27178 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-26Start porting our test scripts to Python. Add ctest support.Gerald Combs1-0/+8
Create Python versions of our various test shell scripts. Add CMake tests for each suite. Tests can now be run directly via test.py, via the "test" target, or via ctest, e.g. ctest --verbose --jobs 3 Add a testing chapter to the Developer's Guide. Add a way to disable ctest in dpkg-buildpackage. Suites completed: - capture - clopts - decryption - dissection Remaining suites: - fileformats - io - mergecap - nameres - text2pcap - unittests - wslua Change-Id: I8936e05edefc76a86b6a7a5da302e7461bbdda0f Reviewed-on: https://code.wireshark.org/review/27134 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-21wsutil: convert one leftover function in wsjson.Dario Lombardo1-3/+3
Change-Id: I8d65389dfd6bf373e751e3373d9f22d733d9b5e9 Reviewed-on: https://code.wireshark.org/review/27069 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-21wsutil: rename wsjsmn to wsjson.Dario Lombardo1-2/+2
This puts more distance between the caller and the underlying library. At the moment we're using libjsmn, but other libraries (like json-glib) could be used. Change-Id: I1431424a998fc8188ad47b71d6d95afdc92a3f9e Reviewed-on: https://code.wireshark.org/review/27055 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-18Remove autotools build system.Dario Lombardo4-34/+2
It has been replaced by cmake. Change-Id: I83a5eddb8645dbbf6bca9f026066d2e995d8e87a Reviewed-on: https://code.wireshark.org/review/26969 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-17Remove some GTK+-only code.Gerald Combs1-3/+0
Change-Id: Ic2498c7acd6a1a522be45094148402ee34a6b4d1 Reviewed-on: https://code.wireshark.org/review/26958 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-15More PortAudio removal.Gerald Combs1-1/+1
Change-Id: Ib56212e09d41fc76494d8186c77541302700104c Reviewed-on: https://code.wireshark.org/review/26952 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-15Gtk: Remove source codeRoland Knall5-23/+3
Removing all gtk source code, except for main.? which will remain for the official removal during SFUS18 Change-Id: I4273baf207df1eaaa4b94623cfd10bf74b1fc4a4 Reviewed-on: https://code.wireshark.org/review/26937 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-04-12Add in the signed integer fetch routines.Guy Harris1-0/+13
Change-Id: I75d7ffa74cc669d85861cbd712f1a4c927f098db Reviewed-on: https://code.wireshark.org/review/26918 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-04-09CMake: More Qt4 removal.Gerald Combs1-1/+0
Remove some Qt major version checks. Remove the ENABLE_QT5 option. Change-Id: I891bc90956a2ea2cd5a7c50c56d9fcbfc963d6c2 Reviewed-on: https://code.wireshark.org/review/26785 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-05GTK Cmake: Remove the option to build the GTK UI.AndersBroman2-15/+1
Change-Id: If702717b559a727388d83ce82c0fc2967c662ff0 Reviewed-on: https://code.wireshark.org/review/26747 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-022.5 → 2.9.Gerald Combs1-1/+1
Change-Id: I9a6cd7a510f8ba5310a9cf8a2818903d4c03253f Reviewed-on: https://code.wireshark.org/review/26712 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-27Add missing symbols.Guy Harris2-2/+11
Also, move some symbols to the correct location. Change-Id: Iba2df29961ba2fd13bda069e7664dc55df50bb53 Reviewed-on: https://code.wireshark.org/review/26665 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-16Bump micro version to 2Pascal Quantin1-1/+1
Change-Id: I384db83e3c471cbb371e7af4d488dd03d7761125 Reviewed-on: https://code.wireshark.org/review/26497 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-15Epan+Qt: Invalidate cached column strings.Gerald Combs1-0/+5
Add col_data_changed, which checks to see if we have updated column info. Add col_append_frame_number, which adds a frame number and sets col_data_changed. Call col_append_frame_number instead of col_append_fstr from some dissectors. Add PacketListRecord::invalidateAllRecords, which invalidates any cached record data. Add PacketListModel::invalidateAllColumnStrings which calls invalidateAllRecords and signals that our data has changed. Call invalidateAllColumnStrings when we have new name resolution or column information. Bug: 11414 Bug: 11468 Change-Id: I2671594a722f4f9436fe1df84d43489a148e0cee Reviewed-on: https://code.wireshark.org/review/26373 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-03-13Remove popcount in favor of ws_count_ones.Gerald Combs1-1/+0
Remove our popcount implementation in favor of ws_count_ones, which is our other popcount implementation. This required updating and running process-x11-xcb.pl. Change-Id: I8634c55242113b338c5b0173837c35f98b148b4f Reviewed-on: https://code.wireshark.org/review/26454 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-12Remove some unused or hard-coded header checks.Gerald Combs1-1/+0
Remove some unused checks and code found using grep -o 'HAVE_[A-Z0-9_]*' ConfigureChecks.cmake | sort -u \ | while read have_h ; do echo = $have_h ; git --no-pager grep -cl $have_h ; done Change-Id: I86bfcfdc4f60d9d7de87017a7bb00f833a79bd2c Reviewed-on: https://code.wireshark.org/review/26451 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-11[Automatic update for 2018-03-11]Gerald Combs1-0/+1
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Iac7e2b50ed60639dde90946632811753288110d6 Reviewed-on: https://code.wireshark.org/review/26421 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-07Debian: Fixup some symbols.Gerald Combs2-3/+6
Change-Id: I3744d9d4a9caf9b8c4ccceefce07e88e24406be2 Reviewed-on: https://code.wireshark.org/review/26342 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-06Transition from GeoIP Legacy to MaxMindDB.Gerald Combs4-9/+6
MaxMind is discontinuing its legacy databases in April in favor of GeoIP2, which use a newer database format (MaxMind DB). The reference C library (libmaxminddb) is available under the Apache 2.0 license which isn't quite compatible with ours. Add mmdbresolve, a utility that reads IPv4 and IPv6 addresses on stdin and prints resolved information on stdout. Place it under a liberal license (MIT) so that we can keep libmaxminddb at arm's length. Add epan/maxmind_db.[ch], which spawns mmdbresolve and communicates with it via stdio. Migrate the preferences and documentation to MaxMindDB. Change the IPv4 and IPv6 asnum fields to FT_UINT32s. Change the geographic coordinate fields to FT_DOUBLEs. Bug: 10658 Change-Id: I24aeed637bea1b41d173270bda413af230f4425f Reviewed-on: https://code.wireshark.org/review/26214 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-04[Automatic update for 2018-03-04]Gerald Combs1-1/+1
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I95feebf818e68804d287e011f4c6ee2cd244b2f3 Reviewed-on: https://code.wireshark.org/review/26254 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-02Remove the endpoint "Map" feature.Gerald Combs3-19/+1
Remove the endpoint map and its button from the Qt and GTK+ UIs. It depends on GeoIP Legacy for coordinate information and those databases are being deprecated in favor of MaxMind DB. We *could* upgrade the code to use mmdbresolve, but according to https://dev.maxmind.com/geoip/geoip2/geolite2/ they're also going to remove coordinate information from GeoLite2: "In addition, in 2019, latitude and longitude coordinates in the GeoLite2 databases will be removed.* Latitude and longitude coordinates will continue to be provided in GeoIP2 databases. Please check back for updates." Change-Id: I43e1593d282a0f1aae897b1f4724117d1496b21e Reviewed-on: https://code.wireshark.org/review/26229 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-28L16_mono: Add L16 monaural codec plugin as functional exampleJaap Keuter1-0/+1
This codec plugin serves a dual purpose. First it is to add L16 codec suppport to Wireshark. Second it is an illustration of a basic codec plugin module. Change-Id: I64394dab3257ae49dece0257b16cd969503918e2 Reviewed-on: https://code.wireshark.org/review/26131 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-24Rename airpdcap to dot11decrypt.Gerald Combs2-4/+4
Our 802.11 decryption code isn't tied to any specific product. Change the file and API names to dot11decrypt. Change-Id: I14fd951be3ae9b656a4e1959067fc0bdcc681ee2 Reviewed-on: https://code.wireshark.org/review/26058 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-19Get rid of more new_ prefixes for statistics functions and types.Guy Harris1-8/+8
There are no "old" versions of them that we're keeping around. Change-Id: I3c76a14d0ec1a06df39c547da37f4dea9987df4d Reviewed-on: https://code.wireshark.org/review/25892 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-14Debian: Update Build-Depends.Gerald Combs1-1/+1
Sync the required CMake version and remove w3m. Change-Id: I6c74bb5eb42c678bc91911085b270a9c60095135 Reviewed-on: https://code.wireshark.org/review/25783 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-13Update symbol lists.Guy Harris2-0/+3
Change-Id: Iafc539a6ced0f81e2ebf796ccb490119fe2ff3f6 Reviewed-on: https://code.wireshark.org/review/25779 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-11Switch from AsciiDoc to Asciidoctor.Gerald Combs2-2/+3
Switch the markup text processor for files in the docbook directory from AsciiDoc to Asciidoctor. Asciidoctor has several useful features (such as direct PDF output) and is actively developed. It's written in Ruby but that dependency can be sidestepped with AsciidoctorJ, a self-contained bundle that only depends on the JRE. The current toolchain targets require Python, AsciiDoc, DocBook XML, DocBook XSL, Java, FOP, xsltproc, lynx, and the HTMLHelp compiler: HTML: AsciiDoc → DocBook XML → xsltproc + DocBook XSL Chunked HTML: AsciiDoc → DocBook XML → xsltproc + DocBook XSL PDF: AsciiDoc → DocBook XML → xsltproc + DocBook XSL → FOP HTMLHelp: AsciiDoc → DocBook XML → xsltproc + DocBook XSL → HHC This change removes the AsciiDoc and FOP requirements and adds either AsciidoctorJ or Asciidoctor + Ruby: HTML: Asciidoctor → DocBook XML → xsltproc + DocBook XSL Chunked HTML: Asciidoctor → DocBook XML → xsltproc + DocBook XSL PDF: Asciidoctor HTMLHelp: Asciidoctor → DocBook XML → xsltproc + DocBook XSL → HHC Ideally we could generate all of these using AsciidoctorJ, Java, and lynx. Unfortunately we're not there yet. The release notes depend on several macros (ws-buglink, ws-salink, cve-idlink, sort-and-group). Add Asciidoctor (Ruby) equivalents. Remove the BUILD_xxx_GUIDES CMake options and add various output targets automatically. This means that you have to build the various documentation targets explicitly. Change-Id: I31930677a656b99b1c6839bb6c33a13db951eb9a Reviewed-on: https://code.wireshark.org/review/25668 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-09Update symbols lists.Guy Harris2-4/+8
Change-Id: Iecdef99d172fad793fd98ae10a6f03bb425d73de Reviewed-on: https://code.wireshark.org/review/25712 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-08debian: use SPDX identifiers.Dario Lombardo1-13/+1
Change-Id: Ib9e31d1fe917557a5e5c8bf6002afc2438c0baf4 Reviewed-on: https://code.wireshark.org/review/25662 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-07Remove range_foreach_r from debian symbolsMichael Mann1-1/+0
Change-Id: I209fde24ca421b8e2dfd982408b4610bc5e63d82 Reviewed-on: https://code.wireshark.org/review/25655 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-062.5.0 → 2.5.1.Gerald Combs1-1/+1
Change-Id: I185a3f359acfe5dfd06c0b7f5fff3b6586be1ff9 Reviewed-on: https://code.wireshark.org/review/25647 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-04New symbols.Guy Harris1-0/+6
Change-Id: I3ddb5d89a0b1e1afc5979b2e028030ff61f1ee05 Reviewed-on: https://code.wireshark.org/review/25586 Reviewed-by: Guy Harris <guy@alum.mit.edu>