Update copyright headers.

diff --git a/Makefile b/Makefile
index 463d1f7..5dcc843 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
 ##  $Id$
 ## -----------------------------------------------------------------------
-##
+##   
 ##   Copyright 1998-2004 H. Peter Anvin - All Rights Reserved
 ##
 ##   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, Inc., 675 Mass Ave, Cambridge MA 02139,
-##   USA; either version 2 of the License, or (at your option) any later
-##   version; incorporated herein by reference.
+##   the Free Software Foundation, Inc., 53 Temple Place Ste 330,
+##   Boston MA 02111-1307, USA; either version 2 of the License, or
+##   (at your option) any later version; incorporated herein by reference.
 ##
 ## -----------------------------------------------------------------------
 

diff --git a/Makefile.private b/Makefile.private
index d62f476..5228096 100644 (file)
--- a/Makefile.private
+++ b/Makefile.private
@@ -1,12 +1,12 @@
 ## -*- makefile -*- ------------------------------------------------------
 ##   
-##   Copyright 2000-2003 H. Peter Anvin - All Rights Reserved
+##   Copyright 2000-2004 H. Peter Anvin - All Rights Reserved
 ##
 ##   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, Inc., 675 Mass Ave, Cambridge MA 02139,
-##   USA; either version 2 of the License, or (at your option) any later
-##   version; incorporated herein by reference.
+##   the Free Software Foundation, Inc., 53 Temple Place Ste 330,
+##   Boston MA 02111-1307, USA; either version 2 of the License, or
+##   (at your option) any later version; incorporated herein by reference.
 ##
 ## -----------------------------------------------------------------------
 # $Id$

diff --git a/README b/README
index 2e8cf2a..722f0d7 100644 (file)
--- a/README
+++ b/README
@@ -9,14 +9,18 @@ See the following files for documentation about SYSLINUX:
        COPYING         - For the license terms of this software.
 
 SYSLINUX now builds in a Linux environment, using nasm.  You need nasm
-version 0.98.32 or later to build SYSLINUX from source.  See
+version 0.98.38 or later to build SYSLINUX from source.  See
 http://nasm.sf.net/ for information about nasm.
 
 There is now a mailing list for SYSLINUX.  See the end of syslinux.doc
 for details.
 
-SYSLINUX is Copyright 1994-2002 H. Peter Anvin, and 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,
-Inc., 675 Mass Ave, Cambridge MA 02139, USA; either version 2 of the
-License, or (at your option) any later version.
+SYSLINUX is:
+
+   Copyright 1994-2004 H. Peter Anvin - All Rights Reserved
+
+   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, Inc., 53 Temple Place Ste 330,
+   Boston MA 02111-1307, USA; either version 2 of the License, or
+   (at your option) any later version; incorporated herein by reference.

diff --git a/bin2c.pl b/bin2c.pl
index 103c4bf..8c56ca6 100644 (file)
--- a/bin2c.pl
+++ b/bin2c.pl
@@ -1,16 +1,17 @@
 #!/usr/bin/perl
-# $Id$
-# -----------------------------------------------------------------------
-#   
-#   Copyright 1998 H. Peter Anvin - All Rights Reserved
-#
-#   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, Inc., 675 Mass Ave, Cambridge MA 02139,
-#   USA; either version 2 of the License, or (at your option) any later
-#   version; incorporated herein by reference.
-#
-# -----------------------------------------------------------------------
+## $Id$
+## -----------------------------------------------------------------------
+##   
+##   Copyright 1998-2004 H. Peter Anvin - All Rights Reserved
+##
+##   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, Inc., 53 Temple Place Ste 330,
+##   Boston MA 02111-1307, USA; either version 2 of the License, or
+##   (at your option) any later version; incorporated herein by reference.
+##
+## -----------------------------------------------------------------------
+
 #
 # bin2c.pl: binary file to C source converter
 #

diff --git a/com32/libutil/Makefile b/com32/libutil/Makefile
index d395a3f..1090dbd 100644 (file)
--- a/com32/libutil/Makefile
+++ b/com32/libutil/Makefile
@@ -3,16 +3,31 @@
 ##   
 ##   Copyright 2001-2004 H. Peter Anvin - All Rights Reserved
 ##
