Merge branch 'license/spdx'

diff --git a/contrib/scripts/spdx.sh b/contrib/scripts/spdx.sh
deleted file mode 100755 (executable)
index c0c8780..0000000
--- a/contrib/scripts/spdx.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-# NetBSD compatible sed to insert spdx into headers.
-# This is a one-shot script, future runs would result in duplicate
-# lines.
-#
-# Copyright (C) 2019 ng0 <ng0@n0.is>
-#
-# Permission to use, copy, modify, and/or distribute this software
-# for any purpose with or without fee is hereby granted.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL 
-# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED 
-# WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL 
-# THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR 
-# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM 
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, 
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
-# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# SPDX-License-Identifier: 0BSD
-
-for x in $(egrep -nr -m1 "GNU Affero General Public License" . | cut -f1 -d':'); do
-  sed -i -e '/along with this program.  If not, see <http:\/\/www.gnu.org\/licenses\/>./a\
-\
-     SPDX-License-Identifier: AGPL3.0-or-later' $x;
-done

diff --git a/src/util/getopt.c b/src/util/getopt.c
index 4a7f35f516d031c35c1abd6fa22cc9cfdebf9854..5e8571ee571c7ca8f18250fb7d01ac1921a2b641 100644 (file)
--- a/src/util/getopt.c
+++ b/src/util/getopt.c
@@ -3,7 +3,7 @@
    "Keep this file name-space clean" means, talk to roland@gnu.ai.mit.edu
    before changing it!
 
-   Copyright Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97
+   Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97
      Free Software Foundation, Inc.
 
 NOTE: The canonical source of this file is maintained with the GNU C Library.
@@ -26,7 +26,7 @@ USA.
 
 
 This code was heavily modified for GNUnet.
-Copyright Copyright (C) 2006, 2017 Christian Grothoff
+Copyright (C) 2006, 2017 Christian Grothoff
 */
 
 /**