From 24028875848f7e677e6c99581aa4e390633d571d Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Wed, 5 Nov 2014 08:56:52 +0100
Subject: [PATCH] speedo: Do not not assume GNU tar.

--
Signed-off-by: Werner Koch <wk@gnupg.org>
---
 autogen.sh          |  4 ++--
 build-aux/speedo.mk | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 112d2eef0..7effd568a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -202,12 +202,12 @@ if [ "$myhost" = "find-version" ]; then
 
     case "$version_parts" in
       2)
-        matchstr1="$package-$major.[0-9][0-9]*"
+        matchstr1="$package-$major.[0-9]*"
         matchstr2="$package-$major-base"
         vers="$major.$minor"
         ;;
       *)
-        matchstr1="$package-$major.$minor.[0-9][0-9]*"
+        matchstr1="$package-$major.$minor.[0-9]*"
         matchstr2="$package-$major.$minor-base"
         vers="$major.$minor.$micro"
         ;;
diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index 8e0ef4efa..b7bcf06ee 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -421,11 +421,13 @@ speedo_pkg_gpa_configure = \
 
 speedo_pkg_gpgex_configure = \
 	--with-gpg-error-prefix=$(idir) \
-	--with-libassuan-prefix=$(idir)
+	--with-libassuan-prefix=$(idir) \
+	--enable-gpa-only
 
 speedo_pkg_w64_gpgex_configure = \
 	--with-gpg-error-prefix=$(idir6) \
-	--with-libassuan-prefix=$(idir6)
+	--with-libassuan-prefix=$(idir6) \
+	--enable-gpa-only
 
 
 #
@@ -741,15 +743,16 @@ $(stampdir)/stamp-$(1)-00-unpack: $(stampdir)/stamp-directories
          elif [ -n "$$$${tar}" ]; then			\
 	   echo "speedo: unpacking $(1) from $$$${tar}"; \
            case "$$$${tar}" in				\
-             *.gz) opt=z ;;				\
-             *.bz2) opt=j ;;				\
-	     *.xz) opt=J ;;                      	\
-             *) opt= ;;					\
+             *.gz) pretar=zcat ;;	   		\
+             *.bz2) pretar=bzcat ;;			\
+	     *.xz) pretar=xzcat ;;                     	\
+             *) pretar=cat ;;				\
            esac;					\
            [ -f tmp.tgz ] && rm tmp.tgz;                \
            case "$$$${tar}" in				\
-	     /*) tar x$$$${opt}f - < $$$${tar} ;;	\
-	     *)  wget -q -O - $$$${tar} | tee tmp.tgz | tar x$$$${opt}f - ;; \
+	     /*) $$$${pretar} < $$$${tar} | tar xf - ;;	\
+	     *)  wget -q -O - $$$${tar} | tee tmp.tgz   \
+                  | $$$${pretar} | tar x$$$${opt}f - ;; \
 	   esac;					\
 	   if [ -f tmp.tgz ]; then                      \
 	     if [ -n "$$$${sha1}" ]; then               \