Your message dated Sun, 31 Oct 2021 18:03:23 +0000 with message-id <E1mhFAx-000Cw0-06@fasolo.debian.org> and subject line Bug#825138: fixed in console-setup 1.206 has caused the Debian Bug report #825138, regarding console-setup: 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 owner@bugs.debian.org immediately.) -- 825138: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=825138 Debian Bug Tracking System Contact owner@bugs.debian.org with problems
--- Begin Message ---
- To: submit@bugs.debian.org
- Subject: console-setup: please make the build reproducible
- From: Reiner Herrmann <reiner@reiner-h.de>
- Date: Tue, 24 May 2016 01:24:53 +0200
- Message-id: <20160523232452.GA2223@apollo>
Source: console-setup Version: 1.143 Severity: wishlist Tags: patch User: reproducible-builds@lists.alioth.debian.org Usertags: umask locale fileordering X-Debbugs-Cc: reproducible-builds@lists.alioth.debian.org Hi! While working on the "reproducible builds" effort [1], we have noticed that console-setup could not be built reproducibly. There are three remaining issues: - different umasks cause differences in the mode of uuencoded files - $(wildcard ...) in Makefiles is unsorted, which causes randomly ordered entries in charmap_functions.sh - files are listed in debian/preprocessor with `ls *.{psf,acm}`, which is sorted, but sorted differently depending on the locale. The attached patch fixes those issues. Regards, Reiner [1]: https://wiki.debian.org/ReproducibleBuildsdiff --git a/Fonts/Makefile b/Fonts/Makefile index 3769cbe..452f8fa 100644 --- a/Fonts/Makefile +++ b/Fonts/Makefile @@ -330,7 +330,7 @@ $(ALL_BSD_FONTS) : $(equivalents) $(symbolsets) $(size) $@ $(@:%.raw=%.raw.sfm) %.fnt : %.raw - uuencode $< $(*F) >$@ + umask 022; uuencode $< $(*F) >$@ gzipped_linux_fonts : $(GZIPPED_LINUX_FONTS) @@ -355,7 +355,7 @@ $(SCRNMAPS) : somefont = \ $(SCRNMAPS) : sfm = $(somefont:%.fnt=%.raw.sfm) $(SCRNMAPS) : $(UUENCODED_BSD_FONTS) $./freebsd.set $./fbsdmap - $(fntdir)/fbsdmap --binaryscm $(fntdir)/freebsd.set $(sfm) \ + umask 022; $(fntdir)/fbsdmap --binaryscm $(fntdir)/freebsd.set $(sfm) \ $(fntdir)/../acm/$(encoding).acm | \ uuencode $(encoding_fontset) >$@ diff --git a/Keyboard/Makefile b/Keyboard/Makefile index d5e4e8b..3313210 100644 --- a/Keyboard/Makefile +++ b/Keyboard/Makefile @@ -27,7 +27,7 @@ $./%.ekbd : $./charmap_functions.sh : $(acmfiles) $(kbddir)/make_charmap_functions $(kbddir)/../acm $(charmaps) >$@ -acmfiles := $(wildcard $./../acm/*.acm) +acmfiles := $(sort $(wildcard $./../acm/*.acm)) charmaps := $(basename $(notdir $(acmfiles))) diff --git a/debian/preprocessor b/debian/preprocessor index 89b6717..4f0d1a7 100755 --- a/debian/preprocessor +++ b/debian/preprocessor @@ -46,13 +46,13 @@ awk ' } /## *FONTSETS *##/ { printf "fontsets='\''"; - system("cd Fonts && ls *.psf | sed '\''s/.psf$//'\''"); + system("cd Fonts && LC_ALL=C ls *.psf | sed '\''s/.psf$//'\''"); printf "'\''"; next; } /## *CHARMAPS *##/ { printf "charmaps='\''"; - system("ls acm/*.acm |sed -e '\''s/^acm.//'\'' -e '\''s/.acm$//'\''"); + system("LC_ALL=C ls acm/*.acm |sed -e '\''s/^acm.//'\'' -e '\''s/.acm$//'\''"); printf "UTF-8'\''\n"; next; }Attachment: signature.asc
Description: PGP signature
--- End Message ---
--- Begin Message ---
- To: 825138-close@bugs.debian.org
- Subject: Bug#825138: fixed in console-setup 1.206
- From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>
- Date: Sun, 31 Oct 2021 18:03:23 +0000
- Message-id: <E1mhFAx-000Cw0-06@fasolo.debian.org>
- Reply-to: Samuel Thibault <sthibault@debian.org>
Source: console-setup Source-Version: 1.206 Done: Samuel Thibault <sthibault@debian.org> We believe that the bug you reported is fixed in the latest version of console-setup, 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 825138@bugs.debian.org, and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Samuel Thibault <sthibault@debian.org> (supplier of updated console-setup 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: SHA512 Format: 1.8 Date: Sun, 31 Oct 2021 18:13:37 +0100 Source: console-setup Architecture: source Version: 1.206 Distribution: unstable Urgency: medium Maintainer: Debian Install System Team <debian-boot@lists.debian.org> Changed-By: Samuel Thibault <sthibault@debian.org> Closes: 825138 968195 997110 Changes: console-setup (1.206) unstable; urgency=medium . * Team upload. . [ Sébastien Villemot ] * ckbcomp: When translating X symbols to kernel symbols, ignore Unicode code points above 0xFFFF. Those code points aren’t supported by the Linux kernel, so loadkeys won’t be able to load them, or even parse the value. This affects the fr(bepo_afnor) keymap, which includes the copyleft symbol U+1F12F. Thanks to Jean-Louis Biasini for the bug report and Anisse Astier for the initial patch. (Closes: #968195) . [ Reiner Herrmann ] * Fix reproducibility against file ordering. * Fix reproducibility against umask. Closes: #825138. . [ Peter Hutterer ] * Keyboard/ckbcomp: use the "base" XKB files, not "xorg". . [ Samuel Thibault ] * Keyboard/kbdcompiler: Avoid 'custom' layout. Closes: #997110. * console-setup-linux.lintian-overrides: Suppress warnings about national encodings. Checksums-Sha1: 0f525c4eeee5c1a190548593bdffb070e7fee78c 3180 console-setup_1.206.dsc 44cf217b602d1ca427c2ddd7ff848845a39962dc 1794560 console-setup_1.206.tar.xz 340b0095e58b4765460728dae09b41f04f8fb7e6 11465 console-setup_1.206_amd64.buildinfo Checksums-Sha256: 8f4f53223e8a8a7bfcced7374258fc9e482e71b41b5b682f2415c5f3783f0a3c 3180 console-setup_1.206.dsc 856d0f123911779f5285a9c1479ea505c89981054df5b7ab4cd49fdd32663d2c 1794560 console-setup_1.206.tar.xz 105a98adc61a60383a6fb6e2211a99d24351d5e77e883ebd9c3d1ece3c7f70ed 11465 console-setup_1.206_amd64.buildinfo Files: b685f32d734d035f5e3b3718cb9ae729 3180 utils optional console-setup_1.206.dsc 291a1c99e5e4240b1cc039d442c8117e 1794560 utils optional console-setup_1.206.tar.xz 4f5c01c9120226fd2cad56a48317d9ee 11465 utils optional console-setup_1.206_amd64.buildinfo -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEE59DSENomQIYa2nfqRdTszGSEm3kFAmF+1wQACgkQRdTszGSE m3lKHBAAqakIqY+Ct4LX3ohO2/6rMX/ntM6wwzHvrilPlns4SeWaD4s6GiElmC1C FrILWCx0mqYLtolwMi8zs9tgSbhPKsrnVJDGocWZ3VzDpsD+6y6T7j5Emz3EfM4Z u7SnUtnboIVm/OSsmVuYDLADC/50ewYvdemw9nbmBbn8pFhdGNlW43/fUspGWRze iOs2vsIq02yYrHvsrTtkemhjyyPZYzkk+W5PGlUmsZuy6I3xt/LunLMj649A4OM2 GTa2EfpXLizOYn/6X8k1z8+e0YuGrssO3vEJPSB3lV27nQyC3s8s8GcXGxP0VYow HMFzfJJW6ingMbK+xNsDrcKvzrwDHZBac/tH3BKCemn8zhb+IDMt+t/Uwn5n7gDx sLKqJ9lCmSlfrSTZneXAxfQVQDvfEvD+AWM0B4oFZacOuFGN/4+OG7q9d8J9Y+7A Rve+mbFmFBO4ZboOHDEvnbpsqrOSFLr9Z0aJjdPmq3oC2AKq1UEwIHoqZ3JFXlk5 4JY8z8fuyn6Y8R81zLy2xt2wPk1y1lOMPwqJiI3F8DAY3ZNInHsgxrpkyhGuNgni N5KZsJ3Ro1xbgs15Zfe6uyJw6BAXXYQ90qsoHrsVIAenWzXrQZxFFEbgu+gFbr5g 9BdybAiECoRmqMoDR+UvdWeJHiFrR84aW8f5CPYYPpD3eAy3Ao0= =oIb5 -----END PGP SIGNATURE-----
--- End Message ---