From a29fcaf2c66a965d501a9ea075fb650b47741b9e Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Tue, 6 Aug 2019 16:12:26 +0200 Subject: [PATCH] Bump --- .../patches/10_fix_wrong_line_makefile.patch | 8 +- debian/patches/50_cgi.cfg-debianize.patch | 2 +- .../patches/51_commands.cfg-debianize.patch | 255 ++++++++++-------- debian/patches/52_nagios.cfg-debianize.patch | 32 +-- debian/patches/55_strip_logarchivepath.patch | 8 +- .../patches/70_fix_eventhandler_paths.patch | 54 ++-- debian/patches/80_rpm_part_irrelevant.patch | 14 +- 7 files changed, 211 insertions(+), 162 deletions(-) diff --git a/debian/patches/10_fix_wrong_line_makefile.patch b/debian/patches/10_fix_wrong_line_makefile.patch index 098d117..532f42e 100644 --- a/debian/patches/10_fix_wrong_line_makefile.patch +++ b/debian/patches/10_fix_wrong_line_makefile.patch @@ -1,8 +1,10 @@ Author: Grey Box Description: install as non nagios user ---- a/Makefile.in 2015-08-20 00:49:52.000000000 +0300 -+++ b/Makefile.in 2016-03-04 18:09:00.389187103 +0300 -@@ -250,7 +250,7 @@ +Index: nagios4/Makefile.in +=================================================================== +--- nagios4.orig/Makefile.in ++++ nagios4/Makefile.in +@@ -290,7 +290,7 @@ install-basic: $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR) $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR) $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives diff --git a/debian/patches/50_cgi.cfg-debianize.patch b/debian/patches/50_cgi.cfg-debianize.patch index fc4d8bc..b6dd87b 100644 --- a/debian/patches/50_cgi.cfg-debianize.patch +++ b/debian/patches/50_cgi.cfg-debianize.patch @@ -33,4 +33,4 @@ Description: Debianize cgi.cfg +nagios_check_command=/usr/lib/nagios/plugins/check_nagios /var/cache/nagios4/status.dat 5 '/usr/sbin/nagios4' # AUTHENTICATION USAGE - # This option controls whether or not the CGIs will use any + # This option controls whether or not the CGIs will use any diff --git a/debian/patches/51_commands.cfg-debianize.patch b/debian/patches/51_commands.cfg-debianize.patch index 9b24f7f..6056c77 100644 --- a/debian/patches/51_commands.cfg-debianize.patch +++ b/debian/patches/51_commands.cfg-debianize.patch @@ -1,14 +1,16 @@ Author: Alexander Wirt Description: Debianize commands.cfg ---- a/sample-config/template-object/commands.cfg.in -+++ b/sample-config/template-object/commands.cfg.in -@@ -2,23 +2,12 @@ +Index: nagios4/sample-config/template-object/commands.cfg.in +=================================================================== +--- nagios4.orig/sample-config/template-object/commands.cfg.in ++++ nagios4/sample-config/template-object/commands.cfg.in +@@ -2,24 +2,13 @@ # COMMANDS.CFG - SAMPLE COMMAND DEFINITIONS FOR NAGIOS @VERSION@ # # -# NOTES: This config file provides you with some example command definitions -# that you can reference in host, service, and contact definitions. --# +-# -# You don't need to keep commands in a separate file from your other -# object definitions. This has been done just to make things easier to -# understand. @@ -16,18 +18,19 @@ Description: Debianize commands.cfg ############################################################################### + ################################################################################ # -# SAMPLE NOTIFICATION COMMANDS -# -# These are some example notification commands. They may or may not work on --# your system without modification. As an example, some systems will require +-# your system without modification. As an example, some systems will require -# you to use "/usr/bin/mailx" instead of "/usr/bin/mail" in the commands below. +# NOTIFICATION COMMANDS # ################################################################################ -@@ -41,184 +30,16 @@ +@@ -41,200 +30,16 @@ define command { ################################################################################ # @@ -36,181 +39,197 @@ Description: Debianize commands.cfg # ################################################################################ -+# On Debian, check-host-alive is being defined from within the -+# nagios-plugins-basic package - -# This command checks to see if a host is "alive" by pinging it --# The check must result in a 100% packet loss or 5 second (5000ms) round trip +-# The check must result in a 100% packet loss or 5 second (5000ms) round trip -# average time to produce a critical error. -# Note: Five ICMP echo packets are sent (determined by the '-p 5' argument) - --# 'check-host-alive' command definition --define command{ -- command_name check-host-alive -- command_line $USER1$/check_ping -H $HOSTADDRESS$ -w 3000.0,80% -c 5000.0,100% -p 5 -- } +-define command { +- +- command_name check-host-alive +- command_line $USER1$/check_ping -H $HOSTADDRESS$ -w 3000.0,80% -c 5000.0,100% -p 5 +-} - - -- -- --################################################################################ --# ++# On Debian, check-host-alive is being defined from within the ++# nagios-plugins-basic package + + ################################################################################ + # -# SAMPLE SERVICE CHECK COMMANDS -# -# These are some example service check commands. They may or may not work on --# your system, as they must be modified for your plugins. See the HTML +-# your system, as they must be modified for your plugins. See the HTML -# documentation on the plugins for examples of how to configure command definitions. -# -# NOTE: The following 'check_local_...' functions are designed to monitor -# various metrics on the host that Nagios is running on (i.e. this one). -################################################################################ - --# 'check_local_disk' command definition --define command{ -- command_name check_local_disk -- command_line $USER1$/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$ -- } +-define command { +- +- command_name check_local_disk +- command_line $USER1$/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$ +-} - - --# 'check_local_load' command definition --define command{ -- command_name check_local_load -- command_line $USER1$/check_load -w $ARG1$ -c $ARG2$ -- } +- +-define command { +- +- command_name check_local_load +- command_line $USER1$/check_load -w $ARG1$ -c $ARG2$ +-} - - --# 'check_local_procs' command definition --define command{ -- command_name check_local_procs -- command_line $USER1$/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$ -- } +- +-define command { +- +- command_name check_local_procs +- command_line $USER1$/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$ +-} - - --# 'check_local_users' command definition --define command{ -- command_name check_local_users -- command_line $USER1$/check_users -w $ARG1$ -c $ARG2$ -- } +- +-define command { +- +- command_name check_local_users +- command_line $USER1$/check_users -w $ARG1$ -c $ARG2$ +-} - - --# 'check_local_swap' command definition --define command{ -- command_name check_local_swap -- command_line $USER1$/check_swap -w $ARG1$ -c $ARG2$ -- } +- +-define command { +- +- command_name check_local_swap +- command_line $USER1$/check_swap -w $ARG1$ -c $ARG2$ +-} - - --# 'check_local_mrtgtraf' command definition --define command{ -- command_name check_local_mrtgtraf -- command_line $USER1$/check_mrtgtraf -F $ARG1$ -a $ARG2$ -w $ARG3$ -c $ARG4$ -e $ARG5$ -- } +- +-define command { +- +- command_name check_local_mrtgtraf +- command_line $USER1$/check_mrtgtraf -F $ARG1$ -a $ARG2$ -w $ARG3$ -c $ARG4$ -e $ARG5$ +-} +- - - -################################################################################ -# NOTE: The following 'check_...' commands are used to monitor services on -# both local and remote hosts. - ################################################################################ +-################################################################################ - --# 'check_ftp' command definition --define command{ -- command_name check_ftp -- command_line $USER1$/check_ftp -H $HOSTADDRESS$ $ARG1$ -- } +-define command { +- +- command_name check_ftp +- command_line $USER1$/check_ftp -H $HOSTADDRESS$ $ARG1$ +-} - - --# 'check_hpjd' command definition --define command{ -- command_name check_hpjd -- command_line $USER1$/check_hpjd -H $HOSTADDRESS$ $ARG1$ -- } +- +-define command { +- +- command_name check_hpjd +- command_line $USER1$/check_hpjd -H $HOSTADDRESS$ $ARG1$ +-} - - --# 'check_snmp' command definition --define command{ -- command_name check_snmp -- command_line $USER1$/check_snmp -H $HOSTADDRESS$ $ARG1$ -- } +- +-define command { +- +- command_name check_snmp +- command_line $USER1$/check_snmp -H $HOSTADDRESS$ $ARG1$ +-} - - --# 'check_http' command definition --define command{ -- command_name check_http -- command_line $USER1$/check_http -I $HOSTADDRESS$ $ARG1$ -- } +- +-define command { +- +- command_name check_http +- command_line $USER1$/check_http -I $HOSTADDRESS$ $ARG1$ +-} - - --# 'check_ssh' command definition --define command{ -- command_name check_ssh -- command_line $USER1$/check_ssh $ARG1$ $HOSTADDRESS$ -- } +- +-define command { +- +- command_name check_ssh +- command_line $USER1$/check_ssh $ARG1$ $HOSTADDRESS$ +-} - - --# 'check_dhcp' command definition --define command{ -- command_name check_dhcp -- command_line $USER1$/check_dhcp $ARG1$ -- } +- +-define command { +- +- command_name check_dhcp +- command_line $USER1$/check_dhcp $ARG1$ +-} - - --# 'check_ping' command definition --define command{ -- command_name check_ping -- command_line $USER1$/check_ping -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ -p 5 -- } +- +-define command { +- +- command_name check_ping +- command_line $USER1$/check_ping -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ -p 5 +-} - - --# 'check_pop' command definition --define command{ -- command_name check_pop -- command_line $USER1$/check_pop -H $HOSTADDRESS$ $ARG1$ -- } +- +-define command { +- +- command_name check_pop +- command_line $USER1$/check_pop -H $HOSTADDRESS$ $ARG1$ +-} - - --# 'check_imap' command definition --define command{ -- command_name check_imap -- command_line $USER1$/check_imap -H $HOSTADDRESS$ $ARG1$ -- } +- +-define command { +- +- command_name check_imap +- command_line $USER1$/check_imap -H $HOSTADDRESS$ $ARG1$ +-} - - --# 'check_smtp' command definition --define command{ -- command_name check_smtp -- command_line $USER1$/check_smtp -H $HOSTADDRESS$ $ARG1$ -- } +- +-define command { +- +- command_name check_smtp +- command_line $USER1$/check_smtp -H $HOSTADDRESS$ $ARG1$ +-} - - --# 'check_tcp' command definition --define command{ -- command_name check_tcp -- command_line $USER1$/check_tcp -H $HOSTADDRESS$ -p $ARG1$ $ARG2$ -- } +- +-define command { +- +- command_name check_tcp +- command_line $USER1$/check_tcp -H $HOSTADDRESS$ -p $ARG1$ $ARG2$ +-} - - --# 'check_udp' command definition --define command{ -- command_name check_udp -- command_line $USER1$/check_udp -H $HOSTADDRESS$ -p $ARG1$ $ARG2$ -- } +- +-define command { +- +- command_name check_udp +- command_line $USER1$/check_udp -H $HOSTADDRESS$ -p $ARG1$ $ARG2$ +-} - - --# 'check_nt' command definition --define command{ -- command_name check_nt -- command_line $USER1$/check_nt -H $HOSTADDRESS$ -p 12489 -v $ARG1$ $ARG2$ -- } +- +-define command { +- +- command_name check_nt +- command_line $USER1$/check_nt -H $HOSTADDRESS$ -p 12489 -v $ARG1$ $ARG2$ +-} - - - -################################################################################ -# -# SAMPLE PERFORMANCE DATA COMMANDS - # +-# -# These are sample performance data commands that can be used to send performance -# data output to two text files (one for hosts, another for services). If you --# plan on simply writing performance data out to a file, consider using the +-# plan on simply writing performance data out to a file, consider using the -# host_perfdata_file and service_perfdata_file options in the main config file. +# PERFORMANCE DATA COMMANDS # diff --git a/debian/patches/52_nagios.cfg-debianize.patch b/debian/patches/52_nagios.cfg-debianize.patch index d6c30ad..90ccedb 100644 --- a/debian/patches/52_nagios.cfg-debianize.patch +++ b/debian/patches/52_nagios.cfg-debianize.patch @@ -1,9 +1,11 @@ Author: Alexander Wirt Description: Debianize nagios.cfg ---- a/sample-config/nagios.cfg.in 2017-05-09 19:03:31.000000000 +0200 -+++ b/sample-config/nagios.cfg.in 2017-05-20 00:23:49.536000000 +0200 +Index: nagios4/sample-config/nagios.cfg.in +=================================================================== +--- nagios4.orig/sample-config/nagios.cfg.in ++++ nagios4/sample-config/nagios.cfg.in @@ -15,9 +15,19 @@ - # for historical purposes. This should be the first option specified + # for historical purposes. This should be the first option specified # in the config file!!! -log_file=@localstatedir@/nagios.log @@ -23,7 +25,7 @@ Description: Debianize nagios.cfg # OBJECT CONFIGURATION FILE(S) # These are the object configuration files in which you define hosts, -@@ -26,13 +36,10 @@ +@@ -26,13 +36,10 @@ log_file=@localstatedir@/nagios.log # if you wish (as shown below), or keep them all in a single config file. # You can specify individual object config files as shown below: @@ -41,7 +43,7 @@ Description: Debianize nagios.cfg # Definitions for monitoring a Windows machine #cfg_file=@sysconfdir@/objects/windows.cfg -@@ -63,7 +70,7 @@ +@@ -63,7 +70,7 @@ cfg_file=@sysconfdir@/objects/localhost. # directly) in order to prevent inconsistencies that can occur # when the config files are modified after Nagios starts. @@ -50,7 +52,7 @@ Description: Debianize nagios.cfg -@@ -102,7 +109,7 @@ +@@ -102,7 +109,7 @@ resource_file=@sysconfdir@/resource.cfg # The contents of the status file are deleted every time Nagios # restarts. @@ -59,7 +61,7 @@ Description: Debianize nagios.cfg -@@ -139,7 +146,7 @@ +@@ -139,7 +146,7 @@ nagios_group=@nagios_grp@ # you will have to enable this. # Values: 0 = disable commands, 1 = enable commands @@ -68,8 +70,8 @@ Description: Debianize nagios.cfg -@@ -150,6 +157,8 @@ - # is running as (usually 'nobody'). Permissions should be set at the +@@ -150,6 +157,8 @@ check_external_commands=1 + # is running as (usually 'nobody'). Permissions should be set at the # directory level instead of on the file, as the file is deleted every # time its contents are processed. +# Debian Users: In case you didn't read README.Debian yet, _NOW_ is the @@ -77,7 +79,7 @@ Description: Debianize nagios.cfg command_file=@localstatedir@/rw/nagios.cmd -@@ -176,7 +185,7 @@ +@@ -176,7 +185,7 @@ lock_file=@subsyslockfile@ # is created, used, and deleted throughout the time that Nagios is # running. @@ -86,8 +88,8 @@ Description: Debianize nagios.cfg -@@ -242,7 +251,7 @@ - # This is the directory where archived (rotated) log files should be +@@ -243,7 +252,7 @@ log_rotation_method=d + # This is the directory where archived (rotated) log files should be # placed (assuming you've chosen to do log rotation). -log_archive_path=@localstatedir@/archives @@ -95,7 +97,7 @@ Description: Debianize nagios.cfg -@@ -1091,7 +1100,7 @@ +@@ -1093,7 +1102,7 @@ high_host_flap_threshold=20.0 # strict-iso8601 (YYYY-MM-DDTHH:MM:SS) # @@ -104,7 +106,7 @@ Description: Debianize nagios.cfg -@@ -1176,8 +1185,8 @@ +@@ -1178,8 +1187,8 @@ use_true_regexp_matching=0 # using the $ADMINEMAIL$ and $ADMINPAGER$ macros in your notification # commands. @@ -115,7 +117,7 @@ Description: Debianize nagios.cfg -@@ -1287,7 +1296,7 @@ +@@ -1292,7 +1301,7 @@ debug_verbosity=1 # DEBUG FILE # This option determines where Nagios should write debugging information. diff --git a/debian/patches/55_strip_logarchivepath.patch b/debian/patches/55_strip_logarchivepath.patch index 4f323c3..d2e3306 100644 --- a/debian/patches/55_strip_logarchivepath.patch +++ b/debian/patches/55_strip_logarchivepath.patch @@ -1,8 +1,10 @@ Author: Omni Flux Description: stripping the log_archive_path value from cgi.cfg (#578232) ---- a/cgi/cgiutils.c -+++ b/cgi/cgiutils.c -@@ -511,7 +511,7 @@ +Index: nagios4/cgi/cgiutils.c +=================================================================== +--- nagios4.orig/cgi/cgiutils.c ++++ nagios4/cgi/cgiutils.c +@@ -519,7 +519,7 @@ int read_main_config_file(const char *fi temp_buffer = strtok(NULL, "\n"); strncpy(log_archive_path, (temp_buffer == NULL) ? "" : temp_buffer, sizeof(log_archive_path)); log_archive_path[sizeof(log_archive_path) - 1] = '\x0'; diff --git a/debian/patches/70_fix_eventhandler_paths.patch b/debian/patches/70_fix_eventhandler_paths.patch index 2092ae7..cea280f 100644 --- a/debian/patches/70_fix_eventhandler_paths.patch +++ b/debian/patches/70_fix_eventhandler_paths.patch @@ -1,7 +1,9 @@ Author: Alexander Wirt Description: Fixes paths for all contributed eventhandlers ---- a/contrib/eventhandlers/disable_active_service_checks -+++ b/contrib/eventhandlers/disable_active_service_checks +Index: nagios4/contrib/eventhandlers/disable_active_service_checks +=================================================================== +--- nagios4.orig/contrib/eventhandlers/disable_active_service_checks ++++ nagios4/contrib/eventhandlers/disable_active_service_checks @@ -16,7 +16,7 @@ printfcmd="/usr/bin/printf" @@ -11,8 +13,10 @@ Description: Fixes paths for all contributed eventhandlers # get the current date/time in seconds since UNIX epoch datetime=`date +%s` ---- a/contrib/eventhandlers/disable_notifications -+++ b/contrib/eventhandlers/disable_notifications +Index: nagios4/contrib/eventhandlers/disable_notifications +=================================================================== +--- nagios4.orig/contrib/eventhandlers/disable_notifications ++++ nagios4/contrib/eventhandlers/disable_notifications @@ -14,7 +14,7 @@ printfcmd="/usr/bin/printf" @@ -22,8 +26,10 @@ Description: Fixes paths for all contributed eventhandlers # get the current date/time in seconds since UNIX epoch datetime=`date +%s` ---- a/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler -+++ b/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler +Index: nagios4/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler +=================================================================== +--- nagios4.orig/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler ++++ nagios4/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler @@ -21,7 +21,7 @@ # @@ -33,8 +39,10 @@ Description: Fixes paths for all contributed eventhandlers # Convert the state string to the corresponding return code return_code=-1 ---- a/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca -+++ b/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca +Index: nagios4/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca +=================================================================== +--- nagios4.orig/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca ++++ nagios4/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca @@ -28,8 +28,8 @@ printfcmd="/usr/bin/printf" @@ -46,8 +54,10 @@ Description: Fixes paths for all contributed eventhandlers NagiosHost="nagioshost" # Fire the data off to the NSCA daemon using the send_nsca script ---- a/contrib/eventhandlers/enable_active_service_checks -+++ b/contrib/eventhandlers/enable_active_service_checks +Index: nagios4/contrib/eventhandlers/enable_active_service_checks +=================================================================== +--- nagios4.orig/contrib/eventhandlers/enable_active_service_checks ++++ nagios4/contrib/eventhandlers/enable_active_service_checks @@ -16,7 +16,7 @@ printfcmd="/usr/bin/printf" @@ -57,8 +67,10 @@ Description: Fixes paths for all contributed eventhandlers # get the current date/time in seconds since UNIX epoch datetime=`date +%s` ---- a/contrib/eventhandlers/enable_notifications -+++ b/contrib/eventhandlers/enable_notifications +Index: nagios4/contrib/eventhandlers/enable_notifications +=================================================================== +--- nagios4.orig/contrib/eventhandlers/enable_notifications ++++ nagios4/contrib/eventhandlers/enable_notifications @@ -14,7 +14,7 @@ printfcmd="/usr/bin/printf" @@ -68,8 +80,10 @@ Description: Fixes paths for all contributed eventhandlers # get the current date/time in seconds since UNIX epoch datetime=`date +%s` ---- a/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event -+++ b/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event +Index: nagios4/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event +=================================================================== +--- nagios4.orig/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event ++++ nagios4/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event @@ -10,10 +10,10 @@ # Location of the echo and mail commands @@ -83,8 +97,10 @@ Description: Fixes paths for all contributed eventhandlers # Only take action on hard host states... ---- a/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event -+++ b/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event +Index: nagios4/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event +=================================================================== +--- nagios4.orig/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event ++++ nagios4/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event @@ -10,10 +10,10 @@ # Location of the echo and mail commands @@ -98,8 +114,10 @@ Description: Fixes paths for all contributed eventhandlers # Only take action on hard service states... ---- a/contrib/eventhandlers/submit_check_result -+++ b/contrib/eventhandlers/submit_check_result +Index: nagios4/contrib/eventhandlers/submit_check_result +=================================================================== +--- nagios4.orig/contrib/eventhandlers/submit_check_result ++++ nagios4/contrib/eventhandlers/submit_check_result @@ -24,7 +24,7 @@ echocmd="/bin/echo" diff --git a/debian/patches/80_rpm_part_irrelevant.patch b/debian/patches/80_rpm_part_irrelevant.patch index 46393bb..ee0b797 100644 --- a/debian/patches/80_rpm_part_irrelevant.patch +++ b/debian/patches/80_rpm_part_irrelevant.patch @@ -1,22 +1,28 @@ Author: Mario Fetka Description: Remove the rpm part of contrib makefile ---- a/contrib/Makefile.in 2017-05-09 19:03:31.000000000 +0200 -+++ b/contrib/Makefile.in 2017-05-20 00:56:54.772000000 +0200 -@@ -85,30 +85,3 @@ +Index: nagios4/contrib/Makefile.in +=================================================================== +--- nagios4.orig/contrib/Makefile.in ++++ nagios4/contrib/Makefile.in +@@ -85,34 +85,3 @@ $(CGI_O): $(CGI_C) %.cgi : %.c $(CC) $(CFLAGS) $(LDFLAGS) $< $(CGI_O) -o $@ -############################################################################## -# rpm making automation for CentOS/RHEL. - --ARCH ?= $(shell arch) +-ARCH ?= $(shell uname -m) -ifeq ($(ARCH),x86_64) -RPM_ARCH := x86_64 -else - ifeq ($(ARCH),i686) -RPM_ARCH := i386 - else +- ifeq ($(ARCH),aarch64) +-RPM_ARCH := aarch64 +- else -$(error Unknown arch "$(ARCH)".) +- endif - endif -endif -