Changeset 14ca05b for general/genutils/pinentry.xml

Timestamp:

01/27/2016 04:52:29 AM (8 years ago)

Author:

DJ Lucas <dj@…>

Branches:

systemd-13485

Children:

ef3f063

Parents:

cad6614

Message:

Merge from trunk Chapter 11.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@16850 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• general/genutils/pinentry.xml (modified) (10 diffs)

general/genutils/pinentry.xml

@@ -7 +7 @@
   <!ENTITY pinentry-download-http " ">
   <!ENTITY pinentry-download-ftp  "ftp://ftp.gnupg.org/gcrypt/pinentry/pinentry-&pinentry-version;.tar.bz2">
-  <!ENTITY pinentry-md5sum        "55439c4436b59573a29e144916ee5b61">
-  <!ENTITY pinentry-size          "504 KB">
-  <!ENTITY pinentry-buildsize     "6.3 MB">
-  <!ENTITY pinentry-time          "0.1 SBU">
+  <!ENTITY pinentry-md5sum        "9510b2de013e818dab619e468298703a">
+  <!ENTITY pinentry-size          "424 KB">
+  <!ENTITY pinentry-buildsize     "10 MB">
+  <!ENTITY pinentry-time          "less than 0.1 SBU">
 ]>
 
@@ -42 +42 @@
     toolkits.</para>
 
-    &lfs77_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -72 +72 @@
       <xref linkend="gcr"/>,
       <xref linkend="gtk2"/>,
-      <xref linkend="libsecret"/> and
-      <xref linkend="qt4"/>
+      <xref linkend="gtk3"/>,
+      <xref linkend="libcap-pam"/>,
+      <xref linkend="libsecret"/>,
+      <xref linkend="qt4"/>, and
+      <xref linkend="qt5"/>
     </para>
 
@@ -87 +90 @@
     commands:</para>
 
-<screen><userinput>sed -i 's:ncursesw/::' pinentry/pinentry-curses.c &amp;&amp;
-
-./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+
 make</userinput></screen><!-- &amp;&amp;
 
@@ -126 +128 @@
 
     <para>
-      <command>sed -i ... pinentry/pinentry-curses.c</command>: This
-      <command>sed</command> fixes detection of the
-      <application>Ncurses</application> headers.
+      <option>--disable-pinentry-qt5</option>: Default is enable. Don't use qt5
+      even if it is available. If qt4 is found, <command>pinentry-qt</command>
+      will be linked to qt4.
+    </para>
+
+    <para>
+      <option>--enable-pinentry-qt=yes/no</option>: Default is yes.
+    </para>
+
+    <para>
+      <option>--enable-pinentry-gtk2=yes/no</option>: Default is yes. Even if
+      other <command>pinentry-*</command> is installed,
+      <command>pinentry</command> will be a symlink to
+      <command>pinentry-gtk-2</command>.
+    </para>
+
+    <para>
+      <option>--enable-pinentry-gnome3=yes/no</option>: Default is yes.
+      Actually, it is the gtk3 pinentry.
     </para>
 
@@ -139 +157 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
         <seg>
-          pinentry (symlink), pinentry-curses, pinentry-gnome3,
-          pinentry-gtk-2, pinentry-qt4, and pinentry-tty
+          pinentry (symlink), pinentry-curses, pinentry-gnome3, pinentry-gtk-2,
+          pinentry-qt, and pinentry-tty
         </seg>
         <seg>None</seg>
@@ -170 +188 @@
         <term><command>pinentry-curses</command></term>
         <listitem>
-          <para>is an <application>Ncurses</application> text-based
-          <application>PIN-Entry</application> program.</para>
+          <para> is an <application>Ncurses</application> text-based
+          <application>PIN-Entry</application> helper program.</para>
           <indexterm zone="pinentry pinentry-curses">
             <primary sortas="b-pinentry-curses">pinentry-curses</primary>
@@ -192 +210 @@
         <term><command>pinentry-gtk-2</command></term>
         <listitem>
-          <para> is a <application>GTK+2</application> based
-          <application>PIN-Entry</application> program.</para>
+          <para> is a <application>GTK+2</application>
+          <application>PIN-Entry</application> program program.</para>
           <indexterm zone="pinentry pinentry-gtk-2">
             <primary sortas="b-pinentry-gtk-2">pinentry-gtk-2</primary>
@@ -200 +218 @@
       </varlistentry>
 
-      <varlistentry id="pinentry-qt4">
-        <term><command>pinentry-qt4</command></term>
-        <listitem>
-          <para> is a <application>Qt4</application> based
-          <application>PIN-Entry</application> program.</para>
-          <indexterm zone="pinentry pinentry-qt4">
-            <primary sortas="b-pinentry-qt4">pinentry-qt4</primary>
+      <varlistentry id="pinentry-qt">
+        <term><command>pinentry-qt</command></term>
+        <listitem>
+          <para> is a <application>Qt4 or 5</application>
+          <application>PIN-Entry</application> helper program.</para>
+          <indexterm zone="pinentry pinentry-qt">
+            <primary sortas="b-pinentry-qt">pinentry-qt</primary>
           </indexterm>
         </listitem>
@@ -214 +232 @@
         <term><command>pinentry-tty</command></term>
         <listitem>
-          <para> is a <application>tty</application> based
-          <application>PIN-Entry</application> program.</para>
+          <para> is a <application>tty</application>
+          <application>PIN-Entry</application> helper program.</para>
           <indexterm zone="pinentry pinentry-tty">
             <primary sortas="b-pinentry-tty">pinentry-tty</primary>