Use SPDX license expressions.

slewsys · Feb 8, 2024 · 55bbfd8 · 55bbfd8
1 parent 6bdea60
commit 55bbfd8
Show file tree

Hide file tree

Showing 29 changed files with 161 additions and 50 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,6 +20,7 @@
 /po/Makefile.in
 /po/POTFILES
 /po/stamp-po
+/po/*.gmo
 /src/ed
 /src/ed.dSYM/**
 /stamp-h1

diff --git a/Makefile.am b/Makefile.am
@@ -1,7 +1,5 @@
 # Makefile.am: Top-level automake template for the ed line editor.
 #
-# Copyright © 1993-2018 Andrew L. Moore, SlewSys Research
-#
 # Process this file with automake to create Makefile.in
 
 gnulib_srcdir ?= /opt/src/savannah/gnulib

diff --git a/doc/Makefile.am b/doc/Makefile.am
@@ -1,7 +1,5 @@
 # Makefile.am: Doc subdirectory automake template for the ed line editor.
 #
-# Copyright © 1993-2018 Andrew L. Moore, SlewSys Research
-#
 # Process this file with automake to create Makefile.in
 
 PROG		= ed

diff --git a/doc/bwk/Makefile.am b/doc/bwk/Makefile.am
@@ -1,7 +1,5 @@
 # Makefile.am: Doc/tutorial automake template for the ed line editor.
 #
-# Copyright © 2006-2016 Andrew L. Moore, SlewSys Research
-#
 # Process this file with automake to create Makefile.in.
 
 SUFFIXES = .ps .pdf

diff --git a/lib_bsd/Makefile.am b/lib_bsd/Makefile.am
@@ -1,7 +1,5 @@
 # Makefile.am: Lib subdirectory automake template for the ed line editor.
 #
-# Copyright © 1993-2016 Andrew L. Moore, SlewSys Research
-#
 # Process this file with automake to create Makefile.in
 
 # BSD getopt(3) requires optreset -- ln -sf bsd_getopt.h getopt.h
@@ -18,12 +16,12 @@ libed_a_SOURCES =
 libed_a_LIBADD = $(LIBOBJS)
 
 AM_CPPFLAGS = -I$(top_srcdir)						      \
-              -I$(top_srcdir)/lib					      \
-              -I$(top_srcdir)/include					      \
-              -I$(top_builddir)						      \
-              -I$(top_builddir)/lib					      \
-              -I$(top_builddir)/include					      \
-              -DLOCALEDIR=\"$(localedir)\"
+	      -I$(top_srcdir)/lib					      \
+	      -I$(top_srcdir)/include					      \
+	      -I$(top_builddir)						      \
+	      -I$(top_builddir)/lib					      \
+	      -I$(top_builddir)/include					      \
+	      -DLOCALEDIR=\"$(localedir)\"
 
 localedir = $(datadir)/locale
 
@@ -39,7 +37,7 @@ if WITH_INCLUDED_REGEX
 noinst_HEADERS += regex.h
 libed_a_SOURCES += regex.c
 AM_CPPFLAGS += -DRE_ENABLE_I18N=1					      \
-               -D__USE_GNU=1						      \
-               -I$(top_srcdir)/regex					      \
-               -I$(top_builddir)/regex
+	       -D__USE_GNU=1						      \
+	       -I$(top_srcdir)/regex					      \
+	       -I$(top_builddir)/regex
 endif WITH_INCLUDED_REGEX
diff --git a/licenses/BSD-2-Clause.txt b/licenses/BSD-2-Clause.txt
@@ -0,0 +1,9 @@
+Copyright (c) <year> <owner> 
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/licenses/GPL-2.0-or-later.txt b/licenses/GPL-2.0-or-later.txt
diff --git a/licenses/MIT.txt b/licenses/MIT.txt
@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) <year> <copyright holders>
+
+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.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -1,7 +1,5 @@
 # Makefile.am: Src subdirectory automake template for the ed line editor.
 #
-# Copyright © 1993-2018 Andrew L. Moore, SlewSys Research
-#
 # Process this file with automake to create Makefile.in
 
 bin_PROGRAMS = ed

diff --git a/src/aux.c b/src/aux.c
@@ -2,7 +2,7 @@
  *
  *  Copyright © 1993-2022 Andrew L. Moore, SlewSys Research
  *
- *  This file is part of ed.
+ *  SPDX-License-Identifier:  BSD-2-Clause OR GPL-2.0-or-later OR MIT
  */
 
 #include "ed.h"

