Author: cjg
Date: Sat Oct  4 01:20:16 2014
New Revision: 14479

Log:
Merged more updates from trunk.

Modified:
   branches/systemd/general/genlib/libksba.xml
   branches/systemd/general/genutils/pinentry.xml
   branches/systemd/introduction/welcome/changelog.xml
   branches/systemd/networking/netlibs/neon.xml
   branches/systemd/packages.ent
   branches/systemd/postlfs/security/sudo.xml
   branches/systemd/x/installing/x7driver-wacom.xml
   branches/systemd/x/installing/xterm.xml

Modified: branches/systemd/general/genlib/libksba.xml
==============================================================================
--- branches/systemd/general/genlib/libksba.xml Fri Oct  3 23:07:15 2014        
(r14478)
+++ branches/systemd/general/genlib/libksba.xml Sat Oct  4 01:20:16 2014        
(r14479)
@@ -6,9 +6,9 @@
 
   <!ENTITY libksba-download-http " ">
   <!ENTITY libksba-download-ftp  
"ftp://ftp.gnupg.org/gcrypt/libksba/libksba-&libksba-version;.tar.bz2";>
-  <!ENTITY libksba-md5sum        "cd86fad9c9d360b2cf80449f8a4a4075">
-  <!ENTITY libksba-size          "616 KB">
-  <!ENTITY libksba-buildsize     "9.1 MB">
+  <!ENTITY libksba-md5sum        "9be95245fcfa9d56f56853078ef2650b">
+  <!ENTITY libksba-size          "588 KB">
+  <!ENTITY libksba-buildsize     "7.8 MB">
   <!ENTITY libksba-time          "0.1 SBU">
 ]>
 
@@ -65,6 +65,9 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="libgpg-error"/></para>
 
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="valgrind"/></para>
+
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/libksba"/></para>
 

Modified: branches/systemd/general/genutils/pinentry.xml
==============================================================================
--- branches/systemd/general/genutils/pinentry.xml      Fri Oct  3 23:07:15 
2014        (r14478)
+++ branches/systemd/general/genutils/pinentry.xml      Sat Oct  4 01:20:16 
2014        (r14479)
@@ -6,10 +6,10 @@
 
   <!ENTITY pinentry-download-http " ">
   <!ENTITY pinentry-download-ftp  
"ftp://ftp.gnupg.org/gcrypt/pinentry/pinentry-&pinentry-version;.tar.bz2";>
-  <!ENTITY pinentry-md5sum        "2ae681cbca0d9fb774b2c90b11ebf56c">
-  <!ENTITY pinentry-size          "424 KB">
-  <!ENTITY pinentry-buildsize     "12 MB">
-  <!ENTITY pinentry-time          "0.2 SBU">
+  <!ENTITY pinentry-md5sum        "e2b6f94471ba1e978f6e5bf6b275189b">
+  <!ENTITY pinentry-size          "508 KB">
+  <!ENTITY pinentry-buildsize     "10 MB">
+  <!ENTITY pinentry-time          "0.1 SBU">
 ]>
 
 <sect1 id="pinentry" xreflabel="PIN-Entry-&pinentry-version;">
@@ -81,10 +81,14 @@
   <sect2 role="installation">
     <title>Installation of PIN-Entry</title>
 
