security

via blfs-book Sun, 15 Jan 2017 09:35:15 -0800

Author: dj
Date: Sun Jan 15 09:34:58 2017
New Revision: 18187

Log:
Revert previous commit


Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/prog/cmake.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/kde/extra-cmake-modules.xml
   trunk/BOOK/kde/libdbusmenuqt.xml
   trunk/BOOK/kde/phonon-backend-gstreamer.xml
   trunk/BOOK/kde/phonon-backend-vlc.xml
   trunk/BOOK/kde/phonon.xml
   trunk/BOOK/kde/polkit-qt.xml
   trunk/BOOK/postlfs/security/gpgme.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent      Sun Jan 15 09:33:23 2017        (r18186)
+++ trunk/BOOK/general.ent      Sun Jan 15 09:34:58 2017        (r18187)
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "15">                   <!-- Always 2 digits -->
+<!ENTITY day          "14">                   <!-- Always 2 digits -->
 <!ENTITY month        "01">                   <!-- Always 2 digits -->
 <!ENTITY year         "2017">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "January 15th &year;">
+<!ENTITY releasedate  "January 14th &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/general/prog/cmake.xml
==============================================================================
--- trunk/BOOK/general/prog/cmake.xml   Sun Jan 15 09:33:23 2017        (r18186)
+++ trunk/BOOK/general/prog/cmake.xml   Sun Jan 15 09:34:58 2017        (r18187)
@@ -151,14 +151,14 @@
     <title>Command Explanations</title>
 
     <para>
-      <command>sed -i '/CMAKE_USE_LIBUV 1/s/1/0/' CMakeLists.txt</command>:
-      This command disables the attempt to use the external libuv library.
+      <command>sed ... CMakeLists.txt</command>: This command
+      disables the attempt to use the external libuv library.
     </para>
 
     <para>
-      <command>sed -i '/"lib64"/s/64//' 
Modules/GNUInstallDirs.cmake</command>: 
+      <command>sed ... Modules/GNUInstallDirs.cmake</command>: 
       This command disables applications using cmake from attempting to 
-      install files in a subdirectory named lib64 rather than lib.
+      install files in /usr/lib64/.
     </para>
 
     <para>

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       Sun Jan 15 09:33:23 
2017        (r18186)
+++ trunk/BOOK/introduction/welcome/changelog.xml       Sun Jan 15 09:34:58 
2017        (r18187)
@@ -43,16 +43,6 @@
     </listitem>
 -->
     <listitem>
-      <para>January 15th, 2016</para>
-      <itemizedlist>
-        <listitem>
-          <para>[dj] - Fixed release issue with gpgme-1.8.0 that affects
-          kwallet.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
       <para>January 14th, 2016</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/kde/extra-cmake-modules.xml
==============================================================================
--- trunk/BOOK/kde/extra-cmake-modules.xml      Sun Jan 15 09:33:23 2017        
(r18186)
+++ trunk/BOOK/kde/extra-cmake-modules.xml      Sun Jan 15 09:34:58 2017        
(r18187)
@@ -96,9 +96,7 @@
       commands:
     </para>
 
-<screen><userinput>sed -i '/"lib64"/s/64//' kde-modules/KDEInstallDirs.cmake 
&amp;&amp;
-
-mkdir build &amp;&amp;
+<screen><userinput>mkdir build &amp;&amp;
 cd    build &amp;&amp;
 
 cmake -DCMAKE_INSTALL_PREFIX=/usr .. &amp;&amp;
@@ -121,17 +119,6 @@
 
   </sect2>
 
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i '/"lib64"/s/64//' 
kde-modules/KDEInstallDirs.cmake</command>:
-      This command disables applications using cmake from attempting to
-      install files in a subdirectory named lib64 rather than lib.
-    </para>
-
-  </sect2>
-
   <sect2 role="content">
     <title>Contents</title>
 