diff --git a/src/buf.c b/src/buf.c
@@ -2,7 +2,7 @@
  *
  *  Copyright © 1993-2022 Andrew L. Moore, SlewSys Research
  *
- *  This file is part of ed.
+ *  SPDX-License-Identifier:  BSD-2-Clause OR GPL-2.0-or-later OR MIT
  */
 
 #include "ed.h"

diff --git a/src/cbc.c b/src/cbc.c
@@ -1,12 +1,9 @@
-/* cbc.c: This file contains the encryption routines for the ed line editor */
-/*-
- * SPDX-License-Identifier: BSD-2-Clause
+/* cbc.c: This file contains the encryption routines for the ed line editor
  *
  *  Copyright © 1993 The Regents of the University of California.
- *
  *  Copyright © 2013, 2022 Andrew L. Moore, SlewSys Research
  *
- *  This file is part of ed.
+ *  SPDX-License-Identifier:  BSD-2-Clause OR GPL-2.0-or-later OR MIT
  */
 
 #include <pwd.h>

diff --git a/src/cmds.c b/src/cmds.c
@@ -2,7 +2,7 @@
  *
  *  Copyright © 1993-2018 Andrew L. Moore, SlewSys Research
  *
- *  This file is part of ed.
+ *  SPDX-License-Identifier:  BSD-2-Clause OR GPL-2.0-or-later OR MIT
  */
 
 #include "ed.h"

diff --git a/src/ed.h b/src/ed.h
@@ -1,8 +1,8 @@
 /* ed.h: Header for the ed line editor.
  *
- *  Copyright © 1993-2022 Andrew L. Moore, SlewSys Research
+ *  Copyright © 1993-2024 Andrew L. Moore, SlewSys Research
  *
- *  This file is part of ed.
+ *  SPDX-License-Identifier:  BSD-2-Clause OR GPL-2.0-or-later OR MIT
  */
 
 #include "config.h"

diff --git a/src/exec.c b/src/exec.c
@@ -2,7 +2,7 @@
  *
  *  Copyright © 1993-2022 Andrew L. Moore, SlewSys Research
  *
- *  This file is part of ed.
+ *  SPDX-License-Identifier:  BSD-2-Clause OR GPL-2.0-or-later OR MIT
  */
 
 #include "ed.h"

diff --git a/src/glbl.c b/src/glbl.c
@@ -2,7 +2,7 @@
  *
  *  Copyright © 1993-2022 Andrew L. Moore, SlewSys Research
  *
- *  This file is part of ed.
+ *  SPDX-License-Identifier:  BSD-2-Clause OR GPL-2.0-or-later OR MIT
  */
 
 #include "ed.h"

diff --git a/src/io.c b/src/io.c
@@ -2,7 +2,7 @@
  *
  *  Copyright © 1993-2022 Andrew L. Moore, SlewSys Research
  *
- *  This file is part of ed.
+ *  SPDX-License-Identifier:  BSD-2-Clause OR GPL-2.0-or-later OR MIT
  */
 
 #include "ed.h"

diff --git a/src/main.c b/src/main.c
@@ -2,7 +2,7 @@
  *
  *  Copyright © 1993-2023 Andrew L. Moore, SlewSys Research
  *
- *  This file is part of ed.
+ *  SPDX-License-Identifier:  BSD-2-Clause OR GPL-2.0-or-later OR MIT
  */
 
 #ifndef lint

diff --git a/src/page.c b/src/page.c
@@ -2,7 +2,7 @@
  *
  *  Copyright © 1993-2022 Andrew L. Moore, SlewSys Research
  *
