Ticket #2900: blfs-unzip_zip-wi.patch

general.ent

@@ -215 +215 @@
 <!ENTITY fcron-version                "3.0.4">
 <!ENTITY hdparm-version               "9.6">
 <!ENTITY which-version                "2.20">
-<!ENTITY unzip-version                "5.52">
+<!ENTITY unzip-version                "6.0">
 <!ENTITY zip-version                  "3.0">
 <!ENTITY pciutils-version             "3.1.4">
 <!ENTITY usbutils-version             "0.84">

general/sysutils/zip.xml

@@ -33 +33 @@
     <para>The <application>Zip</application> package contains
     <application>Zip</application> utilities. These
     are useful for compressing files into <filename>ZIP</filename> archives.</para>
+    
+    &lfs65_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">

general/sysutils/unzip.xml

@@ -4 +4 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY unzip-download-http "&sourceforge-repo;/infozip/unzip552.tar.gz">
+  <!ENTITY unzip-download-http "&sourceforge-repo;/infozip/unzip60.tar.gz">
   <!-- <!ENTITY unzip-download-http "http://www.mirrorservice.org/sites/ftp.info-zip.org/pub/infozip/src/unzip552.tar.gz"> -->
   <!-- <!ENTITY unzip-download-ftp  "ftp://ftp.info-zip.org/pub/infozip/src/unzip552.tar.gz"> -->
-  <!ENTITY unzip-download-ftp  "ftp://tug.ctan.org/tex-archive/tools/zip/info-zip/src/unzip552.tar.gz">
-  <!ENTITY unzip-md5sum        "9d23919999d6eac9217d1f41472034a9">
+  <!ENTITY unzip-download-ftp  "ftp://tug.ctan.org/tex-archive/tools/zip/info-zip/src/unzip60.tar.gz">
+  <!ENTITY unzip-md5sum        "62b490407489521db863b523a7f86375">
   <!ENTITY unzip-size          "1.1 MB">
   <!ENTITY unzip-buildsize     "6.7 MB">
   <!ENTITY unzip-time          "Less than 0.1 SBU">
@@ -37 +37 @@
     <filename>ZIP</filename> archives are created with
     <application>PKZIP</application> or <application>Info-ZIP</application>
     utilities, primarily in a DOS environment.</para>
+    
+    &lfs65_checked;
 
     <caution>
       <para>The <application>UnZip</application> package has some locale
@@ -73 +75 @@
     <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>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/unzip-&unzip-version;-security_fix-2.patch"/></para>
-      </listitem>
-      <listitem>
         <para>Optional patch: <ulink
         url="&patch-root;/unzip-5.50-alt-iconv-v1.1.patch"/></para>
       </listitem>
@@ -91 +85 @@
 
   </sect2>
 
+  <!-- TODO: I have not checked if this issue still exists with Unzip 6.0. -->
   <sect2 id="unzip-locale-issues">
     <title>UnZip Locale Issues</title>
 
@@ -170 +165 @@
   <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>Install <application>UnZip</application> by running the following commands:</para>
 
-<screen><userinput>patch -Np1 -i ../unzip-&unzip-version;-security_fix-1.patch &amp;&amp;
-patch -Np1 -i ../unzip-&unzip-version;-security_fix-2.patch &amp;&amp;
-make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux</userinput></screen>
+<screen><userinput>make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>.</para>