[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36

John Goerzen jgoerzen at complete.org
Fri Apr 23 14:50:21 UTC 2010


The following commit has been merged in the master branch:
commit 7f16f7de2f0ee0cd5eae60be322f144107043f1e
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Dec 7 00:58:14 2004 +0100

    Imported hsemail 2004-11-01.
    
    Keywords:
    
    
    (jgoerzen at complete.org--projects/missingh--head--0.7--patch-49)

diff --git a/COPYRIGHT b/COPYRIGHT
index 32ff67f..27cbf67 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -37,7 +37,7 @@ completely independently of the rest of the library, you may treat them
 under the licenses shown below.
 
 ----------------------------------------------------
-The MissingH.Hsemail modules come from hsemail 2004-10-24 from 
+The MissingH.Hsemail modules come from hsemail 2004-11-01 from 
 http://cryp.to/hsemail/.
 
 Copyright/License:
@@ -104,7 +104,7 @@ Pursuant to the terms of the LGPL, you may consider this code to fall
 under the GPL as part of the whole MissingH work.
 
 ----------------------------------------------------
-MissingH.Checksum.CRC32 is
+MissingH.Checksum.CRC32.Posix is
 (C) 2002 HardCore SoftWare, Doug Hoyte
 and is "distributed under the terms of the GNU GPL."  This license is
 the same as the main license for MissingH.
diff --git a/ChangeLog b/ChangeLog
index 63602d5..bb0f4ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,20 @@
 # arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--0.7
 #
 
+2004-12-06 17:58:14 GMT	John Goerzen <jgoerzen at complete.org>	patch-49
+
+    Summary:
+      Imported hsemail 2004-11-01.
+    Revision:
+      missingh--head--0.7--patch-49
+
+
+    modified files:
+     COPYRIGHT ChangeLog debian/changelog
+     libsrc/MissingH/Hsemail/README
+     libsrc/MissingH/Hsemail/Rfc2821.hs
+
+
 2004-12-05 20:59:50 GMT	John Goerzen <jgoerzen at complete.org>	patch-48
 
     Summary:
diff --git a/debian/changelog b/debian/changelog
index c27537c..bb28166 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+missingh (0.7.4) unstable; urgency=low
+
+  * Revved hsemail to 2004-11-01.
+
+ -- John Goerzen <jgoerzen at complete.org>  Mon,  6 Dec 2004 11:57:20 -0600
+
 missingh (0.7.3) unstable; urgency=low
 
   * Adding missing ConfigParser.Lexer to Setup.Description.
diff --git a/libsrc/MissingH/Hsemail/README b/libsrc/MissingH/Hsemail/README
index 113db15..87a960b 100644
--- a/libsrc/MissingH/Hsemail/README
+++ b/libsrc/MissingH/Hsemail/README
@@ -1,7 +1,7 @@
 Parsers for the Internet Message Standard
 =========================================
 
-:Latest Release: hsemail-2004-10-24.tar.gz_
+:Latest Release: hsemail-2004-11-01.tar.gz_
 :Darcs:          darcs_ get --partial http://cryp.to/hsemail/
 
 Synopsis
@@ -40,7 +40,7 @@ Copyleft
 
 .. _darcs: http://abridgegame.org/darcs/
 
-.. _hsemail-2004-10-24.tar.gz: http://cryp.to/hsemail/hsemail-2004-10-24.tar.gz
+.. _hsemail-2004-11-01.tar.gz: http://cryp.to/hsemail/hsemail-2004-11-01.tar.gz
 
 .. _Reference Documentation: docs/index.html
 
diff --git a/libsrc/MissingH/Hsemail/Rfc2821.hs b/libsrc/MissingH/Hsemail/Rfc2821.hs
index 6225e37..6624f86 100644
--- a/libsrc/MissingH/Hsemail/Rfc2821.hs
+++ b/libsrc/MissingH/Hsemail/Rfc2821.hs
@@ -1,6 +1,7 @@
+{-# OPTIONS -fglasgow-exts #-}
 {- |
    Module      :  Rfc2821
-   Copyright   :  (c) 2004-10-24 by Peter Simons
+   Copyright   :  (c) 2004-11-01 by Peter Simons
    License     :  GPL2
 
    Maintainer  :  simons at cryp.to
@@ -47,6 +48,8 @@ import Control.Monad.State
 import Text.ParserCombinators.Parsec
 import Text.ParserCombinators.Parsec.Error
 import Data.List ( intersperse )
+import Data.Char ( toLower )
+import Data.Typeable
 import MissingH.Hsemail.Rfc2234
 
 ----- Smtp Parsers ---------------------------------------------------
@@ -103,13 +106,19 @@ instance Read SmtpCmd where
   readsPrec _ = readWrapper smtpCmd
   readList    = error "reading [SmtpCmd] is not supported"
 
--- |The most generic e-mail address has the form:
+-- |The most general e-mail address has the form:
 -- @\<[\@route,...:]user\@domain\>@. This type, too,
 -- supports 'show' and 'read'. Note that a \"shown\" address
--- is /always/ enclosed in angular brackets.
+-- is /always/ enclosed in angular brackets. When comparing
+-- two mailboxes for equality, the hostname is case-insensitive.
 
 data Mailbox = Mailbox [String] String String
-             deriving (Eq)
+             deriving (Typeable)
+
+instance Eq Mailbox where
+  lhs == rhs  =  (norm lhs) == (norm rhs)
+    where
+    norm (Mailbox rt lp hp) = (rt, lp, map toLower hp)
 
 instance Show Mailbox where
   show (Mailbox [] [] []) = "<>"
@@ -149,10 +158,8 @@ postmaster = Mailbox [] "postmaster" []
 -- > 250-like
 -- > 250 a charm
 --
--- You might want to try it with an @[]@ and see what
--- great standard messages you will get. @:-)@
---
--- /TODO:/ Define 'read' for those as well.
+-- If the message is @[]@, you'll get a really helpful
+-- default text.
 
 data SmtpReply = Reply SmtpCode [String]
 
@@ -463,9 +470,9 @@ handleSmtpCmd cmd = get >>= \st -> match st cmd
 
 -- |Make the string 'crlf' terminated, no matter what.
 -- \'@\\n@\' is expanded, otherwise 'crlf' is appended. Note
--- that if the strong was incorrectly terminated before, it
--- still is. So using this is safe, and useful when reading
--- with 'hGetLine', for example.
+-- that if the string was terminated incorrectly before, it
+-- still is. This function is useful when reading input with
+-- 'hGetLine', for example.
 
 fixCRLF :: String -> String
 fixCRLF ('\r' :'\n':[]) = fixCRLF []
@@ -490,10 +497,10 @@ mkCmd0 str cons = (do
   skipMany wsp >> crlf
   return cons)                          <?> str
 
--- Construct a parser for a command with an argument which
--- the given parser can handle. The parsed result will be
--- applied to the given type constructor and returned.
--- Expects 'crlf'!
+-- Construct a parser for a command with an argument, which
+-- the given parser will handle. The result of the argument
+-- parser will be applied to the type constructor before it
+-- is returned. Expects 'crlf'!
 
 mkCmd1 :: String -> (a -> SmtpCmd) -> GenParser Char st a
        -> GenParser Char st SmtpCmd

-- 
haskell-testpack



More information about the Pkg-haskell-commits mailing list