Revision: 25585
http://sourceforge.net/p/gar/code/25585
Author: cgrzemba
Date: 2016-02-29 12:38:22 +0000 (Mon, 29 Feb 2016)
Log Message:
-----------
nrpe/trunk: update for build IPS package
Modified Paths:
--------------
csw/mgar/pkg/nrpe/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/nrpe/trunk/files/0003-remove-chown-on-install.patch
Modified: csw/mgar/pkg/nrpe/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nrpe/trunk/Makefile 2016-02-27 10:16:42 UTC (rev 25584)
+++ csw/mgar/pkg/nrpe/trunk/Makefile 2016-02-29 12:38:22 UTC (rev 25585)
@@ -25,7 +25,7 @@
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-remove-chown-on-install.patch
#
# replace /usr/local
@@ -53,6 +53,7 @@
# files for CSWnrpe
#
+IPS_PACKAGE_PREFIX = diagnostic/
PACKAGES += CSWnrpe
SPKG_DESC_CSWnrpe = Nagios remote plugin executor
# PKGFILES_CSWnrpe += /opt/csw/bin/nrpe_1k
@@ -65,7 +66,7 @@
# 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_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
@@ -92,6 +93,7 @@
PKGFILES_CSWnrpe-plugin += /opt/csw/share/doc/nrpe_plugin
PKGFILES_CSWnrpe-plugin += /opt/csw/share/doc/nrpe_plugin/license
RUNTIME_DEP_PKGS_CSWnrpe-plugin += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWnrpe-plugin += CSWnrpe
#
# migrate configuration
@@ -151,9 +153,9 @@
LIBEXECDIR=$(libexecdir)
BINDIR=$(bindir)
-# pre-configure:
-# cd $(WORKSRC) && autoconf
-# @$(MAKECOOKIE)
+pre-configure:
+ cd $(WORKSRC) && autoconf
+ @$(MAKECOOKIE)
install-custom:
@ginstall -m 775 -d $(DESTDIR)$(DOCDIR)
Added: csw/mgar/pkg/nrpe/trunk/files/0003-remove-chown-on-install.patch
===================================================================
--- csw/mgar/pkg/nrpe/trunk/files/0003-remove-chown-on-install.patch
(rev 0)
+++ csw/mgar/pkg/nrpe/trunk/files/0003-remove-chown-on-install.patch
2016-02-29 12:38:22 UTC (rev 25585)
@@ -0,0 +1,20 @@
+--- 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
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
