Debian Bug report logs - #1029303
fiat-ecmwf: reproducible-builds: timestamps and kernel version embeded in /usr/bin/fiat

Toggle useless messages

Message #5 received at submit@bugs.debian.org (full text, mbox, reply):

From: Vagrant Cascadian <vagrant@reproducible-builds.org>

To: submit@bugs.debian.org

Subject: fiat-ecmwf: reproducible-builds: timestamps and kernel version embeded in /usr/bin/fiat

Date: Fri, 20 Jan 2023 15:09:28 -0800

[Message part 1 (text/plain, inline)]

Source: fiat-ecmwf
Severity: normal
Tags: patch
User: reproducible-builds@lists.alioth.debian.org
Usertags: timestamps kernel
X-Debbugs-Cc: reproducible-bugs@lists.alioth.debian.org

The timestamp and kernel version is embedded in /usr/bin/fiat:

  https://tests.reproducible-builds.org/debian/rb-pkg/bookworm/amd64/diffoscope-results/fiat-ecmwf.html

  echo·"··timestamp·······:·20240111001119"
  vs.
  echo·"··timestamp·······:·20221209195227"

  echo·"··op.·system······:·Linux-6.0.0-0.deb11.2-amd64·(linux.64)"
  vs.
  echo·"··op.·system······:·Linux-5.10.0-19-amd64·(linux.64)"

The attached two patches fix this by using CMAKE_SYSTEM_NAME instead of
CMAKE_SYSTEM, and using CMake's timestamp function for the build date,
which supports a consistent timestamp if the SOURCE_DATE_EPOCH
environment variable is set.

According to my local tests, with these patches applied fiat-ecmwf should
build reproducibly on tests.reproducible-builds.org once the package
migrates to bookworm/testing!

Unfortunately, there are other outstanding issues with build paths,
which are tested in unstable and experimental.

Thanks for maintaining fiat-ecmwf!

live well,
  vagrant

[0001-src-programs-fiat.in-Avoid-embedding-the-running-ker.patch (text/x-diff, inline)]

From fa4c73e2d8875eea58af026485b508461c657f42 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Fri, 20 Jan 2023 22:50:55 +0000
Subject: [PATCH 1/2] src/programs/fiat.in: Avoid embedding the running kernel
 version.

Use CMAKE_SYSTEM_NAME instead of CMAKE_SYSTEM to avoid embedding the
running kernel version.

https://tests.reproducible-builds.org/debian/issues/bookworm/captures_kernel_version_via_CMAKE_SYSTEM_issue.html
---
 src/programs/fiat.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/programs/fiat.in b/src/programs/fiat.in
index 86f52eb..cab504c 100755
--- a/src/programs/fiat.in
+++ b/src/programs/fiat.in
@@ -42,7 +42,7 @@ info()
   echo "Build:"
   echo "  build type      : @CMAKE_BUILD_TYPE@"
   echo "  timestamp       : @EC_BUILD_TIMESTAMP@"
-  echo "  op. system      : @CMAKE_SYSTEM@ (@EC_OS_NAME@.@EC_OS_BITS@)"
+  echo "  op. system      : @CMAKE_SYSTEM_NAME@ (@EC_OS_NAME@.@EC_OS_BITS@)"
   echo "  processor       : @CMAKE_SYSTEM_PROCESSOR@"
   echo "  c compiler      : @CMAKE_C_COMPILER_ID@ @CMAKE_C_COMPILER_VERSION@"
   echo "    flags         : @EC_C_FLAGS@"
-- 
2.39.0

[0002-Pass-BUILD_TIMESTAMP-via-CMakeLists.txt-and-use-in-f.patch (text/x-diff, inline)]

From 470c9ba8160be203eba1a43b208596e4b9abc1c8 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Fri, 20 Jan 2023 22:53:19 +0000
Subject: [PATCH 2/2] Pass BUILD_TIMESTAMP via CMakeLists.txt and use in
 fiat.in for the build timestamp.

The CMake TIMESTAMP function respects SOURCE_DATE_EPOCH when
specifying UTC timezone.

https://reproducible-builds.org/docs/timestamps/
---
 src/programs/CMakeLists.txt | 1 +
 src/programs/fiat.in        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/programs/CMakeLists.txt b/src/programs/CMakeLists.txt
index 6a96196..2f1188e 100644
--- a/src/programs/CMakeLists.txt
+++ b/src/programs/CMakeLists.txt
@@ -16,6 +16,7 @@ foreach( lang ${langs} )
   set( EC_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} ${CMAKE_${lang}_FLAGS_${CMAKE_BUILD_TYPE_CAPS}}" )
 endforeach()
 
