Use xz to compress the source tarball.

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>

7 files changed, 15 insertions, 33 deletions

diff --git a/Makefile.am b/Makefile.am
index ed3aafd1cc..67ba8cd2d9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -936,26 +936,6 @@ libtool: $(LIBTOOL_DEPS)
 	$(SHELL) ./config.status --recheck
 
 
-# Used by patch-bzip2
-# Trim off any extra version information and find the previous micro release.
-BASE_VERSION=`echo "$(VERSION)" | awk -F. '{$$3 = $$3 + 0 ; printf("%d.%d.%d"), $$1, $$2, $$3}'`
-PREV_VERSION=`echo "$(VERSION)" | awk -F. '{$$3 = $$3 + 0 ; if ($$3 > 0) $$3-- ; printf("%d.%d.%d"), $$1, $$2, $$3}'`
-PREV_DIR="wireshark-$(PREV_VERSION)"
-PREV_FILE="$(PREV_DIR).tar.bz2"
-PREV_URL="https://www.wireshark.org/download/src/all-versions/$(PREV_FILE)"
-
-patch-bzip2: distdir
-	if test x$(BASE_VERSION) != x$(PREV_VERSION) ; then \
-		curl --time-cond $(PREV_FILE) --location --output $(PREV_FILE) $(PREV_URL) && \
-		tar -xjf $(PREV_FILE) && \
-		diff -urN $(PREV_DIR) $(distdir) | bzip2 > patch-wireshark-$(PREV_VERSION)-to-$(VERSION).bz2 && \
-		echo "Created patch-bzip2" ; \
-		rm -rf "$(PREV_FILE)" "$(PREV_DIR)" ; \
-	else \
-		echo "This appears to be the first micro version ($(PREV_VERSION)). Skipping." ; \
-	fi
-	$(am__remove_distdir)
-
 #
 # Install icons and other desktop files for (for use with GNOME, KDE, or
 # any other freedesktop.org-compliant desktops).
@@ -1118,12 +1098,12 @@ rpm-package: dist
 	@cd $(rpm_topdir) && \
 	  mkdir -p BUILD RPMS SOURCES SRPMS && \
 	  cd SOURCES && \
-	  ln -sf ../../../$(distdir).tar.bz2 && \
+	  ln -sf ../../../$(distdir).tar.xz && \
 	  cd .. && \
 	  $(RPMBUILD) --define "_topdir `cd . && pwd`" --define "_prefix $(prefix)" \
 		@RPMBUILD_WITH_ARGS@ --clean -ba SPECS/wireshark.spec && \
 	  echo "Package successfully built in `pwd`/RPMS." ; \
-	  rm -f SOURCES/$(distdir).tar.bz2 ../../$(distdir).tar.bz2
+	  rm -f SOURCES/$(distdir).tar.xz ../../$(distdir).tar.xz
 else
 rpm-package:
 	@echo "RPM executable not available." ; \
diff --git a/configure.ac b/configure.ac
index 4a8fa9079f..db0066a5c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,7 @@ dnl AC_CANONICAL_BUILD
 dnl AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
-AM_INIT_AUTOMAKE([1.11 tar-ustar dist-bzip2 no-dist-gzip subdir-objects])
+AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip subdir-objects])
 
 # Enable silent builds by default. Verbose builds can be enabled with "./configure
 # --enable-silent-rules ..." or "make V=1 ..."
diff --git a/doc/README.packaging b/doc/README.packaging
index 6446fe1fda..3665a2073a 100644
--- a/doc/README.packaging
+++ b/doc/README.packaging
@@ -13,7 +13,7 @@ The canonical location for every Wireshark source release is
 
     https://www.wireshark.org/download/src/all-versions/, e.g.
 
-    https://www.wireshark.org/download/src/all-versions/wireshark-0.99.55.tar.bz2
+    https://www.wireshark.org/download/src/all-versions/wireshark-2.4.5.tar.xz
 
 If your packaging system downloads a copy of the Wireshark sources, use
 this location. Don't use https://www.wireshark.org/download/src.
