From ccb030cbf89faa271b50a9b5a7749ce52c754006 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Thu, 18 Jan 2024 00:40:22 +0100 Subject: [PATCH 1/3] moving to the "i'm so tired" software license 1.0 --- LICENSE | 35 +++++++++++++++++++++++++---------- doc/DESCRIPTION.md | 2 ++ doc/DESCRIPTION_fr.md | 2 ++ doc/PRE_INSTALL.md | 2 ++ doc/PRE_INSTALL_fr.md | 2 ++ doc/PRE_UPGRADE.d/0.13.1~ynh2 | 1 + manifest.toml | 2 +- 7 files changed, 35 insertions(+), 11 deletions(-) create mode 100644 doc/PRE_UPGRADE.d/0.13.1~ynh2 diff --git a/LICENSE b/LICENSE index e375459..abeb8e0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,14 +1,29 @@ - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - Version 2, December 2004 +# "i'm so tired" software license 1.0 -Copyright (C) 2004 Sam Hocevar +copyright (c) [2024] [OniriCorpe and other YunoHost contributors] -Everyone is permitted to copy and distribute verbatim or modified -copies of this license document, and changing it is allowed as long -as the name is changed. +this is anti-capitalist, anti-bigotry software, made by people who are tired of ill-intended organisations and individuals, and would rather not have those around their creations. - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION +permission is granted, free of charge, to any user (be they a person or an organisation) obtaining a copy of this software, to use it for personal, commercial, or educational purposes, subject to the following conditions: - 0. You just DO WHAT THE FUCK YOU WANT TO. - \ No newline at end of file +1. the above copyright notice and this permission notice shall be included in all copies or modified versions of this software. + +2. the user is one of the following: + a. an individual person, labouring for themselves + b. a non-profit organisation + c. an educational institution + d. an organization that seeks shared profit for all of its members, and allows non-members to set the cost of their labor + +3. if the user is an organization with owners, then all owners are workers and all workers are owners with equal equity and/or equal vote. + +4. if the user is an organization, then the user is not law enforcement or military, or working for or under either. + +5. the user does not use the software for ill-intentioned reasons, as determined by the authors of the software. said reasons include but are not limited to: + a. bigotry, including but not limited to racism, xenophobia, homophobia, transphobia, ableism, sexism, antisemitism, religious intolerance + b. pedophilia, zoophilia, and/or incest + c. support for cops and/or the military + d. any blockchain-related technology, including but not limited to cryptocurrencies + +6. the user does not promote or engage with any of the activities listed in the previous item, and is not affiliated with any group that promotes or engages with any of such activities. + +this software is provided as is, without any warranty or condition. in no event shall the authors be liable to anyone for any damages related to this software or this license, under any kind of legal claim. diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index db620d2..734e50d 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -4,3 +4,5 @@ With GoToSocial, you can keep in touch with your friends, post, read, and share The official documentation is at [docs.gotosocial.org](https://docs.gotosocial.org). The documentation for this YunoHost package [can be read here](./doc/DOCS.md) and the admin is **strongly encouraged to read it**! + +Please note that this package uses the ["i'm so tired" software license 1.0](https://github.com/YunoHost-Apps/gotosocial_ynh/blob/master/LICENSE), please read it and accept it before proceeding with installation. diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md index d920822..084fba3 100644 --- a/doc/DESCRIPTION_fr.md +++ b/doc/DESCRIPTION_fr.md @@ -4,3 +4,5 @@ Avec GoToSocial, vous pouvez rester en contact avec vos amis, publier, lire et p Vous pouvez consulter la documentation officielle à l'adresse : [docs.gotosocial.org](https://docs.gotosocial.org). La documentation de ce paquet YunoHost [est lisible ici](./doc/DOCS_fr.md) et l'admin est **vivement encouragé-e à la lire** ! + +Veuillez noter que ce paquet utilise la ["i'm so tired" software license 1.0](https://github.com/YunoHost-Apps/gotosocial_ynh/blob/master/LICENSE), veuillez la lire et l'accepter avant de procéder à l'installation. diff --git a/doc/PRE_INSTALL.md b/doc/PRE_INSTALL.md index 6a5c546..14cb323 100644 --- a/doc/PRE_INSTALL.md +++ b/doc/PRE_INSTALL.md @@ -7,3 +7,5 @@ Please note the following points: - GoToSocial **does not provide a user interface**. You will need to use a Mastodon-compatible client such as [Tusky](https://tusky.app/) on Android, [Feditext](https://fedi.software/@Feditext) for iOS or an instance of [Semaphore](https://semaphore.social/) on the Web. + +Also this package uses the ["i'm so tired" software license 1.0](https://github.com/YunoHost-Apps/gotosocial_ynh/blob/master/LICENSE), please read it and accept it before proceeding with installation. diff --git a/doc/PRE_INSTALL_fr.md b/doc/PRE_INSTALL_fr.md index ed2af3f..1fe8413 100644 --- a/doc/PRE_INSTALL_fr.md +++ b/doc/PRE_INSTALL_fr.md @@ -7,3 +7,5 @@ Veuillez noter les points suivant : - GoToSocial **ne dispose pas d'une interface utilisateur-ice**. Vous devrez utiliser un client compatible avec Mastodon comme [Tusky](https://tusky.app/) sur Android, [Feditext](https://fedi.software/@Feditext) sur iOS ou une instance de [Semaphore](https://semaphore.social/) en Web. + +Aussi, ce paquet utilise la ["i'm so tired" software license 1.0](https://github.com/YunoHost-Apps/gotosocial_ynh/blob/master/LICENSE), veuillez la lire et l'accepter avant de procéder à l'installation. diff --git a/doc/PRE_UPGRADE.d/0.13.1~ynh2 b/doc/PRE_UPGRADE.d/0.13.1~ynh2 new file mode 100644 index 0000000..adc44ff --- /dev/null +++ b/doc/PRE_UPGRADE.d/0.13.1~ynh2 @@ -0,0 +1 @@ +From now on this package will use the ["i'm so tired" software license 1.0](https://github.com/YunoHost-Apps/gotosocial_ynh/blob/master/LICENSE), please read it and accept it before proceeding with update. \ No newline at end of file diff --git a/manifest.toml b/manifest.toml index 9cd40a0..fe6d845 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "GoToSocial" description.en = "Fast ActivityPub social network server written in Go" description.fr = "Serveur de réseau social véloce basé sur ActivityPub écrit en Go" -version = "0.13.1~ynh1" +version = "0.13.1~ynh2" maintainers = ["OniriCorpe"] From d12b80a97b903e5ee32549cd5286a4f38dd98758 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 17 Jan 2024 23:40:29 +0000 Subject: [PATCH 2/3] Auto-update README --- README.md | 4 +++- README_fr.md | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a7ebcf1..46607d5 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,10 @@ With GoToSocial, you can keep in touch with your friends, post, read, and share The official documentation is at [docs.gotosocial.org](https://docs.gotosocial.org). The documentation for this YunoHost package [can be read here](./doc/DOCS.md) and the admin is **strongly encouraged to read it**! +Please note that this package uses the ["i'm so tired" software license 1.0](https://github.com/YunoHost-Apps/gotosocial_ynh/blob/master/LICENSE), please read it and accept it before proceeding with installation. -**Shipped version:** 0.13.1~ynh1 + +**Shipped version:** 0.13.1~ynh2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 2b9f25c..1320a4c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -23,8 +23,10 @@ Avec GoToSocial, vous pouvez rester en contact avec vos amis, publier, lire et p Vous pouvez consulter la documentation officielle à l'adresse : [docs.gotosocial.org](https://docs.gotosocial.org). La documentation de ce paquet YunoHost [est lisible ici](./doc/DOCS_fr.md) et l'admin est **vivement encouragé-e à la lire** ! +Veuillez noter que ce paquet utilise la ["i'm so tired" software license 1.0](https://github.com/YunoHost-Apps/gotosocial_ynh/blob/master/LICENSE), veuillez la lire et l'accepter avant de procéder à l'installation. -**Version incluse :** 0.13.1~ynh1 + +**Version incluse :** 0.13.1~ynh2 ## Captures d’écran From fb10a60fa31a3ce47790f1f5be50c124ac0a57e4 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Thu, 18 Jan 2024 05:28:29 +0100 Subject: [PATCH 3/3] fix --- doc/PRE_UPGRADE.d/{0.13.1~ynh2 => 0.13.1~ynh2.md} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename doc/PRE_UPGRADE.d/{0.13.1~ynh2 => 0.13.1~ynh2.md} (93%) diff --git a/doc/PRE_UPGRADE.d/0.13.1~ynh2 b/doc/PRE_UPGRADE.d/0.13.1~ynh2.md similarity index 93% rename from doc/PRE_UPGRADE.d/0.13.1~ynh2 rename to doc/PRE_UPGRADE.d/0.13.1~ynh2.md index adc44ff..e456a1c 100644 --- a/doc/PRE_UPGRADE.d/0.13.1~ynh2 +++ b/doc/PRE_UPGRADE.d/0.13.1~ynh2.md @@ -1 +1 @@ -From now on this package will use the ["i'm so tired" software license 1.0](https://github.com/YunoHost-Apps/gotosocial_ynh/blob/master/LICENSE), please read it and accept it before proceeding with update. \ No newline at end of file +From now on this package will use the ["i'm so tired" software license 1.0](https://github.com/YunoHost-Apps/gotosocial_ynh/blob/master/LICENSE), please read it and accept it before proceeding with update.