Author: dj
Date: Sat Dec 10 14:29:23 2016
New Revision: 18048

Log:
Update to make-ca.sh-20161210.

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/packages.ent
   trunk/BOOK/postlfs/security/cacerts.xml
   trunk/auxfiles/make-ca.sh

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent      Fri Dec  9 03:07:58 2016        (r18047)
+++ trunk/BOOK/general.ent      Sat Dec 10 14:29:23 2016        (r18048)
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "09">                   <!-- Always 2 digits -->
+<!ENTITY day          "10">                   <!-- Always 2 digits -->
 <!ENTITY month        "12">                   <!-- Always 2 digits -->
 <!ENTITY year         "2016">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "December 9th &year;">
+<!ENTITY releasedate  "December 10th &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development -->

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       Fri Dec  9 03:07:58 
2016        (r18047)
+++ trunk/BOOK/introduction/welcome/changelog.xml       Sat Dec 10 14:29:23 
2016        (r18048)
@@ -43,6 +43,17 @@
     </listitem>
 -->
     <listitem>
+      <para>December 10th, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Fix PKI directory creation in make-ca.sh-20161210 and
+          add message about --force switch when updating with same version
+          of certdata.txt.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>December 9th, 2016</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent     Fri Dec  9 03:07:58 2016        (r18047)
+++ trunk/BOOK/packages.ent     Sat Dec 10 14:29:23 2016        (r18048)
@@ -22,7 +22,7 @@
 <!ENTITY linux-pam-version            "1.3.0">
 <!ENTITY linux-pam-docs-version       "1.2.0">
 <!ENTITY libpwquality-version         "1.3.0">
-<!ENTITY make-ca-version              "20161126">
+<!ENTITY make-ca-version              "20161210">
 <!ENTITY mitkrb-major-version         "1.15">
 <!ENTITY mitkrb-version               "1.15">
 <!ENTITY nettle-version               "3.3">

Modified: trunk/BOOK/postlfs/security/cacerts.xml
==============================================================================
--- trunk/BOOK/postlfs/security/cacerts.xml     Fri Dec  9 03:07:58 2016        
(r18047)
+++ trunk/BOOK/postlfs/security/cacerts.xml     Sat Dec 10 14:29:23 2016        
(r18048)
@@ -13,7 +13,7 @@
 
   <!ENTITY make-ca-download      
"&sources-anduin-http;/other/make-ca.sh-&make-ca-version;">
   <!ENTITY make-ca-size          "11 KB">
-  <!ENTITY make-ca-md5sum        "fca9ae62242800a9dcaee5d400ee5c41">
+  <!ENTITY make-ca-md5sum        "5e41c17a3dd6b8195c55092e87e92ef0">
 ]>
 
 <sect1 id="cacerts" xreflabel="Certificate Authority Certificates">

Modified: trunk/auxfiles/make-ca.sh
==============================================================================
--- trunk/auxfiles/make-ca.sh   Fri Dec  9 03:07:58 2016        (r18047)
+++ trunk/auxfiles/make-ca.sh   Sat Dec 10 14:29:23 2016        (r18048)
@@ -9,6 +9,8 @@
 #
 # Changes:
 #
+# 20161210 - Fix creation of PKI dir when NSS not installed
+#          - Add message about --force swich when no update required
 # 20161126 - Add -D/--destdir switch
 # 20161124 - Add -f/--force switch to bypass version check
 #          - Add multiple switches to allow for alternate localtions
@@ -318,7 +320,7 @@
 fi
 
 if test "${OLDVERSION}x" == "${VERSION}x"; then
-  echo "No update required!"
+  echo "No update required! Use --force to update anyway."
   exit 0
 fi
 
@@ -553,7 +555,8 @@
 # Populate a duplicate anchor directory
 test -d "${DESTDIR}${ANCHORDIR}" && mv "${DESTDIR}${ANCHORDIR}" \
                                        "${DESTDIR}${ANCHORDIR}.old"
-cp -R "${DESTDIR}${CERTDIR}" "${DESTDIR}${ANCHORDIR}"
+install -vdm755 "${DESTDIR}${ANCHORDIR}"
+cp "${DESTDIR}${CERTDIR}"/*.pem "${DESTDIR}${ANCHORDIR}"
 rm -rf "${DESTDIR}${ANCHORDIR}.old"
 
 /usr/bin/c_rehash "${DESTDIR}${CERTDIR}" 2>&1>/dev/null
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to