Updated to Stunnel-4.34

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@8773 af4574ff-66df-0310-9fd7-8a98e5e911e0

general.ent

@@ -106,7 +106,7 @@ $Date$
 <!ENTITY heimdal-version              "1.4">
 <!ENTITY mitkrb-version               "1.6">
 <!ENTITY cyrus-sasl-version           "2.1.23">
-<!ENTITY stunnel-version              "4.21">
+<!ENTITY stunnel-version              "4.34">
 <!ENTITY sudo-version                 "1.7.4p4">
 <!ENTITY nss-version                  "3.12.8">
 <!ENTITY policykit-version            "0.9">

introduction/welcome/changelog.xml

@@ -44,6 +44,9 @@
     <listitem>
       <para>January 4th, 2011</para>
       <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated to Stunnel-4.34.</para>
+        </listitem>
         <listitem>
           <para>[randy] - Removed the obsolete G-Wrap package.</para>
         </listitem>

postlfs/security/stunnel.xml

@@ -6,8 +6,8 @@
 
   <!ENTITY stunnel-download-http "http://www.stunnel.org/download/stunnel/src/stunnel-&stunnel-version;.tar.gz">
   <!ENTITY stunnel-download-ftp  "ftp://stunnel.mirt.net/stunnel/stunnel-&stunnel-version;.tar.gz">
-  <!ENTITY stunnel-md5sum        "1eaec5228979beca4d548f453304e311">
+  <!ENTITY stunnel-md5sum        "bbd274e8364ea3ceca0ee5190e13edd1">
-  <!ENTITY stunnel-size          "528 KB">
+  <!ENTITY stunnel-size          "526 KB">
   <!ENTITY stunnel-buildsize     "5 MB">
   <!ENTITY stunnel-time          "0.1 SBU">
 ]>
@@ -60,13 +60,13 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <!-- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
         <para>Required patch: <ulink
         url="&patch-root;/stunnel-&stunnel-version;-setuid-1.patch"/></para>
       </listitem>
-    </itemizedlist>
+    </itemizedlist> -->
 
     <bridgehead renderas="sect3">Stunnel Dependencies</bridgehead>
 
@@ -104,25 +104,24 @@ useradd -c "Stunnel Daemon" -d /var/lib/stunnel \
       <filename class='extension'>.pem</filename> file must be formatted as
       shown below:</para>
 
-<screen><literal>-----BEGIN RSA PRIVATE KEY-----
+<screen><literal>-----BEGIN PRIVATE KEY-----
-<replaceable>&lt;many encrypted lines of unencrypted key&gt;</replaceable>
+<replaceable>&lt;many encrypted lines of private key&gt;</replaceable>
------END RSA PRIVATE KEY-----
+-----END PRIVATE KEY-----
 -----BEGIN CERTIFICATE-----
 <replaceable>&lt;many encrypted lines of certificate&gt;</replaceable>
------END CERTIFICATE-----</literal></screen>
+-----END CERTIFICATE-----
+-----BEGIN DH PARAMETERS-----
+<replaceable>&lt;encrypted lines of dh parms&gt;</replaceable>
+-----END DH PARAMETERS-----</literal></screen>
     </note>
 
     <para>Install <application>Stunnel</application> by running the following
     commands:</para>
 
-<screen><userinput>patch -Np1 -i ../stunnel-&stunnel-version;-setuid-1.patch &amp;&amp;
+<screen><userinput>sed -i 's|nogroup|stunnel|g' configure &amp;&amp;
-
-sed -i 's|nogroup|stunnel|g' configure &amp;&amp;
-sed -i 's|$(prefix)/var/lib|$(localstatedir)|' tools/Makefile.in &amp;&amp;
-
 ./configure --prefix=/usr \
             --sysconfdir=/etc \
-            --localstatedir=/var/lib \
+            --localstatedir=/var \
             --disable-libwrap &amp;&amp;
 make</userinput></screen>
 
@@ -143,16 +142,11 @@ make</userinput></screen>
     <systemitem class="groupname">nogroup</systemitem> to
     <systemitem class="groupname">stunnel</systemitem>.</para>
 
-    <para><command>sed -i '...' tools/Makefile.in</command>: This command
-    ensures that the chroot jail will be located in
-    <filename class='directory'>/var/lib/stunnel</filename> instead of
-    <filename class='directory'>/usr/var/lib/stunnel</filename>.</para>
-
     <para><parameter>--sysconfdir=/etc</parameter>: This parameter forces
     the configuration directory to <filename class='directory'>/etc</filename>
     instead of <filename class='directory'>/usr/etc</filename>.</para>
 
-    <para><parameter>--localstatedir=/var/lib</parameter>: This parameter
+    <para><parameter>--localstatedir=/var</parameter>: This parameter
     sets the installation to use
     <filename class='directory'>/var/lib/stunnel</filename> instead of
     creating and using
@@ -211,7 +205,8 @@ pid    = /run/stunnel.pid
 chroot = /var/lib/stunnel
 client = no
 setuid = stunnel
-setgid = stunnel</literal>
+setgid = stunnel
+cert   = /etc/stunnel/stunnel.pem</literal>
 
 EOF
 chmod -v 644 /etc/stunnel/stunnel.conf</userinput></screen>