Attachment 105142 Details for Bug 145463 – nagios-3.2.1.patch

[patch] nagios-3.2.1.patch

nagios-3.2.1.patch (text/plain), 3.42 KB, created by Martin Matuska on 2010-04-07 20:30:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Matuska

Created: 2010-04-07 20:30:03 UTC

Size: 3.42 KB

patch

obsolete

>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 <mammad@yahoo-inc.com>
>  dnl FreeBSD -pthread check - Jonathan McDowell <noodles@earth.li>
>- 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=<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=<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 #'`"

Actions: View | Diff

Attachments on bug 145463: 105142 | 105143