From 8fe8b36813cdb92fb62e31ca418c2542002e020b Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 20 Sep 2021 19:38:02 +0100 Subject: [PATCH] Update GPLv3 compliance - ensure files all have GPL header and coypright didaplyed. Tge project is licenced under this licence anyway but this is for completeness. GPLv3 is code is copyrighted code and should be correctly used and attributed. --- docker-configs/Dockerfile-hbmonv2 | 20 +++++++++++++++++++- docker-configs/Dockerfile-hdstack | 18 ++++++++++++++++++ docker-configs/Dockerfile-noproxy | 18 ++++++++++++++++++ docker-configs/Dockerfile-proxy | 17 +++++++++++++++++ docker-configs/docker-compose-ipv6.yml | 17 +++++++++++++++++ docker-configs/docker-compose.yml | 18 ++++++++++++++++++ docker-configs/docker-compose_install.sh | 18 ++++++++++++++++++ docker-configs/entrypoint-hbmonv2 | 19 +++++++++++++++++++ docker-configs/entrypoint-hdstack | 18 ++++++++++++++++++ docker-configs/entrypoint-noproxy | 18 ++++++++++++++++++ docker-configs/entrypoint-proxy | 17 +++++++++++++++++ docker-configs/update_freedmr.sh | 9 --------- hotspot_proxy_v2.py | 18 ++++++++++++++++++ i8n_voice_map.py | 17 +++++++++++++++++ read_ambe.py | 17 +++++++++++++++++ voice_lib.py | 18 ++++++++++++++++++ 16 files changed, 267 insertions(+), 10 deletions(-) delete mode 100755 docker-configs/update_freedmr.sh diff --git a/docker-configs/Dockerfile-hbmonv2 b/docker-configs/Dockerfile-hbmonv2 index b8a5393..7e9a258 100644 --- a/docker-configs/Dockerfile-hbmonv2 +++ b/docker-configs/Dockerfile-hbmonv2 @@ -1,4 +1,22 @@ -aplFROM python:3.7-alpine +############################################################################### +# Copyright (C) 2020 Simon Adlem, G7RZU +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +############################################################################### + +FROM python:3.7-alpine COPY entrypoint-proxy /entrypoint diff --git a/docker-configs/Dockerfile-hdstack b/docker-configs/Dockerfile-hdstack index f3f96c7..b27d1ad 100644 --- a/docker-configs/Dockerfile-hdstack +++ b/docker-configs/Dockerfile-hdstack @@ -1,3 +1,21 @@ +############################################################################### +# Copyright (C) 2020 Simon Adlem, G7RZU +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +############################################################################### + FROM python:3.7-alpine COPY entrypoint-proxy /entrypoint diff --git a/docker-configs/Dockerfile-noproxy b/docker-configs/Dockerfile-noproxy index 608cf73..4cd053b 100644 --- a/docker-configs/Dockerfile-noproxy +++ b/docker-configs/Dockerfile-noproxy @@ -1,3 +1,21 @@ +############################################################################### +# Copyright (C) 2020 Simon Adlem, G7RZU +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +############################################################################### + FROM python:3.7-alpine COPY entrypoint-noproxy /entrypoint diff --git a/docker-configs/Dockerfile-proxy b/docker-configs/Dockerfile-proxy index 4fa5fd7..d6bc147 100644 --- a/docker-configs/Dockerfile-proxy +++ b/docker-configs/Dockerfile-proxy @@ -1,3 +1,20 @@ +############################################################################### +# Copyright (C) 2020 Simon Adlem, G7RZU +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +############################################################################### FROM python:3.9-alpine COPY entrypoint-proxy /entrypoint diff --git a/docker-configs/docker-compose-ipv6.yml b/docker-configs/docker-compose-ipv6.yml index 4a9fe30..734de38 100644 --- a/docker-configs/docker-compose-ipv6.yml +++ b/docker-configs/docker-compose-ipv6.yml @@ -1,3 +1,20 @@ +############################################################################### +# Copyright (C) 2020 Simon Adlem, G7RZU +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +############################################################################### version: '2.1' services: freedmr: diff --git a/docker-configs/docker-compose.yml b/docker-configs/docker-compose.yml index 55be031..025c165 100644 --- a/docker-configs/docker-compose.yml +++ b/docker-configs/docker-compose.yml @@ -1,3 +1,21 @@ +############################################################################### +# Copyright (C) 2020 Simon Adlem, G7RZU +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +############################################################################### + version: '2.1' services: freedmr: diff --git a/docker-configs/docker-compose_install.sh b/docker-configs/docker-compose_install.sh index ca5d40a..bfe3321 100644 --- a/docker-configs/docker-compose_install.sh +++ b/docker-configs/docker-compose_install.sh @@ -1,4 +1,22 @@ #!/bin/bash +# +############################################################################### +# Copyright (C) 2020 Simon Adlem, G7RZU +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +############################################################################### echo FreeDMR Docker installer... diff --git a/docker-configs/entrypoint-hbmonv2 b/docker-configs/entrypoint-hbmonv2 index dc7e71c..c7d3b0b 100755 --- a/docker-configs/entrypoint-hbmonv2 +++ b/docker-configs/entrypoint-hbmonv2 @@ -1,4 +1,23 @@ #!/bin/sh +############################################################################### +# Copyright (C) 2020 Simon Adlem, G7RZU +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +############################################################################### + + cd /opt/HBMonv2 python /opt/HBMonv2/monitor.py & diff --git a/docker-configs/entrypoint-hdstack b/docker-configs/entrypoint-hdstack index de4276c..915df70 100755 --- a/docker-configs/entrypoint-hdstack +++ b/docker-configs/entrypoint-hdstack @@ -1,5 +1,23 @@ #!/bin/sh +############################################################################### +# Copyright (C) 2020 Simon Adlem, G7RZU +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +############################################################################### + cd /opt/freedmr python /opt/freedmr/hdstack/hotspot_proxy_v2.py & python /opt/freedmr/bridge_master.py -c freedmr.cfg -r rules.py & diff --git a/docker-configs/entrypoint-noproxy b/docker-configs/entrypoint-noproxy index 7e208ae..2cab8e8 100755 --- a/docker-configs/entrypoint-noproxy +++ b/docker-configs/entrypoint-noproxy @@ -1,4 +1,22 @@ #!/bin/sh +############################################################################### +# Copyright (C) 2020 Simon Adlem, G7RZU +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +############################################################################### + cd /opt/freedmr python /opt/freedmr/bridge_master.py -c freedmr.cfg -r rules.py diff --git a/docker-configs/entrypoint-proxy b/docker-configs/entrypoint-proxy index 41a89e5..8fdbbca 100755 --- a/docker-configs/entrypoint-proxy +++ b/docker-configs/entrypoint-proxy @@ -1,4 +1,21 @@ #!/bin/sh +############################################################################### +# Copyright (C) 2020 Simon Adlem, G7RZU +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +############################################################################### cd /opt/freedmr python /opt/freedmr/hotspot_proxy_v2.py & diff --git a/docker-configs/update_freedmr.sh b/docker-configs/update_freedmr.sh deleted file mode 100755 index 0256d81..0000000 --- a/docker-configs/update_freedmr.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -docker pull hacknix/freedmr:latest && -docker container rm freedmr --force && -docker run --name=freedmr -d --read-only -v /etc/freedmr/freedmr.cfg:/opt/freedmr/freedmr.cfg \ --v /var/log/freedmr/freedmr.log:/opt/freedmr/freedmr.log \ --v /etc/freedmr/rules.py:/opt/freedmr/rules.py -p 62031:62031/udp -p 62036-62046:62036-62046/udp \ --p 4321:4321/tcp hacknix/freedmr:latest -conntrack -F diff --git a/hotspot_proxy_v2.py b/hotspot_proxy_v2.py index 34598a0..da17699 100644 --- a/hotspot_proxy_v2.py +++ b/hotspot_proxy_v2.py @@ -1,3 +1,21 @@ +############################################################################### +# Copyright (C) 2020 Simon Adlem, G7RZU +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +############################################################################### + from twisted.internet.protocol import DatagramProtocol from twisted.internet import reactor, task from time import time diff --git a/i8n_voice_map.py b/i8n_voice_map.py index 7ab3dac..7195fde 100644 --- a/i8n_voice_map.py +++ b/i8n_voice_map.py @@ -1,3 +1,20 @@ +############################################################################### +# Copyright (C) 2020 Simon Adlem, G7RZU +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +############################################################################### voiceMap = { 'en_GB': { 'A': 'alpha', diff --git a/read_ambe.py b/read_ambe.py index 3d5506d..0442aba 100644 --- a/read_ambe.py +++ b/read_ambe.py @@ -1,3 +1,20 @@ +############################################################################### +# Copyright (C) 2020 Simon Adlem, G7RZU +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +############################################################################### from bitarray import bitarray from itertools import islice import os diff --git a/voice_lib.py b/voice_lib.py index 7266e67..aaf9625 100644 --- a/voice_lib.py +++ b/voice_lib.py @@ -1,3 +1,21 @@ +############################################################################### +# Copyright (C) 2020 Simon Adlem, G7RZU +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +############################################################################### + from bitarray import bitarray words = {