+string(TIMESTAMP BUILD_TIMESTAMP "%Y%m%d%H%M%S" UTC)
 configure_file( ${tool}.in ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${tool} @ONLY )
 
 file(COPY ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${tool}
diff --git a/src/programs/fiat.in b/src/programs/fiat.in
index cab504c..707e385 100755
--- a/src/programs/fiat.in
+++ b/src/programs/fiat.in
@@ -41,7 +41,7 @@ info()
   echo ""
   echo "Build:"
   echo "  build type      : @CMAKE_BUILD_TYPE@"
-  echo "  timestamp       : @EC_BUILD_TIMESTAMP@"
+  echo "  timestamp       : @BUILD_TIMESTAMP@"
   echo "  op. system      : @CMAKE_SYSTEM_NAME@ (@EC_OS_NAME@.@EC_OS_BITS@)"
   echo "  processor       : @CMAKE_SYSTEM_PROCESSOR@"
   echo "  c compiler      : @CMAKE_C_COMPILER_ID@ @CMAKE_C_COMPILER_VERSION@"
-- 
2.39.0

[signature.asc (application/pgp-signature, inline)]

Message #10 received at 1029303-close@bugs.debian.org (full text, mbox, reply):

From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>

To: 1029303-close@bugs.debian.org

Subject: Bug#1029303: fixed in fiat-ecmwf 1.0.0-4

Date: Mon, 23 Jan 2023 07:36:15 +0000

Source: fiat-ecmwf
Source-Version: 1.0.0-4
Done: Alastair McKinstry <mckinstry@debian.org>

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

Debian distribution maintenance software
pp.
Alastair McKinstry <mckinstry@debian.org> (supplier of updated fiat-ecmwf 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 ftpmaster@ftp-master.debian.org)


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

Format: 1.8
Date: Sun, 22 Jan 2023 19:34:07 +0000
Source: fiat-ecmwf
Architecture: source
Version: 1.0.0-4
Distribution: unstable
Urgency: medium
Maintainer: Alastair McKinstry <mckinstry@debian.org>
Changed-By: Alastair McKinstry <mckinstry@debian.org>
Closes: 1029303
Changes:
 fiat-ecmwf (1.0.0-4) unstable; urgency=medium
 .
   * Enable tests
   * Reproducible builds patch from Vagrant Cascadian, Closes: #1029303
Checksums-Sha1:
 28f3094b162d3279f9a792d4ec307babe1b0db4a 2448 fiat-ecmwf_1.0.0-4.dsc
 b89649f81222769d5c079d4f99ca145713afea1e 3572 fiat-ecmwf_1.0.0-4.debian.tar.xz
Checksums-Sha256:
 4e8f7282aba920d9f3f3520903559c8ab3535fc93893989e10036e8a6e3d8e9b 2448 fiat-ecmwf_1.0.0-4.dsc
 cb59086d5a7dd3ecffd8cd649d7710a7e73269c66289208c858df85f82c69257 3572 fiat-ecmwf_1.0.0-4.debian.tar.xz
Files:
 420e3636b9332f71e097e17e4bbf3ddf 2448 science optional fiat-ecmwf_1.0.0-4.dsc
 cf9a3a771ad8774443e81853d8e463cf 3572 science optional fiat-ecmwf_1.0.0-4.debian.tar.xz

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCAAdFiEEgjg86RZbNHx4cIGiy+a7Tl2a06UFAmPOKFkACgkQy+a7Tl2a
06Wafw/5Adi7a39h4/Js0lbpKynWqwb3bpLpps3AxND7eH89j5Se7xW7NancrSzG
c5Vjc3gCVi7K8xPHO0yezOMg5X4upUppTWpYf68mIGto6GGng9Ik7mxG8iShk2EP
JL/5Lv6sllyhormxdprkELaLJTV3fdnV0MTqBv0mon1myHl1kZ7DofkdGMan4IxT
JW8q6MNmIP8GOpbkoRnDAs0OqkvDoYBICl9yvUV0vPzkzPCH6U+JzZUm4QfU9bID
lQVMXCALvQHZvJcbgkTHFOu6AWC0JjBu7WR8ngfBeH2TaZtN01v+m1xB1f4y2vWs
iwKFPtz5h/3D00iLGywLpgY3zbJgIoAGncvqWr5GnqRduox0XMkrPM9MDtRZPYvQ
8z/hWurxuw8Ofn4XkAQc2NoxunGuVyErEJg2QpoAyYbqC3klvGJg+rfyL3GPc7+U
OKwToMxoRQFHAwEVC+AKO3bUrBR3wvYlTDS4kR29N+5OfyVHmyUxEAuZdCRbKYhX
G+lNGxbpNmu2pDdE4X9Z+bFjFKk357oZFo427OJ7uJWxncOUlJksrLBzL5xvNcjP
rCFeD6k1CRjmoG8XyhuzRrdN/1rPIO/KZBw3ND5JcK7hfFohFwRYbg7UbKIS/zmG
BSeqyW2+7+S3sURMtnUdAklbmu10WDFc9qRQ2t1Jl7TMHCL59rs=
=8w/6
-----END PGP SIGNATURE-----

Send a report that this bug log contains spam.