Remove the gpg-zip script.

* tools/gpg-zip.in: Remove.
* m4/tar-ustar.m4: Remove.
--

Note that the script was even not anymore installed.  See also
GnuPG-bug-id: 4252

Signed-off-by: Werner Koch <wk@gnupg.org>

configure.ac

@@ -625,7 +625,6 @@ AC_ARG_VAR(YAT2M, [tool to convert texi to man pages])
 AM_CONDITIONAL(HAVE_YAT2M, test -n "$ac_cv_path_YAT2M")
 AC_ISC_POSIX
 AC_SYS_LARGEFILE
-GNUPG_CHECK_USTAR
 
 
 # We need to compile and run a program on the build machine.  A
@@ -2050,7 +2049,6 @@ agent/Makefile
 scd/Makefile
 g13/Makefile
 dirmngr/Makefile
-tools/gpg-zip
 tools/Makefile
 doc/Makefile
 tests/Makefile

m4/Makefile.am

@@ -1,6 +1,6 @@
 EXTRA_DIST = intl.m4 intldir.m4 glibc2.m4 lock.m4 visibility.m4 intmax.m4 longdouble.m4 printf-posix.m4 signed.m4 size_max.m4 wchar_t.m4 wint_t.m4 xsize.m4  codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 stdint_h.m4 uintmax_t.m4
 
-EXTRA_DIST += ldap.m4 libcurl.m4 libusb.m4 tar-ustar.m4 readline.m4 pkg.m4
+EXTRA_DIST += ldap.m4 libcurl.m4 libusb.m4 readline.m4 pkg.m4
 
 EXTRA_DIST += gnupg-pth.m4
 

m4/tar-ustar.m4

@@ -1,43 +0,0 @@
-dnl Check for a tar program that speaks ustar format
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-AC_DEFUN([GNUPG_CHECK_USTAR],
-[
-  AC_ARG_WITH(tar,
-     AC_HELP_STRING([--with-tar=PATH],[look for a tar program in PATH]),
-     [_do_tar=$withval])
-
-  if test x$_do_tar != xno ; then
-
-     if test x$_do_tar = x ; then
-        AC_PATH_PROG(TAR,"tar")
-        _mytar=$ac_cv_path_TAR
-     fi
-
-     # Check if our tar is ustar format.  If so, it's good.  TODO: Add some
-     # code to check various options, etc, to try and create ustar
-     # format.
-
-     if test x$_mytar != x ; then
-        AC_MSG_CHECKING([whether $_mytar speaks USTAR])
-        echo hithere > conftest.txt
-        $_mytar -cf - conftest.txt | (dd skip=257 bs=1 count=5 2>/dev/null || cat) | grep ustar > /dev/null
-        _tar_bad=$?
-        rm conftest.txt
-
-	if test x$_tar_bad = x0 ; then
-	   AC_MSG_RESULT([yes])
-	else
-	   AC_MSG_RESULT([no])
-	fi
-     fi
-  fi
-
-  AM_CONDITIONAL(HAVE_USTAR, test x$_tar_bad = x0)
-])dnl

tools/Makefile.am

@@ -34,11 +34,6 @@ AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(LIBASSUAN_CFLAGS)
 
 sbin_SCRIPTS = addgnupghome applygnupgdefaults
 
-if HAVE_USTAR
-# bin_SCRIPTS += gpg-zip
-noinst_SCRIPTS = gpg-zip
-endif
-
 if BUILD_SYMCRYPTRUN
   symcryptrun = symcryptrun
 else

tools/gpg-zip.in

@@ -1,148 +0,0 @@
-#!/bin/sh
-
-# gpg-archive - gpg-ized tar using the same format as PGP's PGP Zip.
-# Copyright (C) 2005 Free Software Foundation, Inc.
-#
-# This file is part of GnuPG.
-#
-# GnuPG is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# GnuPG is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-# Despite the name, PGP Zip format is actually an OpenPGP-wrapped tar
-# file.  To be compatible with PGP itself, this must be a USTAR format
-# tar file.  Unclear on whether there is a distinction here between
-# the GNU or POSIX variant of USTAR.
-
-VERSION=@VERSION@
-TAR=@TAR@
-GPG=gpg
-
-usage="\
-Usage: gpg-zip [--help] [--version] [--encrypt] [--decrypt] [--symmetric]
-       [--list-archive] [--output FILE] [--gpg GPG] [--gpg-args ARGS]
-       [--tar TAR] [--tar-args ARGS] filename1 [filename2, ...]
-       directory1 [directory2, ...]
-
-Encrypt or sign files into an archive."
-
-tar_verbose_opt="v"
-
-while test $# -gt 0 ; do
-  case $1 in
-    -h | --help | --h*)
-      echo "$usage"
-      exit 0
-      ;;
-    --list-archive)
-      list=yes
-      create=no
-      unpack=no
-      shift
-      ;;
-    --encrypt | -e)
-      gpg_args="$gpg_args --encrypt"
-      list=no
-      create=yes
-      unpack=no
-      shift
-      ;;
-    --decrypt | -d)
-      gpg_args="$gpg_args --decrypt"
-      list=no
-      create=no
-      unpack=yes
-      shift
-      ;;
-    --symmetric | -c)
-      gpg_args="$gpg_args --symmetric"
-      list=no
-      create=yes
-      unpack=no
-      shift
-      ;;
-    --sign | -s)
-      gpg_args="$gpg_args --sign"
-      list=no
-      create=yes
-      unpack=no
-      shift
-      ;;
-    --recipient | -r)
-      gpg_args="$gpg_args --recipient $2"
-      shift
-      shift
-      ;;
-    --local-user | -u)
-      gpg_args="$gpg_args --local-user $2"
-      shift
-      shift
-      ;;
-    --output | -o)
-      gpg_args="$gpg_args --output $2"
-      shift
-      shift
-      ;;
-    --version)
-      echo "gpg-zip (GnuPG) $VERSION"
-      exit 0
-      ;;
-    --gpg)
-      GPG=$2
-      shift
-      shift
-      ;;
-    --gpg-args)
-      gpg_args="$gpg_args $2"
-      shift
-      shift
-      ;;
-    --tar)
-      TAR=$2
-      shift
-      shift
-      ;;
-    --tar-args)
-      tar_args="$tar_args $2"
-      shift
-      shift
-      ;;
-    --quiet)
-      tar_verbose_opt=""
-      shift
-      ;;
-    --)
-      shift
-      break
-      ;;
-    -*)
-      echo "$usage" 1>&2
-      exit 1
-      ;;
-    *)
-      break
-      ;;
-  esac
-done
-
-if test x$create = xyes ; then
-#   echo "$TAR $tar_args -cf - "$@" | $GPG --set-filename x.tar $gpg_args" 1>&2
-   $TAR $tar_args -cf - "$@" | $GPG --set-filename x.tar $gpg_args
-elif test x$list = xyes ; then
-#   echo "cat \"$1\" | $GPG $gpg_args | $TAR $tar_args -tf -" 1>&2
-   cat "$1" | $GPG $gpg_args | $TAR $tar_args -tf -
-elif test x$unpack = xyes ; then
-#   echo "cat \"$1\" | $GPG $gpg_args | $TAR $tar_args -xvf -" 1>&2
-   cat "$1" | $GPG $gpg_args | $TAR $tar_args -x${tar_verbose_opt}f -
-else
-   echo "$usage" 1>&2
-   exit 1
-fi