Modified: trunk/BOOK/kde/libdbusmenuqt.xml
==============================================================================
--- trunk/BOOK/kde/libdbusmenuqt.xml    Sun Jan 15 09:33:23 2017        (r18186)
+++ trunk/BOOK/kde/libdbusmenuqt.xml    Sun Jan 15 09:34:58 2017        (r18187)
@@ -83,6 +83,7 @@
 cd    build &amp;&amp;
 
 cmake -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_INSTALL_LIBDIR=lib  \
       -DCMAKE_BUILD_TYPE=Release  \
       -DWITH_DOC=OFF              \
       -Wno-dev .. &amp;&amp;

Modified: trunk/BOOK/kde/phonon-backend-gstreamer.xml
==============================================================================
--- trunk/BOOK/kde/phonon-backend-gstreamer.xml Sun Jan 15 09:33:23 2017        
(r18186)
+++ trunk/BOOK/kde/phonon-backend-gstreamer.xml Sun Jan 15 09:34:58 2017        
(r18187)
@@ -93,6 +93,7 @@
 cd    build &amp;&amp;
 
 cmake -DCMAKE_INSTALL_PREFIX=/usr    \
+      -DCMAKE_INSTALL_LIBDIR=lib     \
       -DCMAKE_BUILD_TYPE=Release     \
       -DPHONON_BUILD_PHONON4QT5=ON   \
       -Wno-dev .. &amp;&amp;

Modified: trunk/BOOK/kde/phonon-backend-vlc.xml
==============================================================================
--- trunk/BOOK/kde/phonon-backend-vlc.xml       Sun Jan 15 09:33:23 2017        
(r18186)
+++ trunk/BOOK/kde/phonon-backend-vlc.xml       Sun Jan 15 09:34:58 2017        
(r18187)
@@ -86,6 +86,7 @@
 cd    build &amp;&amp;
 
 cmake -DCMAKE_INSTALL_PREFIX=/usr    \
+      -DCMAKE_INSTALL_LIBDIR=lib     \
       -DCMAKE_BUILD_TYPE=Release     \
       -DPHONON_BUILD_PHONON4QT5=ON   \
       -Wno-dev .. &amp;&amp;

Modified: trunk/BOOK/kde/phonon.xml
==============================================================================
--- trunk/BOOK/kde/phonon.xml   Sun Jan 15 09:33:23 2017        (r18186)
+++ trunk/BOOK/kde/phonon.xml   Sun Jan 15 09:34:58 2017        (r18187)
@@ -87,6 +87,7 @@
 
 cmake -DCMAKE_INSTALL_PREFIX=/usr    \
       -DCMAKE_BUILD_TYPE=Release     \
+      -DCMAKE_INSTALL_LIBDIR=lib     \
       -DPHONON_BUILD_PHONON4QT5=ON   \
       -Wno-dev .. &amp;&amp;
 make</userinput></screen>

Modified: trunk/BOOK/kde/polkit-qt.xml
==============================================================================
--- trunk/BOOK/kde/polkit-qt.xml        Sun Jan 15 09:33:23 2017        (r18186)
+++ trunk/BOOK/kde/polkit-qt.xml        Sun Jan 15 09:34:58 2017        (r18187)
@@ -81,6 +81,7 @@
 
 cmake -DCMAKE_INSTALL_PREFIX=/usr \
       -DCMAKE_BUILD_TYPE=Release  \
+      -DCMAKE_INSTALL_LIBDIR=lib  \
       -Wno-dev .. &amp;&amp;
 make</userinput></screen>
 

Modified: trunk/BOOK/postlfs/security/gpgme.xml
==============================================================================
--- trunk/BOOK/postlfs/security/gpgme.xml       Sun Jan 15 09:33:23 2017        
(r18186)
+++ trunk/BOOK/postlfs/security/gpgme.xml       Sun Jan 15 09:34:58 2017        
(r18187)
@@ -102,12 +102,6 @@
     <title>Installation of GPGME</title>
 
     <para>
-      Fix a minor release error:
-    </para>
-
-<screen><userinput>sed 's#@libsuffix@#.so#' -i 
lang/cpp/src/GpgmeppConfig.cmake.in.in</userinput></screen>
-
-    <para>
       Install <application>GPGME</application> by running the following
       commands:
     </para>
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

[blfs-book] r18187 - in trunk/BOOK: . general/prog introduction/welcome kde postlfs/security

Reply via email to