From 526ca6a27230eb41710b547b4053ec17e1933eda Mon Sep 17 00:00:00 2001 From: Goffi Date: Thu, 23 Apr 2015 10:57:40 +0200 Subject: [PATCH] tmp (wokkel): licenses fixes: the licenses headers were wrong, it was fixed: original work from Adrien Cossa is directly under AGPL v3 (with his agreement), work derivated from Wokkel is sublicensed to AGPL v3 as allowed by the original license, to stay consistent with the rest of the code base. Theses files (and only these ones) can be relicensed again to fill Wokkel license if Ralph plan to merge them upstream... --- src/tmp/wokkel/delay.py | 48 +++++++++++++++++++++++++++++++++++++++ src/tmp/wokkel/mam.py | 16 +++++++++++++ src/tmp/wokkel/pubsub.py | 49 ++++++++++++++++++++++++++++++++++++++-- src/tmp/wokkel/rsm.py | 17 ++++++++++++-- 4 files changed, 126 insertions(+), 4 deletions(-) diff --git a/src/tmp/wokkel/delay.py b/src/tmp/wokkel/delay.py index 4de09959..0af1ad83 100644 --- a/src/tmp/wokkel/delay.py +++ b/src/tmp/wokkel/delay.py @@ -1,5 +1,53 @@ # -*- test-case-name: wokkel.test.test_delay -*- # +# SàT adaptation for wokkel.delay +# Copyright (C) 2015 Adien Cossa (souliane@mailoo.org) +# Copyright (c) 2003-2012 Ralph Meijer. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero 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 Affero General Public License for more details. + +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# -- + +# This program is based on wokkel (https://wokkel.ik.nu/), +# originaly written by Ralph Meijer +# It is sublicensed under AGPL v3 (or any later version) as allowed by the original +# license. + +# -- + +# Here is a copy of the original license: + +# Copyright (c) 2003-2012 Ralph Meijer. +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# # Copyright (c) Ralph Meijer. # See LICENSE for details. diff --git a/src/tmp/wokkel/mam.py b/src/tmp/wokkel/mam.py index 37996024..7432a65e 100644 --- a/src/tmp/wokkel/mam.py +++ b/src/tmp/wokkel/mam.py @@ -1,5 +1,21 @@ # -*- test-case-name: wokkel.test.test_mam -*- # +# SàT Wokkel extension for Message Archive Management (XEP-0313) +# Copyright (C) 2015 Adien Cossa (souliane@mailoo.org) + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero 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 Affero General Public License for more details. + +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# # Copyright (c) Adrien Cossa. # See LICENSE for details. diff --git a/src/tmp/wokkel/pubsub.py b/src/tmp/wokkel/pubsub.py index 3401e8aa..f6210889 100755 --- a/src/tmp/wokkel/pubsub.py +++ b/src/tmp/wokkel/pubsub.py @@ -1,7 +1,52 @@ # -*- test-case-name: wokkel.test.test_pubsub -*- # -# Copyright (c) Ralph Meijer. -# See LICENSE for details. +# SàT adaptation for wokkel.pubsub +# Copyright (C) 2015 Adien Cossa (souliane@mailoo.org) +# Copyright (c) 2003-2012 Ralph Meijer. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero 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 Affero General Public License for more details. + +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# -- + +# This program is based on wokkel (https://wokkel.ik.nu/), +# originaly written by Ralph Meijer +# It is sublicensed under AGPL v3 (or any later version) as allowed by the original +# license. + +# -- + +# Here is a copy of the original license: + +# Copyright (c) 2003-2012 Ralph Meijer. +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. """ XMPP publish-subscribe protocol. diff --git a/src/tmp/wokkel/rsm.py b/src/tmp/wokkel/rsm.py index 6aac96b4..6ad41268 100644 --- a/src/tmp/wokkel/rsm.py +++ b/src/tmp/wokkel/rsm.py @@ -1,7 +1,20 @@ # -*- test-case-name: wokkel.test.test_rsm -*- # -# Copyright (c) Adrien Cossa. -# See LICENSE for details. +# SàT Wokkel extension for Result Set Management (XEP-0059) +# Copyright (C) 2015 Adien Cossa (souliane@mailoo.org) + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero 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 Affero General Public License for more details. + +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . """ XMPP Result Set Management protocol.