From 20fa6607978eea86a041910cf19083d073fd402d Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Fri, 18 Oct 2024 14:09:52 -0600
Subject: [PATCH 1/3] Patch ring to fix i686 build

---
 Cargo.lock | 3 +--
 Cargo.toml | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 835ec6593f..90314db5be 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1547,8 +1547,7 @@ dependencies = [
 [[package]]
 name = "ring"
 version = "0.17.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+source = "git+https://gitlab.redox-os.org/redox-os/ring.git?branch=redox-0.17.8#fce20f12b6aad164a1a7e13ae1dcb46422b171c0"
 dependencies = [
  "cc",
  "cfg-if 1.0.0",
diff --git a/Cargo.toml b/Cargo.toml
index 40a4513bcd..b9f59930aa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -49,3 +49,4 @@ uuid = { version = "1.4", features = ["v4"] }
 
 [patch.crates-io]
 cc-11 = { git = "https://github.com/tea/cc-rs", branch="riscv-abi-arch-fix", package = "cc" }
+ring = { git = "https://gitlab.redox-os.org/redox-os/ring.git", branch = "redox-0.17.8" }

From b3e90be70bebe3465689aefb3c5dd77a68e2cc9f Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Fri, 18 Oct 2024 14:11:24 -0600
Subject: [PATCH 2/3] Link to ring issue requiring patch

---
 Cargo.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Cargo.toml b/Cargo.toml
index b9f59930aa..da6c4d55eb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -49,4 +49,5 @@ uuid = { version = "1.4", features = ["v4"] }
 
 [patch.crates-io]
 cc-11 = { git = "https://github.com/tea/cc-rs", branch="riscv-abi-arch-fix", package = "cc" }
+# https://github.com/briansmith/ring/issues/1999
 ring = { git = "https://gitlab.redox-os.org/redox-os/ring.git", branch = "redox-0.17.8" }

From 0ee8e95f62599c4d0e217a7ab1be88d4bef6c70b Mon Sep 17 00:00:00 2001
From: Josh Megnauth <jo.sh@tutanota.com>
Date: Sun, 20 Oct 2024 02:23:04 -0400
Subject: [PATCH 3/3] fix: Invalid space in `/etc/hostname`

Spaces and newlines are invalid in hostnames. However, the base config inadvertently creates an `/etc/hostname` with a newline after "redox".

This can cause programs to fail.
---
 config/default.toml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/config/default.toml b/config/default.toml
index fef03c7b6e..5982898a10 100644
--- a/config/default.toml
+++ b/config/default.toml
@@ -141,9 +141,7 @@ data = "https://static.redox-os.org/pkg"
 
 [[files]]
 path = "/etc/hostname"
-data = """
-redox
-"""
+data = "redox"
 
 [[files]]
 path = "/etc/issue"