Changeset 9a1c6a74

Timestamp:

06/17/2012 10:46:50 AM (12 years ago)

Author:

Andrew Benton <andy@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

3a35e94

Parents:

23b0f4fc

Message:

Run make-cert.pl with perl to avoid a Bad Interpreter error message if
/usr/bin/perl does not exist

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@10336 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• postlfs/security/cacerts.xml (modified) (6 diffs)
• xsoft/office/libreoffice.xml (modified) (5 diffs)

postlfs/security/cacerts.xml

@@ -99 +99 @@
 my $incert = 0;
 
-while ( <IN> ) 
+while ( <IN> )
 {
-    if ( /^CKA_VALUE MULTILINE_OCTAL/ ) 
+    if ( /^CKA_VALUE MULTILINE_OCTAL/ )
     {
         $incert = 1;
         open( OUT, "|openssl x509 -text -inform DER -fingerprint" )
             || die "could not pipe to openssl x509";
-    } 
-    
-    elsif ( /^END/ && $incert ) 
+    }
+
+    elsif ( /^END/ && $incert )
     {
         close( OUT );
         $incert = 0;
         print "\n\n";
-    } 
-    
-    elsif ($incert) 
+    }
+
+    elsif ($incert)
     {
         my @bs = split( /\\/ );
-        foreach my $b (@bs) 
+        foreach my $b (@bs)
         {
             chomp $b;
@@ -167 +167 @@
 TRUSTATTRIBUTES="CKA_TRUST_SERVER_AUTH"
 BUNDLE="BLFS-ca-bundle-${VERSION}.crt"
-CONVERTSCRIPT="make-cert.pl"
+CONVERTSCRIPT="/bin/make-cert.pl"
 SSLDIR="/etc/ssl"
 
@@ -203 +203 @@
     # Throw a meaningful error and remove the file
     cp "${tempfile}" tempfile.cer
-    "${CONVERTSCRIPT}" > tempfile.crt
+    perl ${CONVERTSCRIPT} > tempfile.crt
     keyhash=$(openssl x509 -noout -in tempfile.crt -hash)
     echo "Certificate ${keyhash} is not trusted!  Removing..."
@@ -214 +214 @@
 
   cp "${tempfile}" tempfile.cer
-  "${CONVERTSCRIPT}" > tempfile.crt
+  perl ${CONVERTSCRIPT} > tempfile.crt
   keyhash=$(openssl x509 -noout -in tempfile.crt -hash)
   mv tempfile.crt "certs/${keyhash}.pem"
@@ -362 +362 @@
         <term><command>make-cert.pl</command></term>
         <listitem>
-          <para>is a utility <application>perl</application> script that 
+          <para>is a utility <application>perl</application> script that
           converts a single binary certificate (.der format) into .pem format.</para>
           <indexterm zone="cacerts make-cert">
@@ -373 +373 @@
         <term><command>remove-expired-certs.sh</command></term>
         <listitem>
-          <para>is a utility <application>perl</application> script that 
+          <para>is a utility <application>perl</application> script that
           removes expired certificates from a directory.  The default
           directory is <filename class='directory'>/etc/ssl/certs</filename>.</para>

xsoft/office/libreoffice.xml

@@ -14 +14 @@
 ]>
 
-<sect1 id="libreoffice" xreflabel="libreoffice-&libreoffice-version;">
+<sect1 id="libreoffice" xreflabel="libreoffice-&libreoffice-version;.2">
   <?dbhtml filename="libreoffice.html"?>
 
@@ -268 +268 @@
 
     <para>
-      <option>--disable-odk</option>: This option disables installing the 
+      <option>--disable-odk</option>: This option disables installing the
       office development kit. Remove this option if you want to develop a
       <application>Libre Office</application> based application.
@@ -274 +274 @@
 
     <para>
-      <option>--with-system- ...</option>: These options prevent 
-      <application>Libre Office</application> trying to compile its own 
+      <option>--with-system- ...</option>: These options prevent
+      <application>Libre Office</application> trying to compile its own
       versions of these dependencies. If you've not installed
       some of the dependencies, remove the corresponding option.
@@ -282 +282 @@
     <para>
       <option>--with-num-cpus=$(getconf _NPROCESSORS_ONLN)</option>: This option
-      tells <application>Libre Office</application> to use all your CPUs to compile 
+      tells <application>Libre Office</application> to use all your CPUs to compile
       in parallel and speed up the build.
     </para>
@@ -340 +340 @@
       <command>gtk-update-icon-cache /usr/share/icons/hicolor</command>: This
       command rebuilds
-      <filename>/usr/share/icons/hicolor/icon-theme.cache</filename> to include 
+      <filename>/usr/share/icons/hicolor/icon-theme.cache</filename> to include
       the new icons.
     </para>