[Pkg-haskell-commits] darcs: haskell-openpgp: Initial Check-In

Clint Adams clint at debian.org
Wed Sep 12 01:59:14 UTC 2012


Wed Sep 12 02:00:20 UTC 2012  Clint Adams <clint at debian.org>
  * Initial Check-In
  Ignore-this: eb20c79029a73649c8562073fe63fbc6

    A ./changelog
    A ./compat
    A ./control
    A ./copyright
    A ./patches/
    A ./patches/0001-Better-bit-counting.-Handle-the-bitlength-of-0.patch
    A ./patches/disable-missing-test.diff
    A ./patches/series
    A ./rules
    A ./source/
    A ./source/format
    A ./watch

Wed Sep 12 02:00:20 UTC 2012  Clint Adams <clint at debian.org>
  * Initial Check-In
  Ignore-this: eb20c79029a73649c8562073fe63fbc6
diff -rN -u old-haskell-openpgp//changelog new-haskell-openpgp//changelog
--- old-haskell-openpgp//changelog	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-openpgp//changelog	2012-09-12 01:59:14.245825152 +0000
@@ -0,0 +1,6 @@
+haskell-openpgp (0.4-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Clint Adams <clint at debian.org>  Tue, 11 Sep 2012 21:37:21 -0400
+
diff -rN -u old-haskell-openpgp//compat new-haskell-openpgp//compat
--- old-haskell-openpgp//compat	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-openpgp//compat	2012-09-12 01:59:14.245825152 +0000
@@ -0,0 +1 @@
+7
\ No newline at end of file
diff -rN -u old-haskell-openpgp//control new-haskell-openpgp//control
--- old-haskell-openpgp//control	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-openpgp//control	2012-09-12 01:59:14.245825152 +0000
@@ -0,0 +1,121 @@
+Source: haskell-openpgp
+Priority: extra
+Section: haskell
+Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
+Uploaders: Clint Adams <clint at debian.org>
+Build-Depends: debhelper (>= 7.0)
+             , haskell-devscripts (>= 0.8)
+             , cdbs
+             , ghc
+             , ghc-prof
+             , libghc-bzlib-dev
+             , libghc-bzlib-prof
+             , libghc-utf8-string-dev
+             , libghc-utf8-string-prof
+             , libghc-zlib-dev
+             , libghc-zlib-prof
+             , libghc-hunit-dev
+             , libghc-quickcheck2-dev (>> 2.4.1.1)
+             , libghc-quickcheck-instances-dev
+             , libghc-test-framework-dev
+             , libghc-test-framework-hunit-dev
+             , libghc-test-framework-quickcheck2-dev
+Build-Depends-Indep: ghc-doc
+                   , libghc-bzlib-doc
+                   , libghc-utf8-string-doc
+                   , libghc-zlib-doc
+Standards-Version: 3.9.3
+Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-openpgp
+Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-openpgp
+Homepage: http://github.com/singpolyma/OpenPGP-Haskell
+
+Package: libghc-openpgp-dev
+Architecture: any
+Depends: ${shlibs:Depends}
+         , ${haskell:Depends}
+         , ${misc:Depends}
+Recommends: ${haskell:Recommends}
+Suggests: ${haskell:Suggests}
+Provides: ${haskell:Provides}
+Description: implementation of the OpenPGP message format
+ This is an OpenPGP library inspired by Stephen Paul Weber's work on
+ OpenPGP libraries in Ruby <https://github.com/singpolyma/openpgp>,
+ PHP <http://github.com/singpolyma/openpgp-php>,
+ and Python <https://github.com/singpolyma/OpenPGP-Python>.
+ .
+ It defines types to represent OpenPGP messages as a series of packets
+ and then defines instances of Data.Binary for each to facilitate
+ encoding/decoding.
+ .
+ For performing cryptography, see
+ <http://hackage.haskell.org/openpgp-crypto-api> or
+ <http://hackage.haskell.org/openpgp-Crypto>
+ .
+ It is intended that you use qualified imports with this library.
+ .
+ > import qualified Data.OpenPGP as OpenPGP
+ .
+  Author: Stephen Paul Weber <singpolyma at singpolyma.net>
+  Upstream-Maintainer: Stephen Paul Weber <singpolyma at singpolyma.net>
+ .
+ This package contains the normal library files.
+
+Package: libghc-openpgp-prof
+Architecture: any
+Depends: ${haskell:Depends}
+         , ${misc:Depends}
+Recommends: ${haskell:Recommends}
+Suggests: ${haskell:Suggests}
+Provides: ${haskell:Provides}
+Description: implementation of the OpenPGP message format; profiling libraries
+ This is an OpenPGP library inspired by Stephen Paul Weber's work on
+ OpenPGP libraries in Ruby <https://github.com/singpolyma/openpgp>,
+ PHP <http://github.com/singpolyma/openpgp-php>,
+ and Python <https://github.com/singpolyma/OpenPGP-Python>.
+ .
+ It defines types to represent OpenPGP messages as a series of packets
+ and then defines instances of Data.Binary for each to facilitate
+ encoding/decoding.
+ .
+ For performing cryptography, see
+ <http://hackage.haskell.org/openpgp-crypto-api> or
+ <http://hackage.haskell.org/openpgp-Crypto>
+ .
+ It is intended that you use qualified imports with this library.
+ .
+ > import qualified Data.OpenPGP as OpenPGP
+ .
+  Author: Stephen Paul Weber <singpolyma at singpolyma.net>
+  Upstream-Maintainer: Stephen Paul Weber <singpolyma at singpolyma.net>
+ .
+ This package contains the libraries compiled with profiling enabled.
+
+Package: libghc-openpgp-doc
+Architecture: all
+Section: doc
+Depends: ${haskell:Depends}
+         , ${misc:Depends}
+Recommends: ${haskell:Recommends}
+Suggests: ${haskell:Suggests}
+Description: implementation of the OpenPGP message format; documentation
+ This is an OpenPGP library inspired by Stpehen Paul Weber's work on
+ OpenPGP libraries in Ruby <https://github.com/singpolyma/openpgp>,
+ PHP <http://github.com/singpolyma/openpgp-php>,
+ and Python <https://github.com/singpolyma/OpenPGP-Python>.
+ .
+ It defines types to represent OpenPGP messages as a series of packets
+ and then defines instances of Data.Binary for each to facilitate
+ encoding/decoding.
+ .
+ For performing cryptography, see
+ <http://hackage.haskell.org/openpgp-crypto-api> or
+ <http://hackage.haskell.org/openpgp-Crypto>
+ .
+ It is intended that you use qualified imports with this library.
+ .
+ > import qualified Data.OpenPGP as OpenPGP
+ .
+  Author: Stephen Paul Weber <singpolyma at singpolyma.net>
+  Upstream-Maintainer: Stephen Paul Weber <singpolyma at singpolyma.net>
+ .
+ This package contains the documentation files.
diff -rN -u old-haskell-openpgp//copyright new-haskell-openpgp//copyright
--- old-haskell-openpgp//copyright	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-openpgp//copyright	2012-09-12 01:59:14.245825152 +0000
@@ -0,0 +1,13 @@
+Copyright © 2011, Stephen Paul Weber <singpolyma.net>
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff -rN -u old-haskell-openpgp//patches/0001-Better-bit-counting.-Handle-the-bitlength-of-0.patch new-haskell-openpgp//patches/0001-Better-bit-counting.-Handle-the-bitlength-of-0.patch
--- old-haskell-openpgp//patches/0001-Better-bit-counting.-Handle-the-bitlength-of-0.patch	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-openpgp//patches/0001-Better-bit-counting.-Handle-the-bitlength-of-0.patch	2012-09-12 01:59:14.245825152 +0000
@@ -0,0 +1,54 @@
+From a595481760fe5c4dc2e970a3a164ac12d4005d73 Mon Sep 17 00:00:00 2001
+From: Stephen Paul Weber <singpolyma at singpolyma.net>
+Date: Tue, 11 Sep 2012 11:34:49 -0500
+Subject: [PATCH 1/2] Better bit counting. Handle the bitlength of 0
+
+Closes #17
+---
+ Data/OpenPGP.hs |   15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/Data/OpenPGP.hs b/Data/OpenPGP.hs
+index 70bd29a..a268dff 100644
+--- a/Data/OpenPGP.hs
++++ b/Data/OpenPGP.hs
+@@ -62,6 +62,7 @@ module Data.OpenPGP (
+ 
+ import Numeric
+ import Control.Monad
++import Control.Arrow
+ import Control.Exception (assert)
+ import Data.Bits
+ import Data.Word
+@@ -790,19 +791,23 @@ signatures_and_data (Message lst) =
+ newtype MPI = MPI Integer deriving (Show, Read, Eq, Ord)
+ instance BINARY_CLASS MPI where
+ 	put (MPI i) = do
+-		put (((fromIntegral . B.length $ bytes) - 1) * 8
+-			+ floor (logBase (2::Double) $ fromIntegral (bytes `B.index` 0))
+-			+ 1 :: Word16)
++		put (bitl :: Word16)
+ 		putSomeByteString bytes
+ 		where
+-		bytes = if B.null bytes' then B.singleton 0 else bytes'
++		(bytes, bitl)
++			| B.null bytes' = (B.singleton 0, 1)
++			| otherwise     =
++				(bytes', (fromIntegral (B.length bytes') - 1) * 8 + sigBit)
++
++		sigBit = fst $ until ((==0) . snd)
++			(first (+1) . second (`shiftR` 1)) (0,B.index bytes 0)
+ 		bytes' = B.reverse $ B.unfoldr (\x ->
+ 				if x == 0 then Nothing else
+ 					Just (fromIntegral x, x `shiftR` 8)
+ 			) (assertProp (>=0) i)
+ 	get = do
+ 		length <- fmap fromIntegral (get :: Get Word16)
+-		bytes <- getSomeByteString ((length + 7) `div` 8)
++		bytes <- getSomeByteString (assertProp (>0) $ (length + 7) `div` 8)
+ 		return (MPI (B.foldl (\a b ->
+ 			a `shiftL` 8 .|. fromIntegral b) 0 bytes))
+ 
+-- 
+1.7.10.4
+
diff -rN -u old-haskell-openpgp//patches/disable-missing-test.diff new-haskell-openpgp//patches/disable-missing-test.diff
--- old-haskell-openpgp//patches/disable-missing-test.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-openpgp//patches/disable-missing-test.diff	2012-09-12 01:59:14.249823855 +0000
@@ -0,0 +1,11 @@
+--- a/tests/suite.hs
++++ b/tests/suite.hs
+@@ -130,7 +130,7 @@
+ 			testCase "000076-007.secret_subkey" (testSerialization "000076-007.secret_subkey"),
+ 			testCase "000077-002.sig" (testSerialization "000077-002.sig"),
+ 			testCase "000078-012.ring_trust" (testSerialization "000078-012.ring_trust"),
+-			testCase "002182-002.sig" (testSerialization "002182-002.sig"),
++			-- testCase "002182-002.sig" (testSerialization "002182-002.sig"),
+ 			testCase "pubring.gpg" (testSerialization "pubring.gpg"),
+ 			testCase "secring.gpg" (testSerialization "secring.gpg"),
+ 			testCase "compressedsig.gpg" (testSerialization "compressedsig.gpg"),
diff -rN -u old-haskell-openpgp//patches/series new-haskell-openpgp//patches/series
--- old-haskell-openpgp//patches/series	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-openpgp//patches/series	2012-09-12 01:59:14.249823855 +0000
@@ -0,0 +1,2 @@
+disable-missing-test.diff
+0001-Better-bit-counting.-Handle-the-bitlength-of-0.patch
diff -rN -u old-haskell-openpgp//rules new-haskell-openpgp//rules
--- old-haskell-openpgp//rules	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-openpgp//rules	2012-09-12 01:59:14.249823855 +0000
@@ -0,0 +1,6 @@
+#!/usr/bin/make -f
+
+DEB_ENABLE_TESTS = yes
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/hlibrary.mk
diff -rN -u old-haskell-openpgp//source/format new-haskell-openpgp//source/format
--- old-haskell-openpgp//source/format	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-openpgp//source/format	2012-09-12 01:59:14.249823855 +0000
@@ -0,0 +1 @@
+3.0 (quilt)
\ No newline at end of file
diff -rN -u old-haskell-openpgp//watch new-haskell-openpgp//watch
--- old-haskell-openpgp//watch	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-openpgp//watch	2012-09-12 01:59:14.249823855 +0000
@@ -0,0 +1,5 @@
+version=3
+opts="downloadurlmangle=s|archive/([\w\d_-]+)/([\d\.]+)/|archive/$1/$2/$1-$2.tar.gz|,\
+filenamemangle=s|(.*)/$|openpgp-$1.tar.gz|" \
+    http://hackage.haskell.org/packages/archive/openpgp \
+    ([\d\.]*\d)/





More information about the Pkg-haskell-commits mailing list