Commit Graph

787 Commits

Author SHA1 Message Date
Michael Mann 3d3f97320b Replace ip_to_str with [ep_]address_to_str and tvb_ip_to_str.
Change-Id: I40d0c8253743183aecef252040b7dd6742ae5c71
Reviewed-on: https://code.wireshark.org/review/5934
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-26 21:17:10 +00:00
Michael Mann f002332d88 Replace ether_to_str with either address_to_str or tvb_ether_to_str.
Change-Id: I8cce9fddbfe950e27e96ea8a5a6d2e0921ff4260
Reviewed-on: https://code.wireshark.org/review/5933
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-21 15:13:30 +00:00
Michael Mann 1f031808e1 Use new color_dissector_filters.[ch] to refactor (color) conversation generation in GTK menus.
Change-Id: I5868a40b71a989a3a1522cb091064bb0aaec6daf
Reviewed-on: https://code.wireshark.org/review/5828
Reviewed-by: Michael Mann <mmann78@netscape.net>
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>
2014-12-19 07:59:28 +00:00
Maarten Bezemer cb345eb4bd Use LocatePythonModule to find make-dissector-reg.py in order to make UseMakeDissectorReg.cmake more generally (out-of-source) usable.
Add make-dissector-reg.py to the Debian packages.

Making it possible to generate out-of-source wireshark plugins.

Change-Id: I0bbe5b46205d39e229d31812341540b26a7336d6
Reviewed-on: https://code.wireshark.org/review/5802
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-18 07:42:39 +00:00
Maarten Bezemer 8ce0f12201 Resync Debian symbols
Fix wrong symbol for proto_tree_add_bitmask_with_flags

Change-Id: I6804aab8f4394653fbeb2b6343d20d43eaa2b93e
Reviewed-on: https://code.wireshark.org/review/5803
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-17 22:08:11 +00:00
Maarten Bezemer ce687075f0 Add cmake helper files for finding wireshark
These files make it possible to use the cmake command find_package(Wirehark) to obtain information about the wireshark installation.

Change-Id: I5af7c4e7b53b99cd473e04905a92bac267cd9b83
Reviewed-on: https://code.wireshark.org/review/5235
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>
2014-12-16 14:18:02 +00:00
Evan Huus fafa686a68 Enable case-insensitive string dissector tables
Permit passing TRUE as the parameter during table registration to achieve that
effect.

Use it in RTP media type table.

Bug: 10708
Change-Id: I892fb1a421d349f0c05197dec90f14fc34ad6b97
Reviewed-on: https://code.wireshark.org/review/5695
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-15 21:09:35 +00:00
Gerald Combs 1ce64e75ab CMake: Make it easier to generate the release notes & NEWS.
Add convenience targets for generating the release notes and the NEWS
file. Make sure we don't run multiple instances of a2x + AsciiDoc at the
same time.

Add the docbook directory to the build by default unless we're running
Windows. Explain why we don't yet build docs on Windows. Make each
docbook makefile target optional.

Split the ENABLE_GUIDES option into ENABLE_HTML_GUIDES and
ENABLE_PDF_GUIDES. Add a default "all_guides" target if either is on.
Remove the Debian patch that hacked around the PDF requirement.

Copy ws.css to the docbook build directory. Don't build PDF release
notes. I'm not sure we ever used them and I don't want to install Java
and FOP just to make a release.

Change-Id: Ia2f710000c17f9e0b4b514fd373d9a5902889553
Reviewed-on: https://code.wireshark.org/review/5712
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-11 21:41:44 +00:00
Gerald Combs 3f08a85819 1.99.1 → 1.99.2.
Change-Id: Ie2e9e81ce1b1d876ae550fc0c17c4367aaa35d98
Reviewed-on: https://code.wireshark.org/review/5705
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-10 19:17:18 +00:00
Michael Mann a971768530 Refactor "color" conversation filters
Have dissectors register their desire to be part of "color" conversation filters and have the GUI use that registered list.  GUI actually using API will come in a separate commit.

