Upgrade xdelta to xdelta3 to solve file bigger than 2g

Change-Id: I68f84873b45757acdc06bf57a5df34a328f97a5f

diff --git a/debian/changelog b/debian/changelog
index bfbf358c61e01fbe1221c76908c2a99785125f8c..62414090bedbae648377724a57225430c74f6022 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pristine-tar (1.34-tizen20160517) unstable; urgency=low
+
+  * Version bump to 1.34
+  * upgrade xdelta to xdelta3 to solve max file bigger than 2g.
+
+ -- Zhang Yang <y0169.zhang@samsung.com>  Tue, 17 May 2016 16:36:00 +0800
+
 pristine-tar (1.33-tizen20150212) unstable; urgency=low
 
   * Version bump to 1.33

diff --git a/debian/control b/debian/control
index be99496e7e048647c2b00abd6b5c5c3c78649447..cf19657022ba353de07e7e9755d6a408d0e651e7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Homepage: http://kitenet.net/~joey/code/pristine-tar/
 Package: pristine-tar
 Architecture: any
 Section: utils
-Depends: xdelta, ${shlibs:Depends}, ${misc:Depends}, perl-modules, tar (< 1.27) | tar (>= 1.27-3)
+Depends: xdelta3, ${shlibs:Depends}, ${misc:Depends}, perl-modules, tar (< 1.27) | tar (>= 1.27-3)
 Recommends: pbzip2, bzip2, xz-utils
 Description: regenerate pristine tarballs
  pristine-tar can regenerate a pristine upstream tarball using only a small

diff --git a/debian/patches/series b/debian/patches/series
index 43df199ba3a2abec7d8dd83b89e6ace41b9382b7..369624920b07650ba87bb4871f68256db45b83d0 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0001-pristine-gz-obey-the-XDELTA_PROGRAM-build-parameter.patch
 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

diff --git a/packaging/pristine-tar.spec b/packaging/pristine-tar.spec
index c7b80ae74107c01f825a75fb0822f209e941a928..d2a619d38308db4266531392c1ed8006b8f78939 100644 (file)
--- a/packaging/pristine-tar.spec
+++ b/packaging/pristine-tar.spec
@@ -1,6 +1,6 @@
 Name:       pristine-tar
 Summary:    Regenerate pristine tarballs
-Version:    1.33
+Version:    1.34
 Release:    0
 Group:      Development/Tools/Building
 License:    GPLv2
@@ -31,9 +31,9 @@ Requires:   perl-base
 Requires:   perl
 %endif
 %if 0%{?fedora} || 0%{?centos_ver} >= 7
-Requires:   xdelta1
+Requires:   xdelta
 %else
-Requires:   xdelta < 3
+Requires:   xdelta3
 %endif
 BuildRequires:  pkgconfig(zlib)
 
@@ -99,7 +99,7 @@ control.
 
 %build
 %if 0%{?fedora} || 0%{?centos_ver} >= 7
-%define makemaker_extraopts XDELTA_PROGRAM=xdelta1
+%define makemaker_extraopts XDELTA_PROGRAM=xdelta
 %endif
 perl Makefile.PL INSTALLDIRS=vendor PREFIX=%{_prefix} %{?makemaker_extraopts}
 

diff --git a/pristine-tar b/pristine-tar
index 0bf44e8b9229db98ccdc05854e3eaec170f8f735..554fd542c1b56bbc6eb953601a252d15f8327aea 100755 (executable)
--- a/pristine-tar
+++ b/pristine-tar
@@ -197,7 +197,7 @@ $ENV{PRISTINE_TAR_COMPAT}=1;
 # build process to hold the values of TAR_PROGRAM and XDELTA_PROGRAM
 # parameters as given to Makefile.PL.
 my $tar_program = "tar";
-my $xdelta_program = "xdelta";
+my $xdelta_program = "xdelta3";
 
 my $message;
 
@@ -427,7 +427,7 @@ sub gentar {
        my $ok;
        foreach my $variant (@try) {
                my $recreatetarball=$variant->();
-               my $ret=try_doit($xdelta_program, "patch", $delta->{delta}, $recreatetarball, $out);
+               my $ret=system("$xdelta_program -d -s $recreatetarball $delta->{delta} $out") >> 8;
                if ($ret == 0) {
                        $ok=1;
                        last;
@@ -539,7 +539,7 @@ sub gendelta {
        }
 
        $delta{delta}="$tempdir/delta";
-       my $ret=system("$xdelta_program delta -0 --pristine $recreatetarball $tarball $delta{delta}") >> 8;
+       my $ret=system("$xdelta_program -0 -e -s $recreatetarball $tarball $delta{delta}") >> 8;
        # xdelta exits 1 on success if there were differences
        if ($ret != 1 && $ret != 0) {
                error "xdelta failed with return code $ret";