update nagios-plugins-config release

diff --git a/http.patch b/http.patch
deleted file mode 100644 (file)
index 166f77d..0000000
--- a/http.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- nagios-plugins-2.1.4.org/commands/check_http.cfg   2014-03-07 13:13:31.000000000 +0100
-+++ nagios-plugins-2.1.4/commands/check_http.cfg       2017-08-20 21:40:54.871308710 +0200
-@@ -1,17 +1,17 @@
- # 'check_http' command definition
- define command {
-       command_name    check_http
--      command_line    $USER1$/check_http -I $HOSTADDRESS$ -f warning $ARG1$
-+      command_line    $USER1$/check_http -I $HOSTADDRESS$ -H $HOSTNAME$ -f warning $ARG1$
- }
- 
- define command {
-       command_name    check_https
--      command_line    $USER1$/check_http -I $HOSTADDRESS$ -f warning -S $ARG1$
-+      command_line    $USER1$/check_http -I $HOSTADDRESS$ -H $HOSTNAME$ -f warning -S --sni $ARG1$
- }
- 
- define command {
-       command_name    check_https.crt
--      command_line    $USER1$/check_http -I $HOSTADDRESS$ -S -C 14 $ARG1$
-+      command_line    $USER1$/check_http -I $HOSTADDRESS$ -H $HOSTNAME$ -S -C 14 --sni $ARG1$
- }
- 
- define service {

diff --git a/nagios-plugins.spec b/nagios-plugins.spec
index d6f0c62369f8e87fd888017e839446d6c9d30e14..57731b679781dc35d70c54398a1ad0209bb54331 100644 (file)
--- a/nagios-plugins.spec
+++ b/nagios-plugins.spec
@@ -17,18 +17,17 @@ Summary:    Host/service/network monitoring program plugins for Nagios
 Summary(pl.UTF-8):     Wtyczki do monitorowania hostów/usług/sieci dla Nagiosa
 Name:          nagios-plugins
 Version:       2.2.1
-Release:       3
+Release:       4
 License:       GPL v3
 Group:         Networking
 Source0:       http://www.nagios-plugins.org/download/%{name}-%{version}.tar.gz
 # Source0-md5: fb521d5c05897f165b0b1862c1e5cb27
 # https://git.pld-linux.org/projects/nagios-config
-Source1:       %{name}-config-20150805.tar.xz
-# Source1-md5: 50c1eff5152ff03948b984631fa0ff61
+Source1:       %{name}-config-20171120.tar.xz
+# Source1-md5: 384c340b1f7579722652acfe90f3d064
 Source2:       nagios-utils.php
 #Patch:                %{name}-shared.patch # needs finishing
 Patch0:                %{name}-tainted.patch
-Patch1:                http.patch
 Patch2:                %{name}-check_http-ssl.patch
 Patch3:                %{name}-noroot.patch
 Patch4:                %{name}-check_ping-socket-filter-warning.patch
@@ -524,7 +523,6 @@ Wtyczki przekazane do projektu Nagios. Część z nich działa, część nie.
 %setup -q -a1
 mv nagios-plugins-config-*/* .
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1