[Reproducible-commits] [dpkg] 19/26: dpkg-deb: Write control.tar in a deterministic order

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch pu/reproducible_builds
in repository dpkg.

commit 8a35b6c5a2487678aaa111dd82d38e22fce90e8a
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Thu Oct 8 14:24:57 2015 +0000

    dpkg-deb: Write control.tar in a deterministic order
    
    This requires the new `--sort=name` option available since
    GNU Tar 1.28. Adding the required Depends for dpkg-dev.
    
    Closes: #719845
---
 debian/control   | 3 ++-
 dpkg-deb/build.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 8c05b3e..44b8004 100644
--- a/debian/control
+++ b/debian/control
@@ -52,7 +52,8 @@ Priority: optional
 Architecture: all
 Multi-Arch: foreign
 Depends: libdpkg-perl (= ${source:Version}), bzip2, xz-utils,
- patch (>= 2.7), make, binutils, base-files (>= 5.0.0), ${misc:Depends}
+ patch (>= 2.7), make, binutils, base-files (>= 5.0.0), tar (>= 1.28)
+ ${misc:Depends}
 Recommends: gcc | c-compiler, build-essential, fakeroot,
  gnupg | gnupg2, gpgv | gpgv2, libalgorithm-merge-perl
 Suggests: debian-keyring
diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
index 76f66a7..8d9f066 100644
--- a/dpkg-deb/build.c
+++ b/dpkg-deb/build.c
@@ -572,7 +572,7 @@ do_build(const char *const *argv)
     m_dup2(p1[1],1); close(p1[0]); close(p1[1]);
     if (chdir(ctrldir))
       ohshite(_("failed to chdir to '%.255s'"), ctrldir);
-    execlp(TAR, "tar", "-cf", "-", "--format=gnu", ".", NULL);
+    execlp(TAR, "tar", "-cf", "-", "--format=gnu", "--sort=name", ".", NULL);
     ohshite(_("unable to execute %s (%s)"), "tar -cf", TAR);
   }
   close(p1[1]);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git