Your message dated Sun, 18 Mar 2018 18:05:23 +0000
with message-id <[email protected]>
and subject line Bug#820842: fixed in gitpkg 0.29
has caused the Debian Bug report #820842,
regarding should use -n in gzip calls
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)


-- 
820842: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=820842
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: gitpkg
Version: 0.26
Severity: wishlist

The tarballs created by gitpkg are not reproducible. I am running
gitpkg against tuptime here, and it gives me this:

[1022]anarcat@angela:test$ diffoscope 3.3.0.tar.gz deb-packages/tuptime/
build-tuptime_3.3.0-1_20160412+19.53.log  tuptime_3.3.0-1_amd64.deb             
    tuptime_3.3.0-1.dsc
tuptime_3.3.0-1_amd64.changes             tuptime_3.3.0-1.debian.tar.xz         
    tuptime_3.3.0.orig.tar.gz
[1022]anarcat@angela:test$ diffoscope 3.3.0.tar.gz 
deb-packages/tuptime/tuptime_3.3.0.orig.tar.gz
--- 3.3.0.tar.gz
+++ deb-packages/tuptime/tuptime_3.3.0.orig.tar.gz
├── metadata
│ @@ -1 +1 @@
│ -gzip compressed data, from Unix
│ +gzip compressed data, last modified: Tue Apr 12 19:53:23 2016, from Unix
╵

To reproduce this:

 1014  wget https://github.com/rfrail3/tuptime/archive/3.3.0.tar.gz
 1015  git clone [email protected]:anarcat/tuptime.git
 1016  cd tuptime/
 1017  ~/dist/gitpkg/gitpkg --exit-hook=dpkg-buildpackage-exit-hook 3.3.0-1 
3.3.0
 1018  gitpkg --exit-hook=dpkg-buildpackage-exit-hook 3.3.0-1 3.3.0
 1019  pwd
 1020  cd ../
 1021  ls
 1022  diffoscope 3.3.0.tar.gz deb-packages/tuptime/tuptime_3.3.0.orig.tar.gz

To fix this:

diff --git a/gitpkg b/gitpkg
index cfb0b7c..ba0a38c 100755
--- a/gitpkg
+++ b/gitpkg
@@ -680,9 +680,9 @@ build_with_exported_orig()
     # handles making tarballs badly anyhow and will leave the .orig suffix
     # in the path inside them.
 
-    echo "tar cf - $DEB_PACKAGE(.orig) | $ORIG_COMPRESSOR$ORIG_COMPRESS_LEVEL 
> $DEB_ORIG"
+    echo "tar cf - $DEB_PACKAGE(.orig) | $ORIG_COMPRESSOR -n 
$ORIG_COMPRESS_LEVEL > $DEB_ORIG"
     tar --transform "s,^$DEB_PACKAGE.orig,$DEB_PACKAGE," \
-       -cf - "$DEB_PACKAGE.orig" | $ORIG_COMPRESSOR $ORIG_COMPRESS_LEVEL > 
"$DEB_ORIG"
+       -cf - "$DEB_PACKAGE.orig" | $ORIG_COMPRESSOR -n $ORIG_COMPRESS_LEVEL > 
"$DEB_ORIG"
 
     if ! format3_lameness; then
        echo "dpkg-source" "${DPKG_SOURCE_OPTS[@]}" "-b -ss $DEB_PACKAGE"
@@ -885,9 +885,9 @@ else
        ) || exit 1
     else
        printf "git archive --prefix=$DEB_PACKAGE/ $GITPKG_ORIG_TREEISH"
-       printf " | $ORIG_COMPRESSOR$ORIG_COMPRESS_LEVEL > $DEB_ORIG\n"
+       printf " | $ORIG_COMPRESSOR -n $ORIG_COMPRESS_LEVEL > $DEB_ORIG\n"
        git archive --format=tar --prefix="$DEB_PACKAGE/" 
