[GNUnet-SVN] [www] branch master updated: Alexandros Theodotou <address@hidden> writes:

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository www.

The following commit(s) were added to refs/heads/master by this push:
     new fa3938c  Alexandros Theodotou <address@hidden> writes:
fa3938c is described below

commit fa3938c72265359c3447d2ed2acb2eab6081a66d
Author: Christian Grothoff <address@hidden>
AuthorDate: Tue Aug 13 21:13:54 2019 +0200

    Alexandros Theodotou <address@hidden> 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?
---
 Makefile        | 12 ++++++++++--
 i18nfix.py      |  8 +++++++-
 make_sitemap.sh |  7 +++++++
 template.py     | 10 +++++++++-
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 0510963..e3789b0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,12 @@
-# This file is in the public domain.
+#
+# Copyright (C) 2017, 2018, 2019 GNUnet e.V.
+#
+# 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.
+#
+# ----
 
 # All: build HTML pages in all languages and compile the
 # TypeScript logic in web-common.
@@ -92,7 +100,7 @@ docker: docker-all
 
 docker-all:
        docker build -t gnunet-www-builder .
-       # Importing via the shell like this is hacky, 
+       # Importing via the shell like this is hacky,
        # but after trying lots of other ways, this works most reliably...
        $(PYTHON) -c 'import i18nfix'
        docker run --rm -v $$(pwd):/tmp/ --user $$(id -u):$$(id -g) 
gnunet-www-builder
diff --git a/i18nfix.py b/i18nfix.py
index de58b95..7f326ba 100644
--- a/i18nfix.py
+++ b/i18nfix.py
@@ -1,5 +1,11 @@
 #!/usr/bin/env python3
-# This file is in the public domain.
+#
+# Copyright (C) 2017, 2018 GNUnet e.V.
+#
+# 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.
 
 """
 Extract translations from a Jinja2 template, stripping leading newlines.
diff --git a/make_sitemap.sh b/make_sitemap.sh
index 4777f94..bc2578d 100755
--- a/make_sitemap.sh
+++ b/make_sitemap.sh
@@ -1,5 +1,12 @@
 #!/bin/sh
 
+# Copyright (C) 2018, 2019 GNUnet e.V.
+#
+# 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.
+#
 # This initial version builds on code from ssg4
 # copyright is as follows:
 # -----
diff --git a/template.py b/template.py
index 6948807..a38a97a 100755
--- a/template.py
+++ b/template.py
@@ -1,6 +1,14 @@
 #!/usr/bin/env python3
 # coding: utf-8
-# This file is in the public domain.
+#
+# Copyright (C) 2017, 2018, 2019 GNUnet e.V.
+#
+# 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.
+#
+# ----
 #
 # This script runs the jinja2 templating engine on an input template-file
 # using the specified locale for gettext translations, and outputs

-- 
To stop receiving notification emails like this one, please contact
address@hidden.