aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhpa <hpa>2004-12-14 23:03:28 +0000
committerhpa <hpa>2004-12-14 23:03:28 +0000
commit9e5ebea8cdc80ee00e38c3d104bef31b8c46c980 (patch)
treefae526710ca5a81c42dc38c3889909fcb0f24823
parent6b233b19f8cc05d159255e535f6bb8681f3063a1 (diff)
downloadsyslinux-elf-9e5ebea8cdc80ee00e38c3d104bef31b8c46c980.tar.gz
syslinux-elf-9e5ebea8cdc80ee00e38c3d104bef31b8c46c980.tar.xz
syslinux-elf-9e5ebea8cdc80ee00e38c3d104bef31b8c46c980.zip
Update copyright headers.
-rw-r--r--Makefile8
-rw-r--r--Makefile.private8
-rw-r--r--README16
-rw-r--r--bin2c.pl25
-rw-r--r--com32/libutil/Makefile27
-rw-r--r--com32/modules/Makefile6
-rw-r--r--com32/samples/Makefile6
-rw-r--r--copybs.asm8
-rw-r--r--gethostip.c6
-rw-r--r--isolinux.asm8
-rw-r--r--ldlinux.asm6
-rwxr-xr-xlss16toppm8
-rw-r--r--memdisk/memdisk.asm6
-rwxr-xr-xppmtolss168
-rw-r--r--pxe.inc8
-rw-r--r--pxelinux.asm6
-rw-r--r--sample/Makefile6
-rw-r--r--syslinux-nomtools.c8
-rw-r--r--syslinux.asm8
-rw-r--r--syslinux.c8
-rw-r--r--syslinux.h8
-rw-r--r--syslxmod.c8
-rw-r--r--win32/Makefile12
-rw-r--r--win32/syslinux-mingw.c6
24 files changed, 122 insertions, 102 deletions
diff --git a/Makefile b/Makefile
index 463d1f7f..5dcc843f 100644
--- 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 d62f476c..52280961 100644
--- 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 2e8cf2ac..722f0d72 100644
--- 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 103c4bf5..8c56ca6c 100644
--- 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 d395a3fd..1090dbd8 100644
--- 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 f194cc93..ada285c9 100644
--- 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 93b7343a..a0a45bc9 100644
--- 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 86feb150..15025da1 100644
--- 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 da7f4ebd..8ba41cbf 100644
--- 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 4da7f1bf..301ced7e 100644
--- 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 98e09f46..7dcfb574 100644
--- 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 df0598c1..7424c682 100755
--- 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 0bae1c38..7acb3cb5 100644
--- 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 e73af362..d2f14a99 100755
--- 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 92da3bbd..3fa839d0 100644
--- 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 ccad9fb6..5b35fbb2 100644
--- 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 ec341cb9..79b06929 100644
--- 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 25538d68..98795c83 100644
--- 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 e104236a..25d73394 100644
--- 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 c5f2d29c..bb1de8ad 100644
--- 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 d0226476..f20172cd 100644
--- 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 1713791f..96e60888 100644
--- 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 cdcdebd4..bd957fa4 100644
--- 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 a71d50df..0b6b1926 100644
--- 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.
*
* ----------------------------------------------------------------------- */