September 2018 - openSUSE Commits - openSUSE Mailing Lists

commit pocl for openSUSE:Factory
by root 25 Sep '18

25 Sep '18

Hello community, here is the log from the commit of package pocl for openSUSE:Factory checked in at 2018-09-25 15:44:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pocl (Old) and /work/SRC/openSUSE:Factory/.pocl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pocl" Tue Sep 25 15:44:45 2018 rev:16 rq:638018 version:1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/pocl/pocl.changes 2018-08-03 12:39:14.539742673 +0200 +++ /work/SRC/openSUSE:Factory/.pocl.new/pocl.changes 2018-09-25 15:45:59.657061672 +0200 @@ -1,0 +2,9 @@ +Tue Sep 25 10:30:51 UTC 2018 - Ondřej Súkup <mimi.vx(a)gmail.com> + +- update to version 1.2 + * Support for LLVM/Clang 7.0 and 6.0 + * HWLOC 2.0 support +- build kernels with distro support - detect and load cpu + optimized code on runtime + +------------------------------------------------------------------- Old: ---- pocl-1.1.tar.gz New: ---- pocl-1.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pocl.spec ++++++ --- /var/tmp/diff_new_pack.2A9YDd/_old 2018-09-25 15:46:00.177061117 +0200 +++ /var/tmp/diff_new_pack.2A9YDd/_new 2018-09-25 15:46:00.181061113 +0200 @@ -13,13 +13,13 @@ # 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/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define sover 2.1.0 +%define sover 2.2.0 Name: pocl -Version: 1.1 +Version: 1.2 Release: 0 Summary: Portable Computing Language - an OpenCL implementation # The whole code is under MIT @@ -28,11 +28,10 @@ License: MIT Group: Development/Tools/Other URL: http://portablecl.org/ -#Source0: http://portablecl.org/downloads/%{name}-%{version}.tar.gz Source0: https://github.com/pocl/pocl/archive/v%{version}.tar.gz#/%{name}-%{version}… Source99: pocl-rpmlintrc -BuildRequires: clang < 7 -BuildRequires: clang-devel < 7 +BuildRequires: clang < 8 +BuildRequires: clang-devel < 8 BuildRequires: cmake BuildRequires: libboost_headers-devel BuildRequires: libtool @@ -45,7 +44,7 @@ BuildRequires: pkgconfig(OpenCL) BuildRequires: pkgconfig(glew) BuildRequires: pkgconfig(hwloc) -Requires: clang < 7 +Requires: clang < 8 Requires: gcc Requires: libstdc++-devel Requires: libut2 @@ -100,12 +99,12 @@ %define __builder ninja %cmake \ -DENABLE_CUDA=0 \ - -DENABLE_ICD=1 \ + -DENABLE_ICD=ON \ -DPOCL_INSTALL_ICD_VENDORDIR=%{_sysconfdir}/OpenCL/vendors \ -DCMAKE_C_COMPILER=clang \ -DCMAKE_CXX_COMPILER=clang++ \ %ifarch %{ix86} x86_64 - -DLLC_HOST_CPU=core2 \ + -DKERNELLIB_HOST_CPU_VARIANTS=distro \ %endif -DEXTRA_KERNEL_CXX_FLAGS="%{optflags} -std=c++11" \ -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" \ @@ -121,18 +120,15 @@ sed -i 's|%{_prefix}%{_prefix}/|%{_prefix}/|g' %{buildroot}%{_sysconfdir}/OpenCL/vendors/pocl.icd # Unbundle vecmath #rm -vf %%{buildroot}/%%{_libdir}/pocl/vecmath/ -#ln -vs %%{_includedir}/vecmath %{buildroot}/%%{_libdir}/pocl/vecmath +#ln -vs %%{_includedir}/vecmath %%{buildroot}/%%{_libdir}/pocl/vecmath # <visit0r> but you need to run the .py to generate the files under the pocl dir -#%%check -#cd build -#ctest - %post -n libpocl2 -p /sbin/ldconfig %postun -n libpocl2 -p /sbin/ldconfig %files %doc CHANGES README doc/sphinx/source/*.rst +%license LICENSE %dir %{_sysconfdir}/OpenCL/ %dir %{_sysconfdir}/OpenCL/vendors %{_sysconfdir}/OpenCL/vendors/pocl.icd ++++++ pocl-1.1.tar.gz -> pocl-1.2.tar.gz ++++++ ++++ 38877 lines of diff (skipped)

1 0

commit perl-AnyEvent-HTTP for openSUSE:Factory
by root 25 Sep '18

25 Sep '18

Hello community, here is the log from the commit of package perl-AnyEvent-HTTP for openSUSE:Factory checked in at 2018-09-25 15:44:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-AnyEvent-HTTP (Old) and /work/SRC/openSUSE:Factory/.perl-AnyEvent-HTTP.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-AnyEvent-HTTP" Tue Sep 25 15:44:41 2018 rev:14 rq:637911 version:2.24 Changes: -------- --- /work/SRC/openSUSE:Factory/perl-AnyEvent-HTTP/perl-AnyEvent-HTTP.changes 2016-09-26 12:36:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-AnyEvent-HTTP.new/perl-AnyEvent-HTTP.changes 2018-09-25 15:45:58.961062414 +0200 @@ -1,0 +2,6 @@ +Fri Aug 31 05:01:49 UTC 2018 - coolo(a)suse.com + +- updated to 2.24 + see /usr/share/doc/packages/perl-AnyEvent-HTTP/Changes + +------------------------------------------------------------------- Old: ---- AnyEvent-HTTP-2.23.tar.gz New: ---- AnyEvent-HTTP-2.24.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-AnyEvent-HTTP.spec ++++++ --- /var/tmp/diff_new_pack.gnfbfq/_old 2018-09-25 15:45:59.377061971 +0200 +++ /var/tmp/diff_new_pack.gnfbfq/_new 2018-09-25 15:45:59.381061966 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-AnyEvent-HTTP # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,14 @@ Name: perl-AnyEvent-HTTP -Version: 2.23 +Version: 2.24 Release: 0 -#Upstream: CHECK(GPL-1.0+ or Artistic-1.0) %define cpan_name AnyEvent-HTTP Summary: Simple but Non-Blocking Http/Https Client -License: Artistic-1.0 or GPL-1.0+ +License: Artistic-1.0 OR GPL-1.0-or-later Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/AnyEvent-HTTP/ -Source0: http://www.cpan.org/authors/id/M/ML/MLEHMANN/%{cpan_name}-%{version}.tar.gz +Source0: https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN/%{cpan_name}-%{version}.… Source1: cpanspec.yml BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -74,6 +73,7 @@ %files -f %{name}.files %defattr(-,root,root,755) -%doc Changes COPYING README +%doc Changes README +%license COPYING %changelog ++++++ AnyEvent-HTTP-2.23.tar.gz -> AnyEvent-HTTP-2.24.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/AnyEvent-HTTP-2.23/Changes new/AnyEvent-HTTP-2.24/Changes --- old/AnyEvent-HTTP-2.23/Changes 2016-08-28 11:30:38.000000000 +0200 +++ new/AnyEvent-HTTP-2.24/Changes 2018-08-30 03:23:10.000000000 +0200 @@ -3,15 +3,32 @@ TODO: provide lwp_request function that takes an lwp http requets and returns a http response. TODO: set_proxy hook TODO: use proxy hook -TODO: maybe read big chunks in smaller portions for chunked-encoding + on_body. TODO: on_upgrade, for 101 responses? TODO: document session vs. sessionid correctly. TODO: support proxy username:password in both proxy switch and set_proxy string (dzagashev(a)gmail.com) TODO: remove "unexpectedly got a destructed handle" +TODO: maybe read big chunks in smaller portions for chunked-encoding + on_body. TODO: callback as body (Kostirya) TODO: infinite recursion(?) (Kostirya) TODO: default rbuf_max value maybe? how about reading large chunks in small parts? +TODO: servers send empty reason, which then gets mangled with linear whitespace CRLF - maybe workaround? + +TODO: look into http 0.9 support (Kostirya <kostirya(a)gmail.com>) +TODO: http://appft.uspto.gov/netacgi/nph-Parser?Sect1=PTO1&Sect2=HITOFF&%23038;d=…"20110298798".PGNR.&%23038;OS=DN/20110298798&%23038;RS=DN/20110298798 + +2.24 Thu Aug 30 03:23:03 CEST 2018 + - bring cookie management more in line with RFC 6265; implement idn + matching for cookie domains. + - update cookie_jar version to 2, invalidate existing cookie jars. + - preserve original cookie domain attribute. + - also expire old cookie jars in cookie parser, just in case. + - further improve relative redirection code. + - comment out code that tried to detect possible bugs with persistent + connection caching, but since it never triggered, it's probably + working fine :) + - do not call on_body callback on a response that AE::HTTP will recurse + on internally (reported by Антон Онуфриев and Ruslan Zakirov). 2.23 Sun Aug 28 11:30:33 CEST 2016 - relative redirects used the proxy schema instead of the request diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/AnyEvent-HTTP-2.23/HTTP.pm new/AnyEvent-HTTP-2.24/HTTP.pm --- old/AnyEvent-HTTP-2.23/HTTP.pm 2016-08-28 11:31:17.000000000 +0200 +++ new/AnyEvent-HTTP-2.24/HTTP.pm 2018-08-30 03:20:03.000000000 +0200 @@ -48,7 +48,7 @@ use base Exporter::; -our $VERSION = 2.23; +our $VERSION = 2.24; our @EXPORT = qw(http_get http_post http_head http_request); @@ -456,7 +456,7 @@ sub cookie_jar_expire($;$) { my ($jar, $session_end) = @_; - %$jar = () if $jar->{version} != 1; + %$jar = () if $jar->{version} != 2; my $anow = AE::now; @@ -486,20 +486,19 @@ sub cookie_jar_extract($$$$) { my ($jar, $scheme, $host, $path) = @_; - %$jar = () if $jar->{version} != 1; + %$jar = () if $jar->{version} != 2; + + $host = AnyEvent::Util::idn_to_ascii $host + if $host =~ /[^\x00-\x7f]/; my @cookies; while (my ($chost, $paths) = each %$jar) { next unless ref $paths; - if ($chost =~ /^\./) { - next unless $chost eq substr $host, -length $chost; - } elsif ($chost =~ /\./) { - next unless $chost eq $host; - } else { - next; - } + # exact match or suffix including . match + $chost eq $host or ".$chost" eq substr $host, -1 - length $chost + or next; while (my ($cpath, $cookies) = each %$paths) { next unless $cpath eq substr $path, 0, length $cpath; @@ -531,6 +530,8 @@ sub cookie_jar_set_cookie($$$$) { my ($jar, $set_cookie, $host, $date) = @_; + %$jar = () if $jar->{version} != 2; + my $anow = int AE::now; my $snow; # server-now @@ -585,7 +586,7 @@ my $cpath = (delete $kv{path}) || "/"; if (exists $kv{domain}) { - $cdom = delete $kv{domain}; + $cdom = $kv{domain}; $cdom =~ s/^\.?/./; # make sure it starts with a "." @@ -594,12 +595,14 @@ # this is not rfc-like and not netscape-like. go figure. my $ndots = $cdom =~ y/.//; next if $ndots < ($cdom =~ /\.[^.][^.]\.[^.][^.]$/ ? 3 : 2); + + $cdom = substr $cdom, 1; # remove initial . } else { $cdom = $host; } # store it - $jar->{version} = 1; + $jar->{version} = 2; $jar->{lc $cdom}{$cpath}{$name} = \%kv; redo if /\G\s*,/gc; @@ -906,7 +909,7 @@ $loc =~ s/^\.\/+//; if ($loc !~ m%^[.?#]%) { - my $prefix = "$uscheme://$uhost:$uport"; + my $prefix = "$uscheme://$uauthority"; unless ($loc =~ s/^\///) { $prefix .= $upath; @@ -1033,7 +1036,7 @@ } elsif ($chunked) { my $cl = 0; my $body = ""; - my $on_body = $arg{on_body} || sub { $body .= shift; 1 }; + my $on_body = (!$redirect && $arg{on_body}) || sub { $body .= shift; 1 }; $state{read_chunk} = sub { $_[1] =~ /^([0-9a-fA-F]+)/ @@ -1076,7 +1079,7 @@ $_[0]->push_read (line => $state{read_chunk}); - } elsif ($arg{on_body}) { + } elsif (!$redirect && $arg{on_body}) { if (defined $len) { $_[0]->on_read (sub { $len -= length $_[0]{rbuf}; @@ -1219,11 +1222,11 @@ $was_persistent = 1; $state{handle} = ka_fetch $ka_key; - $state{handle}->destroyed - and die "AnyEvent::HTTP: unexpectedly got a destructed handle (1), please report.";#d# +# $state{handle}->destroyed +# and die "AnyEvent::HTTP: unexpectedly got a destructed handle (1), please report.";#d# $prepare_handle->(); - $state{handle}->destroyed - and die "AnyEvent::HTTP: unexpectedly got a destructed handle (2), please report.";#d# +# $state{handle}->destroyed +# and die "AnyEvent::HTTP: unexpectedly got a destructed handle (2), please report.";#d# $handle_actual_request->(); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/AnyEvent-HTTP-2.23/META.json new/AnyEvent-HTTP-2.24/META.json --- old/AnyEvent-HTTP-2.23/META.json 2016-08-28 11:31:22.000000000 +0200 +++ new/AnyEvent-HTTP-2.24/META.json 2018-08-30 03:23:15.000000000 +0200 @@ -4,7 +4,7 @@ "unknown" ], "dynamic_config" : 1, - "generated_by" : "ExtUtils::MakeMaker version 7.1, CPAN::Meta::Converter version 2.150001", + "generated_by" : "ExtUtils::MakeMaker version 7.32, CPAN::Meta::Converter version 2.150010", "license" : [ "unknown" ], @@ -41,5 +41,6 @@ } }, "release_status" : "stable", - "version" : 2.23 + "version" : 2.24, + "x_serialization_backend" : "JSON::PP version 2.27300" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/AnyEvent-HTTP-2.23/META.yml new/AnyEvent-HTTP-2.24/META.yml --- old/AnyEvent-HTTP-2.23/META.yml 2016-08-28 11:31:22.000000000 +0200 +++ new/AnyEvent-HTTP-2.24/META.yml 2018-08-30 03:23:15.000000000 +0200 @@ -7,7 +7,7 @@ configure_requires: ExtUtils::MakeMaker: '0' dynamic_config: 1 -generated_by: 'ExtUtils::MakeMaker version 7.1, CPAN::Meta::Converter version 2.150001' +generated_by: 'ExtUtils::MakeMaker version 7.32, CPAN::Meta::Converter version 2.150010' license: unknown meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -22,4 +22,5 @@ requires: AnyEvent: '5.33' common::sense: '3.3' -version: 2.23 +version: 2.24 +x_serialization_backend: 'CPAN::Meta::YAML version 0.012'

