aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-08-13 21:13:54 +0200
committerChristian Grothoff <christian@grothoff.org>2019-08-13 21:13:54 +0200
commitfa3938c72265359c3447d2ed2acb2eab6081a66d (patch)
treed57e23e33e9dc772f63781a95b4804cb480f1ebc
parent08724a4492d141e3cab8e10aa7cc6efbdb06efb1 (diff)
downloadwww-fa3938c72265359c3447d2ed2acb2eab6081a66d.tar.gz
www-fa3938c72265359c3447d2ed2acb2eab6081a66d.zip
Alexandros Theodotou <alex@zrythm.org> writes:
Re: our discussion on IRC: There are at least two files in the GNUnet website source code that have unclear licenses, rendering them proprietary. https://git.gnunet.org/www.git/tree/i18nfix.py https://git.gnunet.org/www.git/tree/template.py These files have no license or copyright notices. They simply say that "this file is in the public domain". In at least European countries, saying that "this file is in the public domain" is not enough to put something in the public domain. You have to explicitly use a license such as CC0 or WTFPL, otherwise the files are "all rights reserved". I'm not really sure you can assume that these files are GPL'd either, otherwise they'd have a copyright notice. So in effect, these files are proprietary. I can't copy them and use them in my (A)GPL project. For such files, if you want to be lax, the GNU package maintainer guidelines generally recommend this: """ Copyright (C) 2019 <name> Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright notice and this notice are preserved. This file is offered as-is, without any warranty. """ Can we add appropriate headers or footers to the files please?
-rw-r--r--Makefile12
-rw-r--r--i18nfix.py8
-rwxr-xr-xmake_sitemap.sh7
-rwxr-xr-xtemplate.py10
4 files changed, 33 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 05109636..e3789b05 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,12 @@
1# This file is in the public domain. 1#
2# Copyright (C) 2017, 2018, 2019 GNUnet e.V.
3#
4# Copying and distribution of this file, with or without modification,
5# are permitted in any medium without royalty provided the copyright
6# notice and this notice are preserved. This file is offered as-is,
7# without any warranty.
8#
9# ----
2 10
3# All: build HTML pages in all languages and compile the 11# All: build HTML pages in all languages and compile the
4# TypeScript logic in web-common. 12# TypeScript logic in web-common.
@@ -92,7 +100,7 @@ docker: docker-all
92 100
93docker-all: 101docker-all:
94 docker build -t gnunet-www-builder . 102 docker build -t gnunet-www-builder .
95 # Importing via the shell like this is hacky, 103 # Importing via the shell like this is hacky,
96 # but after trying lots of other ways, this works most reliably... 104 # but after trying lots of other ways, this works most reliably...
97 $(PYTHON) -c 'import i18nfix' 105 $(PYTHON) -c 'import i18nfix'
98 docker run --rm -v $$(pwd):/tmp/ --user $$(id -u):$$(id -g) gnunet-www-builder 106 docker run --rm -v $$(pwd):/tmp/ --user $$(id -u):$$(id -g) gnunet-www-builder
diff --git a/i18nfix.py b/i18nfix.py
index de58b954..7f326ba6 100644
--- a/i18nfix.py
+++ b/i18nfix.py
@@ -1,5 +1,11 @@
1#!/usr/bin/env python3 1#!/usr/bin/env python3
2# This file is in the public domain. 2#
3# Copyright (C) 2017, 2018 GNUnet e.V.
4#
5# Copying and distribution of this file, with or without modification,
6# are permitted in any medium without royalty provided the copyright
7# notice and this notice are preserved. This file is offered as-is,
8# without any warranty.
3 9
4""" 10"""
5Extract translations from a Jinja2 template, stripping leading newlines. 11Extract translations from a Jinja2 template, stripping leading newlines.
diff --git a/make_sitemap.sh b/make_sitemap.sh
index 4777f948..bc2578d7 100755
--- a/make_sitemap.sh
+++ b/make_sitemap.sh
@@ -1,5 +1,12 @@
1#!/bin/sh 1#!/bin/sh
2 2
3# Copyright (C) 2018, 2019 GNUnet e.V.
4#
5# Copying and distribution of this file, with or without modification,
6# are permitted in any medium without royalty provided the copyright
7# notice and this notice are preserved. This file is offered as-is,
8# without any warranty.
9#
3# This initial version builds on code from ssg4 10# This initial version builds on code from ssg4
4# copyright is as follows: 11# copyright is as follows:
5# ----- 12# -----
diff --git a/template.py b/template.py
index 69488078..a38a97a8 100755
--- a/template.py
+++ b/template.py
@@ -1,6 +1,14 @@
1#!/usr/bin/env python3 1#!/usr/bin/env python3
2# coding: utf-8 2# coding: utf-8
3# This file is in the public domain. 3#
4# Copyright (C) 2017, 2018, 2019 GNUnet e.V.
5#
6# Copying and distribution of this file, with or without modification,
7# are permitted in any medium without royalty provided the copyright
8# notice and this notice are preserved. This file is offered as-is,
9# without any warranty.
10#
11# ----
4# 12#
5# This script runs the jinja2 templating engine on an input template-file 13# This script runs the jinja2 templating engine on an input template-file
6# using the specified locale for gettext translations, and outputs 14# using the specified locale for gettext translations, and outputs