rpm/syslinux
SHA256
1
0
Fork 0
forked from pool/syslinux
Code Pull Requests Activity

Accepting request 868912 from home:bmwiedemann:reproducible:test

Browse Source 
Add syslinux-4.04-reproducible-isohybrid.patch to allow for deterministic iso image creation (boo#1062303)
helps ipxe iso reproducibility.

OBS-URL: https://build.opensuse.org/request/show/868912
OBS-URL: https://build.opensuse.org/package/show/system:install:head/syslinux?expand=0&rev=104
This commit is contained in:
Steffen Winterfeldt 2021-03-15 08:49:24 +00:00 committed by Git OBS Bridge
parent e2b7fa998d
commit 6b1e054506
3 changed files with 67 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
syslinux-4.04-reproducible-isohybrid.patch Normal file
View File

@ -0,0 +1,59 @@
https://github.com/distropatches/syslinux/tree/isohybrid
Author: Bernhard M. Wiedemann <bwiedemann@suse.de>
Date: Wed Feb 3 09:30:53 2021 +0100
isohybrid: Use SOURCE_DATE_EPOCH for deterministic results
without this patch, iso output contained 4 random bytes
at offset 440 for MBR ID
See https://reproducible-builds.org/ for why this matters.
isohybrid: Keep entropy for srand
without this patch, the seed would often be 0 or 0x70000000
The <<2 is added so that pid and ppid do not cancel out each other.
Index: syslinux-4.04/utils/isohybrid.pl
===================================================================
--- syslinux-4.04.orig/utils/isohybrid.pl
+++ syslinux-4.04/utils/isohybrid.pl
@@ -199,7 +199,7 @@ if (defined($opt{'id'})) {
seek(FILE, 440, SEEK_SET) or die "$0: $file: $!\n";
read(FILE, $id, 4);
if ($id eq "\x00\x00\x00\x00") {
- $id = pack("V", get_random());
+ $id = pack("V", $ENV{SOURCE_DATE_EPOCH} || get_random());
}
}
Index: syslinux-4.04/utils/isohybrid.c
===================================================================
--- syslinux-4.04.orig/utils/isohybrid.c
+++ syslinux-4.04/utils/isohybrid.c
@@ -927,6 +927,8 @@ main(int argc, char *argv[])
uint8_t *buf = NULL, *bufz = NULL;
int cylsize = 0, frac = 0;
unsigned padding = 0;
+ int randseed;
+ char *source_date_epoch;
size_t orig_gpt_size, free_space, gpt_size;
struct iso_primary_descriptor descriptor;
struct stat isostat;
@@ -956,7 +958,11 @@ main(int argc, char *argv[])
if(entry != part_efi && entry != part_mac) part_data = entry;
}
- srand(time(NULL) << (getppid() << getpid()));
+
+ if((source_date_epoch = getenv("SOURCE_DATE_EPOCH")) == NULL ||
+ (randseed = strtol(source_date_epoch, NULL, 10)) <= 0)
+ randseed = time(NULL) ^ (getppid()<<2) ^ getpid();
+ srand(randseed);
if (!(fp = fopen(argv[0], "r+"))) // #####
err(1, "could not open file `%s'", argv[0]);

6
syslinux.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Feb 3 09:45:57 UTC 2021 - Bernhard Wiedemann <bwiedemann@suse.com>
- Add syslinux-4.04-reproducible-isohybrid.patch to allow for
deterministic iso image creation (boo#1062303)
-------------------------------------------------------------------
Thu Mar 19 14:24:57 UTC 2020 - Steffen Winterfeldt <snwint@suse.com>

2
syslinux.spec
View File

@ -63,6 +63,7 @@ Patch21: sysmacros.patch
Patch22: remove-note-gnu-section.patch
Patch23: %{name}-%{version}-lzo.diff
Patch24: %{name}-%{version}-gcc10.diff
Patch25: syslinux-4.04-reproducible-isohybrid.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -103,6 +104,7 @@ Authors:
%patch22 -p1
%patch23 -p0
%patch24 -p0
%patch25 -p1
%build
cp %{SOURCE2} .