Merge branch 'hotfix/http_tiny_can_ssl'

giterlizzi · Aug 20, 2018 · 28f7918 · 28f7918
2 parents e90ef2e + b68df23
commit 28f7918
Show file tree

Hide file tree

Showing 28 changed files with 60 additions and 54 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,10 +1,23 @@
 # SlackMan - Slackware Package Manager ChangeLog
 
+## [v1.4.1]
+
+Fixed some incompatibilty issue with previous Slackware releases.
+
+### Fixed
+
+  * #14 - Undefined subroutine "HTTP::Tiny->can_ssl" on Slackware 14.2
+
+### Changed
+
+  * `t/*` - Added support of `slackman-libsupport`
+
+
 ## [v1.4.0]
 
 This release introduce the automatic detection of Slackware `-current` release using the new `/etc/slackware-version` format (eg. `14.2+`). Added parsing of Slackware Announce in ChangeLog. General optimizations and reduced the `slackman` command startup by ~0.3 second. Improved download information (added speed, ETA, etc). Added information of supported arch in all `.repo` config file.
 
-## Added
+### Added
 
   * Added `--terse` option for display only a single description line when install or upgrade package
   * Added `slackman clean removed` command for delete removed packages and scripts file in pkgtools directory (`/var/log/removed_{packages,scripts}`)
@@ -18,7 +31,7 @@ This release introduce the automatic detection of Slackware `-current` release u
   * #12 - Added `slackman changelog --announces` option to retrieve Slackware ChangeLog announces
   * #13 - Added `arch` config option in `.repo` files with supported repository arch
 
-## Changed
+### Changed
 
   * Re-added `HTTP::Tiny` support with check of SSL Perl modules (`IO::Socket::SSL` and `Net::SSLeay`)
   * Optimization for `slackman.bash` completion file
@@ -31,7 +44,7 @@ This release introduce the automatic detection of Slackware `-current` release u
 
 This release introduce new options (`--local` for install or upgrade from local package) and new feature (`.renames` configuration file). Now SlackMan use cURL command for download th packages and repository metadata. Added new D-Bus methods and signals and improved `slackman-notifier` client.
 
-## Added
+### Added
 
   * Added missing options in Bash completion script
   * Added new D-Bus methods (see `org.lotarproject.SlackMan(7)`)
