Copy the current wireshark.spec.in and update it for use with CMake.
Remove the Qt4, GTK+2, and GTK+3 options. Add Ninja and mmdbresolve
options.
The rpm-package target builds a tarball using git-export-release.sh and
therefore must be run from a git checkout. The RPM _prefix macro is set
to CMAKE_INSTALL_PREFIX, so you'll probably want to run
cmake -DCMAKE_INSTALL_PREFIX=/usr ...
Change-Id: Ib014494d8858a0059126404cd91528ded5d8a9f6
Reviewed-on: https://code.wireshark.org/review/26579
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
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>
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>
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>
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>
RPM complains when the date isn't valid.
Change-Id: I859a9900ba87d52159071b06310d5873c092231a
Reviewed-on: https://code.wireshark.org/review/19003
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
It's been installed since Idb60157a51ea1dd0afd6cfac695bfa5760485241.
Change-Id: I2171f2a0bc9b05059b8ecf4451715f7f6d9506e3
Reviewed-on: https://code.wireshark.org/review/17113
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Compress the source tarball using xz instead of bzip2. Other open source
projects (including many of our dependencies) have been using xz for a
while so hopefully this won't be too much of a shock.
Remove the patch-bzip2 Autotools target while we're here.
Change-Id: I456d27b6cd56a43aba829bd45938f98568eb7b1d
Reviewed-on: https://code.wireshark.org/review/16735
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Now that nmake build system has been removed they are not needed anymore.
Change-Id: I88075f955bb4349185859c1af4be22e53de5850f
Reviewed-on: https://code.wireshark.org/review/16050
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>
Most people building RPMs don't need autoconf, automake, flex, or bison.
But enough people do patch Wireshark (in the spec file) to make it an option.
Based on Joao's Ib3f85b59c26c25c83fe6a939aee1a2dc75dd28f9.
Change-Id: I62bf2a0c5cbe0a1abd680322ab82fcb14aedd0c3
Reviewed-on: https://code.wireshark.org/review/15313
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
The RPMs use 'alternatives' to determine which GUI is used so it doesn't make
sense to have 2 desktop entries: one for 'wireshark' (Qt or Gtk GUI, depending on
configuration) and one for 'wireshark-gtk' (the Gtk GUI).
(Maybe it makes sense to just not use 'alternatives' and allow the user to pick
which GUI is used via the menu system. But then if they wanted to run the Gtk+
GUI from the command line they'd need to remember to run 'wireshark-gtk' even
if that's the only GUI installed...)
Change-Id: I9d3fe13bb01eab87caad4ad21c6571ef6288b110
Reviewed-on: https://code.wireshark.org/review/11780
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
This was mentioned a while ago in another change but I forgot about it until
seeing Gerald's recent release-notes change (which indicates that the RPM and
Debian package names for the old GUI are wireshark-gtk).
Change-Id: I2a39fce38086d3716c8ef2a07eb8f23bb91a25fa
Reviewed-on: https://code.wireshark.org/review/11709
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
anymore).
Also make the RPM follow configure's qt4-vs-qt5 choice.
Change-Id: I832af99e055d42b92f3a7c8e4378c7a9d5d628b9
Reviewed-on: https://code.wireshark.org/review/10532
Reviewed-by: Jeffrey Smith <whydoubt@gmail.com>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
The spec file for building RPM's is not currently set up to handle
using Qt5 rather than Qt4.
This change adds Qt5 support to the spec file.
Change-Id: Ie726603377953bec41692a21148325829a26ba9a
Reviewed-on: https://code.wireshark.org/review/10276
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Based on the one from Richard Hughes.
A French translation of the description field is included.
Links to two screenshots are provided--they are stored in my home directory
on wireshark.org (for lack of a better place that I can put them).
Bug: 10479
Change-Id: Ida9b9e46c0fb23a7baff50f98afa597b25b8ca54
Reviewed-on: https://code.wireshark.org/review/4178
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
The initial suggestions came from Michal Labedzki on
https://code.wireshark.org/review/#/c/4178
Change-Id: Iae04d667f70ae73b46d2edc1645c238ef6efc518
Reviewed-on: https://code.wireshark.org/review/6511
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Niels de Vos <devos@fedoraproject.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
(Change I567269d8e45e6543d9e39dbedc49830adf7edb9f made the desktop files
install outside of /usr/share/ .)
RPMs now build and work regardless of the prefix but the desktop integration stuff
only works if the prefix is /usr or (if you're lucky) /usr/local .
Change-Id: If20e0127a044eac1ba099f959a90d068c4bb2ae5
Reviewed-on: https://code.wireshark.org/review/5600
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
someplace other than /usr .
Change-Id: I42cbe98bcfc0e8ba2aa08f651044db051d31205c
(cherry picked from commit 25d9695cb3536b672f4cd8bc280e2a3c816a0d8a)
Conflicts:
packaging/rpm/SPECS/wireshark.spec.in
Reviewed-on: https://code.wireshark.org/review/5605
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
it when installing the gnome package.
Change-Id: I0bbd9c0edc3fb6fe0e672aa3dbea5ba23d847d87
Reviewed-on: https://code.wireshark.org/review/5598
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Rather than checking for all the "--with" arguments just use the "$have_xxx"
variables.
Don't allow rpmbuild's ./configure to decide to build a GUI just because it's
available: make it build only what was ./configure'd.
Change-Id: I68582b4c13da7b52d56591dce68ac426e9f607f1
Reviewed-on: https://code.wireshark.org/review/3958
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
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>
errors out if you %exclude a file that's not there.
Fixes the issue reported by Chris on the -dev list.
Change-Id: If8d8b6a9ee69c3d94756b729a809f3c04fc2517f
Reviewed-on: https://code.wireshark.org/review/3586
Reviewed-by: Christopher Maynard <Christopher.Maynard@gtech.com>
Petri-Dish: Christopher Maynard <Christopher.Maynard@gtech.com>
Apparently rpmbuild now verifies the dates (including the day of the week)
you entered.
Change-Id: I1c67fb3170de3199b5fe5f8c117eaefb4d4d28c7
Reviewed-on: https://code.wireshark.org/review/3442
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
The location of update-alternatives does not depend on Wireshark's
installation prefix: it's always in /usr/sbin/.
Change-Id: I7dda9cebec83bc64133adfeb5ee6af70dc6dc7ab
Reviewed-on: https://code.wireshark.org/review/3413
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
If we have a pre-alternatives wireshark binary out there (e.g., because
we're upgrading from wireshark-1.10 to wireshark-1.12), get rid of it
in the %pre script. Otherwise the binary gets left there (because it's
listed as a %ghost in the new spec file).
Change-Id: I5828fcff486af3d269bad8dfe544c7659179bf5e
Reviewed-on: https://code.wireshark.org/review/3332
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Fedora prohibits it, we don't need it, and it gets in the way some times.
Change-Id: I92cee959f471866ff90efe9f96e4fa519c357dd9
Reviewed-on: https://code.wireshark.org/review/2763
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
(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>
./configure's options for gtk2 vs gtk3 vs qt.
Make it possible to not build the GNOME package (now both UIs' packages are
optional). I think Chris requested this a while ago.
If this works out it may make sense to control the rest of the options via
./configure .
svn path=/trunk/; revision=53607
desktop-integration files); build it by default.
Use 'alternatives' to choose which GUI actually gets used; give the Gtk
GUI priority over the Qt one (for now).
svn path=/trunk/; revision=53297
a theme-specific icon (and as such hicolor is where applications should
install their icons). So: don't install some of our icons in the gnome area,
install them all in hicolor.
While we're at it, go ahead and install all the icon sizes we have.
If we're on SuSE, use their desktop-file-updater macro; without that they
won't recognize our desktop file.
Fix bug which prevented the MIME database from being updated if our install
prefix is not /usr .
svn path=/trunk/; revision=48204
The problem with listing these package names (which I think is convenient)
is that different distros have different names for some packages. So:
update to work on OpenSuSE.
svn path=/trunk/; revision=48160
Use the prefix from 'configure' in the RPM (so: to build an RPM which installs
in /opt do "./configure --prefix=/opt && make rpm-package").
(Maybe this approach should also be used for the other options in the .spec
file.)
Only clean up if building the RPM was successful.
svn path=/trunk/; revision=47957
install in a non-standard location.
Assume the desktop-integration stuff goes in /usr (regardless of our prefix).
This (with r47914) fixes RPM generation when someone uses a prefix other than
/usr .
Also: run desktop-file-validate on the wireshark.desktop file (just in case it
wasn't installed with desktop-file-install).
svn path=/trunk/; revision=47916
Fedora's .spec file. Changes include:
- Create a separate wireshark-gnome package (like Redhat).
- Control some things with variables set at the top of the file.
- Allow the user to configure how dumpcap is installed.
- Allow the user to choose some options including GTK2 or GTK3.
- Greatly expand the BuildRequires entries; get the minimum versions of some
things from 'configure'.
- Install freedesktop files for better (free)desktop integration.
svn path=/trunk/; revision=47528
Specifically: configure.in was changed in SVN 31068
to "Switch to .tar.bz2 for the "dist" target since
that's what most people download".
So: This patch has the required additional changes.
svn path=/trunk/; revision=31481
wireshark was located in /usr/X11R6/bin while dumpcap
int /usr/bin. That way wireshark couldn't find dumpcap.
Install wireshark in the same path as dumpcap and tshark.
svn path=/trunk/; revision=18874
returned quite a list of files. Add them to MAINTAINERCLEANFILES.
Whitespace changes (replace multiple spaces by TABs, in a few cases this
needed to be done at the beginning of Makefile lines.
svn path=/trunk/; revision=14891
"--define", we now build the RPM and SRPM packages in packages/rpm.
As a result, one need not be root to build RPM-based packages.
Move the specfile to packaging/rpm/SPECS.
Update the INSTALL document to include the various packaging makefile
targets.
svn path=/trunk/; revision=4581
Also mark those files as configuration files; "dictionary.xml" should
definitely be one, as it could be modified by the administrator if other
XML dictionary files are added to the list at the end, and the other
ones might be modified if there are any protocol changes.
svn path=/trunk/; revision=4389
package build targets. Move ethereal.spec(.in) to packaging/rpm.
The spec file is different from Henri's. We might want to switch to his
for the sake of consistency.
svn path=/trunk/; revision=2162
Anders