- *  This file is part of ed.
+ *  SPDX-License-Identifier:  BSD-2-Clause OR GPL-2.0-or-later OR MIT
  */
 
 #include "ed.h"

diff --git a/src/parse.c b/src/parse.c
@@ -2,7 +2,7 @@
  *
  *  Copyright © 1993-2022 Andrew L. Moore, SlewSys Research
  *
- *  This file is part of ed.
+ *  SPDX-License-Identifier:  BSD-2-Clause OR GPL-2.0-or-later OR MIT
  */
 
 #include "ed.h"

diff --git a/src/re.c b/src/re.c
@@ -2,7 +2,7 @@
  *
  *  Copyright © 1993-2022 Andrew L. Moore, SlewSys Research
  *
- *  This file is part of ed.
+ *  SPDX-License-Identifier:  BSD-2-Clause OR GPL-2.0-or-later OR MIT
  */
 
 #include "ed.h"

diff --git a/src/signal.c b/src/signal.c
@@ -2,7 +2,7 @@
  *
  *  Copyright © 1993-2022 Andrew L. Moore, SlewSys Research
  *
- *  This file is part of ed.
+ *  SPDX-License-Identifier:  BSD-2-Clause OR GPL-2.0-or-later OR MIT
  */
 
 #include "ed.h"

diff --git a/src/sub.c b/src/sub.c
@@ -2,7 +2,7 @@
  *
  *  Copyright © 1993-2024 Andrew L. Moore, SlewSys Research
  *
- *  This file is part of ed.
+ *  SPDX-License-Identifier:  BSD-2-Clause OR GPL-2.0-or-later OR MIT
  */
 
 #include "ed.h"

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
@@ -1,7 +1,5 @@
 # Makefile.am: Testsuite subdirectory automake template for the ed line editor.
 #
-# Copyright © 1993-2017 Andrew L. Moore, SlewSys Research
-#
 # Process this file with automake to create Makefile.in.
 
 AUTOTEST      = $(AUTOM4TE) --language=autotest

diff --git a/testsuite/proto.err-at.in b/testsuite/proto.err-at.in
@@ -1,7 +1,5 @@
 # proto.err-at.in: Autotest template for the ed testsuite.
 #
-# Copyright © 2005-2018 Andrew L. Moore, SlewSys Research
-#
 # Process this file with autotest to create testsuite (see also Makefile.am).
 
 AT_SETUP([Pipe: @[email protected]])

diff --git a/testsuite/proto.fail-at.in b/testsuite/proto.fail-at.in
@@ -1,7 +1,5 @@
 # proto.fail-at.in: Autotest template for the ed testsuite.
 #
-# Copyright © 2005-2018 Andrew L. Moore, SlewSys Research
-#
 # Process this file with autotest to create testsuite (see also Makefile.am).
 
 AT_SETUP([Fail: @[email protected]])

diff --git a/testsuite/proto.ok-at.in b/testsuite/proto.ok-at.in
@@ -1,7 +1,5 @@
 # proto.ok-at.in: Autotest template for the ed testsuite.
 #
-# Copyright © 2005-2018 Andrew L. Moore, SlewSys Research
-#
 # Process this file with autotest to create testsuite (see also Makefile.am).
 
 AT_SETUP([Script: @[email protected]])

diff --git a/testsuite/proto.ok-mf-at.in b/testsuite/proto.ok-mf-at.in
@@ -1,7 +1,5 @@
 # proto.ok-mf-at.in: Autotest template for the ed testsuite.
 #
-# Copyright © 2021 Andrew L. Moore, SlewSys Research
-#
 # Process this file with autotest to create testsuite (see also Makefile.am).
 
 AT_SETUP([Script: @[email protected]])

diff --git a/testsuite/proto.ok-so-at.in.in b/testsuite/proto.ok-so-at.in.in
@@ -1,7 +1,5 @@
 # proto.ok-so-at.in: Autotest template for the ed testsuite.
 #
-# Copyright © 2005-2018 Andrew L. Moore, SlewSys Research
-#
 # Process this file with autotest to create testsuite (see also Makefile.am).
 
 AT_SETUP([Script: @[email protected]])