Merge pull request #222 from pjf/221_ziplib

Bugfix to SharpZipLib.

CKAN/CKAN/CKAN.csproj

@@ -43,7 +43,7 @@
       <HintPath>..\packages\Newtonsoft.Json.6.0.5\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib">
-      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
+      <HintPath>..\packages\SharpZipLib.0.86.0-pjf-ckan_gh221\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
     <Reference Include="log4net">
       <HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>

CKAN/NetKAN/NetKAN.csproj

@@ -33,7 +33,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="ICSharpCode.SharpZipLib">
-      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
+      <HintPath>..\packages\SharpZipLib.0.86.0-pjf-ckan_gh221\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="Newtonsoft.Json">

CKAN/Tests/Tests.csproj

@@ -37,7 +37,7 @@
       <HintPath>..\packages\Newtonsoft.Json.6.0.5\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib">
-      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
+      <HintPath>..\packages\SharpZipLib.0.86.0-pjf-ckan_gh221\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
     <Reference Include="System.Transactions" />
   </ItemGroup>
@@ -56,6 +56,7 @@
     <Compile Include="NetKAN\KSMod.cs" />
     <Compile Include="NetKAN\GitHubTests.cs" />
     <Compile Include="CKAN\ModuleInstallDescriptor.cs" />
+    <Compile Include="ZipLib.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>

CKAN/Tests/ZipLib.cs

@@ -0,0 +1,32 @@
+using NUnit.Framework;
+using ICSharpCode.SharpZipLib.Zip;
+using System.IO;
+using System;
+
+namespace Tests
+{
+    [TestFixture()]
+    public class ZipLib
+    {
+        [Test()]
+        public void GH221()
+        {
+            // This is a perfectly fine file, written by 'file-roller', but
+            // SharpZipLib can choke on it because it's not properly handling
+            // the headers properly. See GH #221.
+            string file = Path.Combine(TestData.DataDir(), "gh221.zip");
+
+            var zipfile = new ZipFile(file);
+
+            var entry = zipfile.GetEntry("221.txt");
+
+            string version = string.Format("{0}", entry.Version);
+
+            Assert.DoesNotThrow(delegate
+            {
+                zipfile.GetInputStream(entry);
+            }, "zip-entry format {0} (788 is our bug)", version);
+        }
+    }
+}
+

CKAN/packages/SharpZipLib.0.86.0-pjf-ckan_gh221/README.md

@@ -0,0 +1,8 @@
+This is a patched copy of ZSharpLib which fixes the
+`ZipException: Version required to extract this entry not supported (788)`
+bug described [here](http://community.sharpdevelop.net/forums/t/21758.aspx).
+
+- Get [this branch](https://github.com/pjf/SharpZipLib/tree/ckan_gh221).
+- `cd SharpZipLib/src`
+- `xbuild /p:Configuration=Release ICSharpCode.SharpZLib.csproj`
+- Copy the build artefacts from `../bin`.