From aeed90a428536038c61b63eebbbf0408617c98be Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 3 Jan 2021 18:04:59 -0800 Subject: Commit patch queue (exported by git-debrebase) [git-debrebase make-patches: export and commit patches] --- debian/patches/0001-asprintf.patch | 118 +++++ debian/patches/0002-ctype.patch | 32 ++ debian/patches/0003-bdf.patch | 21 + debian/patches/0004-link-order.patch | 21 + debian/patches/0005-buildflags.patch | 19 + debian/patches/0006-syslinux-path.patch | 75 +++ debian/patches/0007-ttf-dejavu.patch | 95 ++++ debian/patches/0008-adddir.patch | 23 + ...s-reproducible-and-owner-to-cpio.-Closes-.patch | 38 ++ ...id-including-the-.-directory-in-the-cpio-.patch | 29 ++ ...ple-Makefile-Set-time-on-files-in-example.patch | 107 +++++ ...pstream-Add-changelog-for-upstream-versio.patch | 511 +++++++++++++++++++++ debian/patches/series | 12 + 13 files changed, 1101 insertions(+) create mode 100644 debian/patches/0001-asprintf.patch create mode 100644 debian/patches/0002-ctype.patch create mode 100644 debian/patches/0003-bdf.patch create mode 100644 debian/patches/0004-link-order.patch create mode 100644 debian/patches/0005-buildflags.patch create mode 100644 debian/patches/0006-syslinux-path.patch create mode 100644 debian/patches/0007-ttf-dejavu.patch create mode 100644 debian/patches/0008-adddir.patch create mode 100644 debian/patches/0009-gfxboot-pass-reproducible-and-owner-to-cpio.-Closes-.patch create mode 100644 debian/patches/0010-gfxboot-avoid-including-the-.-directory-in-the-cpio-.patch create mode 100644 debian/patches/0011-themes-example-Makefile-Set-time-on-files-in-example.patch create mode 100644 debian/patches/0012-changelog.upstream-Add-changelog-for-upstream-versio.patch create mode 100644 debian/patches/series diff --git a/debian/patches/0001-asprintf.patch b/debian/patches/0001-asprintf.patch new file mode 100644 index 0000000..b3a74fa --- /dev/null +++ b/debian/patches/0001-asprintf.patch @@ -0,0 +1,118 @@ +From: Colin Watson +Date: Sun, 3 Jan 2021 02:06:39 -0800 +Subject: Fix some non-exploitable buffer overflows in mkbootmsg (LP: #27011). + +--- + gfxboot-compile.c | 32 ++++++++++++++++++++------------ + 1 file changed, 20 insertions(+), 12 deletions(-) + +diff --git a/gfxboot-compile.c b/gfxboot-compile.c +index dd882e8..835450e 100644 +--- a/gfxboot-compile.c ++++ b/gfxboot-compile.c +@@ -1763,7 +1763,7 @@ void log_cline(FILE *lf) + } + + +-char *add_to_line(char *s) ++char *add_to_line(const char *s) + { + static char buf[10240] = {}; + static int ind = 0; +@@ -1812,7 +1812,7 @@ void decompile(unsigned char *data, unsigned size) + unsigned inst_size; + dict_t *d; + unsigned type; +- char *s, buf[1024]; ++ char *s, *buf; + unsigned char *p; + + // setup initial vocabulary +@@ -1889,13 +1889,15 @@ void decompile(unsigned char *data, unsigned size) + } + + case t_unsigned: +- sprintf(buf, "%d", val); ++ asprintf(&buf, "%d", val); + add_to_line(buf); ++ free(buf); + break; + + case t_string: ++ buf = malloc(strlen((char *) data + i + u + 1) * 4 + 3); + buf[0] = '"'; +- for(j = 1, p = data + i + u + 1; *p && j < sizeof buf - 10; p++) { ++ for(j = 1, p = data + i + u + 1; *p; p++) { + if(*p == '\n') { + buf[j++] = '\\'; + buf[j++] = 'n'; +@@ -1917,16 +1919,18 @@ void decompile(unsigned char *data, unsigned size) + buf[j++] = '"'; + buf[j] = 0; + s = add_to_line(buf); ++ free(buf); + break; + + case t_sec: + if(val < dict_size && dict[val].name) { +- sprintf(buf, "%s", dict[val].name); ++ asprintf(&buf, "%s", dict[val].name); + } + else { +- sprintf(buf, "name_%d", val); ++ asprintf(&buf, "name_%d", val); + } + s = add_to_line(buf); ++ free(buf); + printf("%s\n", s); + add_to_line(""); + break; +@@ -1939,38 +1943,42 @@ void decompile(unsigned char *data, unsigned size) + } + } + if(s) { +- sprintf(buf, "%s", s); ++ asprintf(&buf, "%s", s); + } + else { +- sprintf(buf, "prim_<%d>", val); ++ asprintf(&buf, "prim_<%d>", val); + } + s = add_to_line(buf); ++ free(buf); + printf("%s\n", s); + add_to_line(""); + break; + + case t_bool: +- sprintf(buf, "%s", val ? "true" : "false"); ++ asprintf(&buf, "%s", val ? "true" : "false"); + s = add_to_line(buf); ++ free(buf); + printf("%s\n", s); + add_to_line(""); + break; + + case t_none: +- sprintf(buf, ".undef"); ++ asprintf(&buf, ".undef"); + s = add_to_line(buf); ++ free(buf); + printf("%s\n", s); + add_to_line(""); + break; + + case t_dict_idx: + if(val < dict_size && dict[val].name) { +- sprintf(buf, "/%s", dict[val].name); ++ asprintf(&buf, "/%s", dict[val].name); + } + else { +- sprintf(buf, "/name_%d", val); ++ asprintf(&buf, "/name_%d", val); + } + add_to_line(buf); ++ free(buf); + break; + + default: diff --git a/debian/patches/0002-ctype.patch b/debian/patches/0002-ctype.patch new file mode 100644 index 0000000..7e7a372 --- /dev/null +++ b/debian/patches/0002-ctype.patch @@ -0,0 +1,32 @@ +From: Colin Watson +Date: Sun, 3 Jan 2021 02:06:39 -0800 +Subject: Make sure to pass unsigned chars to isspace(), per the C standard; + not doing so + +can cause problems on powerpc and other architectures. +--- + gfxboot-compile.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gfxboot-compile.c b/gfxboot-compile.c +index 835450e..0914d53 100644 +--- a/gfxboot-compile.c ++++ b/gfxboot-compile.c +@@ -658,7 +658,7 @@ char *next_word(char **ptr) + + *word = 0; + +- while(isspace(*s)) if(*s++ == '\n') line++; ++ while(isspace((unsigned char) *s)) if(*s++ == '\n') line++; + + if(!*s) { + *ptr = s; +@@ -757,7 +757,7 @@ char *next_word(char **ptr) + word[n] = 0; + } + else { +- while(!isspace(*s)) s++; ++ while(!isspace((unsigned char) *s)) s++; + } + + if(!is_str) { diff --git a/debian/patches/0003-bdf.patch b/debian/patches/0003-bdf.patch new file mode 100644 index 0000000..c5a579b --- /dev/null +++ b/debian/patches/0003-bdf.patch @@ -0,0 +1,21 @@ +From: Colin Watson +Date: Sun, 3 Jan 2021 02:06:39 -0800 +Subject: Try .bdf files in gfxboot-font. + +--- + gfxboot-font.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gfxboot-font.c b/gfxboot-font.c +index 423f27d..a3c2637 100644 +--- a/gfxboot-font.c ++++ b/gfxboot-font.c +@@ -921,7 +921,7 @@ char *search_font(char *font_path, char *name) + char *font_name = NULL; + char *cur_path, *sep; + struct stat sbuf; +- static char *suffix[] = { "", ".otf", ".ttf", ".ttc", ".pfa", ".pfb", ".pcf.gz" }; ++ static char *suffix[] = { "", ".otf", ".ttf", ".ttc", ".pfa", ".pfb", ".pcf.gz", ".bdf" }; + + if(!font_path || !name) return NULL; + diff --git a/debian/patches/0004-link-order.patch b/debian/patches/0004-link-order.patch new file mode 100644 index 0000000..d9772c1 --- /dev/null +++ b/debian/patches/0004-link-order.patch @@ -0,0 +1,21 @@ +From: Colin Watson +Date: Sun, 3 Jan 2021 02:06:39 -0800 +Subject: Fix link order with 'ld --as-needed' (Closes: #605771). + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 6921559..54af87c 100644 +--- a/Makefile ++++ b/Makefile +@@ -18,7 +18,7 @@ changelog: $(GITDEPS) + $(GIT2LOG) --changelog changelog + + gfxboot-font: gfxboot-font.c +- $(CC) $(CFLAGS) -I /usr/include/freetype2 -lfreetype $< -o $@ ++ $(CC) $(CFLAGS) -I /usr/include/freetype2 $< -lfreetype -o $@ + + gfxboot-compile: gfxboot-compile.c vocabulary.h bincode.h + $(CC) $(CFLAGS) $< -o $@ diff --git a/debian/patches/0005-buildflags.patch b/debian/patches/0005-buildflags.patch new file mode 100644 index 0000000..8c51b4f --- /dev/null +++ b/debian/patches/0005-buildflags.patch @@ -0,0 +1,19 @@ +From: Daniel Baumann +Date: Sun, 3 Jan 2021 02:06:39 -0800 +Subject: Avoid overwriting buildflags. + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 54af87c..f8a8de7 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,5 +1,5 @@ + CC = gcc +-CFLAGS = -g -Wall -Wno-pointer-sign -O2 -fomit-frame-pointer ++#CFLAGS = -g -Wall -Wno-pointer-sign -O2 -fomit-frame-pointer + + GIT2LOG := $(shell if [ -x ./git2log ] ; then echo ./git2log --update ; else echo true ; fi) + GITDEPS := $(shell [ -d .git ] && echo .git/HEAD .git/refs/heads .git/refs/tags) diff --git a/debian/patches/0006-syslinux-path.patch b/debian/patches/0006-syslinux-path.patch new file mode 100644 index 0000000..f240498 --- /dev/null +++ b/debian/patches/0006-syslinux-path.patch @@ -0,0 +1,75 @@ +From: Daniel Baumann +Date: Sun, 3 Jan 2021 02:06:39 -0800 +Subject: Updating syslinux paths (Closes: #682974). + +--- + gfxboot | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/gfxboot b/gfxboot +index f597c4f..c809762 100755 +--- a/gfxboot ++++ b/gfxboot +@@ -989,9 +989,9 @@ my @vm_order = qw ( qemu64 qemu32 qemu qemu-kvm vbox vbox64 vboxsdl vmplayer vmw + my %bl_list = ( + grub => '/usr/sbin/grub', + lilo => '/sbin/lilo', +- isolinux => '/usr/share/syslinux/isolinux.bin', ++ isolinux => '/usr/lib/syslinux/isolinux.bin', + syslinux => '/usr/bin/syslinux', +- pxelinux => '/usr/share/syslinux/pxelinux.0', ++ pxelinux => '/usr/lib/syslinux/pxelinux.0', + bd => '/usr/bin/bd', + bochs => '/usr/bin/bochs', + ); +@@ -1793,8 +1793,8 @@ sub prepare_isolinux + $arch_dir = 'i386'; + $arch_dir = 'x86_64' if $opt_64 && !$opt_32; + +- $comboot = "$opt_syslinux/usr/share/syslinux/gfxboot.c32"; +- $comboot = "$opt_syslinux/usr/share/syslinux/gfxboot.com" unless -f $comboot; ++ $comboot = "$opt_syslinux/usr/lib/syslinux/gfxboot.c32"; ++ $comboot = "$opt_syslinux/usr/lib/syslinux/gfxboot.com" unless -f $comboot; + $comboot = 0 unless -f $comboot; + + # syslinux 6.x +@@ -1867,7 +1867,7 @@ sub prepare_isolinux + close F; + } + +- system "cp $opt_syslinux/usr/share/syslinux/isolinux.bin $dst/$loader" and die "error: no isolinux\n"; ++ system "cp $opt_syslinux/usr/lib/syslinux/isolinux.bin $dst/$loader" and die "error: no isolinux\n"; + system "cp $comboot $dst/$loader" if $comboot; + + for my $f ("ldlinux.c32", "libcom32.c32") { +@@ -1917,8 +1917,8 @@ sub prepare_syslinux + + die "error: syslinux not found\n" unless -f "$opt_syslinux/$bl_list{syslinux}"; + +- $comboot = "$opt_syslinux/usr/share/syslinux/gfxboot.c32"; +- $comboot = "$opt_syslinux/usr/share/syslinux/gfxboot.com" unless -f $comboot; ++ $comboot = "$opt_syslinux/usr/lib/syslinux/gfxboot.c32"; ++ $comboot = "$opt_syslinux/usr/lib/syslinux/gfxboot.com" unless -f $comboot; + $comboot = 0 unless -f $comboot; + + # syslinux 6.x +@@ -2034,8 +2034,8 @@ sub prepare_pxelinux + $arch_dir = 'i386'; + $arch_dir = 'x86_64' if $opt_64 && !$opt_32; + +- $comboot = "$opt_syslinux/usr/share/syslinux/gfxboot.c32"; +- $comboot = "$opt_syslinux/usr/share/syslinux/gfxboot.com" unless -f $comboot; ++ $comboot = "$opt_syslinux/usr/lib/syslinux/gfxboot.c32"; ++ $comboot = "$opt_syslinux/usr/lib/syslinux/gfxboot.com" unless -f $comboot; + $comboot = 0 unless -f $comboot; + + # syslinux 6.x +@@ -2108,7 +2108,7 @@ sub prepare_pxelinux + close F; + } + +- system "cp $opt_syslinux/usr/share/syslinux/pxelinux.0 $dst/$loader" and die "error: no pxelinux\n"; ++ system "cp $opt_syslinux/usr/lib/syslinux/pxelinux.0 $dst/$loader" and die "error: no pxelinux\n"; + system "cp $comboot $dst/$loader" if $comboot; + + for my $f ("ldlinux.c32", "libcom32.c32") { diff --git a/debian/patches/0007-ttf-dejavu.patch b/debian/patches/0007-ttf-dejavu.patch new file mode 100644 index 0000000..a35d418 --- /dev/null +++ b/debian/patches/0007-ttf-dejavu.patch @@ -0,0 +1,95 @@ +From: Daniel Baumann +Date: Sun, 3 Jan 2021 02:06:39 -0800 +Subject: gfxboot expects fonts to be in /usr/share/fonts/truetype et al, + +not in subdirectories within like debian based systems do. + +The proper fix is to make search_font() in gfxboot-font recursive, +however, for the time being we add the paths manually here. +--- + themes/example_02/Makefile | 2 +- + themes/example_03/Makefile | 2 +- + themes/example_04/Makefile | 2 +- + themes/example_05/Makefile | 2 +- + themes/example_06/Makefile | 2 +- + themes/example_07/Makefile | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/themes/example_02/Makefile b/themes/example_02/Makefile +index 0fb4640..c0d551d 100644 +--- a/themes/example_02/Makefile ++++ b/themes/example_02/Makefile +@@ -16,7 +16,7 @@ bootlogo: example_*.bc font + $(GFXBOOT) --archive $@.dir --pack-archive $@ + + font: +- $(GFXBOOT_FONT) -v -f DejaVuSans:size=20 font.fnt >font.log ++ $(GFXBOOT_FONT) -v -p /usr/share/fonts/truetype/ttf-dejavu -f DejaVuSans:size=20 font.fnt >font.log + + clean: + rm -rf *~ *.log *.dir bootlogo *.fnt +diff --git a/themes/example_03/Makefile b/themes/example_03/Makefile +index cffce2e..4e18e35 100644 +--- a/themes/example_03/Makefile ++++ b/themes/example_03/Makefile +@@ -16,7 +16,7 @@ bootlogo: example_*.bc font + $(GFXBOOT) --archive $@.dir --pack-archive $@ + + font: +- $(GFXBOOT_FONT) -v -f DejaVuSans:size=20 font.fnt >font.log ++ $(GFXBOOT_FONT) -v -p /usr/share/fonts/truetype/ttf-dejavu -f DejaVuSans:size=20 font.fnt >font.log + + clean: + rm -rf *~ *.log *.dir bootlogo *.fnt +diff --git a/themes/example_04/Makefile b/themes/example_04/Makefile +index 07357a5..e54c817 100644 +--- a/themes/example_04/Makefile ++++ b/themes/example_04/Makefile +@@ -16,7 +16,7 @@ bootlogo: example_*.bc font + $(GFXBOOT) --archive $@.dir --pack-archive $@ + + font: +- $(GFXBOOT_FONT) -v -f DejaVuSans:size=32 font.fnt >font.log ++ $(GFXBOOT_FONT) -v -p /usr/share/fonts/truetype/ttf-dejavu -f DejaVuSans:size=32 font.fnt >font.log + + clean: + rm -rf *~ *.log *.dir bootlogo *.fnt +diff --git a/themes/example_05/Makefile b/themes/example_05/Makefile +index 07357a5..e54c817 100644 +--- a/themes/example_05/Makefile ++++ b/themes/example_05/Makefile +@@ -16,7 +16,7 @@ bootlogo: example_*.bc font + $(GFXBOOT) --archive $@.dir --pack-archive $@ + + font: +- $(GFXBOOT_FONT) -v -f DejaVuSans:size=32 font.fnt >font.log ++ $(GFXBOOT_FONT) -v -p /usr/share/fonts/truetype/ttf-dejavu -f DejaVuSans:size=32 font.fnt >font.log + + clean: + rm -rf *~ *.log *.dir bootlogo *.fnt +diff --git a/themes/example_06/Makefile b/themes/example_06/Makefile +index bf21c5d..0a3c7cd 100644 +--- a/themes/example_06/Makefile ++++ b/themes/example_06/Makefile +@@ -20,7 +20,7 @@ bootlogo: example_*.bc font + @ln -snf bootlogo message + + font: +- $(GFXBOOT_FONT) -v -f DejaVuSans:size=32 font.fnt >font.log ++ $(GFXBOOT_FONT) -v -p /usr/share/fonts/truetype/ttf-dejavu -f DejaVuSans:size=32 font.fnt >font.log + + clean: + rm -rf *~ *.log *.dir bootlogo message *.fnt +diff --git a/themes/example_07/Makefile b/themes/example_07/Makefile +index bf21c5d..0a3c7cd 100644 +--- a/themes/example_07/Makefile ++++ b/themes/example_07/Makefile +@@ -20,7 +20,7 @@ bootlogo: example_*.bc font + @ln -snf bootlogo message + + font: +- $(GFXBOOT_FONT) -v -f DejaVuSans:size=32 font.fnt >font.log ++ $(GFXBOOT_FONT) -v -p /usr/share/fonts/truetype/ttf-dejavu -f DejaVuSans:size=32 font.fnt >font.log + + clean: + rm -rf *~ *.log *.dir bootlogo message *.fnt diff --git a/debian/patches/0008-adddir.patch b/debian/patches/0008-adddir.patch new file mode 100644 index 0000000..ec9c483 --- /dev/null +++ b/debian/patches/0008-adddir.patch @@ -0,0 +1,23 @@ +From: Daniel Baumann +Date: Sun, 3 Jan 2021 02:06:39 -0800 +Subject: Replacing adddir location with absolute name in order to allow to + compile the + +themes from any location, not just /usr/share/gfxboot/themes/foo. +--- + themes/openSUSE/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/themes/openSUSE/Makefile b/themes/openSUSE/Makefile +index 9272d1f..547614e 100644 +--- a/themes/openSUSE/Makefile ++++ b/themes/openSUSE/Makefile +@@ -10,7 +10,7 @@ else + PREPARED = $(shell [ -f .prepared ] && echo 1) + endif + +-ADDDIR = ../../bin/adddir ++ADDDIR ?= /usr/share/gfxboot/bin/adddir + BFLAGS = -O -v -L ../.. + + SUBDIRS = fonts help-boot help-install po src diff --git a/debian/patches/0009-gfxboot-pass-reproducible-and-owner-to-cpio.-Closes-.patch b/debian/patches/0009-gfxboot-pass-reproducible-and-owner-to-cpio.-Closes-.patch new file mode 100644 index 0000000..ccca801 --- /dev/null +++ b/debian/patches/0009-gfxboot-pass-reproducible-and-owner-to-cpio.-Closes-.patch @@ -0,0 +1,38 @@ +From: Vagrant Cascadian +Date: Fri, 1 Jan 2021 03:38:21 +0000 +Subject: gfxboot: pass --reproducible and --owner to cpio. (Closes: #978946) + +Apply fixes for reproducibilty, similar to: + + https://github.com/openSUSE/gfxboot/pull/35 + +See also: + + https://bugs.debian.org/978946 + https://tests.reproducible-builds.org/debian/issues/unstable/users_and_groups_in_cpio_archive_issue.html +--- + gfxboot | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gfxboot b/gfxboot +index c809762..75cdba3 100755 +--- a/gfxboot ++++ b/gfxboot +@@ -2616,7 +2616,7 @@ sub pack_archive + } + + if(@pack_list) { +- open $f, "| ( cd $dir ; cpio --quiet -o ) >$file/$archive"; ++ open $f, "| ( cd $dir ; cpio --quiet --reproducible --owner=+0:+0 -o ) >$file/$archive"; + print $f join("\n", @pack_list); + close $f; + } +@@ -2625,7 +2625,7 @@ sub pack_archive + else { + $file = $gfxboot_tmp->file; + +- $i = system "cd $dir ; find . | cpio --quiet -o >$file 2>/dev/null"; ++ $i = system "cd $dir ; find . | cpio --quiet --reproducible --owner=+0:+0 -o >$file 2>/dev/null"; + die "$file: failed to create archive\n" if $i; + } + diff --git a/debian/patches/0010-gfxboot-avoid-including-the-.-directory-in-the-cpio-.patch b/debian/patches/0010-gfxboot-avoid-including-the-.-directory-in-the-cpio-.patch new file mode 100644 index 0000000..2838e9e --- /dev/null +++ b/debian/patches/0010-gfxboot-avoid-including-the-.-directory-in-the-cpio-.patch @@ -0,0 +1,29 @@ +From: Vagrant Cascadian +Date: Sun, 3 Jan 2021 03:21:23 +0000 +Subject: gfxboot: avoid including the "." directory in the cpio archive. + (Closes: #978946) + +The "." directory is at best extraneous, and is a little trickier to +avoid a resulting embedded timestamp. + +See also: + + https://bugs.debian.org/978946 + https://tests.reproducible-builds.org/debian/issues/unstable/timestamps_in_cpio_archive_issue.html +--- + gfxboot | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gfxboot b/gfxboot +index 75cdba3..0ede732 100755 +--- a/gfxboot ++++ b/gfxboot +@@ -2625,7 +2625,7 @@ sub pack_archive + else { + $file = $gfxboot_tmp->file; + +- $i = system "cd $dir ; find . | cpio --quiet --reproducible --owner=+0:+0 -o >$file 2>/dev/null"; ++ $i = system "cd $dir ; find . -mindepth 1 | cpio --quiet --reproducible --owner=+0:+0 -o >$file 2>/dev/null"; + die "$file: failed to create archive\n" if $i; + } + diff --git a/debian/patches/0011-themes-example-Makefile-Set-time-on-files-in-example.patch b/debian/patches/0011-themes-example-Makefile-Set-time-on-files-in-example.patch new file mode 100644 index 0000000..0ef88c9 --- /dev/null +++ b/debian/patches/0011-themes-example-Makefile-Set-time-on-files-in-example.patch @@ -0,0 +1,107 @@ +From: Vagrant Cascadian +Date: Fri, 1 Jan 2021 04:09:40 +0000 +Subject: themes/example*/Makefile: Set time on files in example themes using + Makefile as a reference time. (Closes: #978946) + +Similar to fixes applied in other themes: + + https://github.com/openSUSE/gfxboot/pull/35 + +See also: + + https://bugs.debian.org/978946 + https://tests.reproducible-builds.org/debian/issues/unstable/timestamps_in_cpio_archive_issue.html +--- + themes/example_01/Makefile | 1 + + themes/example_02/Makefile | 1 + + themes/example_03/Makefile | 1 + + themes/example_04/Makefile | 1 + + themes/example_05/Makefile | 1 + + themes/example_06/Makefile | 1 + + themes/example_07/Makefile | 1 + + 7 files changed, 7 insertions(+) + +diff --git a/themes/example_01/Makefile b/themes/example_01/Makefile +index a3d1be4..c54659d 100644 +--- a/themes/example_01/Makefile ++++ b/themes/example_01/Makefile +@@ -12,6 +12,7 @@ bootlogo: example_*.bc + @rm -rf $@.dir + @mkdir $@.dir + $(GFXBOOT_COMPILE) $(BFLAGS) -l $@.log -c $< $@.dir/init ++ touch --reference Makefile $@.dir/* + $(GFXBOOT) --archive $@.dir --pack-archive $@ + + clean: +diff --git a/themes/example_02/Makefile b/themes/example_02/Makefile +index c0d551d..5eb150c 100644 +--- a/themes/example_02/Makefile ++++ b/themes/example_02/Makefile +@@ -13,6 +13,7 @@ bootlogo: example_*.bc font + @mkdir $@.dir + $(GFXBOOT_COMPILE) $(BFLAGS) -l $@.log -c $< $@.dir/init + @cp font.fnt $@.dir ++ touch --reference Makefile $@.dir/* + $(GFXBOOT) --archive $@.dir --pack-archive $@ + + font: +diff --git a/themes/example_03/Makefile b/themes/example_03/Makefile +index 4e18e35..2c7de7c 100644 +--- a/themes/example_03/Makefile ++++ b/themes/example_03/Makefile +@@ -13,6 +13,7 @@ bootlogo: example_*.bc font + @mkdir $@.dir + $(GFXBOOT_COMPILE) $(BFLAGS) -l $@.log -c $< $@.dir/init + @cp clouds.jpg font.fnt $@.dir ++ touch --reference Makefile $@.dir/* + $(GFXBOOT) --archive $@.dir --pack-archive $@ + + font: +diff --git a/themes/example_04/Makefile b/themes/example_04/Makefile +index e54c817..b3bcd70 100644 +--- a/themes/example_04/Makefile ++++ b/themes/example_04/Makefile +@@ -13,6 +13,7 @@ bootlogo: example_*.bc font + @mkdir $@.dir + $(GFXBOOT_COMPILE) $(BFLAGS) -l $@.log -c $< $@.dir/init + @cp clouds.jpg font.fnt $@.dir ++ touch --reference Makefile $@.dir/* + $(GFXBOOT) --archive $@.dir --pack-archive $@ + + font: +diff --git a/themes/example_05/Makefile b/themes/example_05/Makefile +index e54c817..b3bcd70 100644 +--- a/themes/example_05/Makefile ++++ b/themes/example_05/Makefile +@@ -13,6 +13,7 @@ bootlogo: example_*.bc font + @mkdir $@.dir + $(GFXBOOT_COMPILE) $(BFLAGS) -l $@.log -c $< $@.dir/init + @cp clouds.jpg font.fnt $@.dir ++ touch --reference Makefile $@.dir/* + $(GFXBOOT) --archive $@.dir --pack-archive $@ + + font: +diff --git a/themes/example_06/Makefile b/themes/example_06/Makefile +index 0a3c7cd..88c0b08 100644 +--- a/themes/example_06/Makefile ++++ b/themes/example_06/Makefile +@@ -16,6 +16,7 @@ bootlogo: example_*.bc font + @mkdir $@.dir + $(GFXBOOT_COMPILE) $(BFLAGS) -l $@.log -c $< $@.dir/init + @cp $(FILES) $@.dir ++ touch --reference Makefile $@.dir/* + $(GFXBOOT) --archive $@.dir --pack-archive $@ + @ln -snf bootlogo message + +diff --git a/themes/example_07/Makefile b/themes/example_07/Makefile +index 0a3c7cd..88c0b08 100644 +--- a/themes/example_07/Makefile ++++ b/themes/example_07/Makefile +@@ -16,6 +16,7 @@ bootlogo: example_*.bc font + @mkdir $@.dir + $(GFXBOOT_COMPILE) $(BFLAGS) -l $@.log -c $< $@.dir/init + @cp $(FILES) $@.dir ++ touch --reference Makefile $@.dir/* + $(GFXBOOT) --archive $@.dir --pack-archive $@ + @ln -snf bootlogo message + diff --git a/debian/patches/0012-changelog.upstream-Add-changelog-for-upstream-versio.patch b/debian/patches/0012-changelog.upstream-Add-changelog-for-upstream-versio.patch new file mode 100644 index 0000000..c234da1 --- /dev/null +++ b/debian/patches/0012-changelog.upstream-Add-changelog-for-upstream-versio.patch @@ -0,0 +1,511 @@ +From: Vagrant Cascadian +Date: Sun, 3 Jan 2021 16:37:22 -0800 +Subject: changelog.upstream: Add changelog for upstream version 4.5.73. + +--- + changelog.upstream | 496 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 496 insertions(+) + create mode 100644 changelog.upstream + +diff --git a/changelog.upstream b/changelog.upstream +new file mode 100644 +index 0000000..17cb2cc +--- /dev/null ++++ b/changelog.upstream +@@ -0,0 +1,496 @@ ++2020-10-22: 4.5.73 ++ - Translated using Weblate (Hindi) ++ ++2020-08-25: 4.5.72 ++ - Translated using Weblate (Persian) ++ - Translated using Weblate (Portuguese) ++ ++2020-07-29: 4.5.71 ++ - Translated using Weblate (French) ++ - Translated using Weblate (Galician) ++ - Translated using Weblate (Hindi) ++ - Translated using Weblate (Russian) ++ - Translated using Weblate (Ukrainian) ++ - Translated using Weblate (Spanish) ++ - Added translation using Weblate (Persian) ++ ++2020-06-15: 4.5.70 ++ - merge pr openSUSE/sw_20 ++ - add 'default' and 'https' install methods (bsc#1171018) ++ - adjust config file description ++ - add https dialog title ++ ++2020-05-27: 4.5.69 ++ - merge pr openSUSE/sw_10 ++ - add F8-shortcut for language selection (jsc#SLE-12810, jsc#SLE-12479) ++ - actual implementation of language switch ++ ++2020-04-14: 4.5.68 ++ - Translated using Weblate (Indonesian) ++ - Translated using Weblate (Swedish) ++ - Translated using Weblate (Thai) ++ ++2020-02-26: 4.5.67 ++ - Translated using Weblate (Spanish) ++ ++2020-02-11: 4.5.66 ++ - Translated using Weblate (Finnish) ++ ++2020-01-29: 4.5.65 ++ - Translated using Weblate (Finnish) ++ ++2020-01-16: 4.5.64 ++ - merge pr openSUSE/sw_10 ++ - rework font settings (bsc#1159874) ++ ++2019-12-10: 4.5.63 ++ - Translated using Weblate (German) ++ ++2019-12-09: 4.5.62 ++ - merge pr openSUSE/sw_09 ++ - prepare gfxboot for syslinux 6.x (jsc#SLE-2969) ++ - adjust gfxtest script to work with syslinux 6.x ++ ++2019-12-07: 4.5.61 ++ - Translated using Weblate (Chinese (China)) ++ ++2019-12-06: 4.5.60 ++ - Translated using Weblate (Czech) ++ - Translated using Weblate (Danish) ++ ++2019-12-05: 4.5.59 ++ - Translated using Weblate (German) ++ - Translated using Weblate (Portuguese (Brazil)) ++ - Translated using Weblate (Slovak) ++ ++2019-12-05: 4.5.58 ++ - Translated using Weblate (Catalan) ++ - Translated using Weblate (Japanese) ++ ++2019-12-05: 4.5.57 ++ - merge pr openSUSE/sw_08 ++ - rebuild font file to support latest language additions ++ - make more boot menu texts translatable ++ ++2019-12-04: 4.5.56 ++ - merge pr crayxt/master ++ - Add Kazakh translation. ++ - Add Kazakh language definition. ++ - Add Kazakh to the list of languages. ++ ++2019-11-05: 4.5.55 ++ - Translated using Weblate (Indonesian) ++ ++2019-10-29: 4.5.54 ++ - Translated using Weblate (Indonesian) ++ ++2019-10-23: 4.5.53 ++ - Translated using Weblate (Estonian) ++ ++2019-10-22: 4.5.52 ++ - Translated using Weblate (Spanish) ++ ++2019-08-17: 4.5.51 ++ - Translated using Weblate (Portuguese) ++ ++2019-04-05: 4.5.50 ++ - merge pr openSUSE/sw_04 ++ - fix SLES splash calculation (bsc#1129387) ++ ++2019-03-12: 4.5.49 ++ - merge pr joseivanlopez/remove_master-boot-code ++ - Replace master-bood-code by syslinux version ++ ++2019-02-05: 4.5.48 ++ - merge pr openSUSE/sw_03 ++ - ensure theme builds are reproducible (bsc#1124165) ++ - adjust unpack_bootlogo script ++ ++2018-09-10: 4.5.47 ++ - Translated using Weblate (Arabic) ++ ++2018-06-19: 4.5.46 ++ - merge pr openSUSE/sw_02 ++ - rework video mode list composition (bsc#1096971) ++ - remove obsolete qemu options from gfxboot script ++ ++2018-06-12: 4.5.45 ++ - merge pr openSUSE/sw_01 ++ - don't crash if vbe video mode list is empty (bsc#1096971) ++ - replace genisoimage with mkisofs ++ ++2018-04-27: 4.5.44 ++ - Translated using Weblate (Greek) ++ ++2018-04-27: 4.5.43 ++ - Translated using Weblate (Greek) ++ ++2018-04-27: 4.5.42 ++ - merge pr openSUSE/sw_02 ++ - enhance documentation ++ - add sample screenshots ++ - merge pr openSUSE/sw_03 ++ - update git2log script ++ ++2018-04-09: 4.5.41 ++ - Translated using Weblate (Catalan) ++ ++2018-04-03: 4.5.40 ++ - Translated using Weblate (Indonesian) ++ ++2018-03-24: 4.5.39 ++ - Translated using Weblate (Spanish) ++ ++2018-03-22: 4.5.38 ++ - Translated using Weblate (Portuguese) ++ ++2018-03-22: 4.5.37 ++ - Translated using Weblate (Portuguese) ++ ++2018-03-08: 4.5.36 ++ - Translated using Weblate (Galician) ++ ++2018-03-03: 4.5.35 ++ - Translated using Weblate (French) ++ - Translated using Weblate (Danish) ++ ++2018-02-26: 4.5.34 ++ - Translated using Weblate (Dutch) ++ ++2018-02-21: 4.5.33 ++ - Translated using Weblate (Dutch) ++ ++2018-02-21: 4.5.32 ++ - Translated using Weblate (Ukrainian) ++ ++2018-02-20: 4.5.31 ++ - Translated using Weblate (Finnish) ++ ++2018-02-20: 4.5.30 ++ - Translated using Weblate (Finnish) ++ ++2018-02-02: 4.5.29 ++ - Translated using Weblate (Indonesian) ++ ++2018-01-31: 4.5.28 ++ - Translated using Weblate (Danish) ++ ++2018-01-31: 4.5.27 ++ - Translated using Weblate (Catalan) ++ ++2018-01-28: 4.5.26 ++ - Translated using Weblate (Danish) ++ ++2018-01-26: 4.5.25 ++ - Translated using Weblate (Slovak) ++ - Translated using Weblate (Japanese) ++ ++2018-01-23: 4.5.24 ++ - merge pr openSUSE/sw_01 ++ - add config file entries to specify a title for the main screen ++ (bsc#1077188) ++ - fix bug processing serial menu entries (bsc#1075852) ++ ++2017-10-05: 4.5.23 ++ - merge pr openSUSE/bsc_1061383 ++ - fix linear framebuffer activation (bsc#1061383) ++ - add gfx mode number and framebuffer address to debug status ++ ++2017-09-12: 4.5.22 ++ - merge pr openSUSE/bsc_980570 ++ - prefer linear framebuffer modes for drawing (bsc#980570) ++ - bincode: Fix coreboot LFB mode ++ - color bits detection: add workaround for broken vbe info ++ - better fallback video mode selection ++ ++2017-05-09: 4.5.21 ++ - merge pr openSUSE/bsc_1033202 ++ - fix UK keyboard setting (bsc#1033202) ++ ++2016-11-23: 4.5.20 ++ - merge pr openSUSE/test_10 ++ - adjust keymap names to be consistent again (bsc#1009914) ++ - update git2log script ++ ++2016-11-07: 4.5.19 ++ - merge pr Davidmp1/patch-3 ++ - Update ca.po ++ ++2016-10-19: 4.5.18 ++ - merge pr embar-/patch-1 ++ - Update lt.po ++ - merge pr Davidmp1/patch-1 ++ - Update ca.po ++ ++2016-10-17: 4.5.17 ++ - merge pr openSUSE/bsc_780621 ++ - fix bug calculating video and xvideo options (bsc#780621) ++ ++2016-10-14: 4.5.16 ++ - merge pr openSUSE/test_9 ++ - updated sound samples ++ - updated texts that are run through espeak ++ - adjust to changed sox syntax ++ - re-rendered font ++ - ensure sound samples are loaded only once ++ - one more text to sample ++ - again updated sound samples ++ - use new functions to pass on video menu settings to bootloader ++ - adjust to new menu engine ++ - adjust to new menu engine ++ - rework video mode menu ++ - implement enhanced menu layout engine ++ ++2016-09-13: 4.5.15 ++ - merge pr ancorgs/new_keymaps ++ - Adapted to the new keymaps used by linuxrc and YaST ++ ++2016-08-08: 4.5.14 ++ - merge pr openSUSE/bsc_988392 ++ - fix boot-label redrawing after language change (bsc#988392) ++ ++2016-06-13: 4.5.13 ++ - merge pr openSUSE/trans_2016 ++ - make 'systemboot' and 'more' menu entries translatable ++ - updated translations ++ ++2015-12-04: 4.5.12 ++ - merge pr openSUSE/bsc_957893 ++ - fix booting from submenu (bsc#957893) ++ ++2015-11-12: 4.5.11 ++ - merge pr openSUSE/bsc_906990 ++ - implement support for sub-menues (bsc#906990) ++ - documented submenu syntax ++ - show submenu indicator in RTL layout ++ - on leaving a submenu, restore cursor position ++ ++2015-10-19: 4.5.10 ++ - update translations (bsc#950962) ++ ++2015-10-01: 4.5.9 ++ - implement LEAP boot splash ++ ++2015-09-29: 4.5.8 ++ - merge pr imobach/add-readme ++ - Add a basic README.md ++ ++2014-10-14: 4.5.7 ++ - updated git2log ++ - added 'archive' Makefile target ++ ++2014-10-02: 4.5.6 ++ - work around memory corruption issue seen on hyper-v (bnc#876640) ++ ++2014-09-17: 4.5.5 ++ - remove duplicate 'Default' from po file ++ - translation update ++ - translation update 2 ++ - recreated font to match latest translations ++ - fix compiler warning ++ ++2014-08-25: 4.5.4 ++ - added two more texts to pot file ++ ++2014-08-25: 4.5.3 ++ - adjust network dialog to latest linuxrc ++ - make 'Upgrade" translatable ++ ++2014-01-24: 4.5.2 ++ - set min video mode to 1024x576 ++ - hrvoje.senjan: use FT_SYNTHESIS_H macro ++ - fix compiler warning ++ ++2012-10-01: 4.5.1 ++ - start using 'default' video entry ++ ++2012-03-28: 4.5.0 ++ - rework monitor detection new video selection menu ++ - ddc test record ++ ++2011-10-13: 4.4.7 ++ - fix isohybrid detection ++ ++2011-10-13: 4.4.6 ++ - don't set init boot option (bnc#723678) ++ ++2011-09-02: 4.4.5 ++ - make systemd default ++ ++2011-09-02: 4.4.4 ++ - use isolinux-config from package ++ - add config option for default init program ++ ++2011-07-07: 4.4.3 ++ - update upstream theme ++ - added KDE theme ++ ++2011-07-07: 4.4.2 ++ - fix script in case we are on no branch ++ - added menu to select init variant (bnc#704417) ++ ++2011-04-18: 4.4.1 ++ - pass cwd via sysconfig ++ - pass back working dir as absolute path ++ - fix wrong mem access ++ - restore compat with syslinux 3 ++ ++2011-04-07: 4.4.0 ++ - rewrite chdir to work without bootloader chdir support ++ - set version to oS 11.5 ++ ++2011-02-24: 4.3.8 ++ - default to hd install with isohybrid boot from hd ++ ++2011-02-21: 4.3.7 ++ - new oS 11.4 branding ++ ++2011-01-13: 4.3.6 ++ - fix autoselection of emulator for "gfxboot -p" (bnc#661832) ++ - add qemu-kvm to the list auf autoselected emulators (bnc#661832) ++ - update virtual box support ++ ++2010-10-27: 4.3.5 ++ - avoid dialogs wider than screen ++ ++2010-10-04: 4.3.4 ++ - create VERSION and changelog from git repo ++ - remove VERSION ++ ++2010-10-04: 4.3.3 ++ - updated help text translations (bnc#551046) ++ ++2010-10-04: 4.3.2 ++ - updated translations (bnc#551046) ++ ++2010-09-03: 4.3.1 ++ - show real product name on serial console (bnc#634299) ++ - new tag ++ ++2010-08-05: 4.3.0 ++ - add 'lang' option if language has been changed [used to be: if != ++ en_US] (bnc#619983) ++ - keyboard label was not translatable (bnc#610638) ++ ++2010-07-05: 4.2.3 ++ - updated translations (bnc#619513) ++ ++2010-06-25: 4.2.2 ++ - updated translations ++ ++2010-05-31: 4.2.1 ++ - clear font flags when setting an undefined font (bnc#609755) ++ ++2010-05-20: 4.2.0 ++ - don't abuse bit 31 in font pointer (bnc#599478) ++ - turn on ints explicitly ++ - better memory dump ++ ++2010-05-19: 4.1.47 ++ - openSUSE 11.3 theme ++ ++2010-04-30: 4.1.46 ++ - strip gfxboot.com related parts from syslinux-3.86 patchset ++ - added Asturian (bnc#562202) ++ - fixed examples to work with latest gfxboot.c32 ++ - set valid tss for pm calls ++ - new version ++ ++2010-04-16: 4.1.44 ++ - fix help text formatting ++ ++2010-04-16: 4.1.43 ++ - reset progress bar status after error ++ ++2010-04-09: 4.1.42 ++ - add patches for syslinux 3.86 ++ - prefer gfxboot.c32 over gfxboot.com ++ ++2009-12-10: 4.1.41 ++ - leave more room for timeout indicator (bnc#551718) ++ - center main menu (bnc#562089) ++ ++2009-11-16: 4.1.40 ++ - syslinux patch: fix chdir() return value ++ ++2009-10-30: 4.1.39 ++ - updated translations (bnc#551046) ++ - updated help text translations ++ ++2009-10-29: 4.1.38 ++ - added --no-unpack option ++ - menu layout can be in high memory ++ - extend interface so it works with gfxboot.c32 ++ - add gfxboot.c32 patch ++ ++2009-10-19: 4.1.37 ++ - get kernel size right ++ - fix syslinux setup ++ - fix progress indicator for PXE boot ++ ++2009-10-19: 4.1.36 ++ - more examples ++ - more examples ++ - set correct timeout value ++ - set correct timeout value ++ - localboot should return to text mode ++ ++2009-10-15: 4.1.35 ++ - added some sample themes ++ - improved gfxtest script ++ - install examples ++ ++2009-10-15: 4.1.34 ++ - support pxe setup in test script ++ - added patches for syslinux 3.83 ++ ++2009-10-12: 4.1.33 ++ - updated speech samples ++ ++2009-10-12: 4.1.32 ++ - added swiss french keymap ++ ++2009-10-07: 4.1.31 ++ - added syslinux-3.82 patchset ++ - updated keyboard mapping list ++ - make keytable handling more consistent ++ - new keyboard mappings, new font ++ - the new maps ++ ++2009-10-02: 4.1.30 ++ - fix pot ++ ++2009-09-30: 4.1.29 ++ - log more data to allow easier font size adjustments ++ - new font ++ - cleaned up po files ++ - more flexible translation support ++ - livecd: add F4=kerneloptions ++ ++2009-09-29: 4.1.28 ++ - set default install type correctly (bnc#542781) ++ ++2009-09-28: 4.1.27 ++ - make new network dialog translatable ++ - updated language list ++ - fixed grub picture (bnc#542113) ++ ++2009-09-24: 4.1.26 ++ - escape weird chars in URLs ++ ++2009-09-18: 4.1.25 ++ - unified config file ++ - added memcheck option ++ - removed old config copies ++ - fixed evil bug ++ - F-key assignments configurable via gfxboot.cfg ++ ++2009-09-15: 4.1.24 ++ - added proxy setup (bnc#329668) ++ ++2009-09-14: 4.1.23 ++ - fix some nasm warnings ++ - up version number ++ - updated 11.2 openSUSE theme (bnc#538949) ++ - added network config dialog ++ diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..313389d --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,12 @@ +0001-asprintf.patch +0002-ctype.patch +0003-bdf.patch +0004-link-order.patch +0005-buildflags.patch +0006-syslinux-path.patch +0007-ttf-dejavu.patch +0008-adddir.patch +0009-gfxboot-pass-reproducible-and-owner-to-cpio.-Closes-.patch +0010-gfxboot-avoid-including-the-.-directory-in-the-cpio-.patch +0011-themes-example-Makefile-Set-time-on-files-in-example.patch +0012-changelog.upstream-Add-changelog-for-upstream-versio.patch -- cgit v1.2.3