[blfs-book] r10336 - in trunk/BOOK: postlfs/security xsoft/office

andy at linuxfromscratch.org andy at linuxfromscratch.org
Sun Jun 17 03:46:57 PDT 2012


Author: andy
Date: 2012-06-17 04:46:50 -0600 (Sun, 17 Jun 2012)
New Revision: 10336

Modified:
   trunk/BOOK/postlfs/security/cacerts.xml
   trunk/BOOK/xsoft/office/libreoffice.xml
Log:
Run make-cert.pl with perl to avoid a Bad Interpreter error message if
/usr/bin/perl does not exist

Modified: trunk/BOOK/postlfs/security/cacerts.xml
===================================================================
--- trunk/BOOK/postlfs/security/cacerts.xml	2012-06-17 08:47:26 UTC (rev 10335)
+++ trunk/BOOK/postlfs/security/cacerts.xml	2012-06-17 10:46:50 UTC (rev 10336)
@@ -98,26 +98,26 @@
 
 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;
             printf( OUT "%c", oct($b) ) unless $b eq '';
@@ -166,7 +166,7 @@
 TEMPDIR=$(mktemp -d)
 TRUSTATTRIBUTES="CKA_TRUST_SERVER_AUTH"
 BUNDLE="BLFS-ca-bundle-${VERSION}.crt"
-CONVERTSCRIPT="make-cert.pl"
+CONVERTSCRIPT="/bin/make-cert.pl"
 SSLDIR="/etc/ssl"
 
 mkdir "${TEMPDIR}/certs"
@@ -202,7 +202,7 @@
   if test "${?}" = "0"; then
     # 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..."
     rm -f tempfile.cer tempfile.crt "${tempfile}"
@@ -213,7 +213,7 @@
   # Find the cert data and generate a cert file for it
 
   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"
   rm -f tempfile.cer "${tempfile}"
@@ -361,7 +361,7 @@
       <varlistentry id="make-cert">
         <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">
             <primary sortas="b-make-cert">make-cert</primary>
@@ -372,7 +372,7 @@
       <varlistentry id="remove-expired-certs">
         <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>
           <indexterm zone="cacerts remove-expired-certs">

Modified: trunk/BOOK/xsoft/office/libreoffice.xml
===================================================================
--- trunk/BOOK/xsoft/office/libreoffice.xml	2012-06-17 08:47:26 UTC (rev 10335)
+++ trunk/BOOK/xsoft/office/libreoffice.xml	2012-06-17 10:46:50 UTC (rev 10336)
@@ -13,7 +13,7 @@
   <!ENTITY libreoffice-time               "121 SBU">
 ]>
 
-<sect1 id="libreoffice" xreflabel="libreoffice-&libreoffice-version;">
+<sect1 id="libreoffice" xreflabel="libreoffice-&libreoffice-version;.2">
   <?dbhtml filename="libreoffice.html"?>
 
   <sect1info>
@@ -267,21 +267,21 @@
     </para>
 
     <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.
     </para>
 
     <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.
     </para>
 
     <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>
 
@@ -339,7 +339,7 @@
     <para>
       <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>
   </sect2>




More information about the blfs-book mailing list