Merge pull request #146 from hadfl/perlmod

update perl modules
omniosorg · Apr 14, 2024 · a55b16d · a55b16d
2 parents 1fbc4ce + 3a6cb91
commit a55b16d
Show file tree

Hide file tree

Showing 4 changed files with 562 additions and 6 deletions.
diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml
@@ -21,9 +21,9 @@ jobs:
           # - windows-latest
 
         perl:
-          - '5.32'
           - '5.34'
           - '5.36'
+          - '5.38'
         # exclude:
           #- os: ubuntu-16.04
           #  perl: '5.26'

diff --git a/cpanfile b/cpanfile
@@ -2,10 +2,10 @@ requires 'Bytes::Random::Secure::Tiny', '== 1.011';
 requires 'Cpanel::JSON::XS', '== 4.37';
 requires 'Curses::UI', '== 0.9609';
 requires 'Data::Processor', '== 1.0.9';
-requires 'Mojolicious', '== 9.34';
-requires 'IO::Socket::SSL', '== 2.083';
-requires 'IO::Uncompress::UnXz', '== 2.206';
-requires 'IO::Uncompress::UnZstd', '== 2.206';
+requires 'Mojolicious', '== 9.36';
+requires 'IO::Socket::SSL', '== 2.085';
+requires 'IO::Uncompress::UnXz', '== 2.211';
+requires 'IO::Uncompress::UnZstd', '== 2.211';
 requires 'Regexp::IPv4', '== 0.003';
 requires 'Regexp::IPv6', '== 0.03';
 requires 'TOML::Tiny', '== 0.16';

diff --git a/lib/Zadm/Utils.pm b/lib/Zadm/Utils.pm
@@ -504,7 +504,11 @@ sub loadTemplate($self, $file, $name = '') {
 
 sub getOverLink($self) {
     my $dladm = $self->readProc('dladm', [ qw(show-link -p -o), 'link,class' ]);
-    return [ map { /^([^:]+):(?:phys|etherstub|aggr|overlay)/ } @$dladm ];
+
+    return [
+        (map { /^([^:]+):aggr/ } @$dladm),
+        map { /^([^:]+):(?:phys|etherstub|overlay)/ } @$dladm
+    ];
 }
 
 sub isVirtual($self) {