diff options
author | ng0 <ng0@n0.is> | 2019-01-16 09:25:11 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-01-16 09:25:11 +0000 |
commit | 750d2818314cf81c993cc17148bfd0bbd7ffcd16 (patch) | |
tree | 022e20eebe8eebdaaa35f32f9209407b9602aecd /contrib | |
parent | 1e9181264407912efca61e0c9a66fd51e0b9b188 (diff) | |
download | gnunet-750d2818314cf81c993cc17148bfd0bbd7ffcd16.tar.gz gnunet-750d2818314cf81c993cc17148bfd0bbd7ffcd16.zip |
More spdx identifiers. For openrc service file, adjust the header
to reflect changes in Gentoo (->Foundation=>Authors).
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/apparmor/usr.bin.gnunet-helper-nat-server | 2 | ||||
-rw-r--r-- | contrib/benchmark/collect.awk | 3 | ||||
-rwxr-xr-x | contrib/scripts/gnunet-chk.py.in | 2 | ||||
-rw-r--r-- | contrib/scripts/gnunet_janitor.py.in | 2 | ||||
-rw-r--r-- | contrib/scripts/gnunet_pyexpect.py.in | 2 | ||||
-rwxr-xr-x | contrib/scripts/spdx.sh | 26 | ||||
-rw-r--r-- | contrib/scripts/terminate.py.in | 2 | ||||
-rw-r--r-- | contrib/services/openrc/gnunet.initd | 4 | ||||
-rw-r--r-- | contrib/test_gnunet_prefix.c | 2 |
9 files changed, 43 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 |
19 | from __future__ import print_function | 21 | from __future__ import print_function |
20 | import os | 22 | 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 @@ | |||
1 | #!/bin/sh | ||
2 | # NetBSD compatible sed to insert spdx into headers. | ||
3 | # This is a one-shot script, future runs would result in duplicate | ||
4 | # lines. | ||
5 | # | ||
6 | # Copyright (C) 2019 ng0 <ng0@n0.is> | ||
7 | # | ||
8 | # Permission to use, copy, modify, and/or distribute this software | ||
9 | # for any purpose with or without fee is hereby granted. | ||
10 | # | ||
11 | # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL | ||
12 | # WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED | ||
13 | # WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL | ||
14 | # THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR | ||
15 | # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM | ||
16 | # LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, | ||
17 | # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN | ||
18 | # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
19 | # | ||
20 | # SPDX-License-Identifier: 0BSD | ||
21 | |||
22 | for x in $(egrep -nr -m1 "GNU Affero General Public License" . | cut -f1 -d':'); do | ||
23 | sed -i -e '/along with this program. If not, see <http:\/\/www.gnu.org\/licenses\/>./a\ | ||
24 | \ | ||
25 | SPDX-License-Identifier: AGPL3.0-or-later' $x; | ||
26 | 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 @@ | |||
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 | ||
5 | if [ -d /run ] ; then | 7 | if [ -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 | /** |