aboutsummaryrefslogtreecommitdiffstats
path: root/debian/control
AgeCommit message (Collapse)AuthorFilesLines
2018-03-06Transition from GeoIP Legacy to MaxMindDB.Gerald Combs1-2/+2
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-02Remove the endpoint "Map" feature.Gerald Combs1-1/+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-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-11Switch from AsciiDoc to Asciidoctor.Gerald Combs1-1/+1
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>
2017-08-06debian: Fix typo in d/controlBalint Reczey1-1/+1
Change-Id: Iaec804825f3d85b4b6ed4fa82300cd41849ed23d Reviewed-on: https://code.wireshark.org/review/22966 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2017-05-31debian: remove imagemagick and demote xdg-utils depsPeter Wu1-3/+4
imagemagick was needed since v1.11.1-rc1-140-g02a8e72b43, but unnecessary since v2.1.0rc0-491-g18a54fcaa4, remove it. xdg-utils is needed for xdg-open (opening websites) at runtime in GTK+, but not for Qt nor during the build, remove it or mark it as optional. Change-Id: I6fc4d5fb61ea8b5cf79526d92ef8c108bc9d11a3 Reviewed-on: https://code.wireshark.org/review/21765 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-04-19Add libxml2 as optional dependencyAhmad Fatoum1-1/+1
This can be used by dissectors that need to parse out-of-band configuration. Change-Id: I13c0a2f408fb5c21bad7ab3d7971e0fa8ed7d783 Reviewed-on: https://code.wireshark.org/review/20912 Reviewed-by: Roland Knall <rknall@gmail.com>
2016-12-06codecs: Add support for G.722 and G.726Peter Wu1-1/+1
Integrate the Spandsp library for G.722 and G.726 support. Adds support for G.722 and all eight variants of G.726. Note: this also fixes a crash in Qt (buffer overrun, reading too much data) caused by confusion of the larger output buffer (resample_buff) with the smaller input buffer (decode_buff). It was not triggered before because the sample rate was always 8k, but with the addition of the new codecs, a different sample rate became possible (16k). Fix also a crash which occurs when the RTP_STREAM_DEBUG macro is enabled and the VOIP Calls dialog is opened (the begin frame, start_fd, is not yet known and therfore a NULL dereference could occur). Passes testing (plays normally without bad RTP timing errors) with SampleCaptures files: sip-rtp-g722.pcap and sip-rtp-g726.pcap. Tested with cmake (Qt), autotools (Qt and GTK+) with ASAN enabled. Bug: 5619 Change-Id: I5661908d193927bba50901079119eeff0c04991f Reviewed-on: https://code.wireshark.org/review/18939 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-11-02Packaging: Add dependencies for lz4 and snappy packagesBenoît Canet1-1/+2
Do it for Debian-like, RPM-based, and MacOS (via Homebrew) systems. Signed-off-by: Benoît Canet <benoit@scylladb.com> Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Change-Id: I52802301815243021c039da6a27af6c534792439 Reviewed-on: https://code.wireshark.org/review/18272 Reviewed-by: Benoît Canet <benoit@scylladb.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-10-20debian: Ship ciscodump and sshdumpBalint Reczey1-1/+1
Both binaries use libssh. Libssh can be linked to OpenSSL or to Libgcrypt. Since the ciscodump and sshdump executables are covered by GPL-2+ the Debian package build depends on the libssh flavor built with libgcrypt. Change-Id: If2dd85beb08e4b04f0c3aac46966fce67828b473 Reviewed-on: https://code.wireshark.org/review/18263 Petri-Dish: Anders Broman <a.broman58@gmail.com> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-10-17debian: Bump standards version to 3.9.7 used in Ubuntu 16.04Balint Reczey1-1/+1
Change-Id: I4a2a3dfad440f17f1b9cfae282623038d9b0981a Reviewed-on: https://code.wireshark.org/review/18242 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-10-17debian: Build-depend on cmake (>= 2.8.8)Balint Reczey1-2/+2
Change-Id: I3097a06fa7cbe858f7b8b2af22d56da6ae027974 Reviewed-on: https://code.wireshark.org/review/18240 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-10-17debian: Stop using hardening-check during .deb package buildBalint Reczey1-1/+1
Hardening-check script has been removed from Debian unstable. Checking binaries' security features is implemented in Lintian instead which will raise proper warnings for not Position Independent Executables and binaries missing "bindnow" linker flag. This also fixes the Lintian error complaining about dependency on obsolete hardening-includes package. Change-Id: If3387aa1f2297927c19d85f27361ba639203aad9 Reviewed-on: https://code.wireshark.org/review/18238 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-10-13Remove nghttp2 code and use system' nghttp2Balint Reczey1-1/+1
Update debian, macos (setup / homebrew) download script Update testsuite (don't try HPACK when build without nghttp2) Change-Id: I365e5e17bc4fab4acd81b4c39ea7189a5d1ee112 Reviewed-on: https://code.wireshark.org/review/17347 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-29debian: Recommend libqt5multimedia5-plugins for wireshark-qtBalint Reczey1-0/+1
This makes RTP Player actually play RTP stream using Qt, too. Bug: 11918 Change-Id: I9a90f50ceeccc1f298bf1b0a8dcc7a9017107484 Reviewed-on: https://code.wireshark.org/review/12882 Petri-Dish: Balint Reczey <balint@balintreczey.hu> Reviewed-by: 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-12-18debian: Fix .deb package generation on wheezyBalint Reczey1-1/+1
Bug: 11901 Change-Id: Id2bfd33d05e74d197832af21a4ac701e0d84ab50 Reviewed-on: https://code.wireshark.org/review/12709 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-12-10debian: Build-depend on qtmultimedia5-dev and libqt5svg5-dev to enable more ↵Balint Reczey1-0/+1
Qt features Change-Id: I14ff81898cd9154805d35ab67976b354e50fbe16 Reviewed-on: https://code.wireshark.org/review/12471 Reviewed-by: Balint Reczey <balint@balintreczey.hu> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2015-12-09debian: Make wireshark meta-package depend on Qt _or_ GTK+ UIBalint Reczey1-1/+1
Change-Id: I0a6df7bd3b738125dd83be15d7a0e36e2396cc3d Reviewed-on: https://code.wireshark.org/review/12472 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-12-06debian: Merge multiple small packaging fixes from DebianBalint Reczey1-11/+15
* Ask user during installation if she/he wants to allow regular users to capture packets * Fix minor typos in d/control * Handle upgrades from older versions properly * Make wireshark depend on misc:Depends * Sync order of some fields Change-Id: I608b43cfaa81799f165f4c39734182d41cb1d524 Reviewed-on: https://code.wireshark.org/review/12448 Petri-Dish: Balint Reczey <balint@balintreczey.hu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-12-03Change codecs from static to dynamic libraryPascal Quantin1-1/+12
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-10-05debian: Build .debs with Qt 5Balint Reczey1-2/+2
Change-Id: I085d5332a0a1c8151b5781c0a94cffe2fe32aeb7 Reviewed-on: https://code.wireshark.org/review/10800 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Tested-by: Balint Reczey <balint@balintreczey.hu> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2015-09-27debian: Show hardening results after buildBalint Reczey1-1/+1
Change-Id: I121d264b86ecf9e0607e6fe00c2791a91d8fe974 Reviewed-on: https://code.wireshark.org/review/10656 Reviewed-by: Balint Reczey <balint@balintreczey.hu> Petri-Dish: Balint Reczey <balint@balintreczey.hu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-19Use system's GeoIP database by default on DebianBalint Reczey1-0/+1
Change-Id: I58c1cbb242c20737dd16a0477858b0225c0b5d14 Reviewed-on: https://code.wireshark.org/review/10051 Petri-Dish: Balint Reczey <balint@balintreczey.hu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-08-19Use system's OpenLayers.js on DebianBalint Reczey1-1/+1
Change-Id: Id790ee61d3443e2f96a83260514fa3a6d31d09da Reviewed-on: https://code.wireshark.org/review/10050 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2014-12-08Add missing build-dependencies for the Debian packageBalint Reczey1-2/+3
They are libparse-yapp-perl and libsbc-dev. Change-Id: I474179bb805acb87f8bf316730d63eb294e10a69 Reviewed-on: https://code.wireshark.org/review/5322 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2014-11-02Fix typo: Intrustion -> IntrusionBalint Reczey1-2/+2
Change-Id: Iea95556a4d77ff54d46a505903e50134f51d563a Reviewed-on: https://code.wireshark.org/review/5082 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-09-02Qt → wireshark. GTK+ → wireshark-gtk.Gerald Combs1-4/+16
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-06-15Depend on docbook-xml and drop obsoleted 0005-...patchBalint Reczey1-1/+1
Change-Id: I4c849a1e8205b65ba05959213967bac5f378c96c Reviewed-on: https://code.wireshark.org/review/2137 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Tested-by: Balint Reczey <balint@balintreczey.hu>
2014-06-08.deb package format is 'native'Balint Reczey1-1/+1
Change-Id: I2b52648c74290df0e98e4be31ac6c51db309eaaf Reviewed-on: https://code.wireshark.org/review/2001 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Tested-by: Balint Reczey <balint@balintreczey.hu>
2014-06-08Sync .deb packaging from DebianBalint Reczey1-44/+226
The sync makes CMake the build system for the .deb package and starts providing wireshark-qt in the wireshark-qt package. The package structure, i.e. the libraries are shipped in separate packages is also sync-ed. Wireshark-qt uses the Qt 4 libraries, but it is easy to switch it to Qt 5. Change-Id: I849d18bdb8ca6ebf4072cf1d73d749080ac5dac2 Reviewed-on: https://code.wireshark.org/review/1986 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Tested-by: Balint Reczey <balint@balintreczey.hu>
2013-10-22Generate wsicon32.xpm during building Debian packageBalint Reczey1-1/+1
svn path=/trunk/; revision=52773
2013-07-15Make Debian package build depend on xdg-utils to let configure detect xdg-openBalint Reczey1-1/+1
svn path=/trunk/; revision=50614
2013-07-15As suggest by Balint:Jeff Morriss1-1/+1
Remove the 03-preferences patch: there's an ongoing discussion over at Debian about using xdg-open to open URLs[1] (instead of sensible-browser as this patch was doing) and anyway xdg-open behaves better for Balint. Since we'll be using xdg-open, add a dependency on xdg-utils (also suggested by Balint). Both changes are untested. [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=172436 svn path=/trunk/; revision=50611
2013-01-14Add missing files to package.Jaap Keuter1-1/+1
Allow more recent automake. svn path=/trunk/; revision=47082
2011-10-20Update minimum version requirement for GTK to 2.12.Jaap Keuter1-1/+1
svn path=/trunk/; revision=39487
2011-08-23Remove support for libpcre, we use GRegex in GLib.Stig Bjørlykke1-1/+1
svn path=/trunk/; revision=38683
2010-08-27Make wireshark-dev depend on the right automake.Jaap Keuter1-1/+1
svn path=/trunk/; revision=33947
2010-01-26Debian is in the process of removing the MIBs from the repository.Jaap Keuter1-0/+1
svn path=/trunk/; revision=31675
2009-07-08Drop non-existing omniidl from wireshark-dev dependancy list.Jaap Keuter1-1/+1
svn path=/trunk/; revision=29008
2009-05-15Update standards version.Jaap Keuter1-1/+2
svn path=/trunk/; revision=28368
2008-10-27Add libgeoip-dev package dependancy.Jaap Keuter1-1/+1
svn path=/trunk/; revision=26580
2008-08-10Replace build-depend of ADNS by c-aresJaap Keuter1-1/+1
svn path=/trunk/; revision=25975
2008-05-31Update Debian packaging files for Wireshark 1.0.Jaap Keuter1-56/+5
These files build the package with all features and minimum changes from the released sources. svn path=/trunk/; revision=25406
2008-04-20From Andrew K Burley (bug 2406):Stig Bjørlykke1-1/+1
Updated dependency for portaudio. svn path=/trunk/; revision=25124
2007-07-04From Frederic Peters:Jaap Keuter1-13/+68
Update of de Debian Packaging files from 0.99.2 to 0.99.6pre1. svn path=/trunk/; revision=22238
2006-07-27Frederic Peters <fpeters@debian.org>:Jörg Mayer1-23/+30
Update to match the current debian package svn path=/trunk/; revision=18799
2006-05-22ethereal->wireshark updatesRonnie Sahlberg1-4/+4
svn path=/trunk/; revision=18206
2005-08-13Aplly those parts of ethereal_0.10.12-3.diff.gzJörg Mayer1-1/+1
from Debian, that change debian/ svn path=/trunk/; revision=15331
2005-03-14from Frederic Peters: bring debian package generation .deb up to dateUlf Lamping1-13/+15
I don't have the facility to test this, hopefully Frederic knows what he's doing :-) However, this was out of date since a long time ago, so can't get worse anyway... svn path=/trunk/; revision=13754
2002-10-26Update Debian packaging files. Ethereal is now split in 4 packages :Olivier Abad1-5/+47
ethereal-common, ethereal, tethereal, ethereal-dev svn path=/trunk/; revision=6513
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 11:06:54 +0000