diff --git a/README.md b/README.md index 775ddff7..ca13a7b9 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@ A debt of gratitude is owed to the original author, Jacob Pipkin, longtime maint To make **sbotools** packages from the master branch, see [sbotools-git-slackbuild](https://github.com/pghvlaans/sbotools-git-slackbuild). For release **sbotools**, a SlackBuild is [available](https://slackbuilds.org/repository/15.0/system/sbotools/) at slackbuilds.org. ## Changes +* 3.2.1 - 2024-12-20 + * Bugfix: sboinstall, sboupgrade GPG check for custom repositories (removed unneeded conditional) * 3.2 - 2024-12-19 * sbocheck: Do not use compact format for CLASSIC mode diff --git a/SBO-Lib/Changes b/SBO-Lib/Changes index 5454d6e6..8b85b499 100644 --- a/SBO-Lib/Changes +++ b/SBO-Lib/Changes @@ -1,4 +1,7 @@ sbotools +* 3.2.1 - 2024-12-20 + * Bugfix: sboinstall, sboupgrade GPG check for custom repositories (removed unneeded conditional) + * 3.2 - 2024-12-19 * sbocheck: Do not use compact format for CLASSIC mode * Repo.pm: Prompt for regeneration if SLACKBUILDS.TXT is missing instead of erroring out diff --git a/SBO-Lib/README b/SBO-Lib/README index d0d4ef14..ff5fe56e 100644 --- a/SBO-Lib/README +++ b/SBO-Lib/README @@ -1,4 +1,4 @@ -SBO-Lib version 3.2 +SBO-Lib version 3.2.1 =================== SBO::Lib is a library for the sbotools scripts. diff --git a/SBO-Lib/lib/SBO/App.pm b/SBO-Lib/lib/SBO/App.pm index 60e9dc71..ca4564d9 100644 --- a/SBO-Lib/lib/SBO/App.pm +++ b/SBO-Lib/lib/SBO/App.pm @@ -13,7 +13,7 @@ use strict; use warnings FATAL => 'all'; use File::Basename; -our $VERSION = '3.2'; +our $VERSION = '3.2.1'; sub new { my $class = shift; diff --git a/SBO-Lib/lib/SBO/App/Remove.pm b/SBO-Lib/lib/SBO/App/Remove.pm index 9251dde8..91150022 100644 --- a/SBO-Lib/lib/SBO/App/Remove.pm +++ b/SBO-Lib/lib/SBO/App/Remove.pm @@ -16,7 +16,7 @@ use Getopt::Long qw(GetOptionsFromArray :config bundling); use parent 'SBO::App'; -our $VERSION = '3.2'; +our $VERSION = '3.2.1'; lint_sbo_home(); diff --git a/SBO-Lib/lib/SBO/App/Snap.pm b/SBO-Lib/lib/SBO/App/Snap.pm index 7e505c8a..f824adb9 100644 --- a/SBO-Lib/lib/SBO/App/Snap.pm +++ b/SBO-Lib/lib/SBO/App/Snap.pm @@ -19,7 +19,7 @@ use Getopt::Long qw/ GetOptionsFromArray /; use parent 'SBO::App'; -our $VERSION = '3.2'; +our $VERSION = '3.2.1'; lint_sbo_home(); diff --git a/SBO-Lib/lib/SBO/Lib.pm b/SBO-Lib/lib/SBO/Lib.pm index 4da142db..16952383 100644 --- a/SBO-Lib/lib/SBO/Lib.pm +++ b/SBO-Lib/lib/SBO/Lib.pm @@ -16,7 +16,7 @@ use strict; use warnings FATAL => 'all'; package SBO::Lib; -our $VERSION = '3.2'; +our $VERSION = '3.2.1'; =pod diff --git a/SBO-Lib/lib/SBO/Lib/Build.pm b/SBO-Lib/lib/SBO/Lib/Build.pm index f45773dc..8fdce3c7 100644 --- a/SBO-Lib/lib/SBO/Lib/Build.pm +++ b/SBO-Lib/lib/SBO/Lib/Build.pm @@ -4,7 +4,7 @@ use 5.016; use strict; use warnings; -our $VERSION = '3.2'; +our $VERSION = '3.2.1'; use SBO::Lib::Util qw/ :const prompt script_error get_sbo_from_loc get_arch check_multilib on_blacklist open_fh uniq save_options %config in /; use SBO::Lib::Tree qw/ get_sbo_location /; diff --git a/SBO-Lib/lib/SBO/Lib/Download.pm b/SBO-Lib/lib/SBO/Lib/Download.pm index 0f39ad26..3c70a955 100644 --- a/SBO-Lib/lib/SBO/Lib/Download.pm +++ b/SBO-Lib/lib/SBO/Lib/Download.pm @@ -4,7 +4,7 @@ use 5.016; use strict; use warnings; -our $VERSION = '3.2'; +our $VERSION = '3.2.1'; use SBO::Lib::Util qw/ :const script_error get_sbo_from_loc open_read get_arch /; use SBO::Lib::Repo qw/ $distfiles /; diff --git a/SBO-Lib/lib/SBO/Lib/Info.pm b/SBO-Lib/lib/SBO/Lib/Info.pm index 7fab3255..9b2dbd2b 100644 --- a/SBO-Lib/lib/SBO/Lib/Info.pm +++ b/SBO-Lib/lib/SBO/Lib/Info.pm @@ -4,7 +4,7 @@ use 5.016; use strict; use warnings; -our $VERSION = '3.2'; +our $VERSION = '3.2.1'; use SBO::Lib::Util qw/ in get_arch get_sbo_from_loc get_optional open_read script_error slurp usage_error uniq /; use SBO::Lib::Tree qw/ get_orig_location get_sbo_location is_local /; diff --git a/SBO-Lib/lib/SBO/Lib/Pkgs.pm b/SBO-Lib/lib/SBO/Lib/Pkgs.pm index f30ee6a7..86572c4a 100644 --- a/SBO-Lib/lib/SBO/Lib/Pkgs.pm +++ b/SBO-Lib/lib/SBO/Lib/Pkgs.pm @@ -4,7 +4,7 @@ use 5.016; use strict; use warnings; -our $VERSION = '3.2'; +our $VERSION = '3.2.1'; use SBO::Lib::Util qw/ %config build_cmp script_error open_read version_cmp /; use SBO::Lib::Tree qw/ get_sbo_location get_sbo_locations is_local /; diff --git a/SBO-Lib/lib/SBO/Lib/Readme.pm b/SBO-Lib/lib/SBO/Lib/Readme.pm index a4761123..ba82db20 100644 --- a/SBO-Lib/lib/SBO/Lib/Readme.pm +++ b/SBO-Lib/lib/SBO/Lib/Readme.pm @@ -4,7 +4,7 @@ use 5.016; use strict; use warnings; -our $VERSION = '3.2'; +our $VERSION = '3.2.1'; use SBO::Lib::Util qw/ prompt script_error slurp open_read open_fh _ERR_OPENFH usage_error %config /; use SBO::Lib::Tree qw/ is_local /; diff --git a/SBO-Lib/lib/SBO/Lib/Repo.pm b/SBO-Lib/lib/SBO/Lib/Repo.pm index 9514aa84..1ac0b794 100644 --- a/SBO-Lib/lib/SBO/Lib/Repo.pm +++ b/SBO-Lib/lib/SBO/Lib/Repo.pm @@ -4,7 +4,7 @@ use 5.016; use strict; use warnings; -our $VERSION = '3.2'; +our $VERSION = '3.2.1'; use SBO::Lib::Util qw/ %config prompt usage_error get_slack_branch get_slack_version get_slack_version_url script_error open_fh open_read in slurp _ERR_DOWNLOAD /; @@ -647,8 +647,6 @@ sub verify_gpg { my $url = $config{REPO}; if ($url eq 'FALSE') { $url = get_slack_version_url(); - } else { - usage_error("The origins of $repo_path are unclear.\n\nPlease check your REPO, VERSION and RSYNC_DEFAULT settings. Exiting."); } if ($url =~ m!^rsync://!) { return verify_rsync(0); diff --git a/SBO-Lib/lib/SBO/Lib/Tree.pm b/SBO-Lib/lib/SBO/Lib/Tree.pm index 4a0d8077..3477a410 100644 --- a/SBO-Lib/lib/SBO/Lib/Tree.pm +++ b/SBO-Lib/lib/SBO/Lib/Tree.pm @@ -4,7 +4,7 @@ use 5.016; use strict; use warnings; -our $VERSION = '3.2'; +our $VERSION = '3.2.1'; use SBO::Lib::Util qw/ script_error open_read idx %config /; use SBO::Lib::Repo qw/ $repo_path $slackbuilds_txt /; diff --git a/SBO-Lib/lib/SBO/Lib/Util.pm b/SBO-Lib/lib/SBO/Lib/Util.pm index f8aee7da..40260ddb 100644 --- a/SBO-Lib/lib/SBO/Lib/Util.pm +++ b/SBO-Lib/lib/SBO/Lib/Util.pm @@ -4,7 +4,7 @@ use 5.016; use strict; use warnings; -our $VERSION = '3.2'; +our $VERSION = '3.2.1'; use Exporter 'import'; use File::Copy; diff --git a/man1/sbocheck.1 b/man1/sbocheck.1 index 67e9bb31..b42c9605 100644 --- a/man1/sbocheck.1 +++ b/man1/sbocheck.1 @@ -1,4 +1,4 @@ -.TH sbocheck 1 "Pungenday, The Aftermath 61, 3190 YOLD" "sbotools 3.2" sbotools +.TH sbocheck 1 "Prickle-Prickle, The Aftermath 62, 3190 YOLD" "sbotools 3.2.1" sbotools .SH NAME .P .B diff --git a/man1/sboclean.1 b/man1/sboclean.1 index 95031d6d..5476dac6 100644 --- a/man1/sboclean.1 +++ b/man1/sboclean.1 @@ -1,4 +1,4 @@ -.TH sboclean 1 "Pungenday, The Aftermath 61, 3190 YOLD" "sbotools 3.2" sbotools +.TH sboclean 1 "Prickle-Prickle, The Aftermath 62, 3190 YOLD" "sbotools 3.2.1" sbotools .SH NAME .P .B diff --git a/man1/sboconfig.1 b/man1/sboconfig.1 index d09d65e7..8668e4ac 100644 --- a/man1/sboconfig.1 +++ b/man1/sboconfig.1 @@ -1,4 +1,4 @@ -.TH sboconfig 1 "Pungenday, The Aftermath 61, 3190 YOLD" "sbotools 3.2" sbotools +.TH sboconfig 1 "Prickle-Prickle, The Aftermath 62, 3190 YOLD" "sbotools 3.2.1" sbotools .SH NAME .P .B diff --git a/man1/sbofind.1 b/man1/sbofind.1 index e956e240..61c75714 100644 --- a/man1/sbofind.1 +++ b/man1/sbofind.1 @@ -1,4 +1,4 @@ -.TH sbofind 1 "Pungenday, The Aftermath 61, 3190 YOLD" "sbotools 3.2" sbotools +.TH sbofind 1 "Prickle-Prickle, The Aftermath 62, 3190 YOLD" "sbotools 3.2.1" sbotools .SH NAME .P .B diff --git a/man1/sboinstall.1 b/man1/sboinstall.1 index e2d5ebdf..13d1bae0 100644 --- a/man1/sboinstall.1 +++ b/man1/sboinstall.1 @@ -1,4 +1,4 @@ -.TH sboinstall 1 "Pungenday, The Aftermath 61, 3190 YOLD" "sbotools 3.2" sbotools +.TH sboinstall 1 "Prickle-Prickle, The Aftermath 62, 3190 YOLD" "sbotools 3.2.1" sbotools .SH NAME .P .B diff --git a/man1/sboremove.1 b/man1/sboremove.1 index 3fa070f6..0d9e7e59 100644 --- a/man1/sboremove.1 +++ b/man1/sboremove.1 @@ -1,4 +1,4 @@ -.TH sboremove 1 "Pungenday, The Aftermath 61, 3190 YOLD" "sbotools 3.2" sbotools +.TH sboremove 1 "Prickle-Prickle, The Aftermath 62, 3190 YOLD" "sbotools 3.2.1" sbotools .SH NAME .P .B diff --git a/man1/sbosnap.1 b/man1/sbosnap.1 index 09600d9a..df32bdb0 100644 --- a/man1/sbosnap.1 +++ b/man1/sbosnap.1 @@ -1,4 +1,4 @@ -.TH sbosnap 1 "Pungenday, The Aftermath 61, 3190 YOLD" "sbotools 3.2" sbotools +.TH sbosnap 1 "Prickle-Prickle, The Aftermath 62, 3190 YOLD" "sbotools 3.2.1" sbotools .SH NAME .P .B diff --git a/man1/sbotools.1 b/man1/sbotools.1 index a898bcd0..0cccefb8 100644 --- a/man1/sbotools.1 +++ b/man1/sbotools.1 @@ -1,4 +1,4 @@ -.TH sbotools 1 "Pungenday, The Aftermath 61, 3190 YOLD" "sbotools 3.2" sbotools +.TH sbotools 1 "Prickle-Prickle, The Aftermath 62, 3190 YOLD" "sbotools 3.2.1" sbotools .SH NAME .P .B diff --git a/man1/sboupgrade.1 b/man1/sboupgrade.1 index bd7866a9..49be7c22 100644 --- a/man1/sboupgrade.1 +++ b/man1/sboupgrade.1 @@ -1,4 +1,4 @@ -.TH sboupgrade 1 "Pungenday, The Aftermath 61, 3190 YOLD" "sbotools 3.2" sbotools +.TH sboupgrade 1 "Prickle-Prickle, The Aftermath 62, 3190 YOLD" "sbotools 3.2.1" sbotools .SH NAME .P .B diff --git a/man3/SBO::Lib::Build.3 b/man3/SBO::Lib::Build.3 index bc7ade58..49678ab0 100644 --- a/man3/SBO::Lib::Build.3 +++ b/man3/SBO::Lib::Build.3 @@ -55,7 +55,7 @@ .\" ======================================================================== .\" .IX Title "SBO::Lib::Build 3" -.TH SBO::Lib::Build 3 "Pungenday, The Aftermath 61, 3190 YOLD" "" "sbotools 3.2" +.TH SBO::Lib::Build 3 "Prickle-Prickle, The Aftermath 62, 3190 YOLD" "" "sbotools 3.2.1" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/man3/SBO::Lib::Download.3 b/man3/SBO::Lib::Download.3 index 37696a19..20890fdd 100644 --- a/man3/SBO::Lib::Download.3 +++ b/man3/SBO::Lib::Download.3 @@ -55,7 +55,7 @@ .\" ======================================================================== .\" .IX Title "SBO::Lib::Download 3" -.TH SBO::Lib::Download 3 "Pungenday, The Aftermath 61, 3190 YOLD" "" "sbotools 3.2" +.TH SBO::Lib::Download 3 "Prickle-Prickle, The Aftermath 62, 3190 YOLD" "" "sbotools 3.2.1" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/man3/SBO::Lib::Info.3 b/man3/SBO::Lib::Info.3 index 537f0796..403a9f00 100644 --- a/man3/SBO::Lib::Info.3 +++ b/man3/SBO::Lib::Info.3 @@ -55,7 +55,7 @@ .\" ======================================================================== .\" .IX Title "SBO::Lib::Info 3" -.TH SBO::Lib::Info 3 "Pungenday, The Aftermath 61, 3190 YOLD" "" "sbotools 3.2" +.TH SBO::Lib::Info 3 "Prickle-Prickle, The Aftermath 62, 3190 YOLD" "" "sbotools 3.2.1" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/man3/SBO::Lib::Pkgs.3 b/man3/SBO::Lib::Pkgs.3 index 65cd6ce5..d7847d6f 100644 --- a/man3/SBO::Lib::Pkgs.3 +++ b/man3/SBO::Lib::Pkgs.3 @@ -55,7 +55,7 @@ .\" ======================================================================== .\" .IX Title "SBO::Lib::Pkgs 3" -.TH SBO::Lib::Pkgs 3 "Pungenday, The Aftermath 61, 3190 YOLD" "" "sbotools 3.2" +.TH SBO::Lib::Pkgs 3 "Prickle-Prickle, The Aftermath 62, 3190 YOLD" "" "sbotools 3.2.1" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/man3/SBO::Lib::Readme.3 b/man3/SBO::Lib::Readme.3 index 4284d90a..3b7a3116 100644 --- a/man3/SBO::Lib::Readme.3 +++ b/man3/SBO::Lib::Readme.3 @@ -55,7 +55,7 @@ .\" ======================================================================== .\" .IX Title "SBO::Lib::Readme 3" -.TH SBO::Lib::Readme 3 "Pungenday, The Aftermath 61, 3190 YOLD" "" "sbotools 3.2" +.TH SBO::Lib::Readme 3 "Prickle-Prickle, The Aftermath 62, 3190 YOLD" "" "sbotools 3.2.1" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/man3/SBO::Lib::Repo.3 b/man3/SBO::Lib::Repo.3 index 68e13a79..87ed1416 100644 --- a/man3/SBO::Lib::Repo.3 +++ b/man3/SBO::Lib::Repo.3 @@ -55,7 +55,7 @@ .\" ======================================================================== .\" .IX Title "SBO::Lib::Repo 3" -.TH SBO::Lib::Repo 3 "Pungenday, The Aftermath 61, 3190 YOLD" "" "sbotools 3.2" +.TH SBO::Lib::Repo 3 "Prickle-Prickle, The Aftermath 62, 3190 YOLD" "" "sbotools 3.2.1" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/man3/SBO::Lib::Tree.3 b/man3/SBO::Lib::Tree.3 index 8dbd3701..c10afd53 100644 --- a/man3/SBO::Lib::Tree.3 +++ b/man3/SBO::Lib::Tree.3 @@ -55,7 +55,7 @@ .\" ======================================================================== .\" .IX Title "SBO::Lib::Tree 3" -.TH SBO::Lib::Tree 3 "Pungenday, The Aftermath 61, 3190 YOLD" "" "sbotools 3.2" +.TH SBO::Lib::Tree 3 "Prickle-Prickle, The Aftermath 62, 3190 YOLD" "" "sbotools 3.2.1" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/man3/SBO::Lib::Util.3 b/man3/SBO::Lib::Util.3 index 5a8bfc8b..b15f5f3f 100644 --- a/man3/SBO::Lib::Util.3 +++ b/man3/SBO::Lib::Util.3 @@ -55,7 +55,7 @@ .\" ======================================================================== .\" .IX Title "SBO::Lib::Util 3" -.TH SBO::Lib::Util 3 "Pungenday, The Aftermath 61, 3190 YOLD" "" "sbotools 3.2" +.TH SBO::Lib::Util 3 "Prickle-Prickle, The Aftermath 62, 3190 YOLD" "" "sbotools 3.2.1" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/man5/sbotools.conf.5 b/man5/sbotools.conf.5 index 82c86473..fac688ac 100644 --- a/man5/sbotools.conf.5 +++ b/man5/sbotools.conf.5 @@ -1,4 +1,4 @@ -.TH sbotools.conf 5 "Pungenday, The Aftermath 61, 3190 YOLD" "sbotools 3.2" sbotools +.TH sbotools.conf 5 "Prickle-Prickle, The Aftermath 62, 3190 YOLD" "sbotools 3.2.1" sbotools .SH NAME .P .B diff --git a/man5/sbotools.hints.5 b/man5/sbotools.hints.5 index 1ac315dd..7b9c802b 100644 --- a/man5/sbotools.hints.5 +++ b/man5/sbotools.hints.5 @@ -1,4 +1,4 @@ -.TH sbotools.hints 5 "Pungenday, The Aftermath 61, 3190 YOLD" "sbotools 3.2" sbotools +.TH sbotools.hints 5 "Prickle-Prickle, The Aftermath 62, 3190 YOLD" "sbotools 3.2.1" sbotools .SH NAME .P .B diff --git a/slackbuild/sbotools/sbotools.SlackBuild b/slackbuild/sbotools/sbotools.SlackBuild index a4422c86..09b1e712 100644 --- a/slackbuild/sbotools/sbotools.SlackBuild +++ b/slackbuild/sbotools/sbotools.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=sbotools -VERSION=${VERSION:-3.2} +VERSION=${VERSION:-3.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_pghv} PKGTYPE=${PKGTYPE:-tgz} diff --git a/slackbuild/sbotools/sbotools.info b/slackbuild/sbotools/sbotools.info index 67fe57f2..6d52b7b4 100644 --- a/slackbuild/sbotools/sbotools.info +++ b/slackbuild/sbotools/sbotools.info @@ -1,7 +1,7 @@ PRGNAM="sbotools" -VERSION="3.2" +VERSION="3.2.1" HOMEPAGE="https://pghvlaans.github.io/sbotools/" -DOWNLOAD="https://pghvlaans.github.io/sbotools/downloads/sbotools-3.2.tar.gz" +DOWNLOAD="https://pghvlaans.github.io/sbotools/downloads/sbotools-3.2.1.tar.gz" MD5SUM="@MD5@" DOWNLOAD_x86_64="" MD5SUM_x86_64=""