summaryrefslogtreecommitdiff
path: root/packaging/rpm
AgeCommit message (Collapse)AuthorFilesLines
2017-04-19Add libxml2 as optional dependencyAhmad Fatoum1-0/+13
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-21[rpm-build] Add an option to exclude extcap.AndersBroman1-0/+9
Change-Id: Ibe16ad31986818fcd6e1bfbcfdd38ecc7663dd39 Reviewed-on: https://code.wireshark.org/review/19360 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-12-06codecs: Add support for G.722 and G.726Peter Wu1-0/+11
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-12-01RPM: fix the date in a recent changelog entry.Jeff Morriss1-1/+1
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>
2016-11-02Packaging: Add dependencies for lz4 and snappy packagesBenoît Canet1-0/+18
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-13Remove nghttp2 code and use system' nghttp2Balint Reczey1-0/+10
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>
2016-08-17RPM: distribute the wireshark.pc file.Jeff Morriss1-0/+4
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>
2016-08-02RPM: Download from https://www.wireshark.org/.Gerald Combs1-2/+2
Download from https://www.wireshark.org/ instead of https://wireshark.org/. This conforms to README.packaging and avoids a redirect. Change-Id: I0ed63f446bc16cbd501444c8743809672c4a084b Reviewed-on: https://code.wireshark.org/review/16829 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-29Use xz to compress the source tarball.Gerald Combs1-2/+2
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>
2016-06-30Remove Makefile.common filesJoão Valverde1-2/+2
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>
2016-05-12RPM: make autoconf (and a few other build dependencies) optional.Jeff Morriss1-4/+21
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>
2016-04-25Another fix for RPM spec file version stringJoão Valverde1-1/+1
Change-Id: I424640867173ccd5655b4cefb457d76f845e7966 Reviewed-on: https://code.wireshark.org/review/15111 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-04-23autotools: Fix rpm-package targetJoão Valverde1-4/+6
Change-Id: I6012199370a17d534ba7633509cd95c8a81aaebd Reviewed-on: https://code.wireshark.org/review/15062 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-04-14Update the RPM packaging to use the new Gtk ./configure optionsJeff Morriss1-5/+4
Follow-up to I0a6cd56f92b0f7dc8f06aa93f36622887d506fb5. Change-Id: Ie5bcffb84b1d6298b2d0f93205491c9a10b603c5 Reviewed-on: https://code.wireshark.org/review/14907 Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-21Remove ADNS supportJoão Valverde1-8/+0
Relevant mailing list message: https://www.wireshark.org/lists/wireshark-dev/201503/msg00007.html Change-Id: I0cff6d4d64fb52a651bcf6b28c183e43653b1cc2 Reviewed-on: https://code.wireshark.org/review/14519 Reviewed-by: João Valverde <j@v6e.pt>
2015-11-16Don't include wireshark-gtk.desktop in RPMs.Jeff Morriss1-2/+4
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>
2015-11-11Rename the wireshark-gnome RPM package wireshark-gtk.Jeff Morriss1-5/+13
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>
2015-11-11GTK: Add separate working desktop file for GTK+ Wireshark GUIBalint Reczey1-0/+3
Change-Id: I52a749b7e2b9a4a5cb2968409e140b9d5f2002f6 Reviewed-on: https://code.wireshark.org/review/11696 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-09-16Don't force Lua support in RPMs (some distros don't ship a compatible LuaJeff Morriss1-12/+17
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>
2015-09-14Begin support for Qt5 in RPM packagingJeffrey Smith1-6/+37
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>
2015-02-18Add an appdata entry for Wireshark.Jeff Morriss1-0/+7
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>
2015-01-22Add a changelog entry for the license tag change ↵Jeff Morriss1-1/+4
(I82de1bc4ffcb1e962b1a35dc58aaa87aca04ed5e). Change-Id: I5e715579be9b415cd0fd957c66c7bd82319c88b3 Reviewed-on: https://code.wireshark.org/review/6743 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-01-21Make the license tag in the RPM more specific: Wireshark is GPLv2+.Jeff Morriss1-1/+1
Change-Id: I82de1bc4ffcb1e962b1a35dc58aaa87aca04ed5e Reviewed-on: https://code.wireshark.org/review/6701 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-21Modernize the description of Wireshark given in the RPM info.Jeff Morriss1-12/+18
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>
2014-12-04Fix building of RPMs and get RPM builds working with a prefix other than ↵Jeff Morriss1-23/+25
/usr again. (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>
2014-12-04Tell the loader where to find our libraries if we're being installedJeff Morriss1-9/+14
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>
2014-12-03Don't run gtk-update-icon-cache when uninstalling the Qt package. But do runJeff Morriss1-2/+5
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>
2014-09-02Simplify ./configure logic for telling rpmbuild which GUI(s) we're building.Jeff Morriss1-3/+15
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>
2014-09-02Qt → wireshark. GTK+ → wireshark-gtk.Gerald Combs1-53/+61
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-08-13Use a wildcard to exclude all Wireshark (GUI) binaries: rpmbuild in RHEL6Jeff Morriss1-4/+2
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>
2014-08-05Fix some dates in the changelog; add some recent changes to the changelog.Jeff Morriss1-4/+18
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>
2014-08-04Fix RPM builds with a prefix other than /usr.Jeff Morriss1-8/+8
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>
2014-08-01Remove the old wireshark binary during RPM upgrades.Jeff Morriss1-1/+7
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>
2014-07-01Get rid of rpath when we're building RPMs.Jeff Morriss1-0/+6
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>
2014-07-01Fix buildroot.Jeff Morriss1-2/+3
Change-Id: I902db6c69ae5966da1102e4fbcfd9f46867c0b4f Reviewed-on: https://code.wireshark.org/review/2762 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte3-5/+0
(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-01-07The capabilities for dumpcap don't need to be inheritable.Guy Harris1-2/+2
See https://bugzilla.redhat.com/show_bug.cgi?id=1022377 svn path=/trunk/; revision=54630
2013-12-11Trivial: Fix typo.Chris Maynard1-1/+1
svn path=/trunk/; revision=53937
2013-11-26Overhaul rpm-building options a bit: as suggested by Anders, have the RPM followJeff Morriss1-17/+28
./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
2013-11-21Attempt to fix Qt dependencies for SUSE.Jeff Morriss1-0/+5
svn path=/trunk/; revision=53490
2013-11-13Make subpackage Requires: more generic.Jeff Morriss1-2/+2
svn path=/trunk/; revision=53300
2013-11-13Add a (wireshark-)qt package that contains the Qt-based GUI (and the necessaryJeff Morriss1-14/+87
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
2013-09-20As pointed out by Kurt in ↵Jeff Morriss1-0/+5
http://ask.wireshark.org/questions/24886/error-failed-build-dependencies-while-making-rpm : If we're not building with gtk3 we now need to add --with-gtk2 . svn path=/trunk/; revision=52161
2013-03-28Simplify the check for rpmbuild's version.Jeff Morriss1-6/+12
svn path=/trunk/; revision=48612
2013-03-14SuSE's suse_update_desktop_file macro BuildRequires update-desktop-files.Jeff Morriss1-0/+7
svn path=/trunk/; revision=48298
2013-03-08freekdesktop.org says all themes must fall back to 'hicolor' if they don't findJeff Morriss1-9/+13
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
2013-03-07List more (obvious) build dependencies.Jeff Morriss1-8/+36
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
2013-03-06Update the changelog.Gerald Combs1-0/+3
svn path=/trunk/; revision=48151
2013-03-06Enable c-ares support by default to match the Windows and DebianGerald Combs1-3/+8
packages (and to make things less painful if the user enables name resolution). Untested. svn path=/trunk/; revision=48150
2013-02-28Make it so that alternate-prefix RPM builds actually work.Jeff Morriss1-5/+5
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
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-14 22:21:39 +0000