rpm/monitoring-plugins
SHA256
1
0
Fork 0
forked from pool/monitoring-plugins
Code Pull Requests Activity

Accepting request 1138821 from home:pmonrealgonzalez:branches:server:monitoring

Browse Source 
- check_ircd: Remove the perl-IO-Socket-INET6 dependency.
  * Remove the dependency on perl(IO::Socket::INET6) as it has been
    deprecated by upstream, is no longer suitable for use and its not
    being maintained. A compatible replacement for this package is
    perl(IO::Socket::IP) which is shipped by the perl-base package.
  * Add monitoring-plugins-ircd-INET6-deprecation.patch

OBS-URL: https://build.opensuse.org/request/show/1138821
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/monitoring-plugins?expand=0&rev=116
This commit is contained in:
Lars Vogdt 2024-01-16 08:39:51 +00:00 committed by Git OBS Bridge
parent 7e20b26c28
commit c0f2d03d1d
4 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
check_ircd_ssl
View File

@ -37,7 +37,7 @@
# 1999/09/20. Some code taken from Charlie Cook (check_disk.pl). # 1999/09/20. Some code taken from Charlie Cook (check_disk.pl).
# #
use Getopt::Long; use Getopt::Long;
use IO::Socket::INET6; use IO::Socket::IP;
use strict; use strict;
use vars qw($PROGNAME $VERSION); use vars qw($PROGNAME $VERSION);
use vars qw($opt_V $opt_h $opt_t $opt_p $opt_H $opt_w $opt_c $ssl $verbose); use vars qw($opt_V $opt_h $opt_t $opt_p $opt_H $opt_w $opt_c $ssl $verbose);
@ -106,10 +106,10 @@ sub connection ($$$$$$) {
debug("Attempting connect.\n",$verbose); debug("Attempting connect.\n",$verbose);
# Connect to server # Connect to server
debug("Connecting ...........\n",$verbose); debug("Connecting ...........\n",$verbose);
my $sock = IO::Socket::INET6->new( PeerAddr => $server, my $sock = IO::Socket::IP->new( PeerAddr => $server,
PeerPort => $port, PeerPort => $port,
Proto => 'tcp', Proto => 'tcp',
Domain => AF_UNSPEC ) or return ($user); Domain => AF_UNSPEC ) or return ($user);
if($ssl) { if($ssl) {
use IO::Socket::SSL; use IO::Socket::SSL;
debug("Starting SSL .........\n",$verbose); debug("Starting SSL .........\n",$verbose);

28
monitoring-plugins-ircd-INET6-deprecation.patch Normal file
View File

@ -0,0 +1,28 @@
Index: monitoring-plugins-2.3.5/plugins-scripts/check_ircd.pl
===================================================================
--- monitoring-plugins-2.3.5.orig/plugins-scripts/check_ircd.pl
+++ monitoring-plugins-2.3.5/plugins-scripts/check_ircd.pl
@@ -37,7 +37,7 @@
# 1999/09/20. Some code taken from Charlie Cook (check_disk.pl).
#
use Getopt::Long;
-use IO::Socket::INET6;
+use IO::Socket::IP;
use strict;
use vars qw($PROGNAME $VERSION);
use vars qw($opt_V $opt_h $opt_t $opt_p $opt_H $opt_w $opt_c $ssl $verbose);
@@ -106,10 +107,10 @@ sub connection ($$$$$$) {
debug("Attempting connect.\n",$verbose);
# Connect to server
debug("Connecting ...........\n",$verbose);
- my $sock = IO::Socket::INET6->new( PeerAddr => $server,
- PeerPort => $port,
- Proto => 'tcp',
- Domain => AF_UNSPEC ) or return ($user);
+ my $sock = IO::Socket::IP->new( PeerAddr => $server,
+ PeerPort => $port,
+ Proto => 'tcp',
+ Domain => AF_UNSPEC ) or return ($user);
if($ssl) {
use IO::Socket::SSL;
debug("Starting SSL .........\n",$verbose);

10
monitoring-plugins.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Jan 15 10:44:48 UTC 2024 - Pedro Monreal <pmonreal@suse.com>
- check_ircd: Remove the perl-IO-Socket-INET6 dependency.
* Remove the dependency on perl(IO::Socket::INET6) as it has been
deprecated by upstream, is no longer suitable for use and its not
being maintained. A compatible replacement for this package is
perl(IO::Socket::IP) which is shipped by the perl-base package.
* Add monitoring-plugins-ircd-INET6-deprecation.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 5 11:46:24 UTC 2023 - Lars Vogdt <lars@linux-schulserver.de> - 2.3.5 Tue Dec 5 11:46:24 UTC 2023 - Lars Vogdt <lars@linux-schulserver.de> - 2.3.5

4
monitoring-plugins.spec
View File

@ -73,6 +73,8 @@ Patch126: monitoring-plugins-2.3.3-check_ssh.t_-_improve_testing.patch
Patch128: monitoring-plugins-2.3.3-check_disk_on_btrfs.patch Patch128: monitoring-plugins-2.3.3-check_disk_on_btrfs.patch
# PATCH-FIX-UPSTREAM - see https://github.com/monitoring-plugins/monitoring-plugins/pull/1774 # PATCH-FIX-UPSTREAM - see https://github.com/monitoring-plugins/monitoring-plugins/pull/1774
Patch129: monitoring-plugins-2.3.3-check_by_ssh.patch Patch129: monitoring-plugins-2.3.3-check_by_ssh.patch
# PATCH-FIX-openSUSE - check_ircd: Remove the perl-IO-Socket-INET6 dependency
Patch130: monitoring-plugins-ircd-INET6-deprecation.patch
BuildRequires: bind-utils BuildRequires: bind-utils
BuildRequires: dhcp-devel BuildRequires: dhcp-devel
BuildRequires: fping BuildRequires: fping
@ -654,7 +656,7 @@ Summary: Check an IRCd server
Group: System/Monitoring Group: System/Monitoring
Requires: %{name}-common = %{version} Requires: %{name}-common = %{version}
Requires: perl Requires: perl
Requires: perl(IO::Socket::INET6) Requires: perl(IO::Socket::IP)
Requires: perl(IO::Socket::SSL) Requires: perl(IO::Socket::SSL)
Provides: nagios-plugins-ircd = %{version} Provides: nagios-plugins-ircd = %{version}
Obsoletes: nagios-plugins-ircd <= 1.5 Obsoletes: nagios-plugins-ircd <= 1.5