Revision: 18066
http://gar.svn.sourceforge.net/gar/?rev=18066&view=rev
Author: j_arndt
Date: 2012-05-21 19:34:20 +0000 (Mon, 21 May 2012)
Log Message:
-----------
nrpe: update to 2.13, still work in progress
Modified Paths:
--------------
csw/mgar/pkg/nrpe/trunk/Makefile
csw/mgar/pkg/nrpe/trunk/checksums
csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preinstall
Added Paths:
-----------
csw/mgar/pkg/nrpe/trunk/files/0002-changing-packetbuffer-length-to-8k.patch
Removed Paths:
-------------
csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype
csw/mgar/pkg/nrpe/trunk/files/CSWnrpeplugin.prototype
Modified: csw/mgar/pkg/nrpe/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nrpe/trunk/Makefile 2012-05-21 14:01:00 UTC (rev 18065)
+++ csw/mgar/pkg/nrpe/trunk/Makefile 2012-05-21 19:34:20 UTC (rev 18066)
@@ -1,9 +1,9 @@
NAME = nrpe
-VERSION = 2.12
+VERSION = 2.13
CATEGORIES = apps
GARTYPE = v2
-SPKG_DESC_CSWnrpe = Nagios remote plugin executor
+SPKG_DESC_CSWnrpe = Nagios remote plugin executor
SPKG_DESC_CSWnrpeplugin = Nagios plugin that connects to nrpe demon
define BLURB
@@ -14,33 +14,65 @@
MASTER_SITES = $(SF_MIRRORS)
DISTFILES = $(NAME)-$(VERSION).tar.gz
+#
+# modulations
+#
+
+EXTRA_MODULATORS = SIZE
+MODULATIONS_SIZE = 1k 8k
+
# Distfiles for CSWnrpe
-DISTFILES += CSWnrpe.preinstall CSWnrpe.prototype
+DISTFILES += CSWnrpe.preinstall
+#DISTFILES += CSWnrpe.prototype
DISTFILES += cswnrpe cswusergroup
DISTFILES += README_8k
# Distfiles for nrpe_plugin
-DISTFILES += CSWnrpeplugin.prototype
+#DISTFILES += CSWnrpeplugin.prototype
-PATCHFILES = patch.diff configure.diff
+#PATCHFILES = patch.diff
-PATCHFILES_isa-sparcv8-size-8k = common.h.diff
-PATCHFILES_isa-i386-size-8k = common.h.diff
+PATCHFILES_isa-sparcv8-size-8k =
0002-changing-packetbuffer-length-to-8k.patch
+PATCHFILES_isa-i386-size-8k = 0002-changing-packetbuffer-length-to-8k.patch
-PACKAGES = CSWnrpe CSWnrpeplugin
-CATALOGNAME_CSWnrpe = nrpe
-CATALOGNAME_CSWnrpeplugin = nrpe_plugin
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
-RUNTIME_DEP_PKGS_CSWnrpe = CSWosslrt CSWtcpwrap
-RUNTIME_DEP_PKGS_CSWnrpeplugin = CSWosslrt
+PACKAGES = CSWnrpe CSWnrpeplugin
+CATALOGNAME_CSWnrpe = nrpe
+CATALOGNAME_CSWnrpeplugin = nrpe_plugin
-SPKG_CLASSES_CSWnrpe = none cswusergroup cswpreserveconf cswinitsmf
+PKGFILES_CSWnrpe = /opt/csw/bin/nrpe_1k
+PKGFILES_CSWnrpe += /opt/csw/bin/nrpe_8k
+PKGFILES_CSWnrpe += /etc/opt/csw/nrpe.cfg.CSW
+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 += /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
+PKGFILES_CSWnrpe += /etc/opt/csw/init.d/cswnrpe
+PKGFILES_CSWnrpe += /opt/csw/etc/templates/CSWnrpe$(CFGDIR)
+PKGFILES_CSWnrpe += /opt/csw/etc/templates/CSWnrpe$(CFGDIR)/nrpe.cfg
-EXTRA_MODULATORS = SIZE
-MODULATIONS_SIZE = 1k 8k
+PKGFILES_CSWnrpeplugin = /opt/csw/libexec/nagios-plugins
+PKGFILES_CSWnrpeplugin += /opt/csw/libexec/nagios-plugins/check_nrpe
+PKGFILES_CSWnrpeplugin += /opt/csw/libexec/nagios-plugins/check_nrpe_8k
+PKGFILES_CSWnrpeplugin += /opt/csw/share/doc/nrpe
+PKGFILES_CSWnrpeplugin += /opt/csw/share/doc/nrpe/README_8k
+PKGFILES_CSWnrpeplugin += /opt/csw/share/doc/nrpe_plugin
+PKGFILES_CSWnrpeplugin += /opt/csw/share/doc/nrpe_plugin/license
+
+RUNTIME_DEP_PKGS_CSWnrpe = CSWosslrt CSWtcpwrap
+RUNTIME_DEP_PKGS_CSWnrpeplugin = CSWosslrt
+
+#SPKG_CLASSES_CSWnrpe = none cswusergroup cswpreserveconf cswinitsmf
+
LICENSE = LEGAL
NOISALIST = 1
@@ -54,7 +86,9 @@
CONFIGURE_ARGS += --prefix=/opt/csw
CONFIGURE_ARGS += --exec-prefix=/opt/csw
-sysconfdir = /etc/${prefix}
+CFLAGS += "-I/opt/csw/include"
+
+sysconfdir = /etc${prefix}
bindir = $(prefix)/bin
libexecdir = $(prefix)/libexec/nagios-plugins
datadir = $(prefix)/share
@@ -68,32 +102,50 @@
MERGE_SCRIPTS_isa-i386-size-1k = copy-all
MERGE_SCRIPTS_isa-i386-size-8k = copy-nrpe-only
+#
+#
+#
+
+INITSMF = /etc/opt/csw/init.d/cswnrpe
+USERGROUP = /etc/opt/csw/pkg/CSWnrpe/cswusergroup
+#POSTMSG = /opt/csw/share/doc/nrpe/README.CSW
+
include gar/category.mk
DOCDIR=$(datadir)/doc/nrpe
CFGDIR=$(sysconfdir)
LIBEXECDIR=$(libexecdir)
BINDIR=$(bindir)
+CSWnrpe_TEMPLATEDIR = /opt/csw/etc/templates/CSWnrpe$(CFGDIR)
install-custom:
- ginstall -m 775 -d $(DESTDIR)$(DOCDIR)
- ginstall -m 755 -d $(DESTDIR)$(LIBEXECDIR)
- ginstall -m 755 -d $(DESTDIR)$(BINDIR)
- ginstall -m 755 -d $(DESTDIR)/nagios
- ginstall -m 755 $(WORKSRC)/src/check_nrpe $(DESTDIR)$(LIBEXECDIR)
- ginstall -m 755 $(WORKSRC)/src/nrpe $(DESTDIR)$(BINDIR)/nrpe_1k
- 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 775 -d $(DESTDIR)$(CFGDIR)
- ginstall -m 644 $(WORKSRC)/sample-config/nrpe.cfg
$(DESTDIR)$(CFGDIR)/nrpe.cfg.CSW
- ginstall -d $(DESTDIR)/etc/opt/csw/init.d
- ginstall -m 755 $(FILEDIR)/cswnrpe $(DESTDIR)/etc/opt/csw/init.d/cswnrpe
- @ginstall -m 755 -d $(DESTDIR)/opt/csw/etc/pkg/CSWnrpe
- @ginstall -m 644 $(FILEDIR)/cswusergroup
$(DESTDIR)/opt/csw/etc/pkg/CSWnrpe/cswusergroup
+ @ginstall -m 775 -d $(DESTDIR)$(DOCDIR)
+ @ginstall -m 755 -d $(DESTDIR)$(LIBEXECDIR)
+ @ginstall -m 755 -d $(DESTDIR)$(BINDIR)
+ @ginstall -m 755 -d $(DESTDIR)/nagios
+ @ginstall -m 755 $(WORKSRC)/src/check_nrpe $(DESTDIR)$(LIBEXECDIR)
+ @ginstall -m 755 $(WORKSRC)/src/nrpe $(DESTDIR)$(BINDIR)/nrpe_1k
+ @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)
+ @#
+ @# configuration file for CSWnrpe -> cswcptemplates
+ @#
+ @ginstall -m 775 -d $(DESTDIR)$(CSWnrpe_TEMPLATEDIR)
+ @ginstall -m 644 $(WORKSRC)/sample-config/nrpe.cfg
$(DESTDIR)$(CSWnrpe_TEMPLATEDIR)/nrpe.cfg
+ @#
+ @# create user and group -> cswusergroup
+ @#
+ @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
@$(MAKECOOKIE)
merge-copy-nrpe-only:
Modified: csw/mgar/pkg/nrpe/trunk/checksums
===================================================================
--- csw/mgar/pkg/nrpe/trunk/checksums 2012-05-21 14:01:00 UTC (rev 18065)
+++ csw/mgar/pkg/nrpe/trunk/checksums 2012-05-21 19:34:20 UTC (rev 18066)
@@ -1,10 +1 @@
-afe807962bd3d189e78a92f040b10eff CSWnrpe.preinstall
-5e3db7d856aa07719aef0fcac537ad7f CSWnrpe.prototype
-5598cf47118a6e8d2e8bdcd4a2c3ee16 CSWnrpeplugin.prototype
-3bb2fbb228a6e2d0a99d981d82610d9a README_8k
-36b85dd37d47a3813bfef5dee5804b61 common.h.diff
-4b51476c782d2c5764d10f8ed530ada0 configure.diff
-f7b166f02aa2cefb76fc235f6edd1745 cswnrpe
-0a98ba4dd462e50f23239433117bae5e cswusergroup
-b2d75e2962f1e3151ef58794d60c9e97 nrpe-2.12.tar.gz
-5b02d4385daaea2a8c13903539aa6189 patch.diff
+06a1d3e0ecb8d1ba085a4a61f92be74c nrpe-2.13.tar.gz
Added:
csw/mgar/pkg/nrpe/trunk/files/0002-changing-packetbuffer-length-to-8k.patch
===================================================================
--- csw/mgar/pkg/nrpe/trunk/files/0002-changing-packetbuffer-length-to-8k.patch
(rev 0)
+++ csw/mgar/pkg/nrpe/trunk/files/0002-changing-packetbuffer-length-to-8k.patch
2012-05-21 19:34:20 UTC (rev 18066)
@@ -0,0 +1,34 @@
+From 3aaf73298717337b2002ae64d843d1342778c370 Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <j...@opencsw.org>
+Date: Tue, 28 Feb 2012 14:43:46 +0100
+Subject: [PATCH] changing packetbuffer length to 8k
+
+---
+ include/common.h | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/common.h b/include/common.h
+index fb3b429..6591d10 100755
+--- a/include/common.h
++++ b/include/common.h
+@@ -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;
+--
+1.7.9
+
Modified: csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preinstall
===================================================================
--- csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preinstall 2012-05-21 14:01:00 UTC
(rev 18065)
+++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preinstall 2012-05-21 19:34:20 UTC
(rev 18066)
@@ -5,7 +5,7 @@
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 (to have a backup is always a good idea).
+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.
Deleted: csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype
===================================================================
--- csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype 2012-05-21 14:01:00 UTC
(rev 18065)
+++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype 2012-05-21 19:34:20 UTC
(rev 18066)
@@ -1,16 +0,0 @@
-f none /opt/csw/bin/nrpe_1k 0775 root bin
-f none /opt/csw/bin/nrpe_8k 0775 root bin
-s none /opt/csw/bin/nrpe=/opt/csw/bin/nrpe_1k
-f cswpreserveconf /etc/opt/csw/nrpe.cfg.CSW 0644 root bin
-d none /opt/csw/share/doc/nrpe 0755 root bin
-f none /opt/csw/share/doc/nrpe/NRPE.pdf 0644 root bin
-f none /opt/csw/share/doc/nrpe/LEGAL 0644 root bin
-f none /opt/csw/share/doc/nrpe/license 0644 root bin
-f none /opt/csw/share/doc/nrpe/README 0644 root bin
-f none /opt/csw/share/doc/nrpe/README_8k 0644 root bin
-f none /opt/csw/share/doc/nrpe/README.SSL 0644 root bin
-f none /opt/csw/share/doc/nrpe/SECURITY 0644 root bin
-d none /opt/csw/nagios 755 root bin
-f cswinitsmf /etc/opt/csw/init.d/cswnrpe 0755 root bin
-d none /opt/csw/etc/pkg/CSWnrpe 0755 root bin
-f cswusergroup /opt/csw/etc/pkg/CSWnrpe/cswusergroup 0644 root bin
Deleted: csw/mgar/pkg/nrpe/trunk/files/CSWnrpeplugin.prototype
===================================================================
--- csw/mgar/pkg/nrpe/trunk/files/CSWnrpeplugin.prototype 2012-05-21
14:01:00 UTC (rev 18065)
+++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpeplugin.prototype 2012-05-21
19:34:20 UTC (rev 18066)
@@ -1,7 +0,0 @@
-d none /opt/csw/libexec/nagios-plugins 0755 root bin
-f none /opt/csw/libexec/nagios-plugins/check_nrpe 0775 root bin
-f none /opt/csw/libexec/nagios-plugins/check_nrpe_8k 0775 root bin
-d none /opt/csw/share/doc/nrpe 0755 root bin
-f none /opt/csw/share/doc/nrpe/README_8k 0644 root bin
-d none /opt/csw/share/doc/nrpe_plugin 0755 root bin
-f none /opt/csw/share/doc/nrpe_plugin/license 0644 root bin
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
