SF.net SVN: gar:[25652] csw/mgar/pkg/nrpe/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu Apr 7 20:54:57 CEST 2016
Revision: 25652
http://sourceforge.net/p/gar/code/25652
Author: dmichelsen
Date: 2016-04-07 18:54:55 +0000 (Thu, 07 Apr 2016)
Log Message:
-----------
nrpe/trunk: General rework
Modified Paths:
--------------
csw/mgar/pkg/nrpe/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/nrpe/trunk/files/0003-change_dh_param_to_2048.patch
Removed Paths:
-------------
csw/mgar/pkg/nrpe/trunk/files/0003-chage_dh_param_to_2048.patch
csw/mgar/pkg/nrpe/trunk/files/0003-remove-chown-on-install.patch
csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.checkinstall
csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.gspec
csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preinstall
csw/mgar/pkg/nrpe/trunk/files/CSWnrpeplugin.gspec
csw/mgar/pkg/nrpe/trunk/files/common.h.diff
csw/mgar/pkg/nrpe/trunk/files/configure.diff
csw/mgar/pkg/nrpe/trunk/files/cswusergroup
csw/mgar/pkg/nrpe/trunk/files/patch.diff
Modified: csw/mgar/pkg/nrpe/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nrpe/trunk/Makefile 2016-04-07 14:55:30 UTC (rev 25651)
+++ csw/mgar/pkg/nrpe/trunk/Makefile 2016-04-07 18:54:55 UTC (rev 25652)
@@ -4,73 +4,42 @@
define BLURB
- NRPE allows you to remotely execute Nagios plugins on other Linux/Unix machines. This allows you to monitor remote machine metrics (disk usage, CPU load, etc.). NRPE can also communicate with some of the Windows agent addons, so you can execute scripts and check metrics on remote Windows machines as well.
+ NRPE allows you to remotely execute Nagios plugins on other Linux/Unix machines.
+ This allows you to monitor remote machine metrics (disk usage, CPU load, etc.).
+ NRPE can also communicate with some of the Windows agent addons, so you can execute
+ scripts and check metrics on remote Windows machines as well.
endef
SF_PROJECT = nagios
MASTER_SITES = $(SF_MIRRORS)
-DISTFILES = $(NAME)-$(VERSION).tar.gz
+DISTFILES += $(DISTNAME).tar.gz
+DISTFILES += cswnrpe
+DISTFILES += README_8k
-#
-# modulations
-#
+PATCHFILES_isa-sparcv8plus-size-8k += 0002-changing-packetbuffer-length-to-8k.patch
+PATCHFILES_isa-pentium_pro-size-8k += 0002-changing-packetbuffer-length-to-8k.patch
+PATCHFILES += 0003-change_dh_param_to_2048.patch
+
+LICENSE = LEGAL
+
EXTRA_MODULATORS = SIZE
MODULATIONS_SIZE = 1k 8k
-DISTFILES += CSWnrpe.preinstall
-DISTFILES += cswnrpe cswusergroup
-DISTFILES += README_8k
+REINPLACE_USRLOCAL += .*/nrpe-2.15/SECURITY
+REINPLACE_USRLOCAL += .*/nrpe-2.15/README
+REINPLACE_USRLOCAL += sample-config/nrpe.cfg.in
-PATCHFILES_isa-sparcv8plus-size-8k = 0002-changing-packetbuffer-length-to-8k.patch
-PATCHFILES_isa-pentium_pro-size-8k = 0002-changing-packetbuffer-length-to-8k.patch
-# needs autoconf!
-PATCHFILES += 0003-remove-chown-on-install.patch
-PATCHFILES += 0003-chage_dh_param_to_2048.patch
+PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
+PACKAGING_PLATFORMS += solaris11-sparc solaris11-i386
-#
-# replace /usr/local
-#
-
-REINPLACE_USRLOCAL += .*/nrpe-2.15/SECURITY
-REINPLACE_USRLOCAL += .*/nrpe-2.15/README
-REINPLACE_USRLOCAL += sample-config/nrpe.cfg.in
-
-PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 solaris11-i386 solaris11-sparc
-
-# GARCOMPILER = GCC5
-
-#
-#
-#
PRESERVECONF += $(sysconfdir)/nrpe.cfg
USERGROUP += $(sysconfdir)/pkg/CSWnrpe/cswusergroup
INITSMF += $(sysconfdir)/init.d/cswnrpe
-# OBSOLETED_BY_CSWnrpe-plugin = CSWnrpeplugin
-# SPKG_CATALOG_NAME_CSWnrpeplugin = nrpe_plugin_stub
-
-#
-# files for CSWnrpe
-#
-
-IPS_PACKAGE_PREFIX = diagnostic/
-PACKAGES += CSWnrpe
-SPKG_DESC_CSWnrpe = Nagios remote plugin executor
-PKGFILES_CSWnrpe += /opt/csw/bin/nrpe_1k
-PKGFILES_CSWnrpe += /opt/csw/bin/nrpe_8k
-PKGFILES_CSWnrpe += /opt/csw/bin/nrpe
-PKGFILES_CSWnrpe += /etc/opt/csw/nrpe.cfg.CSW
-PKGFILES_CSWnrpe += /etc/opt/csw/init.d/cswnrpe
-PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe
-PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/NRPE.pdf
-PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/LEGAL
-PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/license
-PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/README
-PKGFILES_CSWnrpe_SHARED += /opt/csw/share/doc/nrpe/README_8k
-PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/README.SSL
-PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/SECURITY
-PKGFILES_CSWnrpe += /opt/csw/nagios
+PACKAGES += CSWnrpe
+SPKG_DESC_CSWnrpe = Nagios remote plugin executor
+# PKGFILES is catchall
RUNTIME_DEP_PKGS_CSWnrpe += CSWlibwrap1
RUNTIME_DEP_PKGS_CSWnrpe += CSWlibssl1-0-0
@@ -78,112 +47,69 @@
CHECKPKG_OVERRIDES_CSWnrpe += file-collision|/opt/csw/share/doc/nrpe/README_8k|CSWnrpe|CSWnrpe-plugin
CHECKPKG_OVERRIDES_CSWnrpe-plugin += file-collision|/opt/csw/share/doc/nrpe/README_8k|CSWnrpe|CSWnrpe-plugin
-
-#
-# files for CSWnrpe-plugin
-#
-
-PACKAGES += CSWnrpe-plugin
-SPKG_DESC_CSWnrpe-plugin = Nagios plugin that connects to nrpe demon
-PKGFILES_CSWnrpe-plugin += /opt/csw/libexec/nagios-plugins
-PKGFILES_CSWnrpe-plugin += /opt/csw/libexec/nagios-plugins/check_nrpe
-PKGFILES_CSWnrpe-plugin += /opt/csw/libexec/nagios-plugins/check_nrpe_1k
-PKGFILES_CSWnrpe-plugin += /opt/csw/libexec/nagios-plugins/check_nrpe_8k
-PKGFILES_CSWnrpe-plugin += /opt/csw/share/doc/nrpe
-PKGFILES_CSWnrpe-plugin_SHARED += /opt/csw/share/doc/nrpe/README_8k
-PKGFILES_CSWnrpe-plugin += /opt/csw/share/doc/nrpe_plugin
-PKGFILES_CSWnrpe-plugin += /opt/csw/share/doc/nrpe_plugin/license
+PACKAGES += CSWnrpe-plugin
+SPKG_DESC_CSWnrpe-plugin = Nagios plugin that connects to nrpe demon
+PKGFILES_CSWnrpe-plugin += .*/check_nrpe_.*
+PKGFILES_CSWnrpe-plugin_SHARED += /opt/csw/share/doc/nrpe/README_8k
RUNTIME_DEP_PKGS_CSWnrpe-plugin += CSWlibssl1-0-0
#RUNTIME_DEP_PKGS_CSWnrpe-plugin += CSWnrpe
+ALTERNATIVES = 1k 8k
+ALTERNATIVE_1k += $(bindir)/nrpe nrpe $(bindir)/nrpe_1k 20
+ALTERNATIVE_1k += $(libexecdir)/check_nrpe check_nrpe $(libexecdir)/check_nrpe_1k
+ALTERNATIVE_8k += $(bindir)/nrpe nrpe $(bindir)/nrpe_8k 10
+ALTERNATIVE_8k += $(libexecdir)/check_nrpe check_nrpe $(libexecdir)/check_nrpe_8k
-#
-# migrate configuration
-#
+NOISALIST = 1
-# MIGRATE_FILES_CSWnrpe = nrpe.cfg
-# MIGRATE_SOURCE_DIR = /opt/csw/etc
-# MIGRATE_DEST_DIR = /etc/opt/csw
+libexecdir = $(prefix)/libexec/nagios-plugins
-LICENSE = LEGAL
-
-NOISALIST = 1
-
-CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --with-ssl-lib=/opt/csw/lib
-CONFIGURE_ARGS += --with-ssl-inc=/opt/csw/include
-CONFIGURE_ARGS += --with-ssl-dir=/opt/csw/bin
-CONFIGURE_ARGS += --with-kerberos-inc=/opt/csw/include
+CONFIGURE_ARGS += $(DIRPATHS)
+CONFIGURE_ARGS += --with-ssl-lib=$(libdir)
+CONFIGURE_ARGS += --with-ssl-inc=$(includedir)
+CONFIGURE_ARGS += --with-ssl-dir=$(bindir)
+CONFIGURE_ARGS += --with-kerberos-inc=$(includedir)
CONFIGURE_ARGS += --enable-command-args
-CONFIGURE_ARGS += --prefix=/opt/csw
-CONFIGURE_ARGS += --exec-prefix=/opt/csw
-CFLAGS += "-I/opt/csw/include"
+INSTALL_ARGS = install-daemon-config
-sysconfdir = /etc${prefix}
-bindir = $(prefix)/bin
-libexecdir = $(prefix)/libexec/nagios-plugins
-datadir = $(prefix)/share
+# There is no testsuite
+TEST_SCRIPTS =
-TEST_TARGET = all
+INSTALL_OVERRIDE_VARS += NAGIOS_INSTALL_OPTS
+INSTALL_OVERRIDE_VARS += NRPE_INSTALL_OPTS
-INSTALL_SCRIPTS = custom
-
MERGE_SCRIPTS_isa-sparcv8plus-size-1k = copy-all
-MERGE_SCRIPTS_isa-sparcv8plus-size-8k = copy-nrpe-only
+MERGE_SCRIPTS_isa-sparcv8plus-size-8k = copy-only
MERGE_SCRIPTS_isa-pentium_pro-size-1k = copy-all
-MERGE_SCRIPTS_isa-pentium_pro-size-8k = copy-nrpe-only
+MERGE_SCRIPTS_isa-pentium_pro-size-8k = copy-only
-#
-#
-#
-#POSTMSG = /opt/csw/share/doc/nrpe/README.CSW
-#
-# overrides
-#
+EXTRA_PAX_ARGS += -s ',($(bindir))/nrpe,$$1/nrpe_$(SIZE),'
+EXTRA_PAX_ARGS += -s ',($(libexecdir))/check_nrpe,$$1/check_nrpe_$(SIZE),'
-#
-#
-#
-
include gar/category.mk
-DOCDIR=$(datadir)/doc/nrpe
-CFGDIR=$(sysconfdir)
-LIBEXECDIR=$(libexecdir)
-BINDIR=$(bindir)
-
pre-configure:
+ @# This is because of patch 0003-change_dh_param_to_2048.patch
cd $(WORKSRC) && autoconf
@$(MAKECOOKIE)
-install-custom:
- @ginstall -m 775 -d $(DESTDIR)$(DOCDIR)
- @ginstall -m 755 -d $(DESTDIR)$(LIBEXECDIR)
- @ginstall -m 755 -d $(DESTDIR)$(BINDIR)
- @ginstall -m 755 $(WORKSRC)/src/check_nrpe $(DESTDIR)$(LIBEXECDIR)/check_nrpe_1k
- @ln -s $(LIBEXECDIR)/check_nrpe_1k $(DESTDIR)$(LIBEXECDIR)/check_nrpe
- @ginstall -m 755 $(WORKSRC)/src/nrpe $(DESTDIR)$(BINDIR)/nrpe_1k
- @ln -s $(BINDIR)/nrpe_1k $(DESTDIR)$(BINDIR)/nrpe
- @ginstall -m 644 $(WORKSRC)/docs/NRPE.pdf $(DESTDIR)$(DOCDIR)
- @ginstall -m 644 $(FILEDIR)/README_8k $(DESTDIR)$(DOCDIR)
- @ginstall -m 644 $(WORKSRC)/LEGAL $(DESTDIR)$(DOCDIR)
- @ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(DOCDIR)
- @ginstall -m 644 $(WORKSRC)/README.SSL $(DESTDIR)$(DOCDIR)
- @ginstall -m 644 $(WORKSRC)/SECURITY $(DESTDIR)$(DOCDIR)
- # @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWnrpe
- # @ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWnrpe/cswusergroup
- @#
- @# Start / Stop script
- @ginstall -d $(DESTDIR)/etc/$(BUILD_PREFIX)/init.d
- @ginstall -m 755 $(FILEDIR)/cswnrpe $(DESTDIR)/etc/$(BUILD_PREFIX)/init.d/cswnrpe
- cd $(WORKSRC) && gmake install-daemon-config DESTDIR=$(DESTDIR)
+post-install: DOCDIR=$(docdir)/nrpe
+post-install:
+ ginstall -m 775 -d $(DESTDIR)$(DOCDIR)
+ ginstall -m 644 $(WORKDIR)/README_8k $(DESTDIR)$(DOCDIR)
+ ginstall -m 644 $(WORKSRC)/docs/NRPE.pdf $(DESTDIR)$(DOCDIR)
+ ginstall -m 644 $(WORKSRC)/LEGAL $(DESTDIR)$(DOCDIR)
+ ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(DOCDIR)
+ ginstall -m 644 $(WORKSRC)/README.SSL $(DESTDIR)$(DOCDIR)
+ ginstall -m 644 $(WORKSRC)/SECURITY $(DESTDIR)$(DOCDIR)
+ ginstall -D -m 755 $(WORKDIR)/cswnrpe $(DESTDIR)$(sysconfdir)/init.d/cswnrpe
@$(MAKECOOKIE)
merge-copy-nrpe-only:
- cp $(INSTALLISADIR)$(bindir)/nrpe_1k $(PKGROOT)$(bindir)/nrpe_8k
- cp $(INSTALLISADIR)$(LIBEXECDIR)/check_nrpe_1k $(PKGROOT)$(LIBEXECDIR)/check_nrpe_8k
+ cp $(INSTALLISADIR)$(bindir)/nrpe $(PKGROOT)$(bindir)/nrpe_$(SIZE)
+ cp $(INSTALLISADIR)$(LIBEXECDIR)/check_nrpe $(PKGROOT)$(LIBEXECDIR)/check_nrpe_$(SIZE)
@$(MAKECOOKIE)
Deleted: csw/mgar/pkg/nrpe/trunk/files/0003-chage_dh_param_to_2048.patch
===================================================================
--- csw/mgar/pkg/nrpe/trunk/files/0003-chage_dh_param_to_2048.patch 2016-04-07 14:55:30 UTC (rev 25651)
+++ csw/mgar/pkg/nrpe/trunk/files/0003-chage_dh_param_to_2048.patch 2016-04-07 18:54:55 UTC (rev 25652)
@@ -1,39 +0,0 @@
-From a733ca5b0f5e5e8f8a17730c43164c338c79161e Mon Sep 17 00:00:00 2001
-From: Jan Holzhueter <jh at opencsw.org>
-Date: Tue, 29 Mar 2016 10:16:49 +0200
-Subject: [PATCH] chage_dh_param_to_2048
-
----
- configure.in | 2 +-
- src/nrpe.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index f0dfa09..1993140 100644
---- a/configure.in
-+++ b/configure.in
-@@ -340,7 +340,7 @@ if test x$check_for_ssl = xyes; then
- sslbin=$ssldir/bin/openssl
- fi
- # awk to strip off meta data at bottom of dhparam output
-- $sslbin dhparam -C 512 | awk '/^-----/ {exit} {print}' > include/dh.h
-+ $sslbin dhparam -C 2048 | awk '/^-----/ {exit} {print}' > include/dh.h
- fi
- fi
-
-diff --git a/src/nrpe.c b/src/nrpe.c
-index 381f0ac..6234492 100644
---- a/src/nrpe.c
-+++ b/src/nrpe.c
-@@ -266,7 +266,7 @@ int main(int argc, char **argv){
-
- /* use anonymous DH ciphers */
- SSL_CTX_set_cipher_list(ctx,"ADH");
-- dh=get_dh512();
-+ dh=get_dh2048();
- SSL_CTX_set_tmp_dh(ctx,dh);
- DH_free(dh);
- if(debug==TRUE)
---
-2.4.0
-
Copied: csw/mgar/pkg/nrpe/trunk/files/0003-change_dh_param_to_2048.patch (from rev 25651, csw/mgar/pkg/nrpe/trunk/files/0003-chage_dh_param_to_2048.patch)
===================================================================
--- csw/mgar/pkg/nrpe/trunk/files/0003-change_dh_param_to_2048.patch (rev 0)
+++ csw/mgar/pkg/nrpe/trunk/files/0003-change_dh_param_to_2048.patch 2016-04-07 18:54:55 UTC (rev 25652)
@@ -0,0 +1,39 @@
+From a733ca5b0f5e5e8f8a17730c43164c338c79161e Mon Sep 17 00:00:00 2001
+From: Jan Holzhueter <jh at opencsw.org>
+Date: Tue, 29 Mar 2016 10:16:49 +0200
+Subject: [PATCH] chage_dh_param_to_2048
+
+---
+ configure.in | 2 +-
+ src/nrpe.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index f0dfa09..1993140 100644
+--- a/configure.in
++++ b/configure.in
+@@ -340,7 +340,7 @@ if test x$check_for_ssl = xyes; then
+ sslbin=$ssldir/bin/openssl
+ fi
+ # awk to strip off meta data at bottom of dhparam output
+- $sslbin dhparam -C 512 | awk '/^-----/ {exit} {print}' > include/dh.h
++ $sslbin dhparam -C 2048 | awk '/^-----/ {exit} {print}' > include/dh.h
+ fi
+ fi
+
+diff --git a/src/nrpe.c b/src/nrpe.c
+index 381f0ac..6234492 100644
+--- a/src/nrpe.c
++++ b/src/nrpe.c
+@@ -266,7 +266,7 @@ int main(int argc, char **argv){
+
+ /* use anonymous DH ciphers */
+ SSL_CTX_set_cipher_list(ctx,"ADH");
+- dh=get_dh512();
++ dh=get_dh2048();
+ SSL_CTX_set_tmp_dh(ctx,dh);
+ DH_free(dh);
+ if(debug==TRUE)
+--
+2.4.0
+
Deleted: csw/mgar/pkg/nrpe/trunk/files/0003-remove-chown-on-install.patch
===================================================================
--- csw/mgar/pkg/nrpe/trunk/files/0003-remove-chown-on-install.patch 2016-04-07 14:55:30 UTC (rev 25651)
+++ csw/mgar/pkg/nrpe/trunk/files/0003-remove-chown-on-install.patch 2016-04-07 18:54:55 UTC (rev 25652)
@@ -1,20 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -392,7 +392,7 @@ AC_ARG_WITH([nrpe_port],
- [nrpe_port=5666])
- AC_SUBST(nrpe_user)
- AC_SUBST(nrpe_group)
--NRPE_INSTALL_OPTS="-o $nrpe_user -g $nrpe_group"
-+NRPE_INSTALL_OPTS=
- AC_SUBST(NRPE_INSTALL_OPTS)
- AC_SUBST(nrpe_port)
- AC_DEFINE_UNQUOTED(DEFAULT_SERVER_PORT,$nrpe_port,[Default port for NRPE daemon])
-@@ -409,7 +409,7 @@ AC_ARG_WITH([nagios_group],
- [nagios_group=nagios])
- AC_SUBST(nagios_user)
- AC_SUBST(nagios_group)
--NAGIOS_INSTALL_OPTS="-o $nagios_user -g $nagios_group"
-+NAGIOS_INSTALL_OPTS=
- AC_SUBST(NAGIOS_INSTALL_OPTS)
-
- # Determine target OS, version and architecture for package build macros
Deleted: csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.checkinstall
===================================================================
--- csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.checkinstall 2016-04-07 14:55:30 UTC (rev 25651)
+++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.checkinstall 2016-04-07 18:54:55 UTC (rev 25652)
@@ -1,50 +0,0 @@
-# See if user group are needed
-NEEDNAGUSER=0
-NEEDNAGGROUP=0
-NEEDCMDGROUP=0
-
-#First check target machines password file, THEN check
-#NIS/NIS+/whatever
-
-grep '^nagios:' /etc/passwd >/dev/null
-if [ $? -ne 0 ] ; then
- getent passwd nagios >/dev/null
- if [ $? -ne 0 ] ; then
- NEEDNAGUSER=1
- fi
-fi
-
-grep '^nagios:' /etc/group >/dev/null
-if [ $? -ne 0 ] ; then
- getent group nagios >/dev/null
- if [ $? -ne 0 ] ; then
- NEEDNAGGROUP=1
- fi
-fi
-
-if [ "$NEEDNAGUSER" = 1 ] ; then
- echo "***"
- echo "User nagios must exist for this package install."
- echo "nagios user will be added."
- ADDNAGUSER=1
-else
- echo "nagios user detected"
-fi
-
-if [ "$NEEDNAGGROUP" = 1 ] ; then
- echo "***"
- echo "Group nagios must exist for this package install."
- echo "nagios group will be added."
- ADDNAGGROUP=1
-else
- echo "nagios group detected"
-fi
-
-# Make env variables available to other packaging scripts
-
-cat >$1 <<!
-CLASSES='$CLASSES'
-NEEDNAGUSER='$NEEDNAGUSER'
-NEEDNAGGROUP='$NEEDNAGGROUP'
-NEEDCMDGROUP='$NEEDCMDGROUP'
-!
Deleted: csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.gspec
===================================================================
--- csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.gspec 2016-04-07 14:55:30 UTC (rev 25651)
+++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.gspec 2016-04-07 18:54:55 UTC (rev 25652)
@@ -1,3 +0,0 @@
-%var bitname nrpe
-%var pkgname CSWnrpe
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
Deleted: csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preinstall
===================================================================
--- csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preinstall 2016-04-07 14:55:30 UTC (rev 25651)
+++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preinstall 2016-04-07 18:54:55 UTC (rev 25652)
@@ -1,18 +0,0 @@
-cat << EOF
-
-=======================================================================
-
-From package revision nrpe-2.12,REV=2009.10.11 on the configuration
-file for NRPE is stored in /etc/opt/csw/.
-
-No further action is needed (having a backup is always a good idea).
-
- Installation will proceed in 10 seconds.
- Press CTRL+C if you want to stop now.
-
-=======================================================================
-EOF
-
-sleep 10
-
-exit 0
Deleted: csw/mgar/pkg/nrpe/trunk/files/CSWnrpeplugin.gspec
===================================================================
--- csw/mgar/pkg/nrpe/trunk/files/CSWnrpeplugin.gspec 2016-04-07 14:55:30 UTC (rev 25651)
+++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpeplugin.gspec 2016-04-07 18:54:55 UTC (rev 25652)
@@ -1,3 +0,0 @@
-%var bitname nrpe_plugin
-%var pkgname CSWnrpeplugin
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
Deleted: csw/mgar/pkg/nrpe/trunk/files/common.h.diff
===================================================================
--- csw/mgar/pkg/nrpe/trunk/files/common.h.diff 2016-04-07 14:55:30 UTC (rev 25651)
+++ csw/mgar/pkg/nrpe/trunk/files/common.h.diff 2016-04-07 18:54:55 UTC (rev 25652)
@@ -1,21 +0,0 @@
-diff --speed-large-files --minimal -Nru nrpe-2.12.orig/include/common.h nrpe-2.12/include/common.h
---- nrpe-2.12.orig/include/common.h 2008-03-10 22:04:42.000000000 +0100
-+++ nrpe-2.12/include/common.h 2009-06-08 12:23:57.199466306 +0200
-@@ -41,7 +41,7 @@
- #define DEFAULT_SOCKET_TIMEOUT 10 /* timeout after 10 seconds */
- #define DEFAULT_CONNECTION_TIMEOUT 300 /* timeout if daemon is waiting for connection more than this time */
-
--#define MAX_INPUT_BUFFER 2048 /* max size of most buffers we use */
-+#define MAX_INPUT_BUFFER 8192 /* max size of most buffers we use */
- #define MAX_FILENAME_LENGTH 256
-
- #define MAX_HOST_ADDRESS_LENGTH 256 /* max size of a host address */
-@@ -60,7 +60,7 @@
- #define NRPE_PACKET_VERSION_2 2
- #define NRPE_PACKET_VERSION_1 1 /* older packet version identifiers (no longer supported) */
-
--#define MAX_PACKETBUFFER_LENGTH 1024 /* max amount of data we'll send in one query/response */
-+#define MAX_PACKETBUFFER_LENGTH 8192 /* max amount of data we'll send in one query/response */
-
- typedef struct packet_struct{
- int16_t packet_version;
Deleted: csw/mgar/pkg/nrpe/trunk/files/configure.diff
===================================================================
--- csw/mgar/pkg/nrpe/trunk/files/configure.diff 2016-04-07 14:55:30 UTC (rev 25651)
+++ csw/mgar/pkg/nrpe/trunk/files/configure.diff 2016-04-07 18:54:55 UTC (rev 25652)
@@ -1,12 +0,0 @@
-diff --speed-large-files --minimal -Nru nrpe-2.12.orig/configure nrpe-2.12/configure
---- nrpe-2.12.orig/configure 2008-03-10 22:04:41.000000000 +0100
-+++ nrpe-2.12/configure 2008-12-23 13:30:12.640927821 +0100
-@@ -6179,7 +6179,7 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lwrap $LIBS"
-+LIBS="-lsocket -lwrap $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
Deleted: csw/mgar/pkg/nrpe/trunk/files/cswusergroup
===================================================================
--- csw/mgar/pkg/nrpe/trunk/files/cswusergroup 2016-04-07 14:55:30 UTC (rev 25651)
+++ csw/mgar/pkg/nrpe/trunk/files/cswusergroup 2016-04-07 18:54:55 UTC (rev 25652)
@@ -1 +0,0 @@
-nagios:nagios:Nagios user:/opt/csw/nagios:/bin/false:m:r
Deleted: csw/mgar/pkg/nrpe/trunk/files/patch.diff
===================================================================
--- csw/mgar/pkg/nrpe/trunk/files/patch.diff 2016-04-07 14:55:30 UTC (rev 25651)
+++ csw/mgar/pkg/nrpe/trunk/files/patch.diff 2016-04-07 18:54:55 UTC (rev 25652)
@@ -1,16 +0,0 @@
-diff --speed-large-files --minimal -Nru nrpe-2.12.orig/src/nrpe.c nrpe-2.12/src/nrpe.c
---- nrpe-2.12.orig/src/nrpe.c 2008-03-10 22:04:43.000000000 +0100
-+++ nrpe-2.12/src/nrpe.c 2008-12-15 14:31:43.737436594 +0100
-@@ -613,10 +613,10 @@
- log_facility=LOG_UUCP;
- else if(!strcmp(varvalue,"cron"))
- log_facility=LOG_CRON;
-- else if(!strcmp(varvalue,"authpriv"))
-+/* else if(!strcmp(varvalue,"authpriv"))
- log_facility=LOG_AUTHPRIV;
- else if(!strcmp(varvalue,"ftp"))
-- log_facility=LOG_FTP;
-+ log_facility=LOG_FTP; */
- else if(!strcmp(varvalue,"local0"))
- log_facility=LOG_LOCAL0;
- else if(!strcmp(varvalue,"local1"))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list