From 90f49b3dac820c25c3766aa31c6ae7c3fd3a0954 Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Thu, 11 Mar 2021 21:38:40 +0000
Subject: [PATCH] Fix segfault when urxvt shuts down.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@24355 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  4 ++--
 introduction/welcome/changelog.xml | 10 ++++++++++
 xsoft/other/rxvt-unicode.xml       | 12 +++++++++++-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/general.ent b/general.ent
index a9ea6d7b10..a283c39226 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "10">                   <!-- Always 2 digits -->
+<!ENTITY day          "11">                   <!-- Always 2 digits -->
 <!ENTITY month        "03">                   <!-- Always 2 digits -->
 <!ENTITY year         "2021">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "March 10th, &year;">
+<!ENTITY releasedate  "March 11th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development -->
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 4d6c7aa030..dfa4f967ae 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,16 @@
       </itemizedlist>
     </listitem>
     -->
+    <listitem>
+      <para>March 11th, 2021</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Prevent a (mostly harmless) segfault when a urxvt
+          term (from rxvt-unicode) shuts down.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>March 10th, 2021</para>
       <itemizedlist>
diff --git a/xsoft/other/rxvt-unicode.xml b/xsoft/other/rxvt-unicode.xml
index dba7d1f48c..92379608c1 100644
--- a/xsoft/other/rxvt-unicode.xml
+++ b/xsoft/other/rxvt-unicode.xml
@@ -109,7 +109,8 @@
       following commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr --enable-everything &amp;&amp;
+<screen><userinput>sed -i '/if (perl)/,+5d' src/rxvtperl.xs      &amp;&amp;
+./configure --prefix=/usr --enable-everything &amp;&amp;
 make</userinput></screen>
 
     <para>
@@ -127,6 +128,15 @@ make</userinput></screen>
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <para>
+      <command>sed -i '/if (perl)/,+5d' src/rxvtperl.xs</command>:
+      This prevents a segmentation fault when closing a urxvt terminal,
+      caused by deallocating a private environment copy before destructing
+      the perl interpreter which calls getenv().
+      <!--https://bugzilla.redhat.com/show_bug.cgi?id=1894917
+          http://lists.schmorp.de/pipermail/rxvt-unicode/2020q2/002583.html -->
+    </para>
+
     <para>
       <parameter>--enable-everything</parameter>: Add support for all
       non-multichoice options. Details about the different options can be