Update to upstream release 1.40

Remove unused patches. Add xdelta3 as dependency. Install bash-completion.

5 files changed, 10 insertions, 151 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 70f8cb52f683..4474e41e06ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Sun May 21 18:18:39 UTC 2017
 pkgbase = pristine-tar
 	pkgdesc = Tool to regenerate a pristine upstream tarball using only a small binary delta file and a copy of the source which can be a revision control checkout.
-	pkgver = 1.38
+	pkgver = 1.40
 	pkgrel = 1
 	url = https://packages.debian.org/sid/pristine-tar
 	arch = i686
@@ -10,15 +8,10 @@ pkgbase = pristine-tar
 	license = GPL
 	depends = perl
 	depends = xdelta
+	depends = xdelta3
 	conflicts = pristine-tar-git
-	source = http://ftp.debian.org/debian/pool/main/p/pristine-tar/pristine-tar_1.38.tar.xz
-	source = 0002-Use-posix-tar-format-by-default.patch
-	source = 0003-Mangle-PAX-headers-when-using-posix-tar-format.patch
-	source = 0004-HACK-workaround-for-some-broken-pristine-tar-branche.patch
-	sha256sums = cc7e1a35bfb7ce19a0acd5c7e9a041b007f28509f495db8cc52e385ac12106f2
-	sha256sums = 09b7e2fba6f53ad1ac85d6000393835aedb8785ddcfd176f043f6301e267c614
-	sha256sums = d470d888fba8c32c20602a2e90219893d15074cf447c5920b37fa57fe5d38692
-	sha256sums = 0d2cbbeeb8c5fbba193b4ac39a33de800515811f6858e26a8874ed3bce6f394c
+	source = http://ftp.debian.org/debian/pool/main/p/pristine-tar/pristine-tar_1.40.tar.xz
+	sha256sums = 03e45374f908bf7821a9244f9555d68257070865585574bc5b4cf9d4d39b4e54
 
 pkgname = pristine-tar
 
