From owner-svn-ports-head@FreeBSD.ORG Tue Sep 30 13:52:59 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 32A1C949; Tue, 30 Sep 2014 13:52:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 066E9E3E; Tue, 30 Sep 2014 13:52:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8UDqwQ8005314; Tue, 30 Sep 2014 13:52:58 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8UDqw9H005312; Tue, 30 Sep 2014 13:52:58 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201409301352.s8UDqw9H005312@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Tue, 30 Sep 2014 13:52:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369602 - head/net-mgmt/nrpe X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Sep 2014 13:52:59 -0000 Author: mat Date: Tue Sep 30 13:52:58 2014 New Revision: 369602 URL: http://svnweb.freebsd.org/changeset/ports/369602 QAT: https://qat.redports.org/buildarchive/r369602/ Log: Try not to break a nagios installation when installing/upgrading nrpe by not using /var/spool/nagios. The nrpe.spec file puts localstatedir to their nagios spool directory, but localstatedir is not used outside of the configure script, so, no need to have it here. Sponsored by: Absolight Modified: head/net-mgmt/nrpe/Makefile head/net-mgmt/nrpe/pkg-plist Modified: head/net-mgmt/nrpe/Makefile ============================================================================== --- head/net-mgmt/nrpe/Makefile Tue Sep 30 13:52:33 2014 (r369601) +++ head/net-mgmt/nrpe/Makefile Tue Sep 30 13:52:58 2014 (r369602) @@ -3,7 +3,7 @@ PORTNAME= nrpe DISTVERSION= 2.15 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-mgmt MASTER_SITES= SF/nagios/${PORTNAME}-2.x/${PORTNAME}-${PORTVERSION} @@ -35,27 +35,21 @@ SSL_CFLAGS= -I${OPENSSLINC} ARGS_CONFIGURE_ON= --enable-command-args ARGS_CONFIGURE_OFF= --disable-command-args -.include - NAGIOSUSER?= nagios NAGIOSGROUP?= nagios -NAGIOSDIR?= /var/spool/nagios USERS= ${NAGIOSUSER} GROUPS= ${NAGIOSGROUP} -NAGIOSUID= 181 -NAGIOSGID= ${NAGIOSUID} NRPE_PIDDIR?= /var/run/nrpe2 CONFIGURE_ARGS+=--bindir=${PREFIX}/sbin \ --libexecdir=${PREFIX}/libexec/nagios \ --sysconfdir=${PREFIX}/etc \ - --localstatedir=${NAGIOSDIR} \ --with-nrpe-user=${NAGIOSUSER} \ --with-nrpe-group=${NAGIOSGROUP} -PLIST_SUB= NAGIOSDIR=${NAGIOSDIR} \ - NAGIOSUID=${NAGIOSUID} \ +PLIST_SUB= NAGIOSUSER=${NAGIOSUSER} \ + NAGIOSGROUP=${NAGIOSGROUP} \ NRPE_PIDDIR=${NRPE_PIDDIR} SUB_LIST+= PIDDIR=${NRPE_PIDDIR} @@ -68,7 +62,6 @@ post-patch: ${WRKSRC}/sample-config/nrpe.cfg.in do-install: ${INSTALL} -d ${STAGEDIR}${NRPE_PIDDIR} - ${INSTALL} -m 750 -d ${STAGEDIR}${NAGIOSDIR} ${INSTALL_PROGRAM} ${WRKSRC}/src/nrpe ${STAGEDIR}${PREFIX}/sbin/nrpe2 ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios ${INSTALL_PROGRAM} ${WRKSRC}/src/check_nrpe ${STAGEDIR}${PREFIX}/libexec/nagios/check_nrpe2 Modified: head/net-mgmt/nrpe/pkg-plist ============================================================================== --- head/net-mgmt/nrpe/pkg-plist Tue Sep 30 13:52:33 2014 (r369601) +++ head/net-mgmt/nrpe/pkg-plist Tue Sep 30 13:52:58 2014 (r369602) @@ -1,9 +1,4 @@ -@unexec cmp -s %D/etc/nrpe.cfg.sample %D/etc/nrpe.cfg && rm %D/etc/nrpe.cfg || true -etc/nrpe.cfg.sample -@exec test -f %B/nrpe.cfg || install -m 644 %D/%F %B/nrpe.cfg +@sample etc/nrpe.cfg.sample libexec/nagios/check_nrpe2 sbin/nrpe2 -@dirrmtry libexec/nagios -@exec install -m 755 -o %%NAGIOSUID%% -d %%NRPE_PIDDIR%% -@dirrmtry %%NAGIOSDIR%% -@dirrmtry %%NRPE_PIDDIR%% +@dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,755) %%NRPE_PIDDIR%%