Hello community,
here is the log from the commit of package ghc-tar-conduit for openSUSE:Factory
checked in at 2017-06-22 10:39:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-tar-conduit (Old)
and /work/SRC/openSUSE:Factory/.ghc-tar-conduit.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-tar-conduit"
Thu Jun 22 10:39:13 2017 rev:2 rq:504109 version:0.1.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-tar-conduit/ghc-tar-conduit.changes
2017-04-12 18:09:18.988495786 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-tar-conduit.new/ghc-tar-conduit.changes
2017-06-22 10:39:14.287392072 +0200
@@ -1,0 +2,5 @@
+Thu Jun 8 11:08:27 UTC 2017 - psim...@suse.com
+
+- Update to version 0.1.1.
+
+-------------------------------------------------------------------
Old:
----
tar-conduit-0.1.0.tar.gz
New:
----
tar-conduit-0.1.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-tar-conduit.spec ++++++
--- /var/tmp/diff_new_pack.TtVc3X/_old 2017-06-22 10:39:14.923302419 +0200
+++ /var/tmp/diff_new_pack.TtVc3X/_new 2017-06-22 10:39:14.927301854 +0200
@@ -18,7 +18,7 @@
%global pkg_name tar-conduit
Name: ghc-%{pkg_name}
-Version: 0.1.0
+Version: 0.1.1
Release: 0
Summary: Parse tar files using conduit for streaming
License: MIT
++++++ tar-conduit-0.1.0.tar.gz -> tar-conduit-0.1.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tar-conduit-0.1.0/ChangeLog.md
new/tar-conduit-0.1.1/ChangeLog.md
--- old/tar-conduit-0.1.0/ChangeLog.md 2016-11-03 17:29:25.000000000 +0100
+++ new/tar-conduit-0.1.1/ChangeLog.md 2017-05-31 10:46:31.000000000 +0200
@@ -1,3 +1,7 @@
+## 0.1.1 - 2017-05-31
+
+ * Allow checksums to have leading spaces ([PR
8](https://github.com/snoyberg/tar-conduit/pull/8))
+
## 0.1.0 - 2016-11-03
* Initial release
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tar-conduit-0.1.0/src/Data/Conduit/Tar.hs
new/tar-conduit-0.1.1/src/Data/Conduit/Tar.hs
--- old/tar-conduit-0.1.0/src/Data/Conduit/Tar.hs 2016-11-03
13:48:48.000000000 +0100
+++ new/tar-conduit-0.1.1/src/Data/Conduit/Tar.hs 2017-05-31
10:44:12.000000000 +0200
@@ -1,4 +1,6 @@
{-# LANGUAGE BangPatterns #-}
+{-# LANGUAGE CPP #-}
+{-# LANGUAGE DeriveDataTypeable #-}
{-| This module is about stream-processing tar archives. It is currently
not very well tested. See the documentation of 'withEntries' for an usage
sample.
-}
@@ -33,6 +35,10 @@
import Data.ByteString.Short (ShortByteString, toShort, fromShort)
import Data.Monoid ((<>))
+#if !MIN_VERSION_base(4,8,0)
+import Control.Applicative ((<*))
+#endif
+
data Header = Header
{ headerOffset :: !Offset
, headerPayloadOffset :: !Offset
@@ -108,7 +114,7 @@
parseHeader offset bs = assert (S.length bs == 512) $ do
let checksumBytes = S.take 8 $ S.drop 148 bs
expectedChecksum = parseOctal checksumBytes
- actualChecksum = bsum bs - bsum checksumBytes + 8 * 0x20
+ actualChecksum = bsum bs - bsum checksumBytes + 8 * space
unless (actualChecksum == expectedChecksum) (Left (BadChecksum offset))
return Header
{ headerOffset = offset
@@ -137,7 +143,10 @@
parseOctal :: Integral i => ByteString -> i
parseOctal = S.foldl' (\t c -> t * 8 + fromIntegral (c - zero)) 0
. S.takeWhile (\c -> zero <= c && c <= seven)
+ . S.dropWhile (== space)
+ space :: Integral i => i
+ space = 0x20
zero = 48
seven = 55
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tar-conduit-0.1.0/tar-conduit.cabal
new/tar-conduit-0.1.1/tar-conduit.cabal
--- old/tar-conduit-0.1.0/tar-conduit.cabal 2016-11-03 17:34:29.000000000
+0100
+++ new/tar-conduit-0.1.1/tar-conduit.cabal 2017-05-31 10:44:35.000000000
+0200
@@ -1,5 +1,5 @@
name: tar-conduit
-version: 0.1.0
+version: 0.1.1
synopsis: Parse tar files using conduit for streaming
description: Please see README.md
homepage: https://github.com/snoyberg/tar-conduit#readme
