Hello community, here is the log from the commit of package wsmancli checked in at Fri Sep 26 16:57:40 CEST 2008. -------- --- wsmancli/wsmancli.changes 2008-04-29 10:35:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/wsmancli/wsmancli.changes 2008-09-16 09:57:34.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 16 09:56:50 CEST 2008 - prusnak@suse.cz + +- update to 2.1.0 + * adapted to the new openwsman 2.1 + +------------------------------------------------------------------- Old: ---- wsmancli-2.0.0.tar.bz2 New: ---- wsmancli-2.1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wsmancli.spec ++++++ --- /var/tmp/diff_new_pack.h25222/_old 2008-09-26 16:57:30.000000000 +0200 +++ /var/tmp/diff_new_pack.h25222/_new 2008-09-26 16:57:30.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package wsmancli (Version 2.0.0) +# spec file for package wsmancli (Version 2.1.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -14,7 +21,7 @@ Name: wsmancli BuildRequires: gcc-c++ libwsman-devel pkgconfig BuildRequires: libcurl-devel -Version: 2.0.0 +Version: 2.1.0 Release: 1 Url: http://www.openwsman.org/ License: BSD 3-Clause @@ -53,6 +60,9 @@ %{_bindir}/wseventmgr %changelog +* Tue Sep 16 2008 prusnak@suse.cz +- update to 2.1.0 + * adapted to the new openwsman 2.1 * Tue Apr 29 2008 prusnak@suse.cz - update to 2.0.0 * adapted to the new openwsman 2.0 API ++++++ wsmancli-2.0.0.tar.bz2 -> wsmancli-2.1.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/wsmancli-2.0.0/aclocal.m4 new/wsmancli-2.1.0/aclocal.m4 --- old/wsmancli-2.0.0/aclocal.m4 2008-04-06 19:34:22.000000000 +0200 +++ new/wsmancli-2.1.0/aclocal.m4 2008-09-15 04:02:58.000000000 +0200 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,10 +11,13 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_if(m4_PACKAGE_VERSION, [2.61],, -[m4_fatal([this file was generated for autoconf 2.61. -You have another version of autoconf. If you want to use that, -you should regenerate the build system entirely.], [63])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(AC_AUTOCONF_VERSION, [2.61],, +[m4_warning([this file was generated for autoconf 2.61. +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'.])]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # @@ -84,16 +87,14 @@ # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], -[if test -n "$PKG_CONFIG"; then - if test -n "$$1"; then - pkg_cv_[]$1="$$1" - else - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - fi -else - pkg_failed=untried +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + else + pkg_failed=untried fi[]dnl ])# _PKG_CONFIG @@ -137,9 +138,9 @@ if test $pkg_failed = yes; then _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -174,7 +175,7 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -189,7 +190,7 @@ [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10], [], +m4_if([$1], [1.10.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -205,8 +206,10 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10])dnl -_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) +[AM_AUTOMAKE_VERSION([1.10.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -501,7 +504,7 @@ # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -561,13 +564,13 @@ # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 +# serial 13 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -672,16 +675,17 @@ # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. +_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $1 | $1:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -982,7 +986,7 @@ # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- -# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/wsmancli-2.0.0/configure new/wsmancli-2.1.0/configure --- old/wsmancli-2.0.0/configure 2008-04-08 01:13:06.000000000 +0200 +++ new/wsmancli-2.1.0/configure 2008-09-15 04:03:00.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for wsmancli 2.0.0. +# Generated by GNU Autoconf 2.61 for wsmancli 2.1.0. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -572,8 +572,8 @@ # Identity of this package. PACKAGE_NAME='wsmancli' PACKAGE_TARNAME='wsmancli' -PACKAGE_VERSION='2.0.0' -PACKAGE_STRING='wsmancli 2.0.0' +PACKAGE_VERSION='2.1.0' +PACKAGE_STRING='wsmancli 2.1.0' PACKAGE_BUGREPORT='' ac_unique_file="wsmancli.spec.in" @@ -1226,7 +1226,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 wsmancli 2.0.0 to adapt to many kinds of systems. +\`configure' configures wsmancli 2.1.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1292,7 +1292,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wsmancli 2.0.0:";; + short | recursive ) echo "Configuration of wsmancli 2.1.0:";; esac cat <<\_ACEOF @@ -1385,7 +1385,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wsmancli configure 2.0.0 +wsmancli configure 2.1.0 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1399,7 +1399,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by wsmancli $as_me 2.0.0, which was +It was created by wsmancli $as_me 2.1.0, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2090,7 +2090,7 @@ # Define the identity of the package. PACKAGE=wsmancli - VERSION=2.0.0 + VERSION=2.1.0 cat >>confdefs.h <<_ACEOF @@ -6173,41 +6173,37 @@ { echo "$as_me:$LINENO: checking for OPENWSMAN" >&5 echo $ECHO_N "checking for OPENWSMAN... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$OPENWSMAN_CFLAGS"; then - pkg_cv_OPENWSMAN_CFLAGS="$OPENWSMAN_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openwsman >= 2.0.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "openwsman >= 2.0.0") 2>&5 +if test -n "$OPENWSMAN_CFLAGS"; then + pkg_cv_OPENWSMAN_CFLAGS="$OPENWSMAN_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openwsman >= 2.1.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "openwsman >= 2.1.0") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_OPENWSMAN_CFLAGS=`$PKG_CONFIG --cflags "openwsman >= 2.0.0" 2>/dev/null` + pkg_cv_OPENWSMAN_CFLAGS=`$PKG_CONFIG --cflags "openwsman >= 2.1.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$OPENWSMAN_LIBS"; then - pkg_cv_OPENWSMAN_LIBS="$OPENWSMAN_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openwsman >= 2.0.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "openwsman >= 2.0.0") 2>&5 +if test -n "$OPENWSMAN_LIBS"; then + pkg_cv_OPENWSMAN_LIBS="$OPENWSMAN_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openwsman >= 2.1.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "openwsman >= 2.1.0") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_OPENWSMAN_LIBS=`$PKG_CONFIG --libs "openwsman >= 2.0.0" 2>/dev/null` + pkg_cv_OPENWSMAN_LIBS=`$PKG_CONFIG --libs "openwsman >= 2.1.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -6220,14 +6216,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - OPENWSMAN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "openwsman >= 2.0.0"` + OPENWSMAN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "openwsman >= 2.1.0" 2>&1` else - OPENWSMAN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "openwsman >= 2.0.0"` + OPENWSMAN_PKG_ERRORS=`$PKG_CONFIG --print-errors "openwsman >= 2.1.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$OPENWSMAN_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements (openwsman >= 2.0.0) were not met: + { { echo "$as_me:$LINENO: error: Package requirements (openwsman >= 2.1.0) were not met: $OPENWSMAN_PKG_ERRORS @@ -6238,7 +6234,7 @@ and OPENWSMAN_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -echo "$as_me: error: Package requirements (openwsman >= 2.0.0) were not met: +echo "$as_me: error: Package requirements (openwsman >= 2.1.0) were not met: $OPENWSMAN_PKG_ERRORS @@ -6958,7 +6954,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by wsmancli $as_me 2.0.0, which was +This file was extended by wsmancli $as_me 2.1.0, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7011,7 +7007,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -wsmancli config.status 2.0.0 +wsmancli config.status 2.1.0 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -7695,21 +7691,22 @@ fi rm -f "$tmp/out12" # Compute $ac_file's index in $config_headers. +_am_arg=$ac_file _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $ac_file | $ac_file:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || -$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X$ac_file : 'X\(//\)[^/]' \| \ - X$ac_file : 'X\(//\)$' \| \ - X$ac_file : 'X\(/\)' \| . 2>/dev/null || -echo X$ac_file | +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +echo X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -7746,7 +7743,7 @@ # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/wsmancli-2.0.0/configure.in new/wsmancli-2.1.0/configure.in --- old/wsmancli-2.0.0/configure.in 2008-04-08 01:12:27.000000000 +0200 +++ new/wsmancli-2.1.0/configure.in 2008-09-15 04:01:23.000000000 +0200 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(wsmancli, 2.0.0) +AC_INIT(wsmancli, 2.1.0) AC_CONFIG_SRCDIR(wsmancli.spec.in) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) AM_CONFIG_HEADER(config.h) @@ -15,7 +15,7 @@ WSMAN_PKG=$PACKAGE_NAME AC_SUBST(WSMAN_PKG) -PKG_CHECK_MODULES(OPENWSMAN, [openwsman >= 2.0.0]) +PKG_CHECK_MODULES(OPENWSMAN, [openwsman >= 2.1.0]) have_cunit=no AC_CHECK_HEADERS([CUnit/Basic.h], have_cunit="yes" ) AM_CONDITIONAL(BUILD_CUNIT_TESTS, test "$have_cunit" == "yes") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/wsmancli-2.0.0/examples/cpp/Makefile.in new/wsmancli-2.1.0/examples/cpp/Makefile.in --- old/wsmancli-2.0.0/examples/cpp/Makefile.in 2008-04-06 19:34:23.000000000 +0200 +++ new/wsmancli-2.1.0/examples/cpp/Makefile.in 2008-09-15 04:02:59.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -49,7 +49,7 @@ Identify_OBJECTS = $(am_Identify_OBJECTS) Identify_LDADD = $(LDADD) Identify_DEPENDENCIES = -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -237,8 +237,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -250,8 +250,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -261,13 +261,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/wsmancli-2.0.0/examples/Makefile.in new/wsmancli-2.1.0/examples/Makefile.in --- old/wsmancli-2.0.0/examples/Makefile.in 2008-04-06 19:34:23.000000000 +0200 +++ new/wsmancli-2.1.0/examples/Makefile.in 2008-09-15 04:02:59.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -59,7 +59,7 @@ wsmid_identify_OBJECTS = $(am_wsmid_identify_OBJECTS) wsmid_identify_LDADD = $(LDADD) wsmid_identify_DEPENDENCIES = $(am__DEPENDENCIES_1) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -343,8 +343,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -369,8 +369,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -380,13 +380,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/wsmancli-2.0.0/Makefile.in new/wsmancli-2.1.0/Makefile.in --- old/wsmancli-2.0.0/Makefile.in 2008-04-06 19:34:23.000000000 +0200 +++ new/wsmancli-2.1.0/Makefile.in 2008-09-15 04:03:00.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -295,8 +295,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -321,8 +321,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -332,13 +332,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -408,6 +407,10 @@ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -434,6 +437,8 @@ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -584,7 +589,7 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-shar dist-tarZ dist-zip distcheck distclean \ + dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \ distclean-generic distclean-hdr distclean-tags distcleancheck \ distdir distuninstallcheck dvi dvi-am html html-am info \ info-am install install-am install-data install-data-am \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/wsmancli-2.0.0/src/Makefile.in new/wsmancli-2.1.0/src/Makefile.in --- old/wsmancli-2.0.0/src/Makefile.in 2008-04-06 19:34:23.000000000 +0200 +++ new/wsmancli-2.1.0/src/Makefile.in 2008-09-15 04:02:59.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -51,7 +51,7 @@ am_wsman_OBJECTS = wsman.$(OBJEXT) wsman_OBJECTS = $(am_wsman_OBJECTS) wsman_DEPENDENCIES = $(am__DEPENDENCIES_1) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -259,8 +259,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -272,8 +272,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -283,13 +283,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/wsmancli-2.0.0/src/wsman.c new/wsmancli-2.1.0/src/wsman.c --- old/wsmancli-2.0.0/src/wsman.c 2008-03-04 04:47:55.000000000 +0100 +++ new/wsmancli-2.1.0/src/wsman.c 2008-06-03 16:00:27.000000000 +0200 @@ -182,51 +182,51 @@ u_option_entry_t options[] = { {"debug", 'd', U_OPTION_ARG_INT, &debug_level, - "Set the verbosity of debugging output.", "1-6"}, + "Set the verbosity of debugging output.", "1-6"}, {"encoding", 'j', U_OPTION_ARG_STRING, &encoding, - "Set request message encoding"}, + "Set request message encoding"}, {"cacert", 'c', U_OPTION_ARG_STRING, &cainfo, - "Certificate file to verify the peer", "<filename>"}, + "Certificate file to verify the peer", "<filename>"}, {"cert", 'A', U_OPTION_ARG_STRING, &cert, - "Certificate file. The certificate must be in PEM format.", "<filename>"}, + "Certificate file. The certificate must be in PEM format.", "<filename>"}, {"sslkey", 'K', U_OPTION_ARG_STRING, &sslkey, - "SSL Key.", "<key>"}, + "SSL Key.", "<key>"}, {"username", 'u', U_OPTION_ARG_STRING, &username, - "User name", "<username>"}, + "User name", "<username>"}, {"path", 'g', U_OPTION_ARG_STRING, &url_path, - "Service Path (default: 'wsman')", "<path>"}, + "Service Path (default: 'wsman')", "<path>"}, {"input", 'J', U_OPTION_ARG_STRING, &input, - "File with resource for Create and Put operations in XML, can be a SOAP envelope", - "<filename>"}, + "File with resource for Create and Put operations in XML, can be a SOAP envelope", + "<filename>"}, {"password", 'p', U_OPTION_ARG_STRING, &password, - "User Password", "<password>"}, + "User Password", "<password>"}, {"hostname", 'h', U_OPTION_ARG_STRING, &server, - "Host name", "<hostname>"}, + "Host name", "<hostname>"}, {"endpoint", 'b', U_OPTION_ARG_STRING, &endpoint, - "End point", "<url>"}, + "End point", "<url>"}, {"port", 'P', U_OPTION_ARG_INT, &server_port, - "Server Port", "<port>"}, + "Server Port", "<port>"}, {"proxy", 'X', U_OPTION_ARG_STRING, &proxy, - "Proxy name", "<proxy>"}, + "Proxy name", "<proxy>"}, {"proxyauth", 'Y', U_OPTION_ARG_STRING, &proxy_upwd, - "Proxy user:pwd", "<proxyauth>"}, + "Proxy user:pwd", "<proxyauth>"}, {"auth", 'y', U_OPTION_ARG_STRING, &authentication_method, - "Authentication Method", "<basic|digest|gss>"}, + "Authentication Method", "<basic|digest|gss>"}, {"method", 'a', U_OPTION_ARG_STRING, &invoke_method, - "Method (Works only with 'invoke')", "<custom method>"}, + "Method (Works only with 'invoke')", "<custom method>"}, {"prop", 'k', U_OPTION_ARG_STRING_ARRAY, &properties, - "Properties with key value pairs (For 'put', 'invoke' and 'create')", - "<key=val>"}, + "Properties with key value pairs (For 'put', 'invoke' and 'create')", + "<key=val>"}, {"config-file", 'C', U_OPTION_ARG_STRING, &config_file, - "Alternate configuration file", "<file>"}, + "Alternate configuration file", "<file>"}, {"out-file", 'O', U_OPTION_ARG_STRING, &output_file, - "Write output to file", "<file>"}, + "Write output to file", "<file>"}, {"noverifypeer", 'V', U_OPTION_ARG_NONE, &noverify_peer, - "Not to verify peer certificate", NULL}, + "Not to verify peer certificate", NULL}, {"noverifyhost", 'v', U_OPTION_ARG_NONE, &noverify_host, - "Not to verify hostname", NULL}, + "Not to verify hostname", NULL}, {"transport-timeout", 'I', U_OPTION_ARG_INT, &transport_timeout, - "Transport timeout in seconds", "<time in sec>"}, + "Transport timeout in seconds", "<time in sec>"}, {NULL} }; @@ -234,94 +234,94 @@ u_option_entry_t request_options[] = { {"filter", 'x', U_OPTION_ARG_STRING, &wsm_filter, - "Filter", "<filter>"}, + "Filter", "<filter>"}, {"dialect", 'D', U_OPTION_ARG_STRING, &wsm_dialect, - "Filter Dialect", "<dialect>"}, + "Filter Dialect", "<dialect>"}, {"operation-timeout", 't', U_OPTION_ARG_INT, &operation_timeout, - "Operation timeout in seconds", "<time in sec>"}, + "Operation timeout in seconds", "<time in sec>"}, {"max-envelope-size", 'e', U_OPTION_ARG_INT, - &max_envelope_size, - "maximal envelope size", "<size>"}, + &max_envelope_size, + "maximal envelope size", "<size>"}, {"fragment", 'F', U_OPTION_ARG_STRING, &fragment, - "Fragment (Supported Dialects: XPATH)", "<fragment>"}, + "Fragment (Supported Dialects: XPATH)", "<fragment>"}, {NULL} }; u_option_entry_t enum_options[] = { {"max-elements", 'm', U_OPTION_ARG_INT, &enum_max_elements, - "Max Elements Per Pull/Optimized Enumeration", - "<max number of elements>"}, + "Max Elements Per Pull/Optimized Enumeration", + "<max number of elements>"}, {"optimize", 'o', U_OPTION_ARG_NONE, &enum_optimize, - "Optimize enumeration results", NULL}, + "Optimize enumeration results", NULL}, {"estimate-count", 'E', U_OPTION_ARG_NONE, &enum_estimate, - "Return estimation of total items", NULL}, + "Return estimation of total items", NULL}, {"enum-mode", 'M', U_OPTION_ARG_STRING, &enum_mode, - "Enumeration Mode", "epr|objepr"}, + "Enumeration Mode", "epr|objepr"}, {"enum-context", 'U', U_OPTION_ARG_STRING, &enum_context, - "Enumeration Context (For use with Pull and Release)", - "<enum context>"}, + "Enumeration Context (For use with Pull and Release)", + "<enum context>"}, {NULL} }; u_option_entry_t event_options[] = { {"delivery-mode", 'G', U_OPTION_ARG_STRING, &event_delivery_mode, - "Four delivery modes available: push/pushwithack/events/pull", - "<mode>"}, + "Four delivery modes available: push/pushwithack/events/pull", + "<mode>"}, {"delivery-sec-mode", 's', U_OPTION_ARG_STRING, &event_delivery_sec_mode, - "Four delivery modes available: httpbasic/httpdigest/httpsbasic/httpsdigest/httpsmutual/httpsmutualbasic/httpsmutualdigest", - "<mode>"}, + "Four delivery modes available: httpbasic/httpdigest/httpsbasic/httpsdigest/httpsmutual/httpsmutualbasic/httpsmutualdigest", + "<mode>"}, {"delivery-username", 'n', U_OPTION_ARG_STRING, &event_username, - "username for the eventing receiver", - "<username>"}, + "username for the eventing receiver", + "<username>"}, {"delivery-password", 'z', U_OPTION_ARG_STRING, &event_password, - "password for the eventing receiver", - "<password>"}, + "password for the eventing receiver", + "<password>"}, {"delivery-thumbprint", 'Y', U_OPTION_ARG_STRING, &event_thumbprint, - "ceritificate thumbprint of the eventing receiver", - "<thumbprint>"}, + "ceritificate thumbprint of the eventing receiver", + "<thumbprint>"}, {"notification-uri", 'Z', U_OPTION_ARG_STRING, &event_delivery_uri, - "Where notifications are sent", - "<uri>"}, + "Where notifications are sent", + "<uri>"}, {"subscription-expiry-time", 'r', U_OPTION_ARG_INT, &event_subscription_expire, - "subscription expiry time in seconds", - "<seconds>"}, + "subscription expiry time in seconds", + "<seconds>"}, {"heartbeat",'H', U_OPTION_ARG_INT, &event_heartbeat, - "Send hearbeat in an interval", - "<seconds>"}, + "Send hearbeat in an interval", + "<seconds>"}, {"bookmark", 'l', U_OPTION_ARG_NONE, &event_sendbookmark, - "Send bookmark",NULL}, + "Send bookmark",NULL}, {"subscription-identifier", 'i', U_OPTION_ARG_STRING, &event_subscription_id, - "Used to specify which subscription", - "<uuid:XXX>"}, + "Used to specify which subscription", + "<uuid:XXX>"}, {"event-reference-properties", 'L', U_OPTION_ARG_STRING, &event_reference_properties, - "Event Reference Properties, correlation of Events with Subscription", - "<xml string>"}, + "Event Reference Properties, correlation of Events with Subscription", + "<xml string>"}, {NULL} }; u_option_entry_t cim_options[] = { {"namespace", 'N', U_OPTION_ARG_STRING, &cim_namespace, - "CIM Namespace (default is root/cimv2)", "<namespace>"}, + "CIM Namespace (default is root/cimv2)", "<namespace>"}, {"binding-enum-mode", 'B', U_OPTION_ARG_STRING, - &binding_enum_mode, - "CIM binding Enumeration Mode", "none|include|exclude"}, + &binding_enum_mode, + "CIM binding Enumeration Mode", "none|include|exclude"}, {"cim-extensions", 'T', U_OPTION_ARG_NONE, &cim_extensions, - "Show CIM Extensions", NULL}, + "Show CIM Extensions", NULL}, {NULL} }; u_option_entry_t test_options[] = { {"from-file", 'f', U_OPTION_ARG_STRING, &test_case, - "Send request from file", "<file name>"}, + "Send request from file", "<file name>"}, {"print-request", 'R', U_OPTION_ARG_NONE, &dump_request, - "print request on stdout", NULL}, + "print request on stdout", NULL}, {"request", 'Q', U_OPTION_ARG_NONE, &request_only, - "Only output reqest. Not send it.", NULL}, + "Only output reqest. Not send it.", NULL}, {"step", 'S', U_OPTION_ARG_NONE, &step, - "Do not perform multiple operations (do not pull data when enumerating)", - NULL}, + "Do not perform multiple operations (do not pull data when enumerating)", + NULL}, //{ "print-response", 'N', 0, G_OPTION_ARG_NONE, &dump_response, "print all responses to stdout", NULL}, {NULL} }; @@ -335,12 +335,12 @@ u_option_context_t *opt_ctx; opt_ctx = u_option_context_new("<action> <Resource Uri>"); enum_group = u_option_group_new("enumeration", "Enumeration", - "Enumeration Options"); + "Enumeration Options"); test_group = u_option_group_new("tests", "Tests", "Test Cases"); cim_group = u_option_group_new("cim", "CIM", "CIM Options"); event_group = u_option_group_new("event", "Event subscription", "Subscription Options"); req_flag_group = - u_option_group_new("flags", "Flags", "Request Flags"); + u_option_group_new("flags", "Flags", "Request Flags"); u_option_group_add_entries(enum_group, enum_options); u_option_group_add_entries(test_group, test_options); @@ -371,15 +371,15 @@ resource_uri_opt = argv[2]; } else { if (argv[1] && (strcmp(argv[1], "identify") == 0 || - strcmp(argv[1], "test") == 0 || - strcmp(argv[1], "anonid") == 0 || - strcmp(argv[1], "unsubscribe") == 0 || - strcmp(argv[1], "renew") == 0)) { + strcmp(argv[1], "test") == 0 || + strcmp(argv[1], "anonid") == 0 || + strcmp(argv[1], "unsubscribe") == 0 || + strcmp(argv[1], "renew") == 0)) { _action = argv[1]; } else { fprintf(stderr, - "Error: operation can not be completed." - " Action or/and Resource Uri missing.\n"); + "Error: operation can not be completed." + " Action or/and Resource Uri missing.\n"); return FALSE; } } @@ -433,39 +433,39 @@ static void initialize_logging(void) { debug_add_handler(wsman_debug_message_handler, DEBUG_LEVEL_ALWAYS, - NULL); + NULL); } static void request_usr_pwd( WsManClient *client, wsman_auth_type_t auth, - char **username, - char **password) + char **username, + char **password) { - char *pw; - char user[21]; - char *p; - - fprintf(stdout,"Authentication failed, please retry\n"); - /* - fprintf(stdout, "%s authentication is used\n", - wsmc_transport_get_auth_name( auth)); - */ - printf("User name: "); - fflush(stdout); - if ( (p = fgets(user, 20, stdin) ) != NULL ) - { - - if (strchr(user, '\n')) - (*(strchr(user, '\n'))) = '\0'; - *username = u_strdup_printf ("%s", user); - } else { - *username = NULL; - } + char *pw; + char user[21]; + char *p; - pw = (char *)getpass("Password: "); - *password = u_strdup_printf ("%s", pw); + fprintf(stdout,"Authentication failed, please retry\n"); + /* + fprintf(stdout, "%s authentication is used\n", + wsmc_transport_get_auth_name( auth)); + */ + printf("User name: "); + fflush(stdout); + if ( (p = fgets(user, 20, stdin) ) != NULL ) + { + + if (strchr(user, '\n')) + (*(strchr(user, '\n'))) = '\0'; + *username = u_strdup_printf ("%s", user); + } else { + *username = NULL; + } + + pw = (char *)getpass("Password: "); + *password = u_strdup_printf ("%s", pw); } @@ -478,9 +478,14 @@ while (properties != NULL && properties[c] != NULL) { char *cc[3]; u_tokenize1(cc, 2, properties[c], '='); - if (!hash_alloc_insert(h, cc[0], cc[1])) { - debug("hash_alloc_insert failed"); + if (!hash_lookup(h, cc[0])) { + if (!hash_alloc_insert(h, cc[0], cc[1])) { + debug("hash_alloc_insert failed"); + } + } else { + warn("duplicate not added to hash"); } + c++; } return h; @@ -502,15 +507,15 @@ static int wsman_options_get_delivery_sec_mode(void) { - int mode = 0; - int i; - for (i = 0; delivery_sec_mode[i].action != NULL; i++) { - if (strcmp(delivery_sec_mode[i].action, event_delivery_sec_mode) == 0) { - mode = delivery_sec_mode[i].value; - break; - } - } - return mode; + int mode = 0; + int i; + for (i = 0; delivery_sec_mode[i].action != NULL; i++) { + if (strcmp(delivery_sec_mode[i].action, event_delivery_sec_mode) == 0) { + mode = delivery_sec_mode[i].value; + break; + } + } + return mode; } @@ -519,10 +524,10 @@ if (iniparser_find_entry(ini, "client")) { agent = iniparser_getstr(ini, "client:agent"); server_port = server_port ? - server_port : iniparser_getint(ini, "client:port", 80); + server_port : iniparser_getint(ini, "client:port", 80); authentication_method = authentication_method ? - authentication_method : - iniparser_getstr(ini, "client:authentication_method"); + authentication_method : + iniparser_getstr(ini, "client:authentication_method"); } else { return 0; } @@ -544,7 +549,7 @@ WsXmlDocH enum_response; WsXmlDocH resource = NULL; char *enumeration_mode, *binding_enumeration_mode, - *resource_uri_with_selectors; + *resource_uri_with_selectors; char *event_mode, *delivery_uri; char *resource_uri = NULL; char subscontext[512]; @@ -557,7 +562,7 @@ ini = iniparser_new(filename); if (ini == NULL) { fprintf(stderr, "cannot parse file [%s]", - filename); + filename); exit(EXIT_FAILURE); } else if (!wsman_read_client_config(ini)) { fprintf(stderr, "Configuration file not found\n"); @@ -622,12 +627,12 @@ if (resource_uri_with_selectors && strcmp(resource_uri_with_selectors,CIM_ALL_AVAILABLE_CLASSES) != 0) { wsmc_set_options_from_uri(resource_uri_with_selectors, - options); + options); wsmc_remove_query_string(resource_uri_with_selectors, - &resource_uri); + &resource_uri); } else if (resource_uri_with_selectors) { wsmc_remove_query_string(resource_uri_with_selectors, - &resource_uri); + &resource_uri); } op = wsman_options_get_action(); if (encoding) { @@ -675,8 +680,8 @@ resource = wsmc_read_file(input, wsmc_get_encoding(cl), 0); } doc = wsmc_action_invoke(cl, resource_uri, options, - invoke_method, - resource); + invoke_method, + resource); ws_xml_destroy_doc(resource); wsman_output(cl, doc); if (doc) { @@ -695,8 +700,8 @@ if (input) { resource = wsmc_read_file(input, "UTF-8", 0); doc = - wsmc_action_create(cl, resource_uri, options, - resource); + wsmc_action_create(cl, resource_uri, options, + resource); ws_xml_destroy_doc(resource); wsman_output(cl, doc); if (doc) { @@ -711,12 +716,12 @@ printf("input file provided\n"); resource = wsmc_read_file(input, wsmc_get_encoding(cl), 0); doc = wsmc_action_put(cl, resource_uri, options, - resource); + resource); ws_xml_destroy_doc(resource); } else { doc = - wsmc_action_get_and_put(cl, resource_uri, - options); + wsmc_action_get_and_put(cl, resource_uri, + options); } wsman_output(cl, doc); if (doc) { @@ -739,8 +744,8 @@ break; case WSMAN_ACTION_RELEASE: doc = - wsmc_action_release(cl, resource_uri, options, - enum_context); + wsmc_action_release(cl, resource_uri, options, + enum_context); wsman_output(cl, doc); if (doc) { ws_xml_destroy_doc(doc); @@ -761,52 +766,72 @@ } else { error("Filter Requied"); } - } - else + } else if (wsm_dialect && strcmp(wsm_dialect, WSM_SELECTOR_FILTER_DIALECT) == 0 ) { + // fixme: Namespace + if (wsm_filter) { + hscan_t hs; + hnode_t *hn; + hash_t *selfilter = NULL; + hash_t *selectors_new = NULL; + selector_entry *entry; + selectors_new = hash_create2(HASHCOUNT_T_MAX, 0, 0); + selfilter = u_parse_query(wsm_filter); + hash_scan_begin(&hs, selfilter); + while ((hn = hash_scan_next(&hs))) { + entry = u_malloc(sizeof(selector_entry)); + entry->type = 0; + entry->entry.text = (char *)hnode_get(hn); + hash_alloc_insert(selectors_new, hnode_getkey(hn), entry); + } + + if (hash_count(selectors_new) > 0 ) + filter = filter_create_selector(selectors_new); + } + } else { filter = filter_create_simple(wsm_dialect, wsm_filter); + } enumeration_mode = enum_mode; - binding_enumeration_mode = - binding_enum_mode; + binding_enumeration_mode = binding_enum_mode; if (enumeration_mode) { if (strcmp(enumeration_mode, "epr") == 0) wsmc_set_action_option(options, - FLAG_ENUMERATION_ENUM_EPR); + FLAG_ENUMERATION_ENUM_EPR); else if (strcmp(enumeration_mode, "objepr") == 0) wsmc_set_action_option(options, - FLAG_ENUMERATION_ENUM_OBJ_AND_EPR); + FLAG_ENUMERATION_ENUM_OBJ_AND_EPR); } if (binding_enumeration_mode) { if (strcmp(binding_enumeration_mode, "include") == - 0) + 0) wsmc_set_action_option(options, - FLAG_IncludeSubClassProperties); + FLAG_IncludeSubClassProperties); else if (strcmp - (binding_enumeration_mode, - "exclude") == 0) + (binding_enumeration_mode, + "exclude") == 0) wsmc_set_action_option(options, - FLAG_ExcludeSubClassProperties); + FLAG_ExcludeSubClassProperties); else if (strcmp(binding_enumeration_mode, "none") - == 0) + == 0) wsmc_set_action_option(options, - FLAG_POLYMORPHISM_NONE); + FLAG_POLYMORPHISM_NONE); } if (enum_optimize) { wsmc_set_action_option(options, - FLAG_ENUMERATION_OPTIMIZATION); + FLAG_ENUMERATION_OPTIMIZATION); } options->max_elements = enum_max_elements; if (enum_estimate) { wsmc_set_action_option(options, - FLAG_ENUMERATION_COUNT_ESTIMATION); + FLAG_ENUMERATION_COUNT_ESTIMATION); } enum_response = wsmc_action_enumerate(cl, resource_uri, options, filter); wsman_output(cl, enum_response); if (enum_response) { if (!(wsmc_get_response_code(cl) == 200 || - wsmc_get_response_code(cl) == 400 || - wsmc_get_response_code(cl) == 500)) { + wsmc_get_response_code(cl) == 400 || + wsmc_get_response_code(cl) == 500)) { break; } enumContext = wsmc_get_enum_context(enum_response); @@ -846,7 +871,7 @@ if(event_delivery_mode) options->delivery_mode = wsman_options_get_delivery_mode(); if(event_delivery_sec_mode) - options->delivery_sec_mode = wsman_options_get_delivery_sec_mode(); + options->delivery_sec_mode = wsman_options_get_delivery_sec_mode(); if(event_username) options->delivery_username = event_username; if(event_password) @@ -872,8 +897,8 @@ break; case WSMAN_ACTION_UNSUBSCRIBE: snprintf(subscontext, 512 , "<wsa:ReferenceParameters xmlns:wsa=\"http://schemas.xmlsoap.org/ws/2004/08/addressing\" \ - xmlns:wse=\"http://schemas.xmlsoap.org/ws/2004/08/eventing\"><wse:Identifier>%s</wse:Identifier> \ - </wsa:ReferenceParameters>", event_subscription_id); + xmlns:wse=\"http://schemas.xmlsoap.org/ws/2004/08/eventing\"><wse:Identifier>%s</wse:Identifier> \ + </wsa:ReferenceParameters>", event_subscription_id); rqstDoc = wsmc_action_unsubscribe(cl, resource_uri, options, subscontext); wsman_output(cl, rqstDoc); if (rqstDoc) { @@ -884,8 +909,8 @@ if(event_subscription_expire) options->expires = event_subscription_expire; snprintf(subscontext, 512 , "<wsa:ReferenceParameters xmlns:wsa=\"http://schemas.xmlsoap.org/ws/2004/08/addressing\" \ - xmlns:wse=\"http://schemas.xmlsoap.org/ws/2004/08/eventing\"><wse:Identifier>%s</wse:Identifier> \ - </wsa:ReferenceParameters>", event_subscription_id); + xmlns:wse=\"http://schemas.xmlsoap.org/ws/2004/08/eventing\"><wse:Identifier>%s</wse:Identifier> \ + </wsa:ReferenceParameters>", event_subscription_id); rqstDoc = wsmc_action_renew(cl, resource_uri, options, subscontext); wsman_output(cl, rqstDoc); if (rqstDoc) { @@ -900,10 +925,10 @@ if (wsmc_get_response_code(cl) != 200) { fprintf(stderr, "Connection failed. response code = %ld\n", - wsmc_get_response_code(cl)); + wsmc_get_response_code(cl)); if (wsmc_get_fault_string(cl)) { fprintf(stderr, "%s\n", - wsmc_get_fault_string(cl)); + wsmc_get_fault_string(cl)); } } wsmc_options_destroy(options); @@ -915,7 +940,7 @@ } #ifdef DEBUG_VERBOSE printf(" ****** Transfer Time = %ull usecs ******\n", - get_transfer_time()); + get_transfer_time()); #endif return retVal; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/wsmancli-2.0.0/tests/cunit/enumeration.c new/wsmancli-2.1.0/tests/cunit/enumeration.c --- old/wsmancli-2.0.0/tests/cunit/enumeration.c 2007-08-03 14:38:46.000000000 +0200 +++ new/wsmancli-2.1.0/tests/cunit/enumeration.c 2008-05-27 16:41:30.000000000 +0200 @@ -264,7 +264,7 @@ options->max_elements = tests[i].max_elements; WsXmlDocH enum_response = wsmc_action_enumerate(cl, - (char *)tests[i].resource_uri, options); + (char *)tests[i].resource_uri, options, NULL); CU_ASSERT_TRUE(wsmc_get_response_code(cl) == tests[i].final_status); if (wsmc_get_response_code(cl) != tests[i].final_status) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/wsmancli-2.0.0/tests/cunit/Makefile.in new/wsmancli-2.1.0/tests/cunit/Makefile.in --- old/wsmancli-2.0.0/tests/cunit/Makefile.in 2008-04-06 19:34:23.000000000 +0200 +++ new/wsmancli-2.1.0/tests/cunit/Makefile.in 2008-09-15 04:03:00.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -47,7 +47,7 @@ wsman_cunit_tests_OBJECTS = $(am_wsman_cunit_tests_OBJECTS) am__DEPENDENCIES_1 = wsman_cunit_tests_DEPENDENCIES = $(am__DEPENDENCIES_1) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -243,8 +243,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -256,8 +256,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -267,13 +267,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/wsmancli-2.0.0/tests/cunit/pull.c new/wsmancli-2.1.0/tests/cunit/pull.c --- old/wsmancli-2.0.0/tests/cunit/pull.c 2007-08-03 14:39:15.000000000 +0200 +++ new/wsmancli-2.1.0/tests/cunit/pull.c 2008-05-27 16:42:33.000000000 +0200 @@ -161,7 +161,7 @@ options->max_elements = pull_tests[i].max_elements; WsXmlDocH enum_response = wsmc_action_enumerate(cl, - (char *)pull_tests[i].resource_uri, options); + (char *)pull_tests[i].resource_uri, options, NULL); CU_ASSERT_TRUE(wsmc_get_response_code(cl) == pull_tests[i].final_status); if (wsmc_get_response_code(cl) != pull_tests[i].final_status) { @@ -182,7 +182,7 @@ while (enumContext != NULL) { WsXmlDocH docp = wsmc_action_pull(cl, (char *)pull_tests[i].resource_uri, - options, enumContext); + options, NULL, enumContext); CU_ASSERT_PTR_NOT_NULL(docp); if (!docp) { goto RETURN; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/wsmancli-2.0.0/tests/interop/Makefile.in new/wsmancli-2.1.0/tests/interop/Makefile.in --- old/wsmancli-2.0.0/tests/interop/Makefile.in 2008-04-06 19:34:23.000000000 +0200 +++ new/wsmancli-2.1.0/tests/interop/Makefile.in 2008-09-15 04:03:00.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -46,7 +46,7 @@ interop_LDADD = $(LDADD) am__DEPENDENCIES_1 = interop_DEPENDENCIES = $(am__DEPENDENCIES_1) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -226,8 +226,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -239,8 +239,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -250,13 +250,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/wsmancli-2.0.0/tests/Makefile.in new/wsmancli-2.1.0/tests/Makefile.in --- old/wsmancli-2.0.0/tests/Makefile.in 2008-04-06 19:34:23.000000000 +0200 +++ new/wsmancli-2.1.0/tests/Makefile.in 2008-09-15 04:03:00.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -256,8 +256,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -282,8 +282,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -293,13 +293,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de