Changes - j0ke.net Open Build Service

Changes of Revision 42

[-] [+]	Changed	icinga-mod_gearman.changes
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jul 19 06:11:25 UTC 2012 - cs@linux-administrator.com + +- update to release 1.3.6 + +------------------------------------------------------------------- Sun Jul 8 08:49:05 UTC 2012 - cs@linux-administrator.com - update to release 1.3.4
[-] [+]	Changed	icinga-mod_gearman.spec ^
@@ -2,7 +2,7 @@ %define monitor icinga %define pkgname mod_gearman Name: %{monitor}-%{pkgname} -Version: 1.3.4 +Version: 1.3.6 Release: 1 Group: Application/System License: GPLv3
[-] [+]	Changed	mod_gearman-1.3.6.tar.bz2/Changes ^
@@ -1,7 +1,15 @@ This file documents the revision history for mod_gearman. +1.3.6 Mon Jul 19 17:08:19 CEST 2012 + - added 'use_uniq_jobs' option + - allow gearman_top to display multiple servers (Thomas Dohl) + - fixed typo in 'timeout_return' docs + - added send_gearman.pl (Vincent Candeau) + - Bugfixes: + - removed newlines in perllib breaking build on opensuse + 1.3.4 Tue Jun 19 14:58:14 CEST 2012 - - worker: added 'timeout_result' config option to + - worker: added 'timeout_return' config option to set return code for checks running into timeout - send_gearman: make timeout configurable - send_gearman: added new mode which sends one result per line
[-] [+]	Changed	mod_gearman-1.3.6.tar.bz2/README ^
@@ -38,7 +38,7 @@ Download -------- - * Latest stable http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.3.4.tar.gz[version 1.3.4], released June 19 2012 + * Latest stable http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.3.6.tar.gz[version 1.3.6], released July 19 2012 * Mod Gearman is available for download at: http://labs.consol.de/nagios/mod-gearman * Source is available on GitHub: http://github.com/sni/mod_gearman * Older versions are available in the <<_archive,download archive>>. @@ -575,7 +575,8 @@ encryption. Anybody will be able to inject packages to your worker. Encryption is enabled by default and you have to explicitly disable it. When using encryption, you will either have to specify a shared password with `key=...` or -a keyfile with `keyfile=...` Default is On. +a keyfile with `keyfile=...`. +Default is On. + ==== encryption=yes @@ -598,6 +599,20 @@ keyfile=/path/to/secret.file ==== +use_uniq_jobs:: +Using uniq keys prevents the gearman queues from filling up when there +is no worker. However, gearmand seems to have problems with the uniq +key and sometimes jobs get stuck in the queue. Set this option to 'off' +when you run into problems with stuck jobs but make sure your worker +are running. +Default is On. + ++ +==== + use_uniq_jobs=on +==== + + Server Options ~~~~~~~~~~~~~~ @@ -862,13 +877,13 @@ ==== -timeout_result:: +timeout_return:: Defines the return code for timed out checks. Accepted return codes are 0 (Ok), 1 (Warning), 2 (Critical) and 3 (Unknown) Default: 2 + ==== - timeout_result=2 + timeout_return=2 ==== @@ -1238,6 +1253,7 @@ Archive ------- +* http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.3.6.tar.gz[version 1.3.6 - July 19 2012] * http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.3.4.tar.gz[version 1.3.4 - June 19 2012] * http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.3.2.tar.gz[version 1.3.2 - May 27 2012] * http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.3.0.tar.gz[version 1.3.0 - April 27 2012]
[-] [+]	Changed	mod_gearman-1.3.6.tar.bz2/aclocal.m4 ^
@@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, -[m4_warning([this file was generated for autoconf 2.67. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, +[m4_warning([this file was generated for autoconf 2.65. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])])
[-] [+]	Changed	mod_gearman-1.3.6.tar.bz2/common/utils.c ^
@@ -235,6 +235,7 @@ opt->debug_level = GM_LOG_INFO; opt->perfdata = GM_DISABLED; opt->perfdata_mode = GM_PERFDATA_OVERWRITE; + opt->use_uniq_jobs = GM_ENABLED; opt->do_hostchecks = GM_ENABLED; opt->hosts = GM_DISABLED; opt->services = GM_DISABLED; @@ -493,6 +494,12 @@ return(GM_OK); } + /* use_uniq_jobs */ + else if ( !strcmp( key, "use_uniq_jobs" ) ) { + opt->use_uniq_jobs = parse_yes_or_no(value, GM_ENABLED); + return(GM_OK); + } + else if ( value == NULL ) { gm_log( GM_LOG_ERROR, "unknown switch '%s'\n", key ); return(GM_OK); @@ -986,7 +993,11 @@ gm_log( GM_LOG_DEBUG, "encryption key: not set\n" ); } } + if(mode == GM_NEB_MODE) { + gm_log( GM_LOG_DEBUG, "accept clear result: %s\n", opt->accept_clear_results == GM_ENABLED ? "yes" : "no"); + } gm_log( GM_LOG_DEBUG, "transport mode: %s\n", opt->encryption == GM_ENABLED ? "aes-256+base64" : "base64 only"); + gm_log( GM_LOG_DEBUG, "use uniq jobs: %s\n", opt->use_uniq_jobs == GM_ENABLED ? "overwrite" : "append"); gm_log( GM_LOG_DEBUG, "--------------------------------\n" ); return;
[-] [+]	Changed	mod_gearman-1.3.6.tar.bz2/configure ^
@@ -1,13 +1,13 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for mod_gearman 1.3.4. +# Generated by GNU Autoconf 2.65 for mod_gearman 1.3.6. # # Report bugs to <sven.nierlein@consol.de>. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # # # This configure script is free software; the Free Software Foundation @@ -319,7 +319,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" \|\| eval "mkdir $as_dirs" - } \|\| test -d "$as_dir" \|\| as_fn_error $? "cannot create directory $as_dir" + } \|\| test -d "$as_dir" \|\| as_fn_error "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -359,19 +359,19 @@ fi # as_fn_arith -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. +# script with status $?, using 1 if that was 0. as_fn_error () { - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 fi - $as_echo "$as_me: error: $2" >&2 + $as_echo "$as_me: error: $1" >&2 as_fn_exit $as_status } # as_fn_error @@ -533,7 +533,7 @@ exec 6>&1 # Name of the host. -# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname \|\| uname -n) 2>/dev/null \| sed 1q` @@ -552,8 +552,8 @@ # Identity of this package. PACKAGE_NAME='mod_gearman' PACKAGE_TARNAME='mod_gearman' -PACKAGE_VERSION='1.3.4' -PACKAGE_STRING='mod_gearman 1.3.4' +PACKAGE_VERSION='1.3.6' +PACKAGE_STRING='mod_gearman 1.3.6' PACKAGE_BUGREPORT='sven.nierlein@consol.de' PACKAGE_URL='' @@ -777,9 +777,8 @@ fi case $ac_option in - =?) ac_optarg=`expr "X$ac_option" : '[^=]=$.$'` ;; - =) ac_optarg= ;; - ) ac_optarg=yes ;; + =) ac_optarg=`expr "X$ac_option" : '[^=]=$.$'` ;; + ) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -824,7 +823,7 @@ ac_useropt=`expr "x$ac_option" : 'x-disable-$.$'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -850,7 +849,7 @@ ac_useropt=`expr "x$ac_option" : 'x-enable-$[^=]$'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1054,7 +1053,7 @@ ac_useropt=`expr "x$ac_option" : 'x-with-$[^=]$'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1070,7 +1069,7 @@ ac_useropt=`expr "x$ac_option" : 'x-without-$.$'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1100,8 +1099,8 @@ \| --x-librar= \| --x-libra=* \| --x-libr=* \| --x-lib=* \| --x-li=* \| --x-l=) x_libraries=$ac_optarg ;; - -) as_fn_error $? "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information" + -) as_fn_error "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information." ;; =) @@ -1109,7 +1108,7 @@ # Reject names that are not valid shell variable names. case $ac_envvar in #( '' \| [0-9] \| [!_$as_cr_alnum] ) - as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + as_fn_error "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1127,13 +1126,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev \| sed 's/_/-/g'` - as_fn_error $? "missing argument to $ac_option" + as_fn_error "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; ) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1156,7 +1155,7 @@ [\\/$] \| ?:[\\/]* ) continue;; NONE \| '' ) case $ac_var in prefix ) continue;; esac;; esac - as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1170,8 +1169,8 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 + $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1186,9 +1185,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` \|\| - as_fn_error $? "working directory cannot be determined" + as_fn_error "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" \|\| - as_fn_error $? "pwd does not report name of working directory" + as_fn_error "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1227,11 +1226,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" \|\| as_fn_error $? "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" \|\| as_fn_error "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1257,7 +1256,7 @@ # 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 mod_gearman 1.3.4 to adapt to many kinds of systems. +\`configure' configures mod_gearman 1.3.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1271,7 +1270,7 @@ --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking ...' messages + -q, --quiet, --silent do not print \`checking...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1323,7 +1322,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short \| recursive ) echo "Configuration of mod_gearman 1.3.4:";; + short \| recursive ) echo "Configuration of mod_gearman 1.3.6:";; esac cat <<\_ACEOF @@ -1422,10 +1421,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -mod_gearman configure 1.3.4 -generated by GNU Autoconf 2.67 +mod_gearman configure 1.3.6 +generated by GNU Autoconf 2.65 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1533,7 +1532,7 @@ mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { + test $ac_status = 0; } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" \|\| test ! -s conftest.err }; then : @@ -1599,10 +1598,10 @@ ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval "test \"\${$3+set}\"" = set; then : + if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1638,7 +1637,7 @@ else ac_header_preproc=no fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 $as_echo "$ac_header_preproc" >&6; } @@ -1661,15 +1660,17 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## -------------------------------------- ## +( cat <<\_ASBOX +## -------------------------------------- ## ## Report this to sven.nierlein@consol.de ## -## -------------------------------------- ##" +## -------------------------------------- ## +_ASBOX ) \| sed "s/^/$as_me: WARNING: /" >&2 ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -1691,7 +1692,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1722,7 +1723,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else eval "$3=no" @@ -1821,7 +1822,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1883,8 +1884,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by mod_gearman $as_me 1.3.4, which was -generated by GNU Autoconf 2.67. Invocation command line was +It was created by mod_gearman $as_me 1.3.6, which was +generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -1994,9 +1995,11 @@ { echo - $as_echo "## ---------------- ## + cat <<\_ASBOX +## ---------------- ## ## Cache variables. ## -## ---------------- ##" +## ---------------- ## +_ASBOX echo # The following way of writing the cache mishandles newlines in values, ( @@ -2030,9 +2033,11 @@ ) echo - $as_echo "## ----------------- ## + cat <<\_ASBOX +## ----------------- ## ## Output variables. ## -## ----------------- ##" +## ----------------- ## +_ASBOX echo for ac_var in $ac_subst_vars do @@ -2045,9 +2050,11 @@ echo if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## + cat <<\_ASBOX +## ------------------- ## ## File substitutions. ## -## ------------------- ##" +## ------------------- ## +_ASBOX echo for ac_var in $ac_subst_files do @@ -2061,9 +2068,11 @@ fi if test -s confdefs.h; then - $as_echo "## ----------- ## + cat <<\_ASBOX +## ----------- ## ## confdefs.h. ## -## ----------- ##" +## ----------- ## +_ASBOX echo cat confdefs.h echo @@ -2118,12 +2127,7 @@ ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -) ac_site_file1=./$CONFIG_SITE;; - /) ac_site_file1=$CONFIG_SITE;; - ) ac_site_file1=./$CONFIG_SITE;; - esac + ac_site_file1=$CONFIG_SITE elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -2138,11 +2142,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/\| /' "$ac_site_file" >&5 - . "$ac_site_file" \ - \|\| { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5 ; } + . "$ac_site_file" fi done @@ -2218,7 +2218,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2235,22 +2235,16 @@ ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi + for ac_t in install-sh install.sh shtool; do + if test -f "$ac_dir/$ac_t"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/$ac_t -c" + break 2 + fi + done done if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2366,11 +2360,11 @@ ' case `pwd` in [\\\"\#\$\&\'\`$am_lf]) - as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; + as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; esac case $srcdir in [\\\"\#\$\&\'\`$am_lf\ \ ]) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; + as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -2392,7 +2386,7 @@ # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + as_fn_error "ls -t appears to fail. Make sure there is not a broken alias in your environment" "$LINENO" 5 fi @@ -2402,7 +2396,7 @@ # Ok. : else - as_fn_error $? "newly created file is older than distributed files! + as_fn_error "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -2640,7 +2634,7 @@ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" \| sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2648,7 +2642,7 @@ all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in @@@%%%=?=@@@%%%) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -2682,7 +2676,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2698,7 +2692,7 @@ # Define the identity of the package. PACKAGE='mod_gearman' - VERSION='1.3.4' + VERSION='1.3.6' cat >>confdefs.h <<_ACEOF @@ -2981,8 +2975,9 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "C++ compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5 ; } +{ as_fn_set_status 77 +as_fn_error "C++ compiler cannot create executables +See \`config.log' for more details." "$LINENO" 5; }; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3024,8 +3019,8 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5 ; } +as_fn_error "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3082,9 +3077,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run C++ compiled programs. +as_fn_error "cannot run C++ compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details." "$LINENO" 5; } fi fi fi @@ -3135,8 +3130,8 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5 ; } +as_fn_error "cannot compute suffix of object files: cannot compile +See \`config.log' for more details." "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -3754,8 +3749,8 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +as_fn_error "no acceptable C compiler found in \$PATH +See \`config.log' for more details." "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -4130,7 +4125,7 @@ fi set dummy $CC; ac_cc=`$as_echo "$2" \| sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then : +if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4427,7 +4422,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -4443,11 +4438,11 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -4486,7 +4481,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -4502,18 +4497,18 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5 ; } +as_fn_error "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." "$LINENO" 5; } fi ac_ext=c @@ -4574,7 +4569,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP @@ -4640,7 +4635,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -4772,7 +4767,8 @@ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" \| $as_tr_cpp` 1 _ACEOF @@ -4876,7 +4872,8 @@ do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" \| $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" \| $as_tr_cpp` 1 _ACEOF @@ -5238,13 +5235,14 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" \| $as_tr_cpp` 1 _ACEOF else - as_fn_error $? "Compiling Mod-Gearman requires standard unix headers files" "$LINENO" 5 + as_fn_error "Compiling Mod-Gearman requires standard unix headers files" "$LINENO" 5 fi done @@ -5258,7 +5256,7 @@ _ACEOF else - as_fn_error $? "Compiling Mod-Gearman requires ltdl.h" "$LINENO" 5 + as_fn_error "Compiling Mod-Gearman requires ltdl.h" "$LINENO" 5 fi done @@ -5272,7 +5270,7 @@ _ACEOF else - as_fn_error $? "Compiling Mod-Gearman requires curses.h" "$LINENO" 5 + as_fn_error "Compiling Mod-Gearman requires curses.h" "$LINENO" 5 fi done @@ -5349,7 +5347,7 @@ LIBS="-lgearman $LIBS" else - as_fn_error $? "Compiling Mod-Gearman requires libgearman. You may specify the path by --with-gearman=path..." "$LINENO" 5 + as_fn_error "Compiling Mod-Gearman requires libgearman. You may specify the path by --with-gearman=path..." "$LINENO" 5 fi @@ -5446,7 +5444,7 @@ LIBS="-lperl $LIBS" else - as_fn_error $? "Compiling Mod-Gearman with embedded Perl requires libperl." "$LINENO" 5 + as_fn_error "Compiling Mod-Gearman with embedded Perl requires libperl." "$LINENO" 5 fi # save libs, as we do not want to add -lperl to all LIBS @@ -5459,7 +5457,7 @@ echo "creating common/perlxsi.c" perl -MExtUtils::Embed -e xsinit -- -o common/perlxsi.c echo "Embedded Perl interpreter will be compiled in..." - PERLLIBS="`perl -MExtUtils::Embed -e ccopts -e ldopts`" + PERLLIBS="`perl -MExtUtils::Embed -e ccopts -e ldopts \| tr -d '\n'`" fi @@ -5479,7 +5477,8 @@ do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" \| $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" \| $as_tr_cpp` 1 _ACEOF @@ -5615,7 +5614,6 @@ ac_libobjs= ac_ltlibobjs= -U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -5639,23 +5637,23 @@ fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error $? "conditional \"AMDEP\" was never defined. + as_fn_error "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. + as_fn_error "conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error $? "conditional \"am__fastdepCC\" was never defined. + as_fn_error "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${USEPERL_TRUE}" && test -z "${USEPERL_FALSE}"; then - as_fn_error $? "conditional \"USEPERL\" was never defined. + as_fn_error "conditional \"USEPERL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${USEBSD_TRUE}" && test -z "${USEBSD_FALSE}"; then - as_fn_error $? "conditional \"USEBSD\" was never defined. + as_fn_error "conditional \"USEBSD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -5805,19 +5803,19 @@ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. +# script with status $?, using 1 if that was 0. as_fn_error () { - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 fi - $as_echo "$as_me: error: $2" >&2 + $as_echo "$as_me: error: $1" >&2 as_fn_exit $as_status } # as_fn_error @@ -6013,7 +6011,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" \|\| eval "mkdir $as_dirs" - } \|\| test -d "$as_dir" \|\| as_fn_error $? "cannot create directory $as_dir" + } \|\| test -d "$as_dir" \|\| as_fn_error "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -6066,8 +6064,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by mod_gearman $as_me 1.3.4, which was -generated by GNU Autoconf 2.67. Invocation command line was +This file was extended by mod_gearman $as_me 1.3.6, which was +generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -6132,11 +6130,11 @@ cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -mod_gearman config.status 1.3.4 -configured by $0, generated by GNU Autoconf 2.67, +mod_gearman config.status 1.3.6 +configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -6154,16 +6152,11 @@ while test $# != 0 do case $1 in - --=?) + --=) ac_option=`expr "X$1" : 'X$[^=]$='` ac_optarg=`expr "X$1" : 'X[^=]=$.$'` ac_shift=: ;; - --=) - ac_option=`expr "X$1" : 'X$[^=]$='` - ac_optarg= - ac_shift=: - ;; ) ac_option=$1 ac_optarg=$2 @@ -6185,7 +6178,6 @@ $ac_shift case $ac_optarg in \') ac_optarg=`$as_echo "$ac_optarg" \| sed "s/'/'\\\\\\\\''/g"` ;; - '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -6198,7 +6190,7 @@ ac_need_defaults=false;; --he \| --h) # Conflict between --help and --header - as_fn_error $? "ambiguous option: \`$1' + as_fn_error "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help \| --hel \| -h ) $as_echo "$ac_cs_usage"; exit ;; @@ -6207,7 +6199,7 @@ ac_cs_silent=: ;; # This is an error. - -) as_fn_error $? "unrecognized option: \`$1' + -) as_fn_error "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; ) as_fn_append ac_config_targets " $1" @@ -6265,7 +6257,7 @@ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - ) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + ) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -6303,7 +6295,7 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} \|\| as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +} \|\| as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -6320,7 +6312,7 @@ fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\\r' + ac_cs_awk_cr='\r' else ac_cs_awk_cr=$ac_cr fi @@ -6334,18 +6326,18 @@ echo "$ac_subst_vars" \| sed 's/./&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh \|\| - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" \| grep -c '^'` + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" \| grep -c '$'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh \|\| - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.$ac_delim\$/X/p" conf$$subs.awk \| grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -6434,28 +6426,20 @@ else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - \|\| as_fn_error $? "could not setup config files machinery" "$LINENO" 5 + \|\| as_fn_error "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove sole $(srcdir), -# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]VPATH[ ]=[ ]/{ -h -s/// -s/^/:/ -s/[ ]$/:/ -s/:\$(srcdir):/:/g -s/:\${srcdir}:/:/g -s/:@srcdir@:/:/g -s/^:// + ac_vpsub='/^[ ]VPATH[ ]=/{ +s/:\$(srcdir):/:/ +s/:\${srcdir}:/:/ +s/:@srcdir@:/:/ +s/^$[^=]=[ ]$:/\1/ s/:$// -x -s/$=[ ]$./\1/ -G -s/\n// s/^[^=]=[ ]$// }' fi @@ -6483,7 +6467,7 @@ if test -z "$ac_t"; then break elif $ac_last_try; then - as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -6568,7 +6552,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF \|\| ac_write_fail=1 - as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 + as_fn_error "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -6581,7 +6565,7 @@ esac case $ac_mode$ac_tag in :[FHL]:);; - :L* \| :C:) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :L* \| :C:) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -6609,7 +6593,7 @@ [\\/$]) false;; ) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac \|\| - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in \') ac_f=`$as_echo "$ac_f" \| sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -6636,7 +6620,7 @@ case $ac_tag in :-:* \| :-) cat >"$tmp/stdin" \ - \|\| as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + \|\| as_fn_error "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -6773,22 +6757,22 @@ $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" \| $AWK -f "$tmp/subs.awk" >$tmp/out \ - \|\| as_fn_error $? "could not create $ac_file" "$LINENO" 5 + \|\| as_fn_error "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]datarootdir[ ]:=/p' "$tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&5 +which seems to be undefined. Please make sure it is defined." >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&2;} +which seems to be undefined. Please make sure it is defined." >&2;} rm -f "$tmp/stdin" case $ac_file in -) cat "$tmp/out" && rm -f "$tmp/out";; ) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - \|\| as_fn_error $? "could not create $ac_file" "$LINENO" 5 + \|\| as_fn_error "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -6799,19 +6783,19 @@ $as_echo "/ $configure_input /" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ - \|\| as_fn_error $? "could not create $ac_file" "$LINENO" 5 + \|\| as_fn_error "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$tmp/config.h" "$ac_file" \ - \|\| as_fn_error $? "could not create $ac_file" "$LINENO" 5 + \|\| as_fn_error "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/ $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - \|\| as_fn_error $? "could not create -" "$LINENO" 5 + \|\| as_fn_error "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -6961,7 +6945,7 @@ ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 \|\| - as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -6982,7 +6966,7 @@ exec 5>>config.log # Use \|\|, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success \|\| as_fn_exit 1 + $ac_cs_success \|\| as_fn_exit $? fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
[-] [+]	Changed	mod_gearman-1.3.6.tar.bz2/configure.ac ^
@@ -4,7 +4,7 @@ ############################################## # autoconf really does not work with 2.59 or older AC_PREREQ([2.60]) -AC_INIT([mod_gearman], [1.3.4], [sven.nierlein@consol.de]) +AC_INIT([mod_gearman], [1.3.6], [sven.nierlein@consol.de]) AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) AC_CONFIG_SRCDIR([neb_module/mod_gearman.c],[worker/worker.c],[tools/send_gearman.c],[tools/check_gearman.c],[tools/gearman_top.c]) AC_CONFIG_HEADER([config.h]) @@ -100,7 +100,7 @@ echo "creating common/perlxsi.c" perl -MExtUtils::Embed -e xsinit -- -o common/perlxsi.c echo "Embedded Perl interpreter will be compiled in..." - PERLLIBS="`perl -MExtUtils::Embed -e ccopts -e ldopts`" + PERLLIBS="`perl -MExtUtils::Embed -e ccopts -e ldopts \| tr -d '\n'`" AC_SUBST(PERLLIBS) fi
[-] [+]	Changed	mod_gearman-1.3.6.tar.bz2/contrib/README ^
@@ -16,3 +16,15 @@ Instead of the Worker polling from the master gearmand, it can now poll the jobs from a local jobserver which gets fed by the Gearman-Proxy. + +Written by: Sven Nierlein + + + +send_gearman.pl +--------------- +send_gearman.pl is a perl implementation of the send_gearman tool. You +can use it to compile a windows binary and use that to send in results +from windows platforms. + +Written by: Vincent Candeau
[-] [+]	Added	mod_gearman-1.3.6.tar.bz2/contrib/send_gearman.pl ^
@@ -0,0 +1,102 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use Nagios::Passive; +use Nagios::Passive::Gearman; +use Getopt::Long; + +################### +# Vincent CANDEAU # +# Capensis - v1.0 # +################### + +### Manage CLI options +my($server, $encryption, $key, $host, $service, $message, $returncode, $debug, $help); +my $params = GetOptions( + "server=s" => \$server, # Serveur Addresse IP:PORT + "e\|encryption" => \$encryption, # Enable Encryption + "k\|key=s" => \$key, # Encryption key + "h\|host=s" => \$host, # HostName + "s\|service=s" => \$service, # Service Name + "m\|message=s" => \$message, # Output + "r\|returncode=i" => \$returncode, # Return Code + "d\|debug" => \$debug, # Debug + "help" => \$help # Display help + ); + +### HELP +sub help { + print("help:\n"); + print("usage : $0 [ --server <IP:PORT> ] [ -e / --encryption [ -k / --key <Key passphrase> ] ] [ -h / --host <hostname> ] [ -s / --service service name> ] [ -m / --message \"<output>\" ][ -r / --returncode <Code(0,1,2,3)> ] [ -d / --debug ] [ --help ]\n"); + print("\tserver\t\tServer IP:PORT (Default: IP: 127.0.0.1 / PORT: 4730)\n"); + print("\tencryption\tEnable / Disable Encryption\n"); + print("\tkey\t\tEncryption passphrase\n"); + print("\thost\t\tHost Name\n"); + print("\tservice\t\tService Name\n"); + print("\tmessage\t\tOutput message\n"); + print("\treturncode\tReturn Code\n"); + print("\tdebug\t\tEnable / Disable debug\n"); + print("\thelp\t\tDisplay this message\n"); +} + +### MAIN +if( not $params ) { + exit(1); +} +elsif ( defined($help) ) { + &help(); + exit(0); +} +elsif ( !defined($host) \|\| !defined($service) \|\| !defined($message) \|\| !defined($returncode) \|\| ( defined($encryption) && ( !defined($key) ) ) ) { + &help(); +} +else { + if( !defined($server) ) { + $server = "127.0.0.1:4730"; + } + else { + if( not $server =~ /:/ ) { + $server = $server . ":4730"; + } + } + + if( defined($debug) ) { + print "Server: " . $server . "\n"; + print "Encryption: " .(defined $encryption ? 'on' : 'off'). "\n"; + print "Key: " . $key . "\n" if defined $encryption; + print "Host: " . $host . "\n"; + + print "Service: " . $service . "\n"; + print "Message: " . $message . "\n"; + print "Code: " . $returncode . "\n"; + } + + my $gearman = Gearman::Client->new; + $gearman->job_servers($server); + + my $nw; + if( !defined($key) ) { + $nw = Nagios::Passive->create( + gearman => $gearman, + service_description => $service, + check_name => $service, + host_name => $host, + return_code => $returncode, + output => $message + ); + } + else { + $nw = Nagios::Passive->create( + gearman => $gearman, + key => $key, + service_description => $service, + check_name => $service, + host_name => $host, + return_code => $returncode, + output => $message + ); + } + my $job = $nw->submit; + print "submitted job: ".$job."\n" if defined $debug; +}
[-] [+]	Changed	mod_gearman-1.3.6.tar.bz2/docs/QUICKSTART ^
@@ -54,9 +54,9 @@ -------------------------------------- #> cd /tmp -#> wget "http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.3.4.tar.gz" -#> tar zxf mod_gearman-1.3.4.tar.gz -#> cd mod_gearman-1.3.4 +#> wget "http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.3.6.tar.gz" +#> tar zxf mod_gearman-1.3.6.tar.gz +#> cd mod_gearman-1.3.6 #> ./configure --prefix=/opt --with-gearman=/opt --with-user=nagios --with-init-dir=/etc/init.d #> make #> make install @@ -120,7 +120,7 @@ -------------------------------------- #> grep mod_gearman /var/log/nagios3/nagios.log -[1295003042] mod_gearman: Version 1.3.4 +[1295003042] mod_gearman: Version 1.3.6 [1295003042] Event broker module '/opt/lib/mod_gearman/mod_gearman.o' initialized successfully. -------------------------------------- @@ -154,7 +154,7 @@ -------------------------------------- #> /opt/bin/check_gearman -H localhost -q worker_`hostname` -t 10 -s check -check_gearman OK - debian64 has 1 worker and is working on 0 jobs. Version: 1.3.4\|worker=1 jobs=2c +check_gearman OK - debian64 has 1 worker and is working on 0 jobs. Version: 1.3.6\|worker=1 jobs=2c -------------------------------------- The interesting number is the last one, '2c' in our case, which means there
[-] [+]	Changed	mod_gearman-1.3.6.tar.bz2/docs/QUICKSTART.html ^
@@ -614,9 +614,9 @@ <div class="listingblock"> <div class="content"> <pre><tt>#> cd /tmp -#> wget "http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.3.4.tar.gz" -#> tar zxf mod_gearman-1.3.4.tar.gz -#> cd mod_gearman-1.3.4 +#> wget "http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.3.6.tar.gz" +#> tar zxf mod_gearman-1.3.6.tar.gz +#> cd mod_gearman-1.3.6 #> ./configure --prefix=/opt --with-gearman=/opt --with-user=nagios --with-init-dir=/etc/init.d #> make #> make install @@ -674,7 +674,7 @@ <div class="listingblock"> <div class="content"> <pre><tt>#> grep mod_gearman /var/log/nagios3/nagios.log -[1295003042] mod_gearman: Version 1.3.4 +[1295003042] mod_gearman: Version 1.3.6 [1295003042] Event broker module '/opt/lib/mod_gearman/mod_gearman.o' initialized successfully.</tt></pre> </div></div> </div> @@ -701,7 +701,7 @@ <div class="listingblock"> <div class="content"> <pre><tt>#> /opt/bin/check_gearman -H localhost -q worker_`hostname` -t 10 -s check -check_gearman OK - debian64 has 1 worker and is working on 0 jobs. Version: 1.3.4\|worker=1 jobs=2c</tt></pre> +check_gearman OK - debian64 has 1 worker and is working on 0 jobs. Version: 1.3.6\|worker=1 jobs=2c</tt></pre> </div></div> <div class="paragraph"><p>The interesting number is the last one, <em>2c</em> in our case, which means there have been already 2 jobs executed by this worker.</p></div> @@ -741,7 +741,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2012-06-19 14:58:18 CEST +Last updated 2012-07-16 21:07:23 CEST </div> </div> </body>
[-] [+]	Changed	mod_gearman-1.3.6.tar.bz2/docs/README.html ^
@@ -640,7 +640,7 @@ <div class="ulist"><ul> <li> <p> -Latest stable <a href="http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.3.4.tar.gz">version 1.3.4</a>, released June 19 2012 +Latest stable <a href="http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.3.6.tar.gz">version 1.3.6</a>, released July 19 2012 </p> </li> <li> @@ -1369,7 +1369,8 @@ encryption. Anybody will be able to inject packages to your worker. Encryption is enabled by default and you have to explicitly disable it. When using encryption, you will either have to specify a shared password with <tt>key=...</tt> or -a keyfile with <tt>keyfile=...</tt> Default is On. +a keyfile with <tt>keyfile=...</tt>. +Default is On. </p> <div class="exampleblock"> <div class="exampleblock-content"> @@ -1412,7 +1413,28 @@ </div></div> </div></div> </dd> +<dt class="hdlist1"> +use_uniq_jobs +</dt> +<dd> +<p> +Using uniq keys prevents the gearman queues from filling up when there +is no worker. However, gearmand seems to have problems with the uniq +key and sometimes jobs get stuck in the queue. Set this option to <em>off</em> +when you run into problems with stuck jobs but make sure your worker +are running. +Default is On. +</p> +</dd> </dl></div> +<div class="paragraph"><p>+</p></div> +<div class="exampleblock"> +<div class="exampleblock-content"> +<div class="literalblock"> +<div class="content"> +<pre><tt>use_uniq_jobs=on</tt></pre> +</div></div> +</div></div> <h3 id="_server_options">Server Options</h3><div style="clear:left"></div> <div class="paragraph"><p>Additional options for the NEB module only:</p></div> <div class="dlist"><dl> @@ -1849,7 +1871,7 @@ </div></div> </dd> <dt class="hdlist1"> -timeout_result +timeout_return </dt> <dd> <p> @@ -1861,7 +1883,7 @@ <div class="exampleblock-content"> <div class="literalblock"> <div class="content"> -<pre><tt>timeout_result=2</tt></pre> +<pre><tt>timeout_return=2</tt></pre> </div></div> </div></div> </dd> @@ -2354,6 +2376,11 @@ <div class="ulist"><ul> <li> <p> +<a href="http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.3.6.tar.gz">version 1.3.6 - July 19 2012</a> +</p> +</li> +<li> +<p> <a href="http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.3.4.tar.gz">version 1.3.4 - June 19 2012</a> </p> </li> @@ -2493,7 +2520,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2012-06-19 16:40:11 CEST +Last updated 2012-07-16 21:07:23 CEST </div> </div> </body>
[-] [+]	Changed	mod_gearman-1.3.6.tar.bz2/etc/mod_gearman_neb.conf.in ^
@@ -89,6 +89,16 @@ #keyfile=/path/to/secret.file +# use_uniq_jobs +# Using uniq keys prevents the gearman queues from filling up when there +# is no worker. However, gearmand seems to have problems with the uniq +# key and sometimes jobs get stuck in the queue. Set this option to 'off' +# when you run into problems with stuck jobs but make sure your worker +# are running. +use_uniq_jobs=on + + + ############################################################################### # # NEB Module Config
[-] [+]	Changed	mod_gearman-1.3.6.tar.bz2/extras/gearmand-init ^
@@ -12,7 +12,7 @@ ### END INIT INFO NAME=gearmand -DAEMON="/opt/gearman/sbin/gearmand" +DAEMON="/opt/projects/gearmand/current/gearmand/gearmand" OPTIONS="-d -j 0" PORT=4730 LISTEN=0.0.0.0
[-] [+]	Changed	mod_gearman-1.3.6.tar.bz2/extras/shared.conf ^
@@ -97,6 +97,16 @@ #keyfile=/path/to/secret.file +# use_uniq_jobs +# Using uniq keys prevents the gearman queues from filling up when there +# is no worker. However, gearmand seems to have problems with the uniq +# key and sometimes jobs get stuck in the queue. Set this option to 'off' +# when you run into problems with stuck jobs but make sure your worker +# are running. +use_uniq_jobs=on + + + ############################################################################### # # NEB Module Config
[-] [+]	Changed	mod_gearman-1.3.6.tar.bz2/extras/standalone_worker.conf ^
@@ -136,9 +136,9 @@ # Default: yes show_error_output=yes -# timeout_result defines the return code for timed out checks. Accepted return +# timeout_return defines the return code for timed out checks. Accepted return # codes are 0 (Ok), 1 (Warning), 2 (Critical) and 3 (Unknown) Default: 2 -timeout_result=2 +timeout_return=2 # Use dup_results_are_passive to set if the duplicate result send to the dupserver # will be passive or active.
[-] [+]	Changed	mod_gearman-1.3.6.tar.bz2/include/common.h ^
@@ -54,7 +54,7 @@ #define MOD_GM_COMMON_H /* constants / -#define GM_VERSION "1.3.4" +#define GM_VERSION "1.3.6" #define GM_ENABLED 1 #define GM_DISABLED 0 #define GM_BUFFERSIZE 98304 @@ -193,6 +193,7 @@ int logmode; /< logmode: auto, syslog, file or nagios / char * logfile; /*< path for the logfile / FILE * logfile_fp; /*< filedescriptor for the logfile / + int use_uniq_jobs; /*< flag whether normal jobs will be sent with/without uniq set / /* neb module / char result_queue; /*< name of the result queue used by the neb module / int result_workers; /*< number of result worker threads started /
[-] [+]	Changed	mod_gearman-1.3.6.tar.bz2/neb_module/mod_gearman.c ^
@@ -606,7 +606,7 @@ if(add_job_to_queue( &client, mod_gm_opt->server_list, target_queue, - hst->name, + (mod_gm_opt->use_uniq_jobs == GM_ENABLED ? hst->name : NULL), temp_buffer, GM_JOB_PRIO_NORMAL, GM_DEFAULT_JOB_RETRIES, @@ -783,7 +783,7 @@ if(add_job_to_queue( &client, mod_gm_opt->server_list, target_queue, - uniq, + (mod_gm_opt->use_uniq_jobs == GM_ENABLED ? uniq : NULL), temp_buffer, prio, GM_DEFAULT_JOB_RETRIES,
[-] [+]	Changed	mod_gearman-1.3.6.tar.bz2/support/mod_gearman.spec ^
@@ -1,5 +1,5 @@ Name: mod_gearman -Version: 1.3.4 +Version: 1.3.6 Release: 1%{?dist} License: GNU Public License version 2 Packager: Sven Nierlein <sven.nierlein@consol.de>
[-] [+]	Changed	mod_gearman-1.3.6.tar.bz2/tools/gearman_top.c ^
@@ -39,6 +39,7 @@ /* work starts here / int main (int argc, char argv) { int opt; + int i; mod_gm_opt = malloc(sizeof(mod_gm_opt_t)); set_default_options(mod_gm_opt); @@ -81,11 +82,15 @@ if(opt_batch == GM_ENABLED) { if(opt_interval > 0) { while(1) { - print_stats(server_list[0]); + for(i=0;i<server_list_num;i++) { + print_stats(server_list[i]); + } usleep(opt_interval); } } else { - print_stats(server_list[0]); + for(i=0;i<server_list_num;i++) { + print_stats(server_list[i]); + } } clean_exit(0); } @@ -103,7 +108,11 @@ while(1) { if(getch() == 'q') clean_exit(0); - print_stats(server_list[0]); + if(opt_batch == GM_DISABLED) + erase(); / clear screen / + for(i=0;i<server_list_num;i++) { + print_stats(server_list[i]); + } usleep(opt_interval); } @@ -182,9 +191,6 @@ now = (localtime(&t)); strftime(cur_time, sizeof(cur_time), "%Y-%m-%d %H:%M:%S", &now ); - if(opt_batch == GM_DISABLED) { - erase(); /* clear screen */ - } my_printf("%s - %s:%i ", cur_time, server, port ); if(version != NULL && strcmp(version, "") != 0) my_printf(" - v%s", version );