@@ -45,7 +45,7 @@ Warnings are displayed when Wireshark and TShark are run as root.
 There are several configure-time options on non-Windows systems that
 affect the privileges a normal user needs to capture traffic and list
 interfaces:
-  
+
     --enable-setcap-install   Install dumpcap with cap_net_admin and
                               cap_net_raw capabilities. Linux only.
 
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
index 763025e42d..71db1bfb6b 100644
--- a/docbook/release-notes.asciidoc
+++ b/docbook/release-notes.asciidoc
@@ -27,6 +27,8 @@ used for troubleshooting, analysis, development and education.
 The following features are new (or have been significantly updated)
 since version 2.1.1:
 
+* Source code releases are now compressed using xz.
+
 The following features are new (or have been significantly updated)
 since version 2.1.0:
 
diff --git a/docbook/wsdg_src/WSDG_chapter_sources.asciidoc b/docbook/wsdg_src/WSDG_chapter_sources.asciidoc
index 5d3676759f..a0bd342009 100644
--- a/docbook/wsdg_src/WSDG_chapter_sources.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_sources.asciidoc
@@ -338,7 +338,7 @@ There are several ways to download the Wireshark source code (as
 described in <<ChSrcObtain>>), but bringing the changes from the
 official sources into your personal source tree is identical.
 
-First of all, you will download the new `.tar.bz2` file of the official
+First of all, you will download the new `.tar.xz` file of the official
 sources the way you did it the first time.
 
 If you haven't changed anything in the sources, you could simply throw
@@ -349,7 +349,7 @@ remember later that you really did change something before.
 
 If you have changed your source tree, you have to merge the official
 changes since the last update into your source tree. You will install
-the content of the `.tar.bz2` file into a new directory and use a good
+the content of the `.tar.xz` file into a new directory and use a good
 merge tool (e.g. http://winmerge.sourceforge.net/[]for Win32) to bring
 your personal source tree in sync with the official sources again.
 
diff --git a/docbook/wsug_src/WSUG_chapter_build_install.asciidoc b/docbook/wsug_src/WSUG_chapter_build_install.asciidoc
index c103754301..a4c9b7cb5b 100644
--- a/docbook/wsug_src/WSUG_chapter_build_install.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_build_install.asciidoc
@@ -268,19 +268,19 @@ Use the following general steps to build Wireshark from source under UNIX or Lin
 +
 --
 ----
-$ tar xaf wireshark-2.0.5.tar.bz2
+$ tar xaf wireshark-2.4.5.tar.xz
 ----
 In other cases you will have to use the following commands:
 ----
-$ bzip2 -d wireshark-2.0.5.tar.bz2
-$ tar xf wireshark-2.0.5.tar
+$ xz -d wireshark-2.4.5.tar.xz
+$ tar xf wireshark-2.4.5.tar
 ----
 --
 
 . Change directory to the Wireshark source directory.
 +
 ----
-$ cd wireshark-2.0.5
+$ cd wireshark-2.4.5
 ----
 
 . Configure your source so it will build correctly for your version of UNIX. You
diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in
index 974510ec9e..068c58d75b 100644
--- a/packaging/rpm/SPECS/wireshark.spec.in
+++ b/packaging/rpm/SPECS/wireshark.spec.in
@@ -37,9 +37,9 @@ Version:	@RPM_VERSION@
 Release:	1
 License:	GPLv2+
 Group:		Applications/Internet
-Source:		https://wireshark.org/download/src/%{name}-%{package_version}.tar.bz2
+Source:		https://wireshark.org/download/src/%{name}-%{package_version}.tar.xz
 # Or this URL for automated builds:
-#Source:	https://wireshark.org/download/automated/src/%{name}-%{package_version}.tar.bz2
+#Source:	https://wireshark.org/download/automated/src/%{name}-%{package_version}.tar.xz
 URL:		https://www.wireshark.org/
 Packager:	Gerald Combs <gerald[AT]wireshark.org>
 # Some distributions create a wireshark-devel package; get rid of it