From 24e2a6f2f855a36a52719164a17cf15283ee0300 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre@linuxfromscratch.org>
Date: Fri, 26 Aug 2016 07:13:09 +0000
Subject: [PATCH] Fixes for BLFS porg: - add a special case for cacerts in
 packInstall.sh, so that a dummy version   is generated, otherwise porgball
 does not work as intended - do not quote out apostrophes in scripts, when
 generating configuration   instructions

---
 BLFS/xsl/scripts.xsl        | 3 ++-
 pkgmngt/packInstall.sh.porg | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/BLFS/xsl/scripts.xsl b/BLFS/xsl/scripts.xsl
index 46cbc51..6c8e08a 100644
--- a/BLFS/xsl/scripts.xsl
+++ b/BLFS/xsl/scripts.xsl
@@ -537,7 +537,8 @@ popd</xsl:text>
         </xsl:call-template>
       </xsl:when>
       <xsl:when test="contains($out-string,string($APOS))
-                      and $wrap-install = 'y'">
+                      and $wrap-install = 'y'
+                      and ancestor::sect2[@role='installation']">
         <xsl:call-template name="output-root">
           <xsl:with-param name="out-string"
                           select="substring-before($out-string,string($APOS))"/>
diff --git a/pkgmngt/packInstall.sh.porg b/pkgmngt/packInstall.sh.porg
index 3149f71..d48ae69 100644
--- a/pkgmngt/packInstall.sh.porg
+++ b/pkgmngt/packInstall.sh.porg
@@ -23,6 +23,7 @@ case $PCKGVRS in
   vim*|unzip*) local VERSION=$(echo $PCKGVRS | sed 's/^[^0-9]*\([0-9]\)\([0-9]\)/\1.\2/') ;;
   tidy*) local VERSION=$(echo $PCKGVRS | sed 's/^[^0-9]*\([0-9]*\)/\1cvs/') ;;
   docbook-xml) local VERSION=4.5 ;;
+  cacerts*) local VERSION=0.1 ;;
   *) local VERSION=$(echo ${PCKGVRS} | sed 's/^.*[-_]\([0-9]\)/\1/' |
                    sed 's/_/./g');;
 # the last sed above is because some package managers do not want a '_'
@@ -50,6 +51,7 @@ case $PCKGVRS in
   vim*|unzip*) local VERSION=$(echo $PCKGVRS | sed 's/^[^0-9]*\([0-9]\)\([0-9]\)/\1.\2/') ;;
   tidy*) local VERSION=$(echo $PCKGVRS | sed 's/^[^0-9]*\([0-9]*\)/\1cvs/') ;;
   docbook-xml) local VERSION=4.5 ;;
+  cacerts*) local VERSION=0.1 ;;
   *) local VERSION=$(echo ${PCKGVRS} | sed 's/^.*[-_]\([0-9]\)/\1/' |
                    sed 's/_/./g');;
 # the last sed above is because some package managers do not want a '_'