Date: Wed, 11 Dec 2013 06:04:04 -0600 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Dmitry Sivachenko <demon@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r336061 - in head/net-mgmt/nagios-plugins: . files Message-ID: <52A854B4.6020400@FreeBSD.org> In-Reply-To: <201312101429.rBAETWic071606@svn.freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On 12/10/2013 8:29 AM, Dmitry Sivachenko wrote: > Author: demon > Date: Tue Dec 10 14:29:31 2013 > New Revision: 336061 > URL: http://svnweb.freebsd.org/changeset/ports/336061 > > Log: > Update to version 1.5. > (check_dig problem on FreeBSD-10 still unresolved) > > PR: 184644 > Submitted by: Niclas Zeising <zeising@daemonic.se> > > Modified: > head/net-mgmt/nagios-plugins/Makefile > head/net-mgmt/nagios-plugins/distinfo > head/net-mgmt/nagios-plugins/files/patch-configure.in > head/net-mgmt/nagios-plugins/pkg-descr > head/net-mgmt/nagios-plugins/pkg-plist > > Modified: head/net-mgmt/nagios-plugins/Makefile > ============================================================================== > --- head/net-mgmt/nagios-plugins/Makefile Tue Dec 10 13:01:25 2013 (r336060) > +++ head/net-mgmt/nagios-plugins/Makefile Tue Dec 10 14:29:31 2013 (r336061) > @@ -2,11 +2,10 @@ > # $FreeBSD$ > > PORTNAME= nagios-plugins > -PORTVERSION= 1.4.16 > -PORTREVISION= 3 > +PORTVERSION= 1.5 > PORTEPOCH= 1 > CATEGORIES= net-mgmt > -MASTER_SITES= SF/nagiosplug/nagiosplug/${PORTVERSION} > +MASTER_SITES= https://www.nagios-plugins.org/download/ > > MAINTAINER= demon@FreeBSD.org > COMMENT= Plugins for Nagios > @@ -18,7 +17,7 @@ USE_AUTOTOOLS= libtool aclocal autoconf > ACLOCAL_ARGS= -I m4 -I gl/m4 > AUTOMAKE_ARGS= --add-missing > > -OPTIONS_DEFINE= QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 JAIL NLS > +OPTIONS_DEFINE= QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 JAIL NLS DBI > OPTIONS_DEFAULT=IPV6 > > QSTAT_DESC= Game server query support (check_game) > @@ -29,6 +28,7 @@ MYSQL_DESC= MySQL support (check_mysql) > PGSQL_DESC= PostgreSQL support (check_pgsql) > LDAP_DESC= OpenLDAP support (check_ldap) > JAIL_DESC= Compilation within jail(8) (see Makefile) > +DBI_DESC= Check database using DBI > > GNU_CONFIGURE= yes > > @@ -43,7 +43,8 @@ NAGIOSCGIURL?= ${NAGIOSHTMURL}/cgi-bin > NAGIOSPOLLIP?= 127.0.0.1 > NAGIOSPOLLIP6?= ::1 > > -NO_STAGE= yes > +NEED_ROOT= yes # check_icmp, check_dhcp > + > .include <bsd.port.options.mk> > > CONFIGURE_ARGS= --with-nagios-user=${NAGIOSUSER} \ > @@ -98,9 +99,9 @@ PLIST_SUB+= SUB_SNMP="@comment " > > .if ${PORT_OPTIONS:MRADIUS} > LIB_DEPENDS+= radiusclient-ng:${PORTSDIR}/net/radiusclient > -CONFIGURE_ARGS+= --enable-radius > PLIST_SUB+= SUB_RADIUS="" > .else > +CONFIGURE_ARGS+= --without-radius > PLIST_SUB+= SUB_RADIUS="@comment " > .endif > > @@ -124,9 +125,9 @@ PLIST_SUB+= SUB_PGSQL="@comment " > > .if ${PORT_OPTIONS:MLDAP} > USE_OPENLDAP= YES > -CONFIGURE_ARGS+= --enable-ldap > PLIST_SUB+= SUB_LDAP="" > .else > +CONFIGURE_ARGS+= --without-ldap > PLIST_SUB+= SUB_LDAP="@comment " > .endif > > @@ -138,6 +139,14 @@ CONFIGURE_ARGS+= --disable-nls > PLIST_SUB+= NLS="@comment " > .endif > > +.if ${PORT_OPTIONS:MDBI} > +PLIST_SUB+= SUB_DBI="" > +LIB_DEPENDS+= libdbi.so:${PORTSDIR}/databases/libdbi > +.else > +CONFIGURE_ARGS+= --without-dbi > +PLIST_SUB+= SUB_DBI="@comment " > +.endif > + > # Restore check_users from 1.4.15 for hosts without getutxent(3) > .if ${OSVERSION} < 900007 > EXTRA_PATCHES+= ${FILESDIR}/extra-patch-plugins__check_users.c > > Modified: head/net-mgmt/nagios-plugins/distinfo > ============================================================================== > --- head/net-mgmt/nagios-plugins/distinfo Tue Dec 10 13:01:25 2013 (r336060) > +++ head/net-mgmt/nagios-plugins/distinfo Tue Dec 10 14:29:31 2013 (r336061) > @@ -1,2 +1,2 @@ > -SHA256 (nagios-plugins-1.4.16.tar.gz) = b0caf07e0084e9b7f10fdd71cbd3ebabcd85ad78df64da360b51233b0e73b2bd > -SIZE (nagios-plugins-1.4.16.tar.gz) = 2087089 > +SHA256 (nagios-plugins-1.5.tar.gz) = fcc55e23bbf1c70bcf1a90749d30249955d4668a9b776b2521da023c5c2f2170 > +SIZE (nagios-plugins-1.5.tar.gz) = 2428258 > > Modified: head/net-mgmt/nagios-plugins/files/patch-configure.in > ============================================================================== > --- head/net-mgmt/nagios-plugins/files/patch-configure.in Tue Dec 10 13:01:25 2013 (r336060) > +++ head/net-mgmt/nagios-plugins/files/patch-configure.in Tue Dec 10 14:29:31 2013 (r336061) > @@ -1,6 +1,6 @@ > ---- configure.in.orig 2009-09-16 10:20:34.000000000 +0200 > -+++ configure.in 2009-12-17 15:42:34.486203026 +0100 > -@@ -11,8 +11,6 @@ > +--- configure.in.orig 2013-10-02 17:22:21.000000000 +0200 > ++++ configure.in 2013-12-09 16:12:25.845469460 +0100 > +@@ -12,8 +12,6 @@ > RELEASE=1 > AC_SUBST(RELEASE) > > @@ -9,7 +9,7 @@ > dnl Deprecated configure options > > > -@@ -43,6 +41,7 @@ > +@@ -44,6 +42,7 @@ > gl_EARLY > AC_PROG_GCC_TRADITIONAL > AC_PROG_LIBTOOL > @@ -17,7 +17,7 @@ > > AM_PROG_CC_C_O > > -@@ -200,11 +199,12 @@ > +@@ -211,11 +210,12 @@ > ACX_HELP_STRING([--with-pgsql=DIR], > [sets path to pgsql installation]), > PGSQL=$withval,) > @@ -32,71 +32,60 @@ > fi > AC_CHECK_LIB(pq,PQsetdbLogin,,,-lcrypt) > if test "$ac_cv_lib_pq_PQsetdbLogin" = "yes"; then > -@@ -241,37 +241,42 @@ > - AC_MSG_WARN([Skipping PostgreSQL plugin (check_pgsql)]) > - AC_MSG_WARN([install lib crypt and PostgreSQL libs to compile this plugin (see REQUIREMENTS).]) > - fi > -+else > -+ AC_MSG_WARN([Skipping PostgreSQL plugin (check_pgsql)]) > -+ AC_MSG_WARN([PostgreSQL directory has not been found]) > -+fi > - LIBS="$_SAVEDLIBS" > - CPPFLAGS="$_SAVEDCPPFLAGS" > - > -+AC_ARG_ENABLE(radius,--enable-radius compile check_radius) > -+if test x$enable_radius = xyes; then > - dnl Check for radius libraries > - _SAVEDLIBS="$LIBS" > --AC_CHECK_LIB(radiusclient,rc_read_config) > --if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then > -- EXTRAS="$EXTRAS check_radius" > -- RADIUSLIBS="-lradiusclient" > -- AC_SUBST(RADIUSLIBS) > --else > -- AC_CHECK_LIB(radiusclient-ng,rc_read_config) > -+ AC_CHECK_LIB(radiusclient-ng,rc_read_config,,,-L${LOCALBASE}/lib) > - if test "$ac_cv_lib_radiusclient_ng_rc_read_config" = "yes"; then > - EXTRAS="$EXTRAS check_radius" > -- RADIUSLIBS="-lradiusclient-ng" > -+ RADIUSLIBS="-L${LOCALBASE}/lib -lradiusclient-ng"\ > -+ RADIUSINCLUDE="-I${LOCALBASE}/include" > - AC_SUBST(RADIUSLIBS) > -+ AC_SUBST(RADIUSINCLUDE) > +@@ -259,10 +259,10 @@ > + dnl Check for DBI libraries > + AS_IF([test "x$with_dbi" != "xno"], [ > + _SAVEDLIBS="$LIBS" > +- AC_CHECK_LIB(dbi,dbi_initialize) > ++ AC_CHECK_LIB(dbi,dbi_initialize,,,-L${LOCALBASE}/lib) > + if test "$ac_cv_lib_dbi_dbi_initialize" = "yes"; then > + EXTRAS="$EXTRAS check_dbi" > +- DBILIBS="-ldbi" > ++ DBILIBS="-L${LOCALBASE}/lib -ldbi" > + AC_SUBST(DBILIBS) > else > - AC_MSG_WARN([Skipping radius plugin]) > - AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).]) > - fi > --fi > - LIBS="$_SAVEDLIBS" > -+fi > - > -+AC_ARG_ENABLE(ldap,--enable-ldap compile check_ldap) > -+if test x$enable_ldap = xyes; then > + AC_MSG_WARN([Skipping dbi plugin]) > +@@ -276,17 +276,13 @@ > + dnl Check for radius libraries > + AS_IF([test "x$with_radius" != "xno"], [ > + _SAVEDLIBS="$LIBS" > +- AC_CHECK_LIB(radiusclient,rc_read_config) > +- if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then > +- EXTRAS="$EXTRAS check_radius" > +- RADIUSLIBS="-lradiusclient" > +- AC_SUBST(RADIUSLIBS) > +- else > +- AC_CHECK_LIB(radiusclient-ng,rc_read_config) > ++ AC_CHECK_LIB(radiusclient-ng,rc_read_config,,,-L${LOCALBASE}/lib) > + if test "$ac_cv_lib_radiusclient_ng_rc_read_config" = "yes"; then > + EXTRAS="$EXTRAS check_radius" > +- RADIUSLIBS="-lradiusclient-ng" > ++ RADIUSLIBS="-L${LOCALBASE}/lib -lradiusclient-ng" > ++ RADIUSINCLUDE="-I${LOCALBSE}/include" > + AC_SUBST(RADIUSLIBS) > ++ AC_SUBST(RADIUSINCLUDE) > + else > + AC_MSG_WARN([Skipping radius plugin]) > + AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).]) > +@@ -300,12 +296,13 @@ > dnl Check for LDAP libraries > - _SAVEDLIBS="$LIBS" > --AC_CHECK_LIB(ldap,main,,,-llber) > --if test "$ac_cv_lib_ldap_main" = "yes"; then > -- LDAPLIBS="-lldap -llber"\ > -- LDAPINCLUDE="-I/usr/include/ldap" > -+AC_CHECK_LIB(ldap,ldap_simple_bind,,,-L${LOCALBASE}/lib -llber) > -+if test "$ac_cv_lib_ldap_ldap_simple_bind" = "yes"; then > -+ LDAPLIBS="-L${LOCALBASE}/lib -lldap -llber"\ > -+ LDAPINCLUDE="-I${LOCALBASE}/include" > - AC_SUBST(LDAPLIBS) > - AC_SUBST(LDAPINCLUDE) > -+ LIBS="-L${LOCALBASE}/lib $LIBS" > - AC_CHECK_FUNCS(ldap_set_option) > - EXTRAS="$EXTRAS check_ldap" > - AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s) > -@@ -280,6 +285,7 @@ > - AC_MSG_WARN([install LDAP libs to compile this plugin (see REQUIREMENTS).]) > - fi > - LIBS="$_SAVEDLIBS" > -+fi > - > - dnl Check for headers used by check_ide_smart > - AC_CHECK_HEADER(linux/hdreg.h, FOUNDINCLUDE=yes, FOUNDINCLUDE=no) > -@@ -597,22 +603,10 @@ > + AS_IF([test "x$with_ldap" != "xno"], [ > + _SAVEDLIBS="$LIBS" > +- AC_CHECK_LIB(ldap,main,,,-llber) > +- if test "$ac_cv_lib_ldap_main" = "yes"; then > +- LDAPLIBS="-lldap -llber"\ > +- LDAPINCLUDE="-I/usr/include/ldap" > ++ AC_CHECK_LIB(ldap,ldap_simple_bind,,,-L${LOCALBASE}/lib -llber) > ++ if test "$ac_cv_lib_ldap_ldap_simple_bind" = "yes"; then > ++ LDAPLIBS="-L${LOCALBSE}/lib -lldap -llber" > ++ LDAPINCLUDE="-I${LOCALBASE}/include" > + AC_SUBST(LDAPLIBS) > + AC_SUBST(LDAPINCLUDE) > ++ LIBS="-L${LOCALBASE}/lib $LIBS" > + AC_CHECK_FUNCS(ldap_set_option) > + EXTRAS="$EXTRAS check_ldap" > + AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s) > +@@ -729,22 +726,10 @@ > dnl ac_cv_ps_cols=8 > dnl AC_MSG_RESULT([$ac_cv_ps_command]) > > @@ -122,7 +111,7 @@ > then > ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" > ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'" > -@@ -620,9 +614,8 @@ > +@@ -752,9 +737,8 @@ > ac_cv_ps_cols=9 > AC_MSG_RESULT([$ac_cv_ps_command]) > > @@ -134,7 +123,7 @@ > elif ps -axwo 'stat uid pid ppid vsz rss pcpu ucomm command' 2>/dev/null | \ > egrep -i ["^ *STAT +UID +PID +PPID +VSZ +RSS +%CPU +UCOMM +COMMAND"] > /dev/null > then > -@@ -632,209 +625,6 @@ > +@@ -764,209 +748,6 @@ > ac_cv_ps_cols=9 > AC_MSG_RESULT([$ac_cv_ps_command]) > > @@ -344,16 +333,16 @@ > else > AC_MSG_WARN([unable to find usable ps syntax - check_procs and check_nagios will not be compiled]) > fi > -@@ -1212,6 +1002,8 @@ > - AC_DEFINE_UNQUOTED(WHO_COMMAND,"$ac_cv_path_to_who", > - [path and arguments for invoking 'who']) > +@@ -1354,6 +1135,8 @@ > + AC_MSG_WARN([Get smbclient from Samba.org to monitor SMB shares]) > + fi > > +AC_ARG_ENABLE(snmp,--enable-snmp compile check_hpjd and check_snmp) > +if test x$enable_snmp = xyes; then > AC_PATH_PROG(PATH_TO_SNMPGET,snmpget) > AC_ARG_WITH(snmpget_command, > ACX_HELP_STRING([--with-snmpget-command=PATH], > -@@ -1242,7 +1034,10 @@ > +@@ -1384,7 +1167,10 @@ > else > AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins]) > fi > @@ -364,7 +353,7 @@ > AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat) > AC_PATH_PROG(PATH_TO_QSTAT,qstat) > AC_ARG_WITH(qstat_command, > -@@ -1267,7 +1062,10 @@ > +@@ -1409,7 +1195,10 @@ > AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat", > [path to qstat/quakestat]) > fi > @@ -373,9 +362,9 @@ > +AC_ARG_ENABLE(fping,--enable-fping compile check_fping) > +if test x$enable_fping = xyes; then > AC_PATH_PROG(PATH_TO_FPING,fping) > - AC_ARG_WITH(fping_command, > - ACX_HELP_STRING([--with-fping-command=PATH], > -@@ -1279,6 +1077,7 @@ > + AC_PATH_PROG(PATH_TO_FPING6,fping6) > + > +@@ -1430,6 +1219,7 @@ > else > AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin]) > fi > @@ -383,7 +372,7 @@ > > AC_PATH_PROG(PATH_TO_SSH,ssh) > AC_ARG_WITH(ssh_command, > -@@ -1346,32 +1145,12 @@ > +@@ -1497,32 +1287,12 @@ > dnl end if for PATH_TO_SWAP > fi > > > Modified: head/net-mgmt/nagios-plugins/pkg-descr > ============================================================================== > --- head/net-mgmt/nagios-plugins/pkg-descr Tue Dec 10 13:01:25 2013 (r336060) > +++ head/net-mgmt/nagios-plugins/pkg-descr Tue Dec 10 14:29:31 2013 (r336061) > @@ -12,4 +12,4 @@ contacts in a variety of different ways > etc.). Current status information, historical logs, and reports can > all be accessed via a web browser. > > -WWW: http://www.nagios.org/ > +WWW: https://www.nagios-plugins.org/ > > Modified: head/net-mgmt/nagios-plugins/pkg-plist > ============================================================================== > --- head/net-mgmt/nagios-plugins/pkg-plist Tue Dec 10 13:01:25 2013 (r336060) > +++ head/net-mgmt/nagios-plugins/pkg-plist Tue Dec 10 14:29:31 2013 (r336061) > @@ -3,6 +3,7 @@ libexec/nagios/check_breeze > libexec/nagios/check_by_ssh Looks like check_by_ssh was removed. Needs to be removed from plist and revision bumped as it does not package with pkgng: > =======================<phase: package >============================ > ===> Building package for nagios-plugins-1.5,1 > pkg-static: lstat(/wrkdirs/usr/ports/net-mgmt/nagios-plugins/work/stage/usr/local/libexec/nagios/check_by_ssh): No such file or directory > *** Error code 1 > > Stop in /usr/ports/net-mgmt/nagios-plugins. > *** Error code 1 > > Stop in /usr/ports/net-mgmt/nagios-plugins. > ===> Cleaning for nagios-plugins-1.5,1 -- Regards, Bryan Drewery [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBAgAGBQJSqFS4AAoJEDXXcbtuRpfPfeoIALJ4r+nYqwyy8kbTdkZOdpEj s4GnidWsttaPjnE+956ZfyPVi3z+VyxDW2PnjZhmNXjn2qCMWkmTW36+cCFMW45u wXZshTIV9sLE+QYjxlBnQZDqHrDmJ+ZRcV34uTtLFMCH2xfjryvt3IAeQ6q2UM8l K976WraMghSLYjpGXqAybQ2PmOA+DUdc+yLU/UV1HzZPdieCXQmKAUT5h47DeV3k P6OQZsHFiv2NjANNJJu0bdGJc/KZpPDDFmXPcpCtNhj7kOyz5Krdt5dc1Q0Taz0b d7IJgtIYMEtFZfuMkPmHtnIXpmTEkjenRkeM7C7pREqDqerpxjXDQxU/VArBq+k= =68Ak -----END PGP SIGNATURE-----home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?52A854B4.6020400>