aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-04-18Remove autotools build system.Dario Lombardo186-18636/+55
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-17CMake: API reference fixes.Gerald Combs1-1/+4
Fixup a dependency and make sure we create the API reference from scratch. Change-Id: I832d1772eb8b4f07cab6f04d164cac10c70ab3bb Reviewed-on: https://code.wireshark.org/review/26990 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-17More GTK+ removal.Gerald Combs3-119/+5
Remove GTK+ entries from .gitignore and start removing it from packaging. Change-Id: I70391000906e983eab250c8158b486c3dc6d4a16 Reviewed-on: https://code.wireshark.org/review/26988 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-17Qt: fix remaining CaptureEvent signal connectionsPeter Wu8-15/+15
Converted all remaining "CaptureEvent *" to "CaptureEvent" using: sed -e 's/CaptureEvent *\*/CaptureEvent/g' $(git grep -le 'CaptureEvent *\*') -i Change-Id: I328d2890ec3b5e6672fa3fab22e85063e8309574 Fixes: v2.9.0rc0-186-g57bf7e4347 ("Qt: Fix memory leak for CaptureEvent") Reviewed-on: https://code.wireshark.org/review/26985 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-04-17Autotools: Update for recently removed files.Gerald Combs1-7/+0
Change-Id: Idaf2e7794b337dc41e306905f9281c676376bf93 Reviewed-on: https://code.wireshark.org/review/26986 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-17glib: Use g_slist_free_full() in a couple of places.Anders8-47/+13
Change-Id: Iff833bf5c197959c8decb62d6ce794c6d0415fb7 Reviewed-on: https://code.wireshark.org/review/26978 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-17lapdm: Hand B4 frames into a dissector supporting L2 pseudo-lengthHarald Welte1-0/+13
B4 frames have no length octet at L2 level, but instead a L2 pseudo length octet at L3. We must call the proper dissector for decoding them, and gsm_a_ccch supports L2 pseudo length. This addresses the LAPDm side of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14105 Ping-Bug: 14105 Change-Id: I5743dc6153a1adae60b8d9564f345861edc3fca4 Reviewed-on: https://code.wireshark.org/review/26798 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-17rsl: Fix treatment of SACCH FILL / SACCH INFO MODIFYHarald Welte1-2/+4
The RSL SACCH INFO MODIFY / RSL SACCH FILL messages contain a SI5 / SI6 / SI5bis / SI5ter message. Those SI are (like the SI on CCCH) sent as UI frame in downlink direction. Since Phase 2, the "L2 pseudo-length field is part of the L3 message, and not stripped / interpreted at L2. 3GPP TS 44.006 states that a special B4 frame format is used on the SACCH downlink for UI frames, which is basically a normal B frame, but with no length field at L2, shifting the length field into L3 where it becomes the L2 pseudo-length. From RSL, we need to call a variant of the RR dissector that is able to decode a L3 message that includes a L2 pseudo-length. This is, paradoxically, not the "gsm_a_sacch" dissector, as that one is only used for B-frames, i.e. actual LAPDm ABM frames. We must use the "gsm_a_ccch" dissector. See also the discussion in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14105 as well as https://lists.osmocom.org/pipermail/openbsc/2017-December/011545.html and https://osmocom.org/issues/3059 for further background information. Ping-Bug: 14105 Change-Id: Icdad2b7698d5d7d613cacceec6a3d848b946306c Reviewed-on: https://code.wireshark.org/review/26797 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-17Qt: Fix memory leak for CaptureEventRoland Knall27-107/+117
Make the argument to the events a non-memory object Change-Id: I46d8c24415aa2bc48b2a2d3b1fccffa6956d08b5 Reviewed-on: https://code.wireshark.org/review/26671 Reviewed-by: Roland Knall <rknall@gmail.com>
2018-04-17Qt: Fix segfault bug when analysing SCTP packetsruengeler1-3/+3
Change-Id: Id444318621ffa61ee5edb84d40de372e8b7f60ef Fixes: v2.5.2rc0-26-gecda3d0901 ("tap-sctp: remove guint32 unneeded allocations.") Reviewed-on: https://code.wireshark.org/review/26977 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-04-17Switch the Doxygen API reference build to CMake.Gerald Combs15-652/+2515
Switch to a single Doyxgen configuration which was generated using a recent version of Doxygen and customized to suit our needs. Add wsar_html and wsar_html_zip targets to CMake. Update some Doxygen markup and documentation as needed. Change-Id: Ic8a424b292c35a26f74ae0b53322265683e56e69 Reviewed-on: https://code.wireshark.org/review/26976 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-17Remove some GTK+-only code.Gerald Combs32-528/+22
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-17Add a destination directory flag to git-export-release.Gerald Combs3-25/+20
Add a destination directory flag to git-export-release.sh. Use it to replace the current "dist" target. Use it in the RPM section to avoid a symlink. Change-Id: I30ae76b3ab1a995d232e748b79aa37440f90f854 Reviewed-on: https://code.wireshark.org/review/26974 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16Qt: Rename packet_list_enable_colorStig Bjørlykke5-6/+3
Rename packet_list_enable_color() to packet_list_recolor_packets() to reflect what it does. Remove the call from where it's not needed. Change-Id: I55dd1a9af8f5b1dbd83b06136a5bbcfddea06cdb Reviewed-on: https://code.wireshark.org/review/26959 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16Add some notes to git-export-release.sh.Gerald Combs1-0/+14
Add some notes about avoiding the use of git stash. Change-Id: I441adef099e5d64834a73e9f0f260d00c21be585 Reviewed-on: https://code.wireshark.org/review/26973 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-16glib-compat is no longer used - it provided only code for versions < 2.32Joerg Mayer5-191/+0
Change-Id: I17e2c221cc40dbe9328458db9f17480c05bdc276 Reviewed-on: https://code.wireshark.org/review/26972 Petri-Dish: Jörg Mayer <jmayer@loplof.de> Tested-by: Petri Dish Buildbot Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2018-04-16glib: Get rid of GLIB_CHECK_VERSION as we now require 2.32.0Anders22-121/+0
Change-Id: Ie95cf37f9cd283545693e290340a7489cc989c95 Reviewed-on: https://code.wireshark.org/review/26970 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16Forbid leading, duplicated and trailing dots in field namesPeter Wu17-89/+91
In order to simplify the display filter scanner, try to restrict the use of dots ('.') in field names. Forbid leading dots, does not affect current dissectors. Fix '..' typo in fpp dissector and forbid it. Forbid trailing dots after fixing dissectors: some of them just have an excess dot, others are missing a name after the dot. Change-Id: I6e58a04ef0306ee8c16fbf6a3cabb076d7fc69c9 Reviewed-on: https://code.wireshark.org/review/26967 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16ssl: fix duplicate dissections with multiple PDUs in a streamPeter Wu1-4/+3
The previous fix was incomplete and would still result in duplicate PDU dissections starting from the second reassembled PDU in a TLS stream. The reason for that is that "nxtseq" is the absolute offset within a TLS application data stream where the current segment ends while the reassembled PDU length ("ipfd_head->datalen") is likely smaller than "nxtseq". Note: this fix assumes that the there won't be another (partial) PDU following a reassembled PDU in a single packet (that is, the condition "nxtseq > msp->nxtpdu" is assumed not to occur). If that is not the case, a different issue occurs which needs another fix (more work): "Reassembly error, protocol SSL: Frame already added in first pass". Change-Id: Ib546f6e85baa0670c2c6a31ee8de87422004ecf3 Bug: 14596 Fixes: v2.1.0rc0-1521-gcefd1d4910 ("ssl: avoid duplicate PDU dissections") Reviewed-on: https://code.wireshark.org/review/26935 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16RPM: enable rpm target even if git is not availablePeter Wu1-8/+12
Change-Id: Ic6a7d656aeb0ae30c5e1cc1d8f12ed5ad43f73d7 Reviewed-on: https://code.wireshark.org/review/26968 Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16QUIC: Add initial support of draft-10Alexis La Goutte1-33/+6
Drop support of draft-08 and draft-09 with draft-10, PONG frame type is remove (and ACK use the same value)" Bug: 13881 Change-Id: Iaf99da18bf8cc4fcfc43bbed2d60d6978405651c Reviewed-on: https://code.wireshark.org/review/26964 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16RPM: support building from out-of-tree directories.Dario Lombardo1-0/+5
When building the RPM from a directory at the same level as the source (like in mdkir build;cmake ../wireshark;make rpm-package) we can't rely on the retrieval of the git version. However the wireshark export dir still have it and we can get it from there. Change-Id: Id6bcb453ec3a65977fc092c610e99e8dd01f613a Reviewed-on: https://code.wireshark.org/review/26957 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16RPM: restore the bindir in openSUSE before packing.Dario Lombardo1-0/+6
Change-Id: I6e60d1a299528c0f1603b56704a8c47f18c66d08 Reviewed-on: https://code.wireshark.org/review/26926 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16RPM: install wireshark.desktop in /usr/share/applications.Dario Lombardo1-0/+4
The presence of this file in /usr/share/applications in required by suse_update_desktop_file, as described here: https://en.opensuse.org/openSUSE:Packaging_Conventions_RPM_Macros#.25suse_update_desktop_file Change-Id: I88573afca2d4523a1b305bf4dc672c421c2fa1d1 Reviewed-on: https://code.wireshark.org/review/26925 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16RPM: cd into build dir in openSUSE.Dario Lombardo1-0/+6
This step is needed because of the differences in the %cmake macro between Fedora/Centos and openSUSE. Change-Id: I7ac94e560b4c298934f78e96036a814f3eadc4a5 Reviewed-on: https://code.wireshark.org/review/26924 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16Qt: Do not show MaxMind DB path when not enabledStig Bjørlykke1-0/+2
The About dialog should not show MaxMind DB path when built without the MaxMind DB resolver. Change-Id: Id5b51628a04005fc4dcaacea26abb3a0ddee9b66 Reviewed-on: https://code.wireshark.org/review/26886 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-04-15More PortAudio removal.Gerald Combs10-122/+6
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-15[Automatic update for 2018-04-15]Gerald Combs6-13/+167
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I50b0c7211bfde3e0a17b4580e18fa423ab8fbdf1 Reviewed-on: https://code.wireshark.org/review/26953 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-15Remove GTK+ and PortAudio from Autotools.Gerald Combs3-339/+18
Change-Id: I2126832da7542fc4f8147e26718abeede299717f Reviewed-on: https://code.wireshark.org/review/26942 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-15Provide alternative paths for the macosx-support-libs.Joerg Mayer1-23/+39
That way I won't have to restore the dir after a "git -dfX" Also Update CMake to 1.11.0 (current) and Qt to 5.9.5 (LTS) Change-Id: Idcc481b517d6379f97fa5d30ce3b886cfcf3c9d4 Reviewed-on: https://code.wireshark.org/review/26951 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2018-04-15packet-mq: Fix for Missing ConstRobert Grange1-47/+45
Fix to fill in some missing const in Display Change-Id: Ic9fa51eef84cefffc29f7424246e707c560ba1d0 Reviewed-on: https://code.wireshark.org/review/26892 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-15Gtk: Remove source codeRoland Knall237-142726/+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-15.mailmap: update of March and April (2018)Alexis La Goutte2-7/+9
Change-Id: Ic9879655c764fbfe10a60894337722bb717a9598 Reviewed-on: https://code.wireshark.org/review/26884 Reviewed-by: Saku Ytti <saku@ytti.fi> Reviewed-by: Yasuyuki Tanaka <yasuyuki.tanaka@inria.fr> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-15openflow: fix decode of experimenter OXM fieldsJaime Caamaño Ruiz3-33/+18
No longer report decoded experimenter values as undecoded which was causing incorrect offset handling. Change-Id: If902f8c8c5b53b8062e88229d67728bb67557062 Signed-off-by: Jaime Caamaño Ruiz <jcaamano@suse.com> Reviewed-on: https://code.wireshark.org/review/26888 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-15dfilter-test.py: document parallelization supportPeter Wu3-5/+13
Tests are independent and can be run in parallel using pytest-xdist (https://github.com/pytest-dev/pytest-xdist), document it. While at it, allow running the tests from other directories. Change-Id: I3e55c549669f7d59d35cd64eca53680cea6dec2d Reviewed-on: https://code.wireshark.org/review/26943 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-15Check for HAVE_LZ4FRAME_H in the LZ4 detection process and use itJoerg Mayer4-8/+21
Change-Id: I919621b8c4c809eb181d563251eeb099b767ad82 Reviewed-on: https://code.wireshark.org/review/26940 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-15Remove some references to PortAudio.Gerald Combs4-33/+9
Change-Id: Icfe9516ff814db5362aa345e6f527551dcb13935 Reviewed-on: https://code.wireshark.org/review/26946 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-15dftestlib: remove unnecessary execute bitPeter Wu18-0/+0
tools/dfilter-test.py is the main script, others are imported as needed. Change-Id: I5ce7bd298b90d3e16c83c6b219c2717ccbcf2a10 Reviewed-on: https://code.wireshark.org/review/26944 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-15Clean up whitespace.Guy Harris1-1/+1
Change-Id: Ifdd6f1e96a01f040375639f6d09e56241798b346 Reviewed-on: https://code.wireshark.org/review/26949 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-04-15Expand and clean up comments.Guy Harris1-4/+23
Change-Id: Ie87615c664e3fec70356f86675b219c7a6462417 Reviewed-on: https://code.wireshark.org/review/26948 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-04-15Clean up the way we handle the FCS.Guy Harris1-36/+100
For the "802.15.4 with FCS" link-layer type, strip what FCS we find, if any, off and use that new tvbuff for all dissection except for checking and dissection of the FCS itself. For the "802.15.4 without FCS" link-layer type, don't fake an uncaptured FCS by increasing the reported length, just use the tvbuff as is. This means we handle 802.15.4 the same way we handle other link-layer types where the FCS might, or might not, appear as part of the captured data. Change-Id: Ia91b7fb0aad495876be00bf813c6b6517e5e11d7 Reviewed-on: https://code.wireshark.org/review/26947 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-04-14DTN: Minor changes for Bundle-Integrity/Confidentiality Block payloadKrishnamurthy Mayya1-2/+2
Change-Id: I0d4458e02c9e1f747659fb116906ca44515a9033 Reviewed-on: https://code.wireshark.org/review/26941 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-14Bluetooth: ATT: Fix cast-warningsMichał Łabędzki1-11/+11
1. Use explicit cast from gint16 to gint then to gdouble - I can understand my compiler - implicit cast is not explicit cast 2. Fix const cast by remove "const" from one field but add it whenever possible in other places Change-Id: Iab7401f972c40bca2df58f91b89e29cf2d7cf11b Reviewed-on: https://code.wireshark.org/review/26917 Petri-Dish: Michal Labedzki <michal.labedzki@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki <michal.labedzki@wireshark.org>
2018-04-14packet-pcep.c: opposite inner 'if' condition leads to a dead code blockchinarulezzz1-6/+7
Change-Id: I13e32d7f333c3e50085c0008d7677f4c6d0611d4 Reviewed-on: https://code.wireshark.org/review/26928 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-14PDCP NR: remove a now meaningless commentPascal Quantin1-2/+0
Change-Id: Ie234abdad7be9fd6f68d6676bae37286ee5dca2f Reviewed-on: https://code.wireshark.org/review/26938 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-14PDCP LTE: reuse existing pdcp_lte_info structure after first passPascal Quantin2-94/+94
Change-Id: I3fbd95cbdbf958d4b6b93f0b7511be9ee772608c Reviewed-on: https://code.wireshark.org/review/26932 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-14RLC LTE: reuse existing rlc_lte_info structure after first passPascal Quantin1-67/+62
Change-Id: I0f0022ec1d04b466e9725684708088486d5f181c Reviewed-on: https://code.wireshark.org/review/26931 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-14MAC LTE: reuse existing mac_lte_info structure after first passPascal Quantin1-18/+13
Change-Id: I2e6c9067b8c4d8b318f79c6ad9e924af234a6b78 Reviewed-on: https://code.wireshark.org/review/26930 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-14PDCP NR: reuse existing pdcp_nr_info structure after first passPascal Quantin2-86/+87
Change-Id: Ief847244d8f989e2639a0dbcf96e2c7a7b1fb69a Reviewed-on: https://code.wireshark.org/review/26933 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Roland Knall <rknall@gmail.com>
2018-04-14packet-tns.c: add TODO to TNS Refuse packet dissectorchinarulezzz1-0/+5
Change-Id: If5f8cf73eb878fa3feb31ba32d576d75a293e314 Reviewed-on: https://code.wireshark.org/review/26927 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>