Change-Id: I5ffe922d97894fe7bf3182056b76ab5839a9461a
Reviewed-on: https://code.wireshark.org/review/5658
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-10 09:04:00 +00:00
Balint Reczey 8a446e9b7a Add missing build-dependencies for the Debian package
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-12-08 23:21:32 +00:00
Michael Mann e172ebb3b4 Add proto_tree_add_bitmask_with_flags.
It's proto_tree_add_bitmask with the ability to control the data appended to header.

Change-Id: Icce97437ba7cfc9158ec204a837da8db8138424a
Reviewed-on: https://code.wireshark.org/review/5533
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-08 01:13:02 +00:00
Alexis La Goutte 58b7277cb4 802.11: Add ieee80211_supported_rates_vals_ext to be exported
It will be reused by CAPWAP dissector (* Rates Message Element)

Change-Id: I60ce12f382a35cdc2747baf23e2e3c30a305a8bd
Reviewed-on: https://code.wireshark.org/review/5640
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-08 00:48:53 +00:00
Guy Harris 090a0466b5 Update to reflect current reality.
Change-Id: I6defd7ffe92e9e07f4ff41166449d5a086800846
Reviewed-on: https://code.wireshark.org/review/5538
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-30 00:57:48 +00:00
Maarten Bezemer 159626c282 Update debian symbols
* register_tap_ui is removed in a21436eaed
 * wtap_read_bytes(_or_eof) are introduced in 670ebda4a6

Change-Id: If815c686d57310f0d87f965b5b5c2a71b651cbad
Reviewed-on: https://code.wireshark.org/review/5465
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-25 02:31:19 +00:00
Guy Harris e908804776 Update symbol list.
Change-Id: Ib1cb41f212bbccd4e20d3621110cbb98c01a7196
Reviewed-on: https://code.wireshark.org/review/5444
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-22 20:20:39 +00:00
Guy Harris 355458061a It's not missing, it's passed on.
Change-Id: Id1b1c7501f357667abb961948afdd816e13a7ad3
Reviewed-on: https://code.wireshark.org/review/5314
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-14 20:29:31 +00:00
Guy Harris 1b4d51e9a7 Update Debian symbol files.
Change-Id: Iee66cf87d742780740b572b39c8ecf94f93dc142
Reviewed-on: https://code.wireshark.org/review/5310
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-14 20:25:20 +00:00
Stig Bjørlykke ea167053ff Improved deregistering fields.
This improvement avoids use of deallocated memory (crash) if using a
deregistered field in display filter, color filter, custom column and
other cases when the field is used as "interesting field".

This functionality is currently used in http, imf and ldap preferences.

Also removed unused proto_registrar_n() as this does not work correctly
after deregistering fields.

Change-Id: I043e3bf7a98bd773c9801e712a012d1eab8a7f94
Reviewed-on: https://code.wireshark.org/review/5161
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-11-10 08:01:12 +00:00
Balint Reczey 250c1ecb35 Fix typo: Intrustion -> Intrusion
Change-Id: Iea95556a4d77ff54d46a505903e50134f51d563a
Reviewed-on: https://code.wireshark.org/review/5082
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-02 19:36:37 +00:00
Michael Mann 47ff5bb1e3 Sync debian symbol files to current API.
Change-Id: I64b18ac20401f93b6162ecc7ec4935f8b78508f7
Reviewed-on: https://code.wireshark.org/review/5009
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>
2014-10-31 05:23:09 +00:00
Michael Mann f5ed47dbbc Eliminate proto_tree_add_text from packet-q933.c
Change-Id: If5b85609d3daaf66cbcc15e3127af4e7f5736e52
Reviewed-on: https://code.wireshark.org/review/4995
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-30 20:53:52 +00:00
Guy Harris a307ed66cc Robopatch and remove #MISSING comments.
Change-Id: I611882a8b268046665488381be64aca89cdf3194
Reviewed-on: https://code.wireshark.org/review/4563
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-08 20:54:40 +00:00
Gerald Combs d98debe6d0 1.99.0 → 1.99.1.
Change-Id: I8580be0bfe88e33df333f0397f51762f4af819f6
Reviewed-on: https://code.wireshark.org/review/4532
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-07 19:41:19 +00:00
Evan Huus 26e72012f6 Update debian symbol files to satisfy the buildbot
Why is this necessary again?