@@ -40,13 +53,13 @@ This release introduce new options (`--local` for install or upgrade from local
   * Added new TAP test
   * Added support of `slackman-libsupport` package
 
-## Removed
+### Removed
 
   * Removed check of require modules
   * Drop support of `HTTP::Tiny` module
   * Drop support of "experimental" Perl feature
 
-## Changed
+### Changed
 
   * DB schema optimization for `manifest` table
   * Use Perl sub for `REGEXP` SQLite function
@@ -55,7 +68,7 @@ This release introduce new options (`--local` for install or upgrade from local
   * Reduced required Perl modules
   * Optimization for `SlackMan/Config.pm` module
 
-## Fixed
+### Fixed
 
   * Fixed `repos.d/slackware.repo` URL
 
@@ -68,7 +81,7 @@ This release fix an issue for SlackMan build (#10 thanks to @axpira)
 
 This release introduce new features, new commands and improved the stability and performance. Added new D-Bus methods/properties and integrated SlackMan via PolicyKit.
 
-## Added
+### Added
 
   * #2: Add new repo via URL or via local file (`slackman repo add REPOSITORY-FILE`)
   * #3: Added `--tag` option for upgrade installed package with specified package tag (eg. `slackman upgrade --repo slackonly:packages --tag SBo`)
@@ -88,23 +101,23 @@ This release introduce new features, new commands and improved the stability and
   * Added new option to search a CVE (Common Vulnerabilities and Exposures) into the ChangeLogs (`--cve=CVE-YYYY-NNNN`)
   * Added `slackman repo config` command to edit via CLI repository configuration
 
-## Fixed
+### Fixed
 
   * #8: Optimizations of Slackware database parsing
 
-## Removed
+### Removed
 
   * Removed `slackman update installed` command (merged into `slackman update history`)
   * Removed `unlink` after package upgrade and install. Remember to launch `slackman clean cache` command periodically
 
 
 ## [v1.1.2]
 
-## Added
+### Added
 
   * Added `--after` and `--before` in `slackman.bash` completion script
 
-## Fixed
+### Fixed
 
   * Fixed paser for `--after` and `--before` options
   * Fixed `notify` sub callback for `slackman-notifier` command
@@ -168,6 +181,7 @@ This release introduce new features, new commands & params and new DBus service
   * [v1.0.0]
 
 [Develop]: https://github.com/LotarProject/slackman/compare/master...develop
+[v1.4.1]: https://github.com/LotarProject/slackman/compare/v1.4.0...v1.4.1
 [v1.4.0]: https://github.com/LotarProject/slackman/compare/v1.3.0...v1.4.0
 [v1.3.0]: https://github.com/LotarProject/slackman/compare/v1.2.1...v1.3.0
 [v1.2.1]: https://github.com/LotarProject/slackman/compare/v1.2.0...v1.2.1

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v1.4.0
+v1.4.1
diff --git a/dbus/slackman-notifier b/dbus/slackman-notifier
@@ -19,7 +19,7 @@ use Slackware::SlackMan;
 use Slackware::SlackMan::Config  qw(:all);
 use Slackware::SlackMan::Utils   qw(:all);
 
-my $VERSION = "v1.4.0";
+my $VERSION = "v1.4.1";
 my $options = {};
 
 GetOptions( $options,

diff --git a/lib/Slackware/SlackMan.pm b/lib/Slackware/SlackMan.pm
@@ -13,7 +13,7 @@ BEGIN {
 
   @ISA = qw(Exporter);
 
-  $VERSION   = 'v1.4.0';
+  $VERSION   = 'v1.4.1';
   @EXPORT_OK = ();
   @EXPORT    = qw(
     $slackman_opts

diff --git a/lib/Slackware/SlackMan/Command.pm b/lib/Slackware/SlackMan/Command.pm
@@ -11,7 +11,7 @@ BEGIN {
 
   require Exporter;
 
-  $VERSION     = 'v1.4.0';
+  $VERSION     = 'v1.4.1';
   @ISA         = qw(Exporter);
   @EXPORT_OK   = qw(
     run
@@ -127,21 +127,6 @@ $SIG{INT} = sub {
 
 sub run {
 
-  my ($ssl_check, $ssl_reason) = HTTP::Tiny->can_ssl;
-
-  unless ($ssl_check) {
-
-    $ssl_reason =~ s/^/ - /gm;
-
-    print "Problem with SSL support for HTTP::Tiny module:\n\n";
-    print "$ssl_reason\n";
-    print "Please install the required modules and execute this command again.\n\n";
-
-    exit(100);
-
-  }
-
-
   my @lock_commands = qw(update install upgrade remove reinstall clean);
   my @skip_lock     = qw(log.tail);
 

diff --git a/lib/Slackware/SlackMan/Command/Clean.pm b/lib/Slackware/SlackMan/Command/Clean.pm
@@ -11,7 +11,7 @@ BEGIN {
 
   require Exporter;
 
-  $VERSION     = 'v1.4.0';
+  $VERSION     = 'v1.4.1';
   @ISA         = qw(Exporter);
   @EXPORT_OK   = qw();
   %EXPORT_TAGS = (

diff --git a/lib/Slackware/SlackMan/Command/Config.pm b/lib/Slackware/SlackMan/Command/Config.pm
@@ -11,7 +11,7 @@ BEGIN {
 
   require Exporter;
 
-  $VERSION     = 'v1.4.0';
+  $VERSION     = 'v1.4.1';
   @ISA         = qw(Exporter);
   @EXPORT_OK   = qw();
   %EXPORT_TAGS = (

diff --git a/lib/Slackware/SlackMan/Command/DB.pm b/lib/Slackware/SlackMan/Command/DB.pm
@@ -11,7 +11,7 @@ BEGIN {
 
   require Exporter;
 
-  $VERSION     = 'v1.4.0';
+  $VERSION     = 'v1.4.1';
   @ISA         = qw(Exporter);
   @EXPORT_OK   = qw();
   %EXPORT_TAGS = (

diff --git a/lib/Slackware/SlackMan/Command/List.pm b/lib/Slackware/SlackMan/Command/List.pm
@@ -11,7 +11,7 @@ BEGIN {
 
   require Exporter;
 
-  $VERSION     = 'v1.4.0';
+  $VERSION     = 'v1.4.1';
   @ISA         = qw(Exporter);
   @EXPORT_OK   = qw();
   %EXPORT_TAGS = (

diff --git a/lib/Slackware/SlackMan/Command/Log.pm b/lib/Slackware/SlackMan/Command/Log.pm
@@ -11,7 +11,7 @@ BEGIN {
 
   require Exporter;
 
-  $VERSION     = 'v1.4.0';
+  $VERSION     = 'v1.4.1';
   @ISA         = qw(Exporter);
   @EXPORT_OK   = qw();
   %EXPORT_TAGS = (

diff --git a/lib/Slackware/SlackMan/Command/Package.pm b/lib/Slackware/SlackMan/Command/Package.pm
@@ -11,7 +11,7 @@ BEGIN {
 
   require Exporter;
 
-  $VERSION     = 'v1.4.0';
+  $VERSION     = 'v1.4.1';
   @ISA         = qw(Exporter);
   @EXPORT_OK   = qw();
   %EXPORT_TAGS = (

diff --git a/lib/Slackware/SlackMan/Command/Repo.pm b/lib/Slackware/SlackMan/Command/Repo.pm
@@ -11,7 +11,7 @@ BEGIN {
 
   require Exporter;
 
-  $VERSION     = 'v1.4.0';
+  $VERSION     = 'v1.4.1';
   @ISA         = qw(Exporter);
   @EXPORT_OK   = qw();
   %EXPORT_TAGS = (

diff --git a/lib/Slackware/SlackMan/Command/Update.pm b/lib/Slackware/SlackMan/Command/Update.pm
@@ -11,7 +11,7 @@ BEGIN {
 
   require Exporter;
 
-  $VERSION     = 'v1.4.0';
+  $VERSION     = 'v1.4.1';
   @ISA         = qw(Exporter);
   @EXPORT_OK   = qw();
   %EXPORT_TAGS = (

diff --git a/lib/Slackware/SlackMan/Config.pm b/lib/Slackware/SlackMan/Config.pm
@@ -11,7 +11,7 @@ BEGIN {
 
   require Exporter;
 
-  $VERSION     = 'v1.4.0';
+  $VERSION     = 'v1.4.1';
   @ISA         = qw(Exporter);
   @EXPORT_OK   = qw( get_config );
   %EXPORT_TAGS = (

diff --git a/lib/Slackware/SlackMan/DB.pm b/lib/Slackware/SlackMan/DB.pm
@@ -11,7 +11,7 @@ BEGIN {
 
   require Exporter;
 
-  $VERSION = 'v1.4.0';
+  $VERSION = 'v1.4.1';
   @ISA     = qw(Exporter);
 
   @EXPORT_OK = qw{

diff --git a/lib/Slackware/SlackMan/DBus.pm b/lib/Slackware/SlackMan/DBus.pm
@@ -11,7 +11,7 @@ BEGIN {
 
   require Exporter;
 
-  $VERSION   = 'v1.4.0';
+  $VERSION   = 'v1.4.1';
   @ISA       = qw(Exporter);
   @EXPORT_OK = qw{};
 

diff --git a/lib/Slackware/SlackMan/Logger.pm b/lib/Slackware/SlackMan/Logger.pm
@@ -11,7 +11,7 @@ BEGIN {
 
   require Exporter;
 
-  $VERSION   = 'v1.4.0';
+  $VERSION   = 'v1.4.1';
   @ISA       = qw(Exporter);
   @EXPORT_OK = qw{}
 

diff --git a/lib/Slackware/SlackMan/Package.pm b/lib/Slackware/SlackMan/Package.pm
@@ -11,7 +11,7 @@ BEGIN {
 
   require Exporter;
 
-  $VERSION = 'v1.4.0';
+  $VERSION = 'v1.4.1';
   @ISA     = qw(Exporter);
 
   @EXPORT_OK = qw{

diff --git a/lib/Slackware/SlackMan/Parser.pm b/lib/Slackware/SlackMan/Parser.pm
@@ -11,7 +11,7 @@ BEGIN {
 
   require Exporter;
 
-  $VERSION = 'v1.4.0';
+  $VERSION = 'v1.4.1';
   @ISA     = qw(Exporter);
 
   @EXPORT_OK = qw{

diff --git a/lib/Slackware/SlackMan/Pkgtools.pm b/lib/Slackware/SlackMan/Pkgtools.pm
@@ -11,7 +11,7 @@ BEGIN {
 
   require Exporter;
 
-  $VERSION = 'v1.4.0';
+  $VERSION = 'v1.4.1';
   @ISA     = qw(Exporter);
 
   @EXPORT = qw{

diff --git a/lib/Slackware/SlackMan/Repo.pm b/lib/Slackware/SlackMan/Repo.pm
@@ -11,7 +11,7 @@ BEGIN {
 
   require Exporter;
 
-  $VERSION     = 'v1.4.0';
+  $VERSION     = 'v1.4.1';
   @ISA         = qw(Exporter);
 
   @EXPORT_OK   = qw{

diff --git a/lib/Slackware/SlackMan/Utils.pm b/lib/Slackware/SlackMan/Utils.pm
@@ -11,7 +11,7 @@ BEGIN {
 
   require Exporter;
 
-  $VERSION = 'v1.4.0';
+  $VERSION = 'v1.4.1';
   @ISA     = qw(Exporter);
 
   @EXPORT_OK = qw(

diff --git a/slackbuilds/slackman-libsupport/slackman-libsupport.SlackBuild b/slackbuilds/slackman-libsupport/slackman-libsupport.SlackBuild
@@ -24,7 +24,7 @@
 
 
 PRGNAM=slackman-libsupport
-VERSION=${VERSION:-1.4.0}
+VERSION=${VERSION:-1.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_lotar}
 
@@ -73,12 +73,11 @@ if [ ! -e $CPANM ]; then
   curl -L https://cpanmin.us -o $CWD/cpanm
 fi
 
-for MODULE in $MODULES; do
-  perl $CPANM -L $PKG/usr/share/slackman --self-contained \
-    --configure-args="--cflags=$SLKCFLAGS" --verbose --notest $MODULE
-done
+perl $CPANM -L $PKG/usr/share/slackman --self-contained \
+  --configure-args="--cflags=$SLKCFLAGS" --verbose --notest $MODULES
 
 rm -rf $PKG/usr/share/slackman/bin
+rm -rf $PKG/usr/share/slackman/man
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true

diff --git a/slackbuilds/slackman/slackman.SlackBuild b/slackbuilds/slackman/slackman.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for slackman
 
-# Copyright 2016-2017 Giuseppe Di Terlizzi <[email protected]>
+# Copyright 2016-2018 Giuseppe Di Terlizzi <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 
 PRGNAM=slackman
-VERSION=${VERSION:-1.4.0}
+VERSION=${VERSION:-1.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_lotar}
 ARCH=noarch

diff --git a/t/00-load.t b/t/00-load.t
@@ -6,6 +6,8 @@ use warnings FATAL => 'all';
 use Test::More;
 use File::Basename;
 
+use lib qw(/usr/share/slackman/lib/perl5);
+
 my $current_directory = dirname(__FILE__);
 $ENV{ROOT} = "$current_directory/root";
 

diff --git a/t/01-package-info.t b/t/01-package-info.t
@@ -6,6 +6,8 @@ use warnings FATAL => 'all';
 use Test::More;
 use File::Basename;
 
+use lib qw(/usr/share/slackman/lib/perl5);
+
 my $current_directory = dirname(__FILE__);
 $ENV{ROOT} = "$current_directory/root";
 

diff --git a/t/02-variables.t b/t/02-variables.t
@@ -6,6 +6,8 @@ use warnings FATAL => 'all';
 use Test::More;
 use File::Basename;
 
+use lib qw(/usr/share/slackman/lib/perl5);
+
 my $current_directory = dirname(__FILE__);
 $ENV{ROOT} = "$current_directory/root";
 

diff --git a/t/03-config.t b/t/03-config.t
@@ -6,6 +6,8 @@ use warnings FATAL => 'all';
 use Test::More;
 use File::Basename;
 
+use lib qw(/usr/share/slackman/lib/perl5);
+
 my $current_directory = dirname(__FILE__);
 $ENV{ROOT} = "$current_directory/root";