aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-01-16 17:56:12 +0000
committerng0 <ng0@n0.is>2019-01-16 17:56:12 +0000
commite3cb893de32c0d29528283fe2a4644994dc2ba8a (patch)
treeef9502ae871485c6a850c923b701d9b029296cc6 /contrib
parent32cd2c4a41ad05d9e5b689131968c5939862c6cb (diff)
parent750d2818314cf81c993cc17148bfd0bbd7ffcd16 (diff)
downloadgnunet-e3cb893de32c0d29528283fe2a4644994dc2ba8a.tar.gz
gnunet-e3cb893de32c0d29528283fe2a4644994dc2ba8a.zip
Merge branch 'license/spdx'
Diffstat (limited to 'contrib')
-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
-rw-r--r--contrib/scripts/terminate.py.in2
-rw-r--r--contrib/services/openrc/gnunet.initd4
-rw-r--r--contrib/test_gnunet_prefix.c2
8 files changed, 17 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 @@
6# modify it under the terms of version 2 of the GNU General Public 6# modify it under the terms of version 2 of the GNU General Public
7# License published by the Free Software Foundation. 7# License published by the Free Software Foundation.
8# 8#
9# SPDX-License-Identifier: GPL2.0
10#
9# This should be placed in /etc/apparmor.d/usr.sbin.gnunet-helper-nat-server 11# This should be placed in /etc/apparmor.d/usr.sbin.gnunet-helper-nat-server
10# This profile may be a reasonable starting point for other NAT helpers. 12# This profile may be a reasonable starting point for other NAT helpers.
11# 13#
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 @@
13# 13#
14# You should have received a copy of the GNU Affero General Public License 14# You should have received a copy of the GNU Affero General Public License
15# along with this program. If not, see <http://www.gnu.org/licenses/>. 15# along with this program. If not, see <http://www.gnu.org/licenses/>.
16 16#
17# SPDX-License-Identfier: AGPL3.0-or-later
17 18
18# Aggregate benchmarking data from multiple threads/processes 19# Aggregate benchmarking data from multiple threads/processes
19# generated by util/benchmark.c. 20# 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 @@
15# You should have received a copy of the GNU Affero General Public License 15# You should have received a copy of the GNU Affero General Public License
16# along with this program. If not, see <http://www.gnu.org/licenses/>. 16# along with this program. If not, see <http://www.gnu.org/licenses/>.
17# 17#
18# SPDX-License-Identifier: AGPL3.0-or-later
19#
18# File: gnunet-chk.py 20# File: gnunet-chk.py
19# Brief: Computes GNUNET style Content Hash Key for a given file 21# Brief: Computes GNUNET style Content Hash Key for a given file
20# Author: Sree Harsha Totakura 22# 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 @@
15# You should have received a copy of the GNU Affero General Public License 15# You should have received a copy of the GNU Affero General Public License
16# along with this program. If not, see <http://www.gnu.org/licenses/>. 16# along with this program. If not, see <http://www.gnu.org/licenses/>.
17# 17#
18# SPDX-License-Identifier: AGPL3.0-or-later
19#
18# Finds any gnunet processes still running in the system and kills them 20# Finds any gnunet processes still running in the system and kills them
19# 21#
20# gnunet janitor can be used by invoking `make' like this: 22# 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 @@
15# You should have received a copy of the GNU Affero General Public License 15# You should have received a copy of the GNU Affero General Public License
16# along with this program. If not, see <http://www.gnu.org/licenses/>. 16# along with this program. If not, see <http://www.gnu.org/licenses/>.
17# 17#
18# SPDX-License-Identifier: AGPL3.0-or-later
19#
18# Testcase for gnunet-peerinfo 20# Testcase for gnunet-peerinfo
19from __future__ import print_function 21from __future__ import print_function
20import os 22import os
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 @@
15# You should have received a copy of the GNU Affero General Public License 15# You should have received a copy of the GNU Affero General Public License
16# along with this program. If not, see <http://www.gnu.org/licenses/>. 16# along with this program. If not, see <http://www.gnu.org/licenses/>.
17# 17#
18# SPDX-License-Identifier: AGPL3.0-or-later
19#
18# Utility module that implements safe process termination for W32. 20# Utility module that implements safe process termination for W32.
19# For other platforms it's equivalent to Popen.kill () 21# For other platforms it's equivalent to Popen.kill ()
20# Requires pywin32 on W32. 22# 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 @@
1#!/sbin/openrc-run 1#!/sbin/openrc-run
2# Copyright 1999-2016 Gentoo Foundation 2# Copyright 1999-2016 Gentoo Authors
3# Copyright 2016 - 2019 ng0, lynX
3# Distributed under the terms of the GNU General Public License v2 4# Distributed under the terms of the GNU General Public License v2
5# SPDX-License-Identifier: GPL2.0
4 6
5if [ -d /run ] ; then 7if [ -d /run ] ; then
6 PIDFILE=${PIDFILE:-/run/gnunet/arm-service.pid} 8 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 @@
14 14
15 You should have received a copy of the GNU Affero General Public License 15 You should have received a copy of the GNU Affero General Public License
16 along with this program. If not, see <http://www.gnu.org/licenses/>. 16 along with this program. If not, see <http://www.gnu.org/licenses/>.
17
18 SPDX-License-Identifier: AGPL3.0-or-later
17 */ 19 */
18 20
19/** 21/**