Change-Id: Idf8981a00636b16ac06b5af5962131d29d88dfad
Reviewed-on: https://code.wireshark.org/review/4360
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-29 02:08:10 +00:00
Guy Harris 99f5c507d2 The Ubuntu build says to do this, so I'll believe it so it stops failing.
We get rid of the exports file with ws_symbol_export.h, and then we
bring it back with this.

Change-Id: Ic689d20ec8ca5806677e1b52018c8c79b381508f
Reviewed-on: https://code.wireshark.org/review/4335
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-27 19:40:04 +00:00
Gerald Combs b7fb1167e3 Qt → wireshark. GTK+ → wireshark-gtk.
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-09-02 15:39:17 +00:00
Gerald Combs d31011572d Convert admon graphics to SVG.
Use a common set of SVG files for AsciiDoc / DocBook admonition
graphics. Put them in a common directory. According to
http://caniuse.com/svg all common browsers have had SVG support for
a while now.

The graphics themselves were created with Inkscape. If you would like
to refine them further you are more than welcome.

Use variables to assemble xsltproc commands in Autotools and Nmake
while we're here.

Try to update Debian rules to reflect ga92c3fb.

Change-Id: If82647af27a60117c517125dff0aca81c033be72
Reviewed-on: https://code.wireshark.org/review/3206
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-24 02:56:35 +00:00
Guy Harris bb15274a4a Update symbol lists.
Change-Id: I55ce6396b943ce9376649a9a8973a6e1cadcced7
Reviewed-on: https://code.wireshark.org/review/3518
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-09 01:16:00 +00:00
Guy Harris b273563aa5 Fix Debian package build complaints.
Apply the patches printed out when the Debian package build complains,
and then remove the #MISSING indications that correspond to routines we
don't export outside the library (either because we don't declare them
as exported outside the library, because they've been removed, or
because they've been moved to another library).

Change-Id: Iba2d5c5436dabd31d7f84fd400bb78afcb5ee69f
Reviewed-on: https://code.wireshark.org/review/3367
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-02 21:18:02 +00:00
Guy Harris 7f937c9bf7 Add tvb_ensure_bytes_exist64 to the API list.
I thought ws_symbol_export.h was supposed to eliminate API list files.
Apparently it didn't, so we have to update this file every time we add a
new API.

Change-Id: I93dda6ccc992c79d52d2b460e818995e6332f1be
Reviewed-on: https://code.wireshark.org/review/3363
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-02 18:55:30 +00:00
Guy Harris 2dad30897b Reflect the move of the buffer_ routines to libwsutil.
We went with the whole WS_DLL_EXPORT thing so that we don't *have* to
maintain lists of exported symbols; is there truly no way to automate
the generation of *these* files?

Change-Id: I77f240c77782ed634e4620833f951c4a02fb4390
Reviewed-on: https://code.wireshark.org/review/3083
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-16 03:41:29 +00:00
Guy Harris 1c297771c3 Rename and move ui/stat_menu.h to epan/stat_groups.h.
The groups are, technically, independent of the notion of a menu, and,
if we have mechanisms by which taps that are not only GUI
toolkit-independent but independent of the *existence* of a GUI can be
registered, they might want to register themselves in a group just in
case they're running in a program that has a GUI.

Also, this might fix the Debian package build.

Change-Id: I29435681e79748fd4f2e0c5ac872cd11f831d172
Reviewed-on: https://code.wireshark.org/review/2830
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03 20:30:42 +00:00
Guy Harris 7dd27dbff8 stat_menu.h moved to libui.
Change-Id: I09227699afa8306d4a699dad5e12efc11f6597ea
Reviewed-on: https://code.wireshark.org/review/2827
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03 19:19:45 +00:00
Jakub Zawadzki 852d5dac9c Remove executable bit, from not executable files.
Change-Id: I36b303b9c2bf4d6bb717261cdbf39ea16532fe06
Reviewed-on: https://code.wireshark.org/review/2757
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-07-01 20:37:09 +00:00
Guy Harris e9424fa107 One more change to dissector_add_for_decode_as.
Change-Id: Icd272fc9ae749728a601966de573843390e278ab
Reviewed-on: https://code.wireshark.org/review/2484
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20 16:48:39 +00:00
Balint Reczey 237669a35d Update debian/symbols for the changed library ABIs
Change-Id: I942a92569472e3cecfaee004778561986aee3e69
Reviewed-on: https://code.wireshark.org/review/2357
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 03:58:30 +00:00
Balint Reczey 14903d65c3 Depend on docbook-xml and drop obsoleted 0005-...patch
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-15 16:33:08 +00:00
Balint Reczey 7de3d23229 Fix Wireshark's name in Vietnamese translation
Change-Id: Idf07c767587815d2cb2c8c094fd820983302b043
Reviewed-on: https://code.wireshark.org/review/2043
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-08 19:19:48 +00:00
Evan Huus 4f6e021646 Add GPLv2+ license header to headers-check.c as per private email from the
author.

