From 750d2818314cf81c993cc17148bfd0bbd7ffcd16 Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 16 Jan 2019 09:25:11 +0000 Subject: More spdx identifiers. For openrc service file, adjust the header to reflect changes in Gentoo (->Foundation=>Authors). --- contrib/apparmor/usr.bin.gnunet-helper-nat-server | 2 ++ contrib/benchmark/collect.awk | 3 ++- contrib/scripts/gnunet-chk.py.in | 2 ++ contrib/scripts/gnunet_janitor.py.in | 2 ++ contrib/scripts/gnunet_pyexpect.py.in | 2 ++ contrib/scripts/spdx.sh | 26 +++++++++++++++++++++++ contrib/scripts/terminate.py.in | 2 ++ contrib/services/openrc/gnunet.initd | 4 +++- contrib/test_gnunet_prefix.c | 2 ++ doc/handbook/gendocs.sh | 2 ++ src/util/w32cat.c | 2 ++ 11 files changed, 47 insertions(+), 2 deletions(-) create mode 100755 contrib/scripts/spdx.sh diff --git a/contrib/apparmor/usr.bin.gnunet-helper-nat-server b/contrib/apparmor/usr.bin.gnunet-helper-nat-server index d590021d5..637c9aa7c 100644 --- a/contrib/apparmor/usr.bin.gnunet-helper-nat-server +++ b/contrib/apparmor/usr.bin.gnunet-helper-nat-server @@ -6,6 +6,8 @@ # modify it under the terms of version 2 of the GNU General Public # License published by the Free Software Foundation. # +# SPDX-License-Identifier: GPL2.0 +# # This should be placed in /etc/apparmor.d/usr.sbin.gnunet-helper-nat-server # This profile may be a reasonable starting point for other NAT helpers. # diff --git a/contrib/benchmark/collect.awk b/contrib/benchmark/collect.awk index 16f2e700c..264f2113e 100644 --- a/contrib/benchmark/collect.awk +++ b/contrib/benchmark/collect.awk @@ -13,7 +13,8 @@ # # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . - +# +# SPDX-License-Identfier: AGPL3.0-or-later # Aggregate benchmarking data from multiple threads/processes # generated by util/benchmark.c. diff --git a/contrib/scripts/gnunet-chk.py.in b/contrib/scripts/gnunet-chk.py.in index cabaef6c4..c60211556 100755 --- a/contrib/scripts/gnunet-chk.py.in +++ b/contrib/scripts/gnunet-chk.py.in @@ -15,6 +15,8 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # +# SPDX-License-Identifier: AGPL3.0-or-later +# # File: gnunet-chk.py # Brief: Computes GNUNET style Content Hash Key for a given file # Author: Sree Harsha Totakura diff --git a/contrib/scripts/gnunet_janitor.py.in b/contrib/scripts/gnunet_janitor.py.in index cbe96a8eb..4ae9ad124 100644 --- a/contrib/scripts/gnunet_janitor.py.in +++ b/contrib/scripts/gnunet_janitor.py.in @@ -15,6 +15,8 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # +# SPDX-License-Identifier: AGPL3.0-or-later +# # Finds any gnunet processes still running in the system and kills them # # gnunet janitor can be used by invoking `make' like this: diff --git a/contrib/scripts/gnunet_pyexpect.py.in b/contrib/scripts/gnunet_pyexpect.py.in index f155db5be..810d5b321 100644 --- a/contrib/scripts/gnunet_pyexpect.py.in +++ b/contrib/scripts/gnunet_pyexpect.py.in @@ -15,6 +15,8 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # +# SPDX-License-Identifier: AGPL3.0-or-later +# # Testcase for gnunet-peerinfo from __future__ import print_function import os diff --git a/contrib/scripts/spdx.sh b/contrib/scripts/spdx.sh new file mode 100755 index 000000000..c0c87809f --- /dev/null +++ b/contrib/scripts/spdx.sh @@ -0,0 +1,26 @@ +#!/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 +# +# 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 ./a\ +\ + SPDX-License-Identifier: AGPL3.0-or-later' $x; +done diff --git a/contrib/scripts/terminate.py.in b/contrib/scripts/terminate.py.in index 30f5dc97f..161b4db61 100644 --- a/contrib/scripts/terminate.py.in +++ b/contrib/scripts/terminate.py.in @@ -15,6 +15,8 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # +# SPDX-License-Identifier: AGPL3.0-or-later +# # Utility module that implements safe process termination for W32. # For other platforms it's equivalent to Popen.kill () # Requires pywin32 on W32. diff --git a/contrib/services/openrc/gnunet.initd b/contrib/services/openrc/gnunet.initd index c042e3de1..cdf296ebd 100644 --- a/contrib/services/openrc/gnunet.initd +++ b/contrib/services/openrc/gnunet.initd @@ -1,6 +1,8 @@ #!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2016 Gentoo Authors +# Copyright 2016 - 2019 ng0, lynX # Distributed under the terms of the GNU General Public License v2 +# SPDX-License-Identifier: GPL2.0 if [ -d /run ] ; then PIDFILE=${PIDFILE:-/run/gnunet/arm-service.pid} diff --git a/contrib/test_gnunet_prefix.c b/contrib/test_gnunet_prefix.c index 4614ee9e2..1a3c9a7ba 100644 --- a/contrib/test_gnunet_prefix.c +++ b/contrib/test_gnunet_prefix.c @@ -14,6 +14,8 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . + + SPDX-License-Identifier: AGPL3.0-or-later */ /** diff --git a/doc/handbook/gendocs.sh b/doc/handbook/gendocs.sh index 3b71b36a2..79c92c9ad 100755 --- a/doc/handbook/gendocs.sh +++ b/doc/handbook/gendocs.sh @@ -19,6 +19,8 @@ scriptversion=2016-12-31.18 # You should have received a copy of the GNU General Public License # along with this program. If not, see . # +# SPDX-License-Identifier: GPL3.0-or-later +# # Original author: Mohit Agarwal. # Send bug reports and any other correspondence to bug-gnulib@gnu.org. # diff --git a/src/util/w32cat.c b/src/util/w32cat.c index f2a0feac5..8a48638aa 100644 --- a/src/util/w32cat.c +++ b/src/util/w32cat.c @@ -16,6 +16,8 @@ along with cat; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + SPDX-License-Identifier: AGPL3.0-or-later */ #include -- cgit v1.2.3