Packaging: Add dependencies for lz4 and snappy packages

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>

debian/control

@@ -21,7 +21,8 @@ Build-Depends: libgtk-3-dev, lsb-release,
  libgcrypt-dev, portaudio19-dev, libkrb5-dev, liblua5.2-dev, libsmi2-dev,
  libgeoip-dev, dpkg-dev (>= 1.16.1~), imagemagick, xdg-utils,
  libnl-genl-3-dev [linux-any], libnl-route-3-dev [linux-any], asciidoc,
- cmake (>= 2.8.8), w3m, libsbc-dev, libnghttp2-dev, libssh-gcrypt-dev
+ cmake (>= 2.8.8), w3m, libsbc-dev, libnghttp2-dev, libssh-gcrypt-dev,
+ libnghttp2-dev, liblz4-dev, libsnappy-dev
 Build-Conflicts: libsnmp4.2-dev, libsnmp-dev
 Vcs-Svn: svn://svn.debian.org/svn/collab-maint/ext-maint/wireshark/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/ext-maint/wireshark/trunk/

packaging/rpm/SPECS/wireshark.spec.in

@@ -9,6 +9,7 @@
 %bcond_with	lua
 
 # Set these to 1 if you want to ensure your package includes support for them:
+%global with_lz4_and_snappy 1
 %global with_c_ares 1
 %global with_portaudio 0
 %global with_nghttp2 1
@@ -67,6 +68,20 @@ Requires:	libpcap
 BuildRequires:	zlib-devel
 Requires:	zlib
 
+%if %{with_lz4_and_snappy}
+%if 0%{?suse_version}
+BuildRequires:	liblz4-devel
+BuildRequires:	snappy-devel
+Requires:	libsnappy1
+Requires:	liblz4-1
+%else
+BuildRequires:	lz4-devel
+BuildRequires:	snappy-devel
+Requires:	snappy
+Requires:	lz4
+%endif
+%endif
+
 %if %{with_c_ares}
 %if 0%{?suse_version}
 # SuSE uses these package names (yes 2!):
@@ -447,6 +462,9 @@ fi
 %endif
 
 %changelog
+* Mon Oct 18 2016 Benoit Canet
+- Add LZ4 and snappy compression support.
+
 * Mon Aug 29 2016 Jeff Morriss
 - Add libnghttp2 (as an option, defaulting to required).
 

tools/debian-setup.sh

@@ -40,7 +40,8 @@ ADDITIONAL_LIST="libnl-3-dev qttools5-dev qttools5-dev-tools libgtk-3-dev \
 		libc-ares-dev libssh-dev libkrb5-dev libqt5svg5-dev lynx libsmi2-dev \
 		portaudio19-dev asciidoc libgcrypt-dev libsbc-dev libgeoip-dev \
 		libgnutls-dev qtmultimedia5-dev liblua5.2-dev libnl-cli-3-dev \
-		libparse-yapp-perl qt5-default cmake libcap-dev libssh-gcrypt-dev"
+		libparse-yapp-perl qt5-default cmake libcap-dev libssh-gcrypt-dev \
+		liblz4-dev libsnappy-dev"
 
 # Check for lsb_release command in $PATH
 if ! which lsb_release > /dev/null; then

tools/install_rpms_for_devel.sh

@@ -37,7 +37,14 @@ then
 	GLIB2="glib2-devel libglib-2_0-0"
 	PCAP="libpcap-devel libpcap1"
 	ZLIB="zlib-devel libz1"
+	SNAPPY="snappy-devel libsnappy1"
+	# The runtime package name changes with the version.  Just pull it
+	# in through the -devel package.
+	LZ4="liblz4-devel"
 	CARES="libcares-devel libcares2"
+	NGHTTP2="nghttp2"
+	# SUSE doesn't split the pod2* commands into a separate package like RH
+	PERLPODS=""
 else
 	if [ ! -r /etc/redhat-release ]
 	then
@@ -57,12 +64,16 @@ else
 	GLIB2="glib2-devel glib2"
 	PCAP="libpcap-devel libpcap"
 	ZLIB="zlib-devel zlib"
+	SNAPPY="snappy-devel snappy"
+	LZ4="lz4 lz4-devel" # May need to enable EPEL
 	CARES="c-ares-devel c-ares"
+	NGHTTP2="libnghttp2"
+	PERLPODS="perl-podlators"
 fi
 
 PKGS="autoconf automake libtool gcc flex bison python perl $GLIB2
 $PCAP $ZLIB lua-devel lua $CARES $GTK3 $GTK2 desktop-file-utils $QT fop
-asciidoc git git-review perl-podlators libnghttp2-devel libnghttp2"
+asciidoc git git-review $PERLPODS libnghttp2-devel $NGHTTP2 $SNAPPY $LZ4"
 
 echo "Run this command (as root):"
 echo

tools/macos-setup-brew.sh

@@ -25,7 +25,7 @@
 brew update
 
 #install some lib need by Wireshark
-brew install c-ares glib gnutls lua cmake nghttp2
+brew install c-ares glib gnutls lua cmake nghttp2 snappy lz4
 
 #install Qt5
 brew install qt5