svn path=/trunk/; revision=54384

Change-Id: I464197c19316700457a5575b370600db38ce4962
Reviewed-on: https://code.wireshark.org/review/2041
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
2014-06-08 17:51:58 +00:00
Balint Reczey cb4ec166d8 .deb package format is 'native'
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-08 15:33:29 +00:00
Balint Reczey 6d783f228c Don't ship libfiletap in the .deb packages yet
Change-Id: I5b179d2b84bc95e540def544a8b710f81fb0fccb
Reviewed-on: https://code.wireshark.org/review/2000
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
2014-06-08 15:33:05 +00:00
Balint Reczey 97e1491aa8 Sync .deb packaging from Debian
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>
2014-06-08 15:32:10 +00:00
Gerald Combs 285405a0d7 1.11.4 → 1.99.0.
Change-Id: I5b0f713fdbc63e78f4f52177317c0e536aca3044
Reviewed-on: https://code.wireshark.org/review/1761
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-05-23 20:57:42 +00:00
Gerald Combs d73d1f14b3 1.11.3 → 1.11.4.
Change-Id: I0bf8792b9b524ae4d8e1022b234e2510972c7019
Reviewed-on: https://code.wireshark.org/review/1154
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-15 17:29:19 +00:00
Alexis La Goutte 757aa33220 Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash)

Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd
Reviewed-on: https://code.wireshark.org/review/881
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:48:06 +00:00
Guy Harris 0cde948e34 Add libfiletap.
svn path=/trunk/; revision=54673
2014-01-08 21:27:44 +00:00
Guy Harris be9d2e6f3b Add libfiletap.
Add libwsutil to wireshark-dev.files - I'm not sure it's necessary, but
code added to Wireshark has to be able to call routines from libwsutil.

svn path=/trunk/; revision=54655
2014-01-08 10:34:00 +00:00
Evan Huus 00048cf418 Add GPLv2+ license header to headers-check.c as per private email from the
author.

svn path=/trunk/; revision=54384
2013-12-23 15:19:25 +00:00
Gerald Combs 16e27047d0 1.11.2 → 1.11.3.
svn path=/trunk/; revision=53412
2013-11-18 17:41:00 +00:00
Gerald Combs f772a268db 1.11.1 → 1.11.2.
svn path=/trunk/; revision=53346
2013-11-15 22:34:31 +00:00
Balint Reczey 02a8e72b43 Generate wsicon32.xpm during building Debian package
svn path=/trunk/; revision=52773
2013-10-22 22:33:05 +00:00
Pascal Quantin 7c2219f301 1.11.0 -> 1.11.1
svn path=/trunk/; revision=52647
2013-10-16 17:32:45 +00:00
Evan Huus e7a0c26bec Subsume README.binarytrees into wmem doxygen. The README was out of date
anyways, since Michael made key operations non-destructive in r44380.

svn path=/trunk/; revision=52583
2013-10-13 13:13:24 +00:00
Balint Reczey 8ec086a613 Use wildcards for referring to library files in debian/wireshark-common.files
This makes updating debian/wireshark-common.files obsolete when bumping
library versions.

svn path=/trunk/; revision=51016
2013-07-29 17:27:16 +00:00
Balint Reczey 928080f536 Make Debian package build depend on xdg-utils to let configure detect xdg-open
svn path=/trunk/; revision=50614
2013-07-15 17:53:24 +00:00
Jeff Morriss 891854ca7a As suggest by Balint:
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-07-15 14:31:35 +00:00
Jeff Morriss 3c76662814 Try 2 at fixing the Debian package.
svn path=/trunk/; revision=50601
2013-07-15 03:19:32 +00:00
Jeff Morriss a05830e8b2 Try to fix the "make debian-package" buildbot step: update patch 03-preferences
so it applies more cleanly to the modern prefs.c .