-##   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, Inc., 675 Mass Ave, Cambridge MA 02139,
-##   USA; either version 2 of the License, or (at your option) any later
-##   version; incorporated herein by reference.
+##   Permission is hereby granted, free of charge, to any person
+##   obtaining a copy of this software and associated documentation
+##   files (the "Software"), to deal in the Software without
+##   restriction, including without limitation the rights to use,
+##   copy, modify, merge, publish, distribute, sublicense, and/or
+##   sell copies of the Software, and to permit persons to whom
+##   the Software is furnished to do so, subject to the following
+##   conditions:
+##   
+##   The above copyright notice and this permission notice shall
+##   be included in all copies or substantial portions of the Software.
+##   
+##   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+##   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+##   OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+##   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+##   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+##   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+##   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+##   OTHER DEALINGS IN THE SOFTWARE.
 ##
 ## -----------------------------------------------------------------------
 
 ##
-## samples for syslinux users
+## Utility companion library for the COM32 library
 ##
 
 gcc_ok   = $(shell if gcc $(1) -c -x c /dev/null -o /dev/null 2>/dev/null; \

diff --git a/com32/modules/Makefile b/com32/modules/Makefile
index f194cc9..ada285c 100644 (file)
--- a/com32/modules/Makefile
+++ b/com32/modules/Makefile
@@ -5,9 +5,9 @@
 ##
 ##   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, Inc., 675 Mass Ave, Cambridge MA 02139,
-##   USA; either version 2 of the License, or (at your option) any later
-##   version; incorporated herein by reference.
+##   the Free Software Foundation, Inc., 53 Temple Place Ste 330,
+##   Boston MA 02111-1307, USA; either version 2 of the License, or
+##   (at your option) any later version; incorporated herein by reference.
 ##
 ## -----------------------------------------------------------------------
 

diff --git a/com32/samples/Makefile b/com32/samples/Makefile
index 93b7343..a0a45bc 100644 (file)
--- a/com32/samples/Makefile
+++ b/com32/samples/Makefile
@@ -5,9 +5,9 @@
 ##
 ##   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, Inc., 675 Mass Ave, Cambridge MA 02139,
-##   USA; either version 2 of the License, or (at your option) any later
-##   version; incorporated herein by reference.
+##   the Free Software Foundation, Inc., 53 Temple Place Ste 330,
+##   Boston MA 02111-1307, USA; either version 2 of the License, or
+##   (at your option) any later version; incorporated herein by reference.
 ##
 ## -----------------------------------------------------------------------
 

diff --git a/copybs.asm b/copybs.asm
index 86feb15..15025da 100644 (file)
--- a/copybs.asm
+++ b/copybs.asm
@@ -2,13 +2,13 @@
 ; $Id$
 ; -----------------------------------------------------------------------
 ;   
-;   Copyright 1998 H. Peter Anvin - All Rights Reserved
+;   Copyright 1998-2004 H. Peter Anvin - All Rights Reserved
 ;
 ;   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, Inc., 675 Mass Ave, Cambridge MA 02139,
-;   USA; either version 2 of the License, or (at your option) any later
-;   version; incorporated herein by reference.
+;   the Free Software Foundation, Inc., 53 Temple Place Ste 330,
+;   Boston MA 02111-1307, USA; either version 2 of the License, or
+;   (at your option) any later version; incorporated herein by reference.
 ;
 ; -----------------------------------------------------------------------
 

diff --git a/gethostip.c b/gethostip.c
index da7f4eb..8ba41cb 100644 (file)
--- a/gethostip.c
+++ b/gethostip.c
@@ -5,9 +5,9 @@
  *
  *   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, Inc., 675 Mass Ave, Cambridge MA 02139,
- *   USA; either version 2 of the License, or (at your option) any later
- *   version; incorporated herein by reference.
+ *   the Free Software Foundation, Inc., 53 Temple Place Ste 330,
+ *   Boston MA 02111-1307, USA; either version 2 of the License, or
+ *   (at your option) any later version; incorporated herein by reference.
  *
  * ----------------------------------------------------------------------- */
 

diff --git a/isolinux.asm b/isolinux.asm
index 4da7f1b..301ced7 100644 (file)
--- a/isolinux.asm
+++ b/isolinux.asm
@@ -13,10 +13,10 @@
 ;
 ;  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, Inc., 675 Mass Ave, Cambridge MA 02139,
-;  USA; either version 2 of the License, or (at your option) any later
-;  version; incorporated herein by reference.
-; 
+;  the Free Software Foundation, Inc., 53 Temple Place Ste 330,
+;  Boston MA 02111-1307, USA; either version 2 of the License, or
+;  (at your option) any later version; incorporated herein by reference.
+;
 ; ****************************************************************************
 
 %define IS_ISOLINUX 1

diff --git a/ldlinux.asm b/ldlinux.asm
index 98e09f4..7dcfb57 100644 (file)
--- a/ldlinux.asm
+++ b/ldlinux.asm
@@ -20,9 +20,9 @@
 ;
 ;  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, Inc., 675 Mass Ave, Cambridge MA 02139,
-;  USA; either version 2 of the License, or (at your option) any later
-;  version; incorporated herein by reference.
+;  the Free Software Foundation, Inc., 53 Temple Place Ste 330,
+;  Boston MA 02111-1307, USA; either version 2 of the License, or
+;  (at your option) any later version; incorporated herein by reference.
 ; 
 ; ****************************************************************************
 

diff --git a/lss16toppm b/lss16toppm
index df0598c..7424c68 100755 (executable)
--- a/lss16toppm
+++ b/lss16toppm
@@ -2,13 +2,13 @@
 ## $Id$
 ## -----------------------------------------------------------------------
 ##   
-##   Copyright 2001 H. Peter Anvin - All Rights Reserved
+##   Copyright 2001-2004 H. Peter Anvin - All Rights Reserved
 ##
 ##   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, Inc., 675 Mass Ave, Cambridge MA 02139,
-##   USA; either version 2 of the License, or (at your option) any later
-##   version; incorporated herein by reference.
+##   the Free Software Foundation, Inc., 53 Temple Place Ste 330,
+##   Boston MA 02111-1307, USA; either version 2 of the License, or
+##   (at your option) any later version; incorporated herein by reference.
 ##
 ## -----------------------------------------------------------------------
 

diff --git a/memdisk/memdisk.asm b/memdisk/memdisk.asm
index 0bae1c3..7acb3cb 100644 (file)
--- a/memdisk/memdisk.asm
+++ b/memdisk/memdisk.asm
@@ -11,9 +11,9 @@
 ;
 ;  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, Inc., 675 Mass Ave, Cambridge MA 02139,
-;  USA; either version 2 of the License, or (at your option) any later
-;  version; incorporated herein by reference.
+;  the Free Software Foundation, Inc., 53 Temple Place Ste 330,
+;  Boston MA 02111-1307, USA; either version 2 of the License, or
+;  (at your option) any later version; incorporated herein by reference.
 ; 
 ; ****************************************************************************
 

diff --git a/ppmtolss16 b/ppmtolss16
index e73af36..d2f14a9 100755 (executable)
--- a/ppmtolss16
+++ b/ppmtolss16
@@ -2,13 +2,13 @@
 ## $Id$
 ## -----------------------------------------------------------------------
 ##   
-##   Copyright 2001-2003 H. Peter Anvin - All Rights Reserved
+##   Copyright 2004 H. Peter Anvin - All Rights Reserved
 ##
 ##   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, Inc., 675 Mass Ave, Cambridge MA 02139,
-##   USA; either version 2 of the License, or (at your option) any later
-##   version; incorporated herein by reference.
+##   the Free Software Foundation, Inc., 53 Temple Place Ste 330,
+##   Boston MA 02111-1307, USA; either version 2 of the License, or
+##   (at your option) any later version; incorporated herein by reference.
 ##
 ## -----------------------------------------------------------------------
 

diff --git a/pxe.inc b/pxe.inc
index 92da3bb..3fa839d 100644 (file)
--- a/pxe.inc
+++ b/pxe.inc
@@ -1,12 +1,12 @@
 ;; -----------------------------------------------------------------------
 ;;   
-;;   Copyright 1999 H. Peter Anvin - All Rights Reserved
+;;   Copyright 1999-2004 H. Peter Anvin - All Rights Reserved
 ;;
 ;;   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, Inc., 675 Mass Ave, Cambridge MA 02139,
-;;   USA; either version 2 of the License, or (at your option) any later
-;;   version; incorporated herein by reference.
+;;   the Free Software Foundation, Inc., 53 Temple Place Ste 330,
+;;   Boston MA 02111-1307, USA; either version 2 of the License, or
+;;   (at your option) any later version; incorporated herein by reference.
 ;;
 ;; -----------------------------------------------------------------------
 ;; $Id$

diff --git a/pxelinux.asm b/pxelinux.asm
index ccad9fb..5b35fbb 100644 (file)
--- a/pxelinux.asm
+++ b/pxelinux.asm
@@ -12,9 +12,9 @@
 ;
 ;  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, Inc., 675 Mass Ave, Cambridge MA 02139,
-;  USA; either version 2 of the License, or (at your option) any later
-;  version; incorporated herein by reference.
+;  the Free Software Foundation, Inc., 53 Temple Place Ste 330,
+;  Boston MA 02111-1307, USA; either version 2 of the License, or
+;  (at your option) any later version; incorporated herein by reference.
 ; 
 ; ****************************************************************************
 

diff --git a/sample/Makefile b/sample/Makefile
index ec341cb..79b0692 100644 (file)
--- a/sample/Makefile
+++ b/sample/Makefile
@@ -5,9 +5,9 @@
 ##
 ##   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, Inc., 675 Mass Ave, Cambridge MA 02139,
-##   USA; either version 2 of the License, or (at your option) any later
-##   version; incorporated herein by reference.
+##   the Free Software Foundation, Inc., 53 Temple Place Ste 330,
+##   Boston MA 02111-1307, USA; either version 2 of the License, or
+##   (at your option) any later version; incorporated herein by reference.
 ##
 ## -----------------------------------------------------------------------
 

diff --git a/syslinux-nomtools.c b/syslinux-nomtools.c
index 25538d6..98795c8 100644 (file)
--- a/syslinux-nomtools.c
+++ b/syslinux-nomtools.c
@@ -1,13 +1,13 @@
 #ident "$Id$"
 /* ----------------------------------------------------------------------- *
  *   
- *   Copyright 1998-2003 H. Peter Anvin - All Rights Reserved
+ *   Copyright 1998-2004 H. Peter Anvin - All Rights Reserved
  *
  *   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, Inc., 675 Mass Ave, Cambridge MA 02139,
- *   USA; either version 2 of the License, or (at your option) any later
- *   version; incorporated herein by reference.
+ *   the Free Software Foundation, Inc., 53 Temple Place Ste 330,
+ *   Boston MA 02111-1307, USA; either version 2 of the License, or
+ *   (at your option) any later version; incorporated herein by reference.
  *
  * ----------------------------------------------------------------------- */
 

diff --git a/syslinux.asm b/syslinux.asm
index e104236..25d7339 100644 (file)
--- a/syslinux.asm
+++ b/syslinux.asm
@@ -2,13 +2,13 @@
 ; $Id$
 ; -----------------------------------------------------------------------
 ;   
-;   Copyright 1998-2001 H. Peter Anvin - All Rights Reserved
+;   Copyright 1998-2004 H. Peter Anvin - All Rights Reserved
 ;
 ;   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, Inc., 675 Mass Ave, Cambridge MA 02139,
-;   USA; either version 2 of the License, or (at your option) any later
-;   version; incorporated herein by reference.
+;   the Free Software Foundation, Inc., 53 Temple Place Ste 330,
+;   Boston MA 02111-1307, USA; either version 2 of the License, or
+;   (at your option) any later version; incorporated herein by reference.
 ;
 ; -----------------------------------------------------------------------
 

diff --git a/syslinux.c b/syslinux.c
index c5f2d29..bb1de8a 100644 (file)
--- a/syslinux.c
+++ b/syslinux.c
@@ -1,13 +1,13 @@
 #ident "$Id$"
 /* ----------------------------------------------------------------------- *
  *   
- *   Copyright 1998-2003 H. Peter Anvin - All Rights Reserved
+ *   Copyright 1998-2004 H. Peter Anvin - All Rights Reserved
  *
  *   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, Inc., 675 Mass Ave, Cambridge MA 02139,
- *   USA; either version 2 of the License, or (at your option) any later
- *   version; incorporated herein by reference.
+ *   the Free Software Foundation, Inc., 53 Temple Place Ste 330,
+ *   Boston MA 02111-1307, USA; either version 2 of the License, or
+ *   (at your option) any later version; incorporated herein by reference.
  *
  * ----------------------------------------------------------------------- */
 

diff --git a/syslinux.h b/syslinux.h
index d022647..f20172c 100644 (file)
--- a/syslinux.h
+++ b/syslinux.h
@@ -1,13 +1,13 @@
 #ident "$Id$"
 /* ----------------------------------------------------------------------- *
  *   
- *   Copyright 1998-2003 H. Peter Anvin - All Rights Reserved
+ *   Copyright 1998-2004 H. Peter Anvin - All Rights Reserved
  *
  *   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, Inc., 675 Mass Ave, Cambridge MA 02139,
- *   USA; either version 2 of the License, or (at your option) any later
- *   version; incorporated herein by reference.
+ *   the Free Software Foundation, Inc., 53 Temple Place Ste 330,
+ *   Boston MA 02111-1307, USA; either version 2 of the License, or
+ *   (at your option) any later version; incorporated herein by reference.
  *
  * ----------------------------------------------------------------------- */
 

diff --git a/syslxmod.c b/syslxmod.c
index 1713791..96e6088 100644 (file)
--- a/syslxmod.c
+++ b/syslxmod.c
@@ -1,13 +1,13 @@
 #ident "$Id$"
 /* ----------------------------------------------------------------------- *
  *   
- *   Copyright 1998-2003 H. Peter Anvin - All Rights Reserved
+ *   Copyright 1998-2004 H. Peter Anvin - All Rights Reserved
  *
  *   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, Inc., 675 Mass Ave, Cambridge MA 02139,
- *   USA; either version 2 of the License, or (at your option) any later
- *   version; incorporated herein by reference.
+ *   the Free Software Foundation, Inc., 53 Temple Place Ste 330,
+ *   Boston MA 02111-1307, USA; either version 2 of the License, or
+ *   (at your option) any later version; incorporated herein by reference.
  *
  * ----------------------------------------------------------------------- */
 

diff --git a/win32/Makefile b/win32/Makefile
index cdcdebd..bd957fa 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -1,13 +1,13 @@
+## $Id$
 ## -----------------------------------------------------------------------
-##  $Id$
-##
-##   Copyright 1998-2003 H. Peter Anvin - All Rights Reserved
+##   
+##   Copyright 1998-2004 H. Peter Anvin - All Rights Reserved
 ##
 ##   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, Inc., 675 Mass Ave, Cambridge MA 02139,
-##   USA; either version 2 of the License, or (at your option) any later
-##   version; incorporated herein by reference.
+##   the Free Software Foundation, Inc., 53 Temple Place Ste 330,
+##   Boston MA 02111-1307, USA; either version 2 of the License, or
+##   (at your option) any later version; incorporated herein by reference.
 ##
 ## -----------------------------------------------------------------------
 

diff --git a/win32/syslinux-mingw.c b/win32/syslinux-mingw.c
index a71d50d..0b6b192 100644 (file)
--- a/win32/syslinux-mingw.c
+++ b/win32/syslinux-mingw.c
@@ -6,9 +6,9 @@
  *
  *   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, Inc., 675 Mass Ave, Cambridge MA 02139,
- *   USA; either version 2 of the License, or (at your option) any later
- *   version; incorporated herein by reference.
+ *   the Free Software Foundation, Inc., 53 Temple Place Ste 330,
+ *   Boston MA 02111-1307, USA; either version 2 of the License, or
+ *   (at your option) any later version; incorporated herein by reference.
  *
  * ----------------------------------------------------------------------- */