1 0

commit wesnoth for openSUSE:Factory
by root 25 Sep '18

25 Sep '18

Hello community, here is the log from the commit of package wesnoth for openSUSE:Factory checked in at 2018-09-25 15:44:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wesnoth (Old) and /work/SRC/openSUSE:Factory/.wesnoth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wesnoth" Tue Sep 25 15:44:25 2018 rev:8 rq:637908 version:1.14.5 Changes: -------- --- /work/SRC/openSUSE:Factory/wesnoth/wesnoth.changes 2018-07-31 16:03:57.744011967 +0200 +++ /work/SRC/openSUSE:Factory/.wesnoth.new/wesnoth.changes 2018-09-25 15:45:51.581070287 +0200 @@ -1,0 +2,60 @@ +Mon Sep 24 13:46:23 UTC 2018 - mvetter(a)suse.com + +- Update to 1.14.5: + * Campaigns + + A Tale of Two Brothers + o S2 'Chase': improved behavior of undead side leader with + custom AI + * Engine + + Removed incomplete joystick support. + + Removed map scaling algorithm customization. Nearest-neighbor + scaling will now always be used. + + Removed option to disable unit and item halos. + * Language and i18n + + Updated translations: British English, Bulgarian, Chinese + (Simplified), Chinese (Traditional), Czech, French, Galician, + German, Hungarian, Italian, Japanese, Polish, Scottish + Gaelic, Slovak, Spanish, Ukrainian. + * Lua API + + Allow specifying custom flags (in particular teleport) + when using a custom cost function in wesnoth.find_path + * Packaging + + OpenMP support has been removed. It is no longer an + optional build-time dependency. + * Units + + Saurian warriors are now female. (issue #3392) + * WML engine + + Support formula= key in [variable] ConditionalWML + + Support to_location in [move_unit], taking a special location ID + + Support dir in [move_unit] to perform relative movements + + Support location_id in [teleport], [recall], [unstore_unit] + for the target location + + Support a comma-separated list for location_id key in SLF + + Support [filter_weapon] in leadership and resistance abilities, + which activates the ability only when the affected unit is + using a matching weapon. + + Support [filter_second_weapon] in leadership and resistance + abilities, which activates the ability only when the affected + unit's opponent is using a matching weapon. + + Support WFL and percentages in [random_placement]num_items= + + Support [or] in [filter_wml] and similar places + + Support globbing in [filter_wml] via glob_on_* keys + + Add trunc as a valid value for [set_variable]round= + + Remove support for speaker=id in SUF (but retain in [message]) + + Support saner units for some formatting options in [message] + + Support underline=yes|no in [message] + + Support [set_variable]root=cube and root=integer + + Support force_scroll in [move_units_fake] (default no) + + Support facing= in [role][auto_recall] + + Support lists for special and special_active in SWF + + Support usage and alignment in SUF + + Deprecate [replace_map]map= in favor of map_data= + + Add u and v variables in ~ADJUST_ALPHA() and ~CHAN() + + Add clear_shroud in [move_unit] to clear shroud as the unit moves + + Support male_voice and female_voice in [message] + + Support [break], [continue], and [return] in [random_placement] + + [remove_sound_source] now accepts a comma-separated ID list + + Support [filter_team] in [side] in addition to team_name= + + +------------------------------------------------------------------- Old: ---- wesnoth-1.14.4.tar.bz2 New: ---- wesnoth-1.14.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wesnoth.spec ++++++ --- /var/tmp/diff_new_pack.pnnvO2/_old 2018-09-25 15:45:58.725062666 +0200 +++ /var/tmp/diff_new_pack.pnnvO2/_new 2018-09-25 15:45:58.729062662 +0200 @@ -19,7 +19,7 @@ %define major_version 1.14 %define boost_min_version 1.56 Name: wesnoth -Version: 1.14.4 +Version: 1.14.5 Release: 0 Summary: Fantasy Turn-Based Strategy Game License: GPL-2.0-or-later AND EPL-1.0 ++++++ wesnoth-1.14.4.tar.bz2 -> wesnoth-1.14.5.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/wesnoth/wesnoth-1.14.4.tar.bz2 /work/SRC/openSUSE:Factory/.wesnoth.new/wesnoth-1.14.5.tar.bz2 differ: char 11, line 1

1 0

commit hyperscan for openSUSE:Factory
by root 25 Sep '18

25 Sep '18

Hello community, here is the log from the commit of package hyperscan for openSUSE:Factory checked in at 2018-09-25 15:44:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hyperscan (Old) and /work/SRC/openSUSE:Factory/.hyperscan.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hyperscan" Tue Sep 25 15:44:22 2018 rev:3 rq:637887 version:5.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/hyperscan/hyperscan.changes 2018-07-18 22:53:37.931022133 +0200 +++ /work/SRC/openSUSE:Factory/.hyperscan.new/hyperscan.changes 2018-09-25 15:44:23.457164351 +0200 @@ -1,0 +2,6 @@ +Tue Sep 25 06:06:59 UTC 2018 - mardnh(a)gmx.de + +- Add patch + * hyperscan-build.patch (fix build for Tumbleweed) + +------------------------------------------------------------------- New: ---- hyperscan-build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hyperscan.spec ++++++ --- /var/tmp/diff_new_pack.G8o9YB/_old 2018-09-25 15:44:25.613162048 +0200 +++ /var/tmp/diff_new_pack.G8o9YB/_new 2018-09-25 15:44:25.613162048 +0200 @@ -26,6 +26,7 @@ URL: https://www.hyperscan.io/ #Git-Clone: https://github.com/intel/hyperscan.git Source: https://github.com/intel/%{name}/archive/v%{version}.tar.gz#/%{name}-%{vers… +Patch0: hyperscan-build.patch BuildRequires: boost-devel >= 1.57 BuildRequires: cmake BuildRequires: gcc-c++ >= 4.9 @@ -87,6 +88,7 @@ %prep %setup -q +%patch0 -p1 %build %cmake \ ++++++ hyperscan-build.patch ++++++ diff --git a/src/nfa/limex_compile.cpp b/src/nfa/limex_compile.cpp index 6053b56..bbb2660 100644 --- a/src/nfa/limex_compile.cpp +++ b/src/nfa/limex_compile.cpp @@ -980,7 +980,7 @@ u32 addSquashMask(const build_info &args, const NFAVertex &v, // see if we've already seen it, otherwise add a new one. auto it = find(squash.begin(), squash.end(), sit->second); if (it != squash.end()) { - return verify_u32(distance(squash.begin(), it)); + return verify_u32(std::distance(squash.begin(), it)); } u32 idx = verify_u32(squash.size()); squash.push_back(sit->second); @@ -1007,7 +1007,7 @@ u32 addReports(const flat_set<ReportID> &r, vector<ReportID> &reports, auto it = search(begin(reports), end(reports), begin(my_reports), end(my_reports)); if (it != end(reports)) { - u32 offset = verify_u32(distance(begin(reports), it)); + u32 offset = verify_u32(std::distance(begin(reports), it)); DEBUG_PRINTF("reusing found report list at %u\n", offset); return offset; }

1 0

commit osdlyrics for openSUSE:Factory
by root 25 Sep '18

25 Sep '18

Hello community, here is the log from the commit of package osdlyrics for openSUSE:Factory checked in at 2018-09-25 15:44:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/osdlyrics (Old) and /work/SRC/openSUSE:Factory/.osdlyrics.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "osdlyrics" Tue Sep 25 15:44:18 2018 rev:16 rq:637881 version:0.4.3+git20170817.8661927 Changes: -------- --- /work/SRC/openSUSE:Factory/osdlyrics/osdlyrics.changes 2017-12-21 11:29:01.972458352 +0100 +++ /work/SRC/openSUSE:Factory/.osdlyrics.new/osdlyrics.changes 2018-09-25 15:44:22.325165560 +0200 @@ -1,0 +2,15 @@ +Tue Sep 25 08:18:34 UTC 2018 - Jan Engelhardt <jengelh(a)inai.de> + +- Avoid repetition of program name. + +------------------------------------------------------------------- +Mon Sep 24 14:55:33 UTC 2018 - astieger(a)suse.com + +- License is GPL-3.0-or-later + +------------------------------------------------------------------- +Mon Sep 24 13:54:39 UTC 2018 - hillwood(a)opensuse.org + +- Fix boo#1109453. Set Requires tag for python-curl and python-chardet + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osdlyrics.spec ++++++ --- /var/tmp/diff_new_pack.iI57us/_old 2018-09-25 15:44:22.873164974 +0200 +++ /var/tmp/diff_new_pack.iI57us/_new 2018-09-25 15:44:22.873164974 +0200 @@ -1,7 +1,7 @@ # # spec file for package osdlyrics # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,20 +12,19 @@ # 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/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define with_mpd 0 %define date 20170817 - Name: osdlyrics Version: 0.4.3+git%{date}.8661927 Release: 0 Summary: A third-party lyrics display program -License: GPL-3.0 +License: GPL-3.0-or-later Group: Productivity/Multimedia/Sound/Visualization -Url: https://github.com/osdlyrics/osdlyrics +URL: https://github.com/osdlyrics/osdlyrics Source0: %{name}-%{version}.tar.xz Source1: %{name}-appdata.xml BuildRequires: fdupes @@ -37,6 +36,7 @@ BuildRequires: hicolor-icon-theme BuildRequires: intltool BuildRequires: libtool +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: pkgconfig(appindicator-0.1) BuildRequires: pkgconfig(dbus-glib-1) @@ -47,36 +47,26 @@ BuildRequires: pkgconfig(python) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(xmms2-client) -%if %{with_mpd} -BuildRequires: mpd -%endif Requires: gtk2 +Requires: python-chardet +Requires: python-curl Requires: sqlite3 -Recommends: python-%{name} Recommends: %{name}-lang -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Recommends: python-%{name} +%if %{with_mpd} +BuildRequires: mpd +%endif %description -OSD Lyrics -==================== - OSD Lyrics is a lyrics show compatible with various media players. It is not a plugin but a standalone program. OSD Lyrics shows lyrics on your desktop, in the style similar to KaraOK. It also provides another displaying style, in which lyrics scroll from bottom to top. OSD Lyrics can download lyrics from the network automatically. -==================== - -Authors: --------- - Tiger Soldier <tigersoldi(a)gmail.com> - SarlmolApple <sarlmolapple(a)gmail.com> - SimplyZhao <simplyzhao(a)gmail.com> %package -n python-%{name} Summary: Python module for osdlyrics Group: Productivity/Multimedia/Sound/Visualization Requires: %{name} = %{version} -%py_requires %description -n python-osdlyrics This package contains python module for osdlyrics @@ -121,8 +111,8 @@ %endif %files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog README COPYING +%license COPYING +%doc AUTHORS ChangeLog README %{_bindir}/%{name} %{_bindir}/%{name}-create-lyricsource %{_bindir}/%{name}-daemon @@ -135,7 +125,6 @@ %{_datadir}/appdata/%{name}-appdata.xml %files -n python-%{name} -%defattr(-,root,root,-) %{python_sitelib}/%{name} %files lang -f %{name}.lang

1 0

commit pin for openSUSE:Factory
by root 25 Sep '18

25 Sep '18

Hello community, here is the log from the commit of package pin for openSUSE:Factory checked in at 2018-09-25 15:44:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pin (Old) and /work/SRC/openSUSE:Factory/.pin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pin" Tue Sep 25 15:44:15 2018 rev:22 rq:637880 version:0.40 Changes: -------- --- /work/SRC/openSUSE:Factory/pin/pin.changes 2018-06-19 11:54:40.542054240 +0200 +++ /work/SRC/openSUSE:Factory/.pin.new/pin.changes 2018-09-25 15:44:19.725168337 +0200 @@ -1,0 +2,10 @@ +Tue Sep 25 08:38:02 UTC 2018 - Ismail Dönmez <idonmez(a)suse.com> + +- Fix typo SuSE-Release -> SuSE-release + +------------------------------------------------------------------- +Fri Sep 21 16:28:10 UTC 2018 - Mathias Homann <Mathias.Homann(a)opensuse.org> + +- final fix for [bsc#1095723] + +------------------------------------------------------------------- @@ -4 +14,2 @@ -- fix for bug #1095723, pin broken on systems without /etc/SuSE-release file +- fix for bug #1095723, pin broken on systems without + /etc/SuSE-release file [bsc#1095723] ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pin.spec ++++++ --- /var/tmp/diff_new_pack.1exppn/_old 2018-09-25 15:44:21.509166431 +0200 +++ /var/tmp/diff_new_pack.1exppn/_new 2018-09-25 15:44:21.517166423 +0200 @@ -17,8 +17,8 @@ Name: pin -Version: 0.38 -Release: 1 +Version: 0.40 +Release: 0 Summary: A tool for finding package information License: GPL-2.0+ Group: Documentation/SUSE ++++++ pin ++++++ --- /var/tmp/diff_new_pack.1exppn/_old 2018-09-25 15:44:21.553166384 +0200 +++ /var/tmp/diff_new_pack.1exppn/_new 2018-09-25 15:44:21.557166380 +0200 @@ -73,9 +73,9 @@ # 2007 05 06 0.38 fixed fix for bug #188068, copying ARCHIVES.gz should now work with any shell # clean up tempfile if pin gets killed or Ctrl-c'ed (bug #218263) # 2008-12-14 0.39 added stty sane to cleanup trap. (bug #458980, jw) +# 2018-09-21 0.40 Leap 15 does not have /etc/SuSE-Release but /etc/os-release is easier to parse anyways. - -VER=0.38 +VER=0.40 OUT_FILE=$(/bin/mktemp /tmp/.pin_packinfo_$$.XXXXXX) || { echo "pin: can not create temporary file" >& 2; exit 1; } ARC_DIR_OLD="/usr/share/pin/" ARC_DIR="/var/lib/pin/" # dont forget the / at end! @@ -85,8 +85,12 @@ CDROM="/media/cdrom/" # dont forget the / at end! CDROM_ALT="/media/dvd/" +[ -f /etc/os-release ] && { + . /etc/os-release + export USED_VERSION=$VERSION +} + [ -f /etc/SuSE-release ] && USED_VERSION="`grep VERSION /etc/SuSE-release | cut -f3 -d " "`" -[ -z ${USED_VERSION} ] && USED_VERSION="`grep VERSION_ID /etc/os-release | cut -f3 -d "\""`" umask 022

