patches/musl/musl-000[34]-*: merged from upstream.

2 files changed, 116 insertions, 0 deletions

diff --git a/patches/musl/musl-0003-remove-inclusion-guard-hacks-for-sys-kd.h.patch b/patches/musl/musl-0003-remove-inclusion-guard-hacks-for-sys-kd.h.patch
new file mode 100644
index 00000000..c869b3b7
--- /dev/null
+++ b/patches/musl/musl-0003-remove-inclusion-guard-hacks-for-sys-kd.h.patch
@@ -0,0 +1,39 @@
+From 2fab90a71acd3698954c08b9062db67188443dd7 Mon Sep 17 00:00:00 2001
+From: midipix <writeonce@midipix.org>
+Date: Sat, 14 Jul 2018 22:49:06 -0400
+Subject: [PATCH 1/2] remove inclusion guard hacks for sys/kd.h
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+maintainer's note: at some point, probably long before linux separated
+the uapi headers, it was the case, or at least I believed it was the
+case, that linux/types.h was unsafe to include from userspace. thus,
+the inclusion guard macro _LINUX_TYPES_H was defined in sys/kd.h to
+prevent linux/kd.h from including linux/types.h (which it spuriously
+includes but does not use). as far as I can tell, whatever problem
+this was meant to solve does not seem to have been present for a long
+time, and the hack was not done correctly anyway, so removing it is
+the right thing to do.
+
+Signed-off-by: Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
+---
+ include/sys/kd.h | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/include/sys/kd.h b/include/sys/kd.h
+index 793fd59f..33b873f4 100644
+--- a/include/sys/kd.h
++++ b/include/sys/kd.h
+@@ -1,8 +1 @@
+-#ifndef _SYS_KD_H
+-#define _SYS_KD_H
+-
+-#define _LINUX_TYPES_H
+ #include <linux/kd.h>
+-#undef _LINUX_TYPES_H
+-
+-#endif
+-- 
+2.17.0
+
diff --git a/patches/musl/musl-0004-move-inclusion-of-linux-headers-for-kd.h-soundcard.h.patch b/patches/musl/musl-0004-move-inclusion-of-linux-headers-for-kd.h-soundcard.h.patch
new file mode 100644
index 00000000..4a0c2a02
--- /dev/null
+++ b/patches/musl/musl-0004-move-inclusion-of-linux-headers-for-kd.h-soundcard.h.patch
@@ -0,0 +1,77 @@
+From f2c6dbe2442027ed8fe0fa869918e41f495534d8 Mon Sep 17 00:00:00 2001
+From: midipix <writeonce@midipix.org>
+Date: Sat, 14 Jul 2018 22:51:22 -0400
+Subject: [PATCH 2/2] move inclusion of linux headers for kd.h, soundcard.h,
+ vt.h to bits
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+maintainer's note: while musl does not use the linux kernel headers,
+it does provide these three sys/* headers which do nothing but include
+the corresponding linux/* headers, since the sys/* versions are the
+ones documented for application use (and they arguably provide
+interfaces that are not linux-specific but common to other unices).
+these headers should probably not be provided by libc (rather by a
+separate package), but as long as they are, use the bits header
+framework as an aid to out-of-tree ports of musl for non-linux systems
+that want to implement them in some other way.
+
+Signed-off-by: Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
+---
+ arch/generic/bits/kd.h        | 1 +
+ arch/generic/bits/soundcard.h | 1 +
+ arch/generic/bits/vt.h        | 1 +
+ include/sys/kd.h              | 2 +-
+ include/sys/soundcard.h       | 2 +-
+ include/sys/vt.h              | 2 +-
+ 6 files changed, 6 insertions(+), 3 deletions(-)
+ create mode 100644 arch/generic/bits/kd.h
+ create mode 100644 arch/generic/bits/soundcard.h
+ create mode 100644 arch/generic/bits/vt.h
+
+diff --git a/arch/generic/bits/kd.h b/arch/generic/bits/kd.h
+new file mode 100644
+index 00000000..33b873f4
+--- /dev/null
++++ b/arch/generic/bits/kd.h
+@@ -0,0 +1 @@
++#include <linux/kd.h>
+diff --git a/arch/generic/bits/soundcard.h b/arch/generic/bits/soundcard.h
+new file mode 100644
+index 00000000..fade986f
+--- /dev/null
++++ b/arch/generic/bits/soundcard.h
+@@ -0,0 +1 @@
++#include <linux/soundcard.h>
+diff --git a/arch/generic/bits/vt.h b/arch/generic/bits/vt.h
+new file mode 100644
+index 00000000..834abfbc
+--- /dev/null
++++ b/arch/generic/bits/vt.h
+@@ -0,0 +1 @@
++#include <linux/vt.h>
+diff --git a/include/sys/kd.h b/include/sys/kd.h
+index 33b873f4..42122b9c 100644
+--- a/include/sys/kd.h
++++ b/include/sys/kd.h
+@@ -1 +1 @@
+-#include <linux/kd.h>
++#include <bits/kd.h>
+diff --git a/include/sys/soundcard.h b/include/sys/soundcard.h
+index fade986f..5ca77646 100644
+--- a/include/sys/soundcard.h
++++ b/include/sys/soundcard.h
+@@ -1 +1 @@
+-#include <linux/soundcard.h>
++#include <bits/soundcard.h>
+diff --git a/include/sys/vt.h b/include/sys/vt.h
+index 834abfbc..5000de49 100644
+--- a/include/sys/vt.h
++++ b/include/sys/vt.h
+@@ -1 +1 @@
+-#include <linux/vt.h>
++#include <bits/vt.h>
+-- 
+2.17.0
+