diff --git a/0002-Use-posix-tar-format-by-default.patch b/0002-Use-posix-tar-format-by-default.patch
deleted file mode 100644
index 6b615aad3b45..000000000000
--- a/0002-Use-posix-tar-format-by-default.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
-Date: Fri, 31 May 2013 13:51:40 +0300
-Subject: Use posix tar format by default
-
-Should lead to smaller deltas as e.g. git-archive produces tarballs in
-posix format.
-
-The tar format guessing makes sure that pristine-tar commits generated
-with "gnu" tar format also are usable.
-
-Change-Id: I52c20b81c4b02ec22d3744d49b64415af14e0ab4
-Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
----
- pristine-tar | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/pristine-tar b/pristine-tar
-index 0bf44e8..d36e51b 100755
---- a/pristine-tar
-+++ b/pristine-tar
-@@ -417,12 +417,10 @@ sub gentar {
- 
- 	my @try;
- 	push @try, sub { recreatetarball($delta->{manifest}, getcwd,
--			clobber_source => 0, %opts) };
--	push @try, \&recreatetarball_longlink_100;
-+			clobber_source => 0, tar_format => "posix", %opts) };
- 	push @try, sub { recreatetarball($delta->{manifest}, getcwd,
- 			clobber_source => 0, tar_format => "gnu", %opts) };
--	push @try, sub { recreatetarball($delta->{manifest}, getcwd,
--			clobber_source => 0, tar_format => "posix", %opts) };
-+	push @try, \&recreatetarball_longlink_100;
- 
- 	my $ok;
- 	foreach my $variant (@try) {
-@@ -532,7 +530,8 @@ sub gendelta {
- 		if ($#out == 0 && -d $out[0]) {
- 			$sourcedir=$out[0];
- 		}
--		$recreatetarball=recreatetarball("$tempdir/manifest", $sourcedir, clobber_source => 1);
-+		$recreatetarball=recreatetarball("$tempdir/manifest", $sourcedir,
-+									clobber_source => 1, tar_format => "posix");
- 	}
- 	else {
- 		$recreatetarball=$opts{recreatetarball};
-@@ -800,7 +799,7 @@ sub commit {
- 	my ($sourcedir, $id)=export($upstream);
- 	genmanifest($tarball, "$tempdir/manifest");
- 	my $recreatetarball=recreatetarball("$tempdir/manifest", $sourcedir,
--		clobber_source => 1, create_missing => 1);
-+		clobber_source => 1, create_missing => 1, tar_format => "posix");
- 	my $pid = open(GENDELTA, "-|");
- 	if (! $pid) {
- 		# child
diff --git a/0003-Mangle-PAX-headers-when-using-posix-tar-format.patch b/0003-Mangle-PAX-headers-when-using-posix-tar-format.patch
deleted file mode 100644
index d2862b0eacb1..000000000000
--- a/0003-Mangle-PAX-headers-when-using-posix-tar-format.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
-Date: Thu, 6 Jun 2013 14:31:25 +0300
-Subject: Mangle PAX headers when using posix tar format
-
-Remove all timestamps from extended PAX headers in order to guarantee
-that created tarballs are always identical so that the delta can be
-applied cleanly.
-
-The timestamps can break pristine-tar generation as they are different
-every time an archive is generated from git (when using tree id
-instead of commit id as the sha-1 to checkout). Git uses the current
-time as the modification time of files when a tree is archived.
-
-Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
----
- pristine-tar | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/pristine-tar b/pristine-tar
-index d36e51b..4421068 100755
---- a/pristine-tar
-+++ b/pristine-tar
-@@ -378,6 +378,11 @@ sub recreatetarball_helper {
-             "--files-from", "$tempdir/manifest");
- 	if (exists $options{tar_format}) {
- 		push @cmd, ("-H", $options{tar_format});
-+		if ($options{tar_format} eq 'posix') {
-+			# Mangle PAX headers so that created tarballs are always identical
-+			# so that delta can be successfully applied
-+			push @cmd, ('--pax-option=exthdr.name=%d/PaxHeaders/%f,mtime:=0,atime:=0,ctime:=0');
-+		}
- 	}
- 
- 	doit(@cmd);
diff --git a/0004-HACK-workaround-for-some-broken-pristine-tar-branche.patch b/0004-HACK-workaround-for-some-broken-pristine-tar-branche.patch
deleted file mode 100644
index 7378bdb09b19..000000000000
--- a/0004-HACK-workaround-for-some-broken-pristine-tar-branche.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
-Date: Fri, 29 Nov 2013 12:44:56 +0200
-Subject: HACK: workaround for some broken pristine-tar branches
-
-Created by previous buggy versions of the pristine-tar tool distributed
-for openSUSE in Tizen.
-
-Change-Id: I31b1b5527fa399dd0c4baff87b0775a0ff8da773
-Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
----
- pristine-bz2 | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/pristine-bz2 b/pristine-bz2
-index 411e990..8fc694e 100755
---- a/pristine-bz2
-+++ b/pristine-bz2
-@@ -263,6 +263,10 @@ sub genbz2 {
- 	@params=split(' ', $delta->{params});
- 
- 	my $program=$delta->{program};
-+	# Work around for some broken pristine-tar data in Tizen repos
-+	if ($program =~ /.*upstream-bzip2\/bzip2$/) {
-+		$program="bzip2"
-+	}
- 	if (! grep { $program eq $_ } @supported_bzip2_programs) {
- 		die "paranoia check failed on program from delta ($program)";
- 	}
diff --git a/PKGBUILD b/PKGBUILD
index 461188e40956..6fc947383aeb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,19 @@
+# Maintainer: Max Harmathy <max.harmathy@web.de>
 # Contributor: Johannes Dewender  arch at JonnyJD dot net
 # Contributor: Patrick McCarty <pnorcks at gmail dot com>
 # Contributor: Jimmy Tang <jtang@tchpc.tcd.ie>
 
 pkgname=pristine-tar
-pkgver=1.38
+pkgver=1.40
 pkgrel=1
 pkgdesc="Tool to regenerate a pristine upstream tarball using only a small binary delta file and a copy of the source which can be a revision control checkout."
 arch=('i686' 'x86_64')
 url="https://packages.debian.org/sid/pristine-tar"
 license=('GPL')
-depends=('perl' 'xdelta')
+depends=('perl' 'xdelta' 'xdelta3')
 conflicts=('pristine-tar-git')
-source=(http://ftp.debian.org/debian/pool/main/p/${pkgname}/${pkgname}_${pkgver}.tar.xz
-        0002-Use-posix-tar-format-by-default.patch
-        0003-Mangle-PAX-headers-when-using-posix-tar-format.patch
-        0004-HACK-workaround-for-some-broken-pristine-tar-branche.patch)
-sha256sums=('cc7e1a35bfb7ce19a0acd5c7e9a041b007f28509f495db8cc52e385ac12106f2'
-            '09b7e2fba6f53ad1ac85d6000393835aedb8785ddcfd176f043f6301e267c614'
-            'd470d888fba8c32c20602a2e90219893d15074cf447c5920b37fa57fe5d38692'
-            '0d2cbbeeb8c5fbba193b4ac39a33de800515811f6858e26a8874ed3bce6f394c')
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # patches used in the Tizen tools package
-  # (improvements for POSIX tar support)
-  # available in the pristine-tar package at download.tizen.org/tools
-  # DISABLED/broken because pristine-tar was fully re-indented..
-  #patch -p1 < ../0002-Use-posix-tar-format-by-default.patch
-  #patch -p1 < ../0003-Mangle-PAX-headers-when-using-posix-tar-format.patch
-
-  # extra patch for Tizen compat
-  #patch -p1 < ../0004-HACK-workaround-for-some-broken-pristine-tar-branche.patch
-}
+source=(http://ftp.debian.org/debian/pool/main/p/${pkgname}/${pkgname}_${pkgver}.tar.xz)
+sha256sums=('03e45374f908bf7821a9244f9555d68257070865585574bc5b4cf9d4d39b4e54')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -49,6 +30,7 @@ package() {
   make install DESTDIR=$pkgdir PREFIX=/usr INSTALLSITESCRIPT=/usr/bin
   install -d $pkgdir/usr/share/doc/pristine-tar
   install -D GPL TODO delta-format.txt $pkgdir/usr/share/doc/pristine-tar
+  install -D -t $pkgdir/usr/share/bash-completion/completions bash_completion/pristine-tar
 }
 
 # vim:set ts=2 sw=2 et: