wok-next rev 20807

nagios: update patch
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Jun 13 10:39:16 2018 +0200 (2018-06-13)
parents fe6dc47f7d21
children b8ce96f3b372
files nagios/stuff/patches/nagios-3.2.1-Makefiles.u nagios/stuff/patches/nagios-3.2.3-Makefiles.u nagios/stuff/patches/nagios-3.5.0-Makefiles.u nagios/stuff/patches/nagios-Makefiles.u
line diff
     1.1 --- a/nagios/stuff/patches/nagios-3.2.1-Makefiles.u	Wed Jun 13 08:26:54 2018 +0000
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,98 +0,0 @@
     1.4 ---- nagios-3.2.1-ori/Makefile.in	Thu Dec 31 11:12:08 2009
     1.5 -+++ nagios-3.2.1/Makefile.in	Sun Jun  6 11:03:32 2010
     1.6 -@@ -30,8 +30,8 @@
     1.7 - LIBEXECDIR=@libexecdir@
     1.8 - HTMLDIR=@datarootdir@
     1.9 - INSTALL=@INSTALL@
    1.10 --INSTALL_OPTS=@INSTALL_OPTS@
    1.11 --COMMAND_OPTS=@COMMAND_OPTS@
    1.12 -+INSTALL_OPTS=
    1.13 -+COMMAND_OPTS=
    1.14 - HTTPD_CONF=@HTTPD_CONF@
    1.15 - INIT_DIR=@init_dir@
    1.16 - INIT_OPTS=-o root -g root
    1.17 -@@ -264,6 +264,7 @@
    1.18 - 	@echo ""
    1.19 - 
    1.20 - install-webconf:
    1.21 -+	$(INSTALL) -m 755 -d $(DESTDIR)$(HTTPD_CONF)
    1.22 - 	$(INSTALL) -m 644 sample-config/httpd.conf $(DESTDIR)$(HTTPD_CONF)/nagios.conf
    1.23 - 
    1.24 - 	@echo ""
    1.25 ---- nagios-3.2.1-ori/base/Makefile.in	Wed Jun 17 05:57:21 2009
    1.26 -+++ nagios-3.2.1/base/Makefile.in	Sun Jun  6 11:03:32 2010
    1.27 -@@ -39,8 +39,8 @@
    1.28 - CGIDIR=@sbindir@
    1.29 - HTMLDIR=@datarootdir@
    1.30 - INSTALL=@INSTALL@
    1.31 --INSTALL_OPTS=@INSTALL_OPTS@
    1.32 --COMMAND_OPTS=@COMMAND_OPTS@
    1.33 -+INSTALL_OPTS=
    1.34 -+COMMAND_OPTS=
    1.35 - STRIP=@STRIP@
    1.36 - 
    1.37 - CGIURL=@cgiurl@
    1.38 ---- nagios-3.2.1-ori/cgi/Makefile.in	Wed Jun 17 05:57:21 2009
    1.39 -+++ nagios-3.2.1/cgi/Makefile.in	Sun Jun  6 11:03:32 2010
    1.40 -@@ -18,8 +18,8 @@
    1.41 - CGIDIR=@sbindir@
    1.42 - HTMLDIR=@datarootdir@
    1.43 - INSTALL=@INSTALL@
    1.44 --INSTALL_OPTS=@INSTALL_OPTS@
    1.45 --COMMAND_OPTS=@COMMAND_OPTS@
    1.46 -+INSTALL_OPTS=
    1.47 -+COMMAND_OPTS=
    1.48 - STRIP=@STRIP@
    1.49 - 
    1.50 - CGIEXTRAS=@CGIEXTRAS@
    1.51 ---- nagios-3.2.1-ori/common/Makefile.in	Wed Jun 17 05:57:21 2009
    1.52 -+++ nagios-3.2.1/common/Makefile.in	Sun Jun  6 11:03:32 2010
    1.53 -@@ -20,8 +20,8 @@
    1.54 - CGIDIR=@sbindir@
    1.55 - HTMLDIR=@datarootdir@
    1.56 - INSTALL=@INSTALL@
    1.57 --INSTALL_OPTS=@INSTALL_OPTS@
    1.58 --COMMAND_OPTS=@COMMAND_OPTS@
    1.59 -+INSTALL_OPTS=
    1.60 -+COMMAND_OPTS=
    1.61 - 
    1.62 - CP=@CP@
    1.63 - 
    1.64 ---- nagios-3.2.1-ori/contrib/Makefile.in	Mon May 19 20:01:58 2008
    1.65 -+++ nagios-3.2.1/contrib/Makefile.in	Sun Jun  6 10:43:34 2010
    1.66 -@@ -15,7 +15,7 @@
    1.67 - # Generated automatically from configure script
    1.68 - SNPRINTF_O=@SNPRINTF_O@
    1.69 - INSTALL=@INSTALL@
    1.70 --INSTALL_OPTS=@INSTALL_OPTS@
    1.71 -+INSTALL_OPTS=
    1.72 - 
    1.73 - 
    1.74 - prefix=@prefix@
    1.75 ---- nagios-3.2.1-ori/html/Makefile.in	Wed Jul  8 00:34:51 2009
    1.76 -+++ nagios-3.2.1/html/Makefile.in	Sun Jun  6 10:59:50 2010
    1.77 -@@ -10,8 +10,8 @@
    1.78 - CGIDIR=@sbindir@
    1.79 - HTMLDIR=@datadir@
    1.80 - INSTALL=@INSTALL@
    1.81 --INSTALL_OPTS=@INSTALL_OPTS@
    1.82 --COMMAND_OPTS=@COMMAND_OPTS@
    1.83 -+INSTALL_OPTS=
    1.84 -+COMMAND_OPTS=
    1.85 - 
    1.86 - CP=@CP@
    1.87 - 
    1.88 ---- nagios-3.2.1-ori/module/Makefile.in	Sat Dec 15 00:02:24 2007
    1.89 -+++ nagios-3.2.1/module/Makefile.in	Sun Jun  6 11:03:32 2010
    1.90 -@@ -19,9 +19,8 @@
    1.91 - exec_prefix=@exec_prefix@
    1.92 - BINDIR=@bindir@
    1.93 - INSTALL=@INSTALL@
    1.94 --INSTALL_OPTS=@INSTALL_OPTS@
    1.95 --COMMAND_OPTS=@COMMAND_OPTS@
    1.96 --STRIP=@STRIP@
    1.97 -+INSTALL_OPTS=
    1.98 -+COMMAND_OPTS=
    1.99 - 
   1.100 - CP=@CP@
   1.101 - 
     2.1 --- a/nagios/stuff/patches/nagios-3.2.3-Makefiles.u	Wed Jun 13 08:26:54 2018 +0000
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,98 +0,0 @@
     2.4 ---- nagios-3.2.1-ori/Makefile.in	Thu Dec 31 11:12:08 2009
     2.5 -+++ nagios-3.2.1/Makefile.in	Sun Jun  6 11:03:32 2010
     2.6 -@@ -30,8 +30,8 @@
     2.7 - LIBEXECDIR=@libexecdir@
     2.8 - HTMLDIR=@datarootdir@
     2.9 - INSTALL=@INSTALL@
    2.10 --INSTALL_OPTS=@INSTALL_OPTS@
    2.11 --COMMAND_OPTS=@COMMAND_OPTS@
    2.12 -+INSTALL_OPTS=
    2.13 -+COMMAND_OPTS=
    2.14 - HTTPD_CONF=@HTTPD_CONF@
    2.15 - INIT_DIR=@init_dir@
    2.16 - INIT_OPTS=-o root -g root
    2.17 -@@ -264,6 +264,7 @@
    2.18 - 	@echo ""
    2.19 - 
    2.20 - install-webconf:
    2.21 -+	$(INSTALL) -m 755 -d $(DESTDIR)$(HTTPD_CONF)
    2.22 - 	$(INSTALL) -m 644 sample-config/httpd.conf $(DESTDIR)$(HTTPD_CONF)/nagios.conf
    2.23 - 
    2.24 - 	@echo ""
    2.25 ---- nagios-3.2.1-ori/base/Makefile.in	Wed Jun 17 05:57:21 2009
    2.26 -+++ nagios-3.2.1/base/Makefile.in	Sun Jun  6 11:03:32 2010
    2.27 -@@ -39,8 +39,8 @@
    2.28 - CGIDIR=@sbindir@
    2.29 - HTMLDIR=@datarootdir@
    2.30 - INSTALL=@INSTALL@
    2.31 --INSTALL_OPTS=@INSTALL_OPTS@
    2.32 --COMMAND_OPTS=@COMMAND_OPTS@
    2.33 -+INSTALL_OPTS=
    2.34 -+COMMAND_OPTS=
    2.35 - STRIP=@STRIP@
    2.36 - 
    2.37 - CGIURL=@cgiurl@
    2.38 ---- nagios-3.2.1-ori/cgi/Makefile.in	Wed Jun 17 05:57:21 2009
    2.39 -+++ nagios-3.2.1/cgi/Makefile.in	Sun Jun  6 11:03:32 2010
    2.40 -@@ -18,8 +18,8 @@
    2.41 - CGIDIR=@sbindir@
    2.42 - HTMLDIR=@datarootdir@
    2.43 - INSTALL=@INSTALL@
    2.44 --INSTALL_OPTS=@INSTALL_OPTS@
    2.45 --COMMAND_OPTS=@COMMAND_OPTS@
    2.46 -+INSTALL_OPTS=
    2.47 -+COMMAND_OPTS=
    2.48 - STRIP=@STRIP@
    2.49 - 
    2.50 - CGIEXTRAS=@CGIEXTRAS@
    2.51 ---- nagios-3.2.1-ori/common/Makefile.in	Wed Jun 17 05:57:21 2009
    2.52 -+++ nagios-3.2.1/common/Makefile.in	Sun Jun  6 11:03:32 2010
    2.53 -@@ -20,8 +20,8 @@
    2.54 - CGIDIR=@sbindir@
    2.55 - HTMLDIR=@datarootdir@
    2.56 - INSTALL=@INSTALL@
    2.57 --INSTALL_OPTS=@INSTALL_OPTS@
    2.58 --COMMAND_OPTS=@COMMAND_OPTS@
    2.59 -+INSTALL_OPTS=
    2.60 -+COMMAND_OPTS=
    2.61 - 
    2.62 - CP=@CP@
    2.63 - 
    2.64 ---- nagios-3.2.1-ori/contrib/Makefile.in	Mon May 19 20:01:58 2008
    2.65 -+++ nagios-3.2.1/contrib/Makefile.in	Sun Jun  6 10:43:34 2010
    2.66 -@@ -15,7 +15,7 @@
    2.67 - # Generated automatically from configure script
    2.68 - SNPRINTF_O=@SNPRINTF_O@
    2.69 - INSTALL=@INSTALL@
    2.70 --INSTALL_OPTS=@INSTALL_OPTS@
    2.71 -+INSTALL_OPTS=
    2.72 - 
    2.73 - 
    2.74 - prefix=@prefix@
    2.75 ---- nagios-3.2.1-ori/html/Makefile.in	Wed Jul  8 00:34:51 2009
    2.76 -+++ nagios-3.2.1/html/Makefile.in	Sun Jun  6 10:59:50 2010
    2.77 -@@ -10,8 +10,8 @@
    2.78 - CGIDIR=@sbindir@
    2.79 - HTMLDIR=@datadir@
    2.80 - INSTALL=@INSTALL@
    2.81 --INSTALL_OPTS=@INSTALL_OPTS@
    2.82 --COMMAND_OPTS=@COMMAND_OPTS@
    2.83 -+INSTALL_OPTS=
    2.84 -+COMMAND_OPTS=
    2.85 - 
    2.86 - CP=@CP@
    2.87 - 
    2.88 ---- nagios-3.2.1-ori/module/Makefile.in	Sat Dec 15 00:02:24 2007
    2.89 -+++ nagios-3.2.1/module/Makefile.in	Sun Jun  6 11:03:32 2010
    2.90 -@@ -19,9 +19,8 @@
    2.91 - exec_prefix=@exec_prefix@
    2.92 - BINDIR=@bindir@
    2.93 - INSTALL=@INSTALL@
    2.94 --INSTALL_OPTS=@INSTALL_OPTS@
    2.95 --COMMAND_OPTS=@COMMAND_OPTS@
    2.96 --STRIP=@STRIP@
    2.97 -+INSTALL_OPTS=
    2.98 -+COMMAND_OPTS=
    2.99 - 
   2.100 - CP=@CP@
   2.101 - 
     3.1 --- a/nagios/stuff/patches/nagios-3.5.0-Makefiles.u	Wed Jun 13 08:26:54 2018 +0000
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,98 +0,0 @@
     3.4 ---- nagios-3.2.1-ori/Makefile.in	Thu Dec 31 11:12:08 2009
     3.5 -+++ nagios-3.2.1/Makefile.in	Sun Jun  6 11:03:32 2010
     3.6 -@@ -30,8 +30,8 @@
     3.7 - LIBEXECDIR=@libexecdir@
     3.8 - HTMLDIR=@datarootdir@
     3.9 - INSTALL=@INSTALL@
    3.10 --INSTALL_OPTS=@INSTALL_OPTS@
    3.11 --COMMAND_OPTS=@COMMAND_OPTS@
    3.12 -+INSTALL_OPTS=
    3.13 -+COMMAND_OPTS=
    3.14 - HTTPD_CONF=@HTTPD_CONF@
    3.15 - INIT_DIR=@init_dir@
    3.16 - INIT_OPTS=-o root -g root
    3.17 -@@ -264,6 +264,7 @@
    3.18 - 	@echo ""
    3.19 - 
    3.20 - install-webconf:
    3.21 -+	$(INSTALL) -m 755 -d $(DESTDIR)$(HTTPD_CONF)
    3.22 - 	$(INSTALL) -m 644 sample-config/httpd.conf $(DESTDIR)$(HTTPD_CONF)/nagios.conf
    3.23 - 
    3.24 - 	@echo ""
    3.25 ---- nagios-3.2.1-ori/base/Makefile.in	Wed Jun 17 05:57:21 2009
    3.26 -+++ nagios-3.2.1/base/Makefile.in	Sun Jun  6 11:03:32 2010
    3.27 -@@ -39,8 +39,8 @@
    3.28 - CGIDIR=@sbindir@
    3.29 - HTMLDIR=@datarootdir@
    3.30 - INSTALL=@INSTALL@
    3.31 --INSTALL_OPTS=@INSTALL_OPTS@
    3.32 --COMMAND_OPTS=@COMMAND_OPTS@
    3.33 -+INSTALL_OPTS=
    3.34 -+COMMAND_OPTS=
    3.35 - STRIP=@STRIP@
    3.36 - 
    3.37 - CGIURL=@cgiurl@
    3.38 ---- nagios-3.2.1-ori/cgi/Makefile.in	Wed Jun 17 05:57:21 2009
    3.39 -+++ nagios-3.2.1/cgi/Makefile.in	Sun Jun  6 11:03:32 2010
    3.40 -@@ -18,8 +18,8 @@
    3.41 - CGIDIR=@sbindir@
    3.42 - HTMLDIR=@datarootdir@
    3.43 - INSTALL=@INSTALL@
    3.44 --INSTALL_OPTS=@INSTALL_OPTS@
    3.45 --COMMAND_OPTS=@COMMAND_OPTS@
    3.46 -+INSTALL_OPTS=
    3.47 -+COMMAND_OPTS=
    3.48 - STRIP=@STRIP@
    3.49 - 
    3.50 - CGIEXTRAS=@CGIEXTRAS@
    3.51 ---- nagios-3.2.1-ori/common/Makefile.in	Wed Jun 17 05:57:21 2009
    3.52 -+++ nagios-3.2.1/common/Makefile.in	Sun Jun  6 11:03:32 2010
    3.53 -@@ -20,8 +20,8 @@
    3.54 - CGIDIR=@sbindir@
    3.55 - HTMLDIR=@datarootdir@
    3.56 - INSTALL=@INSTALL@
    3.57 --INSTALL_OPTS=@INSTALL_OPTS@
    3.58 --COMMAND_OPTS=@COMMAND_OPTS@
    3.59 -+INSTALL_OPTS=
    3.60 -+COMMAND_OPTS=
    3.61 - 
    3.62 - CP=@CP@
    3.63 - 
    3.64 ---- nagios-3.2.1-ori/contrib/Makefile.in	Mon May 19 20:01:58 2008
    3.65 -+++ nagios-3.2.1/contrib/Makefile.in	Sun Jun  6 10:43:34 2010
    3.66 -@@ -15,7 +15,7 @@
    3.67 - # Generated automatically from configure script
    3.68 - SNPRINTF_O=@SNPRINTF_O@
    3.69 - INSTALL=@INSTALL@
    3.70 --INSTALL_OPTS=@INSTALL_OPTS@
    3.71 -+INSTALL_OPTS=
    3.72 - 
    3.73 - 
    3.74 - prefix=@prefix@
    3.75 ---- nagios-3.2.1-ori/html/Makefile.in	Wed Jul  8 00:34:51 2009
    3.76 -+++ nagios-3.2.1/html/Makefile.in	Sun Jun  6 10:59:50 2010
    3.77 -@@ -10,8 +10,8 @@
    3.78 - CGIDIR=@sbindir@
    3.79 - HTMLDIR=@datadir@
    3.80 - INSTALL=@INSTALL@
    3.81 --INSTALL_OPTS=@INSTALL_OPTS@
    3.82 --COMMAND_OPTS=@COMMAND_OPTS@
    3.83 -+INSTALL_OPTS=
    3.84 -+COMMAND_OPTS=
    3.85 - 
    3.86 - CP=@CP@
    3.87 - 
    3.88 ---- nagios-3.2.1-ori/module/Makefile.in	Sat Dec 15 00:02:24 2007
    3.89 -+++ nagios-3.2.1/module/Makefile.in	Sun Jun  6 11:03:32 2010
    3.90 -@@ -19,9 +19,8 @@
    3.91 - exec_prefix=@exec_prefix@
    3.92 - BINDIR=@bindir@
    3.93 - INSTALL=@INSTALL@
    3.94 --INSTALL_OPTS=@INSTALL_OPTS@
    3.95 --COMMAND_OPTS=@COMMAND_OPTS@
    3.96 --STRIP=@STRIP@
    3.97 -+INSTALL_OPTS=
    3.98 -+COMMAND_OPTS=
    3.99 - 
   3.100 - CP=@CP@
   3.101 - 
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/nagios/stuff/patches/nagios-Makefiles.u	Wed Jun 13 10:39:16 2018 +0200
     4.3 @@ -0,0 +1,98 @@
     4.4 +--- nagios-3.2.1-ori/Makefile.in	Thu Dec 31 11:12:08 2009
     4.5 ++++ nagios-3.2.1/Makefile.in	Sun Jun  6 11:03:32 2010
     4.6 +@@ -30,8 +30,8 @@
     4.7 + LIBEXECDIR=@libexecdir@
     4.8 + HTMLDIR=@datarootdir@
     4.9 + INSTALL=@INSTALL@
    4.10 +-INSTALL_OPTS=@INSTALL_OPTS@
    4.11 +-COMMAND_OPTS=@COMMAND_OPTS@
    4.12 ++INSTALL_OPTS=
    4.13 ++COMMAND_OPTS=
    4.14 + HTTPD_CONF=@HTTPD_CONF@
    4.15 + INIT_DIR=@init_dir@
    4.16 + INIT_OPTS=-o root -g root
    4.17 +@@ -264,6 +264,7 @@
    4.18 + 	@echo ""
    4.19 + 
    4.20 + install-webconf:
    4.21 ++	$(INSTALL) -m 755 -d $(DESTDIR)$(HTTPD_CONF)
    4.22 + 	$(INSTALL) -m 644 sample-config/httpd.conf $(DESTDIR)$(HTTPD_CONF)/nagios.conf
    4.23 + 
    4.24 + 	@echo ""
    4.25 +--- nagios-3.2.1-ori/base/Makefile.in	Wed Jun 17 05:57:21 2009
    4.26 ++++ nagios-3.2.1/base/Makefile.in	Sun Jun  6 11:03:32 2010
    4.27 +@@ -39,8 +39,8 @@
    4.28 + CGIDIR=@sbindir@
    4.29 + HTMLDIR=@datarootdir@
    4.30 + INSTALL=@INSTALL@
    4.31 +-INSTALL_OPTS=@INSTALL_OPTS@
    4.32 +-COMMAND_OPTS=@COMMAND_OPTS@
    4.33 ++INSTALL_OPTS=
    4.34 ++COMMAND_OPTS=
    4.35 + STRIP=@STRIP@
    4.36 + 
    4.37 + CGIURL=@cgiurl@
    4.38 +--- nagios-3.2.1-ori/cgi/Makefile.in	Wed Jun 17 05:57:21 2009
    4.39 ++++ nagios-3.2.1/cgi/Makefile.in	Sun Jun  6 11:03:32 2010
    4.40 +@@ -18,8 +18,8 @@
    4.41 + CGIDIR=@sbindir@
    4.42 + HTMLDIR=@datarootdir@
    4.43 + INSTALL=@INSTALL@
    4.44 +-INSTALL_OPTS=@INSTALL_OPTS@
    4.45 +-COMMAND_OPTS=@COMMAND_OPTS@
    4.46 ++INSTALL_OPTS=
    4.47 ++COMMAND_OPTS=
    4.48 + STRIP=@STRIP@
    4.49 + 
    4.50 + CGIEXTRAS=@CGIEXTRAS@
    4.51 +--- nagios-3.2.1-ori/common/Makefile.in	Wed Jun 17 05:57:21 2009
    4.52 ++++ nagios-3.2.1/common/Makefile.in	Sun Jun  6 11:03:32 2010
    4.53 +@@ -20,8 +20,8 @@
    4.54 + CGIDIR=@sbindir@
    4.55 + HTMLDIR=@datarootdir@
    4.56 + INSTALL=@INSTALL@
    4.57 +-INSTALL_OPTS=@INSTALL_OPTS@
    4.58 +-COMMAND_OPTS=@COMMAND_OPTS@
    4.59 ++INSTALL_OPTS=
    4.60 ++COMMAND_OPTS=
    4.61 + 
    4.62 + CP=@CP@
    4.63 + 
    4.64 +--- nagios-3.2.1-ori/contrib/Makefile.in	Mon May 19 20:01:58 2008
    4.65 ++++ nagios-3.2.1/contrib/Makefile.in	Sun Jun  6 10:43:34 2010
    4.66 +@@ -15,7 +15,7 @@
    4.67 + # Generated automatically from configure script
    4.68 + SNPRINTF_O=@SNPRINTF_O@
    4.69 + INSTALL=@INSTALL@
    4.70 +-INSTALL_OPTS=@INSTALL_OPTS@
    4.71 ++INSTALL_OPTS=
    4.72 + 
    4.73 + 
    4.74 + prefix=@prefix@
    4.75 +--- nagios-3.2.1-ori/html/Makefile.in	Wed Jul  8 00:34:51 2009
    4.76 ++++ nagios-3.2.1/html/Makefile.in	Sun Jun  6 10:59:50 2010
    4.77 +@@ -10,8 +10,8 @@
    4.78 + CGIDIR=@sbindir@
    4.79 + HTMLDIR=@datadir@
    4.80 + INSTALL=@INSTALL@
    4.81 +-INSTALL_OPTS=@INSTALL_OPTS@
    4.82 +-COMMAND_OPTS=@COMMAND_OPTS@
    4.83 ++INSTALL_OPTS=
    4.84 ++COMMAND_OPTS=
    4.85 + 
    4.86 + CP=@CP@
    4.87 + 
    4.88 +--- nagios-3.2.1-ori/module/Makefile.in	Sat Dec 15 00:02:24 2007
    4.89 ++++ nagios-3.2.1/module/Makefile.in	Sun Jun  6 11:03:32 2010
    4.90 +@@ -19,9 +19,8 @@
    4.91 + exec_prefix=@exec_prefix@
    4.92 + BINDIR=@bindir@
    4.93 + INSTALL=@INSTALL@
    4.94 +-INSTALL_OPTS=@INSTALL_OPTS@
    4.95 +-COMMAND_OPTS=@COMMAND_OPTS@
    4.96 +-STRIP=@STRIP@
    4.97 ++INSTALL_OPTS=
    4.98 ++COMMAND_OPTS=
    4.99 + 
   4.100 + CP=@CP@
   4.101 +