Hello community, here is the log from the commit of package wsmancli for openSUSE:Factory checked in at 2012-11-08 21:54:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wsmancli (Old) and /work/SRC/openSUSE:Factory/.wsmancli.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wsmancli", Maintainer is "prus...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/wsmancli/wsmancli.changes 2011-09-23 12:50:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wsmancli.new/wsmancli.changes 2012-11-08 21:54:52.000000000 +0100 @@ -1,0 +2,9 @@ +Thu Nov 8 15:08:46 UTC 2012 - kkae...@suse.com + +- Update to version 2.3.0 + - don't crash on filter parse error (Zoltan Micskei) + - remove -Q (don't send request) option + - complain about bad filter expression + - fix autotools build for MacOS (Dan Villiom Podlaski Christiansen) + +------------------------------------------------------------------- Old: ---- wsmancli-2.2.7.1.tar.bz2 New: ---- wsmancli-2.3.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wsmancli.spec ++++++ --- /var/tmp/diff_new_pack.oxALo5/_old 2012-11-08 21:54:53.000000000 +0100 +++ /var/tmp/diff_new_pack.oxALo5/_new 2012-11-08 21:54:53.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package wsmancli # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,23 +15,24 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: wsmancli -BuildRequires: gcc-c++ libwsman-devel >= 2.2.7 libwsman_clientpp-devel >= 2.2.7 pkgconfig +BuildRequires: gcc-c++ +BuildRequires: libwsman-devel >= 2.2.7 +BuildRequires: libwsman_clientpp-devel >= 2.2.7 +BuildRequires: pkgconfig %if 0%{?suse_version} > 1010 BuildRequires: libcurl-devel %else # SLE 10 BuildRequires: curl-devel %endif -Version: 2.2.7.1 -Release: 11 +Version: 2.3.0 +Release: 0 Url: http://www.openwsman.org/ +Summary: Opensource Implementation of WS-Management - Command line utility License: BSD-3-Clause Group: System/Management -Summary: Opensource Implementation of WS-Management - Command line utility Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ wsmancli-2.2.7.1.tar.bz2 -> wsmancli-2.3.0.tar.bz2 ++++++ ++++ 35425 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wsmancli-2.2.7.1/ChangeLog new/wsmancli-2.3.0/ChangeLog --- old/wsmancli-2.2.7.1/ChangeLog 2011-09-14 21:09:09.000000000 +0200 +++ new/wsmancli-2.3.0/ChangeLog 2012-11-08 15:48:39.000000000 +0100 @@ -1,3 +1,9 @@ +Version 2.3.0 + - don't crash on filter parse error (Zoltan Micskei) + - remove -Q (don't send request) option + - complain about bad filter expression + - fix autotools build for MacOS (Dan Villiom Podlaski Christiansen) + Version 2.2.7.1 - adapt to reduced libu exposure in openwsman diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wsmancli-2.2.7.1/Makefile.am new/wsmancli-2.3.0/Makefile.am --- old/wsmancli-2.2.7.1/Makefile.am 2010-03-05 13:31:37.000000000 +0100 +++ new/wsmancli-2.3.0/Makefile.am 2012-11-08 15:45:19.000000000 +0100 @@ -1,6 +1,13 @@ -SUBDIRS = src examples tests +SUBDIRS = src AUTOMAKE_OPTIONS = no-dist-gzip dist-bzip2 +if BUILD_EXAMPLES +SUBDIRS += examples +endif +if BUILD_TESTS +SUBDIRS += tests +endif + package: dist cp wsmancli.spec /usr/src/packages/SPEC cp wsmancli-*.tar.gz /usr/src/packages/SOURCES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wsmancli-2.2.7.1/config.h.in new/wsmancli-2.3.0/config.h.in --- old/wsmancli-2.2.7.1/config.h.in 2010-09-13 10:35:16.000000000 +0200 +++ new/wsmancli-2.3.0/config.h.in 2012-11-08 15:49:35.000000000 +0100 @@ -3,6 +3,9 @@ /* Define to 1 if you have the <CUnit/Basic.h> header file. */ #undef HAVE_CUNIT_BASIC_H +/* Define to 1 if you have the <dlfcn.h> header file. */ +#undef HAVE_DLFCN_H + /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H @@ -30,6 +33,10 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + /* Name of package */ #undef PACKAGE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wsmancli-2.2.7.1/configure.in new/wsmancli-2.3.0/configure.in --- old/wsmancli-2.2.7.1/configure.in 2011-09-14 21:09:29.000000000 +0200 +++ new/wsmancli-2.3.0/configure.in 2012-11-08 15:46:48.000000000 +0100 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(wsmancli, 2.2.7.1) +AC_INIT(wsmancli, 2.3.0) AC_CONFIG_SRCDIR(wsmancli.spec.in) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) AM_CONFIG_HEADER(config.h) @@ -11,6 +11,7 @@ AC_PROG_CXX AM_PROG_CC_STDC AC_HEADER_STDC +AM_PROG_LIBTOOL WSMAN_PKG=$PACKAGE_NAME AC_SUBST(WSMAN_PKG) @@ -21,6 +22,18 @@ have_cunit=no AC_CHECK_HEADERS([CUnit/Basic.h], have_cunit="yes" ) AM_CONDITIONAL(BUILD_CUNIT_TESTS, test "$have_cunit" == "yes") + +examples_default=no +AC_ARG_WITH(examples, + [ --with-examples=[no/yes] build examples [default=no]],, + with_examples=$examples_default) +AM_CONDITIONAL(BUILD_EXAMPLES, test "x$with_examples" = "xyes") +tests_default=no +AC_ARG_WITH(tests, + [ --with-tests=[no/yes] build tests [default=no]],, + with_tests=$tests_default) +AM_CONDITIONAL(BUILD_TESTS, test "x$with_tests" = "xyes") + dnl ************************************* dnl *** Warnings to show if using GCC *** dnl ************************************* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wsmancli-2.2.7.1/examples/cpp/Makefile.am new/wsmancli-2.3.0/examples/cpp/Makefile.am --- old/wsmancli-2.2.7.1/examples/cpp/Makefile.am 2010-03-05 13:31:37.000000000 +0100 +++ new/wsmancli-2.3.0/examples/cpp/Makefile.am 2012-11-08 15:45:29.000000000 +0100 @@ -1,6 +1,6 @@ LDADD = \ - -lwsman -lwsman_clientpp + $(OPENWSMAN_LIBS) -lwsman_clientpp CXXFLAGS = \ $(OPENWSMAN_CFLAGS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wsmancli-2.2.7.1/src/wseventmgr.c new/wsmancli-2.3.0/src/wseventmgr.c --- old/wsmancli-2.2.7.1/src/wseventmgr.c 2011-09-14 21:03:40.000000000 +0200 +++ new/wsmancli-2.3.0/src/wseventmgr.c 2012-11-08 16:07:32.000000000 +0100 @@ -247,13 +247,10 @@ }; u_option_group_t *event_group; - u_option_group_t *req_flag_group; u_option_context_t *opt_ctx; opt_ctx = u_option_context_new("<action> <Resource Uri>"); 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_add_entries(event_group, event_options); @@ -264,11 +261,16 @@ retval = u_option_context_parse(opt_ctx, &argc, &argv, &error); u_option_context_free(opt_ctx); - if (error) { + if (retval == 0) { + if (error) { if (error->message) printf("%s\n", error->message); u_error_free(error); - return FALSE; + } + else { + fprintf(stderr, "Can't parse context information\n"); + } + return FALSE; } if (argc > 2) { @@ -408,7 +410,6 @@ WsXmlDocH rqstDoc; client_opt_t *options; char *resource_uri_with_selectors; - char *event_mode, *delivery_uri; char *resource_uri = NULL; char subscontext[512]; filter_t *filter = NULL; @@ -504,8 +505,6 @@ } break; case WSMAN_ACTION_SUBSCRIBE: - event_mode = event_delivery_mode; - delivery_uri = event_delivery_uri; if(event_sendbookmark) wsmc_set_action_option(options, FLAG_EVENT_SENDBOOKMARK); if(event_delivery_mode) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wsmancli-2.2.7.1/src/wsman.c new/wsmancli-2.3.0/src/wsman.c --- old/wsmancli-2.2.7.1/src/wsman.c 2011-09-14 21:03:22.000000000 +0200 +++ new/wsmancli-2.3.0/src/wsman.c 2012-11-08 15:58:54.000000000 +0100 @@ -84,7 +84,6 @@ char enum_estimate = 0; char dump_request = 0; char step = 0; -char request_only = 0; char cim_extensions = 0; static char *enum_mode = NULL; static char *binding_enum_mode = NULL; @@ -241,7 +240,7 @@ {"dialect", 'D', U_OPTION_ARG_STRING, &wsm_dialect, "Filter Dialect", "<dialect>"}, {"operation-timeout", 't', U_OPTION_ARG_INT, &operation_timeout, - "Operation timeout in seconds", "<time in sec>"}, + "Operation timeout in milliseconds", "<time in msec>"}, {"max-envelope-size", 'e', U_OPTION_ARG_INT, &max_envelope_size, "maximal envelope size", "<size>"}, @@ -320,8 +319,6 @@ "Send request from file", "<file name>"}, {"print-request", 'R', U_OPTION_ARG_NONE, &dump_request, "print request on stdout", NULL}, - {"request", 'Q', U_OPTION_ARG_NONE, &request_only, - "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}, @@ -362,11 +359,16 @@ retval = u_option_context_parse(opt_ctx, &argc, &argv, &error); u_option_context_free(opt_ctx); - if (error) { + if (retval == 0) { + if (error) { if (error->message) - printf("%s\n", error->message); + fprintf(stderr, "%s\n", error->message); u_error_free(error); - return FALSE; + } + else { + fprintf(stderr, "Can't parse context information\n"); + } + return FALSE; } if (my_version) { @@ -626,7 +628,6 @@ WsXmlDocH resource = NULL; char *enumeration_mode, *binding_enumeration_mode, *resource_uri_with_selectors; - char *event_mode, *delivery_uri; char *resource_uri = NULL; char subscontext[512]; filter_t *filter = NULL; @@ -873,6 +874,10 @@ selector_entry *entry; selectors_new = hash_create2(HASHCOUNT_T_MAX, 0, 0); selfilter = u_parse_query(wsm_filter); + if (!selfilter) { + error("Filter parse error"); + break; + } hash_scan_begin(&hs, selfilter); while ((hn = hash_scan_next(&hs))) { entry = u_malloc(sizeof(selector_entry)); @@ -961,8 +966,6 @@ u_free(enumContext); break; case WSMAN_ACTION_SUBSCRIBE: - event_mode = event_delivery_mode; - delivery_uri = event_delivery_uri; if(event_sendbookmark) wsmc_set_action_option(options, FLAG_EVENT_SENDBOOKMARK); if(event_delivery_mode) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wsmancli-2.2.7.1/wsmancli.spec.in new/wsmancli-2.3.0/wsmancli.spec.in --- old/wsmancli-2.2.7.1/wsmancli.spec.in 2011-09-08 09:23:14.000000000 +0200 +++ new/wsmancli-2.3.0/wsmancli.spec.in 2011-09-14 21:33:31.000000000 +0200 @@ -6,7 +6,7 @@ Name: wsmancli -BuildRequires: gcc-c++ libwsman-devel pkgconfig +BuildRequires: gcc-c++ libwsman-devel >= 2.2.7 libwsman_clientpp-devel >= 2.2.7 pkgconfig %if 0%{?suse_version} > 1010 BuildRequires: libcurl-devel %else -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
