Rebase libarchive to 2.7.1

6 files changed, 0 insertions, 719 deletions

diff --git a/libarchive/libarchive-2.5.5/contrib/README b/libarchive/libarchive-2.5.5/contrib/README
deleted file mode 100644
index 2eb0114..0000000
--- a/libarchive/libarchive-2.5.5/contrib/README
+++ /dev/null
@@ -1,32 +0,0 @@
-Many people have graciously sent me configuration
-files and other useful tidbits for use with libarchive.
-
-I do not support or use any of these; but if you can use them, enjoy!
-
-======================================================================
-
-From: Andre Stechert <andre@splunk.com>
-
-libarchive_autodetect-st_lib_archive.m4
-
-M4 macros for use with autoconf to detect whether a suitable
-version of libarchive is installed on this system.
-
-
-======================================================================
-
-libarchive.spec
-
-An RPM ".spec" file for building libarchive on most systems.
-This apparently was originally developed by a group at pld-linux.org.
-Several people have sent me different versions of this file.
-
-======================================================================
-
-From: Robert Meier <rm1023@dcx.com>
-
-libarchive.1aix53.spec
-
-As above, for use on AIX5.3.
-
-======================================================================
diff --git a/libarchive/libarchive-2.5.5/contrib/libarchive.1aix53.spec b/libarchive/libarchive-2.5.5/contrib/libarchive.1aix53.spec
deleted file mode 100644
index 9c35c82..0000000
--- a/libarchive/libarchive-2.5.5/contrib/libarchive.1aix53.spec
+++ /dev/null
@@ -1,160 +0,0 @@
-# $Revision: 1aix53 $, $Date: 2006/11/15 10:41:28 $
-Summary:        Library to create and read several different archive formats
-Summary(pl):    Biblioteka do tworzenia i odczytu różnych formatów archiwów
-Name:           libarchive
-Version:        2.0a3
-Release:        1aix53
-License:        BSD
-Group:          Libraries
-Source0: http://people.freebsd.org/~kientzle/libarchive/src/%{name}-%{version}.tar.gz
-Patch:          %{name}-0123457890.patch
-URL:            http://people.freebsd.org/~kientzle/libarchive/
-Requires:       glibc
-Requires:       zlib
-Requires:       bzip2
-BuildRequires:  gcc
-BuildRequires:  gcc-c++
-BuildRequires:  gawk
-BuildRequires:  zlib-devel
-BuildRequires:  bzip2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
-%description
-Libarchive is a programming library that can create and read several
-different streaming archive formats, including most popular TAR
-variants and several CPIO formats. It can also write SHAR archives.
-
-%description -l pl
-Libarchive jest biblioteką służacą to tworzenia i odczytu wielu
-różnych strumieniowych formatów archiwów, włączając w to popularne
-odmiany TAR oraz wiele formatów CPIO. Biblioteka ta potrafi także
-zapisywać archiwa SHAR.
-
-%package devel
-Summary:        Header files for libarchive library
-Summary(pl):    Pliki nagłówkowe biblioteki libarchive
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description devel
-Header files for libarchive library.
-
-%description devel -l pl
-Pliki nagłówkowe biblioteki libarchive.
-
-%package static
-Summary:        Static libarchive library
-Summary(pl):    Statyczna biblioteka libarchive
-Group:          Development/Libraries
-Requires:       %{name}-devel = %{version}-%{release}
-
-%description static
-Static libarchive library.
-
-%description static -l pl
-Statyczna biblioteka libarchive.
-
-%package -n bsdtar
-Summary:        bsdtar - tar(1) implementation based on libarchive
-Summary(pl):    bsdtar - implementacja programu tar(1) oparta na libarchive
-Group:          Applications/Archiving
-Requires:       %{name} = %{version}-%{release}
-
-%description -n bsdtar
-bsdtar - tar(1) implementation based on libarchive.
-
-%description -n bsdtar -l pl
-bsdtar - implementacja programu tar(1), oparta na libarchive.
-
-%prep
-%setup -q
-%patch0 -p1
-
-%build
-# Specify paths to avoid use of vacpp
-# -maix64 - required to use large files with aix-5.3
-# -static - required for interoperability without copying libraries
-# -D_BSD - required to include definition of makedev
-# -X64 - required to assemble 64-bit COFF files
-mkdir -p %{buildroot}
-PATH=/opt/freeware/libexec:/opt/freeware/bin:/usr/local/bin:/usr/bin:/etc:/usr/sbin:/usr/ucb:/usr/bin/X11:/sbin:. \
-CPATH=/opt/freeware/include:/usr/local/include \
-LIBPATH=/opt/freeware/lib:/usr/local/lib:/usr/share/lib \
-LD_LIBRARY_PATH=/opt/freeware/lib:/usr/local/lib:/usr/share/lib \
-CFLAGS="$RPM_OPT_FLAGS -maix64 -static -D_BSD" \
-CXXFLAGS="$RPM_OPT_FLAGS -maix64 -static -D_BSD" \
-AR="ar -X64" \
-./configure \
---prefix=%{_prefix} \
---libexecdir=%{_libexecdir} \
---mandir=%{_mandir} \
---infodir=%{_infodir} \
---enable-shared=yes \
---enable-static=yes \
-| tee %{buildroot}/config.log
-make | tee %{buildroot}/make.log
-
-%install
-[ "%buildroot" != "/" ] && [ -d %buildroot ] && rm -rf %buildroot;
-make DESTDIR=%buildroot install
-# original install builds, but does install bsdtar
-cp .libs/%{name}.a %{buildroot}%{_libdir}
-cp bsdtar %{buildroot}%{_bindir}
-cp tar/bsdtar.1 %{buildroot}%{_mandir}/man1
-
-%clean
-rm -fr %buildroot
-
-%files
-%defattr(644,root,root,755)
-%{_libdir}/libarchive.a
-
-%files devel
-%defattr(644,root,root,755)
-%{_libdir}/libarchive.la
-%{_includedir}/*.h
-%doc %{_mandir}/man3/*
-%doc %{_mandir}/man5/*
-
-%files -n bsdtar
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/bsdtar
-%doc %{_mandir}/man1/bsdtar.1*
-
-%define date    %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
-%changelog
-* %{date} PLD Team <feedback@pld-linux.org>
-All persons listed below can be reached at <cvs_login>@pld-linux.org
-
-$Log: libarchive.spec,v $
-Release 1aix53  2006/12/12 rm1023@dcx.com
-- tweak for aix-5.3
-- added libarchive-0123457890.patch for "0123457890" error
-- replaced libarchive-1.3.1.tar.gz with libarchive-2.0a3.tar.gz
-- removed obsolete -CVE-2006-5680.patch and -man_progname.patch
-
-Revision 1.6  2006/11/15 10:41:28  qboosh
-- BR: acl-devel,attr-devel
-- devel deps
-
-Revision 1.5  2006/11/08 22:22:25  twittner
-- up to 1.3.1
-- added BR: e2fsprogs-devel
-- added -CVE-2006-5680.patch agains entering in infinite
-loop in corrupt archives
-- added bsdtar package (bsdtar is included now in libarchive
-sources)
-- rel. 0.1 for testing
-
-Revision 1.4  2005/12/15 18:26:36  twittner
-- up to 1.2.37
-- removed -shared.patch (no longer needed)
-
-Revision 1.3  2005/10/05 17:00:12  arekm
-- up to 1.02.034
-
-Revision 1.2  2005/07/27 20:17:21  qboosh
-- typo
-
-Revision 1.1  2005/07/27 08:36:03  adamg
-- new
diff --git a/libarchive/libarchive-2.5.5/contrib/libarchive.spec b/libarchive/libarchive-2.5.5/contrib/libarchive.spec
deleted file mode 100644
index 29eef95..0000000
--- a/libarchive/libarchive-2.5.5/contrib/libarchive.spec
+++ /dev/null
@@ -1,147 +0,0 @@
-# $Revision: 1 $, $Date: 2006/11/15 10:41:28 $
-Summary:        Library to create and read several different archive formats
-Summary(pl):    Biblioteka do tworzenia i odczytu różnych formatów archiwów
-Name:           libarchive
-Version:        2.0a3
-Release:        1
-License:        BSD
-Group:          Libraries
-Source0: http://people.freebsd.org/~kientzle/libarchive/src/%{name}-%{version}.tar.gz
-Patch:          %{name}-0123457890.patch
-URL:            http://people.freebsd.org/~kientzle/libarchive/
-Requires:       glibc
-Requires:       zlib
-Requires:       bzip2
-BuildRequires:  gcc
-BuildRequires:  gcc-c++
-BuildRequires:  gawk
-BuildRequires:  zlib-devel
-BuildRequires:  bzip2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
-%description
-Libarchive is a programming library that can create and read several
-different streaming archive formats, including most popular TAR
-variants and several CPIO formats. It can also write SHAR archives.
-
-%description -l pl
-Libarchive jest biblioteką służacą to tworzenia i odczytu wielu
-różnych strumieniowych formatów archiwów, włączając w to popularne
-odmiany TAR oraz wiele formatów CPIO. Biblioteka ta potrafi także
-zapisywać archiwa SHAR.
-
-%package devel
-Summary:        Header files for libarchive library
-Summary(pl):    Pliki nagłówkowe biblioteki libarchive
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description devel
-Header files for libarchive library.
-
-%description devel -l pl
-Pliki nagłówkowe biblioteki libarchive.
-
-%package static
-Summary:        Static libarchive library
-Summary(pl):    Statyczna biblioteka libarchive
-Group:          Development/Libraries
-Requires:       %{name}-devel = %{version}-%{release}
-
-%description static
-Static libarchive library.
-
-%description static -l pl
-Statyczna biblioteka libarchive.
-
-%package -n bsdtar
-Summary:        bsdtar - tar(1) implementation based on libarchive
-Summary(pl):    bsdtar - implementacja programu tar(1) oparta na libarchive
-Group:          Applications/Archiving
-Requires:       %{name} = %{version}-%{release}
-
-%description -n bsdtar
-bsdtar - tar(1) implementation based on libarchive.
-
-%description -n bsdtar -l pl
-bsdtar - implementacja programu tar(1), oparta na libarchive.
-
-%prep
-%setup -q
-%patch0 -p1
-
-%build
-mkdir -p %{buildroot}
-./configure \
---prefix=%{_prefix} \
---libexecdir=%{_libexecdir} \
---mandir=%{_mandir} \
---infodir=%{_infodir} \
---enable-shared=yes \
---enable-static=yes \
-| tee %{buildroot}/config.log
-make | tee %{buildroot}/make.log
-
-%install
-[ "%buildroot" != "/" ] && [ -d %buildroot ] && rm -rf %buildroot;
-make DESTDIR=%buildroot install
-# original install builds, but does install bsdtar
-cp .libs/%{name}.a %{buildroot}%{_libdir}
-cp bsdtar %{buildroot}%{_bindir}
-cp tar/bsdtar.1 %{buildroot}%{_mandir}/man1
-
-%clean
-rm -fr %buildroot
-
-%files
-%defattr(644,root,root,755)
-%{_libdir}/libarchive.a
-
-%files devel
-%defattr(644,root,root,755)
-%{_libdir}/libarchive.la
-%{_includedir}/*.h
-%doc %{_mandir}/man3/*
-%doc %{_mandir}/man5/*
-
-%files -n bsdtar
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/bsdtar
-%doc %{_mandir}/man1/bsdtar.1*
-
-%define date    %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
-%changelog
-* %{date} PLD Team <feedback@pld-linux.org>
-All persons listed below can be reached at <cvs_login>@pld-linux.org
-
-$Log: libarchive.spec,v $
-Release 1  2006/12/12 rm1023@dcx.com
-- added libarchive-0123457890.patch for "0123457890" error
-- replaced libarchive-1.3.1.tar.gz with libarchive-2.0a3.tar.gz
-- removed obsolete -CVE-2006-5680.patch and -man_progname.patch
-
-Revision 1.6  2006/11/15 10:41:28  qboosh
-- BR: acl-devel,attr-devel
-- devel deps
-
-Revision 1.5  2006/11/08 22:22:25  twittner
-- up to 1.3.1
-- added BR: e2fsprogs-devel
-- added -CVE-2006-5680.patch agains entering in infinite
-loop in corrupt archives
-- added bsdtar package (bsdtar is included now in libarchive
-sources)
-- rel. 0.1 for testing
-
-Revision 1.4  2005/12/15 18:26:36  twittner
-- up to 1.2.37
-- removed -shared.patch (no longer needed)
-
-Revision 1.3  2005/10/05 17:00:12  arekm
-- up to 1.02.034
-
-Revision 1.2  2005/07/27 20:17:21  qboosh
-- typo
-
-Revision 1.1  2005/07/27 08:36:03  adamg
-- new
diff --git a/libarchive/libarchive-2.5.5/contrib/libarchive_autodetect-st_lib_archive.m4 b/libarchive/libarchive-2.5.5/contrib/libarchive_autodetect-st_lib_archive.m4
deleted file mode 100644
index 4419e88..0000000
--- a/libarchive/libarchive-2.5.5/contrib/libarchive_autodetect-st_lib_archive.m4
+++ /dev/null
@@ -1,154 +0,0 @@
-dnl
-dnl @synopsis ST_LIB_ARCHIVE([ENABLED-DEFAULT])
-dnl
-dnl This macro figures out what's necessary to link a program against an
-dnl instance of the BSD libarchive package by Tim Kientzle.
-dnl 
-dnl See http://people.freebsd.org/~kientzle/libarchive/ for more info.
-dnl
-dnl It exports and substitutes the variables LIBARCHIVE_LIBS, LIBARCHIVE_LDFLAGS,
-dnl and LIBARCHIVE_CPPFLAGS to appropriate values for the identified instance of
-dnl libarchive.  The values are AC_SUBST'd, so a user could, for example, simply
-dnl include @LIBARCHIVE_CPPFLAGS@ in the definition of AM_CPPFLAGS in a Makefile.am.
-dnl
-dnl ENABLED-DEFAULT is either "yes" or "no" and determines whether the default value
-dnl is --with-libarchive or --without-libarchive.  It is not possible to specify a
-dnl default directory.  More simply, any reasonable choice for a default should just
-dnl go into the auto-detect list.
-dnl
-dnl The macro defines the symbol HAVE_LIBARCHIVE if the library is found. You
-dnl should use autoheader to include a definition for this symbol in a config.h
-dnl file. Sample usage in a C/C++ source is as follows:
-dnl
-dnl   #ifdef HAVE_LIBARCHIVE
-dnl   #include <archive.h>
-dnl   #endif /* HAVE_LIBARCHIVE */
-dnl
-dnl @category InstalledPackages
-dnl @author Andre Stechert <andre@splunk.com>
-dnl @version 2006-04-20
-dnl @license GPLWithACException
-
-AC_DEFUN([ST_LIB_ARCHIVE],
-[
-#
-# Handle input from the configurer and blend with the requirements from the maintainer.
-# We go through the trouble of creating a second set of variables other than the with_foo
-# variables in order to be sure that error/corner cases have been cleaned up.
-#
-# After this statement, three trusted variable are defined.
-#
-# st_lib_archive_ENABLED will be either "yes" or "no".  its value determines whether
-# or not we bother with the rest of the checks and whether or not we export a
-# bunch of variables.
-#
-# st_lib_archive_LOCATION will be either "auto" or "defined".  if it is "auto", then
-# we try a bunch of standard locations.  if it is "defined", then we just try the value
-# provided in st_lib_archive_DIR.
-#
-# st_lib_archive_DIR will contain the string provided by the user, provided that it's
-# actually a directory.
-#
-AC_MSG_CHECKING([if libarchive is wanted])
-AC_ARG_WITH([libarchive],
-	AS_HELP_STRING([--with-libarchive=DIR], [libarchive installation directory]),
-	[if test "x$with_libarchive" = "xno" ; then
-		st_lib_archive_ENABLED=no
-	elif test "x$with_libarchive" = "xyes" ; then
-		st_lib_archive_ENABLED=yes
-		st_lib_archive_LOCATION=auto
-	else
-		st_lib_archive_ENABLED=yes
-		st_lib_archive_LOCATION=defined
-		if test -d "$with_libarchive" ; then
-			st_lib_archive_DIR="$with_libarchive"
-		else
-			AC_MSG_ERROR([$with_libarchive is not a directory])
-		fi
-	fi],
-	[if test "x$1" = "xno" ; then
-		st_lib_archive_ENABLED=no
-	elif test "x$1" = "xyes" ; then
-		st_lib_archive_ENABLED=yes
-	else
-		st_lib_archive_ENABLED=yes
-	fi])
-
-if test "$st_lib_archive_ENABLED" = "yes" ; then
-	AC_MSG_RESULT([yes])
-#
-# After this statement, one trusted variable is defined.
-#
-# st_lib_archive_LIB will be either "lib" or "lib64", depending on whether the configurer
-# specified 32, 64.  The default is "lib".
-#
-	AC_MSG_CHECKING([whether to use lib or lib64])
-	AC_ARG_WITH([libarchive-bits],
-		AS_HELP_STRING([--with-libarchive-bits=32/64], [if 64, look in /lib64 on hybrid systems]),
-		[if test "x$with_libarchive_bits" = "x32" ; then
-			st_lib_archive_LIB=lib
-		elif test "x$with_libarchive_bits" = "x64" ; then
-			st_lib_archive_LIB=lib64
-		else
-			AC_MSG_ERROR([the argument must be either 32 or 64])
-		fi],
-		[st_lib_archive_LIB=lib])
-	AC_MSG_RESULT($st_lib_archive_LIB)
-#
-# Save the environment before verifying libarchive availability
-#
-	st_lib_archive_SAVECPPFLAGS="$CPPFLAGS"
-	st_lib_archive_SAVELDFLAGS="$LDFLAGS"
-	AC_LANG_SAVE
-	AC_LANG_C
-
-	if test "x$st_lib_archive_LOCATION" = "xdefined" ; then
-		CPPFLAGS="-I$st_lib_archive_DIR/include $st_lib_archive_SAVECPPFLAGS"
-		LDFLAGS="-L$st_lib_archive_DIR/$st_lib_archive_LIB $st_lib_archive_SAVELDFLAGS"
-		AC_CHECK_LIB(archive, archive_read_new, [st_lib_archive_found_lib=yes], [st_lib_archive_found_lib=no])
-		AC_CHECK_HEADER(archive.h, [st_lib_archive_found_hdr=yes], [st_lib_archive_found_hdr=no])
-		if test "x$st_lib_archive_found_lib" = "xyes" && test "x$st_lib_archive_found_hdr" = "xyes"; then
-			LIBARCHIVE_CPPFLAGS="-I$dir/include"
-			LIBARCHIVE_LDFLAGS="-L$dir/$st_lib_archive_LIB"
-		else
-			AC_MSG_ERROR([could not find libarchive in the requested location])
-		fi
-	else
-		#
-		# These are the common install directories for Linux, FreeBSD, Solaris, and Mac.
-		#
-		for dir in /usr /usr/local /usr/sfw /opt/csw /opt/local /sw
-		do
-			if test -d "$dir" ; then
-				CPPFLAGS="-I$dir/include $st_lib_archive_SAVECPPFLAGS"
-				LDFLAGS="-L$dir/$st_lib_archive_LIB $st_lib_archive_SAVELDFLAGS"
-				AC_CHECK_LIB(archive, archive_read_new, [st_lib_archive_found_lib=yes], [st_lib_archive_found_lib=no])
-				AC_CHECK_HEADER(archive.h, [st_lib_archive_found_hdr=yes], [st_lib_archive_found_hdr=no])
-				if test "x$st_lib_archive_found_lib" = "xyes" && test "x$st_lib_archive_found_hdr" = "xyes"; then
-					LIBARCHIVE_CPPFLAGS="-I$dir/include"
-					LIBARCHIVE_LDFLAGS="-L$dir/$st_lib_archive_LIB"
-					break
-				fi
-			fi
-		done
-	fi
-
-	if test "x$st_lib_archive_found_hdr" = "xyes" && test "x$st_lib_archive_found_lib" = "xyes" ; then
-		LIBARCHIVE_LIBS="-larchive"
-		AC_DEFINE([HAVE_LIBARCHIVE], [1], [Defined to 1 if libarchive is available for use.])
-		AC_SUBST(LIBARCHIVE_LIBS)
-		AC_SUBST(LIBARCHIVE_CPPFLAGS)
-		AC_SUBST(LIBARCHIVE_LDFLAGS)
-	fi
-
-#
-# Restore the environment now that we're done.
-#
-	AC_LANG_RESTORE
-	CPPFLAGS="$st_lib_archive_SAVECPPFLAGS"
-	LDFLAGS="$st_lib_archive_SAVELDFLAGS"
-else
-	AC_MSG_RESULT([no])
-fi
-AM_CONDITIONAL(LIBARCHIVE, test "x$st_lib_archive_found_lib" = "xyes" && test "x$st_lib_archive_found_hdr" = "xyes")
-])
diff --git a/libarchive/libarchive-2.5.5/contrib/psota-benchmark/results.txt b/libarchive/libarchive-2.5.5/contrib/psota-benchmark/results.txt
deleted file mode 100644
index 8197b28..0000000
--- a/libarchive/libarchive-2.5.5/contrib/psota-benchmark/results.txt
+++ /dev/null
@@ -1,122 +0,0 @@
-ODP: [Bug-tar] GNU tar, star and BSD tar speed comparision +new script
-
-Jan Psota
-Thu, 25 Oct 2007 06:51:13 -0700
-
-Latest TCP script at the bottom (3180 bytes).
-4 tests: 64bit dual core Athlon tmpfs / disk (reiserfs) - 60MB/s,
-        32bit Athlon tmpfs / disk (reiserfs) - 55MB/s
-Both machines were idle -- used for testing only.
-Tarball and extracted files were on different physical devices.
-Test data: linux 2.6.22/3 kernel sources for memory operations,
-for the other data average file size should bring enough info.
-
-2 x [...] processor means 1 processor with 2 cores (2 entries in cpuinfo).
-Archive format is set to pax (Joerg).
-Let's end with it. I only wanted to send You a new version of TCP script :-).
-
---
-Jan Psota
-
-TCP, version 2007-10-25
-Linux 2.6.22-suspend2-r2 / Gentoo Base System release 2.0.0_rc5
-2012MB of memory, 2 x AMD Athlon(tm) 64 X2 Dual Core Processor 4200+ 2211.348 
-512 KB 4426.24 bmips
-gcc (GCC) 4.2.2 (Gentoo 4.2.2 p1.0)
-CFLAGS="-O2 -march=k8 -pipe"
-
-bsdtar: bsdtar 2.3.4 - libarchive 2.3.4
-gnutar: tar (GNU tar) 1.19
-star:   star: star 1.5a85 (x86_64-unknown-linux-gnu)
-
-best time of 5 repetitions,
-        src=linux-2.6.23, 291M in 23867 files, avg 13KB/file,
-        archive=/tmp/tcp.tar, extract to /tmp/tcptmp
-program operation       real    user    system  %CPU         speed
-bsdtar  create          0.764   0.232   0.532   99.96       370308 KB/s
-gnutar  create          0.743   0.200   0.512   95.87       380775 KB/s
-star    create          0.587   0.040   0.820   100.00      441247 KB/s
-
-bsdtar  list            0.164   0.096   0.068   99.84      1579341 KB/s
-gnutar  list            0.218   0.064   0.152   98.92      1188128 KB/s
-star    list            0.359   0.044   0.240   79.09       721481 KB/s
-
-bsdtar  extract         0.733   0.200   0.504   96.02       353358 KB/s
-gnutar  extract         0.625   0.092   0.508   96.02       414419 KB/s
-star    extract         0.875   0.096   0.980   100.00      296013 KB/s
-
-bsdtar  compare         0.001   0.000   0.000   0.00     259012000 KB/s
-gnutar  compare         0.719   0.288   0.400   95.66       360239 KB/s
-star    compare         0.695   0.224   0.636   100.00      372679 KB/s
-
-[...]
-best time of 3 repetitions,
-        src=/home, 3.2G in 7447 files, avg 554KB/file,
-        archive=/var/tcp.tar, extract to /mnt/a/tcptmp
-program operation       real    user    system  %CPU         speed
-bsdtar  create          184.680 0.552   13.365  7.53         17958 KB/s
-gnutar  create          159.240 0.256   12.417  7.95         20827 KB/s
-star    create          181.779 0.140   14.789  8.21         18203 KB/s
-
-bsdtar  list            0.053   0.032   0.016   91.41     62435471 KB/s
-gnutar  list            56.535  0.136   3.764   6.89         58531 KB/s
-star    list            56.652  0.080   5.236   9.38         58410 KB/s
-
-bsdtar  extract         78.914  0.820   15.149  20.23        41932 KB/s
-gnutar  extract         78.480  0.196   14.197  18.33        42164 KB/s
-star    extract         79.439  0.132   12.973  16.49        41655 KB/s
-
-bsdtar  compare         0.001   0.000   0.000   0.00    3309080000 KB/s
-gnutar  compare         61.771  3.464   8.905   20.02        53570 KB/s
-star    compare         57.561  1.728   9.897   20.19        57488 KB/s
-
-
-Linux 2.6.22-suspend2-smp / Gentoo Base System release 2.0.0_rc5
-504MB of memory, 1 x AMD Athlon(tm) Processor 1500.033 256 KB 3002.55 bmips
-gcc (GCC) 4.2.2 (Gentoo 4.2.2 p1.0)
-CFLAGS="-O2 -march=athlon-xp -mfpmath=sse -frename-registers -pipe"
-
-bsdtar: bsdtar 2.3.4 - libarchive 2.3.4
-gnutar: tar (GNU tar) 1.19
-star:   star: star 1.5a85 (i686-pc-linux-gnu)
-
-best time of 3 repetitions,
-        src=/usr/src/linux-2.6.22-suspend2/drivers, 119M in 5900 files,
-        avg 21KB/file, archive=/tmp/tcp.tar, extract to /tmp/tcptmp
-program operation       real    user    system  %CPU         speed
-bsdtar  create          1.329   0.192   1.132   99.63        89784 KB/s
-gnutar  create          1.223   0.124   1.092   99.46        97566 KB/s
-star    create          1.848   0.036   1.708   94.36        61372 KB/s
-
-bsdtar  list            0.167   0.060   0.108   100.00      679137 KB/s
-gnutar  list            0.161   0.040   0.124   100.00      704447 KB/s
-star    list            0.859   0.044   0.716   88.51       132032 KB/s
-
-bsdtar  extract         1.186   0.172   1.012   99.87        95629 KB/s
-gnutar  extract         1.064   0.056   1.004   99.63       106593 KB/s
-star    extract         1.920   0.088   1.724   94.40        59070 KB/s
-
-bsdtar  compare         0.002   0.000   0.000   0.00      56708000 KB/s
-gnutar  compare         0.925   0.232   0.692   99.90       122611 KB/s
-star    compare         1.569   0.376   1.096   93.79        72285 KB/s
-
-[...]
-best time of 3 repetitions,
-        src=/home/jasiu, 2.1G in 8416 files, avg 277KB/file,
-        archive=/home/j2/tcp.tar, extract to /mnt/a/tar/tcptmp
-program operation       real    user    system  %CPU         speed
-bsdtar  create          182.171 1.692   29.130  16.91        11584 KB/s
-gnutar  create          174.999 0.632   27.450  16.04        12059 KB/s
-star    create          180.004 0.360   41.795  23.41        11677 KB/s
-
-bsdtar  list            0.214   0.076   0.136   99.04      9822294 KB/s
-gnutar  list            0.210   0.076   0.136   100.00    10009385 KB/s
-star    list            43.462  0.148   18.109  42.00        48363 KB/s
-
-bsdtar  extract         94.912  4.476   31.574  37.98        22146 KB/s
-gnutar  extract         94.657  0.396   29.462  31.54        22206 KB/s
-star    extract         100.814 0.400   39.906  39.98        20849 KB/s
-
-bsdtar  compare         0.003   0.000   0.004   100.00   700657000 KB/s
-gnutar  compare         80.174  3.932   20.365  30.30        26217 KB/s
-star    compare         73.911  8.341   27.670  48.72        28439 KB/s
diff --git a/libarchive/libarchive-2.5.5/contrib/psota-benchmark/tcp.sh b/libarchive/libarchive-2.5.5/contrib/psota-benchmark/tcp.sh
deleted file mode 100644
index 6c0e4b5..0000000
--- a/libarchive/libarchive-2.5.5/contrib/psota-benchmark/tcp.sh
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh
-# tar comparision program
-# 2007-10-25 Jan Psota
-
-n=3                                     # number of repetitions
-TAR=(bsdtar gnutar star)                # TApeArchivers to compare
-OPT=("" "--seek" "-no-fsync")
-pax="--format=pax"                      # comment out for defaults
-OPN=(create list extract compare)       # operations
-version="2007-10-25"
-TIMEFORMAT=$'%R\t%U\t%S\t%P'
-LC_ALL=C
-
-test $# -ge 2 || {
-        echo -e "usage:\t$0 source_dir where_to_place_archive 
-[where_to_extract_it]
-
-TCP, version $version
-TCP stands for Tar Comparision Program here.
-It currently compares: BSD tar (bsdtar), GNU tar (gnutar) and star in archive
-creation, listing, extraction and archive-to-extracted comparision.
-Tcp prints out best time of n=$n repetitions.
-
-Tcp creates temporary archive named tcp.tar with $pax and some native
-(--seek/-no-fsync) options and extracts it to [\$3]/tcptmp/.
-If unset, third argument defaults to [\$2].
-After normal exit tcp removes tarball and extracted files.
-Tcp does not check filesystems destination directories are on for free space,
-so make sure there is enough space (a bit more than source_dir uses) for both:
-archive and extracted files.
-Do not use white space in arguments.
-        Jan Psota, $version"
-        exit 0
-}
-src=$1
-dst=$2/tcp.tar
-dst_path=${3:-$2}/tcptmp
-test -e $dst -o -e /tmp/tcp \
-        && { echo "$dst or /tmp/tcp exists, exiting"; exit 1; }
-mkdir $dst_path || exit 2
-
-use_times ()
-{
-        awk -F"\t" -vN=$n -vL="`du -k $dst`" -vOFS="\t" -vORS="" '
-                { if (NF==4) { printf "\t%s\t%10.1d KB/s\n", $0, ($1+0>0 ? 
-(L+0)/($1+0) : 0) } }' \
-                /tmp/tcp | sort | head -1
-        > /tmp/tcp
-}
-
-test -d $src || { echo "'$src' is not a directory"; exit 3; }
-
-# system information: type, release, memory, cpu(s), compiler and flags
-echo -e "TCP, version $version\n"`uname -sr`" / "`head -1 /etc/*-release`
-free -m | awk '/^Mem/ { printf "%dMB of memory, ", $2 }'
-test -e /proc/cpuinfo \
-        && awk -F: '/name|cache size|MHz|mips/ { if (!a) b=b $2 }
-        /^$/ { a++ } END { print a" x"b" bmips" }' /proc/cpuinfo
-test -e /etc/gentoo-release \
-        && gcc --version | head -1 && grep ^CFLAGS /etc/make.conf
-
-# tar versions
-echo
-for tar in [EMAIL PROTECTED]; do echo -ne "$tar:\t"; $tar --version | head -1; 
-done
-
-echo -e "\nbest time of $n repetitions,\n"\
-"       src=$src, "\
-`du -sh $src | awk '{print $1}'`" in "`find $src | wc -l`" files, "\
-"avg "$((`du -sk $src | awk '{print $1}'`/`find $src -type f | wc 
--l`))"KB/file,\n"\
-"       archive=$dst, extract to $dst_path"
-
-echo -e "program\toperation\treal\tuser\tsystem\t%CPU\t     speed"
-> /tmp/tcp
-let op_num=0
-for op in "cf $dst $pax -C $src ." "tf $dst" "xf $dst -C $dst_path" \
-        "f $dst -C $dst_path --diff"; do
-        let tar_num=0
-        for tar in [EMAIL PROTECTED]; do
-                echo -en "$tar\t${OPN[op_num]}\t"
-                for ((i=1; i<=$n; i++)); do
-                        echo $op | grep -q ^cf && rm -f $dst
-                        echo $op | grep -q ^xf &&
-                                { chmod -R u+w $dst_path
-                                rm -rf $dst_path; mkdir $dst_path; }
-                        sync
-                        if echo $op | grep -q ^f; then  # op == compare
-                                time $tar $op ${OPT[$tar_num]} > /dev/null
-                        else    # op in (create | list | extract)
-                                time $tar $op ${OPT[$tar_num]} > /dev/null \
-                                        || break 3
-                        fi 2>> /tmp/tcp
-                done
-                use_times
-                let tar_num++
-        done
-        let op_num++
-        echo
-done
-rm -rf $dst_path $dst
-echo
-cat /tmp/tcp
-rm -f /tmp/tcp