Author: cjg
Date: Sat Oct 4 01:35:50 2014
New Revision: 14480
Log:
Merge more updates from trunk.
Modified:
branches/systemd/general.ent
branches/systemd/multimedia/cdwriteutils/simpleburn.xml
branches/systemd/networking/mailnews/procmail.xml
branches/systemd/packages.ent
branches/systemd/postlfs/security/stunnel-systemd.xml
Modified: branches/systemd/general.ent
==============================================================================
--- branches/systemd/general.ent Sat Oct 4 01:20:16 2014 (r14479)
+++ branches/systemd/general.ent Sat Oct 4 01:35:50 2014 (r14480)
@@ -1,12 +1,12 @@
<!-- $LastChangedBy$ $Date$ -->
-<!ENTITY day "03"> <!-- Always 2 digits -->
+<!ENTITY day "04"> <!-- Always 2 digits -->
<!ENTITY month "10"> <!-- Always 2 digits -->
<!ENTITY year "2014">
<!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS systemd Development Team">
<!ENTITY version "&year;-&month;-&day;">
-<!ENTITY releasedate "October 2nd, &year;">
+<!ENTITY releasedate "October 4th, &year;">
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
<!ENTITY blfs-version "systemd"> <!-- svn|[release #] -->
<!ENTITY lfs-version "systemd"> <!-- x.y|development] -->
Modified: branches/systemd/multimedia/cdwriteutils/simpleburn.xml
==============================================================================
--- branches/systemd/multimedia/cdwriteutils/simpleburn.xml Sat Oct 4
01:20:16 2014 (r14479)
+++ branches/systemd/multimedia/cdwriteutils/simpleburn.xml Sat Oct 4
01:35:50 2014 (r14480)
@@ -113,7 +113,9 @@
commands:
</para>
-<screen><userinput>mkdir build &&
+<screen><userinput>sed -i -e 's|DESTINATION doc|DESTINATION share/doc|'
CMakeLists.txt &&
+
+mkdir build &&
cd build &&
cmake -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
@@ -145,6 +147,11 @@
<title>Command Explanations</title>
<para>
+ <command>sed ...</command>: Ensure the documentation is installed
+ in /usr/share/doc.
+ </para>
+
+ <para>
<parameter>-DBURNING=LIBBURNIA</parameter>: This switch changes the
burning suite from the default cdrtools.
</para>
Modified: branches/systemd/networking/mailnews/procmail.xml
==============================================================================
--- branches/systemd/networking/mailnews/procmail.xml Sat Oct 4 01:20:16
2014 (r14479)
+++ branches/systemd/networking/mailnews/procmail.xml Sat Oct 4 01:35:50
2014 (r14480)
@@ -71,7 +71,7 @@
commands as the <systemitem class="username">root</systemitem> user:</para>
<screen role='root'><userinput>sed -i 's/getline/get_line/' src/*.[ch]
&&
-make LOCKINGTEST=/tmp install &&
+make LOCKINGTEST=/tmp MANDIR=/usr/share/man install &&
make install-suid</userinput></screen>
</sect2>
Modified: branches/systemd/packages.ent
==============================================================================
--- branches/systemd/packages.ent Sat Oct 4 01:20:16 2014 (r14479)
+++ branches/systemd/packages.ent Sat Oct 4 01:35:50 2014 (r14480)
@@ -34,7 +34,7 @@
<!ENTITY polkit-version "0.112">
<!ENTITY shadow-version "4.2.1">
<!ENTITY ssh-askpass-version "&openssh-version;">
-<!ENTITY stunnel-version "5.03">
+<!ENTITY stunnel-version "5.04">
<!ENTITY sudo-version "1.8.11">
<!ENTITY tripwire-version "2.4.2.2">
Modified: branches/systemd/postlfs/security/stunnel-systemd.xml
==============================================================================
--- branches/systemd/postlfs/security/stunnel-systemd.xml Sat Oct 4
01:20:16 2014 (r14479)
+++ branches/systemd/postlfs/security/stunnel-systemd.xml Sat Oct 4
01:35:50 2014 (r14480)
@@ -6,9 +6,9 @@
<!ENTITY stunnel-download-http
"http://mirrors.zerg.biz/stunnel/stunnel-&stunnel-version;.tar.gz">
<!ENTITY stunnel-download-ftp
"ftp://ftp.stunnel.org/stunnel/stunnel-&stunnel-version;.tar.gz">
- <!ENTITY stunnel-md5sum "ee43ef72038e0437400f712837cefee4">
+ <!ENTITY stunnel-md5sum "53ac78cedabb00ec09564cbd20eaa7c8">
<!ENTITY stunnel-size "580 KB">
- <!ENTITY stunnel-buildsize "5.7 MB">
+ <!ENTITY stunnel-buildsize "7.4 MB">
<!ENTITY stunnel-time "0.1 SBU">
]>
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page