diff --git a/LICENSE b/LICENSE index 6c00d5ad..8b045f0f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,13 +1,23 @@ -DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE -Version 2, December 2004 +MIT License -Copyright (C) 2004 Sam Hocevar +Copyright (c) 2012-2019 Jacob Pipkin, Luke Williams, Andreas Guldstrand +Copyright (c) 2024 K. Eugene Carlson -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. +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: -DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. -0. You just DO WHAT THE FUCK YOU WANT TO. +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. diff --git a/README.md b/README.md index 7c12150a..d052d4d1 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ To make **sbotools** packages from the master branch, see [sbotools-git-slackbui ## Changes -* 3.1 - 2024-12-04 +* 3.1 - 2024-12-05 * sbofind: Allow multiple search terms * Add a summary sbotools(1) man page with executive summaries and a startup guide * sboinstall: Use --mass-rebuild to rebuild all non-compat32 SlackBuilds @@ -20,6 +20,7 @@ To make **sbotools** packages from the master branch, see [sbotools-git-slackbui * sboinstall: Use a resume file for --mass-rebuild * Clarify LOCAL_OVERRIDES documentation * Detect and handle next version (currently 15.1) more effectively + * Adopt MIT License * 3.0 - 2024-11-22 * sbocheck: Use --nopull to check for updated SlackBuilds without updating the tree diff --git a/SBO-Lib/Changes b/SBO-Lib/Changes index 65f81e0d..6c291103 100644 --- a/SBO-Lib/Changes +++ b/SBO-Lib/Changes @@ -1,5 +1,5 @@ sbotools -3.1 - 2024-12-04 +3.1 - 2024-12-05 * sbofind: Allow multiple search terms * Add a summary sbotools(1) man page with executive summaries and a startup guide * sboinstall: Use --mass-rebuild to rebuild all non-compat32 SlackBuilds @@ -11,6 +11,7 @@ sbotools * sboinstall: Use a resume file for --mass-rebuild * Clarify LOCAL_OVERRIDES documentation * Detect and handle next version (now 15.1) more effectively + * Adopt MIT License 3.0 - 2024-11-22 * sbocheck: Use --nopull to check for updated SlackBuilds without updating the tree diff --git a/SBO-Lib/README b/SBO-Lib/README index 9427167d..f216d1ce 100644 --- a/SBO-Lib/README +++ b/SBO-Lib/README @@ -22,16 +22,26 @@ This module bundles Sort::Versions 1.62 which has its own license: COPYRIGHT AND LICENCE -DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE -Version 2, December 2004 - -Copyright (C) 2004 Sam Hocevar - -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. - -DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. You just DO WHAT THE FUCK YOU WANT TO. +MIT License + +Copyright (c) 2012-2019 Jacob Pipkin, Luke Williams, Andreas Guldstrand +Copyright (c) 2024 K. Eugene Carlson + +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. diff --git a/SBO-Lib/lib/SBO/App.pm b/SBO-Lib/lib/SBO/App.pm index 490eabe1..f9a59b52 100644 --- a/SBO-Lib/lib/SBO/App.pm +++ b/SBO-Lib/lib/SBO/App.pm @@ -6,7 +6,7 @@ package SBO::App; # Jacob Pipkin # Andreas Guldstrand # maintainer: K. Eugene Carlson -# license: WTFPL +# license: MIT License use 5.16.0; use strict; diff --git a/SBO-Lib/lib/SBO/App/Remove.pm b/SBO-Lib/lib/SBO/App/Remove.pm index c08d0508..2879a3d8 100644 --- a/SBO-Lib/lib/SBO/App/Remove.pm +++ b/SBO-Lib/lib/SBO/App/Remove.pm @@ -6,7 +6,7 @@ package SBO::App::Remove; # Jacob Pipkin # Andreas Guldstrand # maintainer: K. Eugene Carlson -# license: WTFPL +# license: MIT License use 5.16.0; use strict; diff --git a/SBO-Lib/lib/SBO/App/Snap.pm b/SBO-Lib/lib/SBO/App/Snap.pm index a01de8d0..9e950dae 100644 --- a/SBO-Lib/lib/SBO/App/Snap.pm +++ b/SBO-Lib/lib/SBO/App/Snap.pm @@ -9,7 +9,7 @@ package SBO::App::Snap; # Luke Williams # Andreas Guldstrand # maintainer: K. Eugene Carlson -# license: WTFPL +# license: MIT License use 5.16.0; use strict; diff --git a/SBO-Lib/lib/SBO/Lib.pm b/SBO-Lib/lib/SBO/Lib.pm index 4113190a..9be5c361 100644 --- a/SBO-Lib/lib/SBO/Lib.pm +++ b/SBO-Lib/lib/SBO/Lib.pm @@ -9,7 +9,7 @@ # Luke Williams # Andreas Guldstrand # maintainer: K. Eugene Carlson -# license: WTFPL +# license: MIT License use 5.16.0; use strict; @@ -110,7 +110,7 @@ SBO::Lib is maintained by K. Eugene Carlson . =head1 LICENSE -The sbotools are licensed under the WTFPL . +The sbotools are licensed under the MIT License. Copyright (C) 2012-2017, Jacob Pipkin, Luke Williams, Andreas Guldstrand. Copyright (C) 2024, K. Eugene Carlson. diff --git a/SBO-Lib/lib/SBO/Lib/Build.pm b/SBO-Lib/lib/SBO/Lib/Build.pm index 1b93d5d1..0a2bc590 100644 --- a/SBO-Lib/lib/SBO/Lib/Build.pm +++ b/SBO-Lib/lib/SBO/Lib/Build.pm @@ -817,7 +817,7 @@ SBO::Lib is maintained by K. Eugene Carlson . =head1 LICENSE -The sbotools are licensed under the WTFPL . +The sbotools are licensed under the MIT License. Copyright (C) 2012-2017, Jacob Pipkin, Luke Williams, Andreas Guldstrand. Copyright (C) 2024, K. Eugene Carlson. diff --git a/SBO-Lib/lib/SBO/Lib/Download.pm b/SBO-Lib/lib/SBO/Lib/Download.pm index 857575ea..97ca8900 100644 --- a/SBO-Lib/lib/SBO/Lib/Download.pm +++ b/SBO-Lib/lib/SBO/Lib/Download.pm @@ -296,7 +296,7 @@ SBO::Lib is maintained by K. Eugene Carlson . =head1 LICENSE -The sbotools are licensed under the WTFPL . +The sbotools are licensed under the MIT License. Copyright (C) 2012-2017, Jacob Pipkin, Luke Williams, Andreas Guldstrand. Copyright (C) 2024, K. Eugene Carlson. diff --git a/SBO-Lib/lib/SBO/Lib/Info.pm b/SBO-Lib/lib/SBO/Lib/Info.pm index d51338c7..3e59edd3 100644 --- a/SBO-Lib/lib/SBO/Lib/Info.pm +++ b/SBO-Lib/lib/SBO/Lib/Info.pm @@ -335,7 +335,7 @@ SBO::Lib is maintained by K. Eugene Carlson . =head1 LICENSE -The sbotools are licensed under the WTFPL . +The sbotools are licensed under the MIT License. Copyright (C) 2012-2017, Jacob Pipkin, Luke Williams, Andreas Guldstrand. Copyright (C) 2024, K. Eugene Carlson. diff --git a/SBO-Lib/lib/SBO/Lib/Pkgs.pm b/SBO-Lib/lib/SBO/Lib/Pkgs.pm index 07787f8a..5e771e47 100644 --- a/SBO-Lib/lib/SBO/Lib/Pkgs.pm +++ b/SBO-Lib/lib/SBO/Lib/Pkgs.pm @@ -254,7 +254,7 @@ SBO::Lib is maintained by K. Eugene Carlson . =head1 LICENSE -The sbotools are licensed under the WTFPL . +The sbotools are licensed under the MIT License. Copyright (C) 2012-2017, Jacob Pipkin, Luke Williams, Andreas Guldstrand. Copyright (C) 2024, K. Eugene Carlson. diff --git a/SBO-Lib/lib/SBO/Lib/Readme.pm b/SBO-Lib/lib/SBO/Lib/Readme.pm index d28783d1..698adead 100644 --- a/SBO-Lib/lib/SBO/Lib/Readme.pm +++ b/SBO-Lib/lib/SBO/Lib/Readme.pm @@ -245,7 +245,7 @@ SBO::Lib is maintained by K. Eugene Carlson . =head1 LICENSE -The sbotools are licensed under the WTFPL . +The sbotools are licensed under the MIT License. Copyright (C) 2012-2017, Jacob Pipkin, Luke Williams, Andreas Guldstrand. Copyright (C) 2024, K. Eugene Carlson. diff --git a/SBO-Lib/lib/SBO/Lib/Repo.pm b/SBO-Lib/lib/SBO/Lib/Repo.pm index 1800cfce..aad02eb7 100644 --- a/SBO-Lib/lib/SBO/Lib/Repo.pm +++ b/SBO-Lib/lib/SBO/Lib/Repo.pm @@ -398,7 +398,7 @@ SBO::Lib is maintained by K. Eugene Carlson . =head1 LICENSE -The sbotools are licensed under the WTFPL . +The sbotools are licensed under the MIT License. Copyright (C) 2012-2017, Jacob Pipkin, Luke Williams, Andreas Guldstrand. Copyright (C) 2024, K. Eugene Carlson. diff --git a/SBO-Lib/lib/SBO/Lib/Tree.pm b/SBO-Lib/lib/SBO/Lib/Tree.pm index e7662cf5..e40fddf1 100644 --- a/SBO-Lib/lib/SBO/Lib/Tree.pm +++ b/SBO-Lib/lib/SBO/Lib/Tree.pm @@ -168,7 +168,7 @@ SBO::Lib is maintained by K. Eugene Carlson . =head1 LICENSE -The sbotools are licensed under the WTFPL . +The sbotools are licensed under the MIT License. Copyright (C) 2012-2017, Jacob Pipkin, Luke Williams, Andreas Guldstrand. Copyright (C) 2024, K. Eugene Carlson. diff --git a/SBO-Lib/lib/SBO/Lib/Util.pm b/SBO-Lib/lib/SBO/Lib/Util.pm index aab71488..cfb40a6d 100644 --- a/SBO-Lib/lib/SBO/Lib/Util.pm +++ b/SBO-Lib/lib/SBO/Lib/Util.pm @@ -555,8 +555,7 @@ There is no useful return value. sub show_version { say "sbotools version $SBO::Lib::VERSION"; - say 'licensed under the WTFPL'; - say ''; + say 'licensed under the MIT License'; } =head2 slurp @@ -743,7 +742,7 @@ SBO::Lib is maintained by K. Eugene Carlson . =head1 LICENSE -The sbotools are licensed under the WTFPL . +The sbotools are licensed under the MIT License. Copyright (C) 2012-2017, Jacob Pipkin, Luke Williams, Andreas Guldstrand. Copyright (C) 2024, K. Eugene Carlson. diff --git a/man1/sbocheck.1 b/man1/sbocheck.1 index dbb43495..77489ee6 100644 --- a/man1/sbocheck.1 +++ b/man1/sbocheck.1 @@ -1,4 +1,4 @@ -.TH sbocheck 1 "Pungenday, The Aftermath 46, 3190 YOLD" "sbotools 3.1" sbotools +.TH sbocheck 1 "Prickle-Prickle, The Aftermath 47, 3190 YOLD" "sbotools 3.1" sbotools .SH NAME .P .B diff --git a/man1/sboclean.1 b/man1/sboclean.1 index af94758c..24aaaadd 100644 --- a/man1/sboclean.1 +++ b/man1/sboclean.1 @@ -1,4 +1,4 @@ -.TH sboclean 1 "Pungenday, The Aftermath 46, 3190 YOLD" "sbotools 3.1" sbotools +.TH sboclean 1 "Prickle-Prickle, The Aftermath 47, 3190 YOLD" "sbotools 3.1" sbotools .SH NAME .P .B diff --git a/man1/sboconfig.1 b/man1/sboconfig.1 index dac2064c..6481ab8b 100644 --- a/man1/sboconfig.1 +++ b/man1/sboconfig.1 @@ -1,4 +1,4 @@ -.TH sboconfig 1 "Pungenday, The Aftermath 46, 3190 YOLD" "sbotools 3.1" sbotools +.TH sboconfig 1 "Prickle-Prickle, The Aftermath 47, 3190 YOLD" "sbotools 3.1" sbotools .SH NAME .P .B diff --git a/man1/sbofind.1 b/man1/sbofind.1 index 3ab1b7f9..a2e0d5ec 100644 --- a/man1/sbofind.1 +++ b/man1/sbofind.1 @@ -1,4 +1,4 @@ -.TH sbofind 1 "Pungenday, The Aftermath 46, 3190 YOLD" "sbotools 3.1" sbotools +.TH sbofind 1 "Prickle-Prickle, The Aftermath 47, 3190 YOLD" "sbotools 3.1" sbotools .SH NAME .P .B diff --git a/man1/sboinstall.1 b/man1/sboinstall.1 index 0279e0d1..81d1cd7a 100644 --- a/man1/sboinstall.1 +++ b/man1/sboinstall.1 @@ -1,4 +1,4 @@ -.TH sboinstall 1 "Pungenday, The Aftermath 46, 3190 YOLD" "sbotools 3.1" sbotools +.TH sboinstall 1 "Prickle-Prickle, The Aftermath 47, 3190 YOLD" "sbotools 3.1" sbotools .SH NAME .P .B diff --git a/man1/sboremove.1 b/man1/sboremove.1 index 1730439a..c58476c2 100644 --- a/man1/sboremove.1 +++ b/man1/sboremove.1 @@ -1,4 +1,4 @@ -.TH sboremove 1 "Pungenday, The Aftermath 46, 3190 YOLD" "sbotools 3.1" sbotools +.TH sboremove 1 "Prickle-Prickle, The Aftermath 47, 3190 YOLD" "sbotools 3.1" sbotools .SH NAME .P .B diff --git a/man1/sbosnap.1 b/man1/sbosnap.1 index d48790d5..77810510 100644 --- a/man1/sbosnap.1 +++ b/man1/sbosnap.1 @@ -1,4 +1,4 @@ -.TH sbosnap 1 "Pungenday, The Aftermath 46, 3190 YOLD" "sbotools 3.1" sbotools +.TH sbosnap 1 "Prickle-Prickle, The Aftermath 47, 3190 YOLD" "sbotools 3.1" sbotools .SH NAME .P .B diff --git a/man1/sbotools.1 b/man1/sbotools.1 index a16c1783..2433e7ff 100644 --- a/man1/sbotools.1 +++ b/man1/sbotools.1 @@ -1,4 +1,4 @@ -.TH sbotools 1 "Pungenday, The Aftermath 46, 3190 YOLD" "sbotools 3.1" sbotools +.TH sbotools 1 "Prickle-Prickle, The Aftermath 47, 3190 YOLD" "sbotools 3.1" sbotools .SH NAME .P .B diff --git a/man1/sboupgrade.1 b/man1/sboupgrade.1 index da14200f..0b9eb191 100644 --- a/man1/sboupgrade.1 +++ b/man1/sboupgrade.1 @@ -1,4 +1,4 @@ -.TH sboupgrade 1 "Pungenday, The Aftermath 46, 3190 YOLD" "sbotools 3.1" sbotools +.TH sboupgrade 1 "Prickle-Prickle, The Aftermath 47, 3190 YOLD" "sbotools 3.1" sbotools .SH NAME .P .B diff --git a/man5/sbotools.conf.5 b/man5/sbotools.conf.5 index fd112484..a5e98b8c 100644 --- a/man5/sbotools.conf.5 +++ b/man5/sbotools.conf.5 @@ -1,4 +1,4 @@ -.TH sbotools.conf 5 "Pungenday, The Aftermath 46, 3190 YOLD" "sbotools 3.1" sbotools +.TH sbotools.conf 5 "Prickle-Prickle, The Aftermath 47, 3190 YOLD" "sbotools 3.1" sbotools .SH NAME .P .B diff --git a/man5/sbotools.hints.5 b/man5/sbotools.hints.5 index dfae4b1b..e8ff6cb6 100644 --- a/man5/sbotools.hints.5 +++ b/man5/sbotools.hints.5 @@ -1,4 +1,4 @@ -.TH sbotools.hints 5 "Pungenday, The Aftermath 46, 3190 YOLD" "sbotools 3.1" sbotools +.TH sbotools.hints 5 "Prickle-Prickle, The Aftermath 47, 3190 YOLD" "sbotools 3.1" sbotools .SH NAME .P .B diff --git a/sbocheck b/sbocheck index 40cd5f14..a3258dfc 100755 --- a/sbocheck +++ b/sbocheck @@ -9,7 +9,7 @@ # Luke Williams # Andreas Guldstrand # maintainer: K. Eugene Carlson -# license: WTFPL +# license: MIT License use 5.16.0; use strict; diff --git a/sboclean b/sboclean index 92505c1e..0e1eb6e4 100755 --- a/sboclean +++ b/sboclean @@ -9,7 +9,7 @@ # Luke Williams # Andreas Guldstrand # maintainer: K. Eugene Carlson -# license: WTFPL +# license: MIT License use 5.16.0; use strict; diff --git a/sboconfig b/sboconfig index 6a0f8807..f8231b6e 100755 --- a/sboconfig +++ b/sboconfig @@ -9,7 +9,7 @@ # Luke Williams # Andreas Guldstrand # maintainer: K. Eugene Carlson -# license: WTFPL +# license: MIT License use 5.16.0; use strict; diff --git a/sbofind b/sbofind index 160e3b9c..ce02314e 100755 --- a/sbofind +++ b/sbofind @@ -9,7 +9,7 @@ # Luke Williams # Andreas Guldstrand # maintainer: K. Eugene Carlson -# license: WTFPL +# license: MIT License use 5.16.0; use strict; diff --git a/sboinstall b/sboinstall index 2a175e68..45e71a99 100755 --- a/sboinstall +++ b/sboinstall @@ -9,7 +9,7 @@ # Luke Williams # Andreas Guldstrand # maintainer: K. Eugene Carlson -# license: WTFPL +# license: MIT License use 5.16.0; use strict; diff --git a/sboremove b/sboremove index a96e0568..92b15931 100755 --- a/sboremove +++ b/sboremove @@ -9,7 +9,7 @@ # Jacob Pipkin # Andreas Guldstrand # maintainer: K. Eugene Carlson -# license: WTFPL +# license: MIT License use 5.16.0; use strict; diff --git a/sbosnap b/sbosnap index 9bb7c326..e6e55909 100755 --- a/sbosnap +++ b/sbosnap @@ -9,7 +9,7 @@ # Luke Williams # Andreas Guldstrand # maintainer: K. Eugene Carlson -# license: WTFPL +# license: MIT License use 5.16.0; use strict; diff --git a/sboupgrade b/sboupgrade index bb38c61b..e8b09dc2 100755 --- a/sboupgrade +++ b/sboupgrade @@ -9,7 +9,7 @@ # Luke Williams # Andreas Guldstrand # maintainer: K. Eugene Carlson -# license: WTFPL +# license: MIT License use 5.16.0; use strict; diff --git a/slackbuild/sbotools/sbotools.SlackBuild b/slackbuild/sbotools/sbotools.SlackBuild index 193cbc85..a85f6641 100644 --- a/slackbuild/sbotools/sbotools.SlackBuild +++ b/slackbuild/sbotools/sbotools.SlackBuild @@ -3,8 +3,25 @@ # Slackware build script for sbotools # # Written by Jacob Pipkin -# Altered by K. Eugene Carlson -# Licensed under the WTFPL +# Copyright 2024 K. Eugene Carlson +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. cd $(dirname $0) ; CWD=$(pwd) diff --git a/t/10-version.t b/t/10-version.t index 6c2c8d5b..4c751c0d 100755 --- a/t/10-version.t +++ b/t/10-version.t @@ -18,8 +18,7 @@ make_slackbuilds_txt(); my $version = $SBO::Lib::VERSION; my $ver_text = <<"VERSION"; sbotools version $version -licensed under the WTFPL - +licensed under the MIT License VERSION # 1-8: test -v output of sbo* scripts