ソースを参照

Updated version numbers and .gitignore

John C. Frickson 9 年 前
コミット
619964aa8d
7 ファイル変更34 行追加24 行削除
  1. 10 0
      .gitignore
  2. 13 13
      configure
  3. 3 3
      configure.ac
  4. 3 3
      include/common.h
  5. 2 2
      nrpe.spec
  6. 1 1
      src/check_nrpe.c
  7. 2 2
      update-version

+ 10 - 0
.gitignore

@@ -19,3 +19,13 @@ nbproject/
 .project
 .settings/
 paths
+startup/bsd-init
+startup/debian-init
+startup/default-inetd
+startup/default-init
+startup/default-service
+startup/default-xinetd
+startup/mac-org.nagios.PKG_NAME.plist
+startup/openrc-conf
+startup/openrc-init
+startup/solaris-PKG_NAME.xml

+ 13 - 13
configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for nrpe 2.16RC2.
+# Generated by GNU Autoconf 2.69 for nrpe 3.0-beta1.
 #
 # Report bugs to <nagios-users@lists.sourceforge.net>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='nrpe'
 PACKAGE_TARNAME='nrpe'
-PACKAGE_VERSION='2.16RC2'
-PACKAGE_STRING='nrpe 2.16RC2'
+PACKAGE_VERSION='3.0-beta1'
+PACKAGE_STRING='nrpe 3.0-beta1'
 PACKAGE_BUGREPORT='nagios-users@lists.sourceforge.net'
 PACKAGE_URL='https://www.nagios.org/downloads/nagios-core-addons/'
 
@@ -1305,7 +1305,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures nrpe 2.16RC2 to adapt to many kinds of systems.
+\`configure' configures nrpe 3.0-beta1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1355,7 +1355,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of nrpe 2.16RC2:";;
+     short | recursive ) echo "Configuration of nrpe 3.0-beta1:";;
    esac
   cat <<\_ACEOF
 
@@ -1502,7 +1502,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-nrpe configure 2.16RC2
+nrpe configure 3.0-beta1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2108,7 +2108,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by nrpe $as_me 2.16RC2, which was
+It was created by nrpe $as_me 3.0-beta1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2473,9 +2473,9 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 PKG_NAME=nrpe
-PKG_VERSION="2.16RC2"
+PKG_VERSION="3.0-beta1"
 PKG_HOME_URL="http://www.nagios.org/"
-PKG_REL_DATE="11-09-2015"
+PKG_REL_DATE="04-21-2016"
 RPM_RELEASE=1
 
 LANG=C
@@ -4185,7 +4185,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by nrpe $as_me 2.16RC2, which was
+This file was extended by nrpe $as_me 3.0-beta1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4239,7 +4239,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-nrpe config.status 2.16RC2
+nrpe config.status 3.0-beta1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -7860,7 +7860,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by nrpe $as_me 2.16RC2, which was
+This file was extended by nrpe $as_me 3.0-beta1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7923,7 +7923,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-nrpe config.status 2.16RC2
+nrpe config.status 3.0-beta1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

+ 3 - 3
configure.ac

@@ -5,15 +5,15 @@ define([AC_CACHE_LOAD],)
 define([AC_CACHE_SAVE],)
 
 m4_include([build-aux/custom_help.m4])
-AC_INIT([nrpe],[2.16RC2],[nagios-users@lists.sourceforge.net],[nrpe],[https://www.nagios.org/downloads/nagios-core-addons/])
+AC_INIT([nrpe],[3.0-beta1],[nagios-users@lists.sourceforge.net],[nrpe],[https://www.nagios.org/downloads/nagios-core-addons/])
 AC_CONFIG_SRCDIR([src/nrpe.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_PREFIX_DEFAULT(/usr/local/nagios)
 
 PKG_NAME=nrpe
-PKG_VERSION="2.16RC2"
+PKG_VERSION="3.0-beta1"
 PKG_HOME_URL="http://www.nagios.org/"
-PKG_REL_DATE="11-09-2015"
+PKG_REL_DATE="04-21-2016"
 RPM_RELEASE=1
 
 LANG=C

+ 3 - 3
include/common.h

@@ -2,7 +2,7 @@
  *
  * COMMON.H - NRPE Common Include File
  * Copyright (c) 1999-2007 Ethan Galstad (nagios@nagios.org)
- * Last Modified: 11-09-2015
+ * Last Modified: 04-21-2016
  *
  * License:
  *
@@ -23,8 +23,8 @@
 
 #include "config.h"
 
-#define PROGRAM_VERSION "2.16RC2"
-#define MODIFICATION_DATE "11-09-2015"
+#define PROGRAM_VERSION "3.0-beta1"
+#define MODIFICATION_DATE "04-21-2016"
 
 #define OK							0
 #define ERROR						-1

+ 2 - 2
nrpe.spec

@@ -3,7 +3,7 @@
 
 %if %{isaix}
 	%define _prefix	/opt/nagios
-	%define _docdir %{_prefix}/doc/nrpe-2.16RC2
+	%define _docdir %{_prefix}/doc/nrpe-3.0-beta1
 	%define nshome /opt/nagios
 	%define _make gmake
 %endif
@@ -21,7 +21,7 @@
 %define _sysconfdir /etc/nagios
 
 %define name nrpe
-%define version 2.16RC2
+%define version 3.0-beta1
 %define release 1
 %define nsusr nagios
 %define nsgrp nagios

+ 1 - 1
src/check_nrpe.c

@@ -4,7 +4,7 @@
  * Copyright (c) 1999-2008 Ethan Galstad (nagios@nagios.org)
  * License: GPL
  *
- * Last Modified: 11-09-2015
+ * Last Modified: 04-21-2016
  *
  * Command line: CHECK_NRPE -H <host_address> [-p port] [-c command] [-to to_sec]
  *

+ 2 - 2
update-version

@@ -28,10 +28,10 @@ else
 fi
 
 # Current version number
-CURRENTVERSION=2.16RC2
+CURRENTVERSION=3.0-beta1
 
 # Last date
-LASTDATE=11-09-2015
+LASTDATE=04-21-2016
 
 if [ "x$1" = "x" ]
 then