Your message dated Sun, 18 Sep 2016 05:21:11 +0000
with message-id <e1bluxp-00013x...@franck.debian.org>
and subject line Bug#835985: fixed in nmh 1.6-13
has caused the Debian Bug report #835985,
regarding nmh: please make the build reproducible
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 ow...@bugs.debian.org
immediately.)


-- 
835985: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835985
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Source: nmh
Version: 1.6-12
Severity: wishlist
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: filesystem
X-Debbugs-Cc: reproducible-bui...@lists.alioth.debian.org

Hi,

Whilst working on the Reproducible Builds effort [0], I noticed
that nmh could not be built reproducibly due to non-deterministic
filesystem ordering.

Patch attached.

 [0] https://reproducible-builds.org/


Regards,

-- 
      ,''`.
     : :'  :     Chris Lamb
     `. `'`      la...@debian.org / chris-lamb.co.uk
       `-
--- a/.pc/11-repro/config/version.sh    2016-08-29 20:27:47.169277506 +0100
--- b/.pc/11-repro/config/version.sh    1970-01-01 01:00:00.000000000 +0100
@@ -1,42 +0,0 @@
-#!/bin/sh
-#
-# version.sh -- script to create version string(s) for nmh.
-#
-# You need to pass the script the version number to use.
-#
-
-if [ -z "$1" ]; then
-    echo "usage: version.sh VERSION" 1>&2
-    exit 1
-fi
-
-VERSION=$1
-OFS="$IFS"
-IFS=:
-HOSTNAME=unknown
-
-# Find out the name of the host we are compiling on
-for prog in uname hostname
-do
-    for dir in $PATH
-    do
-       if [ ! -f $dir/$prog ]; then
-           continue
-       fi
-       case $prog in
-           uname)      HOSTNAME=`$prog -n`
-                       ;;
-           hostname)   HOSTNAME=`$prog`
-                       ;;
-       esac
-       break
-    done
-    if [ X"$HOSTNAME" != X  -a  X"$HOSTNAME" != Xunknown ]; then
-       break
-    fi
-done
-
-IFS=" "
-
-echo "char *version_str = \"nmh-$VERSION [compiled on $HOSTNAME at `date`]\";"
-echo "char *version_num = \"nmh-$VERSION\";"
--- a/.pc/11-repro/man/mh-chart-gen.sh  2016-08-29 20:27:47.169277506 +0100
--- b/.pc/11-repro/man/mh-chart-gen.sh  1970-01-01 01:00:00.000000000 +0100
@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# Generates mh-chart.man from other .man files that have a SYNOPSIS
-# section.
-
-nmhmandir=`dirname $0`
-
-# The following ensures the generated date field in the manpage is divorced
-# from the local build environment when building distribution packages.
-LC_TIME=C; export LC_TIME
-unset LANG
-datestamp=`date '+%B %d, %Y'`
-
-cat <<__HOOPY_FROOD
-.TH MH-CHART %manext7% "${datestamp}" "%nmhversion%"
-.\"
-.\" %nmhwarning%
-.\"
-.SH NAME
-mh-chart \- Chart of nmh Commands
-.SH SYNOPSIS
-.na
-__HOOPY_FROOD
-
-for i in $nmhmandir/*.man; do
-  case $i in
-    */mh-chart.man) ;;
-    *) if grep '^\.ad' "$i" >/dev/null; then
-         #### Extract lines from just after .SH SYNOPSIS to just before .ad.
-         #### Filter out the "typical usage:" section in pick.man.
-         awk '/.SH SYNOPSIS/,/^(\.ad|typical usage:)/ {
-                if ($0 !~ /^(\.SH SYNOPSIS|\.na|\.ad|typical usage:)/) print
-              }' "$i"
-         echo
-       fi ;;
-  esac
-done
-
-cat <<'EOF'
-.ad
-
-.SH "SEE ALSO"
-.IR nmh (7),
-.IR mh\-mime (7)
-EOF
--- a/.pc/applied-patches       2016-08-29 20:27:47.165277461 +0100
--- b/.pc/applied-patches       2016-08-29 20:31:59.860110655 +0100
@@ -5,4 +5,3 @@
 05-valgrind
 09-automake
 10-mhuninstall
-11-repro
--- a/config/version.sh 2016-08-29 20:27:47.169277506 +0100
--- b/config/version.sh 2016-08-29 20:31:59.000000000 +0100
@@ -38,5 +38,5 @@
 
 IFS=" "
 
-echo "char *version_str = \"nmh-$VERSION\";"
+echo "char *version_str = \"nmh-$VERSION [compiled on $HOSTNAME at `date`]\";"
 echo "char *version_num = \"nmh-$VERSION\";"
--- a/debian/patches/11-repro   2016-08-29 20:27:47.169277506 +0100
--- b/debian/patches/11-repro   2016-08-29 20:31:59.772109677 +0100
@@ -1,5 +1,5 @@
---- a/config/version.sh
-+++ b/config/version.sh
+--- nmh-1.6.orig/config/version.sh
++++ nmh-1.6/config/version.sh
 @@ -38,5 +38,5 @@ done
  
  IFS=" "
@@ -18,3 +18,12 @@
  
  cat <<__HOOPY_FROOD
  .TH MH-CHART %manext7% "${datestamp}" "%nmhversion%"
+@@ -22,7 +22,7 @@ mh-chart \- Chart of nmh Commands
+ .na
+ __HOOPY_FROOD
+ 
+-for i in $nmhmandir/*.man; do
++find man -name '*.man' | LC_ALL=C sort | while read i; do
+   case $i in
+     */mh-chart.man) ;;
+     *) if grep '^\.ad' "$i" >/dev/null; then
--- a/man/mh-chart-gen.sh       2016-08-29 20:27:47.173277551 +0100
--- b/man/mh-chart-gen.sh       2016-08-29 20:31:59.000000000 +0100
@@ -9,7 +9,7 @@
 # from the local build environment when building distribution packages.
 LC_TIME=C; export LC_TIME
 unset LANG
-datestamp="$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" '+%B %d, 
%Y')"
+datestamp=`date '+%B %d, %Y'`
 
 cat <<__HOOPY_FROOD
 .TH MH-CHART %manext7% "${datestamp}" "%nmhversion%"

--- End Message ---
--- Begin Message ---
Source: nmh
Source-Version: 1.6-13

We believe that the bug you reported is fixed in the latest version of
nmh, 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 835...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Alexander Zangerl <a...@debian.org> (supplier of updated nmh 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 ftpmas...@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Sun, 18 Sep 2016 14:00:14 +1000
Source: nmh
Binary: nmh
Architecture: source amd64
Version: 1.6-13
Distribution: unstable
Urgency: medium
Maintainer: Alexander Zangerl <a...@debian.org>
Changed-By: Alexander Zangerl <a...@debian.org>
Description:
 nmh        - set of electronic mail handling programs
Closes: 835985
Changes:
 nmh (1.6-13) unstable; urgency=medium
 .
   * bumped standards version, adjusted bash-completion file location
   * updated reproducible build patch (closes: #835985)
Checksums-Sha1:
 07e136f291b3522c6d9cd8d507cc978e3847e313 1789 nmh_1.6-13.dsc
 4eb3ce56793f65860e01d777f40215353b908158 19056 nmh_1.6-13.debian.tar.xz
 6df6e04263a3a2c1b06d761601800a9d5d959d9d 7132446 nmh-dbgsym_1.6-13_amd64.deb
 2bf35615acc2a8bf105246b33fcfcbdf2169a823 1237790 nmh_1.6-13_amd64.deb
Checksums-Sha256:
 87a0dbc6fa625eeda85113074500b665050b8961159c0ad2b66c43b0524e2afd 1789 
nmh_1.6-13.dsc
 1586ff598ba647b7d26ba59721c0ffb4e549a9001c354dfd007c7048d97a468d 19056 
nmh_1.6-13.debian.tar.xz
 b3e69f98da335c6c03bda1b1e1ce0018a194506bfd99fd3e5f3a0aebb94bf604 7132446 
nmh-dbgsym_1.6-13_amd64.deb
 fb7b049b6a8f068c3f2a15aa0a1573484e9a6347fa8d08ec6f099515fd781e6e 1237790 
nmh_1.6-13_amd64.deb
Files:
 793eb6ec705871eb230da3a205e29157 1789 mail optional nmh_1.6-13.dsc
 f902089af808bebe5f98dc86f397c29b 19056 mail optional nmh_1.6-13.debian.tar.xz
 1842b610a653ce9d1601f7baa114d8f0 7132446 debug extra 
nmh-dbgsym_1.6-13_amd64.deb
 4fb2fa8025b6033a324097eb30dd2fe9 1237790 mail optional nmh_1.6-13_amd64.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAEBCgAGBQJX3hluAAoJED06g4g30PqNA4EP/RLtPlWx93hISMRfhp14Uxsb
yLDpL+/DoUa/gHZLvh6KJVxpV2SXT0fnqkTnHXrqSIDQaUbfkDgtCnAJA6/f03dw
pxiMQCRcss60Xz+qboXtawPIv5Fe/NrVX6Q1LqE0MYRPEFkuopk91UFzvT8fAinc
+ayUIx5FFihYaioRQno1aywBpGybt0TpUVDNP1XNkB84vW8U9kGFrWIcBy+EZC6J
1tf+nf6Ev3I35aTgNDufbtANH9qnLaO9O6Wm6CJmLf9uH/LGWl3EFNnepnOZ2wag
BTm8WINUlJjPg+xW7AccegEec4DiufI4ArXahZqtDFdStzh0YxQFWoaBcYy02Ize
4g/aRY4jh1Ex0ZMiurVlyz6eMR54+JQLQ3L0FDRT7eUB4s0yzvHrjXBnnMNfFXh+
H0yJdgjCDPrSOGMvTUPEhj8nLDXjLNB6KyjgA7xB9UTLt2NOO+5UmPDMD4mSuU89
8T8sTV/84W5GBuzkldYwVHda1I5MJUzMGLvnsCY9oWf5tkgjkAwPjToFxQj1YtoN
JsnI6p0MlRvheNuvqhB7sc3IgxyZbd8cHuig0hYLLCwVuQ7J0Ve/SYQPYGHVv2WF
umJ9MwkoTF/6S9fi+ks7ELDOPnRvntXhulpL7QHQQmYA3ICIGCs1sdpQ54qopfYj
VO/gJlGXOEAuhR+dhfhH
=/7Lm
-----END PGP SIGNATURE-----

--- End Message ---

Reply via email to