"$GITPKG_ORIG_TREEISH" |
-               $ORIG_COMPRESSOR $ORIG_COMPRESS_LEVEL        \
+               $ORIG_COMPRESSOR -n $ORIG_COMPRESS_LEVEL        \
                > "$DEB_DIR/$DEB_SOURCE/$DEB_ORIG"
        (
            cd "$DEB_DIR/$DEB_SOURCE"

Then it all feels fuzzy and warm.

Of course this assumes upstreams have clues.

-- System Information:
Debian Release: 8.4
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'proposed-updates'), (500, 
'stable'), (1, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 4.2.0-0.bpo.1-amd64 (SMP w/2 CPU cores)
Locale: LANG=fr_CA.UTF-8, LC_CTYPE=fr_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages gitpkg depends on:
ii  dpkg-dev  1.17.26
ii  git       1:2.1.4-2.1+deb8u2

gitpkg recommends no packages.

Versions of packages gitpkg suggests:
ii  devscripts  2.15.3

-- no debconf information

--- End Message ---
--- Begin Message ---
Source: gitpkg
Source-Version: 0.29

We believe that the bug you reported is fixed in the latest version of
gitpkg, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Ron Lee <[email protected]> (supplier of updated gitpkg package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Sun, 18 Mar 2018 17:29:35 +1030
Source: gitpkg
Binary: gitpkg
Architecture: source all
Version: 0.29
Distribution: unstable
Urgency: medium
Maintainer: Ron Lee <[email protected]>
Changed-By: Ron Lee <[email protected]>
Description:
 gitpkg     - tools for maintaining Debian packages with git
Closes: 820842 887963
Changes:
 gitpkg (0.29) unstable; urgency=medium
 .
   * Fix git-debcherry for a change in the behaviour of how git rev-parse
     handles tag refs.  Thanks to James McCoy for spotting it and the initial
     patch to fix it.  Closes: #887963
 .
   * Support passing arbitrary options to the orig compressor, and default to
     passing -n (--no-name) to gzip, so that it doesn't add a timestamp, making
     the compressed orig tarball more reproducible.  Thanks to Antoine Beaupré
     for noticing the current default behaviour, the idea of passing this option
     to gzip to improve it, and testing that it worked.  The actual fix here is
     a bit different, because -n (meaning this) is specific to gzip, so now we
     have support for setting per-compressor options too.  Closes: #820842
Checksums-Sha1:
 70b005002fd54db3d3c1fa5b3152d6c3ec68aa1e 1459 gitpkg_0.29.dsc
 42eb4b4d148092bd36d986ac195be5fd9a84c8aa 42356 gitpkg_0.29.tar.gz
 5260035b4a881cb4718d8f8050f04c63895389d4 43318 gitpkg_0.29_all.deb
Checksums-Sha256:
 48578e9426805d548bef7587dad9eb32516c4b12eeaa5fc6f439b877468d4b97 1459 
gitpkg_0.29.dsc
 a40b74dbf342af2b524180132a911696bdf007726319b190d0bab9490ff94f8d 42356 
gitpkg_0.29.tar.gz
 bd1fe4c5ca8ab5aef79dceada79c78d6a6e7844d52b171ba6aed2d02618b3979 43318 
gitpkg_0.29_all.deb
Files:
 b58f6173cd613a1ad867ea281ced3191 1459 vcs optional gitpkg_0.29.dsc
 de1fa70e760d69256423d8d2fcd917ff 42356 vcs optional gitpkg_0.29.tar.gz
 f176f1775578e4b9fe162cc4b5792c08 43318 vcs optional gitpkg_0.29_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJarp/GAAoJECSWn9pgwHEsTJkP+QHSNzbjVXqPhAKp31rKfvvh
gb38yNhMllabRm0L1OggHFWfwVsOC+S38opkH+cQVij0WzmhGBnQzyjc8GqrZYcN
WKN3l3zlSpCjgwOcbTkKcnmpSpMnWts+Qz2n72P/8jrPopuscCtv8Cltgrv43CJn
qtB2KgmUoDEYOhBXMDMncotLfumQhWSJbfgZ/Ad7dp9nZ/eRbJzfXxPetRjxKJU0
6hOAItUESiGyhYo5LPfwOgNpWf9Zpb2m9J0vkSWjy7L/pOx52/s51Ok7pGJAd6iC
lk8zha22wHwAxIDiaIu4C58MVYR0MGPGB5N4snERyIQb/EBQhP9lRwEMpOVc3Oq4
uR2S00yezZptMf5LwrISq20MWo8p5dy7AudeADklbBDNWNEqg9HgD7U+1CXc6H8l
EGCz4JK8LynI0ohAcbDRJCmG35LYRSJ1/ytimnRu0YTYZlmBP1HTbbN71czyxfLQ
R66CKRJHoD2UPZRBcGGkGL29IXEkYD8jigTDfK7oQewbnYjQ2ZZz4uO470a7EP93
j5lZD0yrQjGRznPYae1TL8zJFjAdenS85pdlST/X9RLKpx/sBe88rGiRkYs6SJti
/eifNSRO0gfzxGDow3aFzN+sDScluiOB9RCZDcZ7PjWsZLnbyJCmn6c6vJGzqk0p
NO++nrH4GiRV5MOIeU+c
=qarM
-----END PGP SIGNATURE-----

--- End Message ---

Reply via email to