Index: trunk/COPYING
===================================================================
--- trunk/COPYING	(revision 591)
+++ trunk/COPYING	(revision 1)
@@ -3,5 +3,5 @@
 ------------------------------------------
 
-Copyright (C) 1999-2009 Rainer Wichmann                                    
+Copyright (C) 1999-2004 Rainer Wichmann                                    
                                                                       
 This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,6 @@
 You should have received a copy of the GNU General Public License     
 along with this program; if not, write to the Free Software           
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-
-On Debian-based systems, see /usr/share/common-licenses
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.             
+
 
 Incorporated code
@@ -102,5 +101,5 @@
        * along with the LZO library; see the file COPYING.
        * If not, write to the Free Software Foundation, Inc.,
-       * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+       * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
        * 
        * Markus F.X.J. Oberhumer
@@ -126,5 +125,5 @@
       You should have received a copy of the GNU General Public License
       along with this program; if not, write to the Free Software
-      Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA  */
+      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
    /* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
@@ -132,30 +131,30 @@
 
   (vi) Support for the MD5 hash algorithm is provided by code
-  from busybox which is distributed under the GPL.
-
-   /* md5.c - Functions to compute MD5 message digest of files or memory blocks
-    *         according to the definition of MD5 in RFC 1321 from April 1992.
-    * Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-    *
-    * NOTE: The canonical source of this file is maintained with the GNU C
-    * Library.  Bugs can be reported to bug-glibc@prep.ai.mit.edu.
-    *
-    * This program is free software; you can redistribute it and/or modify it
-    * under the terms of the GNU General Public License as published by the
-    * Free Software Foundation; either version 2, or (at your option) any
-    * later version.
-    *
-    * This program is distributed in the hope that it will be useful,
-    * but WITHOUT ANY WARRANTY; without even the implied warranty of
-    * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    * GNU General Public License for more details.
-    *
-    * You should have received a copy of the GNU General Public License
-    * along with this program; if not, write to the Free Software Foundation,
-    * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-    */
-
-   /* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.  */
-
+  from beecrypt which is distributed under the LGPL.
+
+      /*
+       * md5.c
+       *
+       * MD5 hash function, code
+       *
+       * Copyright (c) 2000 Virtual Unlimited B.V.
+       *
+       * Author: Bob Deblier <bob@virtualunlimited.com>
+       *
+       * This library is free software; you can redistribute it and/or
+       * modify it under the terms of the GNU Lesser General Public
+       * License as published by the Free Software Foundation; either
+       * version 2.1 of the License, or (at your option) any later version.
+       *
+       * This library is distributed in the hope that it will be useful,
+       * but WITHOUT ANY WARRANTY; without even the implied warranty of
+       * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+       * Lesser General Public License for more details.
+       *
+       * You should have received a copy of the GNU Lesser General Public
+       * License along with this library; if not, write to the Free Software
+       * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+       * USA
+       */
 
   (vi) Support for the SHA-1 hash algorithm is provided by code
@@ -170,5 +169,5 @@
         * country of residence.
         *
-        * Adapted to pike and some cleanup by Niels MÃ¶ller.
+        * Adapted to pike and some cleanup by Niels Möller.
         */
 
@@ -204,5 +203,5 @@
      * You should have received a copy of the GNU Library General Public
      * License along with this library; if not, write to the Free
-     * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+     * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
      *
      * The author of this library can be reached at the following address:
@@ -242,45 +241,4 @@
    either version 2 of the License, or (at your option) any later version."
 
-   (x) Unit testing uses the 'cutest' framework by Asim Jalis, (files
-   CuTest.h, CuTest.c, make-tests.sh) which is licensed under the zlib license:
-
-     * Copyright (c) 2003 Asim Jalis
-     *
-     * This software is provided 'as-is', without any express or implied
-     * warranty. In no event will the authors be held liable for any damages
-     * arising from the use of this software.
-     *
-     * Permission is granted to anyone to use this software for any purpose,
-     * including commercial applications, and to alter it and redistribute it
-     * freely, subject to the following restrictions:
-     *
-     * 1. The origin of this software must not be misrepresented; you must not
-     * claim that you wrote the original software. If you use this software in
-     * a product, an acknowledgment in the product documentation would be
-     * appreciated but is not required.
-     *
-     * 2. Altered source versions must be plainly marked as such, and must not
-     * be misrepresented as being the original software.
-     *
-     * 3. This notice may not be removed or altered from any source
-     * distribution.
-
-   (xi) The dnmalloc library used by samhain is Copyright (C) 2005, Yves Younan, 
-   Wouter Joosen and Frank Piessens, and licensed under the LGPL:
-
-     *   This library is free software; you can redistribute it and/or
-     *   modify it under the terms of the GNU Lesser General Public
-     *   License as published by the Free Software Foundation; either
-     *   version 2.1 of the License, or (at your option) any later version.
-     *
-     *   This library is distributed in the hope that it will be useful,
-     *   but WITHOUT ANY WARRANTY; without even the implied warranty of
-     *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     *   Lesser General Public License for more details.
-     *
-     *   You should have received a copy of the GNU Lesser General Public
-     *   License along with this library; if not, write to the Free Software
-     *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-  
 
 Other
