Hello community, here is the log from the commit of package cfengine for openSUSE:Factory checked in at Tue Oct 11 16:51:41 CEST 2011. -------- --- openSUSE:Factory/cfengine/cfengine.changes 2011-10-06 17:21:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/cfengine/cfengine.changes 2011-10-11 12:54:42.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Oct 11 09:24:22 UTC 2011 - chris@computersalat.de + +- update to 3.2.1 + * ATM no "uptodate" ChangeLog available :( + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- cfengine-3.2.0.tar.gz New: ---- cfengine-3.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cfengine.spec ++++++ --- /var/tmp/diff_new_pack.cnFvF6/_old 2011-10-11 16:51:36.000000000 +0200 +++ /var/tmp/diff_new_pack.cnFvF6/_new 2011-10-11 16:51:36.000000000 +0200 @@ -22,7 +22,7 @@ %define libsoname %{libname}1 Summary: A Tool to Maintain Complicated Networks -Version: 3.2.0 +Version: 3.2.1 Release: 1 License: GPLv2+ Group: Productivity/Networking/System ++++++ cfengine-3.2.0.tar.gz -> cfengine-3.2.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/ChangeLog new/cfengine-3.2.1/ChangeLog --- old/cfengine-3.2.0/ChangeLog 2011-08-22 08:53:28.000000000 +0200 +++ new/cfengine-3.2.1/ChangeLog 2011-09-19 11:46:59.000000000 +0200 @@ -1,9 +1,8 @@ -3.2.0 (in development) +3.2.0 New bootstrap method with single-command bootstrapping: - cf-agent --bootstrap --policy-server 123.456.789.123 - Associated policy template files are added, partially maintained by CFEngine - - See <FIXME> for upgrade procedure Bug fixes for file-editing, package versioning, and embedded database corruption (We recommend using TokyoCabinet instead of @@ -28,8 +27,6 @@ New Emacs mode for CFEngine policy files (thanks to Ted Zlatanov!) - After beta 1: - Warnings are on edit_line changes can now give greater degree of information without spamming promise logs @@ -38,8 +35,6 @@ Invalidation of package list cache on installation/removal of packages. - After beta 2: - New option cf-key -r to remove host key by IP or hostname. Added detection of network interfaces which belong to BSD jails. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/README new/cfengine-3.2.1/README --- old/cfengine-3.2.0/README 2011-08-22 08:53:28.000000000 +0200 +++ new/cfengine-3.2.1/README 2011-09-19 11:46:59.000000000 +0200 @@ -8,4 +8,3 @@ supporting an existing cfengine 2 base. Please see the INSTALL file for build instructions. - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/configure new/cfengine-3.2.1/configure --- old/cfengine-3.2.0/configure 2011-08-22 09:23:49.000000000 +0200 +++ new/cfengine-3.2.1/configure 2011-09-19 12:17:01.000000000 +0200 @@ -800,6 +800,8 @@ POSTGRESQL_CFLAGS POSTGRESQL_CPPFLAGS POSTGRESQL_PATH +CROSS_COMPILING_FALSE +CROSS_COMPILING_TRUE GETCONF GETLOADAVG_LIBS KMEM_GROUP @@ -850,8 +852,6 @@ LDFLAGS CFLAGS CC -CROSS_COMPILING_FALSE -CROSS_COMPILING_TRUE AM_BACKSLASH AM_DEFAULT_VERBOSITY MAINT @@ -3156,7 +3156,7 @@ # Define the identity of the package. PACKAGE=cfengine - VERSION=3.2.0 + VERSION=3.2.1 cat >>confdefs.h <<_ACEOF @@ -3242,35 +3242,10 @@ - if test "x$cross_compiling" = "xyes"; then - CROSS_COMPILING_TRUE= - CROSS_COMPILING_FALSE='#' -else - CROSS_COMPILING_TRUE='#' - CROSS_COMPILING_FALSE= -fi - -# -# Add to the default list of places in CPPFLAGS to match LDFLAGS above -# Don't add if cross-compiling (setting host), to avoid using native libs. -# -if test "x$cross_compiling" = "xno"; then - for x in /usr/local/include /usr/local/gnu/include /opt/dce/include /sw/include /usr/pkg/include /usr/X11R7/include - do - if test -d "$x"; then - y=`expr " $CPPFLAGS " : ".* -I$x "` - if test $y -eq 0; then - CPPFLAGS="$CPPFLAGS -I$x" - fi - fi - done -fi - - DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -4319,7 +4294,7 @@ # which indicates that we try without any flags at all, and "pthread-config" # which is a program returning the flags for the Pth emulation library. -acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" +acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config pthreadGC2" # The ordering *is* (sometimes) important. Some notes on the # individual items follow: @@ -4600,9 +4575,7 @@ CC="$PTHREAD_CC" CFLAGS="$PTHREAD_CFLAGS $CFLAGS" -CPPFLAGS="$PTHREAD_CFLAGS $CPPFLAGS" -LDFLAGS="$PTHREAD_LDFLAGS $LDFLAGS" - +LIBS="$PTHREAD_LIBS $LIBS" ac_ext=c @@ -5884,13 +5857,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo ""$as_me:5887: $ac_compile"" >&5) + (eval echo ""$as_me:5860: $ac_compile"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo ""$as_me:5890: $NM \"conftest.$ac_objext\""" >&5) + (eval echo ""$as_me:5863: $NM \"conftest.$ac_objext\""" >&5) (eval "$NM "conftest.$ac_objext"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo ""$as_me:5893: output"" >&5) + (eval echo ""$as_me:5866: output"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7095,7 +7068,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7098 "configure"' > conftest.$ac_ext + echo '#line 7071 "configure"' > conftest.$ac_ext if { { eval echo ""$as_me":${as_lineno-$LINENO}: "$ac_compile""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8623,11 +8596,11 @@ -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo ""$as_me:8626: $lt_compile"" >&5) + (eval echo ""$as_me:8599: $lt_compile"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8630: $? = $ac_status" >&5 + echo "$as_me:8603: $? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8962,11 +8935,11 @@ -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo ""$as_me:8965: $lt_compile"" >&5) + (eval echo ""$as_me:8938: $lt_compile"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8969: $? = $ac_status" >&5 + echo "$as_me:8942: $? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9067,11 +9040,11 @@ -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo ""$as_me:9070: $lt_compile"" >&5) + (eval echo ""$as_me:9043: $lt_compile"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9074: $? = $ac_status" >&5 + echo "$as_me:9047: $? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9122,11 +9095,11 @@ -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo ""$as_me:9125: $lt_compile"" >&5) + (eval echo ""$as_me:9098: $lt_compile"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9129: $? = $ac_status" >&5 + echo "$as_me:9102: $? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11506,7 +11479,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11509 "configure" +#line 11482 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11602,7 +11575,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11605 "configure" +#line 11578 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12570,6 +12543,31 @@ + if test "x$cross_compiling" = "xyes"; then + CROSS_COMPILING_TRUE= + CROSS_COMPILING_FALSE='#' +else + CROSS_COMPILING_TRUE='#' + CROSS_COMPILING_FALSE= +fi + + +# +# Add to the default list of places in CPPFLAGS to match LDFLAGS above +# Don't add if cross-compiling (setting host), to avoid using native libs. +# +if test "x$cross_compiling" = "xno"; then + for x in /usr/local/include /usr/local/gnu/include /opt/dce/include /sw/include /usr/pkg/include /usr/X11R7/include + do + if test -d "$x"; then + y=`expr " $CPPFLAGS " : ".* -I$x "` + if test $y -eq 0; then + CPPFLAGS="$CPPFLAGS -I$x" + fi + fi + done +fi + # Check whether --with-diagnostics was given. @@ -15165,6 +15163,33 @@ done +ac_fn_c_check_decl "$LINENO" "round" "ac_cv_have_decl_round" "#include <math.h> +" +if test "x$ac_cv_have_decl_round" = x""yes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_ROUND $ac_have_decl +_ACEOF + +ac_fn_c_check_func "$LINENO" "round" "ac_cv_func_round" +if test "x$ac_cv_func_round" = x""yes; then : + $as_echo "#define HAVE_ROUND 1" >>confdefs.h + +else + case " $LIBOBJS " in + *" round.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS round.$ac_objext" + ;; +esac + +fi + + + for ac_func in getcwd getnetgrent waitpid seteuid setegid setreuid setregid do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -15301,7 +15326,7 @@ fi rm -f conftest* - if test x$DIRFD_MACRO_FOUND != x; then + if test x$DIRFD_MACRO_FOUND = x; then case " $LIBOBJS " in *" dirfd.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS dirfd.$ac_objext" @@ -15765,6 +15790,18 @@ fi +# +# Temporarily force C macros to enable threading in CFEngine if pthreads were +# found by ACX_PTHREAD, and errorneously disabled by another pthread-related +# checks. +# +if test "x$acx_pthread_ok" = "xyes"; then + $as_echo "#define HAVE_PTHREAD_H 1" >>confdefs.h + + $as_echo "#define HAVE_LIBPTHREAD 1" >>confdefs.h + +fi + ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_len" "ac_cv_member_struct_sockaddr_sa_len" " #include <sys/types.h> @@ -15924,6 +15961,7 @@ ;; hpux*|hp-ux*) + $as_echo "#define HPuUX /**/" >>confdefs.h if test "$GCC" != "yes"; then @@ -16466,9 +16504,31 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HP-UX aC" >&5 +$as_echo_n "checking for HP-UX aC... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#if defined __HP_cc +#This is HP-UX ANSI C +#endif + +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +CFLAGS="$CFLAGS -Agcc" +CPPFLAGS="$CPPFLAGS -Agcc" +HP_UX_AC=yes +fi +rm -f conftest.err conftest.i conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC specific compile flags" >&5 $as_echo_n "checking for GCC specific compile flags... " >&6; } -if test x"$GCC" = "xyes"; then +if test x"$GCC" = "xyes" && test x"$HP_UX_AC" != x"yes"; then GCC_CFLAG="-g -Wreturn-type -Wmissing-prototypes" @@ -16733,10 +16793,6 @@ as_fn_error $? "conditional "MAINTAINER_MODE" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${CROSS_COMPILING_TRUE}" && test -z "${CROSS_COMPILING_FALSE}"; then - as_fn_error $? "conditional "CROSS_COMPILING" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then as_fn_error $? "conditional "AMDEP" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -16749,6 +16805,10 @@ as_fn_error $? "conditional "am__fastdepCC" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${CROSS_COMPILING_TRUE}" && test -z "${CROSS_COMPILING_FALSE}"; then + as_fn_error $? "conditional "CROSS_COMPILING" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${HAVE_NOVA_TRUE}" && test -z "${HAVE_NOVA_FALSE}"; then as_fn_error $? "conditional "HAVE_NOVA" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/configure.ac new/cfengine-3.2.1/configure.ac --- old/cfengine-3.2.0/configure.ac 2011-08-22 09:16:30.000000000 +0200 +++ new/cfengine-3.2.1/configure.ac 2011-09-19 11:46:59.000000000 +0200 @@ -21,7 +21,7 @@ dnl 'svnversion' need to be removed before release and added back after. dnl -AM_INIT_AUTOMAKE(cfengine, 3.2.0) dnl remember to set version +AM_INIT_AUTOMAKE(cfengine, 3.2.1) dnl remember to set version AM_MAINTAINER_MODE([enable]) AC_DEFINE(BUILD_YEAR, esyscmd([date +%Y | tr -d '\n']), "Software build year") @@ -34,8 +34,6 @@ AC_CONFIG_MACRO_DIR([m4]) -AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = "xyes") - dnl dnl hide [s]include macros, so old aclocal (automake < 1.10) won't find them and dnl won't complain about something/something.m4 not found @@ -43,22 +41,6 @@ m4_define(incstart,sinc) m4_define(incend,lude) -# -# Add to the default list of places in CPPFLAGS to match LDFLAGS above -# Don't add if cross-compiling (setting host), to avoid using native libs. -# -if test "x$cross_compiling" = "xno"; then - for x in /usr/local/include /usr/local/gnu/include /opt/dce/include /sw/include /usr/pkg/include /usr/X11R7/include - do - if test -d "$x"; then - y=`expr " $CPPFLAGS " : ".* -I$x "` - if test $y -eq 0; then - CPPFLAGS="$CPPFLAGS -I$x" - fi - fi - done -fi - dnl ###################################################################### dnl Use pthreads if available dnl ###################################################################### @@ -67,9 +49,7 @@ CC="$PTHREAD_CC" CFLAGS="$PTHREAD_CFLAGS $CFLAGS" -CPPFLAGS="$PTHREAD_CFLAGS $CPPFLAGS" -LDFLAGS="$PTHREAD_LDFLAGS $LDFLAGS" - +LIBS="$PTHREAD_LIBS $LIBS" dnl ###################################################################### dnl Checks for programs. @@ -91,6 +71,24 @@ AC_FUNC_GETLOADAVG AC_PATH_PROG(GETCONF, getconf, false, $PATH:$prefix/bin:/usr/bin:/usr/local/bin:/sw/bin) +AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = "xyes") + +# +# Add to the default list of places in CPPFLAGS to match LDFLAGS above +# Don't add if cross-compiling (setting host), to avoid using native libs. +# +if test "x$cross_compiling" = "xno"; then + for x in /usr/local/include /usr/local/gnu/include /opt/dce/include /sw/include /usr/pkg/include /usr/X11R7/include + do + if test -d "$x"; then + y=`expr " $CPPFLAGS " : ".* -I$x "` + if test $y -eq 0; then + CPPFLAGS="$CPPFLAGS -I$x" + fi + fi + done +fi + dnl ###################################################################### dnl Checks for libraries. dnl ###################################################################### @@ -511,6 +509,9 @@ AC_CHECK_DECLS(realpath) AC_CHECK_FUNCS(realpath) +AC_CHECK_DECLS(round, [], [], [[#include <math.h>]]) +AC_REPLACE_FUNCS(round) + AC_CHECK_FUNCS(getcwd getnetgrent waitpid seteuid setegid setreuid setregid) AC_CHECK_FUNCS(uname gethostname chflags) AC_CHECK_FUNCS(strstr strsep putenv drand48 srand48 getaddrinfo) @@ -541,7 +542,7 @@ [AC_MSG_RESULT(yes) DIRFD_MACRO_FOUND=1], [AC_MSG_RESULT(no)]) - if test x$DIRFD_MACRO_FOUND != x; then + if test x$DIRFD_MACRO_FOUND = x; then AC_LIBOBJ([dirfd]) fi]) @@ -571,6 +572,16 @@ AC_CHECK_HEADERS(sched.h) fi +# +# Temporarily force C macros to enable threading in CFEngine if pthreads were +# found by ACX_PTHREAD, and errorneously disabled by another pthread-related +# checks. +# +if test "x$acx_pthread_ok" = "xyes"; then + AC_DEFINE(HAVE_PTHREAD_H) + AC_DEFINE(HAVE_LIBPTHREAD) +fi + dnl ###################################################################### dnl Check for sa_len in struct sockaddr dnl ###################################################################### @@ -666,6 +677,7 @@ AC_DEFINE(ULTRIX, [], [Ultrix build]) ;; hpux*|hp-ux*) + AC_DEFINE(HPuUX, [], [HP/UX build]) if test "$GCC" != "yes"; then AC_DEFINE(REGEX_MALLOC, [], [Whether to use the local regex functions]) @@ -858,8 +870,18 @@ dnl Set GCC CFLAGS only if using GCC. dnl #################################################################### +AC_MSG_CHECKING(for HP-UX aC) +AC_PREPROC_IFELSE([AC_LANG_SOURCE([[ +#if defined __HP_cc +#This is HP-UX ANSI C +#endif +]])], [AC_MSG_RESULT(no)],[AC_MSG_RESULT(yes) +CFLAGS="$CFLAGS -Agcc" +CPPFLAGS="$CPPFLAGS -Agcc" +HP_UX_AC=yes]) + AC_MSG_CHECKING(for GCC specific compile flags) -if test x"$GCC" = "xyes"; then +if test x"$GCC" = "xyes" && test x"$HP_UX_AC" != x"yes"; then dnl # -Wformat - to be considered diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/docs/cf-agent.8 new/cfengine-3.2.1/docs/cf-agent.8 --- old/cfengine-3.2.0/docs/cf-agent.8 2011-08-22 09:19:43.000000000 +0200 +++ new/cfengine-3.2.1/docs/cf-agent.8 2011-09-19 12:04:34.000000000 +0200 @@ -46,7 +46,7 @@ .IP "--version, -V" Output the version of the software .SH AUTHOR -Mark Burgess and Cfengine AS +Mark Burgess and CFEngine AS .SH INFORMATION Bug reports: http://bug.cfengine.com, .pp @@ -56,4 +56,4 @@ .pp Support services: http://www.cfengine.com .pp -This software is Copyright (C) 2008-2011 Cfengine AS. +This software is Copyright (C) 2008-2011 CFEngine AS. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/docs/cf-execd.8 new/cfengine-3.2.1/docs/cf-execd.8 --- old/cfengine-3.2.0/docs/cf-execd.8 2011-08-22 09:19:43.000000000 +0200 +++ new/cfengine-3.2.1/docs/cf-execd.8 2011-09-19 12:04:34.000000000 +0200 @@ -47,7 +47,7 @@ .IP "--ld-library-path, -L" value Set the internal value of LD_LIBRARY_PATH for child processes .SH AUTHOR -Mark Burgess and Cfengine AS +Mark Burgess and CFEngine AS .SH INFORMATION Bug reports: http://bug.cfengine.com, .pp @@ -57,4 +57,4 @@ .pp Support services: http://www.cfengine.com .pp -This software is Copyright (C) 2008-2011 Cfengine AS. +This software is Copyright (C) 2008-2011 CFEngine AS. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/docs/cf-key.8 new/cfengine-3.2.1/docs/cf-key.8 --- old/cfengine-3.2.0/docs/cf-key.8 2011-08-22 09:19:43.000000000 +0200 +++ new/cfengine-3.2.1/docs/cf-key.8 2011-09-19 12:04:34.000000000 +0200 @@ -30,7 +30,7 @@ .IP "--remove-keys, -r" value Remove keys for specified hostname/IP .SH AUTHOR -Mark Burgess and Cfengine AS +Mark Burgess and CFEngine AS .SH INFORMATION Bug reports: http://bug.cfengine.com, .pp @@ -40,4 +40,4 @@ .pp Support services: http://www.cfengine.com .pp -This software is Copyright (C) 2008-2011 Cfengine AS. +This software is Copyright (C) 2008-2011 CFEngine AS. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/docs/cf-know.8 new/cfengine-3.2.1/docs/cf-know.8 --- old/cfengine-3.2.0/docs/cf-know.8 2011-08-22 09:19:43.000000000 +0200 +++ new/cfengine-3.2.1/docs/cf-know.8 2011-09-19 12:04:34.000000000 +0200 @@ -37,7 +37,7 @@ Generate reference manual from internal data .IP "--manpage, -M" Generate reference manpage from internal data -.IP "--stories, -s" value +.IP "--stories, -z" value Look up stories for a given topic on the command line .IP "--syntax, -S" value Print a syntax summary of the optional keyword or this cfengine version @@ -50,7 +50,7 @@ .IP "--updatetest, -u" Update test data .SH AUTHOR -Mark Burgess and Cfengine AS +Mark Burgess and CFEngine AS .SH INFORMATION Bug reports: http://bug.cfengine.com, .pp @@ -60,4 +60,4 @@ .pp Support services: http://www.cfengine.com .pp -This software is Copyright (C) 2008-2011 Cfengine AS. +This software is Copyright (C) 2008-2011 CFEngine AS. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/docs/cf-monitord.8 new/cfengine-3.2.1/docs/cf-monitord.8 --- old/cfengine-3.2.0/docs/cf-monitord.8 2011-08-22 09:19:43.000000000 +0200 +++ new/cfengine-3.2.1/docs/cf-monitord.8 2011-09-19 12:04:34.000000000 +0200 @@ -44,7 +44,7 @@ .IP "--tcpdump, -T" Interface with tcpdump if available to collect data about network .SH AUTHOR -Mark Burgess and Cfengine AS +Mark Burgess and CFEngine AS .SH INFORMATION Bug reports: http://bug.cfengine.com, .pp @@ -54,4 +54,4 @@ .pp Support services: http://www.cfengine.com .pp -This software is Copyright (C) 2008-2011 Cfengine AS. +This software is Copyright (C) 2008-2011 CFEngine AS. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/docs/cf-promises.8 new/cfengine-3.2.1/docs/cf-promises.8 --- old/cfengine-3.2.0/docs/cf-promises.8 2011-08-22 09:19:43.000000000 +0200 +++ new/cfengine-3.2.1/docs/cf-promises.8 2011-09-19 12:04:34.000000000 +0200 @@ -44,7 +44,7 @@ .IP "--reports, -r" Generate reports about configuration and insert into CFDB .SH AUTHOR -Mark Burgess and Cfengine AS +Mark Burgess and CFEngine AS .SH INFORMATION Bug reports: http://bug.cfengine.com, .pp @@ -54,4 +54,4 @@ .pp Support services: http://www.cfengine.com .pp -This software is Copyright (C) 2008-2011 Cfengine AS. +This software is Copyright (C) 2008-2011 CFEngine AS. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/docs/cf-report.8 new/cfengine-3.2.1/docs/cf-report.8 --- old/cfengine-3.2.0/docs/cf-report.8 2011-08-22 09:19:43.000000000 +0200 +++ new/cfengine-3.2.1/docs/cf-report.8 2011-09-19 12:04:34.000000000 +0200 @@ -76,7 +76,7 @@ .IP "--remove-hosts, -r" value Remove comma separated list of key hash entries from the hosts-seen database .SH AUTHOR -Mark Burgess and Cfengine AS +Mark Burgess and CFEngine AS .SH INFORMATION Bug reports: http://bug.cfengine.com, .pp @@ -86,4 +86,4 @@ .pp Support services: http://www.cfengine.com .pp -This software is Copyright (C) 2008-2011 Cfengine AS. +This software is Copyright (C) 2008-2011 CFEngine AS. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/docs/cf-runagent.8 new/cfengine-3.2.1/docs/cf-runagent.8 --- old/cfengine-3.2.0/docs/cf-runagent.8 2011-08-22 09:19:43.000000000 +0200 +++ new/cfengine-3.2.1/docs/cf-runagent.8 2011-09-19 12:04:34.000000000 +0200 @@ -56,7 +56,7 @@ .IP "--timeout, -t" value Connection timeout, seconds .SH AUTHOR -Mark Burgess and Cfengine AS +Mark Burgess and CFEngine AS .SH INFORMATION Bug reports: http://bug.cfengine.com, .pp @@ -66,4 +66,4 @@ .pp Support services: http://www.cfengine.com .pp -This software is Copyright (C) 2008-2011 Cfengine AS. +This software is Copyright (C) 2008-2011 CFEngine AS. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/docs/cf-serverd.8 new/cfengine-3.2.1/docs/cf-serverd.8 --- old/cfengine-3.2.0/docs/cf-serverd.8 2011-08-22 09:19:43.000000000 +0200 +++ new/cfengine-3.2.1/docs/cf-serverd.8 2011-09-19 12:04:34.000000000 +0200 @@ -26,25 +26,25 @@ .IP "--verbose, -v" Output verbose information about the behaviour of the agent .IP "--version, -V" -All talk and no action mode - make no changes, only inform of promises not kept -.IP "--file, -f" value Output the version of the software -.IP "--define, -D" value +.IP "--file, -f" value Specify an alternative input file than the default -.IP "--negate, -N" value +.IP "--define, -D" value Define a list of comma separated classes to be defined at the start of execution -.IP "--no-lock, -K" +.IP "--negate, -N" value Define a list of comma separated classes to be undefined at the start of execution -.IP "--inform, -I" +.IP "--no-lock, -K" Ignore locking constraints during execution (ifelapsed/expireafter) if "too soon" to run -.IP "--diagnostic, -x" +.IP "--inform, -I" Print basic information about changes made to the system, i.e. promises repaired -.IP "--no-fork, -F" +.IP "--diagnostic, -x" Activate internal diagnostics (developers only) -.IP "--ld-library-path, -L" value +.IP "--no-fork, -F" Run as a foreground processes (do not fork) +.IP "--ld-library-path, -L" value +Set the internal value of LD_LIBRARY_PATH for child processes .SH AUTHOR -Mark Burgess and Cfengine AS +Mark Burgess and CFEngine AS .SH INFORMATION Bug reports: http://bug.cfengine.com, .pp @@ -54,4 +54,4 @@ .pp Support services: http://www.cfengine.com .pp -This software is Copyright (C) 2008-2011 Cfengine AS. +This software is Copyright (C) 2008-2011 CFEngine AS. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/examples/unit_arrays.cf new/cfengine-3.2.1/examples/unit_arrays.cf --- old/cfengine-3.2.0/examples/unit_arrays.cf 2011-08-22 08:53:28.000000000 +0200 +++ new/cfengine-3.2.1/examples/unit_arrays.cf 2011-09-19 11:46:59.000000000 +0200 @@ -47,4 +47,5 @@ linux:: "Global $(g.array[1]) and $(localarray[2])"; -} \ No newline at end of file +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/examples/unit_chdir.cf new/cfengine-3.2.1/examples/unit_chdir.cf --- old/cfengine-3.2.0/examples/unit_chdir.cf 2011-08-22 08:53:28.000000000 +0200 +++ new/cfengine-3.2.1/examples/unit_chdir.cf 2011-09-19 11:46:59.000000000 +0200 @@ -42,4 +42,5 @@ "/bin/pwd" contain => cd("/tmp"); -} \ No newline at end of file +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/ltmain.sh new/cfengine-3.2.1/ltmain.sh --- old/cfengine-3.2.0/ltmain.sh 2011-08-22 09:23:47.000000000 +0200 +++ new/cfengine-3.2.1/ltmain.sh 2011-09-19 12:16:58.000000000 +0200 @@ -65,7 +65,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu3 +# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2 # automake: $automake_version # autoconf: $autoconf_version # @@ -73,7 +73,7 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION="2.2.6b Debian-2.2.6b-2ubuntu3" +VERSION="2.2.6b Debian-2.2.6b-2" TIMESTAMP="" package_revision=1.3017 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/m4/acinclude.m4 new/cfengine-3.2.1/m4/acinclude.m4 --- old/cfengine-3.2.0/m4/acinclude.m4 2011-08-22 08:53:04.000000000 +0200 +++ new/cfengine-3.2.1/m4/acinclude.m4 2011-09-19 11:45:55.000000000 +0200 @@ -39,7 +39,7 @@ # which indicates that we try without any flags at all, and "pthread-config" # which is a program returning the flags for the Pth emulation library. -acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" +acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config pthreadGC2" # The ordering *is* (sometimes) important. Some notes on the # individual items follow: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/masterfiles/promises.cf new/cfengine-3.2.1/masterfiles/promises.cf --- old/cfengine-3.2.0/masterfiles/promises.cf 2011-08-22 08:53:27.000000000 +0200 +++ new/cfengine-3.2.1/masterfiles/promises.cf 2011-09-19 11:46:59.000000000 +0200 @@ -164,8 +164,8 @@ any:: splaytime => "1"; - mailto => "cfengine@example.org"; - mailfrom => "cfengine@$(sys.host).example.org"; + mailto => "cfengine@$(def.domain)"; + mailfrom => "cfengine@$(sys.host).$(def.domain)"; smtpserver => "localhost"; # Default: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/pub/Makefile.in new/cfengine-3.2.1/pub/Makefile.in --- old/cfengine-3.2.0/pub/Makefile.in 2011-08-22 09:23:51.000000000 +0200 +++ new/cfengine-3.2.1/pub/Makefile.in 2011-09-19 12:17:03.000000000 +0200 @@ -37,8 +37,8 @@ target_triplet = @target@ subdir = pub DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - clock_gettime.c dirfd.c getloadavg.c setlinebuf.c strlcat.c \ - strlcpy.c strndup.c strnlen.c unsetenv.c + clock_gettime.c dirfd.c getloadavg.c round.c setlinebuf.c \ + strlcat.c strlcpy.c strndup.c strnlen.c unsetenv.c ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/cf3_with_library.m4 \ @@ -344,6 +344,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/clock_gettime.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dirfd.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getloadavg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/round.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/setlinebuf.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strlcat.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strlcpy.Plo@am__quote@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/pub/dirfd.c new/cfengine-3.2.1/pub/dirfd.c --- old/cfengine-3.2.0/pub/dirfd.c 2011-08-22 08:53:04.000000000 +0200 +++ new/cfengine-3.2.1/pub/dirfd.c 2011-09-19 11:45:55.000000000 +0200 @@ -47,3 +47,10 @@ } #endif + +#if defined(__hpux) || defined(_AIX) +int dirfd(DIR *dirp) +{ +return dirp->dd_fd != -1 ? dirp->dd_fd : ENOTSUP; +} +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/pub/round.c new/cfengine-3.2.1/pub/round.c --- old/cfengine-3.2.0/pub/round.c 1970-01-01 01:00:00.000000000 +0100 +++ new/cfengine-3.2.1/pub/round.c 2011-09-19 11:45:55.000000000 +0200 @@ -0,0 +1,62 @@ +/* + Copyright (C) Cfengine AS + + This file is part of Cfengine 3 - written and maintained by Cfengine AS. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; version 3. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + + To the extent this program is licensed as part of the Enterprise + versions of Cfengine, the applicable Commerical Open Source License + (COSL) may apply to this file if you as a licensee so wish it. See + included file COSL.txt. + +*/ + +#ifdef HAVE_CONFIG_H +#include "../src/conf.h" +#endif + +#include <math.h> + +#if !HAVE_DECL_ROUND +double round(double x); +#endif + +double round(double x) +{ +if (x >= 0.0) + { + double y = floor(x); + if (x - y >= 0.5) + { + return y + 1.0; + } + else + { + return y; + } + } +else + { + double y = ceil(x); + if (y - x >= 0.5) + { + return y - 1.0; + } + else + { + return y; + } + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/src/agent.c new/cfengine-3.2.1/src/agent.c --- old/cfengine-3.2.0/src/agent.c 2011-08-22 08:53:05.000000000 +0200 +++ new/cfengine-3.2.1/src/agent.c 2011-09-19 11:45:57.000000000 +0200 @@ -1369,11 +1369,7 @@ PROCESSTABLE = NULL; LoadProcessTable(&PROCESSTABLE); - char execdPath[CF_MAXVARSIZE]; - snprintf(execdPath, sizeof(execdPath), "%s/bin/cf-execd", CFWORKDIR); - MapName(execdPath); - - if(!IsProcessNameRunning(execdPath)) + if(!IsProcessNameRunning(".*cf-execd.*")) { CfOut(cf_error, "", "!! Bootstrapping failed, cf-execd is not running"); return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/src/cf3.defs.h new/cfengine-3.2.1/src/cf3.defs.h --- old/cfengine-3.2.0/src/cf3.defs.h 2011-08-22 08:53:05.000000000 +0200 +++ new/cfengine-3.2.1/src/cf3.defs.h 2011-09-19 11:45:57.000000000 +0200 @@ -49,7 +49,7 @@ /* Fundamental (meta) types */ /*************************************************************************/ -#define CF3COPYRIGHT "Copyright (C) Cfengine AS 2008,2010-" +#define CF3COPYRIGHT "Copyright (C) CFEngine AS 2008,2010-" #define CF_SCALAR 's' #define CF_LIST 'l' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/src/cfknow.c new/cfengine-3.2.1/src/cfknow.c --- old/cfengine-3.2.0/src/cfknow.c 2011-08-22 08:53:05.000000000 +0200 +++ new/cfengine-3.2.1/src/cfknow.c 2011-09-19 11:45:57.000000000 +0200 @@ -112,7 +112,7 @@ { "file",required_argument,0,'f' }, { "manual",no_argument,0,'m'}, { "manpage",no_argument,0,'M'}, - { "stories",required_argument,0,'s'}, + { "stories",required_argument,0,'z'}, { "syntax",required_argument,0,'S'}, { "topics",no_argument,0,'T'}, { "test",required_argument,0,'t'}, @@ -183,7 +183,7 @@ LOOKUP = false; -while ((c=getopt_long(argc,argv,"hbd:vVf:mMs:St:ruT",OPTIONS,&optindex)) != EOF) +while ((c=getopt_long(argc,argv,"hbd:vVf:mMz:St:ruT",OPTIONS,&optindex)) != EOF) { switch ((char) c) { @@ -218,25 +218,11 @@ } break; - case 's': + case 'z': - { char buffer[1000000]; - - /* LICENSES = 1; */ - /* CfLDAP_JSON_GetSingleAttributeList("ldap://10.0.0.152", */ - /* "uid=sudhir,ou=people,dc=cfengine,dc=com", */ - /* "ou=groups,dc=cfengine,dc=com", */ - /* "(memberUid=sudhir)", */ - /* "cn", */ - /* "subtree", */ - /* "sasl", */ - /* "password",1,100,buffer,1000000); */ - - printf("JSON:%s \n",buffer); - } #ifdef HAVE_CONSTELLATION strcpy(TOPIC_CMD,optarg); - //CfGenerateStories(TOPIC_CMD,cfi_cause); + CfGenerateStories(TOPIC_CMD,cfi_cause); #endif exit(0); break; @@ -321,9 +307,6 @@ strcpy(GRAPHDIR,""); SHOWREPORTS = false; -PrependRScalar(&GOALS,"goal.*",CF_SCALAR); -PrependRScalar(&GOALCATEGORIES,"goals",CF_SCALAR); - if (InsertTopic("any","any")) { struct Rlist *list = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/src/cfpromises.c new/cfengine-3.2.1/src/cfpromises.c --- old/cfengine-3.2.0/src/cfpromises.c 2011-08-22 08:53:05.000000000 +0200 +++ new/cfengine-3.2.1/src/cfpromises.c 2011-09-19 11:45:57.000000000 +0200 @@ -91,7 +91,7 @@ int main(int argc,char *argv[]) { -CheckOpts(argc,argv); +CheckOpts(argc,argv); GenericInitialize(argc,argv,"common"); ThisAgentInit(); AnalyzePromiseConflicts(); @@ -194,6 +194,8 @@ exit(0); case 'r': + PrependRScalar(&GOALS,"goal.*",CF_SCALAR); + PrependRScalar(&GOALCATEGORIES,"goals",CF_SCALAR); SHOWREPORTS = true; break; @@ -224,8 +226,7 @@ void ThisAgentInit() { - PrependRScalar(&GOALS,"goal.*",CF_SCALAR); - PrependRScalar(&GOALCATEGORIES,"goals",CF_SCALAR); +AddGoalsToDB(Rlist2String(GOALS,","),Rlist2String(GOALCATEGORIES,",")); SHOWREPORTS = false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/src/conf.h.in new/cfengine-3.2.1/src/conf.h.in --- old/cfengine-3.2.0/src/conf.h.in 2011-08-22 09:23:50.000000000 +0200 +++ new/cfengine-3.2.1/src/conf.h.in 2011-09-19 12:17:02.000000000 +0200 @@ -85,6 +85,10 @@ don't. */ #undef HAVE_DECL_REALPATH +/* Define to 1 if you have the declaration of `round', and to 0 if you don't. + */ +#undef HAVE_DECL_ROUND + /* Define to 1 if you have the declaration of `setlinebuf', and to 0 if you don't. */ #undef HAVE_DECL_SETLINEBUF @@ -284,6 +288,9 @@ /* Define to 1 if you have the `realpath' function. */ #undef HAVE_REALPATH +/* Define to 1 if you have the `round' function. */ +#undef HAVE_ROUND + /* Do we have any route entry structure? */ #undef HAVE_RTENTRY diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/src/enterprise_stubs.c new/cfengine-3.2.1/src/enterprise_stubs.c --- old/cfengine-3.2.0/src/enterprise_stubs.c 2011-08-22 08:53:05.000000000 +0200 +++ new/cfengine-3.2.1/src/enterprise_stubs.c 2011-09-19 11:45:57.000000000 +0200 @@ -1149,3 +1149,14 @@ #endif } +/*****************************************************************************/ + +void AddGoalsToDB(char *goal_patterns, char *goal_categories) + +{ +#ifdef HAVE_NOVA + Nova_AddGoalsToDB(goal_patterns,goal_categories); +#endif +} + +/*****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/src/evalfunction.c new/cfengine-3.2.1/src/evalfunction.c --- old/cfengine-3.2.0/src/evalfunction.c 2011-08-22 08:53:05.000000000 +0200 +++ new/cfengine-3.2.1/src/evalfunction.c 2011-09-19 11:45:57.000000000 +0200 @@ -106,11 +106,11 @@ if (return_address) { - snprintf(address, sizeof(address), "%s", IPString2Hostname(ip->name)); + snprintf(address, sizeof(address), "%s", ip->name); } else { - snprintf(address, sizeof(address), "%s", ip->name); + snprintf(address, sizeof(address), "%s", IPString2Hostname(ip->name)); } if (entrytime < now - horizon) @@ -3917,7 +3917,7 @@ static struct Rval FnCallNot(struct FnCall *fp, struct Rlist *finalargs) { struct Rval rval; -SetFnCallReturnStatus("and", FNCALL_SUCCESS, NULL, NULL); +SetFnCallReturnStatus("not", FNCALL_SUCCESS, NULL, NULL); rval.item = strdup(IsDefinedClass(finalargs->item) ? "!any" : "any"); rval.rtype = CF_SCALAR; return rval; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/src/expand.c new/cfengine-3.2.1/src/expand.c --- old/cfengine-3.2.0/src/expand.c 2011-08-22 08:53:05.000000000 +0200 +++ new/cfengine-3.2.1/src/expand.c 2011-09-19 11:45:57.000000000 +0200 @@ -1001,9 +1001,37 @@ if (strcmp(cp->lval,"ifvarclass") == 0) { - if (IsExcluded(cp->rval)) + struct Rval res; + + switch(cp->type) { - return; + case CF_SCALAR: + + if (IsExcluded(cp->rval)) + { + return; + } + + break; + + case CF_FNCALL: + /* eval it: e.g. ifvarclass => not("a_class") */ + + res = EvaluateFunctionCall(cp->rval,NULL); + bool excluded = IsExcluded(res.item); + + DeleteRvalItem(res.item,res.rtype); + + if(excluded) + { + return; + } + + break; + + default: + CfOut(cf_error, "", "!! Invalid ifvarclass type '%c': should be string or function", cp->type); + continue; } continue; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/src/files_interfaces.c new/cfengine-3.2.1/src/files_interfaces.c --- old/cfengine-3.2.0/src/files_interfaces.c 2011-08-22 08:53:05.000000000 +0200 +++ new/cfengine-3.2.1/src/files_interfaces.c 2011-09-19 11:45:57.000000000 +0200 @@ -369,7 +369,7 @@ { if (a.havedepthsearch) { - CfOut(cf_error,"","Warning: depth_search (recursion) is promised for a base object %s that is not a directory",path); + CfOut(cf_inform,"","Warning: depth_search (recursion) is promised for a base object %s that is not a directory",path); SaveSetuid(a,pp); YieldCurrentLock(thislock); return; @@ -461,7 +461,7 @@ if (cfstat(path,&osb) != -1 && S_ISREG(osb.st_mode)) { - VerifyFileLeaf(path,&oslb,a,pp); + VerifyFileLeaf(path,&osb,a,pp); } SaveSetuid(a,pp); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/src/files_names.c new/cfengine-3.2.1/src/files_names.c --- old/cfengine-3.2.0/src/files_names.c 2011-08-22 08:53:05.000000000 +0200 +++ new/cfengine-3.2.1/src/files_names.c 2011-09-19 11:45:57.000000000 +0200 @@ -406,7 +406,24 @@ int Join(char *path, const char *leaf, int bufsize) { - return JoinMargin(path,leaf,NULL,bufsize,CF_BUFFERMARGIN); + return JoinMargin(path,leaf,NULL,bufsize,CF_BUFFERMARGIN); +} + +/*********************************************************************/ + +int JoinSilent(char *path, const char *leaf, int bufsize) +/* Don't warn on buffer limits - just return the value */ +{ + int len = strlen(leaf); + + if ((strlen(path)+len) > (bufsize - CF_BUFFERMARGIN)) + { + return false; + } + + strcat(path,leaf); + + return true; } /*********************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/src/generic_agent.c new/cfengine-3.2.1/src/generic_agent.c --- old/cfengine-3.2.0/src/generic_agent.c 2011-08-22 08:53:05.000000000 +0200 +++ new/cfengine-3.2.1/src/generic_agent.c 2011-09-19 11:45:57.000000000 +0200 @@ -191,7 +191,7 @@ snprintf(VINPUTFILE,CF_BUFSIZE-1,"failsafe.cf"); ReadPromises(ag,agents); } - + if (SHOWREPORTS) { CompilationReport(VINPUTFILE); @@ -222,7 +222,7 @@ int CheckPromises(enum cfagenttype ag) -{ char cmd[CF_BUFSIZE]; +{ char cmd[CF_BUFSIZE], cfpromises[CF_MAXVARSIZE]; char filename[CF_MAXVARSIZE]; struct stat sb; int fd; @@ -234,9 +234,9 @@ CfOut(cf_verbose,""," -> Verifying the syntax of the inputs...\n"); -snprintf(cmd,CF_BUFSIZE-1,"%s%cbin%ccf-promises%s",CFWORKDIR,FILE_SEPARATOR,FILE_SEPARATOR,EXEC_SUFFIX); +snprintf(cfpromises,sizeof(cfpromises),"%s%cbin%ccf-promises%s",CFWORKDIR,FILE_SEPARATOR,FILE_SEPARATOR,EXEC_SUFFIX); -if (cfstat(cmd,&sb) == -1) +if (cfstat(cfpromises,&sb) == -1) { CfOut(cf_error,"","cf-promises%s needs to be installed in %s%cbin for pre-validation of full configuration",EXEC_SUFFIX,CFWORKDIR,FILE_SEPARATOR); return false; @@ -244,7 +244,8 @@ /* If we are cf-agent, check syntax before attempting to run */ -strlcat(cmd, " -f "", CF_BUFSIZE); +snprintf(cmd, sizeof(cmd), ""%s" -f "", cfpromises); + if (IsFileOutsideDefaultRepository(VINPUTFILE)) { @@ -1674,6 +1675,7 @@ if (strcmp(cp->lval,CFG_CONTROLBODY[cfg_goalpatterns].lval) == 0) { + GOALS = NULL; for (rp = (struct Rlist *)returnval.item; rp != NULL; rp=rp->next) { PrependRScalar(&GOALS,rp->item,CF_SCALAR); @@ -1684,6 +1686,7 @@ if (strcmp(cp->lval,CFG_CONTROLBODY[cfg_goalcategories].lval) == 0) { + GOALCATEGORIES = NULL; for (rp = (struct Rlist *)returnval.item; rp != NULL; rp=rp->next) { PrependRScalar(&GOALCATEGORIES,rp->item,CF_SCALAR); @@ -1750,7 +1753,7 @@ printf("Community help: http://forum.cfengine.com\n"); printf("Community info: http://www.cfengine.com/pages/community, "); printf("Support services: http://www.cfengine.com\n\n"); -printf("This software is Copyright (C) 2008,2010-present Cfengine AS.\n"); +printf("This software is Copyright (C) 2008,2010-present CFEngine AS.\n"); } /*******************************************************************/ @@ -1790,14 +1793,14 @@ } printf(".SH AUTHOR\n" - "Mark Burgess and Cfengine AS\n" + "Mark Burgess and CFEngine AS\n" ".SH INFORMATION\n"); printf("\nBug reports: http://bug.cfengine.com, "); printf(".pp\nCommunity help: http://forum.cfengine.com\n"); printf(".pp\nCommunity info: http://www.cfengine.com/pages/community\n"); printf(".pp\nSupport services: http://www.cfengine.com\n"); -printf(".pp\nThis software is Copyright (C) 2008-%d Cfengine AS.\n", BUILD_YEAR); +printf(".pp\nThis software is Copyright (C) 2008-%d CFEngine AS.\n", BUILD_YEAR); } /*******************************************************************/ @@ -1854,7 +1857,8 @@ printf("\n"); AgentBanner(text); printf("\n"); -printf("Copyright (C) Cfengine AS 2008-%d\n", BUILD_YEAR); +printf("Copyright (C) CFEngine AS 2008-%d\n", BUILD_YEAR); +printf("See Licensing at http://cfengine.com/3rdpartylicenses\n"); } /*******************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/src/prototypes3.h new/cfengine-3.2.1/src/prototypes3.h --- old/cfengine-3.2.0/src/prototypes3.h 2011-08-22 08:53:05.000000000 +0200 +++ new/cfengine-3.2.1/src/prototypes3.h 2011-09-19 11:45:57.000000000 +0200 @@ -481,7 +481,7 @@ int ForeignZone(char *s); void NewPromiser(struct Promise *pp); void AnalyzePromiseConflicts(void); - +void AddGoalsToDB(char *goal_patterns, char *goal_categories); /* env_context.c */ /* - Parsing/evaluating expressions - */ @@ -625,6 +625,7 @@ int JoinMargin(char *path, const char *leaf, char **nextFree, int bufsize, int margin); int StartJoin(char *path,char *leaf,int bufsize); int Join(char *path, const char *leaf, int bufsize); +int JoinSilent(char *path, const char *leaf, int bufsize); int EndJoin(char *path,char *leaf,int bufsize); int IsAbsPath(char *path); void AddSlash(char *str); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/src/rlist.c new/cfengine-3.2.1/src/rlist.c --- old/cfengine-3.2.0/src/rlist.c 2011-08-22 08:53:05.000000000 +0200 +++ new/cfengine-3.2.1/src/rlist.c 2011-09-19 11:45:57.000000000 +0200 @@ -774,18 +774,34 @@ { struct Rlist *rp; StartJoin(buffer,"{",bufsize); - + for (rp = list; rp != NULL; rp=rp->next) { - Join(buffer,"'",bufsize); + if(!JoinSilent(buffer,"'",bufsize)) + { + EndJoin(buffer,"...TRUNCATED'}",bufsize); + return false; + } - PrintRval(buffer,bufsize,rp->item,rp->type); + if(!PrintRval(buffer,bufsize,rp->item,rp->type)) + { + EndJoin(buffer,"...TRUNCATED'}",bufsize); + return false; + } - Join(buffer,"'",bufsize); + if(!JoinSilent(buffer,"'",bufsize)) + { + EndJoin(buffer,"...TRUNCATED'}",bufsize); + return false; + } if (rp->next != NULL) { - Join(buffer,",",bufsize); + if(!JoinSilent(buffer,",",bufsize)) + { + EndJoin(buffer,"...TRUNCATED}",bufsize); + return false; + } } } @@ -893,11 +909,11 @@ switch (type) { case CF_SCALAR: - Join(buffer,(char *)rval,bufsize); + return JoinSilent(buffer,(char *)rval,bufsize); break; case CF_LIST: - PrintRlist(buffer,bufsize,(struct Rlist *)rval); + return PrintRlist(buffer,bufsize,(struct Rlist *)rval); break; case CF_FNCALL: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/src/runagent.c new/cfengine-3.2.1/src/runagent.c --- old/cfengine-3.2.0/src/runagent.c 2011-08-22 08:53:05.000000000 +0200 +++ new/cfengine-3.2.1/src/runagent.c 2011-09-19 11:45:57.000000000 +0200 @@ -450,8 +450,10 @@ switch(menu) { case cfd_menu_delta: + Nova_QueryForKnowledgeMap(conn,MENU,time(0) - SECONDS_PER_MINUTE * 10); + break; case cfd_menu_full: - Nova_QueryForKnowledgeMap(conn,MENU,time(0) - 7*24*3600); + Nova_QueryForKnowledgeMap(conn,MENU,time(0) - SECONDS_PER_WEEK); break; case cfd_menu_relay: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/src/server.c new/cfengine-3.2.1/src/server.c --- old/cfengine-3.2.0/src/server.c 2011-08-22 08:53:05.000000000 +0200 +++ new/cfengine-3.2.1/src/server.c 2011-09-19 11:45:57.000000000 +0200 @@ -117,7 +117,6 @@ "Print the help message", "Set debugging level 0,1,2,3", "Output verbose information about the behaviour of the agent", - "All talk and no action mode - make no changes, only inform of promises not kept", "Output the version of the software", "Specify an alternative input file than the default", "Define a list of comma separated classes to be defined at the start of execution", @@ -849,6 +848,9 @@ Get3Environment(); BuiltinClasses(); OSClasses(); + + NewClass(THIS_AGENT); + SetReferenceTime(true); ReadPromises(cf_server,CF_SERVERC); KeepPromises(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cfengine-3.2.0/src/verify_packages.c new/cfengine-3.2.1/src/verify_packages.c --- old/cfengine-3.2.0/src/verify_packages.c 2011-08-22 08:53:05.000000000 +0200 +++ new/cfengine-3.2.1/src/verify_packages.c 2011-09-19 11:45:57.000000000 +0200 @@ -100,6 +100,10 @@ return; } +// Start by reseting the root directory in case yum tries to glob regexs(!) + +chdir("/"); + if (!VerifyInstalledPackages(&INSTALLED_PACKAGE_LISTS,a,pp)) { cfPS(cf_error,CF_FAIL,"",pp,a," !! Unable to obtain a list of installed packages - aborting"); @@ -1701,7 +1705,7 @@ } else { - cfPS(cf_error,CF_FAIL,"",pp,a,"!! Package "%s" cannot be verified -- no match\n",pp->promiser); + cfPS(cf_inform,CF_FAIL,"",pp,a,"!! Package "%s" cannot be verified -- no match\n",pp->promiser); } break; @@ -1905,15 +1909,16 @@ /*****************************************************************************/ static int ExecPackageCommand(char *command,int verify,int setCmdClasses,struct Attributes a,struct Promise *pp) + { - if(strncmp(command,"/cf_internal_rpath",sizeof("/cf_internal_rpath") - 1) == 0) - { - return ExecPackageCommandRpath(command,verify,setCmdClasses,a,pp); - } - else - { - return ExecPackageCommandGeneric(command,verify,setCmdClasses,a,pp); - } +if(strncmp(command,"/cf_internal_rpath",sizeof("/cf_internal_rpath") - 1) == 0) + { + return ExecPackageCommandRpath(command,verify,setCmdClasses,a,pp); + } +else + { + return ExecPackageCommandGeneric(command,verify,setCmdClasses,a,pp); + } } /*****************************************************************************/ @@ -1972,7 +1977,7 @@ ReplaceStr(line,lineSafe,sizeof(lineSafe),"%","%%"); CfOut(cf_inform,"","Q:%20.20s ...:%s",cmd,lineSafe); - if (line[0] != '\0' && verify) + if (verify && line[0] != '\0') { if (a.packages.package_noverify_regex) { @@ -1988,19 +1993,23 @@ packmanRetval = cf_pclose(pfp); - if(verify) // return code check for verify policy + if(verify && a.packages.package_noverify_returncode != CF_NOINT) { - if(a.packages.package_noverify_returncode != CF_NOINT) + if(a.packages.package_noverify_returncode == packmanRetval) { - if(a.packages.package_noverify_returncode == packmanRetval) - { - cfPS(cf_inform,CF_FAIL,"",pp,a,"!! Package verification error (returned %d)",packmanRetval); - retval = false; - } - else - { - CfOut(cf_verbose, "", " Package successfully verified from return code"); - } + cfPS(cf_inform,CF_FAIL,"",pp,a,"!! Package verification error (returned %d)",packmanRetval); + retval = false; + } + else + { + cfPS(cf_inform,CF_NOP,"",pp,a,"-> Package verification succeeded (returned %d)",packmanRetval); + } + } + else if(verify && a.packages.package_noverify_regex) + { + if(retval) // set status if we succeeded above + { + cfPS(cf_inform,CF_NOP,"",pp,a,"-> Package verification succeeded (no match with package_noverify_regex)"); } } else if(setCmdClasses) // generic return code check continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org