From 61f1d15932440b9036e815ca062ae0fcbafd8ef8 Mon Sep 17 00:00:00 2001
From: "Thomas Trepl (Moody)" <thomas@linuxfromscratch.org>
Date: Mon, 7 Feb 2022 21:24:22 +0100
Subject: [PATCH] Revert "Add glibc patch fixing the LC_MONETARY issue"

This reverts commit 2195c1e80003c6279007d84c9880fa74d085c6f5.
---
 chapter03/patches.xml | 8 --------
 chapter08/glibc.xml   | 4 ----
 patches.ent           | 6 ++++--
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index e2bff8ba3..d404035a2 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -84,14 +84,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Glibc Upstream Fixes Patch - <token>&glibc-upstream-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&glibc-upstream-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-upstream-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Kbd Backspace/Delete Fix Patch - <token>&kbd-backspace-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index 0b5245579..94e4d16bf 100644
--- a/chapter08/glibc.xml
+++ b/chapter08/glibc.xml
@@ -49,10 +49,6 @@
     <screen><userinput remap="pre">sed -e '/NOTIFY_REMOVED)/s/)/ \&amp;\&amp; data.attr != NULL)/' \
     -i sysdeps/unix/sysv/linux/mq_notify.c</userinput></screen>
 -->
-    <para>Fix some issues identified after release of Glibc-&glibc-version;:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&glibc-upstream-patch;</userinput></screen>
-    
     <para>Some of the Glibc programs use the non-FHS compliant
     <filename class="directory">/var/db</filename> directory to store
     their runtime data. Apply the following patch to make such programs
diff --git a/patches.ent b/patches.ent
index a7c176e6b..11e3e193b 100644
--- a/patches.ent
+++ b/patches.ent
@@ -48,9 +48,11 @@
 <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
 <!ENTITY glibc-fhs-patch-size "2.8 KB">
 
+<!--
 <!ENTITY glibc-upstream-patch "glibc-&glibc-version;-upstream_fixes-1.patch">
-<!ENTITY glibc-upstream-patch-md5 "e90369421c529583d08a93d20bb54509">
-<!ENTITY glibc-upstream-patch-size "11.6 KB">
+<!ENTITY glibc-upstream-patch-md5 "e602b6c3a332f4a06e2914e02ae2b295">
+<!ENTITY glibc-upstream-patch-size "16 KB">
+-->
 
 <!ENTITY kbd-backspace-patch "kbd-&kbd-version;-backspace-1.patch">
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">