summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-01-16 09:25:11 +0000
committerng0 <ng0@n0.is>2019-01-16 09:25:11 +0000
commit750d2818314cf81c993cc17148bfd0bbd7ffcd16 (patch)
tree022e20eebe8eebdaaa35f32f9209407b9602aecd
parent1e9181264407912efca61e0c9a66fd51e0b9b188 (diff)
More spdx identifiers. For openrc service file, adjust the header
to reflect changes in Gentoo (->Foundation=>Authors).
-rw-r--r--contrib/apparmor/usr.bin.gnunet-helper-nat-server2
-rw-r--r--contrib/benchmark/collect.awk3
-rwxr-xr-xcontrib/scripts/gnunet-chk.py.in2
-rw-r--r--contrib/scripts/gnunet_janitor.py.in2
-rw-r--r--contrib/scripts/gnunet_pyexpect.py.in2
-rwxr-xr-xcontrib/scripts/spdx.sh26
-rw-r--r--contrib/scripts/terminate.py.in2
-rw-r--r--contrib/services/openrc/gnunet.initd4
-rw-r--r--contrib/test_gnunet_prefix.c2
-rwxr-xr-xdoc/handbook/gendocs.sh2
-rw-r--r--src/util/w32cat.c2
11 files changed, 47 insertions, 2 deletions
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 <http://www.gnu.org/licenses/>.
-
+#
+# 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 <http://www.gnu.org/licenses/>.
#
+# 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 <http://www.gnu.org/licenses/>.
#
+# 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 <http://www.gnu.org/licenses/>.
#
+# 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 <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/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 <http://www.gnu.org/licenses/>.
#
+# 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 <http://www.gnu.org/licenses/>.
+
+ 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 <http://www.gnu.org/licenses/>.
#
+# 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 <stdio.h>