+    <para>If both <xref linkend="qt4"/> and <xref linkend="qt5"/> are
+    installed, use <command>source setqt4</command>, before starting.</para>
+
     <para>Install <application>PIN-Entry</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>sed -i 's:../../../s/pinentry/qt4/::' qt4/*.moc &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
 make</userinput></screen><!-- &amp;&amp;
 
 makeinfo - -html - -no-split -o doc/pinentry_nochunks.html doc/pinentry.texi 
&amp;&amp;
@@ -117,6 +121,15 @@
 
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>sed -i ... qt4/*.moc</command> Fix some header locations.
+    </para>
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
 
@@ -126,8 +139,8 @@
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>pinentry, pinentry-curses, pinentry-gtk, pinentry-gtk-2,
-        pinentry-qt, and pinentry-qt4</seg>
+        <seg>pinentry (symlink), pinentry-curses, pinentry-gtk-2,
+          pinentry-qt4, and pinentry-tty</seg>
         <seg>None</seg>
         <seg>None<!--/usr/share/doc/pinentry-&pinentry-version;--></seg>
       </seglistitem>
@@ -159,7 +172,7 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
+<!--
       <varlistentry id="pinentry-gtk">
         <term><command>pinentry-gtk</command></term>
         <listitem>
@@ -169,7 +182,7 @@
             <primary sortas="b-pinentry-gtk">pinentry-gtk</primary>
           </indexterm>
         </listitem>
-      </varlistentry>
+      </varlistentry>-->
 
       <varlistentry id="pinentry-gtk-2">
         <term><command>pinentry-gtk-2</command></term>
@@ -181,7 +194,7 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
+<!--
       <varlistentry id="pinentry-qt">
         <term><command>pinentry-qt</command></term>
         <listitem>
@@ -191,7 +204,7 @@
             <primary sortas="b-pinentry-qt">pinentry-qt</primary>
           </indexterm>
         </listitem>
-      </varlistentry>
+      </varlistentry>-->
 
       <varlistentry id="pinentry-qt4">
         <term><command>pinentry-qt4</command></term>
@@ -203,6 +216,17 @@
           </indexterm>
         </listitem>
       </varlistentry>
+
+      <varlistentry id="pinentry-tty">
+        <term><command>pinentry-tty</command></term>
+        <listitem>
+          <para> is a <application>tty</application>
+          <application>PIN-Entry</application> program.</para>
+          <indexterm zone="pinentry pinentry-tty">
+            <primary sortas="b-pinentry-tty">pinentry-tty</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
     </variablelist>
 

Modified: branches/systemd/introduction/welcome/changelog.xml
==============================================================================
--- branches/systemd/introduction/welcome/changelog.xml Fri Oct  3 23:07:15 
2014        (r14478)
+++ branches/systemd/introduction/welcome/changelog.xml Sat Oct  4 01:20:16 
2014        (r14479)
@@ -44,6 +44,44 @@
 
 -->
     <listitem>
+      <para>September 24th, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to libsoup-2.48.0. Fixes
+          <ulink url="&blfs-ticket-root;5561">#5561</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to xterm-311. Fixes
+          <ulink url="&blfs-ticket-root;5551">#5551</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to pinentry-0.8.4. Fixes
+          <ulink url="&blfs-ticket-root;5550">#5550</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to libksba-1.3.1. Fixes
+          <ulink url="&blfs-ticket-root;5548">#5548</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to xf86-input-wacom-0.26.0. Fixes
+          <ulink url="&blfs-ticket-root;5507">#5507</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to neon-0.30.1. Fixes
+          <ulink url="&blfs-ticket-root;5574">#5574</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to sudo-1.8.11. Fixes
+          <ulink url="&blfs-ticket-root;5572">#5572</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to stunnel-5.04.  Fixes
+          <ulink url="&blfs-ticket-root;5545">#5545</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>September 23rd, 2014</para>
       <itemizedlist>
         <listitem>

Modified: branches/systemd/networking/netlibs/neon.xml
==============================================================================
--- branches/systemd/networking/netlibs/neon.xml        Fri Oct  3 23:07:15 
2014        (r14478)
+++ branches/systemd/networking/netlibs/neon.xml        Sat Oct  4 01:20:16 
2014        (r14479)
@@ -6,10 +6,10 @@
 
   <!ENTITY neon-download-http 
"http://www.webdav.org/neon/neon-&neon-version;.tar.gz";>
   <!ENTITY neon-download-ftp  " ">
-  <!ENTITY neon-md5sum        "fb60b3a124eeec441937a812c456fd94">
+  <!ENTITY neon-md5sum        "231adebe5c2f78fded3e3df6e958878e">
   <!ENTITY neon-size          "892 KB">
-  <!ENTITY neon-buildsize     "28 MB">
-  <!ENTITY neon-time          "0.1 SBU">
+  <!ENTITY neon-buildsize     "7.9 MB (additional 18 MB for the tests)">
+  <!ENTITY neon-time          "0.1 SBU (additional 0.2 SBU for the tests)">
 ]>
 
 <sect1 id="neon" xreflabel="neon-&neon-version;">
@@ -80,10 +80,10 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <ulink url="http://code.google.com/p/libproxy/";>libproxy</ulink>,
+      <xref linkend="libxml2"/>,
       <xref linkend="mitkrb"/>,
-      <ulink url="http://www.manyfish.co.uk/pakchois/";>pakchois</ulink>, and
-      <xref linkend="libxml2"/>
+      <ulink url="http://code.google.com/p/libproxy/";>libproxy</ulink>, and
+      <ulink url="http://www.manyfish.co.uk/pakchois/";>pakchois</ulink>,
     </para>
 
     <para condition="html" role="usernotes">User Notes:

Modified: branches/systemd/packages.ent
==============================================================================
--- branches/systemd/packages.ent       Fri Oct  3 23:07:15 2014        (r14478)
+++ branches/systemd/packages.ent       Sat Oct  4 01:20:16 2014        (r14479)
@@ -35,7 +35,7 @@
 <!ENTITY shadow-version               "4.2.1">
 <!ENTITY ssh-askpass-version          "&openssh-version;">
 <!ENTITY stunnel-version              "5.03">
-<!ENTITY sudo-version                 "1.8.10p3">
+<!ENTITY sudo-version                 "1.8.11">
 <!ENTITY tripwire-version             "2.4.2.2">
 
 <!-- Chapter 5 -->
@@ -121,7 +121,7 @@
 <!ENTITY libical-version              "1.0">
 <!ENTITY libidn-version               "1.29">
 <!ENTITY libiodbc-version             "3.52.9">
-<!ENTITY libksba-version              "1.3.0">
+<!ENTITY libksba-version              "1.3.1">
 <!ENTITY liblinear-version            "1.94">
 <!ENTITY libpaper-version             "1.1.24+nmu3">
 <!ENTITY libsigc-version              "2.4.0">
@@ -194,7 +194,7 @@
 <!ENTITY imagemagick-version          "6.8.9">
 <!ENTITY intltool-version             "0.50.2">
 <!ENTITY lsof-version                 "4.87">
-<!ENTITY pinentry-version             "0.8.3">
+<!ENTITY pinentry-version             "0.8.4">
 <!ENTITY rarian-version               "0.8.1">
 <!ENTITY recode-version               "3.6">
 <!ENTITY rep-gtk-version              "0.90.8.1">
@@ -377,7 +377,7 @@
 <!ENTITY libproxy-version             "0.4.7">
 <!ENTITY libsoup-version              "2.48.0">
 <!ENTITY libtirpc-version             "0.2.5">
-<!ENTITY neon-version                 "0.30.0">
+<!ENTITY neon-version                 "0.30.1">
 <!ENTITY serf-version                 "1.3.7">
 
 <!-- Chapter 18 -->
@@ -441,7 +441,7 @@
 <!ENTITY xcb-util-wm-version          "0.4.1">
 <!ENTITY xorg-server-version          "1.16.0">
 <!ENTITY twm-version                  "1.0.8">
-<!ENTITY xterm-version                "310">
+<!ENTITY xterm-version                "311">
 <!ENTITY xclock-version               "1.0.7">
 <!ENTITY xinit-version                "1.3.3">
 

Modified: branches/systemd/postlfs/security/sudo.xml
==============================================================================
--- branches/systemd/postlfs/security/sudo.xml  Fri Oct  3 23:07:15 2014        
(r14478)
+++ branches/systemd/postlfs/security/sudo.xml  Sat Oct  4 01:20:16 2014        
(r14479)
@@ -6,10 +6,10 @@
 
   <!ENTITY sudo-download-http 
"http://www.sudo.ws/sudo/dist/sudo-&sudo-version;.tar.gz";>
   <!ENTITY sudo-download-ftp  
"ftp://ftp.sudo.ws/pub/sudo/sudo-&sudo-version;.tar.gz";>
-  <!ENTITY sudo-md5sum        "fcd8d0d9f9f0397d076ee901e242ed39">
-  <!ENTITY sudo-size          "2.2 MB">
-  <!ENTITY sudo-buildsize     "32 MB (additional 1 MB for tests)">
-  <!ENTITY sudo-time          "0.6 SBU">
+  <!ENTITY sudo-md5sum        "9a642cf6aca5375f8569a2961f44d0f3">
+  <!ENTITY sudo-size          "2.3 MB">
+  <!ENTITY sudo-buildsize     "24 MB (additional 2 MB for tests)">
+  <!ENTITY sudo-time          "0.5 SBU">
 ]>
 
 <sect1 id="sudo" xreflabel="Sudo-&sudo-version;">
@@ -77,14 +77,14 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <ulink url="http://www.openafs.org/";>AFS</ulink>,
-      <ulink url="http://www.fwtk.org/";>FWTK</ulink>,
       <xref linkend="linux-pam"/>,
       <xref linkend="mitkrb"/>,
-      an <xref linkend="server-mail"/> (that provides a
-      <command>sendmail</command> command),
       <xref linkend="openldap"/>,
-      <ulink url="http://sourceforge.net/projects/opie/files/";>Opie</ulink> and
+      <xref linkend="server-mail"/> (that provides a
+      <command>sendmail</command> command),
+      <ulink url="http://www.openafs.org/";>AFS</ulink>,
+      <ulink url="http://www.fwtk.org/";>FWTK</ulink>,
+      <ulink url="http://sourceforge.net/projects/opie/files/";>Opie</ulink>, 
and
       <ulink url="http://www.rsa.com/node.aspx?id=1156";>SecurID</ulink>
     </para>
 
@@ -111,7 +111,9 @@
 make</userinput></screen>
 
     <para>
-      To test the results, issue: <command>env LC_ALL=C make check</command>.
+      To test the results, issue: <command>env LC_ALL=C make check 2&gt;&amp;1
+      | tee ../make-check.log</command>. Check the results with <command>grep
+      failed ../make-check.log</command>.
     </para>
 
     <para>
@@ -261,13 +263,15 @@
           sudo, sudoedit (symlink), sudoreplay, and visudo
         </seg>
         <seg>
-          group_file.so, sudoers.so, sudo_noexec.so, and system_group.so
+          group_file.so, libsudo_util.so,
+          sudoers.so, sudo_noexec.so, and system_group.so
         </seg>
         <seg>
           /etc/sudoers.d,
+          /run/sudo,
           /usr/lib/sudo,
           /usr/share/doc/sudo-&sudo-version;, and
-          /var/{db,run}/sudo
+          /var/lib/sudo
         </seg>
       </seglistitem>
     </segmentedlist>

Modified: branches/systemd/x/installing/x7driver-wacom.xml
==============================================================================
--- branches/systemd/x/installing/x7driver-wacom.xml    Fri Oct  3 23:07:15 
2014        (r14478)
+++ branches/systemd/x/installing/x7driver-wacom.xml    Sat Oct  4 01:20:16 
2014        (r14479)
@@ -4,13 +4,13 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY xorg-wacom-driver-version "0.25.0">
+  <!ENTITY xorg-wacom-driver-version "0.26.0">
 
   <!ENTITY xorg-wacom-driver-download-http 
"&sourceforge-repo;/linuxwacom/xf86-input-wacom-&xorg-wacom-driver-version;.tar.bz2">
   <!ENTITY xorg-wacom-driver-download-ftp  " ">
-  <!ENTITY xorg-wacom-driver-md5sum        "2cf57400fbd9e35eb16b50ad9fe32de1">
+  <!ENTITY xorg-wacom-driver-md5sum        "707b14021b87622042d4c1533a41b97f">
   <!ENTITY xorg-wacom-driver-size          "576 KB">
-  <!ENTITY xorg-wacom-driver-buildsize     "8.2 MB (additional 2 MB for the 
tests)">
+  <!ENTITY xorg-wacom-driver-buildsize     "6.3 MB (additional 2.3 MB for the 
tests)">
   <!ENTITY xorg-wacom-driver-time          "0.1 SBU">
 ]>
 

Modified: branches/systemd/x/installing/xterm.xml
==============================================================================
--- branches/systemd/x/installing/xterm.xml     Fri Oct  3 23:07:15 2014        
(r14478)
+++ branches/systemd/x/installing/xterm.xml     Sat Oct  4 01:20:16 2014        
(r14479)
@@ -6,7 +6,7 @@
 
   <!ENTITY xterm-download-http " ">
   <!ENTITY xterm-download-ftp  
"ftp://invisible-island.net/xterm/xterm-&xterm-version;.tgz";>
-  <!ENTITY xterm-md5sum        "6bada32548b66a805e9c4475a6736b43">
+  <!ENTITY xterm-md5sum        "bba4f296724aca42adeb61399e7b2a08">
   <!ENTITY xterm-size          "1.2 MB">
   <!ENTITY xterm-buildsize     "12 MB">
   <!ENTITY xterm-time          "0.2 SBU">
-- 
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