1.1 --- a/copyright	Sun Jul 18 10:53:32 2010 +0200
     1.2 +++ b/copyright	Mon Jul 19 12:24:02 2010 +0200
     1.3 @@ -6,11 +6,11 @@
     1.4  
     1.5      http://marmaro.de/prog/masqmail
     1.6  
     1.7 +
     1.8  Upstream authors: Oliver Kurth, Markus Schnalke
     1.9  
    1.10 -
    1.11      Copyright (C) 1999-2002 Oliver Kurth <oku@masqmail.cx>
    1.12 -    Copyright (C) 2008 2010 markus schnalke <meillo@marmaro.de>
    1.13 +    Copyright (C) 2008, 2010 markus schnalke <meillo@marmaro.de>
    1.14  
    1.15      This program is free software; you can redistribute it and/or modify
    1.16      it under the terms of the GNU General Public License as published by
    1.17 @@ -30,6 +30,42 @@
    1.18  Public License can be found in `/usr/share/common-licenses/GPL-2'.
    1.19  
    1.20  
    1.21 -Note: The file contrib/rmail was taken from postfix. Wietse Venema
    1.22 -said that no license would apply to that file. See:
    1.23 -http://lists.debian.org/debian-legal/2010/02/msg00043.html
    1.24 +These files are licensed differently:
    1.25 +
    1.26 +src/md5/hmac_md5.*
    1.27 +
    1.28 +    Copyright 2010, markus schnalke <meillo@marmaro.de>
    1.29 +    
    1.30 +    Permission to use, copy, modify, and/or distribute this software for any
    1.31 +    purpose with or without fee is hereby granted, provided that the above
    1.32 +    copyright notice and this permission notice appear in all copies.
    1.33 +    
    1.34 +    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
    1.35 +    WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
    1.36 +    MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
    1.37 +    ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
    1.38 +    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
    1.39 +    ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
    1.40 +    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
    1.41 +
    1.42 +
    1.43 +src/md5/md5.*
    1.44 +
    1.45 +    Written by Solar Designer <solar at openwall.com> in 2001, and placed
    1.46 +    in the public domain.  There's absolutely no warranty.
    1.47 +
    1.48 +
    1.49 +src/libident/*
    1.50 +
    1.51 +    by Peter Eriksson
    1.52 +    
    1.53 +    This version of 'libident' is hereby released into the
    1.54 +    Public Domain. It may be distributed for a fee or without
    1.55 +    a fee. We only ask you not to pretend you wrote it.
    1.56 +
    1.57 +
    1.58 +contrib/rmail
    1.59 +
    1.60 +    Was taken from postfix. Wietse Venema
    1.61 +    said that no license would apply to that file. See:
    1.62 +    http://lists.debian.org/debian-legal/2010/02/msg00043.html