From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Apr 7 19:30:04 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D3D181065673 for ; Wed, 7 Apr 2010 19:30:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 94A8C8FC1E for ; Wed, 7 Apr 2010 19:30:04 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o37JU3FI037924 for ; Wed, 7 Apr 2010 19:30:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o37JU3Uw037918; Wed, 7 Apr 2010 19:30:03 GMT (envelope-from gnats) Resent-Date: Wed, 7 Apr 2010 19:30:03 GMT Resent-Message-Id: <201004071930.o37JU3Uw037918@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Martin Matuska Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E9277106566C for ; Wed, 7 Apr 2010 19:19:57 +0000 (UTC) (envelope-from mm@mail2.vx.sk) Received: from mail2.vx.sk (neo.vx.sk [188.40.111.84]) by mx1.freebsd.org (Postfix) with ESMTP id 8FAFB8FC13 for ; Wed, 7 Apr 2010 19:19:57 +0000 (UTC) Received: from neo.vx.sk (localhost [127.0.0.1]) by mail2.vx.sk (Postfix) with ESMTP id 9E9782B1E3; Wed, 7 Apr 2010 21:19:56 +0200 (CEST) Received: from mail2.vx.sk ([127.0.0.1]) by neo.vx.sk (neo.vx.sk [127.0.0.1]) (amavisd-new, port 10024) with LMTP id NY7YWMdZK1Ws; Wed, 7 Apr 2010 21:19:50 +0200 (CEST) Received: by mail2.vx.sk (Postfix, from userid 1001) id BF0BC2B1DC; Wed, 7 Apr 2010 21:19:50 +0200 (CEST) Message-Id: <20100407191950.BF0BC2B1DC@mail2.vx.sk> Date: Wed, 7 Apr 2010 21:19:50 +0200 (CEST) From: Martin Matuska To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: jarrod@netleader.com.au Subject: ports/145463: [PATCH] net-mgmt/nagios: update to 3.2.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Apr 2010 19:30:04 -0000 >Number: 145463 >Category: ports >Synopsis: [PATCH] net-mgmt/nagios: update to 3.2.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Apr 07 19:30:03 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Martin Matuska >Release: FreeBSD 8.0-RELEASE-p2 amd64 >Organization: >Environment: System: FreeBSD neo.vx.sk 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #14: Tue Apr 6 18:24:28 CEST >Description: - Update to 3.2.1 Port maintainer (jarrod@netleader.com.au) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- nagios-3.2.1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/net-mgmt/nagios/Makefile,v retrieving revision 1.84 diff -u -r1.84 Makefile --- Makefile 5 Feb 2010 11:42:42 -0000 1.84 +++ Makefile 7 Apr 2010 19:19:17 -0000 @@ -6,8 +6,7 @@ # PORTNAME= nagios -PORTVERSION= 3.2.0 -PORTREVISION= 1 +PORTVERSION= 3.2.1 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-3.x/${PORTNAME}-${PORTVERSION} Index: distinfo =================================================================== RCS file: /home/pcvs/ports/net-mgmt/nagios/distinfo,v retrieving revision 1.44 diff -u -r1.44 distinfo --- distinfo 28 Nov 2009 13:44:45 -0000 1.44 +++ distinfo 7 Apr 2010 19:19:17 -0000 @@ -1,3 +1,3 @@ -MD5 (nagios-3.2.0.tar.gz) = 3566167cc60ddeaad34e7d2e26ed4a58 -SHA256 (nagios-3.2.0.tar.gz) = 7cbf35ba0319f24fa085982c038437c4515003b27863c4897dc86b197a50a5e7 -SIZE (nagios-3.2.0.tar.gz) = 3170967 +MD5 (nagios-3.2.1.tar.gz) = d4655ee8c95c9679fd4fd53dac34bbe3 +SHA256 (nagios-3.2.1.tar.gz) = 8e9a0600dd574977b506613ef81537dccceb2d8f734db049b291e8e21859d9d1 +SIZE (nagios-3.2.1.tar.gz) = 3215350 Index: files/patch-configure.in =================================================================== RCS file: /home/pcvs/ports/net-mgmt/nagios/files/patch-configure.in,v retrieving revision 1.5 diff -u -r1.5 patch-configure.in --- files/patch-configure.in 28 Nov 2009 13:44:45 -0000 1.5 +++ files/patch-configure.in 7 Apr 2010 19:19:17 -0000 @@ -1,5 +1,5 @@ ---- configure.in.orig 2007-12-18 04:21:51.000000000 +1030 -+++ configure.in 2008-01-02 12:15:05.000000000 +1030 +--- configure.in.orig 2010-03-09 19:39:59.000000000 +0100 ++++ configure.in 2010-04-07 20:18:58.585012048 +0200 @@ -6,7 +6,6 @@ AC_INIT(base/nagios.c) @@ -7,8 +7,8 @@ -AC_PREFIX_DEFAULT(/usr/local/nagios) PKG_NAME=nagios - PKG_VERSION="3.0rc1" -@@ -119,7 +118,15 @@ + PKG_VERSION="3.2.1" +@@ -125,7 +124,15 @@ dnl Test for pthreads support - taken from ICU FreeBSD Port configure script THREADLIBS="" have_pthreads="no" @@ -23,8 +23,8 @@ +else dnl FreeBSD: Try ports/linuxthreads first - Mammad Zadeh dnl FreeBSD -pthread check - Jonathan McDowell - AC_DEFUN(AC_PTHREAD_FREEBSD,[ -@@ -180,6 +187,7 @@ + AC_DEFUN([AC_PTHREAD_FREEBSD],[ +@@ -186,6 +193,7 @@ if test $have_pthreads = "no"; then AC_PTHREAD_FREEBSD fi @@ -32,18 +32,18 @@ AC_SUBST(THREADLIBS) -@@ -196,7 +204,7 @@ +@@ -201,7 +209,7 @@ AC_SUBST(nagios_grp) - AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user") - AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$nagios_grp") + AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user",[user name to run nagios]) + AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$nagios_grp",[group name to run nagios]) -INSTALL_OPTS="-o $nagios_user -g $nagios_grp" +INSTALL_OPTS="-o root -g wheel" AC_SUBST(INSTALL_OPTS) - AC_ARG_WITH(command_user,--with-command-user= sets user name for command access,command_user=$withval,command_user=$nagios_user) -@@ -667,6 +675,9 @@ + AC_ARG_WITH(command_user,AC_HELP_STRING([--with-command-user=],[sets user name for command access]),command_user=$withval,command_user=$nagios_user) +@@ -668,6 +676,9 @@ - AC_DEFINE_UNQUOTED(EMBEDDEDPERL) + AC_DEFINE_UNQUOTED(EMBEDDEDPERL,,[Is embedded Perl being compiled in?]) PERLLIBS="`perl -MExtUtils::Embed -e ldopts`" + if test x$have_thr = xyes; then + PERLLIBS="`echo $PERLLIBS | sed 's#pthread #lthr #'`" --- nagios-3.2.1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: