To fix the testsuite for perl module Archive::Zip, patch unzip to use bzip2.

The patch also includes a LOT of security fixes from 2014 onwards,
and should fix locale issues.

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

general/prog/perl-modules/perl-archive-zip.xml

@@ -43,6 +43,11 @@
 
       <bridgehead renderas="sect4">Archive::Zip Dependencies</bridgehead>
 
+      <bridgehead renderas="sect5">Recommended (for the testsuite)</bridgehead>
+      <para role="required">
+        <xref linkend="unzip"/> (with its patch)
+      </para>
+
       <bridgehead renderas="sect5">Optional</bridgehead>
       <para role="optional">
         <xref linkend="perl-test-mockmodule"/>

general/sysutils/unzip.xml

@@ -72,24 +72,15 @@
         <para>Estimated build time: &unzip-time;</para>
       </listitem>
     </itemizedlist>
-<!--
+
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'> -->
-      <!-- <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/unzip-&unzip-version;-security_fix-1.patch"/></para>
-      </listitem>
+    <itemizedlist spacing='compact'>
       <listitem>
         <para>Required patch: <ulink
-        url="&patch-root;/unzip-&unzip-version;-security_fix-2.patch"/></para>
-      </listitem> -->
-      <!--
-      <listitem>
-        <para>Optional patch (will not apply properly): <ulink
-        url="&patch-root;/unzip-5.50-alt-iconv-v1.1.patch"/></para>
+        url="&patch-root;/unzip-&unzip-version;-consolidated_fixes-1.patch"/></para>
       </listitem>
     </itemizedlist>
-    -->
+
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/unzip"/></para>
 
@@ -107,6 +98,10 @@
       characters in the file's name.</para>
     </note>
 
+    <para>These issues are thought to be fixed in the patch. But since none
+    of the editors have data to test this, the following workarounds are
+    retained in case they might still be needed.</para>
+
     <para>The <application>UnZip</application> package assumes that filenames
     stored in the ZIP archives created on non-Unix systems are encoded in
     CP850, and that they should be converted to ISO-8859-1 when writing files
@@ -166,13 +161,19 @@
   <sect2 role="installation">
     <title>Installation of UnZip</title>
 
-    <!-- <para>Note that if you applied the patch described above for locale issues,
-    the first required security patch will have some offsets.  Now install
-    <application>UnZip</application> by running the following commands:</para> -->
+    <para>
+      First apply the patch:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../unzip-&unzip-version;-consolidated_fixes-1.patch</userinput></screen>
+
+    <para>
+      Now compile the package:
+    </para>
 
 <screen><userinput>make -f unix/Makefile generic</userinput></screen>
 
-    <para>The test suite does not work for present target <quote>generic</quote>.</para>
+    <para>The test suite does not work for target <quote>generic</quote>.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 

introduction/welcome/changelog.xml

@@ -44,6 +44,11 @@
     <listitem>
       <para>December 3rd, 2019</para>
       <itemizedlist>
+        <listitem>
+          <para>[ken] - Apply security and other fixes to unzip-6.0, this
+          also allows the testsuite for Archive::Zip-1.67 to pass. Fixes
+          <ulink url="&blfs-ticket-root;12840">#12840</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[ken] - Adjust inkscape to build with poppler-0.83.0. Fixes
           <ulink url="&blfs-ticket-root;12858">#12858</ulink>.</para>