Date: Fri, 15 Jan 2016 16:04:16 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406169 - in head/net-mgmt/nagios-plugins: . files Message-ID: <201601151604.u0FG4G3B086213@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Fri Jan 15 16:04:16 2016 New Revision: 406169 URL: https://svnweb.freebsd.org/changeset/ports/406169 Log: Fix build and runtime with openssl with SSLv3 disabled. While there, rename patches. PR: 206263 Submitted by: chris chrullrich net Sponsored by: Absolight Added: head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__ircd.pl - copied, changed from r406168, head/net-mgmt/nagios-plugins/files/patch-plugins-scripts__check_ircd.pl head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__ntp.pl - copied, changed from r406168, head/net-mgmt/nagios-plugins/files/patch-plugins-scripts__check_ntp.pl head/net-mgmt/nagios-plugins/files/patch-plugins_check__pgsql.c - copied, changed from r406168, head/net-mgmt/nagios-plugins/files/patch-plugins__check_pgsql.c head/net-mgmt/nagios-plugins/files/patch-plugins_check__ssh.c - copied, changed from r406168, head/net-mgmt/nagios-plugins/files/patch-plugins__check_ssh.c head/net-mgmt/nagios-plugins/files/patch-plugins_sslutils.c (contents, props changed) Deleted: head/net-mgmt/nagios-plugins/files/patch-plugins-scripts__check_ircd.pl head/net-mgmt/nagios-plugins/files/patch-plugins-scripts__check_ntp.pl head/net-mgmt/nagios-plugins/files/patch-plugins__check_pgsql.c head/net-mgmt/nagios-plugins/files/patch-plugins__check_ssh.c Modified: head/net-mgmt/nagios-plugins/Makefile head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__file__age.pl Modified: head/net-mgmt/nagios-plugins/Makefile ============================================================================== --- head/net-mgmt/nagios-plugins/Makefile Fri Jan 15 15:40:36 2016 (r406168) +++ head/net-mgmt/nagios-plugins/Makefile Fri Jan 15 16:04:16 2016 (r406169) @@ -3,7 +3,7 @@ PORTNAME= nagios-plugins PORTVERSION= 2.1.1 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= https://www.nagios-plugins.org/download/ \ Modified: head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__file__age.pl ============================================================================== --- head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__file__age.pl Fri Jan 15 15:40:36 2016 (r406168) +++ head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__file__age.pl Fri Jan 15 16:04:16 2016 (r406169) @@ -1,4 +1,4 @@ ---- plugins-scripts/check_file_age.pl.orig 2015-09-08 21:18:08 UTC +--- plugins-scripts/check_file_age.pl.orig 2015-07-30 21:40:06 UTC +++ plugins-scripts/check_file_age.pl @@ -26,7 +26,8 @@ use English; use Getopt::Long; Copied and modified: head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__ircd.pl (from r406168, head/net-mgmt/nagios-plugins/files/patch-plugins-scripts__check_ircd.pl) ============================================================================== Copied and modified: head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__ntp.pl (from r406168, head/net-mgmt/nagios-plugins/files/patch-plugins-scripts__check_ntp.pl) ============================================================================== Copied and modified: head/net-mgmt/nagios-plugins/files/patch-plugins_check__pgsql.c (from r406168, head/net-mgmt/nagios-plugins/files/patch-plugins__check_pgsql.c) ============================================================================== Copied and modified: head/net-mgmt/nagios-plugins/files/patch-plugins_check__ssh.c (from r406168, head/net-mgmt/nagios-plugins/files/patch-plugins__check_ssh.c) ============================================================================== Added: head/net-mgmt/nagios-plugins/files/patch-plugins_sslutils.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/nagios-plugins/files/patch-plugins_sslutils.c Fri Jan 15 16:04:16 2016 (r406169) @@ -0,0 +1,16 @@ +--- plugins/sslutils.c.orig 2015-07-30 21:40:06 UTC ++++ plugins/sslutils.c +@@ -70,8 +70,13 @@ int np_net_ssl_init_with_hostname_versio + #endif + break; + case 3: /* SSLv3 protocol */ ++#if defined(OPENSSL_NO_SSL3) ++ printf(("%s\n", _("CRITICAL - SSL protocol version 3 is not supported by your SSL library."))); ++ return STATE_CRITICAL; ++#else + method = SSLv3_client_method(); + ssl_options = SSL_OP_NO_SSLv2 | SSL_OP_NO_TLSv1; ++#endif + break; + default: /* Unsupported */ + printf("%s\n", _("CRITICAL - Unsupported SSL protocol version."));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601151604.u0FG4G3B086213>