Package: syslinux
Version: 3:6.03+dfsg-8
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu wily ubuntu-patch
Dear Maintainer,
It looks like syslinux 6.03, especially when built with GCC 5, produces
unbootable binaries. We noticed this in Ubuntu; I've applied the cherry-picked
upstream patch attached which appears to solve the problem.
Thanks for considering the patch.
-- System Information:
Debian Release: jessie/sid
APT prefers wily-updates
APT policy: (500, 'wily-updates'), (500, 'wily-security'), (500, 'wily'),
(100, 'wily-backports'), (99, 'wily-proposed')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.1.0-3-generic (SMP w/4 CPU cores)
Locale: LANG=fr_CA.UTF-8, LC_CTYPE=fr_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru syslinux-6.03+dfsg/debian/patches/0001-SYSAPPEND-Fix-space-stripping.patch syslinux-6.03+dfsg/debian/patches/0001-SYSAPPEND-Fix-space-stripping.patch
--- syslinux-6.03+dfsg/debian/patches/0001-SYSAPPEND-Fix-space-stripping.patch 1970-01-01 01:00:00.000000000 +0100
+++ syslinux-6.03+dfsg/debian/patches/0001-SYSAPPEND-Fix-space-stripping.patch 2015-08-13 20:40:07.000000000 +0200
@@ -0,0 +1,58 @@
+From 3106dcd19061b4443c5beba4f0e09412e8d37fbe Mon Sep 17 00:00:00 2001
+From: Dany St-Amant <dany.ephemeral.2...@icloud.com>
+Date: Fri, 28 Nov 2014 13:48:32 -0500
+Subject: [PATCH] SYSAPPEND: Fix space stripping
+
+The description of SYSAPPEND for the DMI information states that the spaces
+are replaced by underscores, but this replacement does not occur in 6.03.
+
+Signed-off-by: Dany St-Amant <dany.ephemeral.2...@icloud.com>
+Signed-off-by: Gene Cumm <gene.c...@gmail.com>
+---
+ com32/elflink/ldlinux/readconfig.c | 2 +-
+ com32/menu/readconfig.c | 2 +-
+ core/sysappend.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/com32/elflink/ldlinux/readconfig.c b/com32/elflink/ldlinux/readconfig.c
+index 347f826..24f1cc9 100644
+--- a/com32/elflink/ldlinux/readconfig.c
++++ b/com32/elflink/ldlinux/readconfig.c
+@@ -330,7 +330,7 @@ static char *copy_sysappend_string(char *dst, const char *src)
+ char c;
+
+ while ((c = *src++)) {
+- if (c <= ' ' && c == '\x7f') {
++ if (c <= ' ' || c == '\x7f') {
+ if (!was_space)
+ *dst++ = '_';
+ was_space = true;
+diff --git a/com32/menu/readconfig.c b/com32/menu/readconfig.c
+index b7814be..257b042 100644
+--- a/com32/menu/readconfig.c
++++ b/com32/menu/readconfig.c
+@@ -299,7 +299,7 @@ static char *copy_sysappend_string(char *dst, const char *src)
+ char c;
+
+ while ((c = *src++)) {
+- if (c <= ' ' && c == '\x7f') {
++ if (c <= ' ' || c == '\x7f') {
+ if (!was_space)
+ *dst++ = '_';
+ was_space = true;
+diff --git a/core/sysappend.c b/core/sysappend.c
+index 5c3f650..758703e 100644
+--- a/core/sysappend.c
++++ b/core/sysappend.c
+@@ -35,7 +35,7 @@ static char *copy_and_mangle(char *dst, const char *src)
+ char c;
+
+ while ((c = *src++)) {
+- if (c <= ' ' && c == '\x7f') {
++ if (c <= ' ' || c == '\x7f') {
+ if (!was_space)
+ *dst++ = '_';
+ was_space = true;
+--
+2.5.0
+
diff -Nru syslinux-6.03+dfsg/debian/patches/series syslinux-6.03+dfsg/debian/patches/series
--- syslinux-6.03+dfsg/debian/patches/series 2015-04-07 07:24:26.000000000 +0200
+++ syslinux-6.03+dfsg/debian/patches/series 2015-08-13 20:46:07.000000000 +0200
@@ -4,3 +4,4 @@
0004-gnu-efi-git.patch
0005-load-linux-correct-type.patch
0006-load-linux-protected-mode.patch
+0001-SYSAPPEND-Fix-space-stripping.patch