Note: I built this patch partially by hand from "svn diff"; hopefully the
Debian stuff likes it.

svn path=/trunk/; revision=50596
2013-07-15 02:03:36 +00:00
Jeff Morriss e101fe1160 Put wsutil/*.h into the wireshark-dev package (in a blind attempt to fix the debian packaging step). Why do we allow/encourage a wirshark-dev package? IMO Wireshark (C language) development should only be done from the source (a tarball or better yet SVN).
svn path=/trunk/; revision=50158
2013-06-25 23:41:06 +00:00
Gerald Combs ea19c7f952 1.9.3 → 1.11.0.
svn path=/trunk/; revision=48972
2013-04-22 17:59:38 +00:00
Gerald Combs ce7c8bc9d7 Resurrect wsicon32.xpm using 'svn cp' then update it based on
wsicon32.png. This should hopefully preserve its history in SVN. Revert
r48565 in debian/.

svn path=/trunk/; revision=48639
2013-03-29 15:44:14 +00:00
Gerald Combs b60e41b984 1.9.2 → 1.9.3.
svn path=/trunk/; revision=48627
2013-03-28 18:13:22 +00:00
Gerald Combs d1b87423df More icon updates.
Use the PNG versions of the new application icons.

Remove the XPM versions of the Wireshark application and capture icons.
To paraphrase Zoidberg, XPMs are bad and we should feel bad. Remove
xpm_to_widget_from_parent (which we weren't using and likely won't use
in the future).

Replace wiki_24.xpm (which was a GNOME or GTK+ stock icon IIRC) with the
16x16 and 24x24 versions emblem-web.png from GNOME icon theme 2.30.3.
This version was used specifically because it's GPLv2 and later versions
are GPLv3.

Update image/README.

svn path=/trunk/; revision=48565
2013-03-26 19:51:33 +00:00
Gerald Combs 4c87778b7a 1.9.1 → 1.9.2.
svn path=/trunk/; revision=48406
2013-03-18 22:18:52 +00:00
Balint Reczey a8f543b56b Merge asn2deb and idl2deb from official Debian package
svn path=/trunk/; revision=48133
2013-03-06 13:31:08 +00:00
Balint Reczey 45c2884f1b Export libwsutil symbols using WS_DLL_PUBLIC define
This change replaces *.def and *.sym file usage following the
guideline at http://gcc.gnu.org/wiki/Visibility

svn path=/trunk/; revision=47938
2013-02-28 14:09:46 +00:00
Gerald Combs f14ad04d4d More 1.9.0 → 1.9.1 changes. Release note updates.
svn path=/trunk/; revision=47777
2013-02-20 21:17:30 +00:00
Jaap Keuter 21f9ab573d Add missing files to package.
Allow more recent automake.

svn path=/trunk/; revision=47082
2013-01-14 21:39:10 +00:00
Gerald Combs 57c3d011b3 Make sure we have epan/wmem/*.h.
svn path=/trunk/; revision=47072
2013-01-14 18:29:50 +00:00
Gerald Combs 917510f087 Fix building a Debian package.
svn path=/trunk/; revision=47053
2013-01-13 23:00:38 +00:00
Jeff Morriss e54831aef1 Don't install idl2wrs except in Debian's special wireshark-dev package.
(Normal Wireshark installations can't be used to develop dissectors so there's
no need to install it or its man page.)

http://www.wireshark.org/lists/wireshark-dev/201206/msg00073.html

(The Debian changes are untested.)

svn path=/trunk/; revision=43370
2012-06-19 15:39:52 +00:00
Gerald Combs f1cf70fc10 1.7.2 → 1.9.0.
svn path=/trunk/; revision=43120
2012-06-05 16:21:47 +00:00
Gerald Combs e5cd6c087e 1.7.1 → 1.7.2.
svn path=/trunk/; revision=41971
2012-04-06 17:27:20 +00:00
Gerald Combs 6f4ab63e89 Add a missing "T".
svn path=/trunk/; revision=41731
2012-03-21 23:15:30 +00:00
Balint Reczey f15662eaa6 Unconditionally install idl2wrs
svn path=/trunk/; revision=39985
2011-11-22 13:53:17 +00:00
Balint Reczey f0642db264 hardcode /bin/sh to idl2wrs
svn path=/trunk/; revision=39984
2011-11-22 13:53:06 +00:00
Gerald Combs 2798ad267a 1.7.0 → 1.7.1.
svn path=/trunk/; revision=39769
2011-11-08 22:35:56 +00:00
Jaap Keuter f27e3fa74b Update minimum version requirement for GTK to 2.12.
svn path=/trunk/; revision=39487
2011-10-20 06:51:53 +00:00
Stig Bjørlykke 5603cef9f2 Remove support for libpcre, we use GRegex in GLib.
svn path=/trunk/; revision=38683
2011-08-23 09:25:06 +00:00
Gerald Combs 1c831b6343 1.5.2 → 1.7.0.
svn path=/trunk/; revision=37148
2011-05-14 20:17:37 +00:00
Gerald Combs d7d45f8072 1.5.1 → 1.5.2. Reenable Babel.
svn path=/trunk/; revision=36540
2011-04-10 17:03:43 +00:00
Gerald Combs 1635ef0ddf 1.5.0 → 1.5.1.
svn path=/trunk/; revision=35639
2011-01-24 19:27:38 +00:00
Jaap Keuter 900849582b Make wireshark-dev depend on the right automake.
svn path=/trunk/; revision=33947
2010-08-27 06:07:32 +00:00
Gerald Combs 349fac664b 1.3.6 -> 1.5.0
svn path=/trunk/; revision=33138
2010-06-07 16:43:09 +00:00
Gerald Combs e535271512 1.3.5 -> 1.3.6.
svn path=/trunk/; revision=32667
2010-05-05 00:28:24 +00:00
Gerald Combs ab71d9d92b 1.3.4 -> 1.3.5.
svn path=/trunk/; revision=32345
2010-03-31 22:54:07 +00:00
Gerald Combs 7e9faae9d9 1.3.3 -> 1.3.4.
svn path=/trunk/; revision=31865
2010-02-11 16:38:42 +00:00
Jaap Keuter 8836263a14 Adjust the release timestamp.
svn path=/trunk/; revision=31676
2010-01-26 07:26:48 +00:00
Jaap Keuter 38437fe567 Debian is in the process of removing the MIBs from the repository.
svn path=/trunk/; revision=31675
2010-01-26 07:24:06 +00:00
Gerald Combs f08e18e9a5 Switch back to normal versioning. Bump the version to 1.3.3.
svn path=/trunk/; revision=31064
2009-11-24 05:57:05 +00:00
Anders Broman a9c313a864 Bump development version.
svn path=/trunk/; revision=30750
2009-10-29 06:15:52 +00:00
Jaap Keuter c65f2d42f8 Fix building debian-package target, broken by r28784.
svn path=/trunk/; revision=30674
2009-10-23 16:48:23 +00:00
Jaap Keuter a8a62d3e8b Bump version number after release of first development snapshot.
svn path=/trunk/; revision=30007
2009-09-20 09:19:59 +00:00
Kovarththanan Rajaratnam 974849a9a0 Remove strcasecmp. We use g_ascii_strcasecmp exclusively
svn path=/trunk/; revision=29643
2009-08-31 19:47:50 +00:00
Jaap Keuter 22768eeca9 Drop obsolete --enable-gtk2 CFLAG
Make fakeroot actually work by setting proper LD_LIBRARY_PATH

svn path=/trunk/; revision=29009
2009-07-08 05:24:55 +00:00
Jaap Keuter 05ca8baee2 Drop non-existing omniidl from wireshark-dev dependancy list.
svn path=/trunk/; revision=29008
2009-07-08 05:22:47 +00:00
Jaap Keuter c556ce7ee0 Add missing packaging file (according to Debian Policy Manual).
svn path=/trunk/; revision=29007
2009-07-08 05:20:30 +00:00
Gerald Combs bc469b1f79 Move the trunk to 1.3.
svn path=/trunk/; revision=28495
2009-05-26 20:53:28 +00:00
Jaap Keuter 88bf6d140f Update standards version.
svn path=/trunk/; revision=28368
2009-05-15 04:55:27 +00:00
Gerald Combs 1c3e3a4a53 Switch back to 1.1.4.
svn path=/trunk/; revision=27810
2009-03-20 23:15:15 +00:00
Gerald Combs ecd732384c Temporarily switch back to building 1.1.3 final.
svn path=/trunk/; revision=27807
2009-03-20 16:17:02 +00:00
Gerald Combs 2d24475011 Move to 1.1.4.
svn path=/trunk/; revision=27767
2009-03-18 05:42:03 +00:00
Gerald Combs 414d042d2e Change the version to 1.1.3. SVN-stamp the version again.
svn path=/trunk/; revision=27252
2009-01-16 22:35:14 +00:00
Jaap Keuter 75ddd6b8b4 Add libgeoip-dev package dependancy.
svn path=/trunk/; revision=26580
2008-10-27 18:40:46 +00:00
Jaap Keuter be494506bd Bump version number
svn path=/trunk/; revision=26579
2008-10-27 18:39:50 +00:00
Jaap Keuter d2f9cdeb31 Update release number.
svn path=/trunk/; revision=26260
2008-09-24 06:25:39 +00:00
Jaap Keuter 1d3a886051 Replace build-depend of ADNS by c-ares
svn path=/trunk/; revision=25975
2008-08-10 08:05:59 +00:00
Jaap Keuter 5ee7425033 Update Debian packaging files for development version
svn path=/trunk/; revision=25461
2008-06-16 20:49:02 +00:00
Jaap Keuter e20bbb0b5f Clean up desktop files based on changes made by Stig.
svn path=/trunk/; revision=25408
2008-06-02 07:26:34 +00:00
Stephen Fisher 412525b59d From Toralf Förster: Fix minor typo: MAde -> Made
svn path=/trunk/; revision=25407
2008-06-01 18:45:19 +00:00
Jaap Keuter 9323e90cc5 Update Debian packaging files for Wireshark 1.0.
These files build the package with all features and
minimum changes from the released sources.

svn path=/trunk/; revision=25406
2008-05-31 16:44:02 +00:00
Stig Bjørlykke dbf503bb34 From Andrew K Burley (bug 2406):
Updated dependency for portaudio.

svn path=/trunk/; revision=25124
2008-04-20 12:28:42 +00:00
Guy Harris a3b70ff0da From Stéphane Loeuillet: patches to fix problems with the .desktop files
found by desktop-file-validate:

  wireshark.desktop: warning: value "" for key "Path" in group "Desktop Entry"
  does not look like an absolute path
  wireshark.desktop: warning: value "GNOME;Application;Network;" for key
  "Categories" in group "Desktop Entry" contains a deprecated value
  "Application"

  wireshark-root.desktop: warning: key "Encoding" in group "Desktop Entry" is
  deprecated
  wireshark-root.desktop: warning: value "" for key "Path" in group "Desktop
  Entry" does not look like an absolute path
  wireshark-root.desktop: warning: value "GNOME;Application;Network;" for key
  "Categories" in group "Desktop Entry" contains a deprecated value
  "Application"

svn path=/trunk/; revision=23034
2007-09-30 00:18:44 +00:00
Jaap Keuter 830903c56a From Frederic Peters:
Update of de Debian Packaging files from 0.99.2 to 0.99.6pre1.

svn path=/trunk/; revision=22238
2007-07-04 07:22:57 +00:00
Gerald Combs 53689800e6 Move epan/crypt-md5.[ch] to epan/crypt. Remove
epan/crypt/airpdcap_md5.[ch].  Fix up whitespace.

svn path=/trunk/; revision=20277
2007-01-02 22:49:57 +00:00
Jörg Mayer f7d69aecc3 The checkin from three weeks ago missed two files...
svn path=/trunk/; revision=18902
2006-08-14 22:04:05 +00:00
Jörg Mayer 3c9b213e8a Forgot to check in the new files during last commit.
svn path=/trunk/; revision=18803
2006-07-28 04:04:55 +00:00
Jörg Mayer 52e9a9c012 Frederic Peters <fpeters@debian.org>:
Update to match the current debian package


svn path=/trunk/; revision=18799
2006-07-27 17:15:34 +00:00
Gerald Combs f7e38bd5e6 Change ETH_VAR_IMPORT to WS_VAR_IMPORT. Try to fix a duplicate variable
definition in the Catapult DCT2000 code.

svn path=/trunk/; revision=18524
2006-06-20 18:30:54 +00:00
Tomas Kukosa 62179dd08f eicon3d*.xpm -> wsicon*.xpm
svn path=/trunk/; revision=18309
2006-06-02 05:43:38 +00:00
Gerald Combs fc9bedbd03 Rename the Debian packaging files.
svn path=/trunk/; revision=18281
2006-05-31 20:28:29 +00:00
Gerald Combs eb71f7fb96 Rename the main executable to "wireshark", along with more conversions:
ethereal.com -> wireshark.org
  mailing lists and addresses
  ETHEREAL -> WIRESHARK
  Man pages
  Automake/Autoconf names


svn path=/trunk/; revision=18271
2006-05-31 19:12:15 +00:00
Gerald Combs 8958bab6de Tethereal/tethereal -> TShark/tshark.
svn path=/trunk/; revision=18268
2006-05-31 17:38:42 +00:00
Gerald Combs b15974d094 libethereal -> libwireshark. idl2eth -> idl2wrs. There are a _lot_ of
changes here.  It compiles OK on OS X, but hasn't been tested anywhere else.

svn path=/trunk/; revision=18260
2006-05-31 00:23:01 +00:00
Ronnie Sahlberg 18ffc28bb1 ethereal->wireshark
svn path=/trunk/; revision=18208
2006-05-22 09:05:24 +00:00
Ronnie Sahlberg 6075ec39fb ethereal->wireshark
svn path=/trunk/; revision=18207
2006-05-22 08:21:22 +00:00
Ronnie Sahlberg f0b33a4789 ethereal->wireshark updates
svn path=/trunk/; revision=18206
2006-05-22 08:14:01 +00:00
Ronnie Sahlberg 89f022b12b name change
svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
Guy Harris 51769bfaac "fi" comes before "fr" in alphabetical order. (This also makes it match
the main "ethereal.desktop" file.)

Expand the RCS ID.

svn path=/trunk/; revision=15336
2005-08-13 08:10:12 +00:00
Jörg Mayer 46c021dffd Aplly those parts of ethereal_0.10.12-3.diff.gz
from Debian, that change debian/


svn path=/trunk/; revision=15331
2005-08-13 05:55:06 +00:00
Ulf Lamping e7a72ba624 from Frederic Peters: bring debian package generation .deb up to date
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
2005-03-14 20:46:46 +00:00
Olivier Abad e0926b556a Update Debian packaging files. Ethereal is now split in 4 packages :
ethereal-common, ethereal, tethereal, ethereal-dev

svn path=/trunk/; revision=6513
2002-10-26 08:56:39 +00:00
Gilbert Ramirez 90e0fb129d Change Ethereal homepage URL from etheral.zing.org to www.ethereal.com.
svn path=/trunk/; revision=2696
2000-11-22 04:07:04 +00:00
Olivier Abad 7fd7ebe2d8 Add a missing build dependency (debhelper) and change build dependency on
libsnmp4.0-dev to libsnmp4.1-dev (this should close bugs #66391 and #66018
from the Debian bug tracking system).

svn path=/trunk/; revision=2106
2000-07-03 22:40:13 +00:00
Olivier Abad a6a7b2af48 In debian/changelog :
Changes from Frederic Peters to avoid conflicts with official debian
packages (I used a version scheme attributed to non-maintainer uploads).

In debian/control :
Add missing build dependencies (only useful for debian build daemons).

svn path=/trunk/; revision=1607
2000-02-08 19:41:50 +00:00
Olivier Abad 744ab22245 Add a debian subdirectory and the files needed to generate a debian package.
The files were created by Frederic Peters <fpeters@debian.org>, the maintainer
of the ethereal debian package.
I just modified `rules' to use autogen.sh when building from a CVS tree.
Building a debian package is now very easy :
- in debian/changelog : change the version number (and replace my name with
                        yours)
- dpkg-buildpackage -rfakeroot -us -uc

svn path=/trunk/; revision=1569
2000-01-26 07:00:26 +00:00