1 0

commit conman for openSUSE:Factory
by root 25 Sep '18

25 Sep '18

Hello community, here is the log from the commit of package conman for openSUSE:Factory checked in at 2018-09-25 15:44:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/conman (Old) and /work/SRC/openSUSE:Factory/.conman.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "conman" Tue Sep 25 15:44:12 2018 rev:12 rq:637874 version:0.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/conman/conman.changes 2018-09-24 13:13:49.309648326 +0200 +++ /work/SRC/openSUSE:Factory/.conman.new/conman.changes 2018-09-25 15:44:15.913172408 +0200 @@ -1,0 +2,8 @@ +Tue Sep 25 07:40:26 UTC 2018 - eich(a)suse.com + +- Update to conman-0.3.0 (2018-09-15): + * Fixed slow connects to Unix socket consoles triggered from + inotify. (#28,#29). + * Obsoletes: Reset-delay-for-unixsock-connect-from-inotify.patch + +------------------------------------------------------------------- Old: ---- Reset-delay-for-unixsock-connect-from-inotify.patch conman-0.2.9.tar.gz New: ---- conman-0.3.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ conman.spec ++++++ --- /var/tmp/diff_new_pack.xw917A/_old 2018-09-25 15:44:16.445171840 +0200 +++ /var/tmp/diff_new_pack.xw917A/_new 2018-09-25 15:44:16.449171836 +0200 @@ -44,7 +44,7 @@ %endif Name: conman -Version: 0.2.9 +Version: 0.3.0 Release: 0 Summary: The Console Manager @@ -71,7 +71,6 @@ %endif Patch1: conman-suse-fix-expect-scripts.patch -Patch2: Reset-delay-for-unixsock-connect-from-inotify.patch # 8/15/14 karl.w.schulz(a)intel.com - include prereq %if 0%{?sles_version} || 0%{?suse_version} @@ -96,7 +95,6 @@ %prep %setup -q -n %{name}-%{name}-%{version} %patch1 -p1 -%patch2 -p1 %build %configure --with-tcp-wrappers \ ++++++ conman-0.2.9.tar.gz -> conman-0.3.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/META new/conman-conman-0.3.0/META --- old/conman-conman-0.2.9/META 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/META 2018-09-15 17:51:34.000000000 +0200 @@ -1,5 +1,5 @@ Name: conman - Version: 0.2.9 + Version: 0.3.0 Release: 1 - Date: 2017-12-14 + Date: 2018-09-15 Author: Chris Dunlap <cdunlap(a)llnl.gov> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/NEWS new/conman-conman-0.3.0/NEWS --- old/conman-conman-0.2.9/NEWS 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/NEWS 2018-09-15 17:51:34.000000000 +0200 @@ -1,3 +1,6 @@ +conman-0.3.0 (2018-09-15): +- Fixed slow connects to Unix socket consoles triggered from inotify. (#28,#29) + conman-0.2.9 (2017-12-14): - Allowed IPMI defaults to be overridden via libipmiconsole.conf. (#27) - Updated recognized strings for IPMI workaround-flags. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/PLATFORMS new/conman-conman-0.3.0/PLATFORMS --- old/conman-conman-0.2.9/PLATFORMS 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/PLATFORMS 2018-09-15 17:51:34.000000000 +0200 @@ -1,17 +1,15 @@ -ConMan 0.2.9 has been built on the following systems: +ConMan 0.3.0 has been built on the following systems: -- CentOS 6.9 -- CentOS 7.4.1708 -- Debian 9.3 -- Fedora 27 -- FreeBSD 11.1 -- NetBSD 7.1 -- OpenBSD 6.2 -- Ubuntu 16.04.3 LTS -- Ubuntu 17.10 +- CentOS 6.10 +- CentOS 7.5.1804 +- Debian 9.5 +- Fedora 28 +- FreeBSD 11.2 +- NetBSD 7.1.2 +- OpenBSD 6.3 +- Ubuntu 18.04.1 LTS RPMs have been built and tested on the following systems: -- CentOS 7.4.1708 -- Fedora 27 +- CentOS 7.5.1804 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/THANKS new/conman-conman-0.3.0/THANKS --- old/conman-conman-0.2.9/THANKS 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/THANKS 2018-09-15 17:51:34.000000000 +0200 @@ -5,6 +5,7 @@ Christopher D. Maestas <cdmaestas(a)gmail.com> Dave Love <d.love(a)liverpool.ac.uk> Dmitry Monakhov <dmonakhov(a)openvz.org> +Egbert Eich <eich(a)suse.com> Jesse Hathaway <jesse(a)mbuki-mvuki.org> Levi Pearson <lpearson(a)lnxi.com> Marc Girard <marc.girard(a)bull.net> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/bool.h new/conman-conman-0.3.0/bool.h --- old/conman-conman-0.2.9/bool.h 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/bool.h 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/client-conf.c new/conman-conman-0.3.0/client-conf.c --- old/conman-conman-0.2.9/client-conf.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/client-conf.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/client-sock.c new/conman-conman-0.3.0/client-sock.c --- old/conman-conman-0.2.9/client-sock.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/client-sock.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/client-tty.c new/conman-conman-0.3.0/client-tty.c --- old/conman-conman-0.2.9/client-tty.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/client-tty.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/client.c new/conman-conman-0.3.0/client.c --- old/conman-conman-0.2.9/client.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/client.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/client.h new/conman-conman-0.3.0/client.h --- old/conman-conman-0.2.9/client.h 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/client.h 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/common.c new/conman-conman-0.3.0/common.c --- old/conman-conman-0.2.9/common.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/common.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * @@ -42,7 +42,7 @@ "https://dun.github.io/conman/\n" \ "\n" \ "Written by Chris Dunlap <cdunlap(a)llnl.gov>.\n" \ - "Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC.\n" \ + "Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC.\n" \ "Copyright (C) 2001-2007 The Regents of the University of California.\n" \ "\n" \ "ConMan is free software: you can redistribute it and/or modify it\n" \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/common.h new/conman-conman-0.3.0/common.h --- old/conman-conman-0.2.9/common.h 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/common.h 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/configure.ac new/conman-conman-0.3.0/configure.ac --- old/conman-conman-0.2.9/configure.ac 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/configure.ac 2018-09-15 17:51:34.000000000 +0200 @@ -3,7 +3,7 @@ # Process this file with autoconf to produce a configure script. ############################################################################### # Written by Chris Dunlap <cdunlap(a)llnl.gov>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/conman.spec new/conman-conman-0.3.0/conman.spec --- old/conman-conman-0.2.9/conman.spec 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/conman.spec 2018-09-15 17:51:34.000000000 +0200 @@ -1,5 +1,5 @@ Name: conman -Version: 0.2.9 +Version: 0.3.0 Release: 1%{?dist} Summary: ConMan: The Console Manager diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/conmen new/conman-conman-0.3.0/conmen --- old/conman-conman-0.2.9/conmen 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/conmen 2018-09-15 17:51:34.000000000 +0200 @@ -4,7 +4,7 @@ # ConMen: a wrapper to aid in ConMan broadcast sessions. ############################################################################### # Written by Chris Dunlap <cdunlap(a)llnl.gov>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/etc/conman.init.in new/conman-conman-0.3.0/etc/conman.init.in --- old/conman-conman-0.2.9/etc/conman.init.in 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/etc/conman.init.in 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/sh ############################################################################### # Written by Chris Dunlap <cdunlap(a)llnl.gov>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. ############################################################################### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/inevent.c new/conman-conman-0.3.0/inevent.c --- old/conman-conman-0.2.9/inevent.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/inevent.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/inevent.h new/conman-conman-0.3.0/inevent.h --- old/conman-conman-0.2.9/inevent.h 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/inevent.h 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/lex.c new/conman-conman-0.3.0/lex.c --- old/conman-conman-0.2.9/lex.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lex.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/lex.h new/conman-conman-0.3.0/lex.h --- old/conman-conman-0.2.9/lex.h 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lex.h 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/lib/alpha.exp new/conman-conman-0.3.0/lib/alpha.exp --- old/conman-conman-0.2.9/lib/alpha.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/alpha.exp 2018-09-15 17:51:34.000000000 +0200 @@ -2,7 +2,7 @@ # Alpha Library Functions (ALF) ############################################################################### # Written by Chris Dunlap <cdunlap(a)llnl.gov>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/lib/conman.exp new/conman-conman-0.3.0/lib/conman.exp --- old/conman-conman-0.2.9/lib/conman.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/conman.exp 2018-09-15 17:51:34.000000000 +0200 @@ -2,7 +2,7 @@ # ConMan Expect Language Library (CELL) ############################################################################### # Written by Chris Dunlap <cdunlap(a)llnl.gov>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/lib/examples/boot_alpha.exp new/conman-conman-0.3.0/lib/examples/boot_alpha.exp --- old/conman-conman-0.2.9/lib/examples/boot_alpha.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/examples/boot_alpha.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -- ############################################################################### # Written by Chris Dunlap <cdunlap(a)llnl.gov>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/lib/examples/mac.exp new/conman-conman-0.3.0/lib/examples/mac.exp --- old/conman-conman-0.2.9/lib/examples/mac.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/examples/mac.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -- ############################################################################### # Written by Chris Dunlap <cdunlap(a)llnl.gov>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/lib/examples/rmc.exp new/conman-conman-0.3.0/lib/examples/rmc.exp --- old/conman-conman-0.2.9/lib/examples/rmc.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/examples/rmc.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -- ############################################################################### # Written by Chris Dunlap <cdunlap(a)llnl.gov>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/lib/examples/shell_cmd_1.exp new/conman-conman-0.3.0/lib/examples/shell_cmd_1.exp --- old/conman-conman-0.2.9/lib/examples/shell_cmd_1.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/examples/shell_cmd_1.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -- ############################################################################### # Written by Chris Dunlap <cdunlap(a)llnl.gov>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/lib/examples/shell_cmd_n.exp new/conman-conman-0.3.0/lib/examples/shell_cmd_n.exp --- old/conman-conman-0.2.9/lib/examples/shell_cmd_n.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/examples/shell_cmd_n.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -- ############################################################################### # Written by Chris Dunlap <cdunlap(a)llnl.gov>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/lib/examples/srm.exp new/conman-conman-0.3.0/lib/examples/srm.exp --- old/conman-conman-0.2.9/lib/examples/srm.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/examples/srm.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -- ############################################################################### # Written by Chris Dunlap <cdunlap(a)llnl.gov>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/lib/examples/wtf.exp new/conman-conman-0.3.0/lib/examples/wtf.exp --- old/conman-conman-0.2.9/lib/examples/wtf.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/examples/wtf.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -- ############################################################################### # Written by Chris Dunlap <cdunlap(a)llnl.gov>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/lib/exec/cyclades-ssh.exp new/conman-conman-0.3.0/lib/exec/cyclades-ssh.exp --- old/conman-conman-0.2.9/lib/exec/cyclades-ssh.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/exec/cyclades-ssh.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -f ############################################################################### # Written by Chris Dunlap <cdunlap(a)llnl.gov>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/lib/exec/cyclades-telnet.exp new/conman-conman-0.3.0/lib/exec/cyclades-telnet.exp --- old/conman-conman-0.2.9/lib/exec/cyclades-telnet.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/exec/cyclades-telnet.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -f ############################################################################### # Written by Chris Dunlap <cdunlap(a)llnl.gov>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/lib/exec/hp-ilo.exp new/conman-conman-0.3.0/lib/exec/hp-ilo.exp --- old/conman-conman-0.2.9/lib/exec/hp-ilo.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/exec/hp-ilo.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -f ############################################################################### # Written by Chris Dunlap <cdunlap(a)llnl.gov>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/lib/exec/hp-lo100.exp new/conman-conman-0.3.0/lib/exec/hp-lo100.exp --- old/conman-conman-0.2.9/lib/exec/hp-lo100.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/exec/hp-lo100.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -f ############################################################################### # Written by Chris Dunlap <cdunlap(a)llnl.gov>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/lib/exec/ibm-bc.exp new/conman-conman-0.3.0/lib/exec/ibm-bc.exp --- old/conman-conman-0.2.9/lib/exec/ibm-bc.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/exec/ibm-bc.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -f ############################################################################### # Written by Chris Dunlap <cdunlap(a)llnl.gov>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/lib/exec/ipmiconsole.exp new/conman-conman-0.3.0/lib/exec/ipmiconsole.exp --- old/conman-conman-0.2.9/lib/exec/ipmiconsole.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/exec/ipmiconsole.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -f ############################################################################### # Written by Chris Dunlap <cdunlap(a)llnl.gov>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/lib/exec/ipmitool.exp new/conman-conman-0.3.0/lib/exec/ipmitool.exp --- old/conman-conman-0.2.9/lib/exec/ipmitool.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/exec/ipmitool.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -f ############################################################################### # Written by Chris Dunlap <cdunlap(a)llnl.gov>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/lib/exec/ssh.exp new/conman-conman-0.3.0/lib/exec/ssh.exp --- old/conman-conman-0.2.9/lib/exec/ssh.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/exec/ssh.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -f ############################################################################### # Written by Chris Dunlap <cdunlap(a)llnl.gov>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/lib/exec/sun-elom.exp new/conman-conman-0.3.0/lib/exec/sun-elom.exp --- old/conman-conman-0.2.9/lib/exec/sun-elom.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/exec/sun-elom.exp 2018-09-15 17:51:34.000000000 +0200 @@ -5,7 +5,7 @@ # Works with ELOM 3.15, at least. # # Written by Chris Dunlap <cdunlap(a)llnl.gov>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/lib/exec/sun-ilom.exp new/conman-conman-0.3.0/lib/exec/sun-ilom.exp --- old/conman-conman-0.2.9/lib/exec/sun-ilom.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/exec/sun-ilom.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -f ############################################################################### # Written by Chris Dunlap <cdunlap(a)llnl.gov>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/lib/exec/sun-v20z-v40z.exp new/conman-conman-0.3.0/lib/exec/sun-v20z-v40z.exp --- old/conman-conman-0.2.9/lib/exec/sun-v20z-v40z.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/exec/sun-v20z-v40z.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -f ############################################################################### # Written by Chris Dunlap <cdunlap(a)llnl.gov>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/list.c new/conman-conman-0.3.0/list.c --- old/conman-conman-0.2.9/list.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/list.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/list.h new/conman-conman-0.3.0/list.h --- old/conman-conman-0.2.9/list.h 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/list.h 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/log.c new/conman-conman-0.3.0/log.c --- old/conman-conman-0.2.9/log.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/log.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/log.h new/conman-conman-0.3.0/log.h --- old/conman-conman-0.2.9/log.h 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/log.h 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/man/conman.1.in new/conman-conman-0.3.0/man/conman.1.in --- old/conman-conman-0.2.9/man/conman.1.in 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/man/conman.1.in 2018-09-15 17:51:34.000000000 +0200 @@ -153,7 +153,7 @@ Chris Dunlap <cdunlap(a)llnl.gov> .SH COPYRIGHT -Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. .br Copyright (C) 2001-2007 The Regents of the University of California. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/man/conman.conf.5.in new/conman-conman-0.3.0/man/conman.conf.5.in --- old/conman-conman-0.2.9/man/conman.conf.5.in 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/man/conman.conf.5.in 2018-09-15 17:51:34.000000000 +0200 @@ -323,7 +323,7 @@ Chris Dunlap <cdunlap(a)llnl.gov> .SH COPYRIGHT -Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. .br Copyright (C) 2001-2007 The Regents of the University of California. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/man/conmand.8.in new/conman-conman-0.3.0/man/conmand.8.in --- old/conman-conman-0.2.9/man/conmand.8.in 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/man/conmand.8.in 2018-09-15 17:51:34.000000000 +0200 @@ -97,7 +97,7 @@ Chris Dunlap <cdunlap(a)llnl.gov> .SH COPYRIGHT -Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. .br Copyright (C) 2001-2007 The Regents of the University of California. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/server-conf.c new/conman-conman-0.3.0/server-conf.c --- old/conman-conman-0.2.9/server-conf.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/server-conf.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/server-esc.c new/conman-conman-0.3.0/server-esc.c --- old/conman-conman-0.2.9/server-esc.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/server-esc.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/server-ipmi.c new/conman-conman-0.3.0/server-ipmi.c --- old/conman-conman-0.2.9/server-ipmi.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/server-ipmi.c 2018-09-15 17:51:34.000000000 +0200 @@ -2,7 +2,7 @@ * Contributed by Levi Pearson <lpearson(a)lnxi.com>. * * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/server-logfile.c new/conman-conman-0.3.0/server-logfile.c --- old/conman-conman-0.2.9/server-logfile.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/server-logfile.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/server-obj.c new/conman-conman-0.3.0/server-obj.c --- old/conman-conman-0.2.9/server-obj.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/server-obj.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/server-process.c new/conman-conman-0.3.0/server-process.c --- old/conman-conman-0.2.9/server-process.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/server-process.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/server-serial.c new/conman-conman-0.3.0/server-serial.c --- old/conman-conman-0.2.9/server-serial.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/server-serial.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/server-sock.c new/conman-conman-0.3.0/server-sock.c --- old/conman-conman-0.2.9/server-sock.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/server-sock.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/server-telnet.c new/conman-conman-0.3.0/server-telnet.c --- old/conman-conman-0.2.9/server-telnet.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/server-telnet.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/server-test.c new/conman-conman-0.3.0/server-test.c --- old/conman-conman-0.2.9/server-test.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/server-test.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/server-unixsock.c new/conman-conman-0.3.0/server-unixsock.c --- old/conman-conman-0.2.9/server-unixsock.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/server-unixsock.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * @@ -45,6 +45,7 @@ #include "util-str.h" +static int open_unixsock_obj_via_inotify(obj_t *unixsock); static size_t max_unixsock_dev_strlen(void); static int connect_unixsock_obj(obj_t *unixsock); static int disconnect_unixsock_obj(obj_t *unixsock); @@ -140,6 +141,7 @@ unixsock->aux.unixsock.logfile = NULL; unixsock->aux.unixsock.timer = -1; unixsock->aux.unixsock.state = CONMAN_UNIXSOCK_DOWN; + unixsock->aux.unixsock.isViaInotify = 0; unixsock->aux.unixsock.delay = UNIXSOCK_MIN_TIMEOUT; /* * Add obj to the master conf->objs list. @@ -147,7 +149,7 @@ list_append(conf->objs, unixsock); rv = inevent_add(unixsock->aux.unixsock.dev, - (inevent_cb_f) open_unixsock_obj, unixsock); + (inevent_cb_f) open_unixsock_obj_via_inotify, unixsock); if (rv < 0) { log_msg(LOG_INFO, "Console [%s] unable to register device \"%s\" for inotify events", @@ -177,6 +179,23 @@ } +static int open_unixsock_obj_via_inotify(obj_t *unixsock) +{ +/* Opens the specified 'unixsock' obj via an inotify callback. + * Returns 0 if the console is successfully opened; o/w, returns -1. + */ + unixsock_obj_t *auxp; + + assert(unixsock != NULL); + assert(is_unixsock_obj(unixsock)); + + auxp = &(unixsock->aux.unixsock); + auxp->isViaInotify = 1; + + return(open_unixsock_obj(unixsock)); +} + + static size_t max_unixsock_dev_strlen(void) { /* Returns the maximum string length allowed for a unix domain device. @@ -199,6 +218,7 @@ * Returns 0 if the connection is successfully completed; o/w, returns -1. */ unixsock_obj_t *auxp; + int isViaInotify; struct stat st; struct sockaddr_un saddr; size_t n; @@ -210,6 +230,9 @@ auxp = &(unixsock->aux.unixsock); + isViaInotify = auxp->isViaInotify; + auxp->isViaInotify = 0; + if (auxp->timer >= 0) { (void) tpoll_timeout_cancel(tp_global, auxp->timer); auxp->timer = -1; @@ -250,11 +273,20 @@ set_fd_nonblocking(unixsock->fd); set_fd_closed_on_exec(unixsock->fd); - /* FIXME: Check to see if connect() on a nonblocking unix domain socket + /* If a connect() triggered via an inotify event fails, reset the + * reconnect delay to its minimum to quickly re-attempt the connection. + * This handles the case where the remote has successfully called bind() + * (triggering the inotify event) but has not yet called listen(). + * FIXME: Check to see if connect() on a nonblocking unix domain socket * can return EINPROGRESS. I don't think it can. */ if (connect(unixsock->fd, (struct sockaddr *) &saddr, sizeof(saddr)) < 0) { + if (isViaInotify) { + auxp->delay = UNIXSOCK_MIN_TIMEOUT; + DPRINTF((15, "Reset [%s] reconnect delay due to inotify event\n", + unixsock->name)); + } log_msg(LOG_INFO, "Console [%s] cannot connect to device \"%s\": %s", unixsock->name, auxp->dev, strerror(errno)); return(disconnect_unixsock_obj(unixsock)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/server.c new/conman-conman-0.3.0/server.c --- old/conman-conman-0.2.9/server.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/server.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/server.h new/conman-conman-0.3.0/server.h --- old/conman-conman-0.2.9/server.h 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/server.h 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * @@ -180,6 +180,7 @@ int timer; /* timer id for reconnects */ int delay; /* secs 'til next reconnect attempt */ unsigned state:1; /* unixsock_state_t conn state */ + unsigned isViaInotify:1; /* true if triggered via inotify */ } unixsock_obj_t; /* Refer to struct ipmiconsole_ipmi_config in <ipmiconsole.h>. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/tpoll.c new/conman-conman-0.3.0/tpoll.c --- old/conman-conman-0.2.9/tpoll.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/tpoll.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/tpoll.h new/conman-conman-0.3.0/tpoll.h --- old/conman-conman-0.2.9/tpoll.h 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/tpoll.h 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/util-file.c new/conman-conman-0.3.0/util-file.c --- old/conman-conman-0.2.9/util-file.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/util-file.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/util-file.h new/conman-conman-0.3.0/util-file.h --- old/conman-conman-0.2.9/util-file.h 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/util-file.h 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/util-net.c new/conman-conman-0.3.0/util-net.c --- old/conman-conman-0.2.9/util-net.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/util-net.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/util-net.h new/conman-conman-0.3.0/util-net.h --- old/conman-conman-0.2.9/util-net.h 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/util-net.h 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/util-str.c new/conman-conman-0.3.0/util-str.c --- old/conman-conman-0.2.9/util-str.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/util-str.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/util-str.h new/conman-conman-0.3.0/util-str.h --- old/conman-conman-0.2.9/util-str.h 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/util-str.h 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/util.c new/conman-conman-0.3.0/util.c --- old/conman-conman-0.2.9/util.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/util.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/util.h new/conman-conman-0.3.0/util.h --- old/conman-conman-0.2.9/util.h 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/util.h 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/wrapper.h new/conman-conman-0.3.0/wrapper.h --- old/conman-conman-0.2.9/wrapper.h 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/wrapper.h 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <cdunlap(a)llnl.gov>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. *

1 0

commit crmsh for openSUSE:Factory
by root 25 Sep '18

25 Sep '18

Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2018-09-25 15:44:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crmsh (Old) and /work/SRC/openSUSE:Factory/.crmsh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "crmsh" Tue Sep 25 15:44:02 2018 rev:148 rq:637867 version:4.0.0+git.1537860833.be41d63c Changes: -------- --- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2018-08-20 16:19:01.736789318 +0200 +++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2018-09-25 15:44:14.517173899 +0200 @@ -1,0 +2,14 @@ +Tue Sep 25 07:44:44 UTC 2018 - kgronlund(a)suse.com + +- Update to version 4.0.0+git.1537860833.be41d63c: + * fix: bootstrap: non interactive unicast cluster init and join(bsc#1109172) + * medium: bootstrap: Disable strict host key checking on all ssh invocations + * medium: support ocfs2 log collecting + * hbreport: process name change for pacemaker 2.0(bsc#1106052) + * Fix: bootstrap: "-i" option doesn't work(bsc#1103833, bsc#1103834) + * Low: bootstrap: No warning message when using '-q' + * high: ra: Support Pacemaker 2.0 daemon names + * high: config: Locate pacemaker daemons more intelligently (#67) (bsc#1096783) + * Fix: TypeError in logparser.py(bsc#1093433) + +------------------------------------------------------------------- Old: ---- crmsh-4.0.0+git.1526547258.54aafa1d.tar.bz2 New: ---- crmsh-4.0.0+git.1537860833.be41d63c.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crmsh.spec ++++++ --- /var/tmp/diff_new_pack.G8wnek/_old 2018-09-25 15:44:15.029173352 +0200 +++ /var/tmp/diff_new_pack.G8wnek/_new 2018-09-25 15:44:15.037173344 +0200 @@ -36,7 +36,7 @@ Summary: High Availability cluster command-line interface License: GPL-2.0-or-later Group: %{pkg_group} -Version: 4.0.0+git.1526547258.54aafa1d +Version: 4.0.0+git.1537860833.be41d63c Release: 0 Url: http://crmsh.github.io Source0: %{name}-%{version}.tar.bz2 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.G8wnek/_old 2018-09-25 15:44:15.077173301 +0200 +++ /var/tmp/diff_new_pack.G8wnek/_new 2018-09-25 15:44:15.077173301 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/ClusterLabs/crmsh.git</param> - <param name="changesrevision">ce8241d2ea413dd5a95eec87f57381ee25077f1c</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">c393b5c661a87f1f9e2bc03be587051aedc33220</param></service></servicedata> \ No newline at end of file ++++++ crmsh-4.0.0+git.1526547258.54aafa1d.tar.bz2 -> crmsh-4.0.0+git.1537860833.be41d63c.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.0.0+git.1526547258.54aafa1d/Dockerfile new/crmsh-4.0.0+git.1537860833.be41d63c/Dockerfile --- old/crmsh-4.0.0+git.1526547258.54aafa1d/Dockerfile 2018-05-17 10:54:18.000000000 +0200 +++ new/crmsh-4.0.0+git.1537860833.be41d63c/Dockerfile 2018-09-25 09:33:53.000000000 +0200 @@ -1,4 +1,4 @@ -FROM opensuse:42.3 +FROM opensuse/leap:15 MAINTAINER Kristoffer Gronlund version: 0.5 ENV container docker diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.0.0+git.1526547258.54aafa1d/crmsh/bootstrap.py new/crmsh-4.0.0+git.1537860833.be41d63c/crmsh/bootstrap.py --- old/crmsh-4.0.0+git.1526547258.54aafa1d/crmsh/bootstrap.py 2018-05-17 10:54:18.000000000 +0200 +++ new/crmsh-4.0.0+git.1537860833.be41d63c/crmsh/bootstrap.py 2018-09-25 09:33:53.000000000 +0200 @@ -96,8 +96,7 @@ Log and display a warning message. """ log("WARNING: {}".format(" ".join(str(arg) for arg in args))) - if not _context.quiet: - print(term.render(clidisplay.warn("! {}".format(" ".join(str(arg) for arg in args))))) + print(term.render(clidisplay.warn("! {}".format(" ".join(str(arg) for arg in args))))) @utils.memoize @@ -856,7 +855,7 @@ warn(" Address already in use: {}".format(addr)) return False for net in all_: - if addr in utils.Network(net): + if utils.ip_in_network(addr, net): return True warn(" Address '{}' invalid, expected one of {}".format(addr, all_)) return False @@ -919,9 +918,13 @@ all_ = utils.network_v6_all() for item in all_.values(): network_list.extend(item) - default_networks = map(utils.get_ipv6_network, network_list) + default_networks = [utils.get_ipv6_network(x) for x in network_list] else: - default_networks = utils.network_all() + network_list = utils.network_all() + if len(network_list) > 1: + default_networks = [_context.ip_network, network_list.remove(_context.ip_network)] + else: + default_networks = _context.ip_network if not default_networks: error("No network configured at {}!".format(utils.this_node())) @@ -1008,7 +1011,11 @@ network_list.extend(item) default_networks = [utils.get_ipv6_network(x) for x in network_list] else: - default_networks = utils.network_all() + network_list = utils.network_all() + if len(network_list) > 1: + default_networks = [_context.ip_network, network_list.remove(_context.ip_network)] + else: + default_networks = _context.ip_network if not default_networks: error("No network configured at {}!".format(utils.this_node())) @@ -1565,7 +1572,7 @@ # If we *were* updating /etc/hosts, the next line would have "\"$hosts_line\"" as # the last arg (but this requires re-enabling this functionality in ha-cluster-init) - if not invoke("ssh root@{} crm cluster init csync2_remote {}".format(seed_host, utils.this_node())): + if not invoke("ssh -o StrictHostKeyChecking=no root@{} crm cluster init csync2_remote {}".format(seed_host, utils.this_node())): error("Can't invoke crm cluster init init csync2_remote on {}".format(seed_host)) # This is necessary if syncing /etc/hosts (to ensure everyone's got the @@ -1589,7 +1596,7 @@ # they haven't gone to all nodes in the cluster, which means a # subseqent join of another node can fail its sync of corosync.conf # when it updates expected_votes. Grrr... - if not invoke('ssh root@%s "csync2 -mr / ; csync2 -fr / ; csync2 -xv"' % (seed_host)): + if not invoke('ssh -o StrictHostKeyChecking=no root@%s "csync2 -mr / ; csync2 -fr / ; csync2 -xv"' % (seed_host)): print("") warn("csync2 run failed - some files may not be sync'd") @@ -1706,12 +1713,11 @@ is_unicast = "nodelist" in open(corosync.conf()).read() if is_unicast: ringXaddr_res = [] - print("") for i in 0, 1: while True: ringXaddr = prompt_for_string('Address for ring{}'.format(i), r'([0-9]+\.){3}[0-9]+|[0-9a-fA-F]{1,4}:', - "", + _context.ip_address if i == 0 and _context.ip_address else "", valid_ucastIP, ringXaddr_res) if not ringXaddr: @@ -1721,9 +1727,13 @@ tmp = re.findall(r' {}/[0-9]+ '.format(ringXaddr), outp, re.M)[0].strip() peer_ip = corosync.get_value("nodelist.node.ring{}_addr".format(i)) # peer ring0_addr and local ring0_addr must be configured in the same network - if peer_ip not in utils.Network(tmp): - print(term.render(clidisplay.error(" Peer IP {} is not in the same network: {}".format(peer_ip, tmp)))) - continue + if not utils.ip_in_network(peer_ip, tmp): + errmsg = " Peer IP {} is not in the same network: {}".format(peer_ip, tmp) + if _context.yes_to_all: + error(errmsg) + else: + print(term.render(clidisplay.error(errmsg))) + continue ringXaddr_res.append(ringXaddr) break @@ -1733,11 +1743,11 @@ invoke("rm -f /var/lib/heartbeat/crm/* /var/lib/pacemaker/cib/*") corosync.add_node_ucast(ringXaddr_res) csync2_update(corosync.conf()) - invoke("ssh root@{} corosync-cfgtool -R".format(seed_host)) + invoke("ssh -o StrictHostKeyChecking=no root@{} corosync-cfgtool -R".format(seed_host)) # if no SBD devices are configured, # check the existing cluster if the sbd service is enabled - if not configured_sbd_device() and invoke("ssh root@{} systemctl is-enabled sbd.service".format(seed_host)): + if not configured_sbd_device() and invoke("ssh -o StrictHostKeyChecking=no root@{} systemctl is-enabled sbd.service".format(seed_host)): _context.diskless_sbd = True if ipv6_flag and not is_unicast: @@ -1902,7 +1912,7 @@ _context.host_status = 1 return - _rc, outp, _errp = utils.get_stdout_stderr("ssh root@{} \"hostname\"".format(seed_host)) + _rc, outp, _errp = utils.get_stdout_stderr("ssh -o StrictHostKeyChecking=no root@{} \"hostname\"".format(seed_host)) if outp: _context.connect_name = seed_host _context.cluster_node = outp.strip() @@ -1917,7 +1927,7 @@ if nodename not in xmlutil.listnodes(): error("Specified node {} is not configured in cluster, can not remove".format(nodename)) - _rc, outp, _errp = utils.get_stdout_stderr("ssh root@{} \"hostname\"".format(nodename)) + _rc, outp, _errp = utils.get_stdout_stderr("ssh -o StrictHostKeyChecking=no root@{} \"hostname\"".format(nodename)) if outp: _context.connect_name = seed_host _context.cluster_node = nodename @@ -1934,7 +1944,7 @@ error("Invalid IP address") # try to use the IP address to connect - _rc, outp, _errp = utils.get_stdout_stderr("ssh root@{} \"hostname\"".format(nodename)) + _rc, outp, _errp = utils.get_stdout_stderr("ssh -o StrictHostKeyChecking=no root@{} \"hostname\"".format(nodename)) if outp: ipaddr = nodename nodename = outp.strip() @@ -1958,12 +1968,12 @@ if _context.host_status != 0: status("Stopping the corosync service") - if not invoke('ssh root@{} "systemctl stop corosync"'.format(_context.connect_name)): + if not invoke('ssh -o StrictHostKeyChecking=no root@{} "systemctl stop corosync"'.format(_context.connect_name)): error("Stopping corosync on {} failed".format(_context.connect_name)) # delete configuration files from the node to be removed toremove = [SYSCONFIG_SBD, CSYNC2_CFG, corosync.conf(), CSYNC2_KEY, COROSYNC_AUTH] - if not invoke('ssh root@{} "bash -c \\\"rm -f {} && rm -f /var/lib/heartbeat/crm/* /var/lib/pacemaker/cib/*\\\""'.format(node, " ".join(toremove))): + if not invoke('ssh -o StrictHostKeyChecking=no root@{} "bash -c \\\"rm -f {} && rm -f /var/lib/heartbeat/crm/* /var/lib/pacemaker/cib/*\\\""'.format(node, " ".join(toremove))): error("Deleting the configuration files failed") else: # Check node status diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.0.0+git.1526547258.54aafa1d/crmsh/command.py new/crmsh-4.0.0+git.1537860833.be41d63c/crmsh/command.py --- old/crmsh-4.0.0+git.1526547258.54aafa1d/crmsh/command.py 2018-05-17 10:54:18.000000000 +0200 +++ new/crmsh-4.0.0+git.1537860833.be41d63c/crmsh/command.py 2018-09-25 09:33:53.000000000 +0200 @@ -420,7 +420,7 @@ ''' return tab completions ''' - return list(self._children.keys()) + return [x for x in self._children.keys() if x not in self._aliases] def get_child(self, child): ''' @@ -455,9 +455,10 @@ child = getattr(cls, attr) return child if attr.startswith('do_') and inspect.isfunction(child) else None - def add_aliases(children, info): + def add_aliases(children, info, aliases): "Add any aliases for command to child map" for alias in info.aliases: + aliases.append(alias) children[alias] = info def add_help(info): @@ -480,23 +481,25 @@ elif info.type == 'level': help_module.add_help(entry, level=info.name) - def prepare(children, child): + def prepare(children, child, aliases): info = ChildInfo(child, cls) if info.type == 'command' and not is_valid_command_function(info.function): raise ValueError("Invalid command function: %s.%s" % (cls.__name__, info.function.__name__)) children[info.name] = info - add_aliases(children, info) + add_aliases(children, info, aliases) add_help(info) children = {} + aliases = [] for child_name in dir(cls): if child_name == 'do_up' and re.search("ui_root.Root", str(cls)): continue child = get_if_command(child_name) if child: - prepare(children, child) + prepare(children, child, aliases) setattr(cls, '_children', children) + setattr(cls, '_aliases', aliases) return children diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.0.0+git.1526547258.54aafa1d/crmsh/config.py new/crmsh-4.0.0+git.1537860833.be41d63c/crmsh/config.py --- old/crmsh-4.0.0+git.1526547258.54aafa1d/crmsh/config.py 2018-05-17 10:54:18.000000000 +0200 +++ new/crmsh-4.0.0+git.1537860833.be41d63c/crmsh/config.py 2018-09-25 09:33:53.000000000 +0200 @@ -53,6 +53,23 @@ return path +def find_pacemaker_daemons(): + ''' + Search for the pacemaker daemon location by trying to find + where the daemons are. The control daemon is either + pacemaker-controld (2.0+) or crmd depending on the version. + ''' + candidate_dirs = ('{}/pacemaker'.format(d) for d in configure_libdir()) + for d in candidate_dirs: + daemon = '{}/pacemaker-controld'.format(d) + if os.path.exists(daemon): + return d + daemon = '{}/crmd'.format(d) + if os.path.exists(daemon): + return d + return '/usr/lib/pacemaker' + + # opt_ classes # members: default, completions, validate() @@ -227,7 +244,7 @@ 'sharedir': opt_dir('%(datadir)s/crmsh'), 'cache': opt_dir('%(cachedir)s/crm'), 'crm_config': opt_dir('%(varlib)s/pacemaker/cib'), - 'crm_daemon_dir': opt_dir('%(libdir)s/pacemaker'), + 'crm_daemon_dir': opt_dir(find_pacemaker_daemons()), 'crm_daemon_user': opt_string('hacluster'), 'ocf_root': opt_dir('%(libdir)s/ocf'), 'crm_dtd_dir': opt_dir('%(datadir)s/pacemaker'), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.0.0+git.1526547258.54aafa1d/crmsh/constants.py new/crmsh-4.0.0+git.1537860833.be41d63c/crmsh/constants.py --- old/crmsh-4.0.0+git.1526547258.54aafa1d/crmsh/constants.py 2018-05-17 10:54:18.000000000 +0200 +++ new/crmsh-4.0.0+git.1537860833.be41d63c/crmsh/constants.py 2018-09-25 09:33:53.000000000 +0200 @@ -334,6 +334,8 @@ } meta_progs = ("crmd", "pengine", "stonithd", "cib") +meta_progs_20 = ("pacemaker-controld", "pacemaker-schedulerd", "pacemaker-fenced", "pacemaker-based") + # elide these properties from tab completion crmd_metadata_do_not_complete = ("dc-version", "cluster-infrastructure", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.0.0+git.1526547258.54aafa1d/crmsh/logparser.py new/crmsh-4.0.0+git.1537860833.be41d63c/crmsh/logparser.py --- old/crmsh-4.0.0+git.1526547258.54aafa1d/crmsh/logparser.py 2018-05-17 10:54:18.000000000 +0200 +++ new/crmsh-4.0.0+git.1537860833.be41d63c/crmsh/logparser.py 2018-09-25 09:33:53.000000000 +0200 @@ -468,7 +468,7 @@ while any(f is not None for _, _, f in lines): x = min(lines, key=lambda v: v[0]) - if x[2] is None: + if x[0] is None or x[2] is None: break if self.to_ts and x[0] > self.to_ts: break diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.0.0+git.1526547258.54aafa1d/crmsh/main.py new/crmsh-4.0.0+git.1537860833.be41d63c/crmsh/main.py --- old/crmsh-4.0.0+git.1526547258.54aafa1d/crmsh/main.py 2018-05-17 10:54:18.000000000 +0200 +++ new/crmsh-4.0.0+git.1537860833.be41d63c/crmsh/main.py 2018-09-25 09:33:53.000000000 +0200 @@ -60,10 +60,15 @@ # prefer the user set PATH def envsetup(): - mybinpath = os.path.dirname(sys.argv[0]) path = os.environ["PATH"].split(':') - for p in mybinpath, config.path.crm_daemon_dir: - if p not in path: + # always add these dirs to PATH if they exist + libexec_dirs = ('/usr/lib64', '/usr/libexec', '/usr/lib', + '/usr/local/lib64', '/usr/local/libexec', '/usr/local/lib') + pacemaker_dirs = set("{}/pacemaker".format(d) for d in libexec_dirs) + pacemaker_dirs.add(config.path.crm_daemon_dir) + pacemaker_dirs.add(os.path.dirname(sys.argv[0])) + for p in pacemaker_dirs: + if p not in path and os.path.isdir(p): os.environ['PATH'] = "%s:%s" % (os.environ['PATH'], p) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.0.0+git.1526547258.54aafa1d/crmsh/ra.py new/crmsh-4.0.0+git.1537860833.be41d63c/crmsh/ra.py --- old/crmsh-4.0.0+git.1526547258.54aafa1d/crmsh/ra.py 2018-05-17 10:54:18.000000000 +0200 +++ new/crmsh-4.0.0+git.1537860833.be41d63c/crmsh/ra.py 2018-09-25 09:33:53.000000000 +0200 @@ -58,7 +58,7 @@ return False if userdir.getuser() not in ("root", config.path.crm_daemon_user): return False - if not (is_program(lrmadmin_prog) and is_process("lrmd")): + if not (is_program(lrmadmin_prog) and is_process(pacemaker_execd())): return False return utils.ext_cmd(">/dev/null 2>&1 %s -C" % lrmadmin_prog) == 0 @@ -227,23 +227,23 @@ @utils.memoize def get_pe_meta(): - return RAInfo("pengine", "metadata") + return RAInfo(utils.pacemaker_schedulerd(), "metadata") @utils.memoize def get_crmd_meta(): - return RAInfo("crmd", "metadata", + return RAInfo(utils.pacemaker_controld(), "metadata", exclude_from_completion=constants.crmd_metadata_do_not_complete) @utils.memoize def get_stonithd_meta(): - return RAInfo("stonithd", "metadata") + return RAInfo(utils.pacemaker_fenced(), "metadata") @utils.memoize def get_cib_meta(): - return RAInfo("cib", "metadata") + return RAInfo(utils.pacemaker_based(), "metadata") @utils.memoize @@ -266,7 +266,7 @@ ''' Do external program metadata. ''' - prog = is_program(prog) + prog = utils.pacemaker_daemon(prog) if prog: rc, l = stdout2list("%s metadata" % prog) if rc == 0: @@ -605,6 +605,8 @@ return cache.retrieve(sid) if self.ra_class in constants.meta_progs: l = prog_meta(self.ra_class) + elif self.ra_class in constants.meta_progs_20: + l = prog_meta(self.ra_class) else: l = ra_meta(self.ra_class, self.ra_type, self.ra_provider) if not l: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.0.0+git.1526547258.54aafa1d/crmsh/ui_context.py new/crmsh-4.0.0+git.1537860833.be41d63c/crmsh/ui_context.py --- old/crmsh-4.0.0+git.1526547258.54aafa1d/crmsh/ui_context.py 2018-05-17 10:54:18.000000000 +0200 +++ new/crmsh-4.0.0+git.1537860833.be41d63c/crmsh/ui_context.py 2018-09-25 09:33:53.000000000 +0200 @@ -47,10 +47,20 @@ ''' Execute the given command line. ''' + def trans_to_help(line): + line_list = line.split() + if line_list[-1] in ["-h", "--help"] and \ + line_list[-2] == "property": + return " ".join(line_list[:-2] + ["help", "property"]) + else: + return line + line = line.strip() if not line or line.startswith('#'): return True + line = trans_to_help(line) + self._mark = len(self.stack) self._in_transit = False self._wait_for_dc = False diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.0.0+git.1526547258.54aafa1d/crmsh/ui_ra.py new/crmsh-4.0.0+git.1537860833.be41d63c/crmsh/ui_ra.py --- old/crmsh-4.0.0+git.1526547258.54aafa1d/crmsh/ui_ra.py 2018-05-17 10:54:18.000000000 +0200 +++ new/crmsh-4.0.0+git.1537860833.be41d63c/crmsh/ui_ra.py 2018-09-25 09:33:53.000000000 +0200 @@ -115,6 +115,8 @@ ra_type, ra_class, ra_provider = args[0], args[1], args[2] elif args[0] in constants.meta_progs: ra_class, ra_provider, ra_type = args[0], None, None + elif args[0] in constants.meta_progs_20: + ra_class, ra_provider, ra_type = args[0], None, None else: ra_class, ra_provider, ra_type = ra.disambiguate_ra_type(args[0]) agent = ra.RAInfo(ra_class, ra_type, ra_provider) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.0.0+git.1526547258.54aafa1d/crmsh/utils.py new/crmsh-4.0.0+git.1537860833.be41d63c/crmsh/utils.py --- old/crmsh-4.0.0+git.1526547258.54aafa1d/crmsh/utils.py 2018-05-17 10:54:18.000000000 +0200 +++ new/crmsh-4.0.0+git.1537860833.be41d63c/crmsh/utils.py 2018-09-25 09:33:53.000000000 +0200 @@ -14,6 +14,7 @@ import bz2 import fnmatch import gc +import ipaddress from contextlib import contextmanager from . import config from . import userdir @@ -201,6 +202,66 @@ return None +def pacemaker_20_daemon(new, old): + "helper to discover renamed pacemaker daemons" + if is_program(new): + return new + return old + + +@memoize +def pacemaker_attrd(): + return pacemaker_20_daemon("pacemaker-attrd", "attrd") + + +@memoize +def pacemaker_based(): + return pacemaker_20_daemon("pacemaker-based", "cib") + + +@memoize +def pacemaker_controld(): + return pacemaker_20_daemon("pacemaker-controld", "crmd") + + +@memoize +def pacemaker_execd(): + return pacemaker_20_daemon("pacemaker-execd", "lrmd") + + +@memoize +def pacemaker_fenced(): + return pacemaker_20_daemon("pacemaker-fenced", "stonithd") + + +@memoize +def pacemaker_remoted(): + return pacemaker_20_daemon("pacemaker-remoted", "pacemaker_remoted") + + +@memoize +def pacemaker_schedulerd(): + return pacemaker_20_daemon("pacemaker-schedulerd", "pengine") + + +def pacemaker_daemon(name): + if name == "attrd" or name == "pacemaker-attrd": + return pacemaker_attrd() + if name == "cib" or name == "pacemaker-based": + return pacemaker_based() + if name == "crmd" or name == "pacemaker-controld": + return pacemaker_controld() + if name == "lrmd" or name == "pacemaker-execd": + return pacemaker_execd() + if name == "stonithd" or name == "pacemaker-fenced": + return pacemaker_fenced() + if name == "pacemaker_remoted" or name == "pacemeaker-remoted": + return pacemaker_remoted() + if name == "pengine" or name == "pacemaker-schedulerd": + return pacemaker_schedulerd() + raise ValueError("Not a Pacemaker daemon name: {}".format(name)) + + def can_ask(): """ Is user-interactivity possible? @@ -1436,7 +1497,7 @@ def get_pcmk_version(dflt): version = dflt - crmd = is_program('crmd') + crmd = pacemaker_controld() if crmd: cmd = crmd else: @@ -1977,177 +2038,23 @@ def get_ipv6_network(addr_with_mask): - return Network(addr_with_mask).network().to_compressed() + return str(ipaddress.ip_interface(addr_with_mask).network.network_address) def gen_nodeid_from_ipv6(addr): - return IP(addr).ip_long() % 1000000000 - + return int(ipaddress.ip_address(addr)) % 1000000000 -MAX_IPV6 = (1 << 128) - 1 -MAX_IPV4 = (1 << 32) - 1 +def ip_in_network(addr, net): + return ipaddress.ip_address(addr) in ipaddress.ip_interface(net).network -class IP(object): - """ - learn from https://github.com/tehmaze/ipcalc - """ - def __init__(self, ip, mask=None, version=0): - """Initialize a new IPv4 or IPv6 address.""" - self.mask = mask - self.v = 0 - if isinstance(ip, int): - self.ip = int(ip) - if self.ip <= MAX_IPV4: - self.v = version or 4 - self.dq = self._itodq(ip) - else: - self.v = version or 6 - self.dq = self._itodq(ip) - else: - if '/' in ip: - ip, mask = ip.split('/', 1) - self.mask = int(mask) - self.v = version or 0 - self.dq = ip - self.ip = self._dqtoi(ip) - - if self.mask is None: - self.mask = {4: 32, 6: 128}[self.v] - elif isinstance(self.mask, str): - self.mask = int(self.mask) - - def __str__(self): - return self.dq - - def _dqtoi(self, dq): - """Convert dotquad or hextet to long.""" - if ':' in dq: - if not valid_ip_addr(dq, 6): - raise ValueError("Invalid IPv6 address") - return self._dqtoi_ipv6(dq) - if '.' in dq: - if not valid_ip_addr(dq): - raise ValueError("Invalid IPv4 address") - return self._dqtoi_ipv4(dq) - - raise ValueError("Invalid address input") - - def _dqtoi_ipv4(self, dq): - q = dq.split('.') - q.reverse() - self.v = 4 - return sum(int(byte) << 8 * index for index, byte in enumerate(q)) - - def _dqtoi_ipv6(self, dq): - hx = dq.split(':') - if len(hx) < 8: - ix = hx.index('') - px = len(hx[ix + 1:]) - for x in range(ix + px + 1, 8): - hx.insert(ix, '0') - - ip = '' - hx = [x == '' and '0' or x for x in hx] - for h in hx: - if len(h) < 4: - h = '%04x' % int(h, 16) - ip += h - self.v = 6 - return int(ip, 16) - - def _itodq(self, n): - """Convert long to dotquad or hextet.""" - if self.v == 4: - return '.'.join(map(str, [ - (n >> 24) & 0xff, - (n >> 16) & 0xff, - (n >> 8) & 0xff, - n & 0xff, - ])) - n = '%032x' % n - return ':'.join(n[4 * x:4 * x + 4] for x in range(0, 8)) +class IP: + def __init__(self, addr): + self.addr = ipaddress.ip_address(addr) def version(self): - return self.v - - def ip_long(self): - return self.ip - - def to_compressed(self): - """ - Compress an IP address to its shortest possible compressed form. - """ - if self.v == 6: - quads = ['%x' % (int(q, 16)) for q in self.dq.split(':')] - quadc = ':%s:' % (':'.join(quads),) - zeros = [0, -1] - - # Find the largest group of zeros - for match in re.finditer(r'(:[:0]+)', quadc): - count = len(match.group(1)) - 1 - if count > zeros[0]: - zeros = [count, match.start(1)] - - count, where = zeros - if count: - quadc = quadc[:where] + ':' + quadc[where + count:] - - quadc = re.sub(r'((^:)|(:$))', '', quadc) - quadc = re.sub(r'((^:)|(:$))', '::', quadc) - return quadc - - -class Network(IP): - """ - learn from https://github.com/tehmaze/ipcalc - """ - def netmask_long(self): - """ - Network netmask derived from subnet size, as long. - """ - if self.version() == 4: - return (MAX_IPV4 >> (32 - self.mask)) << (32 - self.mask) - return (MAX_IPV6 >> (128 - self.mask)) << (128 - self.mask) - - def network(self): - """ - Network address, as IP object. - """ - return IP(self.network_long(), version=self.version()) - - def network_long(self): - """ - Network address, as long. - """ - return self.ip & self.netmask_long() - - def broadcast_long(self): - """ - Broadcast address, as long. - """ - if self.version() == 4: - return self.network_long() | (MAX_IPV4 - self.netmask_long()) - return self.network_long() | (MAX_IPV6 - self.netmask_long()) - - def check_collision(self, other): - """Check another network against the given network.""" - other = Network(other) - return self.network_long() < other.network_long() < self.broadcast_long() or \ - other.network_long() < self.network_long() < other.broadcast_long() - - def __contains__(self, ip): - return self.check_collision(ip) - - def has_key(self, ip): - """ - Check if the given ip is part of the network. - - :param ip: the ip address - :type ip: :class:`IP` or str or long or int - """ - return self.__contains__(ip) + return self.addr.version # vim:ts=4:sw=4:et: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.0.0+git.1526547258.54aafa1d/hb_report/constants.py new/crmsh-4.0.0+git.1537860833.be41d63c/hb_report/constants.py --- old/crmsh-4.0.0+git.1526547258.54aafa1d/hb_report/constants.py 2018-05-17 10:54:18.000000000 +0200 +++ new/crmsh-4.0.0+git.1537860833.be41d63c/hb_report/constants.py 2018-09-25 09:33:53.000000000 +0200 @@ -138,5 +138,6 @@ SYSINFO_F = "sysinfo.txt" SYSSTATS_F = "sysstats.txt" TIME_F = "time.txt" +OCFS2_F = "ocfs2.txt" # vim:ts=4:sw=4:et: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.0.0+git.1526547258.54aafa1d/hb_report/utillib.py new/crmsh-4.0.0+git.1537860833.be41d63c/hb_report/utillib.py --- old/crmsh-4.0.0+git.1526547258.54aafa1d/hb_report/utillib.py 2018-05-17 10:54:18.000000000 +0200 +++ new/crmsh-4.0.0+git.1537860833.be41d63c/hb_report/utillib.py 2018-09-25 09:33:53.000000000 +0200 @@ -283,6 +283,7 @@ time_status() corosync_blackbox() get_ratraces() + dump_ocfs2() for p in process_list: p.join() @@ -441,7 +442,7 @@ for item in grep("^name", incmd="dlm_tool ls"): lock_name = item.split()[1] out_string += "## NOTICE - Lockspace {}\n".format(lock_name) - out_string += get_command_info("dlm_tool lockdump {}".format(lock_name))[1] + '\n' + out_string += get_command_info("dlm_tool lockdebug {}".format(lock_name))[1] + '\n' out_string += "##### NOTICE - Lockspace history:\n" out_string += get_command_info("dlm_tool dump")[1] + '\n' @@ -866,7 +867,7 @@ workdir = constants.WORKDIR if os.path.isfile(constants.CONF): shutil.copy2(constants.CONF, workdir) - if crmutils.is_process("crmd"): + if crmutils.is_process("pacemaker-controld") or crmutils.is_process("crmd"): dump_state(workdir) open(os.path.join(workdir, "RUNNING"), 'w') else: @@ -933,7 +934,7 @@ if constants.USER_NODES: nodes = constants.USER_NODES.split() # 2. running crm - elif crmutils.is_process("crmd"): + elif crmutils.is_process("pacemaker-controld") or crmutils.is_process("crmd"): cmd = "crm node server" nodes = get_command_info(cmd)[1].strip().split('\n') # 3. if the cluster's stopped, try the CIB @@ -1629,6 +1630,22 @@ time_f = os.path.join(constants.WORKDIR, constants.TIME_F) crmutils.str2file(out_string, time_f) +def dump_ocfs2(): + ocfs2_f = os.path.join(constants.WORKDIR, constants.OCFS2_F) + with open(ocfs2_f, "w") as f: + #dump all tasks stack into dmesg + os.system("echo t > /proc/sysrq-trigger") + + cmds = [ "dmesg", "ps -efL", "lsof", + "lsblk -o 'NAME,KNAME,MAJ:MIN,FSTYPE,LABEL,RO,RM,MODEL,SIZE,OWNER,GROUP,MODE,ALIGNMENT,MIN-IO,OPT-IO,PHY-SEC,LOG-SEC,ROTA,SCHED,MOUNTPOINT'", + "mounted.ocfs2 -f", "findmnt", "mount", + "cat /sys/fs/ocfs2/cluster_stack" + ] + for cmd in cmds: + _, out = crmutils.get_stdout(cmd) + f.write("\n\n#=====[ Command ] ==========================#\n") + f.write("# %s\n"%(cmd)) + f.write(out) def touch_dc(): if constants.SKIP_LVL: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.0.0+git.1526547258.54aafa1d/test/containerized-regression-tests.sh new/crmsh-4.0.0+git.1537860833.be41d63c/test/containerized-regression-tests.sh --- old/crmsh-4.0.0+git.1526547258.54aafa1d/test/containerized-regression-tests.sh 2018-05-17 10:54:18.000000000 +0200 +++ new/crmsh-4.0.0+git.1537860833.be41d63c/test/containerized-regression-tests.sh 2018-09-25 09:33:53.000000000 +0200 @@ -1,3 +1,3 @@ #!/bin/sh docker pull krig/crmsh:latest -docker run -t -v "$(pwd):/app" krig/crmsh /bin/sh -c "systemctl start dbus; cd /app; ./test/run-in-container.sh $(whoami) $(id -u) $(id -g)" +docker run -t -v "$(pwd):/app" krig/crmsh /bin/sh -c "cd /app; ./test/run-in-container.sh $(id -un) $(id -gn) $(id -u) $(id -g)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.0.0+git.1526547258.54aafa1d/test/regression.sh new/crmsh-4.0.0+git.1537860833.be41d63c/test/regression.sh --- old/crmsh-4.0.0+git.1526547258.54aafa1d/test/regression.sh 2018-05-17 10:54:18.000000000 +0200 +++ new/crmsh-4.0.0+git.1537860833.be41d63c/test/regression.sh 2018-09-25 09:33:53.000000000 +0200 @@ -145,6 +145,7 @@ fi > $difff if [ $? -ne 0 ]; then echo " FAIL" >&3 + cat $difff >&3 dumpcase return 1 else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.0.0+git.1526547258.54aafa1d/test/run-in-container.sh new/crmsh-4.0.0+git.1537860833.be41d63c/test/run-in-container.sh --- old/crmsh-4.0.0+git.1526547258.54aafa1d/test/run-in-container.sh 2018-05-17 10:54:18.000000000 +0200 +++ new/crmsh-4.0.0+git.1537860833.be41d63c/test/run-in-container.sh 2018-09-25 09:33:53.000000000 +0200 @@ -1,12 +1,17 @@ #!/bin/sh oname=$1 -ouid=$2 -ogid=$3 +ogroup=$2 +ouid=$3 +ogid=$4 cat /etc/group | awk '{ FS = ":" } { print $3 }' | grep -q "$ogid" || groupadd -g "$ogid" id -u $oname >/dev/null 2>&1 || useradd -u $ouid -g $ogid $oname +preamble() { + systemctl start dbus +} + unit_tests() { echo "** Unit tests" su $oname -c "./test/run" @@ -28,7 +33,10 @@ sh /usr/share/crmsh/tests/regression.sh } +preamble unit_tests configure make_install regression_tests + +chown $oname:$ogroup /app/crmtestout/* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.0.0+git.1526547258.54aafa1d/test/run-in-travis.sh new/crmsh-4.0.0+git.1537860833.be41d63c/test/run-in-travis.sh --- old/crmsh-4.0.0+git.1526547258.54aafa1d/test/run-in-travis.sh 2018-05-17 10:54:18.000000000 +0200 +++ new/crmsh-4.0.0+git.1537860833.be41d63c/test/run-in-travis.sh 2018-09-25 09:33:53.000000000 +0200 @@ -22,6 +22,7 @@ } unit_tests +rc_unittest=$? configure make_install -regression_tests +regression_tests && exit $rc_unittest diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.0.0+git.1526547258.54aafa1d/test/testcases/common.excl new/crmsh-4.0.0+git.1537860833.be41d63c/test/testcases/common.excl --- old/crmsh-4.0.0+git.1526547258.54aafa1d/test/testcases/common.excl 2018-05-17 10:54:18.000000000 +0200 +++ new/crmsh-4.0.0+git.1537860833.be41d63c/test/testcases/common.excl 2018-09-25 09:33:53.000000000 +0200 @@ -6,6 +6,8 @@ Error setting fail-count-p0=5 $section=status, set=status-node1$: The object/attribute does not exist Error setting s1=1 2 3 $section=status, set=status-node1$: The object/attribute does not exist Error signing on to the CRMd service +Error connecting to the controller +Error performing operation: Transport endpoint is not connected .EXT crm_resource --list-standards .EXT crm_resource --list-ocf-alternatives Delay .EXT crm_resource --list-ocf-alternatives Dummy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.0.0+git.1526547258.54aafa1d/test/testcases/common.filter new/crmsh-4.0.0+git.1537860833.be41d63c/test/testcases/common.filter --- old/crmsh-4.0.0+git.1526547258.54aafa1d/test/testcases/common.filter 2018-05-17 10:54:18.000000000 +0200 +++ new/crmsh-4.0.0+git.1537860833.be41d63c/test/testcases/common.filter 2018-09-25 09:33:53.000000000 +0200 @@ -2,4 +2,8 @@ # 1. replace .EXT [path/]<cmd> <parameter> with .EXT <cmd> <parameter> /\.EXT \/(.+)/ { gsub(/\/.*\//, "", $2) } /\.EXT >\/dev\/null 2>&1 \/(.+)/ { gsub(/\/.*\//, "", $4) } +/\.EXT pacemaker-fenced/ { gsub(/pacemaker-fenced/,"stonithd") } +/\.EXT pacemaker-controld/ { gsub(/pacemaker-controld/,"crmd") } +/\.EXT pacemaker-schedulerd/ { gsub(/pacemaker-schedulerd/,"pengine") } +/\.EXT pacemaker-based/ { gsub(/pacemaker-based/,"cib") } { print } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.0.0+git.1526547258.54aafa1d/test/testcases/ra.exp new/crmsh-4.0.0+git.1537860833.be41d63c/test/testcases/ra.exp --- old/crmsh-4.0.0+git.1526547258.54aafa1d/test/testcases/ra.exp 2018-05-17 10:54:18.000000000 +0200 +++ new/crmsh-4.0.0+git.1537860833.be41d63c/test/testcases/ra.exp 2018-09-25 09:33:53.000000000 +0200 @@ -96,7 +96,7 @@ The overall delay is derived from a random delay value adding this static delay so that the sum is kept below the maximum delay. pcmk_action_limit (integer, [1]): The maximum number of actions can be performed in parallel on this device - Pengine property concurrent-fencing=true needs to be configured first. + Cluster property concurrent-fencing=true needs to be configured first. Then use this to specify the maximum number of actions can be performed in parallel on this device. -1 is unlimited. pcmk_reboot_action (string, [reboot]): Advanced use only: An alternate command to run instead of 'reboot' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.0.0+git.1526547258.54aafa1d/test/testcases/resource.exp new/crmsh-4.0.0+git.1537860833.be41d63c/test/testcases/resource.exp --- old/crmsh-4.0.0+git.1526547258.54aafa1d/test/testcases/resource.exp 2018-05-17 10:54:18.000000000 +0200 +++ new/crmsh-4.0.0+git.1537860833.be41d63c/test/testcases/resource.exp 2018-09-25 09:33:53.000000000 +0200 @@ -838,40 +838,28 @@ .TRY resource start p3 .TRY resource cleanup .EXT crm_resource --cleanup -Error performing operation: Transport endpoint is not connected .TRY resource cleanup p3 .EXT crm_resource --cleanup --resource p3 -Error performing operation: Transport endpoint is not connected .TRY resource cleanup p3 node1 .EXT crm_resource --cleanup --resource p3 --node node1 -Error performing operation: Transport endpoint is not connected .TRY resource cleanup force .EXT crm_resource --cleanup --force -Error performing operation: Transport endpoint is not connected .TRY resource cleanup p3 force .EXT crm_resource --cleanup --resource p3 --force -Error performing operation: Transport endpoint is not connected .TRY resource cleanup p3 node1 force .EXT crm_resource --cleanup --resource p3 --node node1 --force -Error performing operation: Transport endpoint is not connected .TRY resource refresh .EXT crm_resource --refresh -Error performing operation: Transport endpoint is not connected .TRY resource refresh p3 .EXT crm_resource --refresh --resource p3 -Error performing operation: Transport endpoint is not connected .TRY resource refresh p3 node1 .EXT crm_resource --refresh --resource p3 --node node1 -Error performing operation: Transport endpoint is not connected .TRY resource refresh force .EXT crm_resource --refresh --force -Error performing operation: Transport endpoint is not connected .TRY resource refresh p3 force .EXT crm_resource --refresh --resource p3 --force -Error performing operation: Transport endpoint is not connected .TRY resource refresh p3 node1 force .EXT crm_resource --refresh --resource p3 --node node1 --force -Error performing operation: Transport endpoint is not connected .TRY resource stop p3 .TRY configure rm cg .TRY configure ms msg g @@ -900,6 +888,7 @@ clone_color: m1 allocation score on node1: 0 clone_color: p2:0 allocation score on node1: 0 native_color: p2:0 allocation score on node1: -INFINITY +p2:0 promotion score on none: 0 native_color: p3 allocation score on node1: -INFINITY clone_color: msg allocation score on node1: 0 clone_color: g:0 allocation score on node1: 0 @@ -910,6 +899,7 @@ group_color: p4:0 allocation score on node1: -INFINITY native_color: p0:0 allocation score on node1: -INFINITY native_color: p4:0 allocation score on node1: -INFINITY +g:0 promotion score on none: 0 Remaining: node1 capacity: Transition Summary: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.0.0+git.1526547258.54aafa1d/test/unittests/test_utils.py new/crmsh-4.0.0+git.1537860833.be41d63c/test/unittests/test_utils.py --- old/crmsh-4.0.0+git.1526547258.54aafa1d/test/unittests/test_utils.py 2018-05-17 10:54:18.000000000 +0200 +++ new/crmsh-4.0.0+git.1537860833.be41d63c/test/unittests/test_utils.py 2018-09-25 09:33:53.000000000 +0200 @@ -129,12 +129,10 @@ ip = utils.IP('2001:db3::1') assert ip.version() == 6 - net = utils.Network('192.0.2.0/24') - assert ('192.168.2.0' in net) is False - assert ('192.0.2.42' in net) is True + assert (utils.ip_in_network('192.168.2.0', '192.0.2.0/24') is False) + assert (utils.ip_in_network('192.0.2.42', '192.0.2.0/24') is True) - net = utils.Network('2001:db8::2/64') - assert ('2001:db3::1' in net) is False - assert ('2001:db8::1' in net) is True + assert (utils.ip_in_network('2001:db3::1', '2001:db8::2/64') is False) + assert (utils.ip_in_network('2001:db8::1', '2001:db8::2/64') is True) assert utils.get_ipv6_network("2002:db8::2/64") == "2002:db8::"

1 0

commit obs-service-set_version for openSUSE:Factory
by root 25 Sep '18

25 Sep '18

Hello community, here is the log from the commit of package obs-service-set_version for openSUSE:Factory checked in at 2018-09-25 15:43:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/obs-service-set_version (Old) and /work/SRC/openSUSE:Factory/.obs-service-set_version.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "obs-service-set_version" Tue Sep 25 15:43:56 2018 rev:34 rq:637853 version:0.5.10 Changes: -------- --- /work/SRC/openSUSE:Factory/obs-service-set_version/obs-service-set_version.changes 2018-09-18 11:45:47.339763594 +0200 +++ /work/SRC/openSUSE:Factory/.obs-service-set_version.new/obs-service-set_version.changes 2018-09-25 15:44:11.169177475 +0200 @@ -1,0 +2,11 @@ +Wed Sep 19 06:28:24 UTC 2018 - adrian(a)suse.de + +- Update to version 0.5.10: + * fix zipfile crash also for python2.7 + +------------------------------------------------------------------- +Mon Sep 17 10:21:44 UTC 2018 - olaf(a)aepfle.de + +- Wrap make check in bcond obs_scm_testsuite + +------------------------------------------------------------------- Old: ---- obs-service-set_version-0.5.9.tar.gz New: ---- obs-service-set_version-0.5.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ obs-service-set_version.spec ++++++ --- /var/tmp/diff_new_pack.JwO8QR/_old 2018-09-25 15:44:12.737175801 +0200 +++ /var/tmp/diff_new_pack.JwO8QR/_new 2018-09-25 15:44:12.741175796 +0200 @@ -15,20 +15,21 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # - +%bcond_without obs_scm_testsuite %define service set_version Name: obs-service-%{service} -Version: 0.5.9 +Version: 0.5.10 Release: 0 Summary: An OBS source service: Update spec file version License: GPL-2.0-or-later Group: Development/Tools/Building Url: https://github.com/openSUSE/obs-service-%{service} Source: %{name}-%{version}.tar.gz +%if %{with obs_scm_testsuite} BuildRequires: python3-ddt BuildRequires: python3-flake8 -BuildRequires: python3-packaging +%endif %if 0%{?suse_version} %if 0%{?suse_version} > 1315 Recommends: python3-packaging @@ -55,8 +56,10 @@ sed -i -e "1 s,#!/usr/bin/python$,#!/usr/bin/python3," set_version %endif +%if %{with obs_scm_testsuite} %check make test PYTHON=python3 +%endif %install mkdir -p %{buildroot}%{_prefix}/lib/obs/service ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.JwO8QR/_old 2018-09-25 15:44:12.765175771 +0200 +++ /var/tmp/diff_new_pack.JwO8QR/_new 2018-09-25 15:44:12.765175771 +0200 @@ -1,5 +1,5 @@ pkgname=obs-service-set_version -pkgver=0.5.9 +pkgver=0.5.10 pkgrel=0 pkgdesc="An OBS source service: Update spec file version" arch=('i686' 'x86_64') ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.JwO8QR/_old 2018-09-25 15:44:12.789175744 +0200 +++ /var/tmp/diff_new_pack.JwO8QR/_new 2018-09-25 15:44:12.793175741 +0200 @@ -1,5 +1,5 @@ <servicedata> <service name="tar_scm"> <param name="url">git@github.com:openSUSE/obs-service-set_version.git</param> - <param name="changesrevision">4247c6fdf18d9de6d289b0086528079a6b037080</param></service> + <param name="changesrevision">eaedc529acba421821e0e5dcb4956c66e7f315a9</param></service> </servicedata> \ No newline at end of file ++++++ debian.dsc ++++++ --- /var/tmp/diff_new_pack.JwO8QR/_old 2018-09-25 15:44:12.809175724 +0200 +++ /var/tmp/diff_new_pack.JwO8QR/_new 2018-09-25 15:44:12.809175724 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-set_version -Version: 0.5.9-0 +Version: 0.5.10-0 Binary: obs-service-set_version Provides: obs-service-set_version Maintainer: Adrian Schroeter <adrian(a)suse.de> ++++++ obs-service-set_version-0.5.9.tar.gz -> obs-service-set_version-0.5.10.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-set_version-0.5.9/set_version new/obs-service-set_version-0.5.10/set_version --- old/obs-service-set_version-0.5.9/set_version 2018-09-17 11:27:24.000000000 +0200 +++ new/obs-service-set_version-0.5.10/set_version 2018-09-19 08:27:17.000000000 +0200 @@ -129,9 +129,11 @@ v = self.__get_version(zf.namelist()) if v: return v + # is_zipfile has often false positives and module is + # crashing on processing except OSError: - # is_zipfile has often false positives and module is - # crashing on processing + pass + except IOError: pass # Nothing found return None

1 0

commit yast2-s390 for openSUSE:Factory
by root 25 Sep '18

25 Sep '18

Hello community, here is the log from the commit of package yast2-s390 for openSUSE:Factory checked in at 2018-09-25 15:43:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-s390 (Old) and /work/SRC/openSUSE:Factory/.yast2-s390.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-s390" Tue Sep 25 15:43:51 2018 rev:7 rq:637776 version:4.0.5 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-s390/yast2-s390.changes 2018-05-30 12:42:58.933994171 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-s390.new/yast2-s390.changes 2018-09-25 15:43:51.865198098 +0200 @@ -1,0 +2,12 @@ +Fri Sep 21 11:43:00 UTC 2018 - dgonzalez(a)suse.com + +- Avoid hanging YaST when try to deactivate a DASD in use + (bsc#1091797) +- 4.0.5 + +------------------------------------------------------------------- +Mon Aug 20 09:20:22 CEST 2018 - schubi(a)suse.de + +- Switched license in spec file from SPDX2 to SPDX3 format. + +------------------------------------------------------------------- Old: ---- yast2-s390-4.0.4.tar.bz2 New: ---- yast2-s390-4.0.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-s390.spec ++++++ --- /var/tmp/diff_new_pack.1WFzeb/_old 2018-09-25 15:43:52.265197671 +0200 +++ /var/tmp/diff_new_pack.1WFzeb/_new 2018-09-25 15:43:52.269197666 +0200 @@ -17,7 +17,7 @@ Name: yast2-s390 -Version: 4.0.4 +Version: 4.0.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -40,7 +40,7 @@ Requires: yast2-ruby-bindings >= 3.1.7 Supplements: yast2-storage-ng Summary: YaST2 - S/390 Specific Features Configuration -License: GPL-2.0 +License: GPL-2.0-only Group: System/YaST Url: http://github.com/yast/yast-s390/ ++++++ yast2-s390-4.0.4.tar.bz2 -> yast2-s390-4.0.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-4.0.4/package/yast2-s390.changes new/yast2-s390-4.0.5/package/yast2-s390.changes --- old/yast2-s390-4.0.4/package/yast2-s390.changes 2018-05-29 10:32:44.000000000 +0200 +++ new/yast2-s390-4.0.5/package/yast2-s390.changes 2018-09-24 09:42:42.000000000 +0200 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Fri Sep 21 11:43:00 UTC 2018 - dgonzalez(a)suse.com + +- Avoid hanging YaST when try to deactivate a DASD in use + (bsc#1091797) +- 4.0.5 + +------------------------------------------------------------------- +Mon Aug 20 09:20:22 CEST 2018 - schubi(a)suse.de + +- Switched license in spec file from SPDX2 to SPDX3 format. + +------------------------------------------------------------------- Tue May 08 14:01:56 CEST 2018 - aschnell(a)suse.com - disable mdadm auto assemble during DASD dialog (bsc#1089645) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-4.0.4/package/yast2-s390.spec new/yast2-s390-4.0.5/package/yast2-s390.spec --- old/yast2-s390-4.0.4/package/yast2-s390.spec 2018-05-29 10:32:44.000000000 +0200 +++ new/yast2-s390-4.0.5/package/yast2-s390.spec 2018-09-24 09:42:42.000000000 +0200 @@ -17,14 +17,14 @@ Name: yast2-s390 -Version: 4.0.4 +Version: 4.0.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 Group: System/YaST -License: GPL-2.0 +License: GPL-2.0-only BuildRequires: yast2 BuildRequires: yast2-devtools BuildRequires: yast2-ruby-bindings >= 3.1.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-4.0.4/src/modules/DASDController.rb new/yast2-s390-4.0.5/src/modules/DASDController.rb --- old/yast2-s390-4.0.4/src/modules/DASDController.rb 2018-05-29 10:32:44.000000000 +0200 +++ new/yast2-s390-4.0.5/src/modules/DASDController.rb 2018-09-24 09:42:42.000000000 +0200 @@ -29,6 +29,7 @@ # Representation of the configuration of controller. # Input and output routines. require "yast" +require "yast2/popup" require "shellwords" module Yast @@ -465,84 +466,42 @@ when 0 when 1 - Report.Error( - Builtins.sformat( - # error report, %1 is device identification - _("%1: sysfs not mounted."), - channel - ) - ) + # error report, %1 is device identification + Report.Error(Builtins.sformat(_("%1: sysfs not mounted."), channel)) when 2 - Report.Error( - Builtins.sformat( - # error report, %1 is device identification - _("%1: Invalid status for <online>."), - channel - ) - ) + # error report, %1 is device identification + Report.Error(Builtins.sformat(_("%1: Invalid status for <online>."), channel)) when 3 - Report.Error( - Builtins.sformat( - # error report, %1 is device identification - _("%1: No device found for <ccwid>."), - channel - ) - ) + # error report, %1 is device identification + Report.Error(Builtins.sformat(_("%1: No device found for <ccwid>."), channel)) when 4 - Report.Error( - Builtins.sformat( - # error report, %1 is device identification - _("%1: Could not change state of the device."), - channel - ) - ) + # error report, %1 is device identification + Report.Error(Builtins.sformat(_("%1: Could not change state of the device."), channel)) when 5 # https://bugzilla.novell.com/show_bug.cgi?id=446998#c15 - Report.Error( - Builtins.sformat( - # error report, %1 is device identification - _("%1: Device is not a DASD."), - channel - ) - ) + # error report, %1 is device identification + Report.Error(Builtins.sformat(_("%1: Device is not a DASD."), channel)) when 6 # https://bugzilla.novell.com/show_bug.cgi?id=446998#c15 - Report.Error( - Builtins.sformat( - # error report, %1 is device identification - _("%1: Could not load module."), - channel - ) - ) + # error report, %1 is device identification + Report.Error(Builtins.sformat(_("%1: Could not load module."), channel)) when 7 # http://bugzilla.novell.com/show_bug.cgi?id=561876#c8 - Report.Error( - Builtins.sformat( - # error report, %1 is device identification - _("%1: Failed to activate DASD."), - channel - ) - ) + # error report, %1 is device identification + Report.Error(Builtins.sformat(_("%1: Failed to activate DASD."), channel)) when 8 # http://bugzilla.novell.com/show_bug.cgi?id=561876#c8 - Report.Error( - Builtins.sformat( - # error report, %1 is device identification - _("%1: DASD is not formatted."), - channel - ) - ) + # error report, %1 is device identification + Report.Error(Builtins.sformat(_("%1: DASD is not formatted."), channel)) + when 16 + # https://bugzilla.suse.com/show_bug.cgi?id=1091797#c8 + # TRANSLATORS: error report, %1 is device identification + message = Builtins.sformat(_("%1 DASD is in use and cannot be deactivated."), channel) + report_error(_("Error: channel in use"), message, output_details(ret)) else - Report.Error( - Builtins.sformat( - # error report, %1 is device identification, %2 is integer code - _("%1: Unknown error %2.\nstderr:%3\nstdout:%4"), - channel, - ret["exit"], - ret["stderr"], - ret["stdout"] - ) - ) + # TRANSLATORS: error message, %1 is device identification, %2 is an integer code + message = Builtins.sformat(_("%1 Unknown error %2"), channel, ret["exit"]) + report_error(message, _("Unknown error"), output_details(ret)) end nil @@ -589,7 +548,7 @@ # @param [Boolean] diag boolean Activate DIAG or not def DeactivateDisk(channel, diag) command = Builtins.sformat( - "/sbin/dasd_configure '%1' %2 %3", + "/sbin/dasd_configure '%1' %2 %3 < /dev/null", channel, 0, diag ? 1 : 0 @@ -854,6 +813,32 @@ stderr end + + # Returns an string containing the available stdout and/or stderr + # + # @param ret [Hash] + # @return [String] + def output_details(ret) + output = { + stderr: ret["stderr"].to_s.strip, + stdout: ret["stdout"].to_s.strip + } + + output.map { |k, v| "#{k}: #{v}" unless v.empty? }.compact.join("\n\n") + end + + # Reports the error in the proper way + # + # When an error has details to give more feedback, it is preferable to display it in a Popup + # unless the code has been executed by AutoYaST, in which case the Yast::Report.Error must be + # used to avoid blocking it. + def report_error(headline, message, details) + if Mode.auto || details.empty? + Report.Error("#{message}\n#{details}") + else + Yast2::Popup.show(message, headline: headline, details: details) + end + end end DASDController = DASDControllerClass.new diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-4.0.4/test/dasd_controller_test.rb new/yast2-s390-4.0.5/test/dasd_controller_test.rb --- old/yast2-s390-4.0.4/test/dasd_controller_test.rb 2018-05-29 10:32:44.000000000 +0200 +++ new/yast2-s390-4.0.5/test/dasd_controller_test.rb 2018-09-24 09:42:42.000000000 +0200 @@ -7,6 +7,105 @@ describe "Yast::DASDController" do subject { Yast::DASDController } + describe "#DeactivateDisk" do + let(:auto) { false } + let(:channel) { "0.0.0160" } + let(:diagnose) { false } + let(:exit_code) { 0 } + let(:command_result) { { "exit" => exit_code } } + + before do + allow(Yast::Mode).to receive(:auto).and_return(auto) + allow(Yast::Report).to receive(:Error) + allow(Yast2::Popup).to receive(:show) + allow(Yast::SCR).to receive(:Execute).and_return(command_result) + allow(Yast::SCR).to receive(:Read) + .with(Yast.path(".probe.disk")).once + .and_return(load_data("probe_disk_dasd.yml")) + + subject.ProbeDisks() + end + + it "redirects output to /dev/null" do + expect(Yast::SCR).to receive(:Execute) + .with(anything, /\/sbin\/dasd_configure .* < \/dev\/null/) + + subject.DeactivateDisk(channel, diagnose) + end + + context "whit unknown exit code" do + let(:command_result) do + { + "exit" => exit_code, + "stderr" => "Warning: ECKD DASD 0.0.0150 is unknown!\n" \ + "The following unknown resources may be affected:\n" \ + "- Mount point /unknown\n", + "stdout" => "Continue with operation? (yes/no)" + } + end + let(:exit_code) { "unknown" } + + it "reports an error with details" do + expect(Yast2::Popup).to receive(:show).with(anything, hash_including(:headline, :details)) + + subject.DeactivateDisk(channel, diagnose) + end + + context "but in Mode.auto" do + let(:auto) { true } + + it "reports the error throught Yast::Report" do + expect(Yast::Report).to receive(:Error) + + subject.DeactivateDisk(channel, diagnose) + end + end + end + + context "when disk is being in use" do + let(:exit_code) { 16 } + let(:command_result) do + { + "exit" => exit_code, + "stderr" => "Warning: ECKD DASD 0.0.0150 is in use!\n" \ + "The following resources may be affected:\n" \ + "- Mount point /mnt\n", + "stdout" => "Continue with operation? (yes/no)" + } + end + + it "returns nil" do + expect(subject.DeactivateDisk(channel, diagnose)).to be_nil + end + + it "reports an error using a popup with details" do + expect(Yast2::Popup).to receive(:show).with(anything, hash_including(:headline, :details)) + + subject.DeactivateDisk(channel, diagnose) + end + + context "but in Mode.auto" do + let(:auto) { true } + + it "reports the error throught Yast::Report" do + expect(Yast::Report).to receive(:Error).with(/in use/) + + subject.DeactivateDisk(channel, diagnose) + end + end + + context "but there are not details to show" do + let(:command_result) { { "exit" => exit_code } } + + it "reports an error throught Yast::Report" do + expect(Yast::Report).to receive(:Error).with(/in use/) + + subject.DeactivateDisk(channel, diagnose) + end + end + end + end + describe "#IsAvailable" do it "returns true if .probe.disk contains DASDs" do expect(Yast::SCR).to receive(:Read).with(Yast.path(".probe.disk")).once

1 0