January 2016 - openSUSE Commits - openSUSE Mailing Lists

commit perl-Software-License for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package perl-Software-License for openSUSE:Factory checked in at 2016-01-21 23:44:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Software-License (Old) and /work/SRC/openSUSE:Factory/.perl-Software-License.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Software-License" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Software-License/perl-Software-License.changes 2014-05-31 08:09:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Software-License.new/perl-Software-License.changes 2016-01-22 01:09:58.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Jan 19 10:25:37 UTC 2016 - coolo(a)suse.com + +- updated to 0.103011 + see /usr/share/doc/packages/perl-Software-License/Changes + + 0.103011 2016-01-16 21:27:53-05:00 America/New_York + - do not load Sub::Install, since it isn't used! + - eliminate superfluous FULL STOP characters (".") + +------------------------------------------------------------------- Old: ---- Software-License-0.103010.tar.gz New: ---- Software-License-0.103011.tar.gz cpanspec.yml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Software-License.spec ++++++ --- /var/tmp/diff_new_pack.sgoL41/_old 2016-01-22 01:10:00.000000000 +0100 +++ /var/tmp/diff_new_pack.sgoL41/_new 2016-01-22 01:10:00.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-Software-License # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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,35 +17,33 @@ Name: perl-Software-License -Version: 0.103010 +Version: 0.103011 Release: 0 %define cpan_name Software-License -Summary: Packages that provide templated software licenses +Summary: Packages That Provide Templated Software Licenses License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Software-License/ -Source: http://www.cpan.org/authors/id/R/RJ/RJBS/%{cpan_name}-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/R/RJ/RJBS/%{cpan_name}-%{version}.tar.gz +Source1: cpanspec.yml BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(Data::Section) BuildRequires: perl(Module::Load) -BuildRequires: perl(Sub::Install) BuildRequires: perl(Test::More) >= 0.96 BuildRequires: perl(Text::Template) BuildRequires: perl(Try::Tiny) BuildRequires: perl(parent) Requires: perl(Data::Section) Requires: perl(Module::Load) -Requires: perl(Sub::Install) Requires: perl(Text::Template) Requires: perl(parent) %{perl_requires} %description -This package provides templated software licenses in the form of modules, -as well as some license-related utilities, such as a 'fulltext' method. +packages that provide templated software licenses %prep %setup -q -n %{cpan_name}-%{version} ++++++ Software-License-0.103010.tar.gz -> Software-License-0.103011.tar.gz ++++++ ++++ 2737 lines of diff (skipped) ++++++ cpanspec.yml ++++++ --- #description_paragraphs: 3 #description: |- # override description from CPAN #summary: override summary from CPAN #no_testing: broken upstream #sources: # - source1 # - source2 #patches: # foo.patch: -p1 # bar.patch: #preamble: |- # BuildRequires: gcc-c++ #post_prep: |- # hunspell=`pkg-config --libs hunspell | sed -e 's,-l,,; s, *,,g'` # sed -i -e "s,hunspell-X,$hunspell," t/00-prereq.t Makefile.PL #post_build: |- # rm unused.files #post_install: |- # sed on %{name}.files #license: SUSE-NonFree #skip_noarch: 1 #custom_build: |- #./Build build flags=%{?_smp_mflags} --myflag #custom_test: |- #startserver && make test #ignore_requires: Bizarre::Module

1 0

commit perl-Mojolicious for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package perl-Mojolicious for openSUSE:Factory checked in at 2016-01-21 23:44:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Mojolicious (Old) and /work/SRC/openSUSE:Factory/.perl-Mojolicious.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Mojolicious" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Mojolicious/perl-Mojolicious.changes 2016-01-15 10:42:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Mojolicious.new/perl-Mojolicious.changes 2016-01-22 01:09:55.000000000 +0100 @@ -1,0 +2,28 @@ +Tue Jan 19 10:08:10 UTC 2016 - coolo(a)suse.com + +- updated to 6.40 + see /usr/share/doc/packages/perl-Mojolicious/Changes + + 6.40 2016-01-13 + - Removed client_challenge, client_handshake, server_handshake and server_open + methods from Mojo::Transaction::WebSocket. (batman, sri) + - Removed is_writing method from Mojo::Transaction. + - Removed upgrade event from Mojo::Transaction::HTTP. + - Deprecated Mojo::Transaction::WebSocket::build_frame and + Mojo::Transaction::WebSocket::parse_frame in favor of + Mojo::WebSocket::build_frame and Mojo::WebSocket::parse_frame. (batman) + - Replaced deprecated proxy method in Mojo::Message::Request with an + attribute. + - Added SNI support to all built-in web servers. (bpmedley, sri) + - Added module Mojo::WebSocket. (batman) + - Added established attribute to Mojo::Transaction::WebSocket. + - Added completed method to Mojo::Transaction. + - Updated jQuery to version 2.2.0. + - Improved performance of Mojo::Server::Daemon and Mojo::UserAgent slightly. + - Improved mtime attribute in Mojo::Asset::Memory to default to the value of + $^T. + - Improved app generator command to generate more portable scripts. + - Fixed a few timing bugs. + - Fixed url_for to handle fragments correctly. + +------------------------------------------------------------------- Old: ---- Mojolicious-6.39.tar.gz New: ---- Mojolicious-6.40.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Mojolicious.spec ++++++ --- /var/tmp/diff_new_pack.dfetXN/_old 2016-01-22 01:09:57.000000000 +0100 +++ /var/tmp/diff_new_pack.dfetXN/_new 2016-01-22 01:09:57.000000000 +0100 @@ -17,7 +17,7 @@ Name: perl-Mojolicious -Version: 6.39 +Version: 6.40 Release: 0 %define cpan_name Mojolicious Summary: Real-time web framework ++++++ Mojolicious-6.39.tar.gz -> Mojolicious-6.40.tar.gz ++++++ ++++ 3713 lines of diff (skipped)

1 0

commit perl-Minion for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package perl-Minion for openSUSE:Factory checked in at 2016-01-21 23:44:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Minion (Old) and /work/SRC/openSUSE:Factory/.perl-Minion.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Minion" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Minion/perl-Minion.changes 2016-01-15 10:42:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Minion.new/perl-Minion.changes 2016-01-22 01:09:53.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Jan 19 10:06:25 UTC 2016 - coolo(a)suse.com + +- updated to 4.03 + see /usr/share/doc/packages/perl-Minion/Changes + + 4.03 2016-01-17 + - Removed an unused index from Minion::Backend::Pg. + - Fixed a bug where the worker command would always watch the default queue. + (avkhozov) + +------------------------------------------------------------------- Old: ---- Minion-4.02.tar.gz New: ---- Minion-4.03.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Minion.spec ++++++ --- /var/tmp/diff_new_pack.lOMqg0/_old 2016-01-22 01:09:55.000000000 +0100 +++ /var/tmp/diff_new_pack.lOMqg0/_new 2016-01-22 01:09:55.000000000 +0100 @@ -17,7 +17,7 @@ Name: perl-Minion -Version: 4.02 +Version: 4.03 Release: 0 %define cpan_name Minion Summary: Job queue ++++++ Minion-4.02.tar.gz -> Minion-4.03.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Minion-4.02/Changes new/Minion-4.03/Changes --- old/Minion-4.02/Changes 2016-01-03 01:02:56.000000000 +0100 +++ new/Minion-4.03/Changes 2016-01-17 17:52:03.000000000 +0100 @@ -1,4 +1,9 @@ +4.03 2016-01-17 + - Removed an unused index from Minion::Backend::Pg. + - Fixed a bug where the worker command would always watch the default queue. + (avkhozov) + 4.02 2016-01-03 - Updated links to Mojolicious website. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Minion-4.02/META.json new/Minion-4.03/META.json --- old/Minion-4.02/META.json 2016-01-06 19:47:59.000000000 +0100 +++ new/Minion-4.03/META.json 2016-01-17 23:33:08.000000000 +0100 @@ -54,5 +54,5 @@ }, "x_IRC" : "irc://irc.perl.org/#mojo" }, - "version" : "4.02" + "version" : "4.03" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Minion-4.02/META.yml new/Minion-4.03/META.yml --- old/Minion-4.02/META.yml 2016-01-06 19:47:59.000000000 +0100 +++ new/Minion-4.03/META.yml 2016-01-17 23:33:08.000000000 +0100 @@ -27,4 +27,4 @@ homepage: http://mojolicious.org license: http://www.opensource.org/licenses/artistic-license-2.0 repository: https://github.com/kraih/minion.git -version: '4.02' +version: '4.03' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Minion-4.02/lib/Minion/Backend/Pg.pm new/Minion-4.03/lib/Minion/Backend/Pg.pm --- old/Minion-4.02/lib/Minion/Backend/Pg.pm 2016-01-03 01:01:58.000000000 +0100 +++ new/Minion-4.03/lib/Minion/Backend/Pg.pm 2016-01-17 23:30:50.000000000 +0100 @@ -724,3 +724,6 @@ -- 5 up alter table minion_jobs add column attempts int not null default 1; + +-- 6 up +drop index minion_jobs_state_idx; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Minion-4.02/lib/Minion/Command/minion/job.pm new/Minion-4.03/lib/Minion/Command/minion/job.pm --- old/Minion-4.02/lib/Minion/Command/minion/job.pm 2016-01-03 01:02:07.000000000 +0100 +++ new/Minion-4.03/lib/Minion/Command/minion/job.pm 2016-01-13 19:11:03.000000000 +0100 @@ -127,8 +127,8 @@ -e, --enqueue <name> New job to be enqueued -h, --help Show this summary of available options --home <path> Path to home directory of your application, - defaults to the value of MOJO_HOME or auto - detection + defaults to the value of MOJO_HOME or + auto-detection -l, --limit <number> Number of jobs/workers to show when listing them, defaults to 100 -m, --mode <name> Operating mode for your application, defaults to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Minion-4.02/lib/Minion/Command/minion/worker.pm new/Minion-4.03/lib/Minion/Command/minion/worker.pm --- old/Minion-4.02/lib/Minion/Command/minion/worker.pm 2016-01-03 01:02:12.000000000 +0100 +++ new/Minion-4.03/lib/Minion/Command/minion/worker.pm 2016-01-17 17:47:30.000000000 +0100 @@ -13,7 +13,8 @@ GetOptionsFromArray \@args, 'I|heartbeat-interval=i' => \($self->{interval} = 60), 'j|jobs=i' => \($self->{max} = 4), - 'q|queue=s' => ($self->{queues} = ['default']); + 'q|queue=s' => \my @queues; + $self->{queues} = @queues ? \@queues : ['default']; local $SIG{CHLD} = 'DEFAULT'; local $SIG{INT} = local $SIG{TERM} = sub { $self->{finished}++ }; @@ -77,7 +78,7 @@ -h, --help Show this summary of available options --home <path> Path to home directory of your application, defaults to the value of - MOJO_HOME or auto detection + MOJO_HOME or auto-detection -I, --heartbeat-interval <seconds> Heartbeat interval, defaults to 60 -j, --jobs <number> Number of jobs to perform concurrently, defaults to 4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Minion-4.02/lib/Minion.pm new/Minion-4.03/lib/Minion.pm --- old/Minion-4.02/lib/Minion.pm 2016-01-03 01:01:48.000000000 +0100 +++ new/Minion-4.03/lib/Minion.pm 2016-01-06 19:48:29.000000000 +0100 @@ -16,7 +16,7 @@ has remove_after => 864000; has tasks => sub { {} }; -our $VERSION = '4.02'; +our $VERSION = '4.03'; sub add_task { ($_[0]->tasks->{$_[1]} = $_[2]) and return $_[0] }

1 0

commit perl-Log-Dispatch for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package perl-Log-Dispatch for openSUSE:Factory checked in at 2016-01-21 23:44:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Log-Dispatch (Old) and /work/SRC/openSUSE:Factory/.perl-Log-Dispatch.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Log-Dispatch" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Log-Dispatch/perl-Log-Dispatch.changes 2015-09-24 06:15:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Log-Dispatch.new/perl-Log-Dispatch.changes 2016-01-22 01:09:50.000000000 +0100 @@ -1,0 +2,33 @@ +Tue Jan 19 10:02:29 UTC 2016 - coolo(a)suse.com + +- updated to 2.54 + see /usr/share/doc/packages/perl-Log-Dispatch/Changes + + 2.54 2016-01-18 + + - Fixed File::Locked even more. While some deadlocks were eliminated, there + was still an issue when a Log::Dispatch object was created in a parent + process and then recreated in the children. If the close_after_write + parameter was false, then there would be a deadlock. + + - Made Syslog work on a threaded Perl when the threads module was not + explicitly loaded. Fixed by Konrad Bucheli. GitHub #13. + + - The log() method now accepts a level parameter as an integer. Fixed by Steve + Bertrand. GitHub #15. + + + 2.53 2016-01-14 + + - Actually fix File::Locked, this time with some actual tests. + + + 2.52 2016-01-13 + + - Make File::Locked output do an explicit unlock if the close_after_write + option is not set. Without this it would open the file once in each process, + attempting to get a lock at open time, pretty much guaranteeing a deadlock + in a multiprocess environment. Now it should work sanely whether + close_after_write is true or not. + +------------------------------------------------------------------- Old: ---- Log-Dispatch-2.51.tar.gz New: ---- Log-Dispatch-2.54.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Log-Dispatch.spec ++++++ --- /var/tmp/diff_new_pack.RgPbfs/_old 2016-01-22 01:09:52.000000000 +0100 +++ /var/tmp/diff_new_pack.RgPbfs/_new 2016-01-22 01:09:52.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-Log-Dispatch # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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,7 +17,7 @@ Name: perl-Log-Dispatch -Version: 2.51 +Version: 2.54 Release: 0 %define cpan_name Log-Dispatch Summary: Dispatches messages to one or more outputs @@ -33,6 +33,7 @@ BuildRequires: perl(Devel::GlobalDestruction) BuildRequires: perl(Dist::CheckConflicts) >= 0.02 BuildRequires: perl(IPC::Run3) +BuildRequires: perl(JSON::PP) >= 2.27300 BuildRequires: perl(Module::Runtime) BuildRequires: perl(Params::Validate) >= 1.03 BuildRequires: perl(Sys::Syslog) >= 0.28 @@ -41,6 +42,7 @@ BuildRequires: perl(Test::Requires) Requires: perl(Devel::GlobalDestruction) Requires: perl(Dist::CheckConflicts) >= 0.02 +Requires: perl(JSON::PP) >= 2.27300 Requires: perl(Module::Runtime) Requires: perl(Params::Validate) >= 1.03 Requires: perl(Sys::Syslog) >= 0.28 @@ -62,7 +64,7 @@ %prep %setup -q -n %{cpan_name}-%{version} -find . -type f -print0 | xargs -0 chmod 644 +find . -type f ! -name \*.pl -print0 | xargs -0 chmod 644 %build %{__perl} Makefile.PL INSTALLDIRS=vendor ++++++ Log-Dispatch-2.51.tar.gz -> Log-Dispatch-2.54.tar.gz ++++++ ++++ 6118 lines of diff (skipped)

1 0

commit perl-Apache-AuthCookie for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package perl-Apache-AuthCookie for openSUSE:Factory checked in at 2016-01-21 23:44:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Apache-AuthCookie (Old) and /work/SRC/openSUSE:Factory/.perl-Apache-AuthCookie.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Apache-AuthCookie" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Apache-AuthCookie/perl-Apache-AuthCookie.changes 2015-12-29 12:59:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Apache-AuthCookie.new/perl-Apache-AuthCookie.changes 2016-01-22 01:09:48.000000000 +0100 @@ -1,0 +2,17 @@ +Tue Jan 19 09:34:24 UTC 2016 - coolo(a)suse.com + +- updated to 3.24 + see /usr/share/doc/packages/perl-Apache-AuthCookie/Changes + + 3.24 2016-01-13 + - Update Apache 2.4 README, flesh out guts of Authz Provider notes. + - Improve Apache 2.4 README's AuthzProvider documentation + - Add POD to Apache2_4::AuthCookie + - Add FAQ to Apache2_4::AuthCookie documenation + - 2.4: document that PerlAddAuthzProvider is only needed for *custom* Requires directives. + - 2.4: make authz_handler recognize multiple usernames in the directive like + mod_authz_user does. + - add test case for internal authz_handler + - explicitly require Apache::Test 1.39 so that APACHE2_4 defines are set + +------------------------------------------------------------------- Old: ---- Apache-AuthCookie-3.23.tar.gz New: ---- Apache-AuthCookie-3.24.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Apache-AuthCookie.spec ++++++ --- /var/tmp/diff_new_pack.XB2tIw/_old 2016-01-22 01:09:50.000000000 +0100 +++ /var/tmp/diff_new_pack.XB2tIw/_new 2016-01-22 01:09:50.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-Apache-AuthCookie # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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,7 +17,7 @@ Name: perl-Apache-AuthCookie -Version: 3.23 +Version: 3.24 Release: 0 %define cpan_name Apache-AuthCookie Summary: Perl Authentication and Authorization via cookies @@ -30,12 +30,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -BuildRequires: perl(Apache::Test) >= 1.35 +BuildRequires: perl(Apache::Test) >= 1.39 BuildRequires: perl(CGI) >= 3.12 BuildRequires: perl(Class::Load) >= 0.03 BuildRequires: perl(autobox) >= 1.1 BuildRequires: perl(mod_perl2) >= 1.999022 -Requires: perl(Apache::Test) >= 1.35 +Requires: perl(Apache::Test) >= 1.39 Requires: perl(CGI) >= 3.12 Requires: perl(Class::Load) >= 0.03 Requires: perl(autobox) >= 1.1 ++++++ Apache-AuthCookie-3.23.tar.gz -> Apache-AuthCookie-3.24.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Apache-AuthCookie-3.23/Changes new/Apache-AuthCookie-3.24/Changes --- old/Apache-AuthCookie-3.23/Changes 2015-09-10 18:59:48.000000000 +0200 +++ new/Apache-AuthCookie-3.24/Changes 2016-01-14 00:16:15.000000000 +0100 @@ -1,5 +1,16 @@ Revision history for Apache::AuthCookie +3.24 2016-01-13 + - Update Apache 2.4 README, flesh out guts of Authz Provider notes. + - Improve Apache 2.4 README's AuthzProvider documentation + - Add POD to Apache2_4::AuthCookie + - Add FAQ to Apache2_4::AuthCookie documenation + - 2.4: document that PerlAddAuthzProvider is only needed for *custom* Requires directives. + - 2.4: make authz_handler recognize multiple usernames in the directive like + mod_authz_user does. + - add test case for internal authz_handler + - explicitly require Apache::Test 1.39 so that APACHE2_4 defines are set + 3.23 2015-09-10 - Improve CGI mode param() handling to avoi CGI.pm's "param() called in list context" warning. - add support for Apache 2.4 via mod_perl 1.09. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Apache-AuthCookie-3.23/MANIFEST new/Apache-AuthCookie-3.24/MANIFEST --- old/Apache-AuthCookie-3.23/MANIFEST 2015-09-10 18:59:48.000000000 +0200 +++ new/Apache-AuthCookie-3.24/MANIFEST 2016-01-14 00:16:15.000000000 +0100 @@ -32,6 +32,7 @@ t/htdocs/docs/index.html t/htdocs/docs/login.pl t/htdocs/docs/logout.pl +t/htdocs/docs/myuser/get_me.html t/htdocs/docs/protected/echo_user.pl t/htdocs/docs/protected/get_me.html t/htdocs/docs/stimeout/get_me.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Apache-AuthCookie-3.23/META.yml new/Apache-AuthCookie-3.24/META.yml --- old/Apache-AuthCookie-3.23/META.yml 2015-09-10 18:59:48.000000000 +0200 +++ new/Apache-AuthCookie-3.24/META.yml 2016-01-14 00:16:15.000000000 +0100 @@ -19,4 +19,4 @@ bugtracker: http://rt.cpan.org/Public/Dist/Display.html?Name=Apache-AuthCookie homepage: http://search.cpan.org/dist/Apache-AuthCookie/ repository: git://github.com/mschout/apache-authcookie.git -version: '3.23' +version: '3.24' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Apache-AuthCookie-3.23/Makefile.PL new/Apache-AuthCookie-3.24/Makefile.PL --- old/Apache-AuthCookie-3.23/Makefile.PL 2015-09-10 18:59:48.000000000 +0200 +++ new/Apache-AuthCookie-3.24/Makefile.PL 2016-01-14 00:16:15.000000000 +0100 @@ -11,7 +11,7 @@ 'NAME' => 'Apache::AuthCookie', 'VERSION_FROM' => 'lib/Apache/AuthCookie.pm', 'PREREQ_PM' => { - 'Apache::Test' => 1.35, + 'Apache::Test' => 1.39, 'Test::More' => 0, 'CGI' => 0, 'Class::Load' => 0.03, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Apache-AuthCookie-3.23/README.apache-2.4.pod new/Apache-AuthCookie-3.24/README.apache-2.4.pod --- old/Apache-AuthCookie-3.23/README.apache-2.4.pod 2015-09-10 18:59:48.000000000 +0200 +++ new/Apache-AuthCookie-3.24/README.apache-2.4.pod 2016-01-14 00:16:15.000000000 +0100 @@ -25,7 +25,7 @@ =item Apache::Test You need Apache::Test version 1.39 or later. Previous versions do not define -the constant APACHE2_4 which is needed for the test suite. +the constant C<APACHE2_4> which is needed for the test suite. =item Your AuthCookie Subclass @@ -44,7 +44,8 @@ =item Apache2::Const::AUTHZ_DENIED_NO_USER -return this constant if C<< $r->user >> is empty/undefined. +return this constant if C<< $r->user >> is empty/undefined and you do not wish +to allow anonymous access. =item Apache2::Const::AUTHZ_DENIED @@ -54,6 +55,16 @@ return this constant if C<< $r->user >> is authorized for the current request +=item Apache2::Const::AUTHZ_GENERAL_ERROR + +return this constant to indicate an error processing authz requirements. + +=item Apache2::Const::AUTHZ_NEUTRAL + +return this constant to indicate a neutral response. It is assumed that +another authz provider will be checked in a parent/sibling scope that will +return granted or denied. + =back =back @@ -64,33 +75,150 @@ =item * -Replace all C<PerlAuthzHandler> entries with top level C<PerlAddAuthzProvider> entries. +Remove all C<PerlAuthzHandler> entries. C<PerlAuthzHandler> does not exist in Apache 2.4. -C<PerlAuthzHandler> is gone in Apache 2.4. It has been replaced with -C<PerlAddAuthzProvider>. C<PerlAddAUthzProvider> methods are expected to -return one of C<AUTHZ_DENIED_NO_USER>, C<AUTHZ_GRANTED>, or C<AUTHZ_DENIED>. -Other return values are not valid. Be sure you have ported your authz methods -to return the appropriate constant! +=item * + +Depending on what your C<Require> directives say, you may need to add one or +more top level C<PerlAddAuthzProvider> entires and implement a handler for each +one. + +If your C<Require> directives are simply C<valid-user> or C<user ...> then you +do not need to do this. Apache already provides an authz provider that handles +C<user> and C<valid-user> requirements for you in C<mod_authz_user>. + +C<AuthCookie> does provide a C<authz_handler> for these requirements for +backwards compatibility with previous versions, but the one provided by Apache +is preferred. =item * -Add a C<PerlAddAuthzProvider> directive that calls C<authz_handler()> +If you are C<Require>'ing anything other than C<valid-user> or C<user ...> then +you will need to write your own Authz Provider method and register it with Apache. -E.g.: +Authz Providers are the Apache 2.4 equivalent of a C<PerlAuthzHandler> method. +Each one implements a specific requirement. E.g.: - PerlAddAuthzProvider user Sample::Apache2::AuthCookieHandler->authz_handler + PerlAddAuthzProvider species My::AuthCookieHandler->authz_species -Note that you can use something other than C<user>. e.g.: C<my-user> if you -have other authentication modules in use that are responsible for -C<Requires user ...> directives. +Will be called to handle a -=item * + Require species klingon + +Directive. + +It is important to know that Authz Providers are called B<twice> for +a request. First, the authz provider is called before authentication has been +processed to check for anonymous access. In this method call, C<< $r->user >> +is not set. You are expected to return one of: -Remove All Instances of PerlAuthzHandler that call authorize() +=over 4 + +=item AUTHZ_GRANTED + +Access is granted and no further authn/authz processing will occur for this +request. + +=item AUTHZ_DENIED + +=item AUTHZ_NEUTRAL -E.g.: remove all all instances of: +The response is C<HTTP_FORBIDDEN> (unless neutral is overridden by another +provider) - PerlAuthzHandler Your::AuthCookie::Handler->authorize +=item AUTHZ_DENIED_NO_USER + +Authentication is processed, C<< $r->user >> will be set with the current +username and your authz provider will be called again. + +=back + +The second time the authz provider is called, C<< $r->user >> is set and you +are expected to return one of: + +=over 4 + +=item AUTHZ_GRANTED + +The request is allowed + +=item AUTHZ_DENIED + +The request is forbidden + +=item AUTHZ_NEUTRAL + +The request is forbidden, unless another authz provider returns +C<AUTHZ_GRANTED>. Consult the apache documentation about authorization merging +for more info. + +=back + +You could also return C<AUTHZ_GENERAL_ERROR> from any of these to indicate an +error processing authz directives and halt processing immediately. + +One way to think about these response codes what kind of Require satisfies is +in effect: + +=over 4 + +=item RequireAll/RequireNone + +In this case the priority of responses is: + +=over 4 + +=item AUTHZ_GENERAL_ERROR + +Processing stops immediately + +=item AUTHZ_DENIED + +Processing stops immediately, no siblings are processed. Request is denied. + +=item AUTHZ_DENIED_NO_USER + +Process Authentication and try again + +=item AUTHZ_GRANTED + +Continue processing siblings. + +=item AUTZ_NEUTRAL + +Continue processing siblings. + +=back + +=item RequireAny + +In this case the priority of responses is: + +=over 4 + +=item AUTHZ_GENERAL_ERROR + +Processing stops immediately + +=item AUTHZ_GRANTED + +Processing stops immediately, no siblings are processed. Request is allowed. + +=item AUTHZ_DENIED_NO_USER + +Process Authentication and try again + +=item AUTHZ_DENIED + +Continue processing siblings. + +=item AUTZ_NEUTRAL + +Continue processing siblings. + +=back + +=back =back @@ -102,35 +230,34 @@ =item authorize() has been removed -In C<Apache2_4::AuthCookie>, C<authorize()> is replaced by C<authz_handler>. -C<authz_handler> has a different return type from C<authorize>. Apache expects -a return value of one of C<AUTHZ_GRANTED>, C<AUTHZ_DENIED>, or -C<AUTHZ_DENIED_NO_USER>. +You need to use a C<PerlAddAuthzProvider> and write an appropriate handler as +described above instead. Note that you do not need a C<PerlAddAuthzProvider> +for C<user> or C<valid-user> requirements. Apache already handles those +internally. =item ${auth_name}Satisfy Satisfy support is removed as it is no longer needed with Apache 2.4. -You can handle other non-user requirements with RequireAll, and additional -AuthzProvider handlers: +You are expected to use C<RequireAll> or C<RequireAny> instead. e.g.: - PerlAddAuthzProvider user Your::AuthCookieHandler->authz_handler PerlAddAuthzProvider species Your::AuthCookieHandler->authz_species_handler <RequireAll> Require valid-user - Require species gerbil + Require species klingon </RequireAll> -see: https://httpd.apache.org/docs/2.4/howto/auth.html#reqaccessctrl +see: L<https://httpd.apache.org/docs/2.4/howto/auth.html#reqaccessctrl> =item Unauthorized User HTTP Response Code -In Apache 2.4, in mod_authz_core, if no authz_handlers return C<AUTHZ_GRANTED>, -then C<HTTP_UNAUTHORIZED> is returned. In previous versions, C<HTTP_FORBIDDEN> -was returned. You can get the old behaviour if you want it with: +In Apache 2.4, in C<mod_authz_core>, if no authz handlers return C<AUTHZ_GRANTED>, +then C<HTTP_UNAUTHORIZED> is returned. In previous versions of Apache, +C<HTTP_FORBIDDEN> was returned. You can get the old behaviour if you want it +with: AuthzSendForbiddenOnFailure On @@ -144,19 +271,20 @@ Why is my authz method called twice per request? -This is normal behaviour under Apache 2.4. You are expected to return -C<Apache2::Const::AUTHZ_DENIED_NO_USER> IF C<< $r->user >> has not yet been -set. Your authz handler will be called a second time after the user has been -authenticated. - -=back +This is normal behaviour under Apache 2.4. This is to accomodate for +authorization of anonymous access. You are expected to return +C<Apache2::Const::AUTHZ_DENIED_NO_USER> IF C<< $r->user >> has not yet been set +if you want authentication to proceed. Your authz handler will be called a +second time after the user has been authenticated. -=head1 TODO +=item * -=over 4 +My log shows an entry like: -=item * + authorization result of Require ...: denied (no + # authenticated user yet) -add support for mod_auth_socache if possible +These are normal. This happens because the authz provider returned +C<AUTHZ_DENIED_NO_USER> and the authz provider will be called again after +authentication happens. =back diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Apache-AuthCookie-3.23/SIGNATURE new/Apache-AuthCookie-3.24/SIGNATURE --- old/Apache-AuthCookie-3.23/SIGNATURE 2015-09-10 18:59:48.000000000 +0200 +++ new/Apache-AuthCookie-3.24/SIGNATURE 2016-01-14 00:16:15.000000000 +0100 @@ -14,30 +14,30 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -SHA1 4fb2e9aca110ad4efaa9acba8e71d6bfb510ffff Changes +SHA1 9fba73a06915fdf43a0e5a3809f174b5e860b182 Changes SHA1 cb36dd242de6d18cd64c4b55444347ebf09e43e7 LICENSE -SHA1 a308ff70c88e605fc3ca9a756d08f9003c536b94 MANIFEST +SHA1 4c0c99ee3b19ecbc08f30491799faa2ac9ecebf8 MANIFEST SHA1 0ff75e1a6186d7274e76387884eca541fdd5ca4a MANIFEST.SKIP -SHA1 d8d592009b6ed9fc6f7007385e5bb0d5740fce39 META.yml -SHA1 5b5d0d04447e4814ff7b91584e094175ac84e141 Makefile.PL +SHA1 5ffafb81bd4fa549d1b9954477bdd30255a44299 META.yml +SHA1 7a2275cdc405f9585d15d08ff8edeeed8e6558de Makefile.PL SHA1 b9945378262a25db34dcdba06da956a52876188b README -SHA1 b9a7c4716c9ac0f47b8a3e1ca8d0c18141595f5e README.apache-2.4.pod +SHA1 0fbbaf3a8362d5356d104ce148db9e3d07e1c7bf README.apache-2.4.pod SHA1 ccbc46a0385aabadd1e6f4a22f8d4ebb11b44901 README.modperl2 -SHA1 de860466abecb2f3be5deb75a7e5eb23a1af43ed lib/Apache/AuthCookie.pm -SHA1 714a5abef95062cde56356bfcd5110fbbb562f21 lib/Apache/AuthCookie/Autobox.pm -SHA1 59d7b1093b226bf896ddcea875accb55c40fc6c2 lib/Apache/AuthCookie/FAQ.pod -SHA1 2bf8c686f85bbe52bcc5cf4236d8b8369a9dc031 lib/Apache/AuthCookie/Params.pm -SHA1 22d88939f72b0c934dd54b3f895c7670a9e4afdf lib/Apache/AuthCookie/Params/Base.pm -SHA1 d80828eb8fbb44f06e1262d5cdb0be136e7dd5f7 lib/Apache/AuthCookie/Params/CGI.pm -SHA1 d37b201d846510b6197375260494c3b5857d562d lib/Apache/AuthCookie/Util.pm -SHA1 33a0abcd4da5dcc8703c93ba0b6e99361c5624fe lib/Apache2/AuthCookie.pm -SHA1 04a38982e21cd55af8b4730bf3adcbabefcbe47a lib/Apache2/AuthCookie/Base.pm -SHA1 6945012b16cefcffb2c793b3a7bc19e6622a200c lib/Apache2/AuthCookie/Params.pm -SHA1 c1b92f9f5956f6263e9a9c7bc1f977a167629fed lib/Apache2_4/AuthCookie.pm +SHA1 b5885da476dded21d874ddaf62eeab9afa4ef660 lib/Apache/AuthCookie.pm +SHA1 6cbdbebc1b4a1ce90f9ded7bf5c31f19c19f4e1b lib/Apache/AuthCookie/Autobox.pm +SHA1 3fc5539118a30496b9c9a2659aa4ecba010d37f7 lib/Apache/AuthCookie/FAQ.pod +SHA1 f05973756eaa606d62965641ce181ef877061bde lib/Apache/AuthCookie/Params.pm +SHA1 8da245e78647a7d6f6319190b29571166b63ea34 lib/Apache/AuthCookie/Params/Base.pm +SHA1 7565fa5fb1bbd2ac8776e0f48950b067ef6b3974 lib/Apache/AuthCookie/Params/CGI.pm +SHA1 b79b109eb9e83eae771f84150e9e29a6cafa0c97 lib/Apache/AuthCookie/Util.pm +SHA1 8893d614abb8a99907204bb493ef7508d5b6e769 lib/Apache2/AuthCookie.pm +SHA1 cfc494f7d1b3047f365fda488a57e9d31080b0b7 lib/Apache2/AuthCookie/Base.pm +SHA1 05f74437cc15aa913fda411cfeafd82613a2dc02 lib/Apache2/AuthCookie/Params.pm +SHA1 ca36db816d36bbe96f8b84f6481bf11b50234905 lib/Apache2_4/AuthCookie.pm SHA1 3ac8de46e7bba83f6969caec3c9c14cbd99881cb t/Skeleton/AuthCookieHandler.pm SHA1 b1f854e6edecbdd44fc7b8db719e0fe21d9340d1 t/TEST.PL SHA1 290c96de9cbeafe5cc6ad7f3a47d706e740ba28f t/autobox.t -SHA1 5bdda8342212ecb7450da1e7c34ec42ff99146fd t/conf/extra.conf.in +SHA1 14b2d1c4e40ea7477059c6b792e31592b15120a4 t/conf/extra.conf.in SHA1 2156ea84b69ca7fef7b73d72a06c07cb145da7a9 t/htdocs/docs/authall/get_me.html SHA1 2156ea84b69ca7fef7b73d72a06c07cb145da7a9 t/htdocs/docs/authany/get_me.html SHA1 2156ea84b69ca7fef7b73d72a06c07cb145da7a9 t/htdocs/docs/cookiename/get_me.html @@ -46,19 +46,20 @@ SHA1 ff64131e263980ea9575b71dc05c5aa2063e135d t/htdocs/docs/index.html SHA1 0dba04a9de174ab9881cfe575d1d23bb5fc588a8 t/htdocs/docs/login.pl SHA1 b9eca1b328da7d703abaec2d6a6d5751866843ac t/htdocs/docs/logout.pl +SHA1 2156ea84b69ca7fef7b73d72a06c07cb145da7a9 t/htdocs/docs/myuser/get_me.html SHA1 b37a85d16cbb2342b407f2ba70b8a61aa1ca67bb t/htdocs/docs/protected/echo_user.pl SHA1 2156ea84b69ca7fef7b73d72a06c07cb145da7a9 t/htdocs/docs/protected/get_me.html SHA1 2156ea84b69ca7fef7b73d72a06c07cb145da7a9 t/htdocs/docs/stimeout/get_me.html SHA1 d8a8ea1ebe037a4dea4ad8d1c5b0704b2d43e854 t/lib/Sample/Apache/AuthCookieHandler.pm SHA1 b17b0f3ee3a6643cd57c0d9946c4aa62b0d9e3bb t/lib/Sample/Apache2/AuthCookieHandler.pm SHA1 2fe3e04dd78f4e0ea8322f6482153bee96585b9a t/lib/Sample/Apache2_4/AuthCookieHandler.pm -SHA1 e24b180df613b201f9b4b9945af3b56549df223b t/real.t +SHA1 97d4f24fa12ac67b785863fefcb491fcf8836af9 t/real.t SHA1 61cea839dd94aaaeb301ccac9b83cde4c5c91b42 t/signature.t SHA1 e91bf0ef7d63322eaf15ca7d9907c6db47ce90ca t/startup.pl -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEARECAAYFAlXxtwQACgkQ+CqvSzp9LOyCfgCePYmJ7pcURQ0YQ3OnG3JciB9d -s8gAmgO+buvx/KVwsu+BpEGOL1bhKMBp -=JIIU +iEYEARECAAYFAlaW2r8ACgkQ+CqvSzp9LOznBwCfVyvPHeoEKntFe34bphvP2cOh +bHEAn0jRy+56CvxnZpE0adpINHCgBTbI +=N7RO -----END PGP SIGNATURE----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Apache-AuthCookie-3.23/lib/Apache/AuthCookie/Autobox.pm new/Apache-AuthCookie-3.24/lib/Apache/AuthCookie/Autobox.pm --- old/Apache-AuthCookie-3.23/lib/Apache/AuthCookie/Autobox.pm 2015-09-10 18:59:48.000000000 +0200 +++ new/Apache-AuthCookie-3.24/lib/Apache/AuthCookie/Autobox.pm 2016-01-14 00:16:15.000000000 +0100 @@ -1,5 +1,5 @@ package Apache::AuthCookie::Autobox; -$Apache::AuthCookie::Autobox::VERSION = '3.23'; +$Apache::AuthCookie::Autobox::VERSION = '3.24'; # ABSTRACT: Autobox Extensions for AuthCookie use strict; @@ -14,7 +14,7 @@ } package Apache::AuthCookie::Autobox::Scalar; -$Apache::AuthCookie::Autobox::Scalar::VERSION = '3.23'; +$Apache::AuthCookie::Autobox::Scalar::VERSION = '3.24'; sub is_blank { return defined $_[0] && ($_[0] =~ /\S/) ? 0 : 1; } @@ -31,7 +31,7 @@ =head1 VERSION -version 3.23 +version 3.24 =head1 SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Apache-AuthCookie-3.23/lib/Apache/AuthCookie/FAQ.pod new/Apache-AuthCookie-3.24/lib/Apache/AuthCookie/FAQ.pod --- old/Apache-AuthCookie-3.23/lib/Apache/AuthCookie/FAQ.pod 2015-09-10 18:59:48.000000000 +0200 +++ new/Apache-AuthCookie-3.24/lib/Apache/AuthCookie/FAQ.pod 2016-01-14 00:16:15.000000000 +0100 @@ -1,6 +1,6 @@ # make Dist::Zilla happy. package Apache::AuthCookie::FAQ; -$Apache::AuthCookie::FAQ::VERSION = '3.23'; +$Apache::AuthCookie::FAQ::VERSION = '3.24'; # ABSTRACT: Frequently Asked Questions about Apache::AuthCookie. 1; @@ -15,7 +15,7 @@ =head1 VERSION -version 3.23 +version 3.24 =head1 DESCRIPTION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Apache-AuthCookie-3.23/lib/Apache/AuthCookie/Params/Base.pm new/Apache-AuthCookie-3.24/lib/Apache/AuthCookie/Params/Base.pm --- old/Apache-AuthCookie-3.23/lib/Apache/AuthCookie/Params/Base.pm 2015-09-10 18:59:48.000000000 +0200 +++ new/Apache-AuthCookie-3.24/lib/Apache/AuthCookie/Params/Base.pm 2016-01-14 00:16:15.000000000 +0100 @@ -1,5 +1,5 @@ package Apache::AuthCookie::Params::Base; -$Apache::AuthCookie::Params::Base::VERSION = '3.23'; +$Apache::AuthCookie::Params::Base::VERSION = '3.24'; # ABSTRACT: Internal CGI AuthCookie Params Base Class use strict; @@ -44,7 +44,7 @@ =head1 VERSION -version 3.23 +version 3.24 =head1 SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Apache-AuthCookie-3.23/lib/Apache/AuthCookie/Params/CGI.pm new/Apache-AuthCookie-3.24/lib/Apache/AuthCookie/Params/CGI.pm --- old/Apache-AuthCookie-3.23/lib/Apache/AuthCookie/Params/CGI.pm 2015-09-10 18:59:48.000000000 +0200 +++ new/Apache-AuthCookie-3.24/lib/Apache/AuthCookie/Params/CGI.pm 2016-01-14 00:16:15.000000000 +0100 @@ -1,5 +1,5 @@ package Apache::AuthCookie::Params::CGI; -$Apache::AuthCookie::Params::CGI::VERSION = '3.23'; +$Apache::AuthCookie::Params::CGI::VERSION = '3.24'; # ABSTRACT: Internal CGI Params Subclass use strict; @@ -32,7 +32,7 @@ =head1 VERSION -version 3.23 +version 3.24 =head1 SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Apache-AuthCookie-3.23/lib/Apache/AuthCookie/Params.pm new/Apache-AuthCookie-3.24/lib/Apache/AuthCookie/Params.pm --- old/Apache-AuthCookie-3.23/lib/Apache/AuthCookie/Params.pm 2015-09-10 18:59:48.000000000 +0200 +++ new/Apache-AuthCookie-3.24/lib/Apache/AuthCookie/Params.pm 2016-01-14 00:16:15.000000000 +0100 @@ -1,5 +1,5 @@ package Apache::AuthCookie::Params; -$Apache::AuthCookie::Params::VERSION = '3.23'; +$Apache::AuthCookie::Params::VERSION = '3.24'; # ABSTRACT: AuthCookie Params Driver for mod_perl 1.x use strict; @@ -44,7 +44,7 @@ =head1 VERSION -version 3.23 +version 3.24 =head1 SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Apache-AuthCookie-3.23/lib/Apache/AuthCookie/Util.pm new/Apache-AuthCookie-3.24/lib/Apache/AuthCookie/Util.pm --- old/Apache-AuthCookie-3.23/lib/Apache/AuthCookie/Util.pm 2015-09-10 18:59:48.000000000 +0200 +++ new/Apache-AuthCookie-3.24/lib/Apache/AuthCookie/Util.pm 2016-01-14 00:16:15.000000000 +0100 @@ -1,5 +1,5 @@ package Apache::AuthCookie::Util; -$Apache::AuthCookie::Util::VERSION = '3.23'; +$Apache::AuthCookie::Util::VERSION = '3.24'; # ABSTRACT: Internal Utility Functions for AuthCookie use strict; @@ -96,7 +96,7 @@ =head1 VERSION -version 3.23 +version 3.24 =head1 SOURCE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Apache-AuthCookie-3.23/lib/Apache/AuthCookie.pm new/Apache-AuthCookie-3.24/lib/Apache/AuthCookie.pm --- old/Apache-AuthCookie-3.23/lib/Apache/AuthCookie.pm 2015-09-10 18:59:48.000000000 +0200 +++ new/Apache-AuthCookie-3.24/lib/Apache/AuthCookie.pm 2016-01-14 00:16:15.000000000 +0100 @@ -1,5 +1,5 @@ package Apache::AuthCookie; -$Apache::AuthCookie::VERSION = '3.23'; +$Apache::AuthCookie::VERSION = '3.24'; # ABSTRACT: Perl Authentication and Authorization via cookies use strict; @@ -549,7 +549,7 @@ =head1 VERSION -version 3.23 +version 3.24 =head1 SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Apache-AuthCookie-3.23/lib/Apache2/AuthCookie/Base.pm new/Apache-AuthCookie-3.24/lib/Apache2/AuthCookie/Base.pm --- old/Apache-AuthCookie-3.23/lib/Apache2/AuthCookie/Base.pm 2015-09-10 18:59:48.000000000 +0200 +++ new/Apache-AuthCookie-3.24/lib/Apache2/AuthCookie/Base.pm 2016-01-14 00:16:15.000000000 +0100 @@ -1,5 +1,5 @@ package Apache2::AuthCookie::Base; -$Apache2::AuthCookie::Base::VERSION = '3.23'; +$Apache2::AuthCookie::Base::VERSION = '3.24'; use strict; use mod_perl2 '1.99022'; use Carp; @@ -450,7 +450,7 @@ =head1 VERSION -version 3.23 +version 3.24 =head1 SOURCE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Apache-AuthCookie-3.23/lib/Apache2/AuthCookie/Params.pm new/Apache-AuthCookie-3.24/lib/Apache2/AuthCookie/Params.pm --- old/Apache-AuthCookie-3.23/lib/Apache2/AuthCookie/Params.pm 2015-09-10 18:59:48.000000000 +0200 +++ new/Apache-AuthCookie-3.24/lib/Apache2/AuthCookie/Params.pm 2016-01-14 00:16:15.000000000 +0100 @@ -1,5 +1,5 @@ package Apache2::AuthCookie::Params; -$Apache2::AuthCookie::Params::VERSION = '3.23'; +$Apache2::AuthCookie::Params::VERSION = '3.24'; # ABSTRACT: AuthCookie Params Driver for mod_perl 2.x use strict; @@ -40,7 +40,7 @@ =head1 VERSION -version 3.23 +version 3.24 =head1 SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Apache-AuthCookie-3.23/lib/Apache2/AuthCookie.pm new/Apache-AuthCookie-3.24/lib/Apache2/AuthCookie.pm --- old/Apache-AuthCookie-3.23/lib/Apache2/AuthCookie.pm 2015-09-10 18:59:48.000000000 +0200 +++ new/Apache-AuthCookie-3.24/lib/Apache2/AuthCookie.pm 2016-01-14 00:16:15.000000000 +0100 @@ -1,5 +1,5 @@ package Apache2::AuthCookie; -$Apache2::AuthCookie::VERSION = '3.23'; +$Apache2::AuthCookie::VERSION = '3.24'; # ABSTRACT: Perl Authentication and Authorization via cookies use strict; @@ -113,11 +113,11 @@ =head1 VERSION -version 3.23 +version 3.24 =head1 SYNOPSIS -Make sure your mod_perl is at least 1.24, with StackedHandlers, +Make sure your mod_perl is at least 2.0.0-RC5, with StackedHandlers, MethodHandlers, Authen, and Authz compiled in. # In httpd.conf or .htaccess: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Apache-AuthCookie-3.23/lib/Apache2_4/AuthCookie.pm new/Apache-AuthCookie-3.24/lib/Apache2_4/AuthCookie.pm --- old/Apache-AuthCookie-3.23/lib/Apache2_4/AuthCookie.pm 2015-09-10 18:59:48.000000000 +0200 +++ new/Apache-AuthCookie-3.24/lib/Apache2_4/AuthCookie.pm 2016-01-14 00:16:15.000000000 +0100 @@ -1,44 +1,53 @@ package Apache2_4::AuthCookie; -$Apache2_4::AuthCookie::VERSION = '3.23'; +$Apache2_4::AuthCookie::VERSION = '3.24'; use strict; use base 'Apache2::AuthCookie::Base'; use Apache::AuthCookie::Autobox; +use Apache2::Log; use Apache2::Const -compile => qw(AUTHZ_GRANTED AUTHZ_DENIED AUTHZ_DENIED_NO_USER); +# You really do not need this provider at all. This provides an implementation +# for "Require user ..." directives, that is compatible with mod_authz_core +# (with the exception that expressions are not supported). You should really +# just let mod_authz_core be your "user" authz provider. Nevertheless, due to +# the fact that AuthCookie was released for Apache 2.4 with documentation that +# shows this is needed, we leave this implementation for backwards +# compatibility. sub authz_handler { - my ($auth_type, $r, @requires) = @_; - - return Apache2::Const::AUTHZ_DENIED unless @requires; - - my $debug = $r->dir_config("AuthCookieDebug") || 0; + my ($auth_type, $r, $requires) = @_; my $user = $r->user; - $r->server->log_error("authz user=$user type=$auth_type req=@requires") if $debug >=3; - if ($user->is_blank) { - # user not yet authenticated - $r->server->log_error("No user authenticated", $r->uri); + # user is not yet authenticated return Apache2::Const::AUTHZ_DENIED_NO_USER; } - foreach my $req (@requires) { - $r->server->log_error("requirement := $req") if $debug >= 2; + if ($requires->is_blank) { + $r->server->log_error(q[Your 'Require user ...' config does not specify any users]); + return Apache2::Const::AUTHZ_DENIED; + } - if (lc $req eq 'valid-user') { + my $debug = $r->dir_config("AuthCookieDebug") || 0; + + $r->server->log_error("authz user=$user type=$auth_type req=$requires") if $debug >=3; + + for my $valid_user (split /\s+/, $requires) { + if ($user eq $valid_user) { return Apache2::Const::AUTHZ_GRANTED; } - - return $req eq $user ? Apache2::Const::AUTHZ_GRANTED : Apache2::Const::AUTHZ_DENIED; } + # log a message similar to mod_authz_user + $r->log->debug(sprintf + q[access to %s failed, reason: user '%s' does not meet 'require'ments for a ]. + q[user to be allowed access], $r->uri, $r->user); + return Apache2::Const::AUTHZ_DENIED; } 1; -__END__ - =pod =head1 NAME @@ -47,7 +56,567 @@ =head1 VERSION -version 3.23 +version 3.24 + +=head1 SYNOPSIS + +Make sure your mod_perl is at least 2.0.9, with StackedHandlers, +MethodHandlers, Authen, and Authz compiled in. + + # In httpd.conf or .htaccess: + PerlModule Sample::Apache2::AuthCookieHandler + PerlSetVar WhatEverPath / + PerlSetVar WhatEverLoginScript /login.pl + + # The following line is optional - it allows you to set the domain + # scope of your cookie. Default is the current domain. + PerlSetVar WhatEverDomain .yourdomain.com + + # Use this to only send over a secure connection + PerlSetVar WhatEverSecure 1 + + # Use this if you want user session cookies to expire if the user + # doesn't request a auth-required or recognize_user page for some + # time period. If set, a new cookie (with updated expire time) + # is set on every request. + PerlSetVar WhatEverSessionTimeout +30m + + # to enable the HttpOnly cookie property, use HttpOnly. + # this is an MS extension. See: + # http://msdn.microsoft.com/workshop/author/dhtml/httponly_cookies.asp + PerlSetVar WhatEverHttpOnly 1 + + # Usually documents are uncached - turn off here + PerlSetVar WhatEverCache 1 + + # Use this to make your cookies persistent (+2 hours here) + PerlSetVar WhatEverExpires +2h + + # Use to make AuthCookie send a P3P header with the cookie + # see http://www.w3.org/P3P/ for details about what the value + # of this should be + PerlSetVar WhatEverP3P "CP=\"...\"" + + # These documents require user to be logged in. + <Location /protected> + AuthType Sample::Apache2::AuthCookieHandler + AuthName WhatEver + PerlAuthenHandler Sample::Apache2::AuthCookieHandler->authenticate + Require valid-user + </Location> + + # How to handle a custom requirement (non-user). + PerlAddAuthzProvider species Sample::Apache2::AuthCookieHandler->authz_species + <Location /protected/species> + Require species klingon + </Location> + + # These documents don't require logging in, but allow it. + <FilesMatch "\.ok$"> + AuthType Sample::Apache2::AuthCookieHandler + AuthName WhatEver + PerlFixupHandler Sample::Apache2::AuthCookieHandler->recognize_user + </FilesMatch> + + # This is the action of the login.pl script above. + <Files LOGIN> + AuthType Sample::Apache2::AuthCookieHandler + AuthName WhatEver + SetHandler perl-script + PerlResponseHandler Sample::Apache2::AuthCookieHandler->login + </Files> + +=head1 DESCRIPTION + +This module is for C<mod_perl> version 2 for C<Apache> version 2.4.x. If you +are running mod_perl version 1, you need B<Apache::AuthCookie> instead. If you +are running C<Apache> 2.0.0-2.2.x, you need B<Apache2::AuthCookie> instead. + +B<Apache2_4::AuthCookie> allows you to intercept a user's first unauthenticated +access to a protected document. The user will be presented with a custom form +where they can enter authentication credentials. The credentials are posted to +the server where AuthCookie verifies them and returns a session key. + +The session key is returned to the user's browser as a cookie. As a cookie, the +browser will pass the session key on every subsequent accesses. AuthCookie will +verify the session key and re-authenticate the user. + +All you have to do is write a custom module that inherits from AuthCookie. +Your module is a class which implements two methods: + +=over 4 + +=item C<authen_cred()> + +Verify the user-supplied credentials and return a session key. The session key +can be any string - often you'll use some string containing username, timeout +info, and any other information you need to determine access to documents, and +append a one-way hash of those values together with some secret key. + +=item C<authen_ses_key()> + +Verify the session key (previously generated by C<authen_cred()>, possibly +during a previous request) and return the user ID. This user ID will be fed to +C<$r-E<gt>user()> to set Apache's idea of who's logged in. + +=back + +By using AuthCookie versus Apache's built-in AuthBasic you can design your own +authentication system. There are several benefits. + +=over 4 + +=item 1. + +The client doesn't *have* to pass the user credentials on every subsequent +access. If you're using passwords, this means that the password can be sent on +the first request only, and subsequent requests don't need to send this +(potentially sensitive) information. This is known as "ticket-based" +authentication. + +=item 2. + +When you determine that the client should stop using the credentials/session +key, the server can tell the client to delete the cookie. Letting users "log +out" is a notoriously impossible-to-solve problem of AuthBasic. + +=item 3. + +AuthBasic dialog boxes are ugly. You can design your own HTML login forms when +you use AuthCookie. + +=item 4. + +You can specify the domain of a cookie using C<PerlSetVar> commands. For +instance, if your AuthName is C<WhatEver>, you can put the command + + PerlSetVar WhatEverDomain .yourhost.com + +into your server setup file and your access cookies will span all hosts ending +in C<.yourhost.com>. + +=item 5. + +You can optionally specify the name of your cookie using the C<CookieName> +directive. For instance, if your AuthName is C<WhatEver>, you can put the +command + + PerlSetVar WhatEverCookieName MyCustomName + +into your server setup file and your cookies for this AuthCookie realm will be +named MyCustomName. Default is AuthType_AuthName. + +=back + +This is the flow of the authentication handler, less the details of the +redirects. Two HTTP_MOVED_TEMPORARILY's are used to keep the client from +displaying the user's credentials in the Location field. They don't really +change AuthCookie's model, but they do add another round-trip request to the +client. + +=for html <PRE> + + (-----------------------) +---------------------------------+ + ( Request a protected ) | AuthCookie sets custom error | + ( page, but user hasn't )---->| document and returns | + ( authenticated (no ) | HTTP_FORBIDDEN. Apache abandons | + ( session key cookie) ) | current request and creates sub | + (-----------------------) | request for the error document. |<-+ + | Error document is a script that | | + | generates a form where the user | | + return | enters authentication | | + ^------------------->| credentials (login & password). | | + / \ False +---------------------------------+ | + / \ | | + / \ | | + / \ V | + / \ +---------------------------------+ | + / Pass \ | User's client submits this form | | + / user's \ | to the LOGIN URL, which calls | | + | credentials |<------------| AuthCookie->login(). | | + \ to / +---------------------------------+ | + \authen_cred/ | + \ function/ | + \ / | + \ / | + \ / +------------------------------------+ | + \ / return | Authen cred returns a session | +--+ + V------------->| key which is opaque to AuthCookie.*| | + True +------------------------------------+ | + | | + +--------------------+ | +---------------+ + | | | | If we had a | + V | V | cookie, add | + +----------------------------+ r | ^ | a Set-Cookie | + | If we didn't have a session| e |T / \ | header to | + | key cookie, add a | t |r / \ | override the | + | Set-Cookie header with this| u |u / \ | invalid cookie| + | session key. Client then | r |e / \ +---------------+ + | returns session key with | n | / pass \ ^ + | successive requests | | / session \ | + +----------------------------+ | / key to \ return | + | +-| authen_ses_key|------------+ + V \ / False + +-----------------------------------+ \ / + | Tell Apache to set Expires header,| \ / + | set user to user ID returned by | \ / + | authen_ses_key, set authentication| \ / + | to our type (e.g. AuthCookie). | \ / + +-----------------------------------+ \ / + V + (---------------------) ^ + ( Request a protected ) | + ( page, user has a )--------------+ + ( session key cookie ) + (---------------------) + + + * The session key that the client gets can be anything you want. For + example, encrypted information about the user, a hash of the + username and password (similar in function to Digest + authentication), or the user name and password in plain text + (similar in function to HTTP Basic authentication). + + The only requirement is that the authen_ses_key function that you + create must be able to determine if this session_key is valid and + map it back to the originally authenticated user ID. + +=for html </PRE> + +=head1 METHODS + +C<Apache2_4::AuthCookie> has several methods you should know about. + +=over 4 + +=item * authenticate() + +This method is one you'll use in a server config file (httpd.conf, .htaccess, +...) as a PerlAuthenHandler. If the user provided a session key in a cookie, +the C<authen_ses_key()> method will get called to check whether the key is +valid. If not, or if there is no key provided, we redirect to the login form. + +=item * authen_cred() + +You must define this method yourself in your subclass of +C<Apache2_4::AuthCookie>. Its job is to create the session key that will be +preserved in the user's cookie. The arguments passed to it are: + + sub authen_cred ($$\@) { + my $self = shift; # Package name (same as AuthName directive) + my $r = shift; # Apache request object + my @cred = @_; # Credentials from login form + + ...blah blah blah, create a session key... + return $session_key; + } + +The only limitation on the session key is that you should be able to look at it +later and determine the user's username. You are responsible for implementing +your own session key format. A typical format is to make a string that +contains the username, an expiration time, whatever else you need, and an MD5 +hash of all that data together with a secret key. The hash will ensure that +the user doesn't tamper with the session key. + +=item * authen_ses_key() + +You must define this method yourself in your subclass of +C<Apache2_4::AuthCookie>. Its job is to look at a session key and determine +whether it is valid. If so, it returns the username of the authenticated user. + + sub authen_ses_key ($$$) { + my ($self, $r, $session_key) = @_; + ...blah blah blah, check whether $session_key is valid... + return $ok ? $username : undef; + } + +Optionally, return an array of 2 or more items that will be passed to method +custom_errors. It is the responsibility of this method to return the correct +response to the main Apache module. + +=item * custom_errors($r,@_) + +This method handles the server response when you wish to access the Apache +custom_response method. Any suitable response can be used. this is +particularly useful when implementing 'by directory' access control using +the user authentication information. i.e. + + /restricted + /one user is allowed access here + /two not here + /three AND here + +The authen_ses_key method would return a normal response when the user attempts +to access 'one' or 'three' but return (NOT_FOUND, 'File not found') if an +attempt was made to access subdirectory 'two'. Or, in the case of expired +credentials, (AUTH_REQUIRED,'Your session has timed out, you must login +again'). + + example 'custom_errors' + + sub custom_errors { + my ($self,$r,$CODE,$msg) = @_; + + # return custom message else use the server's standard message + $r->custom_response($CODE, $msg) if $msg; + + return($CODE); + } + + where CODE is a valid code from Apache2::Const + +=item * login() + +This method handles the submission of the login form. It will call the +C<authen_cred()> method, passing it C<$r> and all the submitted data with names +like C<"credential_#">, where # is a number. These will be passed in a simple +array, so the prototype is C<$self-E<gt>authen_cred($r, @credentials)>. After +calling C<authen_cred()>, we set the user's cookie and redirect to the URL +contained in the C<"destination"> submitted form field. + +=item * login_form($r) + +This method is responsible for displaying the login form. The default +implementation will make an internal redirect and display the URL you specified +with the C<PerlSetVar WhatEverLoginScript> configuration directive. You can +overwrite this method to provide your own mechanism. + +=item * login_form_status($r) + +This method returns the HTTP status code that will be returned with the login +form response. The default behaviour is to return HTTP_FORBIDDEN, except for +some known browsers which ignore HTML content for HTTP_FORBIDDEN responses +(e.g.: SymbianOS). You can override this method to return custom codes. + +Note that HTTP_FORBIDDEN is the most correct code to return as the given +request was not authorized to view the requested page. You should only change +this if HTTP_FORBIDDEN does not work. + +=item * logout() + +This is simply a convenience method that unsets the session key for you. You +can call it in your logout scripts. Usually this looks like +C<$r-E<gt>auth_type-E<gt>logout($r);>. + +=item * send_cookie($r, $session_key) + +By default this method simply sends out the session key you give it. If you +need to change the default behavior (perhaps to update a timestamp in the key) +you can override this method. + +=item * recognize_user() + +If the user has provided a valid session key but the document isn't protected, +this method will set C<$r-E<gt>user> anyway. Use it as a PerlFixupHandler, +unless you have a better idea. + +=item * key($r) + +This method will return the current session key, if any. This can be handy +inside a method that implements a C<require> directive check (like the +C<species> method discussed above) if you put any extra information like +clearances or whatever into the session key. + +=item * untaint_destination($self, $uri) + +This method returns a modified version of the destination parameter before +embedding it into the response header. Per default it escapes CR, LF and TAB +characters of the uri to avoid certain types of security attacks. You can +override it to more limit the allowed destinations, e.g., only allow relative +uris, only special hosts or only limited set of characters. + +=back + +=head1 EXAMPLE + +For an example of how to use C<Apache2_4::AuthCookie>, you may want to check +out the test suite, which runs AuthCookie through a few of its paces. The +documents are located in t/eg/, and you may want to peruse t/real.t to see the +generated httpd.conf file (at the bottom of real.t) and check out what requests +it's making of the server (at the top of real.t). + +=head1 THE LOGIN SCRIPT + +You will need to create a login script (called login.pl above) that generates +an HTML form for the user to fill out. You might generate the page using a +ModPerl::Registry script, a HTML::Mason component, an Apache handler, or +perhaps even using a static HTML page. It's usually useful to generate it +dynamically so that you can define the 'destination' field correctly (see +below). + +The following fields must be present in the form: + +=over 4 + +=item 1. + +The ACTION of the form must be /LOGIN (or whatever you defined in your +server configuration as handled by the C<-E<gt>login()> method - see example in +the SYNOPSIS section). + +=item 2. + +The various user input fields (username, passwords, etc.) must be named +'credential_0', 'credential_1', etc. on the form. These will get passed to +your C<authen_cred()> method. + +=item 3. + +You must define a form field called 'destination' that tells AuthCookie where +to redirect the request after successfully logging in. Typically this value is +obtained from C<$r-E<gt>prev-E<gt>uri>. See the login.pl script in t/eg/. + +=back + +In addition, you might want your login page to be able to tell why the user is +being asked to log in. In other words, if the user sent bad credentials, then +it might be useful to display an error message saying that the given username +or password are invalid. Also, it might be useful to determine the difference +between a user that sent an invalid auth cookie, and a user that sent no auth +cookie at all. To cope with these situations, B<AuthCookie> will set +C<$r-E<gt>subprocess_env('AuthCookieReason')> to one of the following values. + +=over 4 + +=item I<no_cookie> + +The user presented no cookie at all. Typically this means the user is +trying to log in for the first time. + +=item I<bad_cookie> + +The cookie the user presented is invalid. Typically this means that the user +is not allowed access to the given page. + +=item I<bad_credentials> + +The user tried to log in, but the credentials that were passed are invalid. + +=back + +You can examine this value in your login form by examining +C<$r-E<gt>prev-E<gt>subprocess_env('AuthCookieReason')> (because it's a +sub-request). + +Of course, if you want to give more specific information about why access +failed when a cookie is present, your C<authen_ses_key()> method can set +arbitrary entries in C<$r-E<gt>subprocess_env>. + +=head1 THE LOGOUT SCRIPT + +If you want to let users log themselves out (something that can't be done using +Basic Auth), you need to create a logout script. For an example, see +t/htdocs/docs/logout.pl. Logout scripts may want to take advantage of +AuthCookie's C<logout()> method, which will set the proper cookie headers in +order to clear the user's cookie. This usually looks like +C<$r-E<gt>auth_type-E<gt>logout($r);>. + +Note that if you don't necessarily trust your users, you can't count on cookie +deletion for logging out. You'll have to expire some server-side login +information too. AuthCookie doesn't do this for you, you have to handle it +yourself. + +=head1 ABOUT SESSION KEYS + +Unlike the sample AuthCookieHandler, you have you verify the user's login and +password in C<authen_cred()>, then you do something like: + + my $date = localtime; + my $ses_key = Digest::SHA::sha256_hex(join(';', $date, $PID, $PAC)); + +save C<$ses_key> along with the user's login, and return C<$ses_key>. + +Now C<authen_ses_key()> looks up the C<$ses_key> passed to it and returns the +saved login. I use a database to store the session key and retrieve it later. + +=head1 FREQUENTLY ASKED QUESTIONS + +=over 4 + +=item * + +I upgraded to Apache 2.4 and now AuthCookie doesn't work! + +Apache 2.4 radically changed the authenciation and authorization API. You will +need to port your AuthCookie subclass over to the Apache 2.4 API. See the POD +documenation in L<README.apache-2.4> for more information, but the quick +rundown is you need to: + +=over 4 + +=item * + +Inherit from C<Apache2_4::AuthCookie> + +=item * + +Remove all C<PerlAuthzHandler> configuration entries. + +=item * + +Write Authz Provider methods for any C<Requires> directives that you are using +that apache does not provide for already (e.g. apache already handles C<user> +and C<valid-user>) and register them with something like. + + PerlAddAuthzProvier species Sample::AuthCookieHandler->authz_species + +=item * + +Replace instances of C<${AuthName}Satistfy> with either C<RequireAll> or +C<RequireAny> blocks. + +=back + +=item * + +Why is my authz method called twice per request? + +This is normal behaviour under Apache 2.4. This is to accomodate for +authorization of anonymous access. You are expected to return +C<Apache2::Const::AUTHZ_DENIED_NO_USER> IF C<< $r->user >> has not yet been set +if you want authentication to proceed. Your authz handler will be called a +second time after the user has been authenticated. + +=item * + +AuthCookie authenticates, but the authorization handler is returning +C<UNAUTHORIZED> instead of C<FORBIDDEN>! + +In Apache 2.4, in C<mod_authz_core>, if no authz handlers return C<AUTHZ_GRANTED>, +then C<HTTP_UNAUTHORIZED> is returned. In previous versions of Apache, +C<HTTP_FORBIDDEN> was returned. You can get the old behaviour if you want it +with: + + AuthzSendForbiddenOnFailure On + +=item * + +My log shows an entry like: + + authorization result of Require ...: denied (no authenticated user yet) + +These are normal. This happens because the authz provider returned +C<AUTHZ_DENIED_NO_USER> and the authz provider will be called again after +authentication happens. + +=back + +=head1 HISTORY + +Originally written by Eric Bartley <bartley(a)purdue.edu> + +versions 2.x were written by Ken Williams <ken(a)forum.swarthmore.edu> + +=head1 COPYRIGHT + +Copyright (c) 2015 Michael Schout. All rights reserved. + +This program is free software; you can redistribute it and/or modify it under +the same terms as Perl itself. + +=head1 SEE ALSO + +L<perl(1)>, L<mod_perl(1)>, L<Apache(1)>. =head1 SOURCE @@ -71,3 +640,8 @@ the same terms as the Perl 5 programming language system itself. =cut + +__END__ + + +# vim: sw=4 ts=4 ai et diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Apache-AuthCookie-3.23/t/conf/extra.conf.in new/Apache-AuthCookie-3.24/t/conf/extra.conf.in --- old/Apache-AuthCookie-3.23/t/conf/extra.conf.in 2015-09-10 18:59:48.000000000 +0200 +++ new/Apache-AuthCookie-3.24/t/conf/extra.conf.in 2016-01-14 00:16:15.000000000 +0100 @@ -12,7 +12,7 @@ <IfDefine APACHE2_4> PerlModule Sample::Apache2_4::AuthCookieHandler PerlAddAuthzProvider dwarf Sample::Apache2_4::AuthCookieHandler->dwarf - PerlAddAuthzProvider user Sample::Apache2_4::AuthCookieHandler->authz_handler + PerlAddAuthzProvider myuser Sample::Apache2_4::AuthCookieHandler->authz_handler </IfDefine> </IfDefine> @@ -73,8 +73,7 @@ PerlAuthenHandler Sample::Apache2_4::AuthCookieHandler->authenticate </IfDefine> </IfDefine> - Require user some-user - Require user programmer + Require user some-user programmer Require user 0 </Location> @@ -113,6 +112,39 @@ </RequireAll> </IfDefine> </Location> + +# test our internal authz_handler for apache 2.4 +<Location /docs/myuser> + AuthName WhatEver + + <IfDefine APACHE1> + AuthType Sample::Apache::AuthCookieHandler + PerlAuthenHandler Sample::Apache::AuthCookieHandler->authenticate + PerlAuthzHandler Sample::Apache::AuthCookieHandler->authorize + </IfDefine> + <IfDefine APACHE2> + <IfDefine !APACHE2_4> + PerlAuthenHandler Sample::Apache2::AuthCookieHandler->authenticate + AuthType Sample::Apache2::AuthCookieHandler + PerlAuthzHandler Sample::Apache2::AuthCookieHandler->authorize + </IfDefine> + <IfDefine APACHE2_4> + PerlAuthenHandler Sample::Apache2_4::AuthCookieHandler->authenticate + AuthType Sample::Apache2_4::AuthCookieHandler + </IfDefine> + </IfDefine> + + <IfDefine !APACHE2_4> + # apache 1.x, apache 2.0, apache 2.2 + Require user programmer + </IfDefine> + <IfDefine APACHE2_4> + # apache 2.4 + <RequireAll> + Require myuser dopey programmer + </RequireAll> + </IfDefine> +</Location> <Location /docs/stimeout> PerlSetVar WhatEverSessionTimeout +10m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Apache-AuthCookie-3.23/t/htdocs/docs/myuser/get_me.html new/Apache-AuthCookie-3.24/t/htdocs/docs/myuser/get_me.html --- old/Apache-AuthCookie-3.23/t/htdocs/docs/myuser/get_me.html 1970-01-01 01:00:00.000000000 +0100 +++ new/Apache-AuthCookie-3.24/t/htdocs/docs/myuser/get_me.html 2016-01-14 00:16:15.000000000 +0100 @@ -0,0 +1,9 @@ +<HTML> +<HEAD> +<TITLE>Congratulations</TITLE> +</HEAD> +<BODY> +<H1>Congratulations, you got past AuthCookie</H1> +<P><A HREF="../logout.pl">Log Out</A></P> +</BODY> +</HTML> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Apache-AuthCookie-3.23/t/real.t new/Apache-AuthCookie-3.24/t/real.t --- old/Apache-AuthCookie-3.23/t/real.t 2015-09-10 18:59:48.000000000 +0200 +++ new/Apache-AuthCookie-3.24/t/real.t 2016-01-14 00:16:15.000000000 +0100 @@ -14,7 +14,7 @@ Apache::TestRequest::user_agent( reset => 1, requests_redirectable => 0 ); -plan tests => 51, need_lwp; +plan tests => 52, need_lwp; ok 1; # we loaded. @@ -228,6 +228,17 @@ 'username=0 access allowed'); } +# local authz provider test for 2.4 (works same as authany on older versions) +{ + my $r = GET( + '/docs/myuser/get_me.html', + Cookie => 'Sample::AuthCookieHandler_WhatEver=programmer:Hero' + ); + + like($r->content, qr/Congratulations, you got past AuthCookie/, + 'myuser=programmer access allowed'); +} + # login with username=0 works { my $r = POST('/LOGIN', [

1 0

commit votca-csg for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package votca-csg for openSUSE:Factory checked in at 2016-01-21 23:44:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/votca-csg (Old) and /work/SRC/openSUSE:Factory/.votca-csg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "votca-csg" Changes: -------- --- /work/SRC/openSUSE:Factory/votca-csg/votca-csg.changes 2015-10-20 00:04:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.votca-csg.new/votca-csg.changes 2016-01-22 01:09:46.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Jan 15 23:14:20 UTC 2016 - junghans(a)votca.org + +- Upgrade to 1.3 + * re-implemented csg_boltzmann --excl + * added support for upcoming gromacs 2016 + * details see 1.3 section of: + https://github.com/votca/csg/blob/master/CHANGELOG.md + or included CHANGELOG.md file + +------------------------------------------------------------------- Old: ---- votca-csg-1.3_rc1.tar.gz votca-csg-manual-1.3_rc1.pdf votca-csg-tutorials-1.3_rc1.tar.gz New: ---- votca-csg-1.3.tar.gz votca-csg-manual-1.3.pdf votca-csg-tutorials-1.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ votca-csg.spec ++++++ --- /var/tmp/diff_new_pack.J1lcJp/_old 2016-01-22 01:09:48.000000000 +0100 +++ /var/tmp/diff_new_pack.J1lcJp/_new 2016-01-22 01:09:48.000000000 +0100 @@ -1,7 +1,7 @@ # # votca-csg.spec # -# Copyright (c) 2013-2015 Christoph Junghans +# Copyright (c) 2013-2016 Christoph Junghans # # Originally written by Jussi Lehtola <jussilehtola(a)fedoraproject.org> # Fixed for multi-distro build by Klaus Kaempf <kkaempf(a)suse.de> @@ -10,16 +10,15 @@ # Name: votca-csg -Version: 1.3~rc1 -%define uversion 1.3_rc1 +Version: 1.3 Release: 0 Summary: VOTCA coarse-graining engine Group: Productivity/Scientific/Chemistry License: Apache-2.0 URL: http://www.votca.org -Source0: https://github.com/votca/csg/archive/v%{uversion}.tar.gz#/%{name}-%{uversio… -Source1: https://github.com/votca/csg-tutorials/archive/v%{uversion}.tar.gz#/%{name}… -Source2: https://github.com/votca/csg-manual/releases/download/v%{uversion}/votca-cs… +Source0: https://github.com/votca/csg/archive/v%{version}.tar.gz#/%{name}-%{version}… +Source1: https://github.com/votca/csg-tutorials/archive/v%{version}.tar.gz#/%{name}-… +Source2: https://github.com/votca/csg-manual/releases/download/v%{version}/votca-csg… BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -37,8 +36,8 @@ BuildRequires: txt2tags #exact same version is needed -Requires: %{name}-common = %{version}-%{release} -Requires: libvotca_csg3 = %{version}-%{release} +Requires: %{name}-common = %{version} +Requires: libvotca_csg3 = %{version} %description Versatile Object-oriented Toolkit for Coarse-graining Applications (VOTCA) is @@ -61,7 +60,7 @@ %package devel Summary: Development headers and libraries for VOTCA Coarse Graining Engine Group: Development/Libraries/C and C++ -Requires: libvotca_csg3 = %{version}-%{release} +Requires: libvotca_csg3 = %{version} Requires: votca-tools-devel = %{version} %description devel @@ -99,7 +98,7 @@ %package bash Summary: Bash completion for votca Group: Productivity/Other -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} Requires: bash-completion BuildArch: noarch @@ -112,7 +111,7 @@ This package contains bash completion support for votca-csg. %prep -%setup -n csg-%{uversion} -q +%setup -n csg-%{version} -q tar -xzf %{S:1} %build @@ -148,7 +147,7 @@ cp %{S:2} %{buildroot}%{pkgdocdir} mkdir -p %{buildroot}%{pkgdocdir}/examples -cp -r csg-tutorials-%{uversion}/* %{buildroot}%{pkgdocdir}/examples +cp -r csg-tutorials-%{version}/* %{buildroot}%{pkgdocdir}/examples %fdupes %{buildroot}%{_prefix} %post -n libvotca_csg3 -p /sbin/ldconfig ++++++ votca-csg-1.3_rc1.tar.gz -> votca-csg-1.3.tar.gz ++++++ ++++ 2419 lines of diff (skipped) ++++++ votca-csg-manual-1.3_rc1.pdf -> votca-csg-manual-1.3.pdf ++++++ (binary differes) ++++++ votca-csg-tutorials-1.3_rc1.tar.gz -> votca-csg-tutorials-1.3.tar.gz ++++++ /work/SRC/openSUSE:Factory/votca-csg/votca-csg-tutorials-1.3_rc1.tar.gz /work/SRC/openSUSE:Factory/.votca-csg.new/votca-csg-tutorials-1.3.tar.gz differ: char 13, line 1

1 0

commit booth for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package booth for openSUSE:Factory checked in at 2016-01-21 23:44:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/booth (Old) and /work/SRC/openSUSE:Factory/.booth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "booth" Changes: -------- --- /work/SRC/openSUSE:Factory/booth/booth.changes 2015-12-09 22:13:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2016-01-22 01:09:43.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Jan 12 14:00:41 UTC 2016 - dmuhamedagic(a)suse.com + +- Update to release candidate v1.0 rc1 + + main: prevent segfault on no arguments + + ticket: term 0 is a valid term (bsc#952426) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ booth.spec ++++++ --- /var/tmp/diff_new_pack.VY4M2y/_old 2016-01-22 01:09:45.000000000 +0100 +++ /var/tmp/diff_new_pack.VY4M2y/_new 2016-01-22 01:09:45.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package booth # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -45,8 +45,8 @@ Summary: Ticket Manager for Multi-site Clusters License: GPL-2.0+ Group: %{pkg_group} -Version: 0.2.0 -Release: 0 +Version: 1.0 +Release: 0rc1 Source: booth.tar.bz2 Source1: %name-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ booth.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/.git_info new/booth/.git_info --- old/booth/.git_info 2015-12-03 11:52:44.000000000 +0100 +++ new/booth/.git_info 2016-01-12 15:03:32.000000000 +0100 @@ -1 +1 @@ -v0.2.0-130-g9c5c19f +v1.0rc1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/ChangeLog new/booth/ChangeLog --- old/booth/ChangeLog 1970-01-01 01:00:00.000000000 +0100 +++ new/booth/ChangeLog 2016-01-12 11:50:01.000000000 +0100 @@ -0,0 +1,39 @@ +* Mon Jan 11 2016 Dejan Muhamedagic <dmuhamedagic(a)suse.com> and others +- release candidate 1.0 rc1 +- main: prevent segfault on no arguments +- ticket: term 0 is a valid term (bsc#952426) +- main: add 'other' as possible site reference +- arbitrator: mark expired tickets as lost (bsc#956321) +- geo attributes support +- booth-keygen: key generate auxiliary program +- ticket: prevent running external program twice +- ticket: make sure that we're the leader if granting ticket (bsc#940037) +- docs: add booth processing FSM dot graphs +- main: add booth peers command +- main: don't allow zero poll timeout (bsc#938820) +- pcmk: don't log error when ticket not in CIB +- client: fix memory leak in ticket list +- client: fix memory growing indefinitely on new client connect +- extprog: ignore running external program on revoke +- client: make sure that the client is still there to be notified +- client: don't allow SIGPIPE to kill the server (if the client leaves too early) +- extprog: preserve child exit status +- extprog: run programs asynchronously +- clients: fix memory leak when removing client +- transport: use non-blocking read +- hmac based authentication support +- ticket: ignore late MY_INDEX requests +- contrib: add geo-cluster.fwd (suse firewall rules) +- ticket: restart elections after last candidate disappears +- ticket: add -C option (wait for commit) +- raft: handle duplicate ticket release requests +- booth-site: exit early in start if daemon cannot start +- raft: ignore messages with invalid term (lower than already committed) +- raft: better control of term increment +- ticket: allow finer resolution time in messages +- use subsecond timers internally +- booth-arbitrator: fix exit codes for all actions +- booth-arbitrator: set the right LSB exit code in status +- booth-arbitrator: fix stop exit code (bnc#914306) +- booth-arbitrator: update exit codes +- main: use /proc/self/oom_score_adj instead of oom_adj (bnc#914037) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/booth.spec new/booth/booth.spec --- old/booth/booth.spec 2015-12-03 11:52:35.000000000 +0100 +++ new/booth/booth.spec 2016-01-12 11:50:01.000000000 +0100 @@ -28,8 +28,8 @@ Summary: Ticket Manager for Multi-site Clusters License: GPL-2.0+ Group: %{pkg_group} -Version: 0.2.0 -Release: 0 +Version: 1.0 +Release: rc1 Source: booth.tar.bz2 Source1: %name-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/configure.ac new/booth/configure.ac --- old/booth/configure.ac 2015-12-03 11:52:35.000000000 +0100 +++ new/booth/configure.ac 2016-01-12 11:50:01.000000000 +0100 @@ -4,7 +4,7 @@ # bootstrap / init AC_PREREQ([2.61]) -AC_INIT([booth], [0.2.0], [users(a)clusterlabs.org]) +AC_INIT([booth], [1.0-0-rc1], [users(a)clusterlabs.org]) AM_INIT_AUTOMAKE([-Wno-portability]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/config.c new/booth/src/config.c --- old/booth/src/config.c 2015-12-03 11:52:35.000000000 +0100 +++ new/booth/src/config.c 2016-01-12 11:50:01.000000000 +0100 @@ -211,13 +211,6 @@ tk = booth_conf->ticket + booth_conf->ticket_count; booth_conf->ticket_count++; - tk->last_valid_tk = malloc(sizeof(struct ticket_config)); - if (!tk->last_valid_tk) { - log_error("out of memory"); - return -ENOMEM; - } - memset(tk->last_valid_tk, 0, sizeof(struct ticket_config)); - if (!check_max_len_valid(name, sizeof(tk->name))) { log_error("ticket name \"%s\" too long.", name); return -EINVAL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/inline-fn.h new/booth/src/inline-fn.h --- old/booth/src/inline-fn.h 2015-12-03 11:52:35.000000000 +0100 +++ new/booth/src/inline-fn.h 2016-01-12 11:50:01.000000000 +0100 @@ -115,7 +115,7 @@ } #define my_last_term(tk) \ - (((tk)->state == ST_CANDIDATE && (tk)->last_valid_tk->current_term) ? \ + (((tk)->state == ST_CANDIDATE && (tk)->last_valid_tk) ? \ (tk)->last_valid_tk->current_term : (tk)->current_term) extern int TIME_RES, TIME_MULT; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/main.c new/booth/src/main.c --- old/booth/src/main.c 2015-12-03 11:52:35.000000000 +0100 +++ new/booth/src/main.c 2016-01-12 11:50:01.000000000 +0100 @@ -1001,16 +1001,16 @@ op = argv[1]; optind = 2; opt_string = ATTR_OPTION_STRING; - } else if (strcmp(arg1, "arbitrator") == 0 || + } else if (argc > 1 && (strcmp(arg1, "arbitrator") == 0 || strcmp(arg1, "site") == 0 || strcmp(arg1, "start") == 0 || - strcmp(arg1, "daemon") == 0) { + strcmp(arg1, "daemon") == 0)) { cl.type = DAEMON; optind = 2; - } else if (strcmp(arg1, "status") == 0) { + } else if (argc > 1 && (strcmp(arg1, "status") == 0)) { cl.type = STATUS; optind = 2; - } else if (strcmp(arg1, "client") == 0) { + } else if (argc > 1 && (strcmp(arg1, "client") == 0)) { cl.type = CLIENT; if (argc < 3) { print_usage(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/raft.c new/booth/src/raft.c --- old/booth/src/raft.c 2015-12-03 11:52:35.000000000 +0100 +++ new/booth/src/raft.c 2016-01-12 11:50:01.000000000 +0100 @@ -284,8 +284,7 @@ /* §5.1 */ if (is_term_invalid(tk, term)) { tk_log_info("got invalid term from %s " - "(%d vs. %d), ignoring", site_string(sender), - term, tk->last_valid_tk->current_term); + "(%d), ignoring", site_string(sender), term); return 1; } @@ -771,7 +770,7 @@ * valid or if there was a tie (in that case update_term > 1) */ if ((update_term > 1) || - (update_term && tk->last_valid_tk->current_term && + (update_term && tk->last_valid_tk && tk->last_valid_tk->current_term >= tk->current_term)) { /* save the previous term, we may need to send out the * MY_INDEX message */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/ticket.c new/booth/src/ticket.c --- old/booth/src/ticket.c 2015-12-03 11:52:35.000000000 +0100 +++ new/booth/src/ticket.c 2016-01-12 11:50:01.000000000 +0100 @@ -161,6 +161,19 @@ } +void save_committed_tkt(struct ticket_config *tk) +{ + if (!tk->last_valid_tk) { + tk->last_valid_tk = malloc(sizeof(struct ticket_config)); + if (!tk->last_valid_tk) { + log_error("out of memory"); + return; + } + } + memcpy(tk->last_valid_tk, tk, sizeof(struct ticket_config)); +} + + static void ext_prog_failed(struct ticket_config *tk, int start_election) { @@ -1294,19 +1307,22 @@ int send_msg ( int cmd, - struct ticket_config *current_tk, + struct ticket_config *tk, struct booth_site *dest, struct boothc_ticket_msg *in_msg ) { int req = 0; - struct ticket_config *tk = current_tk; + struct ticket_config *valid_tk = tk; struct boothc_ticket_msg msg; + /* if we want to send the last valid ticket, then if we're in + * the ST_CANDIDATE state, the last valid ticket is in + * tk->last_valid_tk + */ if (cmd == OP_MY_INDEX) { - if (current_tk->state == ST_CANDIDATE && - current_tk->last_valid_tk->current_term) { - tk = current_tk->last_valid_tk; + if (tk->state == ST_CANDIDATE && tk->last_valid_tk) { + valid_tk = tk->last_valid_tk; } tk_log_info("sending status to %s", site_string(dest)); @@ -1315,6 +1331,6 @@ if (in_msg) req = ntohl(in_msg->header.cmd); - init_ticket_msg(&msg, cmd, req, RLT_SUCCESS, 0, tk); + init_ticket_msg(&msg, cmd, req, RLT_SUCCESS, 0, valid_tk); return booth_udp_send_auth(dest, &msg, sendmsglen(&msg)); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/ticket.h new/booth/src/ticket.h --- old/booth/src/ticket.h 2015-12-03 11:52:35.000000000 +0100 +++ new/booth/src/ticket.h 2016-01-12 11:50:01.000000000 +0100 @@ -55,13 +55,10 @@ tk->next_state = newst; \ } while(0) -#define save_committed_tkt(tk) \ - memcpy((tk)->last_valid_tk, tk, sizeof(struct ticket_config)) - #define is_term_invalid(tk, term) \ - (tk->last_valid_tk->current_term && \ - tk->last_valid_tk->current_term > term) + ((tk)->last_valid_tk && (tk)->last_valid_tk->current_term > (term)) +void save_committed_tkt(struct ticket_config *tk); void disown_ticket(struct ticket_config *tk); int disown_if_expired(struct ticket_config *tk); int check_ticket(char *ticket, struct ticket_config **tc); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/test/live_test.sh new/booth/test/live_test.sh --- old/booth/test/live_test.sh 2015-12-03 11:52:35.000000000 +0100 +++ new/booth/test/live_test.sh 2016-01-12 11:50:01.000000000 +0100 @@ -664,6 +664,7 @@ local rc booth_status dep_rsc_status local start_time end_time local usrmsg + rc=0 TEST=$1 start_time=`date` start_ts=`date +%s`

1 0

commit ipset for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package ipset for openSUSE:Factory checked in at 2016-01-21 23:44:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ipset (Old) and /work/SRC/openSUSE:Factory/.ipset.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ipset" Changes: -------- --- /work/SRC/openSUSE:Factory/ipset/ipset.changes 2015-07-03 00:06:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ipset.new/ipset.changes 2016-01-22 01:09:40.000000000 +0100 @@ -1,0 +2,31 @@ +Mon Jan 18 15:42:54 UTC 2016 - kstreitova(a)suse.com + +- update to 6.27: + * kernel part changes + * fix reported memory size for hash:* types + * fix hash type expire: release empty hash bucket block + * fix hash type expiration: incorrect index fixed + * collapse same condition body to a single one + * fix extension alignment + * compatibility: include linux/export.h when needed + * compatibility: make sure vmalloc.h is included for kvfree() + * compatibility: Fix detecting 'struct net' in 'struct tcf_ematch' + * compatibility: Protect definition of RCU_INIT_POINTER in + compatibility header file + * netfilter: ipset: Fix sleeping memory allocation in atomic + context (Nikolay Borisov) + * userspace changes + * handle uint64_t alignment issue in ipset tool +- disable KMP build as we support the in-kernel version instead. + Remove ipset-preamble file that is no longer needed [bsc#962345] +- run spec-cleaner + +------------------------------------------------------------------- +Sun Aug 30 11:23:27 UTC 2015 - jengelh(a)inai.de + +- Update to new upstream release 6.26 +* Out of bound access in hash:net* types fixed +* Make struct htype per ipset family +* Optimize hash creation routine + +------------------------------------------------------------------- Old: ---- ipset-6.25.1.tar.bz2 ipset-preamble New: ---- ipset-6.27.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ipset.spec ++++++ --- /var/tmp/diff_new_pack.8ntovu/_old 2016-01-22 01:09:42.000000000 +0100 +++ /var/tmp/diff_new_pack.8ntovu/_new 2016-01-22 01:09:42.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ipset # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -16,38 +16,24 @@ # -Name: ipset %define lname libipset3 -Version: 6.25.1 +Name: ipset +Version: 6.27 Release: 0 Summary: Netfilter ipset administration utility License: GPL-2.0 Group: Productivity/Networking/Security Url: http://ipset.netfilter.org/ - #Git-Clone: git://git.netfilter.org/ipset #Git-Web: http://git.netfilter.org/ -Source: ftp://ftp.netfilter.org/pub/ipset/%name-%version.tar.bz2 -Source3: %name-preamble - -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source: ftp://ftp.netfilter.org/pub/ipset/%{name}-%{version}.tar.bz2 BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool BuildRequires: linux-glibc-devel >= 2.6.24 BuildRequires: pkgconfig >= 0.21 BuildRequires: pkgconfig(libmnl) >= 1 -# Make quilt happy -%if 0%{?kernel_module_package_buildreqs:1} -%define with_kmp 1 -BuildRequires: %kernel_module_package_buildreqs -%endif -BuildRequires: kernel-syms >= 2.6.39 -Recommends: %name-kmp - -%if 0%{?with_kmp:1} -%kernel_module_package -p %name-preamble -%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description IP sets are a framework inside the Linux kernel, which can be @@ -64,24 +50,11 @@ * express complex IP address and ports based rulesets with one single iptables rule and benefit from the speed of IP sets -%package KMP -Summary: Netfilter ipset kernel modules -Group: System/Kernel - -%description KMP -IP sets are a framework inside the Linux kernel, which can be -administered by the ipset utility. Depending on the type, currently -an IP set may store IP addresses, (TCP/UDP) port numbers or IP -addresses with MAC addresses in a way, which ensures lightning speed -when matching an entry against a set. - -This package contains a version update to the in-kernel ipset modules. - -%package -n %lname +%package -n %{lname} Summary: Userspace library for the in-kernel Netfilter ipset interface Group: System/Libraries -%description -n %lname +%description -n %{lname} IP sets are a framework inside the Linux kernel, which can be administered by the ipset utility. Depending on the type, currently an IP set may store IP addresses, (TCP/UDP) port numbers or IP @@ -91,7 +64,7 @@ %package devel Summary: Development files for ipset extensions Group: Development/Libraries/C and C++ -Requires: %lname = %version +Requires: %{lname} = %{version} %description devel IP sets are a framework inside the Linux kernel, which can be @@ -104,54 +77,32 @@ %setup -q %build -%if 0%{?with_kmp} -for flavor in %flavors_to_build; do - cp -a . "../%name-$flavor-%version"; - pushd "../%name-$flavor-%version/"; - # ksource: it just checks for a header - %configure --disable-static \ - --with-kbuild="/usr/src/linux-obj/%_target_cpu/$flavor" \ - --with-ksource="/usr/src/linux" \ - --includedir="%_includedir/pkg/%name" - make %{?_smp_mflags} all modules; - popd; -done; -%else -%configure --disable-static --with-kmod=no \ - --includedir="%_includedir/pkg/%name" +%configure --disable-static \ + --with-kmod=no \ + --includedir="%{_includedir}/pkg/%{name}" make %{?_smp_mflags}; -%endif %install -b="%buildroot"; -%if 0%{?with_kmp} -for flavor in %flavors_to_build; do - pushd "../%name-$flavor-%version/"; - make %{?_smp_mflags} install modules_install \ - DESTDIR="$b" INSTALL_MOD_PATH="$b"; - popd; -done; -%else -make %{?_smp_mflags} install DESTDIR="$b"; -%endif -find "$b/%_libdir" -type f -name "*.la" -delete; +make %{?_smp_mflags} install DESTDIR="%{buildroot}"; +find %{buildroot} -type f -name "*.la" -delete -print + +%post -n %{lname} -p /sbin/ldconfig -%post -n %lname -p /sbin/ldconfig -%postun -n %lname -p /sbin/ldconfig +%postun -n %{lname} -p /sbin/ldconfig %files %defattr(-,root,root) -%_sbindir/ipset -%_mandir/man*/* +%{_sbindir}/ipset +%{_mandir}/man*/* -%files -n %lname +%files -n %{lname} %defattr(-,root,root) -%_libdir/libipset.so.3* +%{_libdir}/libipset.so.3* %files devel %defattr(-,root,root) -%_libdir/libipset.so -%_libdir/pkgconfig/libipset.pc -%_includedir/pkg/ +%{_libdir}/libipset.so +%{_libdir}/pkgconfig/libipset.pc +%{_includedir}/pkg/ %changelog ++++++ ipset-6.25.1.tar.bz2 -> ipset-6.27.tar.bz2 ++++++ ++++ 2211 lines of diff (skipped)

1 0

commit openscap for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package openscap for openSUSE:Factory checked in at 2016-01-21 23:44:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openscap (Old) and /work/SRC/openSUSE:Factory/.openscap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openscap" Changes: -------- --- /work/SRC/openSUSE:Factory/openscap/openscap.changes 2015-12-16 17:43:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openscap.new/openscap.changes 2016-01-22 01:09:36.000000000 +0100 @@ -1,0 +2,21 @@ +Tue Jan 19 10:22:08 UTC 2016 - meissner(a)suse.com + +- openscap 1.2.8 release + - Maintenance + - textfilecontent54_probe does not produce false positives on non-UTF files (rhbz #1285757) + - fixed oscap-docker + - small improvements in verbose mode + - oscap info module shows information about tailoring files + - fixed build with CCE (issue #264) + - fixed XCCDF score computation (issue #272) + - fixed segmentation fault in variable probe (issue #277) + - fixed broken support for OVAL directives + - fixed bash completion + - plugged memory leaks + - fixed fresh static analysis (coverity) findings + - fixed shellcheck warnings + - new tests + - refactoring in datastream module + - many small bugfixes and typo fixes + +------------------------------------------------------------------- Old: ---- openscap-1.2.7.tar.gz openscap-1.2.7.tar.gz.sha1sum New: ---- openscap-1.2.8.tar.gz openscap-1.2.8.tar.gz.sha1sum ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openscap.spec ++++++ --- /var/tmp/diff_new_pack.CajwFF/_old 2016-01-22 01:09:40.000000000 +0100 +++ /var/tmp/diff_new_pack.CajwFF/_new 2016-01-22 01:09:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package openscap # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -20,7 +20,7 @@ %define with_bindings 0 Name: openscap -Version: 1.2.7 +Version: 1.2.8 Release: 1.0 Source: https://fedorahosted.org/releases/o/p/openscap/%name-%version.tar.gz Source5: https://fedorahosted.org/releases/o/p/openscap/%name-%version.tar.gz.sha1sum ++++++ openscap-1.2.7.tar.gz -> openscap-1.2.8.tar.gz ++++++ /work/SRC/openSUSE:Factory/openscap/openscap-1.2.7.tar.gz /work/SRC/openSUSE:Factory/.openscap.new/openscap-1.2.8.tar.gz differ: char 5, line 1 ++++++ openscap-1.2.7.tar.gz.sha1sum -> openscap-1.2.8.tar.gz.sha1sum ++++++ --- /work/SRC/openSUSE:Factory/openscap/openscap-1.2.7.tar.gz.sha1sum 2015-12-16 17:43:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openscap.new/openscap-1.2.8.tar.gz.sha1sum 2016-01-22 01:09:36.000000000 +0100 @@ -1 +1 @@ -88be9e23c5fb34d7a4e2252c959af87dc986fa89 openscap-1.2.7.tar.gz +1bdd600be54e50160cfc59c3ab7262fced362c7a openscap-1.2.8.tar.gz

1 0

commit votca-csgapps for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package votca-csgapps for openSUSE:Factory checked in at 2016-01-21 23:43:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/votca-csgapps (Old) and /work/SRC/openSUSE:Factory/.votca-csgapps.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "votca-csgapps" Changes: -------- --- /work/SRC/openSUSE:Factory/votca-csgapps/votca-csgapps.changes 2015-10-20 16:22:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.votca-csgapps.new/votca-csgapps.changes 2016-01-22 01:09:34.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Jan 15 23:15:59 UTC 2016 - junghans(a)votca.org + +- Upgrade to 1.3 + * details: https://github.com/votca/csg/blob/master/CHANGELOG.md + +------------------------------------------------------------------- Old: ---- votca-csgapps-1.3_rc1.tar.gz New: ---- votca-csgapps-1.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ votca-csgapps.spec ++++++ --- /var/tmp/diff_new_pack.ARSdU9/_old 2016-01-22 01:09:36.000000000 +0100 +++ /var/tmp/diff_new_pack.ARSdU9/_new 2016-01-22 01:09:36.000000000 +0100 @@ -10,14 +10,13 @@ # Name: votca-csgapps -Version: 1.3~rc1 -%define uversion 1.3_rc1 +Version: 1.3 Release: 0 Summary: VOTCA coarse-graining engine applications Group: Productivity/Scientific/Chemistry License: Apache-2.0 URL: http://www.votca.org -Source0: https://github.com/votca/csgapps/archive/v%{uversion}.tar.gz#/%{name}-%{uve… +Source0: https://github.com/votca/csgapps/archive/v%{version}.tar.gz#/%{name}-%{vers… BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gromacs-devel @@ -37,7 +36,7 @@ This package contains sample applications of the Coarse Graining Engine of VOTCA package. %prep -%setup -n csgapps-%{uversion} -q +%setup -n csgapps-%{version} -q %build %if %{defined fedora} ++++++ votca-csgapps-1.3_rc1.tar.gz -> votca-csgapps-1.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/csgapps-1.3_rc1/.travis.yml new/csgapps-1.3/.travis.yml --- old/csgapps-1.3_rc1/.travis.yml 2015-09-23 19:47:00.000000000 +0200 +++ new/csgapps-1.3/.travis.yml 2016-01-15 22:49:07.000000000 +0100 @@ -4,44 +4,61 @@ language: cpp -before_install: - - if [[ $CTP = yes ]]; then sudo add-apt-repository -y ppa:boost-latest/ppa; fi #newer boost for libboost_timer - - sudo apt-get update - - sudo apt-get install cmake libfftw3-dev libgsl0-dev txt2tags libboost-program-options-dev libboost-filesystem-dev libboost-system-dev libexpat1-dev libsqlite3-dev pkg-config mercurial - - if [[ $MAN ]]; then sudo apt-get install pgf texlive-fonts-recommended texlive-latex-extra doxygen graphviz; fi - - if [[ $TEST = *cma* ]]; then sudo apt-get install python-numpy gnuplot-nox; fi - - if [[ $TEST = *imc ]]; then sudo apt-get install octave; fi - - if [[ $TEST = *simplex* ]]; then sudo apt-get install gnuplot-nox; fi - - if [[ $TEST = *realtime ]]; then sudo apt-get install gnuplot-nox; fi - - if [[ $GROMACS != yes ]]; then sudo apt-get install gromacs-dev; fi - - if [[ $CTP = yes ]]; then sudo apt-get install libboost1.48-all-dev; fi - -env: #NINJA=1 is currently not support by Travis' cmake, enable when >=2.8.9 - - WERROR=yes J=4 #J>4 triggers an internal compiler in travis' g++ - - J=1 - - BDIR=build J=4 - - BDIR=build J=1 - - MAN=yes J=4 - - MINIMAL=yes J=4 - -matrix: - exclude: - - compiler: clang - env: J=1 #this test just tests the buildsystem - - compiler: clang - env: BDIR=build J=1 #just tests the buildsystem +sudo: false + +addons: + apt: + sources: boost-latest + packages: + - cmake + - ccache + - libfftw3-dev + - libgsl0-dev + - txt2tags + - libboost1.55-all-dev + - libexpat1-dev + - libsqlite3-dev + - pkg-config + - pgf + - texlive-fonts-recommended + - texlive-latex-extra + - doxygen + - graphviz + - python-numpy + - gnuplot-nox + - octave + - gromacs-dev + +env: + global: + - GMX_MAX_THREADS=8 + - CCACHE_CPP2=yes + matrix: #NINJA=1 is currently not support by Travis' cmake, enable when >=2.8.9 + - WERROR=yes J=4 #J>4 triggers an internal compiler in travis' g++ + - J=1 + - BDIR=build J=4 + - BDIR=build J=1 + - MAN=yes J=4 + - MINIMAL=yes J=4 before_script: - - rm -vrf * .git - wget https://raw.githubusercontent.com/votca/buildutil/master/build.sh && chmod 755 build.sh - - if [[ $TEST = *cma* ]]; then wget http://www.lri.fr/~hansen/cma.py; fi #we set PYTHONPATH="$PWD" below + - mkdir -p "$HOME/votca/src" "$HOME/votca/share/votca/scripts/inverse" "$HOME/bin" + - wget -O "$HOME/votca/share/votca/scripts/inverse/cma.py" http://www.lri.fr/~hansen/cma.py + - ln -s /usr/bin/ccache "$HOME/bin/clang++" + - ln -s /usr/bin/ccache "$HOME/bin/clang" script: - - PYTHONPATH="$PWD" ./build.sh -Wdu --prefix $PWD ${MAN:+--devdoc} + - PATH="$HOME/bin:/usr/lib/ccache:$PATH" ./build.sh -Wu --prefix "$HOME/votca" ${MAN:+--devdoc} ${TEST:+--runtest=$TEST} ${WERROR:+--warn-to-errors} ${MINIMAL:+--minimal} ${J:+-j$J} ${BDIR:+--builddir=$BDIR} ${NINJA:+--ninja} ${WALL:+--Wall} + --directory "$HOME/votca/src" --no-clean --depth 1 --gmx-release 4.6.7 tools ${GROMACS:+gromacs} csg csgapps ${MAN:+csg-manual} ${TEST:+csg-tutorials} - ${CTP:+kmc moo ctp} + ${CTP:+kmc moo ctp} ${GROMACS:+-DGMX_USE_RDTSCP=OFF} ${GROMACS:+-DGROMACS_PKG_OVERWRITE=libgmx} + +cache: + directories: + - $HOME/.ccache compiler: - clang diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/csgapps-1.3_rc1/CMakeLists.txt new/csgapps-1.3/CMakeLists.txt --- old/csgapps-1.3_rc1/CMakeLists.txt 2015-09-23 19:47:00.000000000 +0200 +++ new/csgapps-1.3/CMakeLists.txt 2016-01-15 22:49:07.000000000 +0100 @@ -2,7 +2,7 @@ project(csgapps) -set(PROJECT_VERSION "1.3_rc1") +set(PROJECT_VERSION "1.3") set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules)

1 0

commit votca-tools for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package votca-tools for openSUSE:Factory checked in at 2016-01-21 23:43:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/votca-tools (Old) and /work/SRC/openSUSE:Factory/.votca-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "votca-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/votca-tools/votca-tools.changes 2015-10-20 00:05:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.votca-tools.new/votca-tools.changes 2016-01-22 01:09:31.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Jan 15 22:45:01 UTC 2016 - junghans(a)votca.org + +- Upgrade to 1.3 + * details: https://github.com/votca/csg/blob/master/CHANGELOG.md + +------------------------------------------------------------------- Old: ---- votca-tools-1.3_rc1.tar.gz New: ---- votca-tools-1.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ votca-tools.spec ++++++ --- /var/tmp/diff_new_pack.SDxLQm/_old 2016-01-22 01:09:34.000000000 +0100 +++ /var/tmp/diff_new_pack.SDxLQm/_new 2016-01-22 01:09:34.000000000 +0100 @@ -1,7 +1,7 @@ # # votca_tools.spec # -# Copyright (c) 2013-2015 Christoph Junghans <junghans(a)votca.org> +# Copyright (c) 2013-2016 Christoph Junghans <junghans(a)votca.org> # # Originally written by Jussi Lehtola <jussilehtola(a)fedoraproject.org> # Fixed for multi-distro build by Klaus Kaempf <kkaempf(a)suse.de> @@ -10,14 +10,13 @@ # Name: votca-tools -Version: 1.3~rc1 -%define uversion 1.3_rc1 +Version: 1.3 Release: 0 Summary: VOTCA tools library Group: Productivity/Scientific/Chemistry License: Apache-2.0 URL: http://www.votca.org -Source0: https://github.com/votca/tools/archive/v%{uversion}.tar.gz#/%{name}-%{uvers… +Source0: https://github.com/votca/tools/archive/v%{version}.tar.gz#/%{name}-%{versio… BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -55,7 +54,7 @@ %package devel Summary: Development headers and libraries for votca-tools Group: Development/Libraries/C and C++ -Requires: libvotca_tools3 = %{version}-%{release} +Requires: libvotca_tools3 = %{version} %description devel Versatile Object-oriented Toolkit for Coarse-graining Applications (VOTCA) is @@ -65,7 +64,7 @@ This package contains development headers and libraries for votca-tools. %prep -%setup -n tools-%{uversion} -q +%setup -n tools-%{version} -q %build %if %{defined fedora} ++++++ votca-tools-1.3_rc1.tar.gz -> votca-tools-1.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tools-1.3_rc1/.travis.yml new/tools-1.3/.travis.yml --- old/tools-1.3_rc1/.travis.yml 2015-09-23 19:46:08.000000000 +0200 +++ new/tools-1.3/.travis.yml 2016-01-15 22:48:59.000000000 +0100 @@ -4,71 +4,86 @@ language: cpp -before_install: - - if [[ $CTP = yes ]]; then sudo add-apt-repository -y ppa:boost-latest/ppa; fi #newer boost for libboost_timer - - sudo apt-get update - - sudo apt-get install cmake libfftw3-dev libgsl0-dev txt2tags libboost-program-options-dev libboost-filesystem-dev libboost-system-dev libexpat1-dev libsqlite3-dev pkg-config mercurial - - if [[ $MAN ]]; then sudo apt-get install pgf texlive-fonts-recommended texlive-latex-extra doxygen graphviz; fi - - if [[ $TEST = *cma* ]]; then sudo apt-get install python-numpy gnuplot-nox; fi - - if [[ $TEST = *imc ]]; then sudo apt-get install octave; fi - - if [[ $TEST = *simplex* ]]; then sudo apt-get install gnuplot-nox; fi - - if [[ $TEST = *realtime ]]; then sudo apt-get install gnuplot-nox; fi - - if [[ $GROMACS != yes ]]; then sudo apt-get install gromacs-dev; fi - - if [[ $CTP = yes ]]; then sudo apt-get install libboost1.48-all-dev; fi - -env: #NINJA=1 is currently not support by Travis' cmake, enable when >=2.8.9 - - WERROR=yes J=4 #J>4 triggers an internal compiler in travis' g++ - - CTP=yes WERROR=yes J=4 - - CTP=yes WALL=yes J=4 - - J=1 - - BDIR=build J=4 - - BDIR=build J=1 - - MAN=yes J=4 - - MINIMAL=yes J=4 - - CSG_MDRUN_STEPS=500 TEST=hexane/ibi_bonded J=4 - - CSG_MDRUN_STEPS=500 TEST=hexane/ibi J=4 - - CSG_MDRUN_STEPS=500 TEST=methanol/ibi J=4 - - CSG_MDRUN_STEPS=10000 TEST=methanol/imc J=4 - - CSG_MDRUN_STEPS=5000 TEST=methanol-water/X_0.938/re J=4 - - CSG_MDRUN_STEPS=500 TEST=methanol-water/X_0.938/simplex J=4 - - CSG_MDRUN_STEPS=5000 TEST=methanol-water/X_0.062/re J=4 - - CSG_MDRUN_STEPS=500 TEST=methanol-water/X_0.062/simplex J=4 - - CSG_MDRUN_STEPS=5000 TEST=methanol-water/X_0.5/re J=4 - - CSG_MDRUN_STEPS=500 TEST=methanol-water/X_0.5/simplex J=4 - - CSG_MDRUN_STEPS=500 TEST=propane/ibi J=4 - - CSG_MDRUN_STEPS=10000 TEST=propane/imc J=4 - - CSG_MDRUN_STEPS=500 TEST=spce/cma/density J=4 - - CSG_MDRUN_STEPS=500 TEST=spce/cma/simple J=4 GROMACS=yes - - CSG_MDRUN_STEPS=500 TEST=spce/ibi J=4 - - CSG_MDRUN_STEPS=500 TEST=spce/ibi_pressure J=4 - - CSG_MDRUN_STEPS=10000 TEST=spce/imc J=4 - - CSG_MDRUN_STEPS=10000 TEST=spce/realtime J=4 - - CSG_MDRUN_STEPS=5000 TEST=spce/re J=4 - - CSG_MDRUN_STEPS=500 TEST=spce/simplex/density J=4 - - CSG_MDRUN_STEPS=500 TEST=spce/simplex/pressure J=4 - - CSG_MDRUN_STEPS=500 TEST=spce/simplex/simple J=4 - - CSG_MDRUN_STEPS=500 TEST=spce/tf J=4 GROMACS=yes - - CSG_MDRUN_STEPS=500 TEST=urea-water/ibi J=4 - - CSG_MDRUN_STEPS=500 TEST=urea-water/kb-ibi J=4 - -matrix: - exclude: - - compiler: clang - env: J=1 #this test just tests the buildsystem - - compiler: clang - env: BDIR=build J=1 #just tests the buildsystem +sudo: false + +addons: + apt: + sources: boost-latest + packages: + - cmake + - ccache + - libfftw3-dev + - libgsl0-dev + - txt2tags + - libboost1.55-all-dev + - libexpat1-dev + - libsqlite3-dev + - pkg-config + - pgf + - texlive-fonts-recommended + - texlive-latex-extra + - doxygen + - graphviz + - python-numpy + - gnuplot-nox + - octave + - gromacs-dev + +env: + global: + - GMX_MAX_THREADS=8 + - CCACHE_CPP2=yes + matrix: #NINJA=1 is currently not support by Travis' cmake, enable when >=2.8.9 + - WERROR=yes J=4 #J>4 triggers an internal compiler in travis' g++ + - J=1 + - BDIR=build J=4 + - BDIR=build J=1 + - MAN=yes J=4 + - MINIMAL=yes J=4 + - CSG_MDRUN_STEPS=500 TEST=hexane/ibi_bonded J=4 + - CSG_MDRUN_STEPS=500 TEST=hexane/ibi J=4 + - CSG_MDRUN_STEPS=500 TEST=methanol/ibi J=4 + - CSG_MDRUN_STEPS=10000 TEST=methanol/imc J=4 + - CSG_MDRUN_STEPS=5000 TEST=methanol-water/X_0.938/re J=4 + - CSG_MDRUN_STEPS=500 TEST=methanol-water/X_0.938/simplex J=4 + - CSG_MDRUN_STEPS=5000 TEST=methanol-water/X_0.062/re J=4 + - CSG_MDRUN_STEPS=500 TEST=methanol-water/X_0.062/simplex J=4 + - CSG_MDRUN_STEPS=5000 TEST=methanol-water/X_0.5/re J=4 + - CSG_MDRUN_STEPS=500 TEST=methanol-water/X_0.5/simplex J=4 + - CSG_MDRUN_STEPS=500 TEST=propane/ibi J=4 + - CSG_MDRUN_STEPS=10000 TEST=propane/imc J=4 + - CSG_MDRUN_STEPS=500 TEST=spce/cma/density J=4 + - CSG_MDRUN_STEPS=500 TEST=spce/cma/simple J=4 GROMACS=yes + - CSG_MDRUN_STEPS=500 TEST=spce/ibi J=4 + - CSG_MDRUN_STEPS=500 TEST=spce/ibi_pressure J=4 + - CSG_MDRUN_STEPS=10000 TEST=spce/imc J=4 + - CSG_MDRUN_STEPS=10000 TEST=spce/realtime J=4 + - CSG_MDRUN_STEPS=5000 TEST=spce/re J=4 + - CSG_MDRUN_STEPS=500 TEST=spce/simplex/density J=4 + - CSG_MDRUN_STEPS=500 TEST=spce/simplex/pressure J=4 + - CSG_MDRUN_STEPS=500 TEST=spce/simplex/simple J=4 + - CSG_MDRUN_STEPS=500 TEST=spce/tf J=4 GROMACS=yes + - CSG_MDRUN_STEPS=500 TEST=urea-water/ibi J=4 + - CSG_MDRUN_STEPS=500 TEST=urea-water/kb-ibi J=4 before_script: - - rm -vrf * .git - wget https://raw.githubusercontent.com/votca/buildutil/master/build.sh && chmod 755 build.sh - - if [[ $TEST = *cma* ]]; then wget http://www.lri.fr/~hansen/cma.py; fi #we set PYTHONPATH="$PWD" below + - mkdir -p "$HOME/votca/src" "$HOME/votca/share/votca/scripts/inverse" "$HOME/bin" + - wget -O "$HOME/votca/share/votca/scripts/inverse/cma.py" http://www.lri.fr/~hansen/cma.py + - ln -s /usr/bin/ccache "$HOME/bin/clang++" + - ln -s /usr/bin/ccache "$HOME/bin/clang" script: - - PYTHONPATH="$PWD" ./build.sh -Wdu --prefix $PWD ${MAN:+--devdoc} + - PATH="$HOME/bin:/usr/lib/ccache:$PATH" ./build.sh -Wu --prefix "$HOME/votca" ${MAN:+--devdoc} ${TEST:+--runtest=$TEST} ${WERROR:+--warn-to-errors} ${MINIMAL:+--minimal} ${J:+-j$J} ${BDIR:+--builddir=$BDIR} ${NINJA:+--ninja} ${WALL:+--Wall} + --directory "$HOME/votca/src" --no-clean --depth 1 --gmx-release 4.6.7 tools ${GROMACS:+gromacs} csg csgapps ${MAN:+csg-manual} ${TEST:+csg-tutorials} - ${CTP:+kmc moo ctp} + ${CTP:+kmc moo ctp} ${GROMACS:+-DGMX_USE_RDTSCP=OFF} ${GROMACS:+-DGROMACS_PKG_OVERWRITE=libgmx} + +cache: + directories: + - $HOME/.ccache compiler: - clang diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tools-1.3_rc1/CMakeLists.txt new/tools-1.3/CMakeLists.txt --- old/tools-1.3_rc1/CMakeLists.txt 2015-09-23 19:46:08.000000000 +0200 +++ new/tools-1.3/CMakeLists.txt 2016-01-15 22:48:59.000000000 +0100 @@ -2,7 +2,7 @@ project(votca-tools) -set(PROJECT_VERSION "1.3_rc1") +set(PROJECT_VERSION "1.3") string(REGEX REPLACE "^[1-9]+\\.([1-9]+).*$" "\\1" SOVERSION "${PROJECT_VERSION}") if (NOT ${SOVERSION} MATCHES "[1-9]+") message(FATAL_ERROR "Could not determind SOVERSION from ${PROJECT_VERSION}")

1 0

commit mate-menu for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package mate-menu for openSUSE:Factory checked in at 2016-01-21 23:43:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-menu (Old) and /work/SRC/openSUSE:Factory/.mate-menu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mate-menu" Changes: -------- --- /work/SRC/openSUSE:Factory/mate-menu/mate-menu.changes 2016-01-13 22:46:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mate-menu.new/mate-menu.changes 2016-01-22 01:09:29.000000000 +0100 @@ -1,0 +2,14 @@ +Mon Jan 18 14:08:33 UTC 2016 - sor.alexei(a)meowr.ru + +- Update to 5.6.7: + * Fix intends in mate-menu execute.py. + * Do not use mate-folder.png that doesn't exist in freedesktop + specification. + * Fix configurator crash due to changes in Gtk 2.24.29. + * Do not crash if lsb_release is not available (boo#959024). +- Remove 0001-execute-fix.patch, 0001-recent-icon.patch, + 0003-fix-configurator-crash.patch: fixed upstream. +- Add 0001-fix-path-find.patch. +- Only recommend lsb-release. + +------------------------------------------------------------------- Old: ---- 0001-execute-fix.patch 0001-recent-icon.patch 0003-fix-configurator-crash.patch mate-menu-5.6.6.tar.gz New: ---- 0001-fix-path-find.patch mate-menu-5.6.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-menu.spec ++++++ --- /var/tmp/diff_new_pack.QFVbAc/_old 2016-01-22 01:09:31.000000000 +0100 +++ /var/tmp/diff_new_pack.QFVbAc/_new 2016-01-22 01:09:31.000000000 +0100 @@ -17,25 +17,21 @@ %define _name mate_menu -%define _rev 37bbd306cb0c +%define _rev cb3ee3ec1f8e Name: mate-menu -Version: 5.6.6 +Version: 5.6.7 Release: 0 Summary: Advanced MATE menu License: GPL-2.0+ Group: System/GUI/Other -Url: https://bitbucket.org/ubuntu-mate/mate-tweak +Url: https://bitbucket.org/ubuntu-mate/mate-menu Source: https://bitbucket.org/ubuntu-mate/%{name}/get/%{version}.tar.gz#/%{name}-%{… -# PATCH-FIX-UPSTREAM 0001-execute-fix.patch p.drouand(a)gmail.com -- Fix intends in mate-menu execute.py. -Patch0: 0001-execute-fix.patch -# PATCH-FIX-UPSTREAM 0001-recent-icon.patch p.drouand(a)gmail.com -- mate-folder.png icon doesn't exist in icon themes, use folder.png. -Patch1: 0001-recent-icon.patch +# PATCH-FIX-UPSTREAM 0001-fix-path-find.patch sor.alexei(a)meowr.ru +Patch0: 0001-fix-path-find.patch # PATCH-FIX-OPENSUSE 0002-xterm-no-symlink-dep.patch sor.alexei(a)meowr.ru -- Remove dependency on x-terminal-emulator Debian's symlink. -Patch2: 0002-xterm-no-symlink-dep.patch +Patch1: 0002-xterm-no-symlink-dep.patch # PATCH-FEATURE-OPENSUSE 0002-yast2-software.patch sor.alexei(a)meowr.ru -- Use YaST2 and GNOME PackageKit package managers. -Patch3: 0002-yast2-software.patch -# PATCH-FIX-UPSTREAM 0003-fix-configurator-crash.patch sor.alexei(a)meowr.ru -- Fix crash in mate-menu configurator. -Patch4: 0003-fix-configurator-crash.patch +Patch2: 0002-yast2-software.patch BuildRequires: gobject-introspection-devel BuildRequires: intltool BuildRequires: python >= 2.4 @@ -46,7 +42,6 @@ Requires: gvfs Requires: libmate-desktop-2-17 Requires: libmate-panel-applet-4-1 -Requires: lsb-release Requires: mate-menus Requires: mozo Requires: python-configobj @@ -56,6 +51,7 @@ Requires: python-xlib Requires: xdg-utils Recommends: %{name}-lang +Recommends: lsb-release BuildArch: noarch %glib2_gsettings_schema_requires @@ -74,8 +70,6 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 sed -i 's/su-to-root/xdg-su/g' %{_name}/execute.py %build ++++++ 0001-fix-path-find.patch ++++++ diff -paur a/lib/mate-menu.py b/lib/mate-menu.py --- a/lib/mate-menu.py 2016-01-18 16:59:19.000000000 +0300 +++ b/lib/mate-menu.py 2016-01-19 12:52:23.395199920 +0300 @@ -73,19 +73,6 @@ xdg.Config.setWindowManager('MATE') from mate_menu.execute import * -def find_on_path(self, command): - """Is command on the executable search path?""" - if 'PATH' not in os.environ: - return False - path = os.environ['PATH'] - for element in path.split(os.pathsep): - if not element: - continue - filename = os.path.join(element, command) - if os.path.isfile(filename) and os.access(filename, os.X_OK): - return True - return False - class MainWindow( object ): """This is the main class for the application""" @@ -576,12 +563,14 @@ class MenuWin( object ): def createPanelButton( self ): self.button_icon = Gtk.Image.new_from_file( self.buttonIcon ) self.systemlabel = Gtk.Label(label= "%s " % self.buttonText ) - if find_on_path('lsb_release'): + try: process = subprocess.Popen(['lsb_release', '-d'], stdout=subprocess.PIPE) out, err = process.communicate() tooltip = out.replace('Description:', '').strip() self.systemlabel.set_tooltip_text(tooltip) self.button_icon.set_tooltip_text(tooltip) + except FileNotFoundError: + pass if self.applet.get_orient() == MatePanelApplet.AppletOrient.UP or self.applet.get_orient() == MatePanelApplet.AppletOrient.DOWN: self.button_box = Gtk.HBox() ++++++ mate-menu-5.6.6.tar.gz -> mate-menu-5.6.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-menu-37bbd306cb0c/lib/mate-menu-config.py new/ubuntu-mate-mate-menu-cb3ee3ec1f8e/lib/mate-menu-config.py --- old/ubuntu-mate-mate-menu-37bbd306cb0c/lib/mate-menu-config.py 2015-12-15 00:47:17.000000000 +0100 +++ new/ubuntu-mate-mate-menu-cb3ee3ec1f8e/lib/mate-menu-config.py 2016-01-18 14:59:19.000000000 +0100 @@ -383,18 +383,27 @@ self.headingColorLabel.set_sensitive( widget.get_active() ) def getBackgroundColor( self ): - color = Gdk.Color(0,0,0) - self.backgroundColor.get_color(color) + try: + color = self.backgroundColor.get_color() + except TypeError: + color = Gdk.Color(0, 0, 0) + self.backgroundColor.get_color(color) return self.gdkColorToString( color ) def getBorderColor( self ): - color = Gdk.Color(0,0,0) - self.borderColor.get_color(color) + try: + color = self.borderColor.get_color() + except TypeError: + color = Gdk.Color(0, 0, 0) + self.borderColor.get_color(color) return self.gdkColorToString( color ) def getHeadingColor( self ): - color = Gdk.Color(0,0,0) - self.headingColor.get_color(color) + try: + color = self.borderColor.get_color() + except TypeError: + color = Gdk.Color(0, 0, 0) + self.borderColor.get_color(color) return self.gdkColorToString( color ) def gdkColorToString( self, gdkColor ): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-menu-37bbd306cb0c/lib/mate-menu.py new/ubuntu-mate-mate-menu-cb3ee3ec1f8e/lib/mate-menu.py --- old/ubuntu-mate-mate-menu-37bbd306cb0c/lib/mate-menu.py 2015-12-15 00:47:17.000000000 +0100 +++ new/ubuntu-mate-mate-menu-cb3ee3ec1f8e/lib/mate-menu.py 2016-01-18 14:59:19.000000000 +0100 @@ -19,7 +19,7 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__='5.6.6' +__VERSION__='5.6.7' import ctypes import gc @@ -73,6 +73,19 @@ from mate_menu.execute import * +def find_on_path(self, command): + """Is command on the executable search path?""" + if 'PATH' not in os.environ: + return False + path = os.environ['PATH'] + for element in path.split(os.pathsep): + if not element: + continue + filename = os.path.join(element, command) + if os.path.isfile(filename) and os.access(filename, os.X_OK): + return True + return False + class MainWindow( object ): """This is the main class for the application""" @@ -563,11 +576,13 @@ def createPanelButton( self ): self.button_icon = Gtk.Image.new_from_file( self.buttonIcon ) self.systemlabel = Gtk.Label(label= "%s " % self.buttonText ) - process = subprocess.Popen(['lsb_release', '-d'], stdout=subprocess.PIPE) - out, err = process.communicate() - tooltip = out.replace('Description:', '').strip() - self.systemlabel.set_tooltip_text(tooltip) - self.button_icon.set_tooltip_text(tooltip) + if find_on_path('lsb_release'): + process = subprocess.Popen(['lsb_release', '-d'], stdout=subprocess.PIPE) + out, err = process.communicate() + tooltip = out.replace('Description:', '').strip() + self.systemlabel.set_tooltip_text(tooltip) + self.button_icon.set_tooltip_text(tooltip) + if self.applet.get_orient() == MatePanelApplet.AppletOrient.UP or self.applet.get_orient() == MatePanelApplet.AppletOrient.DOWN: self.button_box = Gtk.HBox() self.button_box.pack_start( self.button_icon, False, False, 0 ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-menu-37bbd306cb0c/mate_menu/execute.py new/ubuntu-mate-mate-menu-cb3ee3ec1f8e/mate_menu/execute.py --- old/ubuntu-mate-mate-menu-37bbd306cb0c/mate_menu/execute.py 2015-12-15 00:47:17.000000000 +0100 +++ new/ubuntu-mate-mate-menu-cb3ee3ec1f8e/mate_menu/execute.py 2016-01-18 14:59:19.000000000 +0100 @@ -50,7 +50,7 @@ except Exception, detail: print detail return False - cmd = cmd.split() + cmd = cmd.split() cmd = RemoveArgs(cmd) try: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-menu-37bbd306cb0c/mate_menu/plugins/applications.py new/ubuntu-mate-mate-menu-cb3ee3ec1f8e/mate_menu/plugins/applications.py --- old/ubuntu-mate-mate-menu-37bbd306cb0c/mate_menu/plugins/applications.py 2015-12-15 00:47:17.000000000 +0100 +++ new/ubuntu-mate-mate-menu-cb3ee3ec1f8e/mate_menu/plugins/applications.py 2016-01-18 14:59:19.000000000 +0100 @@ -879,6 +879,7 @@ startupMenuItem.connect( "toggled", self.onAddToStartup, widget ) self.mateMenuWin.stopHiding() + gtk.gtk_menu_popup.argtypes = [c_void_p, c_void_p, c_void_p, c_void_p, c_void_p, c_uint, c_uint] gtk.gtk_menu_popup(hash(mTree), None, None, None, None, event.button, event.time) def searchPopup( self, widget=None, event=None ): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-menu-37bbd306cb0c/mate_menu/plugins/recent.py new/ubuntu-mate-mate-menu-cb3ee3ec1f8e/mate_menu/plugins/recent.py --- old/ubuntu-mate-mate-menu-37bbd306cb0c/mate_menu/plugins/recent.py 2015-12-15 00:47:17.000000000 +0100 +++ new/ubuntu-mate-mate-menu-cb3ee3ec1f8e/mate_menu/plugins/recent.py 2016-01-18 14:59:19.000000000 +0100 @@ -57,7 +57,7 @@ self.width = 250 #Plugin icon - self.icon = 'mate-folder.png' + self.icon = 'folder.png' self.settings = EasyGSettings ("org.mate.mate-menu.plugins.recent")

1 0

commit ima-evm-utils for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package ima-evm-utils for openSUSE:Factory checked in at 2016-01-21 23:43:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ima-evm-utils (Old) and /work/SRC/openSUSE:Factory/.ima-evm-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ima-evm-utils" Changes: -------- --- /work/SRC/openSUSE:Factory/ima-evm-utils/ima-evm-utils.changes 2015-12-03 13:32:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ima-evm-utils.new/ima-evm-utils.changes 2016-01-22 01:09:26.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Jan 19 09:32:33 UTC 2016 - meissner(a)suse.com + +- ima-evm-utils-fix-docbook-xsl-directory.patch: + fixed the nwalsh docbook directory again + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ima-evm-utils.spec ++++++ --- /var/tmp/diff_new_pack.aleDP7/_old 2016-01-22 01:09:29.000000000 +0100 +++ /var/tmp/diff_new_pack.aleDP7/_new 2016-01-22 01:09:29.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ima-evm-utils # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define sover 0 %define libname libimaevm%{sover} ++++++ ima-evm-utils-fix-docbook-xsl-directory.patch ++++++ --- /var/tmp/diff_new_pack.aleDP7/_old 2016-01-22 01:09:29.000000000 +0100 +++ /var/tmp/diff_new_pack.aleDP7/_new 2016-01-22 01:09:29.000000000 +0100 @@ -1,12 +1,13 @@ ---- a/Makefile.am.orig 2014-09-23 14:09:05.000000000 +0200 -+++ b/Makefile.am 2015-01-21 18:00:23.762694050 +0100 -@@ -24,7 +24,7 @@ +Index: ima-evm-utils-1.0/Makefile.am +=================================================================== +--- ima-evm-utils-1.0.orig/Makefile.am ++++ ima-evm-utils-1.0/Makefile.am +@@ -24,7 +24,7 @@ rpm: $(tarname) rpmbuild -ba --nodeps $(SPEC) # requires asciidoc, xslproc, docbook-xsl -MANPAGE_DOCBOOK_XSL = /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl -+MANPAGE_DOCBOOK_XSL = /usr/share/xml/docbook/stylesheet/nwalsh/1.78.1/manpages/docbook.xsl ++MANPAGE_DOCBOOK_XSL = /usr/share/xml/docbook/stylesheet/nwalsh/1.79.0/manpages/docbook.xsl evmctl.1.html: README @asciidoc -o $@ $< -

1 0

commit openlmi-networking for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package openlmi-networking for openSUSE:Factory checked in at 2016-01-21 23:43:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openlmi-networking (Old) and /work/SRC/openSUSE:Factory/.openlmi-networking.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openlmi-networking" Changes: -------- --- /work/SRC/openSUSE:Factory/openlmi-networking/openlmi-networking.changes 2015-03-25 10:01:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openlmi-networking.new/openlmi-networking.changes 2016-01-22 01:09:25.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Jan 19 09:12:49 UTC 2016 - kkaempf(a)suse.com + +- NetworkManager changed include directory layout + 0001-Adapt-to-new-NetworkManager-include-directory-layout.patch + +------------------------------------------------------------------- New: ---- 0001-Adapt-to-new-NetworkManager-include-directory-layout.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openlmi-networking.spec ++++++ --- /var/tmp/diff_new_pack.4VK8FB/_old 2016-01-22 01:09:26.000000000 +0100 +++ /var/tmp/diff_new_pack.4VK8FB/_new 2016-01-22 01:09:26.000000000 +0100 @@ -35,6 +35,9 @@ # PATCH-FIX-UPSTREAM cim-schema 2.40.0 adds new interfaces Patch4: AddIPProtocolEndpoint_RemoveIPProtocolEndpoint.patch +# PATCH-FIX-OPENSUSE +Patch5: 0001-Adapt-to-new-NetworkManager-include-directory-layout.patch + # Upstream name has been changed from cura-networking to openlmi-networking Provides: cura-networking%{?_isa} = %{version}-%{release} Obsoletes: cura-networking < 0.0.5-1 @@ -78,6 +81,7 @@ %patch2 -p1 %endif %patch4 -p1 +%patch5 -p1 %build %cmake ++++++ 0001-Adapt-to-new-NetworkManager-include-directory-layout.patch ++++++ >From c5ed50ef195391c14f869af04c7200d23b170c99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf(a)suse.de> Date: Tue, 19 Jan 2016 10:10:11 +0100 Subject: [PATCH] Adapt to new NetworkManager include directory layout Latest NetworkManager seems to have moved include files from /usr/include to /usr/include/NetworkManager. --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9b3f8c4be731..a654437e8011 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -46,7 +46,7 @@ add_library(${LIBRARY_NAME} SHARED include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMPI_INCLUDE_DIR} ${KONKRETCMPI_INCLUDE_DIR} ${DBUSGLIB_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS} - ${NM_INCLUDE_DIR} ${UUID_INCLUDE_DIR} ${OPENLMI_INCLUDE_DIR} + ${NM_INCLUDE_DIRS} ${UUID_INCLUDE_DIR} ${OPENLMI_INCLUDE_DIR} ) target_link_libraries(${LIBRARY_NAME} ${KONKRETCMPI_LIBRARIES} ${DBUSGLIB_LIBRARIES} -- 2.7.0

1 0

commit crmsh for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2016-01-21 23:43:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crmsh (Old) and /work/SRC/openSUSE:Factory/.crmsh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "crmsh" Changes: -------- --- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2015-12-09 22:14:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2016-01-22 01:09:21.000000000 +0100 @@ -1,0 +2,19 @@ +Fri Jan 15 16:13:32 UTC 2016 - kgronlund(a)suse.com + +- Update to version 2.2.0+git.1452874360.0988ac4: + + Release 2.2.0 + + low: don't use deprecated crm_attribute -U option + + high: cibconfig: Fix XML import bug for cloned groups (bsc#959895) + + medium: ui_cib: Call crm_shadow in batch mode to avoid spawning subshell (bsc#961392) + + high: cibconfig: fail if new object already exists (bsc#959965) + + high: cibconfig: Preserve failure through edit (bsc#959965) + + low: hb_report: Drop function from event patterns + + medium: ui_history: Add events command (bsc#952449) + + medium: scripts: Reformat scripts to simplified form + + medium: scripts: Load single file yml scripts + + low: clidisplay: Avoid crash when colorizing None + + medium: cibconfig: Detect false container children + + medium: history: Ignore central log + + medium: history: Fix live report refresh (bsc#950422) (bsc#927414) + +------------------------------------------------------------------- Old: ---- crmsh-2.2.0~rc3+git.1449475283.649c9d2.tar.bz2 New: ---- crmsh-2.2.0+git.1452874360.0988ac4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crmsh.spec ++++++ --- /var/tmp/diff_new_pack.siH12D/_old 2016-01-22 01:09:24.000000000 +0100 +++ /var/tmp/diff_new_pack.siH12D/_new 2016-01-22 01:09:24.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package crmsh # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -36,7 +36,7 @@ Summary: High Availability cluster command-line interface License: GPL-2.0+ Group: %{pkg_group} -Version: 2.2.0~rc3+git.1449475283.649c9d2 +Version: 2.2.0+git.1452874360.0988ac4 Release: 0 Url: http://crmsh.github.io Source0: %{name}-%{version}.tar.bz2 @@ -196,8 +196,7 @@ %defattr(-,root,root) %{_sbindir}/crm -%{python_sitelib}/crmsh -%{python_sitelib}/crmsh*.egg-info +%{python_sitelib}/crmsh* %{_datadir}/%{name} %exclude %{_datadir}/%{name}/tests ++++++ _service ++++++ --- /var/tmp/diff_new_pack.siH12D/_old 2016-01-22 01:09:24.000000000 +0100 +++ /var/tmp/diff_new_pack.siH12D/_new 2016-01-22 01:09:24.000000000 +0100 @@ -3,7 +3,7 @@ <param name="url">git://github.com/ClusterLabs/crmsh.git</param> <param name="scm">git</param> <param name="filename">crmsh</param> - <param name="versionformat">2.2.0~rc3+git.%ct.%h</param> + <param name="versionformat">2.2.0+git.%ct.%h</param> <param name="revision">master</param> <param name="changesgenerate">enable</param> </service> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.siH12D/_old 2016-01-22 01:09:24.000000000 +0100 +++ /var/tmp/diff_new_pack.siH12D/_new 2016-01-22 01:09:24.000000000 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/ClusterLabs/crmsh.git</param> - <param name="changesrevision">649c9d2f0f4a178adadc74f084e565e7f16ee7af</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">0988ac4d1d2b42a705640bd946f3eb9420258d65</param></service></servicedata> \ No newline at end of file ++++++ crmsh-2.2.0~rc3+git.1449475283.649c9d2.tar.bz2 -> crmsh-2.2.0+git.1452874360.0988ac4.tar.bz2 ++++++ ++++ 8213 lines of diff (skipped)

1 0

commit uhd for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package uhd for openSUSE:Factory checked in at 2016-01-21 23:43:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/uhd (Old) and /work/SRC/openSUSE:Factory/.uhd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "uhd" Changes: -------- --- /work/SRC/openSUSE:Factory/uhd/uhd.changes 2016-01-01 19:50:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.uhd.new/uhd.changes 2016-01-22 01:09:17.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Dec 31 10:22:49 UTC 2015 - wk(a)ire.pw.edu.pl + +- Update sources to version 3.9.2 +- Drop 0003-uhd-C-API-wrapper-fix-commit-30f87afcba71a07.patch: + included upstream + +------------------------------------------------------------------- Old: ---- 0003-uhd-C-API-wrapper-fix-commit-30f87afcba71a07.patch uhd-3.9.1.tar.gz uhd-images_003.009.001-release.tar.gz New: ---- uhd-3.9.2.tar.gz uhd-images_003.009.002-release.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ uhd.spec ++++++ --- /var/tmp/diff_new_pack.3jtHV4/_old 2016-01-22 01:09:20.000000000 +0100 +++ /var/tmp/diff_new_pack.3jtHV4/_new 2016-01-22 01:09:20.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package uhd # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -18,17 +18,16 @@ Name: uhd %define libname libuhd003 -Version: 3.9.1 +Version: 3.9.2 Release: 0 -%define src_ver 003.009.001 -%define img_ver 003.009.001 +%define src_ver 003.009.002 +%define img_ver 003.009.002 Summary: The driver for USRP SDR boards License: GPL-3.0+ Group: Hardware/Other Url: http://ettus-apps.sourcerepo.com/redmine/ettus/projects/uhd/wiki Source0: http://files.ettus.com/binaries/uhd_stable/uhd_%{src_ver}-release/uhd-%{ver… Source1: http://files.ettus.com/binaries/images/uhd-images_%{img_ver}-release.tar.gz -Patch0: 0003-uhd-C-API-wrapper-fix-commit-30f87afcba71a07.patch BuildRequires: boost-devel >= 1.36 BuildRequires: cmake >= 2.6 BuildRequires: docutils @@ -110,7 +109,6 @@ %prep %setup -q -%patch0 -p2 # remove buildtime from documentation echo "HTML_TIMESTAMP = NO" >> docs/Doxyfile.in ++++++ uhd-3.9.1.tar.gz -> uhd-3.9.2.tar.gz ++++++ ++++ 4855 lines of diff (skipped) ++++++ uhd-images_003.009.001-release.tar.gz -> uhd-images_003.009.002-release.tar.gz ++++++ /work/SRC/openSUSE:Factory/uhd/uhd-images_003.009.001-release.tar.gz /work/SRC/openSUSE:Factory/.uhd.new/uhd-images_003.009.002-release.tar.gz differ: char 5, line 1

1 0

commit virt-manager for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package virt-manager for openSUSE:Factory checked in at 2016-01-21 23:43:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-manager (Old) and /work/SRC/openSUSE:Factory/.virt-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "virt-manager" Changes: -------- --- /work/SRC/openSUSE:Factory/virt-manager/virt-manager.changes 2016-01-08 15:23:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.virt-manager.new/virt-manager.changes 2016-01-22 01:09:12.000000000 +0100 @@ -1,0 +2,19 @@ +Mon Jan 18 13:43:47 MST 2016 - carnold(a)suse.com + +- bsc#962221 - virt-install: 'NoneType' object has no attribute + 'isdigit' + eae7dc06-fix-URL-installs-when-content-length-header-missing.patch + +------------------------------------------------------------------- +Fri Jan 8 11:50:46 MST 2016 - carnold(a)suse.com + +- bsc#960828 - Unable to create qcow2 volumes on remote KVM with + virt-manager + virtinst-vol-default-nocow.patch +- bsc#960724 - virt-manager fails to create Virtual machines on a + CentOS7 host + virtinst-set-qemu-emulator.patch +- Upstream bug fix + 89c3638b-fix-detection-that-libvirtd-is-stopped.patch + +------------------------------------------------------------------- New: ---- 89c3638b-fix-detection-that-libvirtd-is-stopped.patch eae7dc06-fix-URL-installs-when-content-length-header-missing.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-manager.spec ++++++ --- /var/tmp/diff_new_pack.30hdX0/_old 2016-01-22 01:09:15.000000000 +0100 +++ /var/tmp/diff_new_pack.30hdX0/_new 2016-01-22 01:09:15.000000000 +0100 @@ -37,6 +37,8 @@ Source1: virt-install.rb Source2: virt-install.desktop # Upstream Patches +Patch1: 89c3638b-fix-detection-that-libvirtd-is-stopped.patch +Patch2: eae7dc06-fix-URL-installs-when-content-length-header-missing.patch # SUSE Only Patch70: virtman-desktop.patch Patch71: virtman-kvm.patch @@ -157,6 +159,8 @@ %prep %setup -q # Upstream Patches +%patch1 -p1 +%patch2 -p1 # SUSE Only %patch70 -p1 %patch71 -p1 ++++++ 89c3638b-fix-detection-that-libvirtd-is-stopped.patch ++++++ Subject: connection: fix detection that libvirtd is stopped From: Pavel Hrdina phrdina(a)redhat.com Tue Jan 5 10:17:37 2016 +0100 Date: Fri Jan 8 10:21:42 2016 +0100: Git: 89c3638b63e5b251db92ef7066c1753bfa469d38 In case that libvirtd is stopped, we could receive another type of error from libvirt "libvirtError: internal error: client socket is closed". This one is usually reported from local connection. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> Index: virt-manager-1.3.2/virtManager/connection.py =================================================================== --- virt-manager-1.3.2.orig/virtManager/connection.py +++ virt-manager-1.3.2/virtManager/connection.py @@ -1298,6 +1298,7 @@ class vmmConnection(vmmGObject): from_remote = getattr(libvirt, "VIR_FROM_REMOTE", None) from_rpc = getattr(libvirt, "VIR_FROM_RPC", None) sys_error = getattr(libvirt, "VIR_ERR_SYSTEM_ERROR", None) + internal_error = getattr(libvirt, "VIR_ERR_INTERNAL_ERROR", None) dom = -1 code = -1 @@ -1309,7 +1310,7 @@ class vmmConnection(vmmGObject): self.get_uri(), exc_info=True) if (dom in [from_remote, from_rpc] and - code in [sys_error]): + code in [sys_error, internal_error]): e = None logging.debug("Not showing user error since libvirtd " "appears to have stopped.") ++++++ eae7dc06-fix-URL-installs-when-content-length-header-missing.patch ++++++ Subject: urlfetcher: Fix URL installs when content-length header missing From: Cole Robinson crobinso(a)redhat.com Tue Jan 12 12:45:02 2016 -0500 Date: Tue Jan 12 12:45:02 2016 -0500: Git: eae7dc061968a83fef8ebb632c8f939621ff22b1 Suggested-by: bduff(a)sjm.com Index: virt-manager-1.3.2/virtinst/urlfetcher.py =================================================================== --- virt-manager-1.3.2.orig/virtinst/urlfetcher.py +++ virt-manager-1.3.2/virtinst/urlfetcher.py @@ -186,8 +186,11 @@ class _HTTPURLFetcher(_URLFetcher): """ response = requests.get(url, stream=True) response.raise_for_status() - size = response.headers.get('content-length') - return response, size.isdigit() and int(size) or None + try: + size = int(response.headers.get('content-length')) + except: + size = None + return response, size def _write(self, urlobj, fileobj): """ ++++++ virtinst-add-ppc64-arch-support.patch ++++++ --- /var/tmp/diff_new_pack.30hdX0/_old 2016-01-22 01:09:15.000000000 +0100 +++ /var/tmp/diff_new_pack.30hdX0/_new 2016-01-22 01:09:15.000000000 +0100 @@ -1,10 +1,10 @@ Reference: bnc#869024 Add s390x and ppc64 support -Index: virt-manager-1.3.0/virtinst/urlfetcher.py +Index: virt-manager-1.3.2/virtinst/urlfetcher.py =================================================================== ---- virt-manager-1.3.0.orig/virtinst/urlfetcher.py -+++ virt-manager-1.3.0/virtinst/urlfetcher.py -@@ -427,6 +427,10 @@ def _distroFromSUSEContent(fetcher, arch +--- virt-manager-1.3.2.orig/virtinst/urlfetcher.py ++++ virt-manager-1.3.2/virtinst/urlfetcher.py +@@ -430,6 +430,10 @@ def _distroFromSUSEContent(fetcher, arch arch = "i586" elif cbuf.find("s390x") != -1: arch = "s390x" @@ -15,7 +15,7 @@ dclass = GenericDistro if distribution: -@@ -966,10 +970,12 @@ class SuseDistro(Distro): +@@ -969,10 +973,12 @@ class SuseDistro(Distro): oldkern += "64" oldinit += "64" ++++++ virtinst-detect-oes-distros.patch ++++++ --- /var/tmp/diff_new_pack.30hdX0/_old 2016-01-22 01:09:15.000000000 +0100 +++ /var/tmp/diff_new_pack.30hdX0/_new 2016-01-22 01:09:15.000000000 +0100 @@ -1,10 +1,10 @@ Enhancement to correctly detect Open Enterprise Server media is selected as the installation source. -Index: virt-manager-1.3.0/virtinst/urlfetcher.py +Index: virt-manager-1.3.2/virtinst/urlfetcher.py =================================================================== ---- virt-manager-1.3.0.orig/virtinst/urlfetcher.py -+++ virt-manager-1.3.0/virtinst/urlfetcher.py -@@ -439,6 +439,10 @@ def _distroFromSUSEContent(fetcher, arch +--- virt-manager-1.3.2.orig/virtinst/urlfetcher.py ++++ virt-manager-1.3.2/virtinst/urlfetcher.py +@@ -442,6 +442,10 @@ def _distroFromSUSEContent(fetcher, arch dclass = SLEDDistro if distro_version is None: distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[4]] ++++++ virtinst-nfs-install-sanitize.patch ++++++ --- /var/tmp/diff_new_pack.30hdX0/_old 2016-01-22 01:09:15.000000000 +0100 +++ /var/tmp/diff_new_pack.30hdX0/_new 2016-01-22 01:09:15.000000000 +0100 @@ -5,10 +5,10 @@ and carry the latter form around internally" We need the RFC version to work correctly whereas redhat's anaconda needs their own modified version. -Index: virt-manager-1.3.0/virtinst/util.py +Index: virt-manager-1.3.2/virtinst/util.py =================================================================== ---- virt-manager-1.3.0.orig/virtinst/util.py -+++ virt-manager-1.3.0/virtinst/util.py +--- virt-manager-1.3.2.orig/virtinst/util.py ++++ virt-manager-1.3.2/virtinst/util.py @@ -552,3 +552,22 @@ def getInstallRepos(enabled_sources_only return (index_dom0, zypper_output) @@ -32,10 +32,10 @@ + + return url + -Index: virt-manager-1.3.0/virtinst/distroinstaller.py +Index: virt-manager-1.3.2/virtinst/distroinstaller.py =================================================================== ---- virt-manager-1.3.0.orig/virtinst/distroinstaller.py -+++ virt-manager-1.3.0/virtinst/distroinstaller.py +--- virt-manager-1.3.2.orig/virtinst/distroinstaller.py ++++ virt-manager-1.3.2/virtinst/distroinstaller.py @@ -49,6 +49,8 @@ def _sanitize_url(url): """ Do nothing for http or ftp, but make sure nfs is in the expected format @@ -45,10 +45,10 @@ if url.startswith("nfs://"): # Convert RFC compliant NFS nfs://server/path/to/distro # to what mount/anaconda expect nfs:server:/path/to/distro -Index: virt-manager-1.3.0/virtinst/urlfetcher.py +Index: virt-manager-1.3.2/virtinst/urlfetcher.py =================================================================== ---- virt-manager-1.3.0.orig/virtinst/urlfetcher.py -+++ virt-manager-1.3.0/virtinst/urlfetcher.py +--- virt-manager-1.3.2.orig/virtinst/urlfetcher.py ++++ virt-manager-1.3.2/virtinst/urlfetcher.py @@ -33,6 +33,7 @@ import urllib2 import urlparse @@ -57,7 +57,7 @@ ######################################################################### -@@ -295,7 +296,8 @@ class _MountedURLFetcher(_LocalURLFetche +@@ -298,7 +299,8 @@ class _MountedURLFetcher(_LocalURLFetche logging.debug("Preparing mount at " + self._srcdir) if self.location.startswith("nfs:"): ++++++ virtinst-s390x-disable-graphics.patch ++++++ --- /var/tmp/diff_new_pack.30hdX0/_old 2016-01-22 01:09:15.000000000 +0100 +++ /var/tmp/diff_new_pack.30hdX0/_new 2016-01-22 01:09:15.000000000 +0100 @@ -1,9 +1,9 @@ Reference: bnc#869024 Disable graphics on s390x -Index: virt-manager-1.3.0/virtinst/guest.py +Index: virt-manager-1.3.2/virtinst/guest.py =================================================================== ---- virt-manager-1.3.0.orig/virtinst/guest.py -+++ virt-manager-1.3.0/virtinst/guest.py +--- virt-manager-1.3.2.orig/virtinst/guest.py ++++ virt-manager-1.3.2/virtinst/guest.py @@ -123,7 +123,10 @@ class Guest(XMLBuilder): self.skip_default_channel = False self.skip_default_sound = False @@ -43,7 +43,7 @@ return self.add_device(VirtualGraphics(self.conn)) -@@ -1052,7 +1057,7 @@ class Guest(XMLBuilder): +@@ -1034,7 +1039,7 @@ class Guest(XMLBuilder): if self._hv_only_supports_virtio(): return True ++++++ virtinst-set-qemu-emulator.patch ++++++ --- /var/tmp/diff_new_pack.30hdX0/_old 2016-01-22 01:09:15.000000000 +0100 +++ /var/tmp/diff_new_pack.30hdX0/_new 2016-01-22 01:09:15.000000000 +0100 @@ -1,43 +1,26 @@ Use the correct qemu emulator based on the architecture. We want to get away from using the old qemu-dm emulator for Xen HVM guests so default to qemu-system-i386. -Index: virt-manager-1.3.0/virtinst/guest.py +Index: virt-manager-1.3.2/virtinst/guest.py =================================================================== ---- virt-manager-1.3.0.orig/virtinst/guest.py -+++ virt-manager-1.3.0/virtinst/guest.py -@@ -849,14 +849,29 @@ class Guest(XMLBuilder): +--- virt-manager-1.3.2.orig/virtinst/guest.py ++++ virt-manager-1.3.2/virtinst/guest.py +@@ -849,14 +849,11 @@ class Guest(XMLBuilder): self.emulator = None return - if self.emulator: -+ if self.conn.is_qemu(): -+ if self.os.arch == "s390x": -+ preferred_emulator = "/usr/bin/qemu-system-s390x" -+ elif self.os.arch == "ppc64" or self.os.arch == "ppc64le": -+ preferred_emulator = "/usr/bin/qemu-system-ppc64" -+ else: -+ preferred_emulator = "/usr/bin/qemu-system-x86_64" -+ elif self.conn.is_lxc(): -+ preferred_emulator = "/usr/lib/libvirt/libvirt_lxc" -+ if not os.path.exists(preferred_emulator): -+ preferred_emulator = "/usr/lib64/libvirt/libvirt_lxc" -+ else: -+ preferred_emulator = "/usr/lib/xen/bin/qemu-system-i386" -+ if self.emulator and self.emulator == preferred_emulator: - return - -- if self.os.is_hvm() and self.type == "xen": +- return +- + if self.os.is_hvm() and self.type == "xen": - if self.conn.caps.host.cpu.arch == "x86_64": - self.emulator = "/usr/lib64/xen/bin/qemu-dm" - else: - self.emulator = "/usr/lib/xen/bin/qemu-dm" -+ if os.path.exists(preferred_emulator): -+ self.emulator = preferred_emulator -+ elif self.os.is_hvm() and self.type == "xen": -+ # We don't want to use the old qemu-dm for xen -+ self.emulator = "/usr/lib/xen/bin/qemu-system-i386" -+ elif not self.emulator: -+ self.emulator = "/usr/bin/qemu-kvm" ++ # Force not using Xen's old qemu-dm except for remote ++ # connections where we don't know the Xen version ++ if not self.conn.is_remote() or not self.emulator: ++ self.emulator = "/usr/lib/xen/bin/qemu-system-i386" def _set_cpu_defaults(self): self.cpu.set_topology_defaults(self.vcpus) ++++++ virtinst-vol-default-nocow.patch ++++++ --- /var/tmp/diff_new_pack.30hdX0/_old 2016-01-22 01:09:15.000000000 +0100 +++ /var/tmp/diff_new_pack.30hdX0/_new 2016-01-22 01:09:15.000000000 +0100 @@ -4,19 +4,33 @@ Signed-off-by: Chunyan Liu <cyliu(a)suse.com> -Index: virt-manager-1.3.0/virtinst/storage.py +Index: virt-manager-1.3.2/virtinst/storage.py =================================================================== ---- virt-manager-1.3.0.orig/virtinst/storage.py -+++ virt-manager-1.3.0/virtinst/storage.py -@@ -716,6 +716,11 @@ class StorageVolume(_StorageObject): +--- virt-manager-1.3.2.orig/virtinst/storage.py ++++ virt-manager-1.3.2/virtinst/storage.py +@@ -716,6 +716,12 @@ class StorageVolume(_StorageObject): lazy_refcounts = XMLProperty("./target/features/lazy_refcounts", is_bool=True, default_cb=_lazy_refcounts_default_cb) + def _nocow_default_cb(self): -+ return True ++ return self.conn.check_support( ++ self.conn.SUPPORT_CONN_NOCOW) + nocow = XMLProperty("./target/nocow", + is_bool=True, default_cb=_nocow_default_cb) + ###################### # Public API helpers # +Index: virt-manager-1.3.2/virtinst/support.py +=================================================================== +--- virt-manager-1.3.2.orig/virtinst/support.py ++++ virt-manager-1.3.2/virtinst/support.py +@@ -314,6 +314,8 @@ SUPPORT_CONN_VCPU_PLACEMENT = _make( + SUPPORT_CONN_MEM_STATS_PERIOD = _make( + function="virDomain.setMemoryStatsPeriod", + version="1.1.1", hv_version={"qemu": 0}) ++SUPPORT_CONN_NOCOW = _make( ++ version="1.2.18", hv_version={"qemu": "2.2.0", "test": 0}) + + # This is for disk <driver name=qemu>. xen supports this, but it's + # limited to arbitrary new enough xen, since I know libxl can handle it ++++++ virtman-add-connect-default.patch ++++++ --- /var/tmp/diff_new_pack.30hdX0/_old 2016-01-22 01:09:15.000000000 +0100 +++ /var/tmp/diff_new_pack.30hdX0/_new 2016-01-22 01:09:15.000000000 +0100 @@ -1,10 +1,10 @@ Enhancement for when no hypervisor can be found locally it opens the new connection dialog. -Index: virt-manager-1.3.0/virtManager/engine.py +Index: virt-manager-1.3.2/virtManager/engine.py =================================================================== ---- virt-manager-1.3.0.orig/virtManager/engine.py -+++ virt-manager-1.3.0/virtManager/engine.py -@@ -207,9 +207,6 @@ class vmmEngine(vmmGObject): +--- virt-manager-1.3.2.orig/virtManager/engine.py ++++ virt-manager-1.3.2/virtManager/engine.py +@@ -236,9 +236,6 @@ class vmmEngine(vmmGObject): except: logging.exception("Error talking to PackageKit") @@ -14,7 +14,7 @@ warnmsg = _("The 'libvirtd' service will need to be started.\n\n" "After that, virt-manager will connect to libvirt on\n" "the next application start up.") -@@ -223,7 +220,11 @@ class vmmEngine(vmmGObject): +@@ -252,7 +249,11 @@ class vmmEngine(vmmGObject): if not connected and do_start: manager.err.ok(_("Libvirt service must be started"), warnmsg) ++++++ virtman-allow-destroy-from-shutdown-menu-of-crashed-vm.patch ++++++ --- /var/tmp/diff_new_pack.30hdX0/_old 2016-01-22 01:09:15.000000000 +0100 +++ /var/tmp/diff_new_pack.30hdX0/_new 2016-01-22 01:09:15.000000000 +0100 @@ -6,11 +6,11 @@ 4) Edit the VM's /etc/default/grub file and remove the crashkernel information and then run grub2-mkconfig /boot/grub2/grub.cfg. 5) Start the VM and within the VM's terminal type "echo 'c' > /proc/sysrq-trigger" -Index: virt-manager-1.3.0/virtManager/manager.py +Index: virt-manager-1.3.2/virtManager/manager.py =================================================================== ---- virt-manager-1.3.0.orig/virtManager/manager.py -+++ virt-manager-1.3.0/virtManager/manager.py -@@ -857,7 +857,7 @@ class vmmManager(vmmGObjectUI): +--- virt-manager-1.3.2.orig/virtManager/manager.py ++++ virt-manager-1.3.2/virtManager/manager.py +@@ -854,7 +854,7 @@ class vmmManager(vmmGObjectUI): show_pause = bool(vm and vm.is_unpauseable()) else: show_pause = bool(vm and vm.is_pauseable()) @@ -19,10 +19,10 @@ if vm and vm.managedsave_supported: self.change_run_text(vm.has_managed_save()) -Index: virt-manager-1.3.0/virtManager/vmmenu.py +Index: virt-manager-1.3.2/virtManager/vmmenu.py =================================================================== ---- virt-manager-1.3.0.orig/virtManager/vmmenu.py -+++ virt-manager-1.3.0/virtManager/vmmenu.py +--- virt-manager-1.3.2.orig/virtManager/vmmenu.py ++++ virt-manager-1.3.2/virtManager/vmmenu.py @@ -31,6 +31,7 @@ class _VMMenu(Gtk.Menu): self._parent = src self._current_vm_cb = current_vm_cb ++++++ virtman-eepro100.patch ++++++ --- /var/tmp/diff_new_pack.30hdX0/_old 2016-01-22 01:09:16.000000000 +0100 +++ /var/tmp/diff_new_pack.30hdX0/_new 2016-01-22 01:09:16.000000000 +0100 @@ -1,9 +1,9 @@ Enhancement to add the eepro100 NIC for KVM -Index: virt-manager-1.3.0/virtManager/addhardware.py +Index: virt-manager-1.3.2/virtManager/addhardware.py =================================================================== ---- virt-manager-1.3.0.orig/virtManager/addhardware.py -+++ virt-manager-1.3.0/virtManager/addhardware.py -@@ -565,6 +565,7 @@ class vmmAddHardware(vmmGObjectUI): +--- virt-manager-1.3.2.orig/virtManager/addhardware.py ++++ virt-manager-1.3.2/virtManager/addhardware.py +@@ -571,6 +571,7 @@ class vmmAddHardware(vmmGObjectUI): if vm.is_hvm(): mod_list = [] if vm.get_hv_type() in ["kvm", "qemu", "test"]: ++++++ virtman-libvirtd-not-running.patch ++++++ --- /var/tmp/diff_new_pack.30hdX0/_old 2016-01-22 01:09:16.000000000 +0100 +++ /var/tmp/diff_new_pack.30hdX0/_new 2016-01-22 01:09:16.000000000 +0100 @@ -1,9 +1,9 @@ Use the correct systemd to start libvirt. -Index: virt-manager-1.3.0/virtManager/packageutils.py +Index: virt-manager-1.3.2/virtManager/packageutils.py =================================================================== ---- virt-manager-1.3.0.orig/virtManager/packageutils.py -+++ virt-manager-1.3.0/virtManager/packageutils.py -@@ -154,8 +154,8 @@ def start_libvirtd(): +--- virt-manager-1.3.2.orig/virtManager/packageutils.py ++++ virt-manager-1.3.2/virtManager/packageutils.py +@@ -143,8 +143,8 @@ def start_libvirtd(): logging.debug("libvirtd not running, asking system-config-services " "to start it") scs = Gio.DBusProxy.new_sync(bus, 0, None, ++++++ virtman-load-stored-uris.patch ++++++ --- /var/tmp/diff_new_pack.30hdX0/_old 2016-01-22 01:09:16.000000000 +0100 +++ /var/tmp/diff_new_pack.30hdX0/_new 2016-01-22 01:09:16.000000000 +0100 @@ -1,7 +1,8 @@ -diff -rup a/virtManager/engine.py b/virtManager/engine.py ---- a/virtManager/engine.py 2015-12-07 01:23:13.000000000 +0100 -+++ b/virtManager/engine.py 2015-12-13 15:39:06.911652459 +0100 -@@ -260,9 +260,22 @@ class vmmEngine(vmmGObject): +Index: virt-manager-1.3.2/virtManager/engine.py +=================================================================== +--- virt-manager-1.3.2.orig/virtManager/engine.py ++++ virt-manager-1.3.2/virtManager/engine.py +@@ -257,9 +257,22 @@ class vmmEngine(vmmGObject): def load_stored_uris(self): uris = self.config.get_conn_uris() or [] ++++++ virtman-packages.patch ++++++ --- /var/tmp/diff_new_pack.30hdX0/_old 2016-01-22 01:09:16.000000000 +0100 +++ /var/tmp/diff_new_pack.30hdX0/_new 2016-01-22 01:09:16.000000000 +0100 @@ -4,10 +4,10 @@ libvirt packages (kvm vs xen). Only install those libvirt packages for which the host is booted. This patch has a corresponding spec file change (%define libvirt_kvm_packages and %define libvirt_xen_packages). -Index: virt-manager-1.3.0/setup.py +Index: virt-manager-1.3.2/setup.py =================================================================== ---- virt-manager-1.3.0.orig/setup.py -+++ virt-manager-1.3.0/setup.py +--- virt-manager-1.3.2.orig/setup.py ++++ virt-manager-1.3.2/setup.py @@ -299,8 +299,11 @@ class configure(distutils.core.Command): ("prefix=", None, "installation prefix"), ("qemu-user=", None, @@ -45,10 +45,10 @@ if self.kvm_package_names is not None: template += "hv_packages = %s\n" % self.kvm_package_names if self.askpass_package_names is not None: -Index: virt-manager-1.3.0/virtcli/cliconfig.py +Index: virt-manager-1.3.2/virtcli/cliconfig.py =================================================================== ---- virt-manager-1.3.0.orig/virtcli/cliconfig.py -+++ virt-manager-1.3.0/virtcli/cliconfig.py +--- virt-manager-1.3.2.orig/virtcli/cliconfig.py ++++ virt-manager-1.3.2/virtcli/cliconfig.py @@ -83,7 +83,8 @@ class _CLIConfig(object): _get_param("preferred_distros", "")) self.hv_packages = _split_list(_get_param("hv_packages", "")) @@ -59,10 +59,10 @@ self.default_graphics = _get_param("default_graphics", "spice") self.default_hvs = _split_list(_get_param("default_hvs", "")) -Index: virt-manager-1.3.0/virtManager/config.py +Index: virt-manager-1.3.2/virtManager/config.py =================================================================== ---- virt-manager-1.3.0.orig/virtManager/config.py -+++ virt-manager-1.3.0/virtManager/config.py +--- virt-manager-1.3.2.orig/virtManager/config.py ++++ virt-manager-1.3.2/virtManager/config.py @@ -172,7 +172,8 @@ class vmmConfig(object): self.default_qemu_user = CLIConfig.default_qemu_user self.preferred_distros = CLIConfig.preferred_distros @@ -73,11 +73,11 @@ self.askpass_package = CLIConfig.askpass_package self.default_graphics_from_config = CLIConfig.default_graphics self.default_hvs = CLIConfig.default_hvs -Index: virt-manager-1.3.0/virtManager/engine.py +Index: virt-manager-1.3.2/virtManager/engine.py =================================================================== ---- virt-manager-1.3.0.orig/virtManager/engine.py -+++ virt-manager-1.3.0/virtManager/engine.py -@@ -197,21 +197,18 @@ class vmmEngine(vmmGObject): +--- virt-manager-1.3.2.orig/virtManager/engine.py ++++ virt-manager-1.3.2/virtManager/engine.py +@@ -226,21 +226,18 @@ class vmmEngine(vmmGObject): ret = None try:

1 0

commit virt-viewer for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package virt-viewer for openSUSE:Factory checked in at 2016-01-21 23:43:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-viewer (Old) and /work/SRC/openSUSE:Factory/.virt-viewer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "virt-viewer" Changes: -------- --- /work/SRC/openSUSE:Factory/virt-viewer/virt-viewer.changes 2015-12-20 10:52:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.virt-viewer.new/virt-viewer.changes 2016-01-22 01:09:09.000000000 +0100 @@ -1,0 +2,58 @@ +Mon Jan 11 08:51:09 MST 2016 - carnold(a)suse.com + +- Update to virt-viewer version 3.1 + virt-viewer-3.1.tar.bz2 + - Last release to support GTK2 for Linux. The next 4.0 release + will be GTK3 only + - Don’t add URI scheme / path info to oVirt URIs + - Require spice-gtk >= 0.30 + - Enable webdav folder sharing with spice + - Add preferences UI dialog + - Take –direct into account when checking if guest is reachable + - Take SPICE proxy into account when connecting to oVirt + instances + - Fail gracefully when hostname is not returned by oVirt + - Don’t show empty foreign menu on secondary displays + - Avoid accidentally trying to connect to port 0 when oVirt + doesn’t specify a port number + - Correctly update geometry when enabling/disabling display heads + - Avoid accidentally creating extra monitors when using + configuration file monitor mapping + - Exit normally when cancelling connect dialog + - Don’t wait for a guest that we know will never show up + - Fix crash when using –reconnect with SPICE + - Avoid zooming out if it would decrease window size below + minimum required for top menu display + - Fix crash when disabling last enabled display + - Honour changes in display position from guest + - Don’t show error dialog twice for unknown graphics type + - Allow to cancel oVirt auth without error + - Set sensitivity of display menu based on whether it is usable + or not + - Set sensitivity of tool bar buttons based on whether they are + usable or not + - Set guest name reported by VNC + - Fix crash when using gtk-vnc 0.3.8 + - Fix alt-tab behaviour in choose VM dialog + - Don’t allow missing display in monitor mapping config + - Add –with-osid flag to configure to allow specifying the + operating system build target. The values should be based on + libosinfo OS short IDs. + - Ensure windows installer places menu icon for all users not + just admin. Requires manual uninstall of previous windows + version + - Require address in remote viewer connect dialog + - Automatically retry VNC connection after auth failure + - Drop GTK2 support for Windows builds + - Enable keepalives on libvirt conncetion + - Allow resize of window to arbitrary size + - Fix thread safety handling event callbacks + - Avoid deprecation warnings with newer glib + - Pulled in multiple fixes for event loop from libvirt-glib + - Fix misc bugs reported by coverity + - Fix binary ID in MSI installer + - Stop polling libvirt after reconnecting to libvirt +- Drop old tarball + virt-viewer-3.0.tar.bz2 + +------------------------------------------------------------------- Old: ---- virt-viewer-3.0.tar.bz2 New: ---- virt-viewer-3.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-viewer.spec ++++++ --- /var/tmp/diff_new_pack.N7cAKa/_old 2016-01-22 01:09:11.000000000 +0100 +++ /var/tmp/diff_new_pack.N7cAKa/_new 2016-01-22 01:09:11.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package virt-viewer # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %if %suse_version >= 1315 %define gtk_arg --with-gtk=3.0 %else @@ -25,10 +26,10 @@ Summary: Virtual Machine Viewer License: GPL-2.0+ Group: System/Monitoring -Version: 3.0 +Version: 3.1 Release: 0 Url: http://www.virt-manager.org -Source0: virt-viewer-3.0.tar.bz2 +Source0: virt-viewer-3.1.tar.bz2 Patch50: netcat.patch Patch51: windows-keycombo.patch Patch52: netware-keycombo.patch ++++++ netcat.patch ++++++ --- /var/tmp/diff_new_pack.N7cAKa/_old 2016-01-22 01:09:11.000000000 +0100 +++ /var/tmp/diff_new_pack.N7cAKa/_new 2016-01-22 01:09:11.000000000 +0100 @@ -1,7 +1,7 @@ -Index: virt-viewer-3.0/src/virt-viewer-app.c +Index: virt-viewer-3.1/src/virt-viewer-app.c =================================================================== ---- virt-viewer-3.0.orig/src/virt-viewer-app.c -+++ virt-viewer-3.0/src/virt-viewer-app.c +--- virt-viewer-3.1.orig/src/virt-viewer-app.c ++++ virt-viewer-3.1/src/virt-viewer-app.c @@ -691,7 +691,7 @@ virt_viewer_app_open_tunnel_ssh(const ch else g_string_append_printf(cat, "UNIX-CONNECT:%s", unixsock); ++++++ netware-keycombo.patch ++++++ --- /var/tmp/diff_new_pack.N7cAKa/_old 2016-01-22 01:09:11.000000000 +0100 +++ /var/tmp/diff_new_pack.N7cAKa/_new 2016-01-22 01:09:11.000000000 +0100 @@ -1,7 +1,7 @@ -Index: virt-viewer-3.0/src/virt-viewer-window.c +Index: virt-viewer-3.1/src/virt-viewer-window.c =================================================================== ---- virt-viewer-3.0.orig/src/virt-viewer-window.c -+++ virt-viewer-3.0/src/virt-viewer-window.c +--- virt-viewer-3.1.orig/src/virt-viewer-window.c ++++ virt-viewer-3.1/src/virt-viewer-window.c @@ -538,6 +538,15 @@ static const struct keyComboDef keyCombo { { GDK_Control_L, GDK_Alt_L, GDK_BackSpace, GDK_VoidSymbol }, N_("Ctrl+Alt+_Backspace"), NULL}, { { GDK_Control_R, GDK_Scroll_Lock, GDK_Scroll_Lock, GDK_VoidSymbol }, N_("Ctrl+Scroll+Scroll"), NULL}, @@ -27,10 +27,10 @@ { { GDK_Control_L, GDK_Alt_L, GDK_F11, GDK_VoidSymbol }, N_("Ctrl+Alt+F11"), NULL}, { { GDK_Control_L, GDK_Alt_L, GDK_F12, GDK_VoidSymbol }, N_("Ctrl+Alt+F12"), NULL}, { { GDK_VoidSymbol }, "" , NULL}, -Index: virt-viewer-3.0/src/virt-gtk-compat.h +Index: virt-viewer-3.1/src/virt-gtk-compat.h =================================================================== ---- virt-viewer-3.0.orig/src/virt-gtk-compat.h -+++ virt-viewer-3.0/src/virt-gtk-compat.h +--- virt-viewer-3.1.orig/src/virt-gtk-compat.h ++++ virt-viewer-3.1/src/virt-gtk-compat.h @@ -35,13 +35,17 @@ G_BEGIN_DECLS #if GTK_CHECK_VERSION(3, 0, 0) ++++++ reverse-3d5627d7-for-xen.patch ++++++ --- /var/tmp/diff_new_pack.N7cAKa/_old 2016-01-22 01:09:11.000000000 +0100 +++ /var/tmp/diff_new_pack.N7cAKa/_new 2016-01-22 01:09:11.000000000 +0100 @@ -8,10 +8,10 @@ Even when the server doesn't provide a display connection address, virt-viewer is able to connect to guest with libvirt attach. -Index: virt-viewer-3.0/src/virt-viewer.c +Index: virt-viewer-3.1/src/virt-viewer.c =================================================================== ---- virt-viewer-3.0.orig/src/virt-viewer.c -+++ virt-viewer-3.0/src/virt-viewer.c +--- virt-viewer-3.1.orig/src/virt-viewer.c ++++ virt-viewer-3.1/src/virt-viewer.c @@ -428,18 +428,17 @@ virt_viewer_extract_connect_info(VirtVie ghost = virt_viewer_extract_xpath_string(xmldesc, xpath); } else { ++++++ virt-viewer-3.0.tar.bz2 -> virt-viewer-3.1.tar.bz2 ++++++ ++++ 71557 lines of diff (skipped) ++++++ virtview-desktop.patch ++++++ --- /var/tmp/diff_new_pack.N7cAKa/_old 2016-01-22 01:09:12.000000000 +0100 +++ /var/tmp/diff_new_pack.N7cAKa/_new 2016-01-22 01:09:12.000000000 +0100 @@ -1,7 +1,7 @@ -Index: virt-viewer-3.0/data/remote-viewer.desktop.in +Index: virt-viewer-3.1/data/remote-viewer.desktop.in =================================================================== ---- virt-viewer-3.0.orig/data/remote-viewer.desktop.in -+++ virt-viewer-3.0/data/remote-viewer.desktop.in +--- virt-viewer-3.1.orig/data/remote-viewer.desktop.in ++++ virt-viewer-3.1/data/remote-viewer.desktop.in @@ -1,10 +1,22 @@ [Desktop Entry] _Name=Remote Viewer ++++++ windows-keycombo.patch ++++++ --- /var/tmp/diff_new_pack.N7cAKa/_old 2016-01-22 01:09:12.000000000 +0100 +++ /var/tmp/diff_new_pack.N7cAKa/_new 2016-01-22 01:09:12.000000000 +0100 @@ -1,7 +1,7 @@ -Index: virt-viewer-3.0/src/virt-viewer-window.c +Index: virt-viewer-3.1/src/virt-viewer-window.c =================================================================== ---- virt-viewer-3.0.orig/src/virt-viewer-window.c -+++ virt-viewer-3.0/src/virt-viewer-window.c +--- virt-viewer-3.1.orig/src/virt-viewer-window.c ++++ virt-viewer-3.1/src/virt-viewer-window.c @@ -536,6 +536,7 @@ struct keyComboDef { static const struct keyComboDef keyCombos[] = { { { GDK_Control_L, GDK_Alt_L, GDK_Delete, GDK_VoidSymbol }, N_("Ctrl+Alt+_Del"), "<virt-viewer>/send/secure-attention"}, @@ -10,10 +10,10 @@ { { GDK_VoidSymbol }, "" , NULL}, { { GDK_Control_L, GDK_Alt_L, GDK_F1, GDK_VoidSymbol }, N_("Ctrl+Alt+F_1"), NULL}, { { GDK_Control_L, GDK_Alt_L, GDK_F2, GDK_VoidSymbol }, N_("Ctrl+Alt+F_2"), NULL}, -Index: virt-viewer-3.0/src/virt-gtk-compat.h +Index: virt-viewer-3.1/src/virt-gtk-compat.h =================================================================== ---- virt-viewer-3.0.orig/src/virt-gtk-compat.h -+++ virt-viewer-3.0/src/virt-gtk-compat.h +--- virt-viewer-3.1.orig/src/virt-gtk-compat.h ++++ virt-viewer-3.1/src/virt-gtk-compat.h @@ -37,6 +37,8 @@ G_BEGIN_DECLS #define GDK_Shift_L GDK_KEY_Shift_L #define GDK_VoidSymbol GDK_KEY_VoidSymbol

1 0

commit tulip for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package tulip for openSUSE:Factory checked in at 2016-01-21 23:43:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tulip (Old) and /work/SRC/openSUSE:Factory/.tulip.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tulip" Changes: -------- --- /work/SRC/openSUSE:Factory/tulip/tulip.changes 2015-10-12 10:02:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tulip.new/tulip.changes 2016-01-22 01:09:00.000000000 +0100 @@ -1,0 +2,22 @@ +Mon Jan 11 08:37:00 UTC 2016 - kkaempf(a)suse.com + +- Update to 4.8.0 + This release offers some new features, mainly : + - new layout plugins coming from the newly integrated OGDF v2015.05 + - an improved version of the Color mapping plugin with predefined + color schemes added from ColorBrewer.org + - a compressed format for the TLPB import/export plugins + + It adds some improvements in : + - the computation performance of K-Core and Louvain clustering measures + - the graphical user interface of the Self Organizing map dedicated view + + Many bugs have been also fixed especially in : + - the Python dedicated view and IDE + - the Edge bundling plugin + - the Scatter plot, Histogram and Pixel oriented dedicated views + +- drop 0007-fix-for-compilation-error-with-Qt-5.5-add-missing-QO.patch + (upstream) + +------------------------------------------------------------------- Old: ---- 0007-fix-for-compilation-error-with-Qt-5.5-add-missing-QO.patch tulip-4.7.0_src.tar.gz New: ---- tulip-4.8.0_src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tulip.spec ++++++ --- /var/tmp/diff_new_pack.6jG4O4/_old 2016-01-22 01:09:09.000000000 +0100 +++ /var/tmp/diff_new_pack.6jG4O4/_new 2016-01-22 01:09:09.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package tulip # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -20,11 +20,11 @@ Summary: Visualization of huge graphs License: GPL-2.0+ Group: Productivity/Graphics/Visualization/Graph -Version: 4.7.0 +# .so version +%define tulip_version 4.8 +Version: %{tulip_version}.0 Release: 0 Url: http://www.tulip-software.org/ -# .so version -%define tulip_version 4.7 Source: %{name}-%{version}_src.tar.gz Source1: %{name}.desktop Source4: %{name}-rpmlintrc @@ -40,7 +40,6 @@ # Fix FindFTGL.cmake Patch6: 0006-Find-system-ftgl.patch # FIX-UPSTREAM (upstream commit r10874) -Patch7: 0007-fix-for-compilation-error-with-Qt-5.5-add-missing-QO.patch Patch8: use-libbfd.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -175,7 +174,7 @@ Group: Productivity/Graphics/Visualization/Graph %description -n libtulip -See package 'tulip' for details. +A library for handling large graphs. See package 'tulip' for details. %package ogdf Summary: A library for displaying graph in a GL context @@ -183,7 +182,7 @@ Requires: Mesa %description ogdf -See package 'tulip' for details. +A library for displaying graph in a GL context. See package 'tulip' for details. %package python Summary: Python bindings for tulip @@ -202,10 +201,10 @@ Requires: Mesa %description -n libtulip-ogl -See package 'tulip' for details. +A library for displaying graph in a GL context. See package 'tulip' for details. %prep -%setup -q -n %{name} +%setup -q dos2unix CMakeLists.txt %patch1 -p1 # not yet %patch2 -p1 @@ -213,7 +212,6 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 %patch8 -p1 %build @@ -252,7 +250,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a rm -f $RPM_BUILD_ROOT/%{_datadir}/tulip/doc/tulip-user/html/.buildinfo rm -f $RPM_BUILD_ROOT/%{_datadir}/tulip/doc/tulip-python/html/.buildinfo -%fdupes $RPM_BUILD_ROOT%{_datadir}/tulip/doc +%fdupes $RPM_BUILD_ROOT%{_datadir}/tulip %fdupes $RPM_BUILD_ROOT%{_docdir}/tulip %fdupes $RPM_BUILD_ROOT%{_includedir}/tulip @@ -264,6 +262,18 @@ %postun -n libtulip-ogl -p /sbin/ldconfig +%post ogdf -p /sbin/ldconfig + +%postun ogdf -p /sbin/ldconfig + +%post python -p /sbin/ldconfig + +%postun python -p /sbin/ldconfig + +%post devel -p /sbin/ldconfig + +%postun devel -p /sbin/ldconfig + %files %defattr(-,root,root) %{_bindir}/tulip @@ -283,8 +293,19 @@ %files python %defattr(-,root,root) %{_libdir}/libtulip-python-%{tulip_version}.so -%{python_sitearch}/*.so -%{python_sitearch}/*.py* +%dir %{python_sitearch}/tulip +%dir %{python_sitearch}/tulip/native +%dir %{python_sitearch}/tulipgui +%dir %{python_sitearch}/tulipgui/native +%dir %{python_sitearch}/tulipogl +%dir %{python_sitearch}/tulipogl/native +%{python_sitearch}/tulip/native/*.so +%{python_sitearch}/tulip/*.py* +%{python_sitearch}/tulipgui/native/*.so +%{python_sitearch}/tulipgui/*.py* +%{python_sitearch}/tulipogl/native/*.so +%{python_sitearch}/tulipogl/*.py* +%{python_sitearch}/tulipplugins.py* %dir %{_datadir}/tulip/apiFiles %{_datadir}/tulip/apiFiles/* ++++++ 0001-Install-to-lib64.patch ++++++ --- /var/tmp/diff_new_pack.6jG4O4/_old 2016-01-22 01:09:09.000000000 +0100 +++ /var/tmp/diff_new_pack.6jG4O4/_new 2016-01-22 01:09:09.000000000 +0100 @@ -1,4 +1,4 @@ -From 5322882d51bdf94ce0558320e956e926feccfa9f Mon Sep 17 00:00:00 2001 +From 07873ab7e6904e1c9ed21b260a1b91c4442318b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf(a)suse.de> Date: Tue, 11 Nov 2014 09:51:21 +0100 Subject: [PATCH 1/6] Install to lib64 @@ -8,10 +8,10 @@ 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index c493239d1cfa..3ed6f49567f2 100644 +index 8f4af01a80b9..60e795702b5f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -387,7 +387,12 @@ SET(TulipPythonInclude ${PROJECT_SOURCE_DIR}/library/tulip-python/include) +@@ -520,7 +520,12 @@ SET(TulipPythonInclude ${PROJECT_SOURCE_DIR}/library/tulip-python/include) ## ======================================================== ## Install paths ## ======================================================== @@ -26,5 +26,5 @@ SET(TulipGlyphPluginsInstallDir ${TulipPluginsInstallDir}/glyph/) SET(TulipViewPluginsInstallDir ${TulipPluginsInstallDir}/view/) -- -2.1.4 +2.6.4 ++++++ 0002-Enable-tlprender.patch ++++++ --- /var/tmp/diff_new_pack.6jG4O4/_old 2016-01-22 01:09:09.000000000 +0100 +++ /var/tmp/diff_new_pack.6jG4O4/_new 2016-01-22 01:09:09.000000000 +0100 @@ -1,4 +1,4 @@ -From 0749491e172afae66aa9d209ddcbdae1c80b2d8e Mon Sep 17 00:00:00 2001 +From efa26e169d37c61262bb3d495829a1948b38dc3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf(a)suse.de> Date: Tue, 11 Nov 2014 09:52:57 +0100 Subject: [PATCH 2/6] Enable tlprender @@ -17,5 +17,5 @@ ENDIF(APPLE) +ADD_SUBDIRECTORY(tlprender) -- -2.1.4 +2.6.4 ++++++ 0003-Enable-PPC-and-PPC64.patch ++++++ --- /var/tmp/diff_new_pack.6jG4O4/_old 2016-01-22 01:09:09.000000000 +0100 +++ /var/tmp/diff_new_pack.6jG4O4/_new 2016-01-22 01:09:09.000000000 +0100 @@ -1,4 +1,4 @@ -From 51037fee41d564fd20eb64ba9556f69a0c381450 Mon Sep 17 00:00:00 2001 +From d60ad852f5bee564d95a3effae2f9ade1d2afd6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf(a)suse.de> Date: Tue, 11 Nov 2014 09:56:52 +0100 Subject: [PATCH 3/6] Enable PPC and PPC64 @@ -23,5 +23,5 @@ #define OS_ARCHITECTURE "other" #endif -- -2.1.4 +2.6.4 ++++++ 0004-Include-string.h-for-libpng16-in-GlTextureManager.cp.patch ++++++ --- /var/tmp/diff_new_pack.6jG4O4/_old 2016-01-22 01:09:09.000000000 +0100 +++ /var/tmp/diff_new_pack.6jG4O4/_new 2016-01-22 01:09:09.000000000 +0100 @@ -1,4 +1,4 @@ -From 087e4bdbdbddb3d3be72c13fdf30375cb378f526 Mon Sep 17 00:00:00 2001 +From 9d7722acd89c08b695a6d674906490c05dfd0fcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf(a)suse.de> Date: Tue, 11 Nov 2014 10:03:05 +0100 Subject: [PATCH 4/6] Include string.h for libpng16 in GlTextureManager.cpp @@ -20,5 +20,5 @@ #include <tulip/GlTextureManager.h> -- -2.1.4 +2.6.4 ++++++ 0005-Use-system-ftgl-lib-if-available.patch ++++++ --- /var/tmp/diff_new_pack.6jG4O4/_old 2016-01-22 01:09:09.000000000 +0100 +++ /var/tmp/diff_new_pack.6jG4O4/_new 2016-01-22 01:09:09.000000000 +0100 @@ -1,48 +1,49 @@ -From 2c50bea125f608970371d879e084d25232736bf0 Mon Sep 17 00:00:00 2001 +From e07efca6e14eacf4de651b8a4e5333a44c0bb5c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf(a)suse.de> Date: Tue, 11 Nov 2014 10:15:54 +0100 Subject: [PATCH 5/6] Use system ftgl lib if available --- CMakeLists.txt | 10 ++++++++-- - thirdparty/CMakeLists.txt | 2 ++ - 2 files changed, 10 insertions(+), 2 deletions(-) + thirdparty/CMakeLists.txt | 4 +++- + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3ed6f49567f2..248ef79f3f97 100644 +index 60e795702b5f..75123c7f8424 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -363,8 +363,14 @@ endif(QUAZIP_FOUND) +@@ -495,8 +495,14 @@ IF(NOT BUILD_CORE_ONLY) - SET(QxtInclude ${PROJECT_SOURCE_DIR}/thirdparty/qxt/src) - SET(QxtLibrary qxt-tulip-${TulipMMVersion}) --SET(FTGLInclude ${PROJECT_SOURCE_DIR}/thirdparty/ftgl/) --SET(FTGLLibrary ftgl-tulip-${TulipMMVersion}) -+IF(SYSTEM_FTGL) -+ FIND_PACKAGE(FTGL) -+ SET(FTGLInclude ${FTGL_INCLUDE_DIR}) -+ SET(FTGLLibrary ${FTGL_LIBRARIES}) -+ELSE() -+ SET(FTGLInclude ${PROJECT_SOURCE_DIR}/thirdparty/ftgl/) -+ SET(FTGLLibrary ftgl-tulip-${TulipMMVersion}) -+ENDIF() + SET(QxtInclude ${PROJECT_SOURCE_DIR}/thirdparty/qxt/src) + SET(QxtLibrary qxt-tulip-${TulipMMVersion}) +- SET(FTGLInclude ${PROJECT_SOURCE_DIR}/thirdparty/ftgl/) +- SET(FTGLLibrary ftgl-tulip-${TulipMMVersion}) ++ IF(SYSTEM_FTGL) ++ FIND_PACKAGE(FTGL) ++ SET(FTGLInclude ${FTGL_INCLUDE_DIR}) ++ SET(FTGLLibrary ${FTGL_LIBRARIES}) ++ ELSE() ++ SET(FTGLInclude ${PROJECT_SOURCE_DIR}/thirdparty/ftgl/) ++ SET(FTGLLibrary ftgl-tulip-${TulipMMVersion}) ++ ENDIF() + SET(Tess2Include ${PROJECT_SOURCE_DIR}/thirdparty/libtess2/Include) + SET(Tess2Library tess2-tulip-${TulipMMVersion}) ENDIF(NOT BUILD_CORE_ONLY) - - SET(OGDFInclude ${PROJECT_SOURCE_DIR}/thirdparty/OGDF) diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt -index 49dd579a1780..3161df543454 100644 +index 50c05a73346a..8f1675327b13 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt -@@ -8,7 +8,9 @@ ADD_SUBDIRECTORY(libqhull) +@@ -7,7 +7,9 @@ ADD_SUBDIRECTORY(OGDF) + ADD_SUBDIRECTORY(libqhull) ADD_SUBDIRECTORY(yajl) - IF(NOT BUILD_CORE_ONLY) +-ADD_SUBDIRECTORY(ftgl) +IF(NOT SYSTEM_FTGL) - ADD_SUBDIRECTORY(ftgl) ++ ADD_SUBDIRECTORY(ftgl) +ENDIF(NOT SYSTEM_FTGL) + ADD_SUBDIRECTORY(libtess2) IF(NOT QUAZIP_FOUND) ADD_SUBDIRECTORY(quazip) - ENDIF(NOT QUAZIP_FOUND) -- -2.1.4 +2.6.4 ++++++ 0006-Find-system-ftgl.patch ++++++ --- /var/tmp/diff_new_pack.6jG4O4/_old 2016-01-22 01:09:09.000000000 +0100 +++ /var/tmp/diff_new_pack.6jG4O4/_new 2016-01-22 01:09:09.000000000 +0100 @@ -1,4 +1,4 @@ -From 90e5d27d3e4f1215faa12a7b318f8fdf4f94f178 Mon Sep 17 00:00:00 2001 +From 0c5415a5b819536fd4e8e20fc65fa0122d08b101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf(a)suse.de> Date: Tue, 11 Nov 2014 11:04:20 +0100 Subject: [PATCH 6/6] Find system ftgl @@ -39,5 +39,5 @@ /usr/X11/lib /usr/X11R6/lib -- -2.1.4 +2.6.4 ++++++ tulip-4.7.0_src.tar.gz -> tulip-4.8.0_src.tar.gz ++++++ /work/SRC/openSUSE:Factory/tulip/tulip-4.7.0_src.tar.gz /work/SRC/openSUSE:Factory/.tulip.new/tulip-4.8.0_src.tar.gz differ: char 5, line 1

1 0

commit ghc-prelude-extras for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package ghc-prelude-extras for openSUSE:Factory checked in at 2016-01-21 23:43:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-prelude-extras (Old) and /work/SRC/openSUSE:Factory/.ghc-prelude-extras.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-prelude-extras" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-prelude-extras/ghc-prelude-extras.changes 2015-09-17 09:19:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-prelude-extras.new/ghc-prelude-extras.changes 2016-01-22 01:08:51.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Jan 18 12:22:55 UTC 2016 - mimi.vx(a)gmail.com + +- update to 0.4.0.3 +* Add instances for Const +* Add instances for tuples up to 9 + +------------------------------------------------------------------- Old: ---- prelude-extras-0.4.0.2.tar.gz New: ---- prelude-extras-0.4.0.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-prelude-extras.spec ++++++ --- /var/tmp/diff_new_pack.PJcD1l/_old 2016-01-22 01:08:53.000000000 +0100 +++ /var/tmp/diff_new_pack.PJcD1l/_new 2016-01-22 01:08:53.000000000 +0100 @@ -19,7 +19,7 @@ %global pkg_name prelude-extras Name: ghc-prelude-extras -Version: 0.4.0.2 +Version: 0.4.0.3 Release: 0 Summary: Haskell 98 - higher order versions of Prelude classes License: BSD-3-Clause ++++++ prelude-extras-0.4.0.2.tar.gz -> prelude-extras-0.4.0.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prelude-extras-0.4.0.2/CHANGELOG.markdown new/prelude-extras-0.4.0.3/CHANGELOG.markdown --- old/prelude-extras-0.4.0.2/CHANGELOG.markdown 2015-09-09 16:25:36.000000000 +0200 +++ new/prelude-extras-0.4.0.3/CHANGELOG.markdown 2016-01-17 02:56:58.000000000 +0100 @@ -1,3 +1,8 @@ +0.4.0.3 +------- +* Add instances for `Const` +* Add instances for tuples up to 9 + 0.4.0.2 ------- * Mark `Prelude.Extras` as Trustworthy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prelude-extras-0.4.0.2/LICENSE new/prelude-extras-0.4.0.3/LICENSE --- old/prelude-extras-0.4.0.2/LICENSE 2015-09-09 16:25:36.000000000 +0200 +++ new/prelude-extras-0.4.0.3/LICENSE 2016-01-17 02:56:58.000000000 +0100 @@ -1,4 +1,4 @@ -Copyright 2011-2014 Edward Kmett +Copyright 2011-2016 Edward Kmett All rights reserved. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prelude-extras-0.4.0.2/prelude-extras.cabal new/prelude-extras-0.4.0.3/prelude-extras.cabal --- old/prelude-extras-0.4.0.2/prelude-extras.cabal 2015-09-09 16:25:36.000000000 +0200 +++ new/prelude-extras-0.4.0.3/prelude-extras.cabal 2016-01-17 02:56:58.000000000 +0100 @@ -1,6 +1,6 @@ name: prelude-extras category: Polymorphism, Combinators -version: 0.4.0.2 +version: 0.4.0.3 license: BSD3 cabal-version: >= 1.6 license-file: LICENSE @@ -9,7 +9,7 @@ stability: provisional homepage: http://github.com/ekmett/prelude-extras bug-reports: http://github.com/ekmett/prelude-extras/issues -copyright: Copyright (C) 2011-2014 Edward A. Kmett +copyright: Copyright (C) 2011-2016 Edward A. Kmett synopsis: Higher order versions of Prelude classes tested-with: GHC == 7.10.2, GHC == 7.8.4, GHC == 7.6.3, GHC == 7.4.2, GHC == 7.0.4 description: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prelude-extras-0.4.0.2/src/Prelude/Extras.hs new/prelude-extras-0.4.0.3/src/Prelude/Extras.hs --- old/prelude-extras-0.4.0.2/src/Prelude/Extras.hs 2015-09-09 16:25:36.000000000 +0200 +++ new/prelude-extras-0.4.0.3/src/Prelude/Extras.hs 2016-01-17 02:56:58.000000000 +0100 @@ -1,12 +1,12 @@ {-# LANGUAGE CPP #-} -{-# LANGUAGE DeriveFunctor #-} -{-# LANGUAGE DeriveFoldable #-} {-# LANGUAGE DeriveTraversable #-} -#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ > 702 +{-# LANGUAGE StandaloneDeriving #-} +{-# LANGUAGE GeneralizedNewtypeDeriving #-} +#if __GLASGOW_HASKELL__ > 702 #define DEFAULT_SIGNATURES {-# LANGUAGE DefaultSignatures #-} #endif -#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 701 +#if __GLASGOW_HASKELL__ >= 701 -- GHC.Conc isn't generally safe, but we're just using TVar {-# LANGUAGE Trustworthy #-} #endif @@ -44,13 +44,16 @@ ) where import Control.Applicative -import Control.Arrow (first) -import Control.Concurrent (Chan, MVar) -import Data.Complex (Complex) import Data.Fixed import Data.IORef (IORef) import Data.Monoid +#if MIN_VERSION_base(4,4,0) +import Data.Complex (Complex) import Data.Ratio (Ratio) +import Control.Concurrent (Chan, MVar) +#else +import Control.Concurrent (MVar) +#endif import Foreign.ForeignPtr (ForeignPtr) import Foreign.Ptr (Ptr, FunPtr) import Foreign.StablePtr (StablePtr) @@ -80,7 +83,7 @@ class Eq1 f where (==#) :: Eq a => f a -> f a -> Bool #ifdef DEFAULT_SIGNATURES - default (==#) :: (Eq (f a), Eq a) => f a -> f a -> Bool + default (==#) :: Eq (f a) => f a -> f a -> Bool (==#) = (==) #endif @@ -88,9 +91,7 @@ a /=# b = not (a ==# b) instance Eq1 Maybe where - Just a ==# Just b = a == b - Nothing ==# Nothing = True - _ ==# _ = False + (==#) = (==) instance Eq a => Eq1 (Either a) where (==#) = (==) @@ -100,7 +101,7 @@ #if MIN_VERSION_base(4,8,0) instance Eq1 Identity where (==#) = (==) -instance Eq1 f => Eq1 (Alt f) where Alt x ==# Alt y = x ==# y +deriving instance Eq1 f => Eq1 (Alt f) #endif #if MIN_VERSION_base(4,7,0) instance Eq1 Proxy where (==#) = (==) @@ -111,6 +112,12 @@ #if MIN_VERSION_base(4,6,0) instance Eq1 Down where (==#) = (==) #endif +#if MIN_VERSION_base(4,8,0) +instance Eq a => Eq1 (Const a) where (==#) = (==) +#else +instance Eq a => Eq1 (Const a) where + Const a ==# Const b = a == b +#endif instance Eq1 Dual where (==#) = (==) instance Eq1 Sum where (==#) = (==) instance Eq1 Product where (==#) = (==) @@ -130,23 +137,48 @@ instance Eq1 Chan where (==#) = (==) #endif +instance Eq a => Eq1 ((,) a) where (==#) = (==) +instance (Eq a, Eq b) => Eq1 ((,,) a b) where (==#) = (==) +instance (Eq a, Eq b, Eq c) => Eq1 ((,,,) a b c) where (==#) = (==) +instance (Eq a, Eq b, Eq c, Eq d) => Eq1 ((,,,,) a b c d) where (==#) = (==) +instance (Eq a, Eq b, Eq c, Eq d, Eq e) => Eq1 ((,,,,,) a b c d e) where (==#) = (==) +instance (Eq a, Eq b, Eq c, Eq d, Eq e, Eq f) => Eq1 ((,,,,,,) a b c d e f) where (==#) = (==) +instance (Eq a, Eq b, Eq c, Eq d, Eq e, Eq f, Eq g) => Eq1 ((,,,,,,,) a b c d e f g) where (==#) = (==) +instance (Eq a, Eq b, Eq c, Eq d, Eq e, Eq f, Eq g, Eq h) => Eq1 ((,,,,,,,,) a b c d e f g h) where (==#) = (==) +instance (Eq a, Eq b, Eq c, Eq d, Eq e, Eq f, Eq g, Eq h, Eq i) => Eq1 ((,,,,,,,,,) a b c d e f g h i) where (==#) = (==) + class Eq2 f where (==##) :: (Eq a, Eq b) => f a b -> f a b -> Bool #ifdef DEFAULT_SIGNATURES - default (==##) :: (Eq (f a b), Eq a, Eq b) => f a b -> f a b -> Bool + default (==##) :: Eq (f a b) => f a b -> f a b -> Bool (==##) = (==) #endif (/=##) :: (Eq2 f, Eq a, Eq b) => f a b -> f a b -> Bool a /=## b = not (a ==## b) -instance Eq2 Either where - (==##) = (==) +instance Eq2 Either where (==##) = (==) + +#if MIN_VERSION_base(4,8,0) +instance Eq2 Const where (==##) = (==) +#else +instance Eq2 Const where Const x ==## Const y = x == y +#endif + +instance Eq2 (,) where (==##) = (==) +instance Eq a => Eq2 ((,,) a) where (==##) = (==) +instance (Eq a, Eq b) => Eq2 ((,,,) a b) where (==##) = (==) +instance (Eq a, Eq b, Eq c) => Eq2 ((,,,,) a b c) where (==##) = (==) +instance (Eq a, Eq b, Eq c, Eq d) => Eq2 ((,,,,,) a b c d) where (==##) = (==) +instance (Eq a, Eq b, Eq c, Eq d, Eq e) => Eq2 ((,,,,,,) a b c d e) where (==##) = (==) +instance (Eq a, Eq b, Eq c, Eq d, Eq e, Eq f) => Eq2 ((,,,,,,,) a b c d e f) where (==##) = (==) +instance (Eq a, Eq b, Eq c, Eq d, Eq e, Eq f, Eq g) => Eq2 ((,,,,,,,,) a b c d e f g) where (==##) = (==) +instance (Eq a, Eq b, Eq c, Eq d, Eq e, Eq f, Eq g, Eq h) => Eq2 ((,,,,,,,,,) a b c d e f g h) where (==##) = (==) class Eq1 f => Ord1 f where compare1 :: Ord a => f a -> f a -> Ordering #ifdef DEFAULT_SIGNATURES - default compare1 :: (Ord (f a), Ord a) => f a -> f a -> Ordering + default compare1 :: Ord (f a) => f a -> f a -> Ordering compare1 = compare #endif @@ -171,7 +203,7 @@ instance Ord1 [] where compare1 = compare #if MIN_VERSION_base(4,8,0) instance Ord1 Identity where compare1 = compare -instance Ord1 f => Ord1 (Alt f) where compare1 (Alt x) (Alt y) = compare1 x y +deriving instance Ord1 f => Ord1 (Alt f) #endif #if MIN_VERSION_base(4,7,0) instance Ord1 Proxy where compare1 = compare @@ -182,6 +214,12 @@ #if MIN_VERSION_base(4,6,0) instance Ord1 Down where compare1 = compare #endif +#if MIN_VERSION_base(4,8,0) +instance Ord a => Ord1 (Const a) where compare1 = compare +#else +instance Ord a => Ord1 (Const a) where + compare1 (Const x) (Const y) = compare x y +#endif instance Ord1 Dual where compare1 = compare instance Ord1 Sum where compare1 = compare instance Ord1 Product where compare1 = compare @@ -192,6 +230,16 @@ instance Ord1 ForeignPtr where compare1 = compare instance Ord1 Fixed where compare1 = compare +instance Ord a => Ord1 ((,) a) where compare1 = compare +instance (Ord a, Ord b) => Ord1 ((,,) a b) where compare1 = compare +instance (Ord a, Ord b, Ord c) => Ord1 ((,,,) a b c) where compare1 = compare +instance (Ord a, Ord b, Ord c, Ord d) => Ord1 ((,,,,) a b c d) where compare1 = compare +instance (Ord a, Ord b, Ord c, Ord d, Ord e) => Ord1 ((,,,,,) a b c d e) where compare1 = compare +instance (Ord a, Ord b, Ord c, Ord d, Ord e, Ord f) => Ord1 ((,,,,,,) a b c d e f) where compare1 = compare +instance (Ord a, Ord b, Ord c, Ord d, Ord e, Ord f, Ord g) => Ord1 ((,,,,,,,) a b c d e f g) where compare1 = compare +instance (Ord a, Ord b, Ord c, Ord d, Ord e, Ord f, Ord g, Ord h) => Ord1 ((,,,,,,,,) a b c d e f g h) where compare1 = compare +instance (Ord a, Ord b, Ord c, Ord d, Ord e, Ord f, Ord g, Ord h, Ord i) => Ord1 ((,,,,,,,,,) a b c d e f g h i) where compare1 = compare + -- needs Haskell 2011 -- instance Ord1 Complex where compare1 = compare @@ -199,7 +247,7 @@ class Eq2 f => Ord2 f where compare2 :: (Ord a, Ord b) => f a b -> f a b -> Ordering #ifdef DEFAULT_SIGNATURES - default compare2 :: (Ord (f a b), Ord a, Ord b) => f a b -> f a b -> Ordering + default compare2 :: Ord (f a b) => f a b -> f a b -> Ordering compare2 = compare #endif @@ -224,11 +272,26 @@ | otherwise = y instance Ord2 Either where compare2 = compare +#if MIN_VERSION_base(4,8,0) +instance Ord2 Const where compare2 = compare +#else +instance Ord2 Const where Const x `compare2` Const y = compare x y +#endif + +instance Ord2 (,) where compare2 = compare +instance Ord a => Ord2 ((,,) a) where compare2 = compare +instance (Ord a, Ord b) => Ord2 ((,,,) a b) where compare2 = compare +instance (Ord a, Ord b, Ord c) => Ord2 ((,,,,) a b c) where compare2 = compare +instance (Ord a, Ord b, Ord c, Ord d) => Ord2 ((,,,,,) a b c d) where compare2 = compare +instance (Ord a, Ord b, Ord c, Ord d, Ord e) => Ord2 ((,,,,,,) a b c d e) where compare2 = compare +instance (Ord a, Ord b, Ord c, Ord d, Ord e, Ord f) => Ord2 ((,,,,,,,) a b c d e f) where compare2 = compare +instance (Ord a, Ord b, Ord c, Ord d, Ord e, Ord f, Ord g) => Ord2 ((,,,,,,,,) a b c d e f g) where compare2 = compare +instance (Ord a, Ord b, Ord c, Ord d, Ord e, Ord f, Ord g, Ord h) => Ord2 ((,,,,,,,,,) a b c d e f g h) where compare2 = compare class Show1 f where showsPrec1 :: Show a => Int -> f a -> ShowS #ifdef DEFAULT_SIGNATURES - default showsPrec1 :: (Show (f a), Show a) => Int -> f a -> ShowS + default showsPrec1 :: Show (f a) => Int -> f a -> ShowS showsPrec1 = showsPrec #endif showList1 :: (Show a) => [f a] -> ShowS @@ -237,14 +300,12 @@ show1 :: (Show1 f, Show a) => f a -> String show1 x = shows1 x "" - shows1 :: (Show1 f, Show a) => f a -> ShowS shows1 = showsPrec1 0 instance Show1 Maybe where showsPrec1 = showsPrec instance Show1 [] where showsPrec1 = showsPrec instance Show a => Show1 (Either a) where showsPrec1 = showsPrec -instance Show a => Show1 ((,) a) where showsPrec1 = showsPrec #if MIN_VERSION_base(4,8,0) instance Show1 Identity where showsPrec1 = showsPrec #endif @@ -266,6 +327,15 @@ $ showString "Alt " . showsPrec1 11 x #endif +#if MIN_VERSION_base(4,8,0) +instance Show a => Show1 (Const a) where showsPrec1 = showsPrec +#else +instance Show a => Show1 (Const a) where + showsPrec1 p (Const x) + = showParen (p > 10) + $ showString "Const " + . showsPrec 11 x +#endif instance Show1 Dual where showsPrec1 = showsPrec instance Show1 Sum where showsPrec1 = showsPrec instance Show1 Product where showsPrec1 = showsPrec @@ -278,12 +348,20 @@ instance Show1 Complex where showsPrec1 = showsPrec #endif --- instance Show1 Complex +instance Show a => Show1 ((,) a) where showsPrec1 = showsPrec +instance (Show a, Show b) => Show1 ((,,) a b) where showsPrec1 = showsPrec +instance (Show a, Show b, Show c) => Show1 ((,,,) a b c) where showsPrec1 = showsPrec +instance (Show a, Show b, Show c, Show d) => Show1 ((,,,,) a b c d) where showsPrec1 = showsPrec +instance (Show a, Show b, Show c, Show d, Show e) => Show1 ((,,,,,) a b c d e) where showsPrec1 = showsPrec +instance (Show a, Show b, Show c, Show d, Show e, Show f) => Show1 ((,,,,,,) a b c d e f) where showsPrec1 = showsPrec +instance (Show a, Show b, Show c, Show d, Show e, Show f, Show g) => Show1 ((,,,,,,,) a b c d e f g) where showsPrec1 = showsPrec +instance (Show a, Show b, Show c, Show d, Show e, Show f, Show g, Show h) => Show1 ((,,,,,,,,) a b c d e f g h) where showsPrec1 = showsPrec +instance (Show a, Show b, Show c, Show d, Show e, Show f, Show g, Show h, Show i) => Show1 ((,,,,,,,,,) a b c d e f g h i) where showsPrec1 = showsPrec class Show2 f where showsPrec2 :: (Show a, Show b) => Int -> f a b -> ShowS #ifdef DEFAULT_SIGNATURES - default showsPrec2 :: (Show (f a b), Show a, Show b) => Int -> f a b -> ShowS + default showsPrec2 :: Show (f a b) => Int -> f a b -> ShowS showsPrec2 = showsPrec #endif showList2 :: (Show a, Show b) => [f a b] -> ShowS @@ -296,8 +374,22 @@ shows2 :: (Show2 f, Show a, Show b) => f a b -> ShowS shows2 = showsPrec2 0 -instance Show2 (,) where showsPrec2 = showsPrec instance Show2 Either where showsPrec2 = showsPrec +#if MIN_VERSION_base(4,8,0) +instance Show2 Const where showsPrec2 = showsPrec +#else +instance Show2 Const where showsPrec2 = showsPrec1 +#endif + +instance Show2 (,) where showsPrec2 = showsPrec +instance Show a => Show2 ((,,) a) where showsPrec2 = showsPrec +instance (Show a, Show b) => Show2 ((,,,) a b) where showsPrec2 = showsPrec +instance (Show a, Show b, Show c) => Show2 ((,,,,) a b c) where showsPrec2 = showsPrec +instance (Show a, Show b, Show c, Show d) => Show2 ((,,,,,) a b c d) where showsPrec2 = showsPrec +instance (Show a, Show b, Show c, Show d, Show e) => Show2 ((,,,,,,) a b c d e) where showsPrec2 = showsPrec +instance (Show a, Show b, Show c, Show d, Show e, Show f) => Show2 ((,,,,,,,) a b c d e f) where showsPrec2 = showsPrec +instance (Show a, Show b, Show c, Show d, Show e, Show f, Show g) => Show2 ((,,,,,,,,) a b c d e f g) where showsPrec2 = showsPrec +instance (Show a, Show b, Show c, Show d, Show e, Show f, Show g, Show h) => Show2 ((,,,,,,,,,) a b c d e f g h) where showsPrec2 = showsPrec showList__ :: (a -> ShowS) -> [a] -> ShowS showList__ _ [] s = "[]" ++ s @@ -309,7 +401,7 @@ class Read1 f where readsPrec1 :: Read a => Int -> ReadS (f a) #ifdef DEFAULT_SIGNATURES - default readsPrec1 :: (Read (f a), Read a) => Int -> ReadS (f a) + default readsPrec1 :: Read (f a) => Int -> ReadS (f a) readsPrec1 = readsPrec #endif @@ -362,10 +454,6 @@ readsPrec1 = readsPrec readList1 = readList -instance Read a => Read1 ((,) a) where - readsPrec1 = readsPrec - readList1 = readList - #if MIN_VERSION_base(4,8,0) instance Read1 Identity where readsPrec1 = readsPrec @@ -389,7 +477,6 @@ readList1 = readList #else instance Read1 ZipList where - readList1 = readList1Default readsPrec1 _ = readParen False $ \s -> do ("ZipList" , s1) <- lex s @@ -407,13 +494,24 @@ readList1 = readList #elif MIN_VERSION_base(4,6,0) instance Read1 Down where - readList1 = readList1Default readsPrec1 p = readParen (p > 10) $ \s -> do ("Down",s1) <- lex s (x ,s2) <- readsPrec 11 s1 return (Down x, s2) #endif +#if MIN_VERSION_base(4,8,0) +instance Read a => Read1 (Const a) where + readsPrec1 = readsPrec + readList1 = readList +#else +instance Read a => Read1 (Const a) where + readsPrec1 p = readParen (p > 10) $ \s -> + do ("Const",s1) <- lex s + (x ,s2) <- readsPrec 11 s1 + return (Const x, s2) +#endif + instance Read1 Dual where readsPrec1 = readsPrec readList1 = readList @@ -440,10 +538,20 @@ readList1 = readList #endif +instance Read a => Read1 ((,) a) where readsPrec1 = readsPrec; readList1 = readList +instance (Read a, Read b) => Read1 ((,,) a b) where readsPrec1 = readsPrec; readList1 = readList +instance (Read a, Read b, Read c) => Read1 ((,,,) a b c) where readsPrec1 = readsPrec; readList1 = readList +instance (Read a, Read b, Read c, Read d) => Read1 ((,,,,) a b c d) where readsPrec1 = readsPrec; readList1 = readList +instance (Read a, Read b, Read c, Read d, Read e) => Read1 ((,,,,,) a b c d e) where readsPrec1 = readsPrec; readList1 = readList +instance (Read a, Read b, Read c, Read d, Read e, Read f) => Read1 ((,,,,,,) a b c d e f) where readsPrec1 = readsPrec; readList1 = readList +instance (Read a, Read b, Read c, Read d, Read e, Read f, Read g) => Read1 ((,,,,,,,) a b c d e f g) where readsPrec1 = readsPrec; readList1 = readList +instance (Read a, Read b, Read c, Read d, Read e, Read f, Read g, Read h) => Read1 ((,,,,,,,,) a b c d e f g h) where readsPrec1 = readsPrec; readList1 = readList +instance (Read a, Read b, Read c, Read d, Read e, Read f, Read g, Read h, Read i) => Read1 ((,,,,,,,,,) a b c d e f g h i) where readsPrec1 = readsPrec; readList1 = readList + class Read2 f where readsPrec2 :: (Read a, Read b) => Int -> ReadS (f a b) #ifdef DEFAULT_SIGNATURES - default readsPrec2 :: (Read (f a b), Read a, Read b) => Int -> ReadS (f a b) + default readsPrec2 :: Read (f a b) => Int -> ReadS (f a b) readsPrec2 = readsPrec #endif readList2 :: (Read a, Read b) => ReadS [f a b] @@ -457,13 +565,29 @@ readListPrec2 = readS_to_Prec (\_ -> readList2) #endif -instance Read2 (,) where +instance Read2 Either where readsPrec2 = readsPrec readList2 = readList -instance Read2 Either where +#if MIN_VERSION_base(4,8,0) +instance Read2 Const where readsPrec2 = readsPrec readList2 = readList +#else +instance Read2 Const where + readsPrec2 = readsPrec1 + readList2 = readList1 +#endif + +instance Read2 (,) where readsPrec2 = readsPrec; readList2 = readList +instance Read a => Read2 ((,,) a) where readsPrec2 = readsPrec; readList2 = readList +instance (Read a, Read b) => Read2 ((,,,) a b) where readsPrec2 = readsPrec; readList2 = readList +instance (Read a, Read b, Read c) => Read2 ((,,,,) a b c) where readsPrec2 = readsPrec; readList2 = readList +instance (Read a, Read b, Read c, Read d) => Read2 ((,,,,,) a b c d) where readsPrec2 = readsPrec; readList2 = readList +instance (Read a, Read b, Read c, Read d, Read e) => Read2 ((,,,,,,) a b c d e) where readsPrec2 = readsPrec; readList2 = readList +instance (Read a, Read b, Read c, Read d, Read e, Read f) => Read2 ((,,,,,,,) a b c d e f) where readsPrec2 = readsPrec; readList2 = readList +instance (Read a, Read b, Read c, Read d, Read e, Read f, Read g) => Read2 ((,,,,,,,,) a b c d e f g) where readsPrec2 = readsPrec; readList2 = readList +instance (Read a, Read b, Read c, Read d, Read e, Read f, Read g, Read h) => Read2 ((,,,,,,,,,) a b c d e f g h) where readsPrec2 = readsPrec; readList2 = readList read2 :: (Read2 f, Read a, Read b) => String -> f a b read2 s = either error id (readEither2 s) @@ -491,7 +615,7 @@ readListPrec2Default = list readPrec2 #endif --- annoying to hav to copy these from Text.Read +-- annoying to have to copy these from Text.Read list :: ReadPrec a -> ReadPrec [a] -- ^ @(list p)@ parses a list of things parsed by @p@, -- using the usual square-bracket syntax. @@ -513,38 +637,26 @@ xs <- listRest True return (x:xs) +-- If Show1 and Read1 are ever derived by the same mechanism as +-- Show and Read, rather than GND, that will change their behavior +-- here. newtype Lift1 f a = Lift1 { lower1 :: f a } - deriving (Functor, Foldable, Traversable) + deriving (Functor, Foldable, Traversable, Eq1, Ord1, Show1, Read1) -instance Eq1 f => Eq1 (Lift1 f) where Lift1 a ==# Lift1 b = a ==# b -instance Ord1 f => Ord1 (Lift1 f) where Lift1 a `compare1` Lift1 b = compare1 a b -instance Show1 f => Show1 (Lift1 f) where showsPrec1 d (Lift1 a) = showsPrec1 d a -instance Read1 f => Read1 (Lift1 f) where - readsPrec1 d = map (first Lift1) . readsPrec1 d - -instance (Eq1 f, Eq a) => Eq (Lift1 f a) where Lift1 a == Lift1 b = a ==# b -instance (Ord1 f, Ord a) => Ord (Lift1 f a) where Lift1 a `compare` Lift1 b = compare1 a b -instance (Show1 f, Show a) => Show (Lift1 f a) where showsPrec d (Lift1 a) = showsPrec1 d a -instance (Read1 f, Read a) => Read (Lift1 f a) where - readsPrec d = map (first Lift1) . readsPrec1 d +instance (Eq1 f, Eq a) => Eq (Lift1 f a) where (==) = (==#) +instance (Ord1 f, Ord a) => Ord (Lift1 f a) where compare = compare1 +instance (Show1 f, Show a) => Show (Lift1 f a) where showsPrec = showsPrec1 +instance (Read1 f, Read a) => Read (Lift1 f a) where readsPrec = readsPrec1 newtype Lift2 f a b = Lift2 { lower2 :: f a b } - deriving (Functor, Foldable, Traversable) + deriving (Functor, Foldable, Traversable, Eq2, Ord2, Show2, Read2) -instance Eq2 f => Eq2 (Lift2 f) where Lift2 a ==## Lift2 b = a ==## b -instance Ord2 f => Ord2 (Lift2 f) where Lift2 a `compare2` Lift2 b = compare2 a b -instance Show2 f => Show2 (Lift2 f) where showsPrec2 d (Lift2 a) = showsPrec2 d a -instance Read2 f => Read2 (Lift2 f) where - readsPrec2 d = map (first Lift2) . readsPrec2 d - -instance (Eq2 f, Eq a) => Eq1 (Lift2 f a) where Lift2 a ==# Lift2 b = a ==## b -instance (Ord2 f, Ord a) => Ord1 (Lift2 f a) where Lift2 a `compare1` Lift2 b = compare2 a b -instance (Show2 f, Show a) => Show1 (Lift2 f a) where showsPrec1 d (Lift2 a) = showsPrec2 d a -instance (Read2 f, Read a) => Read1 (Lift2 f a) where - readsPrec1 d = map (first Lift2) . readsPrec2 d - -instance (Eq2 f, Eq a, Eq b) => Eq (Lift2 f a b) where Lift2 a == Lift2 b = a ==## b -instance (Ord2 f, Ord a, Ord b) => Ord (Lift2 f a b) where Lift2 a `compare` Lift2 b = compare2 a b -instance (Show2 f, Show a, Show b) => Show (Lift2 f a b) where showsPrec d (Lift2 a) = showsPrec2 d a -instance (Read2 f, Read a, Read b) => Read (Lift2 f a b) where - readsPrec d = map (first Lift2) . readsPrec2 d +instance (Eq2 f, Eq a) => Eq1 (Lift2 f a) where (==#) = (==##) +instance (Ord2 f, Ord a) => Ord1 (Lift2 f a) where compare1 = compare2 +instance (Show2 f, Show a) => Show1 (Lift2 f a) where showsPrec1 = showsPrec2 +instance (Read2 f, Read a) => Read1 (Lift2 f a) where readsPrec1 = readsPrec2 + +instance (Eq2 f, Eq a, Eq b) => Eq (Lift2 f a b) where (==) = (==##) +instance (Ord2 f, Ord a, Ord b) => Ord (Lift2 f a b) where compare = compare2 +instance (Show2 f, Show a, Show b) => Show (Lift2 f a b) where showsPrec = showsPrec2 +instance (Read2 f, Read a, Read b) => Read (Lift2 f a b) where readsPrec = readsPrec2

1 0

commit ghc-free for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package ghc-free for openSUSE:Factory checked in at 2016-01-21 23:43:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-free (Old) and /work/SRC/openSUSE:Factory/.ghc-free.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-free" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-free/ghc-free.changes 2015-08-27 08:55:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-free.new/ghc-free.changes 2016-01-22 01:08:49.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Jan 18 10:33:25 UTC 2016 - mimi.vx(a)gmail.com + +- update to 4.12.4 +* Add instances for ExceptT: like ErrorT, but without an Error constraint. +* Support containers +* Support transformers 0.5 +* Removed a number of spurious class constraints. +* Support comonad 5 + +------------------------------------------------------------------- Old: ---- free-4.12.1.tar.gz New: ---- free-4.12.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-free.spec ++++++ --- /var/tmp/diff_new_pack.kNrhli/_old 2016-01-22 01:08:51.000000000 +0100 +++ /var/tmp/diff_new_pack.kNrhli/_new 2016-01-22 01:08:51.000000000 +0100 @@ -18,7 +18,7 @@ %global pkg_name free Name: ghc-free -Version: 4.12.1 +Version: 4.12.4 Release: 0 Summary: Monads for free Group: System/Libraries @@ -33,6 +33,7 @@ # Begin cabal-rpm deps: BuildRequires: ghc-bifunctors-devel BuildRequires: ghc-comonad-devel +BuildRequires: ghc-containers-devel BuildRequires: ghc-distributive-devel BuildRequires: ghc-exceptions-devel BuildRequires: ghc-mtl-devel ++++++ free-4.12.1.tar.gz -> free-4.12.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-4.12.1/.travis.yml new/free-4.12.4/.travis.yml --- old/free-4.12.1/.travis.yml 2015-05-15 19:34:34.000000000 +0200 +++ new/free-4.12.4/.travis.yml 2016-01-17 03:15:13.000000000 +0100 @@ -1,13 +1,14 @@ env: - - GHCVER=7.4.2 CABALVER=1.16 - - GHCVER=7.6.3 CABALVER=1.16 + - GHCVER=7.4.2 CABALVER=1.18 + - GHCVER=7.6.3 CABALVER=1.18 - GHCVER=7.8.4 CABALVER=1.18 - - GHCVER=7.10.1 CABALVER=1.22 - - GHCVER=head CABALVER=1.22 + - GHCVER=7.10.2 CABALVER=1.22 + - GHCVER=8.0.1 CABALVER=1.24 + - GHCVER=head CABALVER=1.24 matrix: allow_failures: - - env: GHCVER=head CABALVER=1.22 + - env: GHCVER=head CABALVER=1.24 before_install: - travis_retry sudo add-apt-repository -y ppa:hvr/ghc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-4.12.1/CHANGELOG.markdown new/free-4.12.4/CHANGELOG.markdown --- old/free-4.12.1/CHANGELOG.markdown 2015-05-15 19:34:34.000000000 +0200 +++ new/free-4.12.4/CHANGELOG.markdown 2016-01-17 03:15:13.000000000 +0100 @@ -1,3 +1,19 @@ +4.12.4 +------ +* Removed a number of spurious class constraints. +* Support GHC 8 + +4.12.3 +------ +* Support `comonad` 5 + +4.12.2 +------ +* Add instances for `ExceptT`: like `ErrorT`, but without an `Error` constraint. +* Support `containers` +* Support `transformers` 0.5 + + 4.12.1 ------ * Support GHC 7.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-4.12.1/README.markdown new/free-4.12.4/README.markdown --- old/free-4.12.1/README.markdown 2015-05-15 19:34:34.000000000 +0200 +++ new/free-4.12.4/README.markdown 2016-01-17 03:15:13.000000000 +0100 @@ -1,7 +1,7 @@ free ==== -[![Build Status](https://secure.travis-ci.org/ekmett/free.png?branch=master)](http:/… +[![Hackage](https://img.shields.io/hackage/v/free.svg)](https://hackage.haskell.org/package/free) [![Build Status](https://secure.travis-ci.org/ekmett/free.png?branch=master)](http:/… This package provides a common definitions for working with free monads, free applicatives, and cofree comonads in Haskell. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-4.12.1/examples/Cabbage.lhs new/free-4.12.4/examples/Cabbage.lhs --- old/free-4.12.1/examples/Cabbage.lhs 2015-05-15 19:34:34.000000000 +0200 +++ new/free-4.12.4/examples/Cabbage.lhs 2016-01-17 03:15:13.000000000 +0100 @@ -43,7 +43,7 @@ @ *Cabbage> singleOut1 (== Sheep) [Wolf, Sheep, Cabbage] -[(Just Wolf,[Sheep,Cabbage]),(Just Sheep,[Wolf,Cabbage]),(Just Cabbage,[Wolf,Sheep]),(Nothing,[Wolf,Sheep,Cabbage])] +(Just Sheep,[Wolf,Cabbage]) @ > singleOutAll :: [a] -> [(Maybe a,[a])] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-4.12.1/free.cabal new/free-4.12.4/free.cabal --- old/free-4.12.1/free.cabal 2015-05-15 19:34:34.000000000 +0200 +++ new/free-4.12.4/free.cabal 2016-01-17 03:15:13.000000000 +0100 @@ -1,6 +1,6 @@ name: free category: Control, Monads -version: 4.12.1 +version: 4.12.4 license: BSD3 cabal-version: >= 1.10 license-file: LICENSE @@ -69,16 +69,18 @@ build-depends: base == 4.*, bifunctors >= 4 && < 6, - comonad == 4.*, + comonad >= 4 && < 6, distributive >= 0.2.1, mtl >= 2.0.1.0 && < 2.3, prelude-extras >= 0.4 && < 1, profunctors >= 4 && < 6, semigroupoids >= 4 && < 6, semigroups >= 0.8.3.1 && < 1, - transformers >= 0.2.0 && < 0.5, + transformers >= 0.2.0 && < 0.6, + transformers-compat >= 0.3 && < 1, template-haskell >= 2.7.0.0 && < 3, - exceptions >= 0.6 && < 0.9 + exceptions >= 0.6 && < 0.9, + containers < 0.6 exposed-modules: Control.Applicative.Free diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-4.12.1/src/Control/Alternative/Free.hs new/free-4.12.4/src/Control/Alternative/Free.hs --- old/free-4.12.1/src/Control/Alternative/Free.hs 2015-05-15 19:34:34.000000000 +0200 +++ new/free-4.12.4/src/Control/Alternative/Free.hs 2016-01-17 03:15:13.000000000 +0100 @@ -69,7 +69,7 @@ (Alt xs) <*> ys = Alt (xs >>= alternatives . (`ap'` ys)) where - ap' :: (Functor f) => AltF f (a -> b) -> Alt f a -> Alt f b + ap' :: AltF f (a -> b) -> Alt f a -> Alt f b Pure f `ap'` u = fmap f u (u `Ap` f) `ap'` v = Alt [u `Ap` (flip <$> f) <*> v] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-4.12.1/src/Control/Comonad/Cofree/Class.hs new/free-4.12.4/src/Control/Comonad/Cofree/Class.hs --- old/free-4.12.1/src/Control/Comonad/Cofree/Class.hs 2015-05-15 19:34:34.000000000 +0200 +++ new/free-4.12.4/src/Control/Comonad/Cofree/Class.hs 2016-01-17 03:15:13.000000000 +0100 @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE FunctionalDependencies #-} {-# LANGUAGE FlexibleInstances #-} @@ -23,7 +24,10 @@ import Control.Comonad.Trans.Traced import Control.Comonad.Trans.Identity import Data.List.NonEmpty -import Data.Semigroup +import Data.Tree +#if __GLASGOW_HASKELL__ < 710 +import Data.Monoid +#endif -- | Allows you to peel a layer off a cofree comonad. class (Functor f, Comonad w) => ComonadCofree f w | w -> f where @@ -34,6 +38,9 @@ unwrap (_ :| []) = Nothing unwrap (_ :| (a : as)) = Just (a :| as) +instance ComonadCofree [] Tree where + unwrap = subForest + instance ComonadCofree (Const b) ((,) b) where unwrap = Const . fst @@ -46,5 +53,5 @@ instance ComonadCofree f w => ComonadCofree f (StoreT s w) where unwrap (StoreT wsa s) = flip StoreT s <$> unwrap wsa -instance (ComonadCofree f w, Semigroup m, Monoid m) => ComonadCofree f (TracedT m w) where +instance (ComonadCofree f w, Monoid m) => ComonadCofree f (TracedT m w) where unwrap (TracedT wma) = TracedT <$> unwrap wma diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-4.12.1/src/Control/Comonad/Cofree.hs new/free-4.12.4/src/Control/Comonad/Cofree.hs --- old/free-4.12.1/src/Control/Comonad/Cofree.hs 2015-05-15 19:34:34.000000000 +0200 +++ new/free-4.12.4/src/Control/Comonad/Cofree.hs 2016-01-17 03:15:13.000000000 +0100 @@ -25,6 +25,7 @@ , ComonadCofree(..) , section , coiter + , coiterW , unfold , unfoldM , hoistCofree @@ -41,6 +42,7 @@ import Control.Comonad.Env.Class import Control.Comonad.Store.Class as Class import Control.Comonad.Traced.Class +import Control.Comonad.Hoist.Class import Control.Category import Control.Monad(ap, (>=>), liftM) import Control.Monad.Zip @@ -64,7 +66,7 @@ -- /Formally/ -- -- A 'Comonad' @v@ is a cofree 'Comonad' for @f@ if every comonad homomorphism --- another comonad @w@ to @v@ is equivalent to a natural transformation +-- from another comonad @w@ to @v@ is equivalent to a natural transformation -- from @w@ to @f@. -- -- A 'cofree' functor is right adjoint to a forgetful functor. @@ -110,6 +112,10 @@ coiter :: Functor f => (a -> f a) -> a -> Cofree f a coiter psi a = a :< (coiter psi <$> psi a) +-- | Like coiter for comonadic values. +coiterW :: (Comonad w, Functor f) => (w a -> f (w a)) -> w a -> Cofree f a +coiterW psi a = extract a :< (coiterW psi <$> psi a) + -- | Unfold a cofree comonad from a seed. unfold :: Functor f => (b -> (a, f b)) -> b -> Cofree f a unfold f c = case f c of @@ -151,7 +157,7 @@ {-# INLINE lower #-} instance Alternative f => Monad (Cofree f) where - return x = x :< empty + return = pure {-# INLINE return #-} (a :< m) >>= k = case k a of b :< n -> b :< (n <|> fmap (>>= k) m) @@ -182,7 +188,7 @@ {-# INLINE (@>) #-} instance Alternative f => Applicative (Cofree f) where - pure = return + pure x = x :< empty {-# INLINE pure #-} (<*>) = ap {-# INLINE (<*>) #-} @@ -235,6 +241,10 @@ foldMap f = go where go (a :< as) = f a `mappend` foldMap go as {-# INLINE foldMap #-} +#if __GLASGOW_HASKELL__ >= 709 + length = go 0 where + go s (_ :< as) = foldl' go (s + 1) as +#endif instance Foldable1 f => Foldable1 (Cofree f) where foldMap1 f = go where @@ -291,6 +301,9 @@ {-# NOINLINE cofreeDataType #-} #endif +instance ComonadHoist Cofree where + cohoist = hoistCofree + instance ComonadEnv e w => ComonadEnv e (Cofree w) where ask = ask . lower {-# INLINE ask #-} @@ -331,12 +344,24 @@ _unwrap f (a :< as) = (a :<) <$> f as {-# INLINE _unwrap #-} --- | Construct a @Lens@ into a @'Cofree' f@ given a list of lenses into the base functor. +-- | Construct an @Lens@ into a @'Cofree' g@ given a list of lenses into the base functor. +-- When the input list is empty, this is equivalent to '_extract'. +-- When the input list is non-empty, this composes the input lenses +-- with '_unwrap' to walk through the @'Cofree' g@ before using +-- '_extract' to get the element at the final location. -- -- For more on lenses see the 'lens' package on hackage. -- --- @telescoped :: 'Functor' g => [Lens' ('Cofree' g a) (g ('Cofree' g a))] -> Lens' ('Cofree' g a) a@ -telescoped :: (Functor f, Functor g) => +-- @telescoped :: [Lens' (g ('Cofree' g a)) ('Cofree' g a)] -> Lens' ('Cofree' g a) a@ +-- +-- @telescoped :: [Traversal' (g ('Cofree' g a)) ('Cofree' g a)] -> Traversal' ('Cofree' g a) a@ +-- +-- @telescoped :: [Getter (g ('Cofree' g a)) ('Cofree' g a)] -> Getter ('Cofree' g a) a@ +-- +-- @telescoped :: [Fold (g ('Cofree' g a)) ('Cofree' g a)] -> Fold ('Cofree' g a) a@ +-- +-- @telescoped :: [Setter' (g ('Cofree' g a)) ('Cofree' g a)] -> Setter' ('Cofree' g a) a@ +telescoped :: Functor f => [(Cofree g a -> f (Cofree g a)) -> g (Cofree g a) -> f (g (Cofree g a))] -> (a -> f a) -> Cofree g a -> f (Cofree g a) telescoped = Prelude.foldr (\l r -> _unwrap . l . r) _extract diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-4.12.1/src/Control/Comonad/Trans/Cofree.hs new/free-4.12.4/src/Control/Comonad/Trans/Cofree.hs --- old/free-4.12.1/src/Control/Comonad/Trans/Cofree.hs 2015-05-15 19:34:34.000000000 +0200 +++ new/free-4.12.4/src/Control/Comonad/Trans/Cofree.hs 2016-01-17 03:15:13.000000000 +0100 @@ -3,6 +3,7 @@ {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE UndecidableInstances #-} {-# LANGUAGE MultiParamTypeClasses #-} +{-# LANGUAGE Rank2Types #-} #if __GLASGOW_HASKELL__ >= 707 {-# LANGUAGE DeriveDataTypeable #-} #endif @@ -26,6 +27,7 @@ , ComonadCofree(..) , headF , tailF + , transCofreeT , coiterT ) where @@ -33,6 +35,8 @@ import Control.Comonad import Control.Comonad.Trans.Class import Control.Comonad.Cofree.Class +import Control.Comonad.Env.Class +import Control.Comonad.Hoist.Class import Control.Category import Data.Bifunctor import Data.Bifoldable @@ -83,6 +87,10 @@ instance Traversable f => Bitraversable (CofreeF f) where bitraverse f g (a :< as) = (:<) <$> f a <*> traverse g as +transCofreeF :: (forall x. f x -> g x) -> CofreeF f a b -> CofreeF g a b +transCofreeF t (a :< fb) = a :< t fb +{-# INLINE transCofreeF #-} + -- | This is a cofree comonad of some functor @f@, with a comonad @w@ threaded through it at each level. newtype CofreeT f w a = CofreeT { runCofreeT :: w (CofreeF f a (CofreeT f w a)) } #if __GLASGOW_HASKELL__ >= 707 @@ -132,12 +140,19 @@ instance (Traversable f, Traversable w) => Traversable (CofreeT f w) where traverse f = fmap CofreeT . traverse (bitraverse f (traverse f)) . runCofreeT -instance Functor f => ComonadTrans (CofreeT f) where +instance ComonadTrans (CofreeT f) where lower = fmap headF . runCofreeT instance (Functor f, Comonad w) => ComonadCofree f (CofreeT f w) where unwrap = tailF . extract . runCofreeT +instance (Functor f, ComonadEnv e w) => ComonadEnv e (CofreeT f w) where + ask = ask . lower + {-# INLINE ask #-} + +instance Functor f => ComonadHoist (CofreeT f) where + cohoist g = CofreeT . fmap (second (cohoist g)) . g . runCofreeT + instance Show (w (CofreeF f a (CofreeT f w a))) => Show (CofreeT f w a) where showsPrec d (CofreeT w) = showParen (d > 10) $ showString "CofreeT " . showsPrec 11 w @@ -153,8 +168,10 @@ compare (CofreeT a) (CofreeT b) = compare a b instance (Alternative f, Monad w) => Monad (CofreeT f w) where +#if __GLASGOW_HASKELL__ < 710 return = CofreeT . return . (:< empty) {-# INLINE return #-} +#endif CofreeT cx >>= f = CofreeT $ do a :< m <- cx b :< n <- runCofreeT $ f a @@ -177,6 +194,10 @@ (a :< fa, b :< fb) <- mzip ma mb return $ (a, b) :< (uncurry mzip <$> mzip fa fb) +-- | Lift a natural transformation from @f@ to @g@ into a comonad homomorphism from @'CofreeT' f w@ to @'CofreeT' g w@ +transCofreeT :: (Functor g, Comonad w) => (forall x. f x -> g x) -> CofreeT f w a -> CofreeT g w a +transCofreeT t = CofreeT . liftW (fmap (transCofreeT t) . transCofreeF t) . runCofreeT + -- | Unfold a @CofreeT@ comonad transformer from a coalgebra and an initial comonad. coiterT :: (Functor f, Comonad w) => (w a -> f (w a)) -> w a -> CofreeT f w a coiterT psi = CofreeT . extend (\w -> extract w :< fmap (coiterT psi) (psi w)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-4.12.1/src/Control/Monad/Free/Church.hs new/free-4.12.4/src/Control/Monad/Free/Church.hs --- old/free-4.12.1/src/Control/Monad/Free/Church.hs 2015-05-15 19:34:34.000000000 +0200 +++ new/free-4.12.4/src/Control/Monad/Free/Church.hs 2016-01-17 03:15:13.000000000 +0100 @@ -56,6 +56,7 @@ ( F(..) , improve , fromF + , iter , iterM , toF , retract @@ -69,7 +70,7 @@ import Control.Applicative import Control.Monad as Monad import Control.Monad.Fix -import Control.Monad.Free hiding (retract, iterM, cutoff) +import Control.Monad.Free hiding (retract, iter, iterM, cutoff) import qualified Control.Monad.Free as Free import Control.Monad.Reader.Class import Control.Monad.Writer.Class @@ -87,8 +88,12 @@ -- <http://comonad.com/reader/2011/free-monads-for-less-2/> newtype F f a = F { runF :: forall r. (a -> r) -> (f r -> r) -> r } +-- | Tear down a 'Free' 'Monad' using iteration. +iter :: (f a -> a) -> F f a -> a +iter phi xs = runF xs id phi + -- | Like iter for monadic values. -iterM :: (Monad m, Functor f) => (f (m a) -> m a) -> F f a -> m a +iterM :: Monad m => (f (m a) -> m a) -> F f a -> m a iterM phi xs = runF xs return phi instance Functor (F f) where @@ -110,7 +115,7 @@ (>>-) = (>>=) instance Monad (F f) where - return a = F (\kp _ -> kp a) + return = pure F m >>= f = F (\kp kf -> m (\a -> runF (f a) kp kf) kf) instance MonadFix (F f) where @@ -118,7 +123,7 @@ a = f (impure a) impure (F x) = x id (error "MonadFix (F f): wrap") -instance (Foldable f, Functor f) => Foldable (F f) where +instance Foldable f => Foldable (F f) where foldr f r xs = runF xs f (foldr (.) id) r {-# INLINE foldr #-} @@ -169,7 +174,7 @@ hoistF :: (forall x. f x -> g x) -> F f a -> F g a hoistF t (F m) = F (\p f -> m p (f . t)) --- | The very definition of a free monoid is that given a natural transformation you get a monoid homomorphism. +-- | The very definition of a free monad is that given a natural transformation you get a monad homomorphism. foldF :: Monad m => (forall x. f x -> m x) -> F f a -> m a foldF f (F m) = m return (Monad.join . f) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-4.12.1/src/Control/Monad/Free/Class.hs new/free-4.12.4/src/Control/Monad/Free/Class.hs --- old/free-4.12.1/src/Control/Monad/Free/Class.hs 2015-05-15 19:34:34.000000000 +0200 +++ new/free-4.12.4/src/Control/Monad/Free/Class.hs 2016-01-17 03:15:13.000000000 +0100 @@ -43,6 +43,7 @@ import Control.Monad.Trans.Maybe import Control.Monad.Trans.List import Control.Monad.Trans.Error +import Control.Monad.Trans.Except import Control.Monad.Trans.Identity #if !(MIN_VERSION_base(4,8,0)) @@ -144,6 +145,9 @@ instance (Functor f, MonadFree f m, Error e) => MonadFree f (ErrorT e m) where wrap = ErrorT . wrap . fmap runErrorT +instance (Functor f, MonadFree f m) => MonadFree f (ExceptT e m) where + wrap = ExceptT . wrap . fmap runExceptT + -- instance (Functor f, MonadFree f m) => MonadFree f (EitherT e m) where -- wrap = EitherT . wrap . fmap runEitherT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-4.12.1/src/Control/Monad/Free/TH.hs new/free-4.12.4/src/Control/Monad/Free/TH.hs --- old/free-4.12.1/src/Control/Monad/Free/TH.hs 2015-05-15 19:34:34.000000000 +0200 +++ new/free-4.12.4/src/Control/Monad/Free/TH.hs 2016-01-17 03:15:13.000000000 +0100 @@ -189,13 +189,18 @@ RecC cName fields -> liftCon' typeSig ts cx f n ns cName $ map (\(_, _, ty) -> ty) fields InfixC (_,t1) cName (_,t2) -> liftCon' typeSig ts cx f n ns cName [t1, t2] ForallC ts' cx' con' -> liftCon typeSig (ts ++ ts') (cx ++ cx') f n ns con' + _ -> fail "Unsupported constructor type" -- | Provide free monadic actions for a type declaration. liftDec :: Bool -- ^ Include type signature? -> Maybe [Name] -- ^ Include only mentioned constructor names. Use all constructors when @Nothing@. -> Dec -- ^ Data type declaration. -> Q [Dec] +#if MIN_VERSION_template_haskell(2,11,0) +liftDec typeSig onlyCons (DataD _ tyName tyVarBndrs _ cons _) +#else liftDec typeSig onlyCons (DataD _ tyName tyVarBndrs cons _) +#endif | null tyVarBndrs = fail $ "Type " ++ show tyName ++ " needs at least one free variable" | otherwise = concat <$> mapM (liftCon typeSig [] [] con nextTyName (init tyNames)) cons' where @@ -213,6 +218,7 @@ constructorName (RecC name _) = name constructorName (InfixC _ name _) = name constructorName (ForallC _ _ c) = constructorName c +constructorName _ = error "Unsupported constructor type" -- | Generate monadic actions for a data type. genFree :: Bool -- ^ Include type signature? @@ -232,7 +238,11 @@ genFreeCon typeSig cname = do info <- reify cname case info of - DataConI _ _ tname _ -> genFree typeSig (Just [cname]) tname + DataConI _ _ tname +#if !(MIN_VERSION_template_haskell(2,11,0)) + _ +#endif + -> genFree typeSig (Just [cname]) tname _ -> fail "makeFreeCon expects a data constructor" -- | @$('makeFree' ''T)@ provides free monadic actions for the @@ -240,7 +250,7 @@ makeFree :: Name -> Q [Dec] makeFree = genFree True Nothing --- | Like 'makeFreeCon', but does not provide type signatures. +-- | Like 'makeFree', but does not provide type signatures. -- This can be used to attach Haddock comments to individual arguments -- for each generated function. -- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-4.12.1/src/Control/Monad/Free.hs new/free-4.12.4/src/Control/Monad/Free.hs --- old/free-4.12.1/src/Control/Monad/Free.hs 2015-05-15 19:34:34.000000000 +0200 +++ new/free-4.12.4/src/Control/Monad/Free.hs 2016-01-17 03:15:13.000000000 +0100 @@ -28,6 +28,7 @@ , retract , liftF , iter + , iterA , iterM , hoistFree , foldFree @@ -186,7 +187,7 @@ Free m >>- f = Free ((>>- f) <$> m) instance Functor f => Monad (Free f) where - return = Pure + return = pure {-# INLINE return #-} Pure a >>= f = f a Free m >>= f = Free ((>>= f) <$> m) @@ -303,18 +304,23 @@ iter _ (Pure a) = a iter phi (Free m) = phi (iter phi <$> m) --- | Like iter for monadic values. +-- | Like 'iter' for applicative values. +iterA :: (Applicative p, Functor f) => (f (p a) -> p a) -> Free f a -> p a +iterA _ (Pure x) = pure x +iterA phi (Free f) = phi (iterA phi <$> f) + +-- | Like 'iter' for monadic values. iterM :: (Monad m, Functor f) => (f (m a) -> m a) -> Free f a -> m a iterM _ (Pure x) = return x -iterM phi (Free f) = phi $ fmap (iterM phi) f +iterM phi (Free f) = phi (iterM phi <$> f) -- | Lift a natural transformation from @f@ to @g@ into a natural transformation from @'FreeT' f@ to @'FreeT' g@. hoistFree :: Functor g => (forall a. f a -> g a) -> Free f b -> Free g b hoistFree _ (Pure a) = Pure a hoistFree f (Free as) = Free (hoistFree f <$> f as) --- | The very definition of a free monoid is that given a natural transformation you get a monoid homomorphism. -foldFree :: (Functor m, Monad m) => (forall x . f x -> m x) -> Free f a -> m a +-- | The very definition of a free monad is that given a natural transformation you get a monad homomorphism. +foldFree :: Monad m => (forall x . f x -> m x) -> Free f a -> m a foldFree _ (Pure a) = return a foldFree f (Free as) = f as >>= foldFree f diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-4.12.1/src/Control/Monad/Trans/Free/Church.hs new/free-4.12.4/src/Control/Monad/Trans/Free/Church.hs --- old/free-4.12.1/src/Control/Monad/Trans/Free/Church.hs 2015-05-15 19:34:34.000000000 +0200 +++ new/free-4.12.4/src/Control/Monad/Trans/Free/Church.hs 2016-01-17 03:15:13.000000000 +0100 @@ -146,10 +146,10 @@ {-# INLINE throwError #-} m `catchError` f = toFT $ fromFT m `catchError` (fromFT . f) -instance (MonadCont m) => MonadCont (FT f m) where +instance MonadCont m => MonadCont (FT f m) where callCC f = join . lift $ callCC (\k -> return $ f (lift . k . return)) -instance (Functor f, MonadReader r m) => MonadReader r (FT f m) where +instance MonadReader r m => MonadReader r (FT f m) where ask = lift ask {-# INLINE ask #-} local f = hoistFT (local f) @@ -165,7 +165,7 @@ {-# INLINE writer #-} #endif -instance (Functor f, MonadState s m) => MonadState s (FT f m) where +instance MonadState s m => MonadState s (FT f m) where get = lift get {-# INLINE get #-} put = lift . put @@ -223,7 +223,7 @@ hoistFT phi (FT m) = FT (\kp kf -> join . phi $ m (return . kp) (\xg -> return . kf (join . phi . xg))) -- | Lift a natural transformation from @f@ to @g@ into a monad homomorphism from @'FT' f m@ to @'FT' g n@ -transFT :: Monad m => (forall a. f a -> g a) -> FT f m b -> FT g m b +transFT :: (forall a. f a -> g a) -> FT f m b -> FT g m b transFT phi (FT m) = FT (\kp kf -> m kp (\xg -> kf xg . phi)) -- | Pull out and join @m@ layers of @'FreeT' f m a@. @@ -252,7 +252,11 @@ -- @ -- 'retract' . 'liftF' = 'id' -- @ +#if __GLASGOW_HASKELL__ < 710 retract :: (Functor f, Monad f) => F f a -> f a +#else +retract :: Monad f => F f a -> f a +#endif retract m = runF m return join {-# INLINE retract #-} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-4.12.1/src/Control/Monad/Trans/Free.hs new/free-4.12.4/src/Control/Monad/Trans/Free.hs --- old/free-4.12.1/src/Control/Monad/Trans/Free.hs 2015-05-15 19:34:34.000000000 +0200 +++ new/free-4.12.4/src/Control/Monad/Trans/Free.hs 2016-01-17 03:15:13.000000000 +0100 @@ -224,7 +224,7 @@ instance (Functor f, Monad m) => Monad (FreeT f m) where fail e = FreeT (fail e) - return a = FreeT (return (Pure a)) + return = pure {-# INLINE return #-} FreeT m >>= f = FreeT $ m >>= \v -> case v of Pure a -> runFreeT (f a) @@ -332,7 +332,7 @@ hoistFreeT :: (Monad m, Functor f) => (forall a. m a -> n a) -> FreeT f m b -> FreeT f n b hoistFreeT mh = FreeT . mh . liftM (fmap (hoistFreeT mh)) . runFreeT --- | Lift a natural transformation from @f@ to @g@ into a monad homomorphism from @'FreeT' f m@ to @'FreeT' g n@ +-- | Lift a natural transformation from @f@ to @g@ into a monad homomorphism from @'FreeT' f m@ to @'FreeT' g m@ transFreeT :: (Monad m, Functor g) => (forall a. f a -> g a) -> FreeT f m b -> FreeT g m b transFreeT nt = FreeT . liftM (fmap (transFreeT nt) . transFreeF nt) . runFreeT @@ -431,7 +431,11 @@ -- @ -- 'intercalateT' f ≡ 'retractT' . 'intersperseT' f -- @ +#if __GLASGOW_HASKELL__ < 710 intercalateT :: (Monad m, MonadTrans t, Monad (t m), Functor (t m)) => t m a -> FreeT (t m) m b -> t m b +#else +intercalateT :: (Monad m, MonadTrans t, Monad (t m)) => t m a -> FreeT (t m) m b -> t m b +#endif intercalateT f (FreeT m) = do val <- lift m case val of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/free-4.12.1/src/Control/Monad/Trans/Iter.hs new/free-4.12.4/src/Control/Monad/Trans/Iter.hs --- old/free-4.12.1/src/Control/Monad/Trans/Iter.hs 2015-05-15 19:34:34.000000000 +0200 +++ new/free-4.12.4/src/Control/Monad/Trans/Iter.hs 2016-01-17 03:15:13.000000000 +0100 @@ -172,7 +172,7 @@ {-# INLINE (<*>) #-} instance Monad m => Monad (IterT m) where - return = IterT . return . Left + return = pure {-# INLINE return #-} IterT m >>= k = IterT $ m >>= either (runIterT . k) (return . Right . (>>= k)) {-# INLINE (>>=) #-}

1 0

commit bustle for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package bustle for openSUSE:Factory checked in at 2016-01-21 23:43:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bustle (Old) and /work/SRC/openSUSE:Factory/.bustle.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bustle" Changes: -------- --- /work/SRC/openSUSE:Factory/bustle/bustle.changes 2015-09-08 18:06:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bustle.new/bustle.changes 2016-01-22 01:08:48.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Jan 15 09:48:47 UTC 2016 - mimi.vx(a)gmail.com + +- update to 0.5.3 +* No functional changes! +* Add keywords to `.desktop` file +* Update screenshots in `.appdata.xml` file + +------------------------------------------------------------------- Old: ---- bustle-0.5.2.tar.gz New: ---- bustle-0.5.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bustle.spec ++++++ --- /var/tmp/diff_new_pack.PKiGvb/_old 2016-01-22 01:08:49.000000000 +0100 +++ /var/tmp/diff_new_pack.PKiGvb/_new 2016-01-22 01:08:49.000000000 +0100 @@ -18,7 +18,7 @@ %bcond_with tests Name: bustle -Version: 0.5.2 +Version: 0.5.3 Release: 0 Summary: Draw sequence diagrams of D-Bus traffic Group: System/Libraries ++++++ bustle-0.5.2.tar.gz -> bustle-0.5.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bustle-0.5.2/HACKING.md new/bustle-0.5.3/HACKING.md --- old/bustle-0.5.2/HACKING.md 2015-08-18 13:23:07.000000000 +0200 +++ new/bustle-0.5.3/HACKING.md 2016-01-11 14:52:06.000000000 +0100 @@ -10,5 +10,29 @@ In new code, try to follow <https://github.com/tibbe/haskell-style-guide/blob/master/haskell-style.md>. -Certain authors did not follow it in the past but it seems like a good kind of +The author did not follow it in the past but it seems like a good kind of thing to aim for. + +Releasing Bustle +================ + +* Ideally, automate the steps below +* Update version number in `bustle.cabal` +* Write news in `NEWS.md` + +```sh +# Tag release, build and sign the tarballs +make maintainer-make-release +gpg --detach-sign --armor dist/bustle-x.y.z.tar.gz +gpg --detach-sign --armor dist/bustle-x.y.z-x86_64.tar.bz2 + +# Stick source and binaries on freedesktop.org +mkdir x.y.z +cp dist/bustle-x.y.z* x.y.z/ +scp -r x.y.z annarchy.freedesktop.org:/srv/www.freedesktop.org/www/software/bustle/ + +# Upload source to Hackage +cabal upload + +git push origin --tags master +``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bustle-0.5.2/NEWS.md new/bustle-0.5.3/NEWS.md --- old/bustle-0.5.2/NEWS.md 2015-08-18 13:23:07.000000000 +0200 +++ new/bustle-0.5.3/NEWS.md 2016-01-11 14:52:06.000000000 +0100 @@ -1,3 +1,10 @@ +Bustle 0.5.3 (2016-01-11) +------------------------- + +* No functional changes! +* Add keywords to `.desktop` file +* Update screenshots in `.appdata.xml` file + Bustle 0.5.2 (2015-08-18) ------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bustle-0.5.2/bustle.cabal new/bustle-0.5.3/bustle.cabal --- old/bustle-0.5.2/bustle.cabal 2015-08-18 13:23:07.000000000 +0200 +++ new/bustle-0.5.3/bustle.cabal 2016-01-11 14:52:06.000000000 +0100 @@ -1,6 +1,6 @@ Name: bustle Category: Network, Desktop -Version: 0.5.2 +Version: 0.5.3 Cabal-Version: >= 1.18 Tested-With: GHC >= 7.8.4 && < 7.11 Synopsis: Draw sequence diagrams of D-Bus traffic @@ -202,6 +202,7 @@ type: exitcode-stdio-1.0 main-is: Test/Regions.hs other-modules: Bustle.Regions + default-language: Haskell2010 Build-Depends: base , QuickCheck diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bustle-0.5.2/data/bustle.appdata.xml.in new/bustle-0.5.3/data/bustle.appdata.xml.in --- old/bustle-0.5.2/data/bustle.appdata.xml.in 2015-08-18 13:23:07.000000000 +0200 +++ new/bustle-0.5.3/data/bustle.appdata.xml.in 2016-01-11 14:52:06.000000000 +0100 @@ -16,8 +16,14 @@ and average method call times.</_p> </description> <screenshots> -  - <_screenshot type="default" width="691" height="510">http://willthompson.co.uk/bustle/bustle-0.3.1.png</_screenshot> + <screenshot type="default"> +  + <_image type="source">https://wiki.freedesktop.org/www/Software/Bustle/bustle-0.5.2-1.png</_image> + </screenshot> + <screenshot> +  + <_image type="source">https://wiki.freedesktop.org/www/Software/Bustle/bustle-0.5.2-2.png</_image> + </screenshot> </screenshots> <url type="homepage">http://willthompson.co.uk/bustle/</url> <updatecontact>philip_at_tecnocode.co.uk</updatecontact> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bustle-0.5.2/data/bustle.desktop.in new/bustle-0.5.3/data/bustle.desktop.in --- old/bustle-0.5.2/data/bustle.desktop.in 2015-08-18 13:23:07.000000000 +0200 +++ new/bustle-0.5.3/data/bustle.desktop.in 2016-01-11 14:52:06.000000000 +0100 @@ -7,3 +7,4 @@ Type=Application Categories=GTK;Development;Debugger;Profiling; StartupNotify=true +_Keywords=debug;profile;d-bus;dbus;sequence;monitor;

1 0

commit ghc-dbus for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package ghc-dbus for openSUSE:Factory checked in at 2016-01-21 23:43:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-dbus (Old) and /work/SRC/openSUSE:Factory/.ghc-dbus.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-dbus" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-dbus/ghc-dbus.changes 2015-10-14 16:45:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-dbus.new/ghc-dbus.changes 2016-01-22 01:08:45.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Jan 17 08:16:49 UTC 2016 - mimi.vx(a)gmail.com + +- update to 0.10.12 + +------------------------------------------------------------------- Old: ---- dbus-0.10.11.tar.gz New: ---- dbus-0.10.12.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-dbus.spec ++++++ --- /var/tmp/diff_new_pack.qxFXgI/_old 2016-01-22 01:08:47.000000000 +0100 +++ /var/tmp/diff_new_pack.qxFXgI/_new 2016-01-22 01:08:47.000000000 +0100 @@ -21,7 +21,7 @@ %global debug_package %{nil} %bcond_with tests Name: ghc-dbus -Version: 0.10.11 +Version: 0.10.12 Release: 0 Summary: A client library for the D-Bus IPC system License: GPL-3.0+ ++++++ dbus-0.10.11.tar.gz -> dbus-0.10.12.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-0.10.11/dbus.cabal new/dbus-0.10.12/dbus.cabal --- old/dbus-0.10.11/dbus.cabal 2015-10-12 02:12:17.000000000 +0200 +++ new/dbus-0.10.12/dbus.cabal 2016-01-15 07:59:32.000000000 +0100 @@ -1,5 +1,5 @@ name: dbus -version: 0.10.11 +version: 0.10.12 license: GPL-3 license-file: license.txt author: John Millikin <john(a)john-millikin.com> @@ -83,7 +83,7 @@ source-repository this type: git location: https://john-millikin.com/code/haskell-dbus/ - tag: haskell-dbus_0.10.11 + tag: haskell-dbus_0.10.12 library ghc-options: -Wall -O2 @@ -95,8 +95,8 @@ -- IMPORTANT: keep these in sync with the test suite build-depends: base >= 4.0 && < 5.0 - , bytestring >= 0.9 - , cereal >= 0.3.4 && < 0.5 + , bytestring >= 0.10.2 + , cereal >= 0.3.4 && < 0.6 , containers >= 0.1 && < 0.6 , libxml-sax >= 0.7 && < 0.8 , network >= 2.2.3 @@ -131,8 +131,8 @@ build-depends: base >= 4.0 && < 5.0 - , bytestring >= 0.9 - , cereal >= 0.3.4 && < 0.5 + , bytestring >= 0.10.2 + , cereal >= 0.3.4 && < 0.6 , chell >= 0.4 && < 0.5 , chell-quickcheck >= 0.2 && < 0.3 , containers >= 0.1 && < 0.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-0.10.11/lib/DBus/Transport.hs new/dbus-0.10.12/lib/DBus/Transport.hs --- old/dbus-0.10.11/lib/DBus/Transport.hs 2015-10-12 02:12:17.000000000 +0200 +++ new/dbus-0.10.12/lib/DBus/Transport.hs 2016-01-15 07:59:32.000000000 +0100 @@ -40,15 +40,16 @@ import Control.Exception import qualified Data.ByteString import Data.ByteString (ByteString) +import qualified Data.ByteString.Builder as Builder +import qualified Data.ByteString.Lazy as Lazy import qualified Data.Map as Map +import Data.Monoid (mappend, mempty) import Data.Typeable (Typeable) import Foreign.C (CUInt) import Network.Socket hiding (recv) import Network.Socket.ByteString (sendAll, recv) import qualified System.Info -import qualified Data.Serialize.Builder as Builder - import DBus -- | Thrown from transport methods when an error occurs. @@ -149,24 +150,24 @@ transportClose (SocketTransport addr s) = catchIOException addr (sClose s) recvLoop :: Socket -> Int -> IO ByteString -recvLoop s = loop Builder.empty where +recvLoop s = \n -> Lazy.toStrict `fmap` loop mempty n where chunkSize = 4096 loop acc n = if n > chunkSize then do chunk <- recv s chunkSize - let builder = Builder.append acc (Builder.fromByteString chunk) + let builder = mappend acc (Builder.byteString chunk) loop builder (n - Data.ByteString.length chunk) else do chunk <- recv s n case Data.ByteString.length chunk of -- Unexpected end of connection; maybe the remote end went away. -- Return what we've got so far. - 0 -> return (Builder.toByteString acc) + 0 -> return (Builder.toLazyByteString acc) len -> do - let builder = Builder.append acc (Builder.fromByteString chunk) + let builder = mappend acc (Builder.byteString chunk) if len == n - then return (Builder.toByteString builder) + then return (Builder.toLazyByteString builder) else loop builder (n - Data.ByteString.length chunk) instance TransportOpen SocketTransport where diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-0.10.11/lib/DBus/Wire.hs new/dbus-0.10.12/lib/DBus/Wire.hs --- old/dbus-0.10.11/lib/DBus/Wire.hs 2015-10-12 02:12:17.000000000 +0200 +++ new/dbus-0.10.12/lib/DBus/Wire.hs 2016-01-15 07:59:32.000000000 +0100 @@ -30,11 +30,14 @@ import Control.Monad (ap, liftM, when, unless) import qualified Data.ByteString import Data.ByteString (ByteString) +import qualified Data.ByteString.Builder as Builder import qualified Data.ByteString.Char8 +import qualified Data.ByteString.Lazy as Lazy import Data.Int (Int16, Int32, Int64) import qualified Data.Map import Data.Map (Map) import Data.Maybe (fromJust, listToMaybe, fromMaybe) +import Data.Monoid (mappend, mempty) import Data.Text (Text) import qualified Data.Text.Encoding import qualified Data.Vector @@ -43,7 +46,6 @@ import Foreign.C.Types (CInt) import System.Posix.Types (Fd(..)) -import qualified Data.Serialize.Builder as Builder import qualified Data.Serialize.Get as Get import Data.Serialize.IEEE754 (getFloat64be, getFloat64le, putFloat64be, putFloat64le) import Data.Serialize.Put (runPut) @@ -178,14 +180,19 @@ appendB :: Word64 -> Builder.Builder -> Marshal () appendB size bytes = Wire (\_ (MarshalState builder count) -> let - builder' = Builder.append builder bytes + builder' = mappend builder bytes count' = count + size in WireRR () (MarshalState builder' count')) appendS :: ByteString -> Marshal () appendS bytes = appendB (fromIntegral (Data.ByteString.length bytes)) - (Builder.fromByteString bytes) + (Builder.byteString bytes) + +appendL :: Lazy.ByteString -> Marshal () +appendL bytes = appendB + (fromIntegral (Lazy.length bytes)) + (Builder.lazyByteString bytes) pad :: Word8 -> Marshal () pad count = do @@ -273,25 +280,25 @@ return ret marshalWord8 :: Word8 -> Marshal () -marshalWord8 x = appendB 1 (Builder.singleton x) +marshalWord8 x = appendB 1 (Builder.word8 x) unmarshalWord8 :: Unmarshal Word8 unmarshalWord8 = liftM Data.ByteString.head (consume 1) marshalWord16 :: Word16 -> Marshal () marshalWord16 = marshalBuilder 2 - Builder.putWord16be - Builder.putWord16le + Builder.word16BE + Builder.word16LE marshalWord32 :: Word32 -> Marshal () marshalWord32 = marshalBuilder 4 - Builder.putWord32be - Builder.putWord32le + Builder.word32BE + Builder.word32LE marshalWord64 :: Word64 -> Marshal () marshalWord64 = marshalBuilder 8 - Builder.putWord64be - Builder.putWord64le + Builder.word64BE + Builder.word64LE marshalInt16 :: Int16 -> Marshal () marshalInt16 = marshalWord16 . fromIntegral @@ -414,35 +421,35 @@ skipTerminator fromMaybeU "signature" parseSignatureBytes bytes -arrayMaximumLength :: Int +arrayMaximumLength :: Int64 arrayMaximumLength = 67108864 marshalVector :: Type -> Vector Value -> Marshal () marshalVector t x = do (arrayPadding, arrayBytes) <- getArrayBytes t x - let arrayLen = Data.ByteString.length arrayBytes + let arrayLen = Lazy.length arrayBytes when (arrayLen > arrayMaximumLength) (throwError ("Marshaled array size (" ++ show arrayLen ++ " bytes) exceeds maximum limit of (" ++ show arrayMaximumLength ++ " bytes).")) marshalWord32 (fromIntegral arrayLen) appendS (Data.ByteString.replicate arrayPadding 0) - appendS arrayBytes + appendL arrayBytes marshalStrictBytes :: ByteString -> Marshal () marshalStrictBytes bytes = do - let arrayLen = Data.ByteString.length bytes + let arrayLen = Lazy.length (Lazy.fromStrict bytes) when (fromIntegral arrayLen > arrayMaximumLength) (throwError ("Marshaled array size (" ++ show arrayLen ++ " bytes) exceeds maximum limit of (" ++ show arrayMaximumLength ++ " bytes).")) marshalWord32 (fromIntegral arrayLen) appendS bytes -getArrayBytes :: Type -> Vector Value -> Marshal (Int, ByteString) +getArrayBytes :: Type -> Vector Value -> Marshal (Int, Lazy.ByteString) getArrayBytes itemType vs = do s <- getState (MarshalState _ afterLength) <- marshalWord32 0 >> getState (MarshalState _ afterPadding) <- pad (alignment itemType) >> getState - putState (MarshalState Builder.empty afterPadding) + putState (MarshalState mempty afterPadding) (MarshalState itemBuilder _) <- Data.Vector.mapM_ marshal vs >> getState - let itemBytes = Builder.toByteString itemBuilder + let itemBytes = Builder.toLazyByteString itemBuilder paddingSize = fromIntegral (afterPadding - afterLength) putState s @@ -556,7 +563,7 @@ Nothing -> throwErrorM (UnmarshalError ("Header field " ++ show label ++ " contains invalid value " ++ show x)) marshalMessage :: Message a => Endianness -> Serial -> a - -> Either MarshalError Data.ByteString.ByteString + -> Either MarshalError ByteString marshalMessage e serial msg = runMarshal where body = messageBody msg marshaler = do @@ -566,15 +573,15 @@ (MarshalState bodyBytesB _) <- getState putState empty marshal (toValue (encodeEndianness e)) - let bodyBytes = Builder.toByteString bodyBytesB - marshalHeader msg serial sig (fromIntegral (Data.ByteString.length bodyBytes)) + let bodyBytes = Builder.toLazyByteString bodyBytesB + marshalHeader msg serial sig (fromIntegral (Lazy.length bodyBytes)) pad 8 - appendS bodyBytes + appendL bodyBytes checkMaximumSize - emptyState = MarshalState Builder.empty 0 + emptyState = MarshalState mempty 0 runMarshal = case unWire marshaler e emptyState of WireRL err -> Left (MarshalError err) - WireRR _ (MarshalState builder _) -> Right (Builder.toByteString builder) + WireRR _ (MarshalState builder _) -> Right (Lazy.toStrict (Builder.toLazyByteString builder)) checkBodySig :: [Variant] -> Marshal Signature checkBodySig vs = case signature (map variantType vs) of

1 0

commit ghc-cabal-helper for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package ghc-cabal-helper for openSUSE:Factory checked in at 2016-01-21 23:43:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-cabal-helper (Old) and /work/SRC/openSUSE:Factory/.ghc-cabal-helper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-cabal-helper" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-cabal-helper/ghc-cabal-helper.changes 2015-12-29 12:58:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-cabal-helper.new/ghc-cabal-helper.changes 2016-01-22 01:08:43.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Jan 11 07:39:48 UTC 2016 - mimi.vx(a)gmail.com + +- update to 0.6.3.0 + +------------------------------------------------------------------- Old: ---- cabal-helper-0.6.2.0.tar.gz New: ---- cabal-helper-0.6.3.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-cabal-helper.spec ++++++ --- /var/tmp/diff_new_pack.PHISNk/_old 2016-01-22 01:08:45.000000000 +0100 +++ /var/tmp/diff_new_pack.PHISNk/_new 2016-01-22 01:08:45.000000000 +0100 @@ -19,7 +19,7 @@ %global pkg_name cabal-helper %bcond_with tests Name: ghc-cabal-helper -Version: 0.6.2.0 +Version: 0.6.3.0 Release: 0 Summary: Simple interface to some of Cabal's configuration state used by ghc-mod License: AGPL-3.0+ ++++++ cabal-helper-0.6.2.0.tar.gz -> cabal-helper-0.6.3.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-helper-0.6.2.0/Distribution/Helper.hs new/cabal-helper-0.6.3.0/Distribution/Helper.hs --- old/cabal-helper-0.6.2.0/Distribution/Helper.hs 2015-09-24 04:11:17.000000000 +0200 +++ new/cabal-helper-0.6.3.0/Distribution/Helper.hs 2016-01-10 22:00:45.000000000 +0100 @@ -48,6 +48,7 @@ , configFlags , nonDefaultConfigFlags , packageId + , compilerVersion -- * Result types , ChModuleName(..) @@ -63,8 +64,10 @@ -- * Managing @dist/@ , prepare + , prepare' , reconfigure , writeAutogenFiles + , writeAutogenFiles' -- * $libexec related error handling , LibexecNotFoundError(..) @@ -79,6 +82,7 @@ import Control.Exception as E import Data.Char import Data.List +import Data.Maybe import Data.Version import Data.Typeable import Distribution.Simple.BuildPaths (exeExtension) @@ -154,7 +158,8 @@ slbiPkgLicenses :: [(String, [(String, Version)])], slbiFlags :: [(String, Bool)], slbiConfigFlags :: [(String, Bool)], - slbiNonDefaultConfigFlags :: [(String, Bool)] + slbiNonDefaultConfigFlags :: [(String, Bool)], + slbiCompilerVersion :: (String, Version) } deriving (Eq, Ord, Read, Show) -- | Caches helper executable result so it doesn't have to be run more than once @@ -164,6 +169,9 @@ (ReaderT QueryEnv m) a } deriving (Functor, Applicative, Monad, MonadIO) +instance MonadTrans Query where + lift = Query . lift . lift + type MonadQuery m = ( MonadIO m , MonadState (Maybe SomeLocalBuildInfo) m , MonadReader QueryEnv m) @@ -230,6 +238,9 @@ -- i.e. don't rely on these being the flags set by the user directly. nonDefaultConfigFlags :: MonadIO m => Query m [(String, Bool)] +-- | The version of GHC the project is configured to use +compilerVersion :: MonadIO m => Query m (String, Version) + -- | Package identifier, i.e. package name and version packageId :: MonadIO m => Query m (String, Version) @@ -246,6 +257,7 @@ flags = Query $ slbiFlags `liftM` getSlbi configFlags = Query $ slbiConfigFlags `liftM` getSlbi nonDefaultConfigFlags = Query $ slbiNonDefaultConfigFlags `liftM` getSlbi +compilerVersion = Query $ slbiCompilerVersion `liftM` getSlbi packageId = Query $ getPackageId -- | Run @cabal configure@ @@ -266,50 +278,57 @@ _ <- liftIO $ readProc (cabalProgram progs) ("configure":progOpts) "" return () - - -invokeHelper :: MonadQuery m => [String] -> m [Maybe ChResponse] -invokeHelper args = ask >>= \QueryEnv {..} -> do - let progs = qePrograms - projdir = qeProjectDir - distdir = qeDistDir - - progArgs = [ "--with-ghc=" ++ ghcProgram progs - , "--with-ghc-pkg=" ++ ghcPkgProgram progs - , "--with-cabal=" ++ cabalProgram progs +readHelper :: (MonadIO m, MonadQuery m) => [String] -> m [Maybe ChResponse] +readHelper args = ask >>= \qe -> liftIO $ do + out <- either error id <$> invokeHelper qe args + let res = read out + liftIO $ evaluate res `E.catch` \se@(SomeException _) -> do + md <- lookupEnv' "CABAL_HELPER_DEBUG" + let msg = "readHelper: exception: '" ++ show se ++ "'" + error $ msg ++ case md of + Nothing -> ", for more information set the environment variable CABAL_HELPER_DEBUG" + Just _ -> ", output: '"++ out ++"'" + +invokeHelper :: QueryEnv -> [String] -> IO (Either String String) +invokeHelper QueryEnv {..} args = do + let progArgs = [ "--with-ghc=" ++ ghcProgram qePrograms + , "--with-ghc-pkg=" ++ ghcPkgProgram qePrograms + , "--with-cabal=" ++ cabalProgram qePrograms + ] + exe <- findLibexecExe "cabal-helper-wrapper" + let args' = progArgs ++ qeProjectDir:qeDistDir:args + out <- qeReadProcess exe args' "" + (Right <$> evaluate out) `E.catch` \(SomeException _) -> + return $ Left $ concat + ["invokeHelper", ": ", exe, " " + , intercalate " " (map show args') + , " failed" ] - liftIO $ do - exe <- findLibexecExe "cabal-helper-wrapper" - let args' = progArgs ++ projdir:distdir:args - out <- qeReadProcess exe args' "" - evaluate (read out) `E.catch` \(SomeException _) -> - error $ concat ["invokeHelper", ": ", exe, " " - , intercalate " " (map show args') - , " (read failed)" - ] getPackageId :: MonadQuery m => m (String, Version) getPackageId = ask >>= \QueryEnv {..} -> do - [ Just (ChResponseVersion pkgName pkgVer) ] <- invokeHelper [ "package-id" ] + [ Just (ChResponseVersion pkgName pkgVer) ] <- readHelper [ "package-id" ] return (pkgName, pkgVer) getSomeConfigState :: MonadQuery m => m SomeLocalBuildInfo getSomeConfigState = ask >>= \QueryEnv {..} -> do - res <- invokeHelper [ "package-db-stack" - , "entrypoints" - , "source-dirs" - , "ghc-options" - , "ghc-src-options" - , "ghc-pkg-options" - , "ghc-merged-pkg-options" - , "ghc-lang-options" - , "licenses" - , "flags" - , "config-flags" - , "non-default-config-flags" - ] + res <- readHelper + [ "package-db-stack" + , "entrypoints" + , "source-dirs" + , "ghc-options" + , "ghc-src-options" + , "ghc-pkg-options" + , "ghc-merged-pkg-options" + , "ghc-lang-options" + , "licenses" + , "flags" + , "config-flags" + , "non-default-config-flags" + , "compiler-version" + ] let [ Just (ChResponsePkgDbs pkgDbs), Just (ChResponseEntrypoints eps), Just (ChResponseCompList srcDirs), @@ -321,28 +340,31 @@ Just (ChResponseLicenses pkgLics), Just (ChResponseFlags fls), Just (ChResponseFlags cfls), - Just (ChResponseFlags ndcfls) + Just (ChResponseFlags ndcfls), + Just (ChResponseVersion comp compVer) ] = res return $ SomeLocalBuildInfo - pkgDbs eps srcDirs ghcOpts ghcSrcOpts ghcPkgOpts ghcMergedPkgOpts ghcLangOpts pkgLics fls cfls ndcfls + pkgDbs eps srcDirs ghcOpts ghcSrcOpts ghcPkgOpts ghcMergedPkgOpts ghcLangOpts pkgLics fls cfls ndcfls (comp, compVer) --- | Make sure the appropriate helper executable for the given project is --- installed and ready to run queries. prepare :: MonadIO m => (FilePath -> [String] -> String -> IO String) -> FilePath - -- ^ Path to project directory, i.e. the one containing the - -- @project.cabal@ file -> FilePath - -- ^ Path to the @dist/@ directory -> m () prepare readProc projdir distdir = liftIO $ do exe <- findLibexecExe "cabal-helper-wrapper" void $ readProc exe [projdir, distdir] "" --- | Create @cabal_macros.h@ and @Paths_\<pkg\>@ possibly other generated files --- in the usual place. +{-# DEPRECATED prepare + "Will be replaced by prepare' in the next major release" #-} + +-- | Make sure the appropriate helper executable for the given project is +-- installed and ready to run queries. +prepare' :: MonadIO m => QueryEnv -> m () +prepare' qe = + liftIO $ void $ invokeHelper qe [] + writeAutogenFiles :: MonadIO m => (FilePath -> [String] -> String -> IO String) -> FilePath @@ -355,6 +377,15 @@ exe <- findLibexecExe "cabal-helper-wrapper" void $ readProc exe [projdir, distdir, "write-autogen-files"] "" +{-# DEPRECATED writeAutogenFiles + "Will be replaced by writeAutogenFiles' in the next major release" #-} + +-- | Create @cabal_macros.h@ and @Paths_\<pkg\>@ possibly other generated files +-- in the usual place. +writeAutogenFiles' :: MonadIO m => QueryEnv -> m () +writeAutogenFiles' qe = + liftIO $ void $ invokeHelper qe ["write-autogen-files"] + -- | Get the path to the sandbox package-db in a project getSandboxPkgDb :: (FilePath -> [String] -> String -> IO String) -> FilePath @@ -442,3 +473,6 @@ #else getProgName #endif + +lookupEnv' :: String -> IO (Maybe String) +lookupEnv' k = lookup k <$> getEnvironment diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-helper-0.6.2.0/cabal-helper.cabal new/cabal-helper-0.6.3.0/cabal-helper.cabal --- old/cabal-helper-0.6.2.0/cabal-helper.cabal 2015-11-19 13:22:02.000000000 +0100 +++ new/cabal-helper-0.6.3.0/cabal-helper.cabal 2016-01-10 22:00:59.000000000 +0100 @@ -1,5 +1,5 @@ name: cabal-helper -version: 0.6.2.0 +version: 0.6.3.0 synopsis: Simple interface to some of Cabal's configuration state used by ghc-mod description: @cabal-helper@ provides a library which wraps the internal use of @@ -68,6 +68,7 @@ CabalHelper.Data CabalHelper.Compile CabalHelper.Log + CabalHelper.Sandbox GHC-Options: -Wall X-Install-Target: $libexecdir Build-Depends: base >= 4.5 && < 5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-helper-0.6.2.0/tests/Spec.hs new/cabal-helper-0.6.3.0/tests/Spec.hs --- old/cabal-helper-0.6.2.0/tests/Spec.hs 2015-11-03 14:27:21.000000000 +0100 +++ new/cabal-helper-0.6.3.0/tests/Spec.hs 2016-01-10 22:00:45.000000000 +0100 @@ -8,6 +8,7 @@ import Data.Functor import Control.Exception as E import Control.Arrow +import Prelude import CabalHelper.Common import CabalHelper.Compile @@ -18,7 +19,7 @@ flip (setEnv "HOME") True =<< fromMaybe "/tmp" <$> lookupEnv "TMPDIR" _ <- rawSystem "cabal" ["update"] - writeAutogenFiles readProcess "." "./dist" + writeAutogenFiles' $ defaultQueryEnv "." "./dist" let vers :: [(Version, [Version])] vers = map (parseVer *** map parseVer) [

1 0

commit ghc-GLURaw for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package ghc-GLURaw for openSUSE:Factory checked in at 2016-01-21 23:43:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-GLURaw (Old) and /work/SRC/openSUSE:Factory/.ghc-GLURaw.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-GLURaw" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-GLURaw/ghc-GLURaw.changes 2016-01-05 21:55:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-GLURaw.new/ghc-GLURaw.changes 2016-01-22 01:08:41.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Jan 11 08:07:55 UTC 2016 - mimi.vx(a)gmail.com + +- update to 2.0.0.1 +* Relaxed upper version bound for OpenGLRaw + +------------------------------------------------------------------- Old: ---- GLURaw-2.0.0.0.tar.gz New: ---- GLURaw-2.0.0.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-GLURaw.spec ++++++ --- /var/tmp/diff_new_pack.JJaEaR/_old 2016-01-22 01:08:43.000000000 +0100 +++ /var/tmp/diff_new_pack.JJaEaR/_new 2016-01-22 01:08:43.000000000 +0100 @@ -18,7 +18,7 @@ %global pkg_name GLURaw Name: ghc-GLURaw -Version: 2.0.0.0 +Version: 2.0.0.1 Release: 0 Summary: A raw binding for the OpenGL graphics system License: BSD-3-Clause ++++++ GLURaw-2.0.0.0.tar.gz -> GLURaw-2.0.0.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLURaw-2.0.0.0/CHANGELOG.md new/GLURaw-2.0.0.1/CHANGELOG.md --- old/GLURaw-2.0.0.0/CHANGELOG.md 2016-01-03 23:49:12.000000000 +0100 +++ new/GLURaw-2.0.0.1/CHANGELOG.md 2016-01-10 16:25:43.000000000 +0100 @@ -1,3 +1,7 @@ +2.0.0.1 +------- +* Relaxed upper version bound for `OpenGLRaw`. + 2.0.0.0 ------- * Use pattern synonyms. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLURaw-2.0.0.0/GLURaw.cabal new/GLURaw-2.0.0.1/GLURaw.cabal --- old/GLURaw-2.0.0.0/GLURaw.cabal 2016-01-03 23:49:12.000000000 +0100 +++ new/GLURaw-2.0.0.1/GLURaw.cabal 2016-01-10 16:25:43.000000000 +0100 @@ -1,5 +1,5 @@ name: GLURaw -version: 2.0.0.0 +version: 2.0.0.1 synopsis: A raw binding for the OpenGL graphics system description: GLURaw is a raw Haskell binding for the GLU 1.3 OpenGL utility library. It is @@ -46,7 +46,7 @@ build-depends: base >= 4 && < 5, transformers >= 0.2 && < 0.6, - OpenGLRaw >= 3.0 && < 3.1 + OpenGLRaw >= 3.0 && < 3.2 default-language: Haskell2010 ghc-options: -Wall other-extensions:

1 0

commit ghc-GLUT for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package ghc-GLUT for openSUSE:Factory checked in at 2016-01-21 23:43:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-GLUT (Old) and /work/SRC/openSUSE:Factory/.ghc-GLUT.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-GLUT" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-GLUT/ghc-GLUT.changes 2016-01-05 21:55:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-GLUT.new/ghc-GLUT.changes 2016-01-22 01:08:39.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Jan 11 08:12:22 UTC 2016 - mimi.vx(a)gmail.com + +- update to 2.7.0.6 +* Relaxed upper version bound for OpenGLRaw. + +------------------------------------------------------------------- Old: ---- GLUT-2.7.0.5.tar.gz New: ---- GLUT-2.7.0.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-GLUT.spec ++++++ --- /var/tmp/diff_new_pack.eJLNYb/_old 2016-01-22 01:08:41.000000000 +0100 +++ /var/tmp/diff_new_pack.eJLNYb/_new 2016-01-22 01:08:41.000000000 +0100 @@ -18,7 +18,7 @@ %global pkg_name GLUT Name: ghc-GLUT -Version: 2.7.0.5 +Version: 2.7.0.6 Release: 0 Summary: A binding for the OpenGL Utility Toolkit License: BSD-3-Clause ++++++ GLUT-2.7.0.5.tar.gz -> GLUT-2.7.0.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLUT-2.7.0.5/CHANGELOG.md new/GLUT-2.7.0.6/CHANGELOG.md --- old/GLUT-2.7.0.5/CHANGELOG.md 2016-01-03 23:53:35.000000000 +0100 +++ new/GLUT-2.7.0.6/CHANGELOG.md 2016-01-10 20:03:01.000000000 +0100 @@ -1,3 +1,7 @@ +2.7.0.6 +-------- +* Relaxed upper version bound for `OpenGLRaw`. + 2.7.0.5 -------- * Make things work with both old and new `OpenGLRaw`/`GLURaw` packages. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLUT-2.7.0.5/GLUT.cabal new/GLUT-2.7.0.6/GLUT.cabal --- old/GLUT-2.7.0.5/GLUT.cabal 2016-01-03 23:53:35.000000000 +0100 +++ new/GLUT-2.7.0.6/GLUT.cabal 2016-01-10 20:03:01.000000000 +0100 @@ -1,5 +1,5 @@ name: GLUT -version: 2.7.0.5 +version: 2.7.0.6 synopsis: A binding for the OpenGL Utility Toolkit description: A Haskell binding for the OpenGL Utility Toolkit, a window system independent @@ -229,7 +229,7 @@ if !flag(BuildExamples) buildable: False main-is: SmoothOpenGL3.hs - build-depends: base >= 3 && < 5, bytestring >= 0.9 && < 0.11, OpenGLRaw >= 1.0 && < 3.1, GLUT + build-depends: base >= 3 && < 5, bytestring >= 0.9 && < 0.11, OpenGLRaw >= 1.0 && < 3.2, GLUT hs-source-dirs: examples/Misc default-language: Haskell2010 ghc-options: -Wall

1 0

commit hdevtools for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package hdevtools for openSUSE:Factory checked in at 2016-01-21 23:43:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hdevtools (Old) and /work/SRC/openSUSE:Factory/.hdevtools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hdevtools" Changes: -------- --- /work/SRC/openSUSE:Factory/hdevtools/hdevtools.changes 2015-08-25 08:49:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hdevtools.new/hdevtools.changes 2016-01-22 01:08:37.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Jan 15 09:57:29 UTC 2016 - mimi.vx(a)gmail.com + +- update to 0.1.2.2 +* Added type checking support for tests and benchmarks in stack projects. + +------------------------------------------------------------------- Old: ---- hdevtools-0.1.2.1.tar.gz New: ---- hdevtools-0.1.2.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hdevtools.spec ++++++ --- /var/tmp/diff_new_pack.n7lpw4/_old 2016-01-22 01:08:39.000000000 +0100 +++ /var/tmp/diff_new_pack.n7lpw4/_new 2016-01-22 01:08:39.000000000 +0100 @@ -18,7 +18,7 @@ %global debug_package %{nil} Name: hdevtools -Version: 0.1.2.1 +Version: 0.1.2.2 Release: 0 Summary: Persistent GHC powered background server for FAST haskell development tools License: MIT @@ -38,6 +38,7 @@ BuildRequires: ghc-process-devel BuildRequires: ghc-syb-devel BuildRequires: ghc-time-devel +BuildRequires: ghc-transformers-devel BuildRequires: ghc-unix-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build # End cabal-rpm deps ++++++ hdevtools-0.1.2.1.tar.gz -> hdevtools-0.1.2.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hdevtools-0.1.2.1/CHANGELOG.md new/hdevtools-0.1.2.2/CHANGELOG.md --- old/hdevtools-0.1.2.1/CHANGELOG.md 1970-01-01 01:00:00.000000000 +0100 +++ new/hdevtools-0.1.2.2/CHANGELOG.md 2016-01-11 23:25:10.000000000 +0100 @@ -0,0 +1,5 @@ +# Changelog + +## 0.1.2.2 - 2016-01-11 + + * Added type checking support for tests and benchmarks in stack projects. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hdevtools-0.1.2.1/LICENSE new/hdevtools-0.1.2.2/LICENSE --- old/hdevtools-0.1.2.1/LICENSE 2015-08-14 00:18:29.000000000 +0200 +++ new/hdevtools-0.1.2.2/LICENSE 2015-12-18 19:26:31.000000000 +0100 @@ -1,4 +1,4 @@ -Copyright (C) 2012 The hdevtools Authors (see AUTHORS file) +Copyright (C) 2015 The hdevtools Authors (see AUTHORS file) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hdevtools-0.1.2.1/hdevtools.cabal new/hdevtools-0.1.2.2/hdevtools.cabal --- old/hdevtools-0.1.2.1/hdevtools.cabal 2015-08-14 00:18:29.000000000 +0200 +++ new/hdevtools-0.1.2.2/hdevtools.cabal 2016-01-11 23:27:20.000000000 +0100 @@ -1,5 +1,5 @@ name: hdevtools -version: 0.1.2.1 +version: 0.1.2.2 synopsis: Persistent GHC powered background server for FAST haskell development tools description: 'hdevtools' is a backend for text editor plugins, to allow for things such as @@ -30,17 +30,19 @@ license: MIT license-file: LICENSE author: Bit Connor -maintainer: schell.scivally(a)synapsegroup.com +maintainer: Sebastian Nagel <sebastian.nagel(a)ncoding.at>, + Ranjit Jhala <jhala(a)cs.ucsd.edu> copyright: See AUTHORS file category: Development -homepage: https://github.com/schell/hdevtools/ -bug-reports: https://github.com/schell/hdevtools/issues/ +homepage: https://github.com/hdevtools/hdevtools/ +bug-reports: https://github.com/hdevtools/hdevtools/issues/ build-type: Simple cabal-version: >=1.8 +extra-source-files: CHANGELOG.md source-repository head type: git - location: git://github.com/schell/hdevtools.git + location: git://github.com/hdevtools/hdevtools.git executable hdevtools hs-source-dirs: src @@ -69,8 +71,9 @@ ghc-paths, syb, network, - process >= 1.2.3.0, + process, time, + transformers, unix if impl(ghc == 7.6.*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hdevtools-0.1.2.1/src/Cabal.hs new/hdevtools-0.1.2.2/src/Cabal.hs --- old/hdevtools-0.1.2.1/src/Cabal.hs 2015-08-14 00:18:29.000000000 +0200 +++ new/hdevtools-0.1.2.2/src/Cabal.hs 2015-12-18 15:38:26.000000000 +0100 @@ -7,6 +7,9 @@ #ifdef ENABLE_CABAL import Stack import Control.Exception (IOException, catch) +import Control.Monad (when) +import Control.Monad.Trans.Class (lift) +import Control.Monad.Trans.State (execStateT, modify) import Data.Char (isSpace) import Data.List (foldl', nub, sort, find, isPrefixOf, isSuffixOf) #if __GLASGOW_HASKELL__ < 709 @@ -24,12 +27,13 @@ #endif componentBuildInfo, foldComponent) import Distribution.Simple.Compiler (PackageDB(..)) +import Distribution.Simple.Command (CommandParse(..), commandParseArgs) import Distribution.Simple.GHC (componentGhcOptions) import Distribution.Simple.Program (defaultProgramConfiguration) import Distribution.Simple.Program.Db (lookupProgram) import Distribution.Simple.Program.Types (ConfiguredProgram(programVersion), simpleProgram) import Distribution.Simple.Program.GHC (GhcOptions(..), renderGhcOptions) -import Distribution.Simple.Setup (ConfigFlags(..), defaultConfigFlags, toFlag) +import Distribution.Simple.Setup (ConfigFlags(..), defaultConfigFlags, configureCommand, toFlag) #if __GLASGOW_HASKELL__ >= 709 import Distribution.Utils.NubList import qualified Distribution.Simple.GHC as GHC(configure) @@ -38,7 +42,7 @@ import Distribution.Version (Version(..)) import System.IO.Error (ioeGetErrorString) -import System.Directory (doesFileExist, getDirectoryContents) +import System.Directory (doesFileExist, doesDirectoryExist, getDirectoryContents) import System.FilePath (takeDirectory, splitFileName, (</>)) @@ -110,30 +114,44 @@ -- via: https://groups.google.com/d/msg/haskell-stack/8HJ6DHAinU0/J68U6AXTsasJ -- cabal configure --package-db=clear --package-db=global --package-db=$(stack path --snapshot-pkg-db) --package-db=$(stack path --local-pkg-db) -getPackageGhcOpts :: FilePath -> Maybe StackConfig -> IO (Either String [String]) -getPackageGhcOpts path mbStack = do +getPackageGhcOpts :: FilePath -> Maybe StackConfig -> [String] -> IO (Either String [String]) +getPackageGhcOpts path mbStack opts = do getPackageGhcOpts' `catch` (\e -> do return $ Left $ "Cabal error: " ++ (ioeGetErrorString (e :: IOException))) where getPackageGhcOpts' :: IO (Either String [String]) getPackageGhcOpts' = do genPkgDescr <- readPackageDescription silent path - let cfgFlags'' = (defaultConfigFlags defaultProgramConfiguration) - { configDistPref = toFlag $ takeDirectory path </> "dist" - -- TODO: figure out how to find out this flag - , configUserInstall = toFlag True - } - let cfgFlags' = stackifyFlags cfgFlags'' mbStack - let sandboxConfig = takeDirectory path </> "cabal.sandbox.config" - exists <- doesFileExist sandboxConfig - - cfgFlags <- case exists of - False -> return cfgFlags' - True -> do - sandboxPackageDb <- getSandboxPackageDB sandboxConfig - return $ cfgFlags' - { configPackageDBs = [Just sandboxPackageDb] - } + distDir <- getDistDir + + let programCfg = defaultProgramConfiguration + let initCfgFlags = (defaultConfigFlags programCfg) + { configDistPref = toFlag distDir + -- TODO: figure out how to find out this flag + , configUserInstall = toFlag True + + -- configure with --enable-tests to include test dependencies/modules + , configTests = toFlag True + + -- configure with --enable-benchmarks to include benchmark dependencies/modules + , configBenchmarks = toFlag True + } + let initCfgFlags' = stackifyFlags initCfgFlags mbStack + + cfgFlags <- flip execStateT initCfgFlags' $ do + let sandboxConfig = takeDirectory path </> "cabal.sandbox.config" + + exists <- lift $ doesFileExist sandboxConfig + when (exists) $ do + sandboxPackageDb <- lift $ getSandboxPackageDB sandboxConfig + modify $ \x -> x { configPackageDBs = [Just sandboxPackageDb] } + + let cmdUI = configureCommand programCfg + case commandParseArgs cmdUI True opts of + CommandReadyToGo (modFlags, _) -> modify modFlags + CommandErrors (e:_) -> error e + _ -> return () + localBuildInfo <- configure (genPkgDescr, emptyHookedBuildInfo) cfgFlags let pkgDescr = localPkgDescr localBuildInfo let baseDir = fst . splitFileName $ path @@ -166,6 +184,14 @@ return $ Right $ renderGhcOptions ghcVersion ghcOpts #endif + -- returns the right 'dist' directory in the case of a sandbox + getDistDir = do + let dir = takeDirectory path </> "dist" + exists <- doesDirectoryExist dir + if not exists then return dir else do + contents <- getDirectoryContents dir + return . maybe dir (dir </>) $ find ("dist-sandbox-" `isPrefixOf`) contents + pkgLibName :: PackageDescription -> Maybe PackageName pkgLibName pkgDescr = if hasLibrary pkgDescr then Just $ pkgName . package $ pkgDescr @@ -217,8 +243,8 @@ # else -getPackageGhcOpts :: FilePath -> IO (Either String [String]) -getPackageGhcOpts _ = return $ Right [] +getPackageGhcOpts :: FilePath -> [String] -> IO (Either String [String]) +getPackageGhcOpts _ _ = return $ Right [] findCabalFile :: FilePath -> IO (Maybe FilePath) findCabalFile _ = return Nothing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hdevtools-0.1.2.1/src/CommandArgs.hs new/hdevtools-0.1.2.2/src/CommandArgs.hs --- old/hdevtools-0.1.2.1/src/CommandArgs.hs 2015-08-14 00:18:29.000000000 +0200 +++ new/hdevtools-0.1.2.2/src/CommandArgs.hs 2015-12-18 15:38:26.000000000 +0100 @@ -53,17 +53,21 @@ | Check { socket :: Maybe FilePath , ghcOpts :: [String] + , cabalOpts :: [String] , path :: Maybe String , file :: String + , json :: Bool } | ModuleFile { socket :: Maybe FilePath , ghcOpts :: [String] + , cabalOpts :: [String] , module_ :: String } | Info { socket :: Maybe FilePath , ghcOpts :: [String] + , cabalOpts :: [String] , path :: Maybe String , file :: String , identifier :: String @@ -71,6 +75,7 @@ | Type { socket :: Maybe FilePath , ghcOpts :: [String] + , cabalOpts :: [String] , path :: Maybe String , file :: String , line :: Int @@ -79,6 +84,7 @@ | FindSymbol { socket :: Maybe FilePath , ghcOpts :: [String] + , cabalOpts :: [String] , symbol :: String , files :: [String] } @@ -86,25 +92,28 @@ dummyAdmin :: HDevTools dummyAdmin = Admin - { socket = Nothing + { socket = Nothing , start_server = False - , noDaemon = False - , status = False - , stop_server = False + , noDaemon = False + , status = False + , stop_server = False } dummyCheck :: HDevTools dummyCheck = Check { socket = Nothing , ghcOpts = [] + , cabalOpts = [] , path = Nothing , file = "" + , json = False } dummyModuleFile :: HDevTools dummyModuleFile = ModuleFile { socket = Nothing , ghcOpts = [] + , cabalOpts = [] , module_ = "" } @@ -112,6 +121,7 @@ dummyInfo = Info { socket = Nothing , ghcOpts = [] + , cabalOpts = [] , path = Nothing , file = "" , identifier = "" @@ -121,6 +131,7 @@ dummyType = Type { socket = Nothing , ghcOpts = [] + , cabalOpts = [] , path = Nothing , file = "" , line = 0 @@ -131,6 +142,7 @@ dummyFindSymbol = FindSymbol { socket = Nothing , ghcOpts = [] + , cabalOpts = [] , symbol = "" , files = [] } @@ -148,14 +160,25 @@ check = record dummyCheck [ socket := def += typFile += help "socket file to use" , ghcOpts := def += typ "OPTION" += help "ghc options" +#ifdef ENABLE_CABAL + , cabalOpts := def += typ "OPTION" += help "cabal options" +#else + , cabalOpts := def += ignore +#endif , path := def += typFile += help "path to target file" , file := def += typFile += argPos 0 += opt "" + , json := def += help "render output as JSON" ] += help "Check a haskell source file for errors and warnings" moduleFile :: Annotate Ann moduleFile = record dummyModuleFile [ socket := def += typFile += help "socket file to use" , ghcOpts := def += typ "OPTION" += help "ghc options" +#ifdef ENABLE_CABAL + , cabalOpts := def += typ "OPTION" += help "cabal options" +#else + , cabalOpts := def += ignore +#endif , module_ := def += typ "MODULE" += argPos 0 ] += help "Get the haskell source file corresponding to a module name" @@ -163,6 +186,11 @@ info = record dummyInfo [ socket := def += typFile += help "socket file to use" , ghcOpts := def += typ "OPTION" += help "ghc options" +#ifdef ENABLE_CABAL + , cabalOpts := def += typ "OPTION" += help "cabal options" +#else + , cabalOpts := def += ignore +#endif , path := def += typFile += help "path to target file" , file := def += typFile += argPos 0 += opt "" , identifier := def += typ "IDENTIFIER" += argPos 1 @@ -172,6 +200,11 @@ type_ = record dummyType [ socket := def += typFile += help "socket file to use" , ghcOpts := def += typ "OPTION" += help "ghc options" +#ifdef ENABLE_CABAL + , cabalOpts := def += typ "OPTION" += help "cabal options" +#else + , cabalOpts := def += ignore +#endif , path := def += typFile += help "path to target file" , file := def += typFile += argPos 0 += opt "" , line := def += typ "LINE" += argPos 1 @@ -182,6 +215,11 @@ findSymbol = record dummyFindSymbol [ socket := def += typFile += help "socket file to use" , ghcOpts := def += typ "OPTION" += help "ghc options" +#ifdef ENABLE_CABAL + , cabalOpts := def += typ "OPTION" += help "cabal options" +#else + , cabalOpts := def += ignore +#endif , symbol := def += typ "SYMBOL" += argPos 0 , files := def += typFile += args ] += help "List the modules where the given symbol could be found" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hdevtools-0.1.2.1/src/CommandLoop.hs new/hdevtools-0.1.2.2/src/CommandLoop.hs --- old/hdevtools-0.1.2.1/src/CommandLoop.hs 2015-08-14 00:18:29.000000000 +0200 +++ new/hdevtools-0.1.2.2/src/CommandLoop.hs 2015-12-18 15:38:26.000000000 +0100 @@ -46,14 +46,16 @@ data CabalConfig = CabalConfig { cabalConfigPath :: FilePath + , cabalConfigOpts :: [String] , cabalConfigLastUpdatedAt :: EpochTime } deriving Eq -mkCabalConfig :: FilePath -> IO CabalConfig -mkCabalConfig path = do +mkCabalConfig :: FilePath -> [String] -> IO CabalConfig +mkCabalConfig path opts = do fileStatus <- getFileStatus path return $ CabalConfig { cabalConfigPath = path + , cabalConfigOpts = opts , cabalConfigLastUpdatedAt = modificationTime fileStatus } @@ -66,7 +68,7 @@ newConfig :: CommandExtra -> IO Config newConfig cmdExtra = do - mbCabalConfig <- traverse mkCabalConfig $ ceCabalConfig cmdExtra + mbCabalConfig <- traverse (\path -> mkCabalConfig path (ceCabalOptions cmdExtra)) $ ceCabalConfig cmdExtra mbStackConfig <- getStackConfig cmdExtra return $ Config { configGhcOpts = "-O0" : ceGhcOptions cmdExtra @@ -140,7 +142,7 @@ return $ Right [] Just cabalConfig -> do liftIO $ setCurrentDirectory . takeDirectory $ cabalConfigPath cabalConfig - liftIO $ getPackageGhcOpts (cabalConfigPath cabalConfig) (configStack config) + liftIO $ getPackageGhcOpts (cabalConfigPath cabalConfig) (configStack config) (cabalConfigOpts cabalConfig) case eCabalGhcOpts of Left e -> return $ Left e Right cabalGhcOpts -> do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hdevtools-0.1.2.1/src/Main.hs new/hdevtools-0.1.2.2/src/Main.hs --- old/hdevtools-0.1.2.1/src/Main.hs 2015-08-14 00:18:29.000000000 +0200 +++ new/hdevtools-0.1.2.2/src/Main.hs 2015-12-22 02:42:26.000000000 +0100 @@ -60,6 +60,7 @@ { ceGhcOptions = ghcOpts args , ceCabalConfig = mCabalFile , cePath = argPath + , ceCabalOptions = cabalOpts args } let defaultSocketPath = maybe "" takeDirectory mCabalFile </> defaultSocketFile let sock = fromMaybe defaultSocketPath $ socket args diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hdevtools-0.1.2.1/src/Stack.hs new/hdevtools-0.1.2.2/src/Stack.hs --- old/hdevtools-0.1.2.1/src/Stack.hs 2015-08-14 00:18:29.000000000 +0200 +++ new/hdevtools-0.1.2.2/src/Stack.hs 2015-12-18 15:38:26.000000000 +0100 @@ -8,9 +8,12 @@ import Data.Maybe (listToMaybe) import Data.Char (isSpace) + #if __GLASGOW_HASKELL__ < 709 import Control.Applicative((<$>), (<*>)) +import System.IO #endif + import System.Process import System.FilePath import System.Directory @@ -18,6 +21,7 @@ import Control.Exception import Types + -- | This module adds support for `stack`, as follows: -- 1. Figure out if the target-file is in a stack project, -- 2. If `stack` in available in PATH, run `stack exec` to extract @@ -104,9 +108,35 @@ where f = reverse . dropWhile isSpace +#if __GLASGOW_HASKELL__ < 709 +execInPath :: String -> FilePath -> IO (Maybe String) +execInPath cmd p = do + eIOEstr <- try $ createProcess prc :: IO (Either IOError ProcH) + case eIOEstr of + Right (_, Just h, _, _) -> Just <$> getClose h + Right (_, Nothing, _, _) -> return Nothing + -- This error is most likely "/bin/sh: stack: command not found" + -- which is caused by the package containing a stack.yaml file but + -- no stack command is in the PATH. + Left _ -> return Nothing + where + prc = (shell cmd) { cwd = Just $ takeDirectory p } + +getClose :: Handle -> IO String +getClose h = do + str <- hGetContents h + hClose h + return str + +type ProcH = (Maybe Handle, Maybe Handle, Maybe Handle, ProcessHandle) + +-- Not deleting this because this is likely more robust than the above! (but +-- only works on process-1.2.3.0 onwards + +#else execInPath :: String -> FilePath -> IO (Maybe String) execInPath cmd p = do - eIOEstr <- (try $ readCreateProcess prc "" :: IO (Either IOError String)) + eIOEstr <- try $ readCreateProcess prc "" :: IO (Either IOError String) return $ case eIOEstr of Right s -> Just s -- This error is most likely "/bin/sh: stack: command not found" @@ -115,3 +145,4 @@ Left _ -> Nothing where prc = (shell cmd) { cwd = Just $ takeDirectory p } +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hdevtools-0.1.2.1/src/Types.hs new/hdevtools-0.1.2.2/src/Types.hs --- old/hdevtools-0.1.2.1/src/Types.hs 2015-08-14 00:18:29.000000000 +0200 +++ new/hdevtools-0.1.2.2/src/Types.hs 2015-12-18 15:38:26.000000000 +0100 @@ -12,12 +12,14 @@ { ceGhcOptions :: [String] , ceCabalConfig :: Maybe FilePath , cePath :: Maybe FilePath + , ceCabalOptions :: [String] } deriving (Read, Show) emptyCommandExtra :: CommandExtra emptyCommandExtra = CommandExtra { ceGhcOptions = [] , ceCabalConfig = Nothing , cePath = Nothing + , ceCabalOptions = [] } data ServerDirective

1 0

commit ghc-HUnit for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package ghc-HUnit for openSUSE:Factory checked in at 2016-01-21 23:43:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-HUnit (Old) and /work/SRC/openSUSE:Factory/.ghc-HUnit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-HUnit" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-HUnit/ghc-HUnit.changes 2016-01-08 15:22:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-HUnit.new/ghc-HUnit.changes 2016-01-22 01:08:35.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Jan 15 10:01:12 UTC 2016 - mimi.vx(a)gmail.com + +- update to 1.3.1.0 + +------------------------------------------------------------------- Old: ---- HUnit-1.3.0.0.tar.gz New: ---- HUnit-1.3.1.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-HUnit.spec ++++++ --- /var/tmp/diff_new_pack.I27pWT/_old 2016-01-22 01:08:37.000000000 +0100 +++ /var/tmp/diff_new_pack.I27pWT/_new 2016-01-22 01:08:37.000000000 +0100 @@ -19,7 +19,7 @@ %global pkg_name HUnit Name: ghc-HUnit -Version: 1.3.0.0 +Version: 1.3.1.0 Release: 0 Summary: A unit testing framework for Haskell License: BSD-3-Clause ++++++ HUnit-1.3.0.0.tar.gz -> HUnit-1.3.1.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HUnit-1.3.0.0/HUnit.cabal new/HUnit-1.3.1.0/HUnit.cabal --- old/HUnit-1.3.0.0/HUnit.cabal 2015-08-21 10:48:41.000000000 +0200 +++ new/HUnit-1.3.1.0/HUnit.cabal 2016-01-11 10:04:20.000000000 +0100 @@ -1,5 +1,5 @@ Name: HUnit -Version: 1.3.0.0 +Version: 1.3.1.0 Cabal-Version: >= 1.8 License: BSD3 License-File: LICENSE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HUnit-1.3.0.0/README.md new/HUnit-1.3.1.0/README.md --- old/HUnit-1.3.0.0/README.md 2015-08-21 10:48:41.000000000 +0200 +++ new/HUnit-1.3.1.0/README.md 2016-01-11 10:04:20.000000000 +0100 @@ -17,6 +17,10 @@ ## Changes +### 1.3.1.0 + +- add minimal support for GHC 8.0 + ### 1.3.0.0 - removed support for old compilers diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HUnit-1.3.0.0/Test/HUnit/Base.hs new/HUnit-1.3.1.0/Test/HUnit/Base.hs --- old/HUnit-1.3.0.0/Test/HUnit/Base.hs 2015-08-21 10:48:41.000000000 +0200 +++ new/HUnit-1.3.1.0/Test/HUnit/Base.hs 2016-01-11 10:04:20.000000000 +0100 @@ -2,6 +2,7 @@ #if MIN_VERSION_base(4,8,1) #define HAS_SOURCE_LOCATIONS {-# LANGUAGE ImplicitParams #-} +{-# LANGUAGE ConstrainedClassMethods #-} #endif -- | Basic definitions for the HUnit library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HUnit-1.3.0.0/Test/HUnit/Lang.hs new/HUnit-1.3.1.0/Test/HUnit/Lang.hs --- old/HUnit-1.3.0.0/Test/HUnit/Lang.hs 2015-08-21 10:48:41.000000000 +0200 +++ new/HUnit-1.3.1.0/Test/HUnit/Lang.hs 2016-01-11 10:04:20.000000000 +0100 @@ -25,7 +25,9 @@ import Data.Typeable #ifdef HAS_SOURCE_LOCATIONS +#if !(MIN_VERSION_base(4,9,0)) import GHC.SrcLoc +#endif import GHC.Stack #endif

1 0

commit ghc-monad-logger for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package ghc-monad-logger for openSUSE:Factory checked in at 2016-01-21 23:43:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-monad-logger (Old) and /work/SRC/openSUSE:Factory/.ghc-monad-logger.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-monad-logger" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-monad-logger/ghc-monad-logger.changes 2015-12-23 08:49:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-monad-logger.new/ghc-monad-logger.changes 2016-01-22 01:08:33.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Jan 15 10:06:34 UTC 2016 - mimi.vx(a)gmail.com + +- update to 0.3.17 +* log to a chan + +------------------------------------------------------------------- Old: ---- monad-logger-0.3.16.tar.gz New: ---- monad-logger-0.3.17.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-monad-logger.spec ++++++ --- /var/tmp/diff_new_pack.N4JWEN/_old 2016-01-22 01:08:35.000000000 +0100 +++ /var/tmp/diff_new_pack.N4JWEN/_new 2016-01-22 01:08:35.000000000 +0100 @@ -19,7 +19,7 @@ %global pkg_name monad-logger Name: ghc-monad-logger -Version: 0.3.16 +Version: 0.3.17 Release: 0 Summary: A class of monads which can log messages License: MIT ++++++ monad-logger-0.3.16.tar.gz -> monad-logger-0.3.17.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monad-logger-0.3.16/ChangeLog.md new/monad-logger-0.3.17/ChangeLog.md --- old/monad-logger-0.3.16/ChangeLog.md 2015-12-13 09:03:42.000000000 +0100 +++ new/monad-logger-0.3.17/ChangeLog.md 2016-01-12 12:18:18.000000000 +0100 @@ -1,3 +1,7 @@ +## 0.3.17 + +* log to a chan [#74](https://github.com/kazu-yamamoto/logger/pull/74) + ## 0.3.16 * Provide default monadLoggerLog implementation [#72](https://github.com/kazu-yamamoto/logger/pull/72) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monad-logger-0.3.16/Control/Monad/Logger.hs new/monad-logger-0.3.17/Control/Monad/Logger.hs --- old/monad-logger-0.3.16/Control/Monad/Logger.hs 2015-12-13 09:03:42.000000000 +0100 +++ new/monad-logger-0.3.17/Control/Monad/Logger.hs 2016-01-12 12:18:18.000000000 +0100 @@ -36,6 +36,8 @@ , LoggingT (..) , runStderrLoggingT , runStdoutLoggingT + , runChanLoggingT + , unChanLoggingT , withChannelLogger , filterLogger , NoLoggingT (..) @@ -80,10 +82,11 @@ import Data.Monoid (Monoid) import Control.Applicative (Applicative (..)) +import Control.Concurrent.Chan (Chan(),writeChan,readChan) import Control.Concurrent.STM import Control.Concurrent.STM.TBChan import Control.Exception.Lifted (onException) -import Control.Monad (liftM, ap, when, void) +import Control.Monad (liftM, ap, when, void, forever) import Control.Monad.Base (MonadBase (liftBase)) import Control.Monad.Loops (untilM) import Control.Monad.Trans.Control (MonadBaseControl (..), MonadTransControl (..)) @@ -579,6 +582,29 @@ runStdoutLoggingT :: MonadIO m => LoggingT m a -> m a runStdoutLoggingT = (`runLoggingT` defaultOutput stdout) +-- | Run a block using a @MonadLogger@ instance which writes tuples to an +-- unbounded channel. +-- +-- The tuples can be extracted (ie. in another thread) with `unChanLoggingT` +-- or a custom extraction funtion, and written to a destination. +-- +-- @since 0.3.17 +runChanLoggingT :: MonadIO m => Chan (Loc, LogSource, LogLevel, LogStr) -> LoggingT m a -> m a +runChanLoggingT chan = (`runLoggingT` sink chan) + where + sink chan loc src lvl msg = writeChan chan (loc,src,lvl,msg) + +-- | Read logging tuples from an unbounded channel and log them into a +-- `MonadLoggerIO` monad, forever. +-- +-- For use in a dedicated thread with a channel fed by `runChanLoggingT`. +-- +-- @since 0.3.17 +unChanLoggingT :: (MonadLogger m, MonadIO m) => Chan (Loc, LogSource, LogLevel, LogStr) -> m () +unChanLoggingT chan = forever $ do + (loc,src,lvl,msg) <- liftIO $ readChan chan + monadLoggerLog loc src lvl msg + -- | Within the 'LoggingT' monad, capture all log messages to a bounded -- channel of the indicated size, and only actually log them if there is an -- exception. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monad-logger-0.3.16/monad-logger.cabal new/monad-logger-0.3.17/monad-logger.cabal --- old/monad-logger-0.3.16/monad-logger.cabal 2015-12-13 09:03:42.000000000 +0100 +++ new/monad-logger-0.3.17/monad-logger.cabal 2016-01-12 12:18:18.000000000 +0100 @@ -1,5 +1,5 @@ name: monad-logger -version: 0.3.16 +version: 0.3.17 synopsis: A class of monads which can log messages. description: Hackage documentation generation is not reliable. For up to date documentation, please see: <http://www.stackage.org/package/monad-logger>. homepage: https://github.com/kazu-yamamoto/logger

1 0

commit ghc-MonadRandom for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package ghc-MonadRandom for openSUSE:Factory checked in at 2016-01-21 23:43:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-MonadRandom (Old) and /work/SRC/openSUSE:Factory/.ghc-MonadRandom.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-MonadRandom" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-MonadRandom/ghc-MonadRandom.changes 2015-11-23 07:30:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-MonadRandom.new/ghc-MonadRandom.changes 2016-01-22 01:08:31.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Jan 18 10:42:18 UTC 2016 - mimi.vx(a)gmail.com + +- update to 0.4.2.1 +* Allow transformers-compat-0.5. +* Add MonadPlus and Alternative instances for RandT. + +------------------------------------------------------------------- Old: ---- MonadRandom-0.4.1.tar.gz New: ---- MonadRandom-0.4.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-MonadRandom.spec ++++++ --- /var/tmp/diff_new_pack.Jjruc2/_old 2016-01-22 01:08:33.000000000 +0100 +++ /var/tmp/diff_new_pack.Jjruc2/_new 2016-01-22 01:08:33.000000000 +0100 @@ -19,7 +19,7 @@ %global pkg_name MonadRandom Name: ghc-MonadRandom -Version: 0.4.1 +Version: 0.4.2.1 Release: 0 Summary: Random-number generation monad License: MIT ++++++ MonadRandom-0.4.1.tar.gz -> MonadRandom-0.4.2.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MonadRandom-0.4.1/CHANGES.markdown new/MonadRandom-0.4.2.1/CHANGES.markdown --- old/MonadRandom-0.4.1/CHANGES.markdown 2015-11-21 05:13:15.000000000 +0100 +++ new/MonadRandom-0.4.2.1/CHANGES.markdown 2016-01-17 00:40:44.000000000 +0100 @@ -1,3 +1,13 @@ +0.4.2.1 (16 January 2016) +------------------------- + + - Allow `transformers-compat-0.5`. + +0.4.2 (16 January 2016) +----------------------- + + - Add `MonadPlus` and `Alternative` instances for `RandT`. + 0.4.1 (20 November 2015) ------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MonadRandom-0.4.1/Control/Monad/Random.hs new/MonadRandom-0.4.2.1/Control/Monad/Random.hs --- old/MonadRandom-0.4.1/Control/Monad/Random.hs 2015-11-21 05:13:15.000000000 +0100 +++ new/MonadRandom-0.4.2.1/Control/Monad/Random.hs 2016-01-17 00:40:44.000000000 +0100 @@ -72,12 +72,16 @@ -- | A monad transformer which adds a random number generator to an -- existing monad. newtype RandT g m a = RandT (StateT g m a) - deriving (Functor, Monad, MonadTrans, MonadIO, MonadFix, MonadReader r, MonadWriter w) + deriving (Functor, Monad, MonadPlus, MonadTrans, MonadIO, MonadFix, MonadReader r, MonadWriter w) -instance (Functor m,Monad m) => Applicative (RandT g m) where +instance (Functor m, Monad m) => Applicative (RandT g m) where pure = return (<*>) = ap +instance (Functor m, MonadPlus m) => Alternative (RandT g m) where + empty = mzero + (<|>) = mplus + -- | Lift arbitrary action to RandT liftRandT :: (g -> m (a, g)) -- ^ action returning value and new generator state -> RandT g m a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MonadRandom-0.4.1/MonadRandom.cabal new/MonadRandom-0.4.2.1/MonadRandom.cabal --- old/MonadRandom-0.4.1/MonadRandom.cabal 2015-11-21 05:13:15.000000000 +0100 +++ new/MonadRandom-0.4.2.1/MonadRandom.cabal 2016-01-17 00:40:44.000000000 +0100 @@ -1,5 +1,5 @@ name: MonadRandom -version: 0.4.1 +version: 0.4.2.1 synopsis: Random-number generation monad. description: Support for computations which consume random values. license: OtherLicense @@ -19,7 +19,7 @@ exposed-modules: Control.Monad.Random, Control.Monad.Random.Class build-depends: base >= 2 && < 5, transformers >= 0.3 && < 0.5, - transformers-compat == 0.4.*, + transformers-compat >= 0.4 && < 0.6, mtl >= 2.1 && < 2.3, random ghc-options: -Wall

1 0

commit ghc-OpenGL for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package ghc-OpenGL for openSUSE:Factory checked in at 2016-01-21 23:43:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-OpenGL (Old) and /work/SRC/openSUSE:Factory/.ghc-OpenGL.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-OpenGL" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-OpenGL/ghc-OpenGL.changes 2016-01-05 21:55:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-OpenGL.new/ghc-OpenGL.changes 2016-01-22 01:08:29.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Jan 11 08:10:15 UTC 2016 - mimi.vx(a)gmail.com + +- update to 3.0.0.1 +* Relaxed upper version bound for OpenGLRaw. + +------------------------------------------------------------------- Old: ---- OpenGL-3.0.0.0.tar.gz New: ---- OpenGL-3.0.0.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-OpenGL.spec ++++++ --- /var/tmp/diff_new_pack.7M3drU/_old 2016-01-22 01:08:31.000000000 +0100 +++ /var/tmp/diff_new_pack.7M3drU/_new 2016-01-22 01:08:31.000000000 +0100 @@ -19,7 +19,7 @@ %global pkg_name OpenGL Name: ghc-OpenGL -Version: 3.0.0.0 +Version: 3.0.0.1 Release: 0 Summary: A binding for the OpenGL graphics system License: BSD-3-Clause ++++++ OpenGL-3.0.0.0.tar.gz -> OpenGL-3.0.0.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OpenGL-3.0.0.0/CHANGELOG.md new/OpenGL-3.0.0.1/CHANGELOG.md --- old/OpenGL-3.0.0.0/CHANGELOG.md 2016-01-03 23:51:12.000000000 +0100 +++ new/OpenGL-3.0.0.1/CHANGELOG.md 2016-01-10 19:50:54.000000000 +0100 @@ -1,3 +1,7 @@ +3.0.0.1 +------- +* Relaxed upper version bound for `OpenGLRaw`. + 3.0.0.0 ------- * Depend on new `OpenGLRaw` and `GLURaw` packages. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OpenGL-3.0.0.0/OpenGL.cabal new/OpenGL-3.0.0.1/OpenGL.cabal --- old/OpenGL-3.0.0.0/OpenGL.cabal 2016-01-03 23:51:12.000000000 +0100 +++ new/OpenGL-3.0.0.1/OpenGL.cabal 2016-01-10 19:50:54.000000000 +0100 @@ -1,5 +1,5 @@ name: OpenGL -version: 3.0.0.0 +version: 3.0.0.1 synopsis: A binding for the OpenGL graphics system description: A Haskell binding for the OpenGL graphics system (GL, version 4.5) and its @@ -155,7 +155,7 @@ transformers >= 0.2 && < 0.6, ObjectName >= 1.1 && < 1.2, StateVar >= 1.1 && < 1.2, - OpenGLRaw >= 3.0 && < 3.1, + OpenGLRaw >= 3.0 && < 3.2, GLURaw >= 2.0 && < 2.1 default-language: Haskell2010 other-extensions: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OpenGL-3.0.0.0/src/Graphics/Rendering/OpenGL/GL/Colors.hs new/OpenGL-3.0.0.1/src/Graphics/Rendering/OpenGL/GL/Colors.hs --- old/OpenGL-3.0.0.0/src/Graphics/Rendering/OpenGL/GL/Colors.hs 2016-01-03 23:51:12.000000000 +0100 +++ new/OpenGL-3.0.0.1/src/Graphics/Rendering/OpenGL/GL/Colors.hs 2016-01-10 19:50:54.000000000 +0100 @@ -491,15 +491,15 @@ marshalClampMode :: ClampMode -> GLenum marshalClampMode x = case x of - ClampOn -> GL_TRUE + ClampOn -> fromIntegral GL_TRUE FixedOnly -> GL_FIXED_ONLY - ClampOff -> GL_FALSE + ClampOff -> fromIntegral GL_FALSE unmarshalClampMode :: GLenum -> ClampMode unmarshalClampMode x - | x == GL_TRUE = ClampOn + | x == fromIntegral GL_TRUE = ClampOn | x == GL_FIXED_ONLY = FixedOnly - | x == GL_FALSE = ClampOff + | x == fromIntegral GL_FALSE = ClampOff | otherwise = error $ "unmarshalClampMode: unknown enum value " ++ show x --------------------------------------------------------------------------------

1 0

commit ghc-retry for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package ghc-retry for openSUSE:Factory checked in at 2016-01-21 23:43:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-retry (Old) and /work/SRC/openSUSE:Factory/.ghc-retry.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-retry" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-retry/ghc-retry.changes 2016-01-08 15:22:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-retry.new/ghc-retry.changes 2016-01-22 01:08:27.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Jan 15 10:08:09 UTC 2016 - mimi.vx(a)gmail.com + +- update to 0.7.1 +* Various documentation updates. +* Add stepping combinator for manual retries. +* Add applyPolicy and applyAndDelay +* Add Read instance for RetryStatus +* Fix logic bug in rsPreviousDelay in first retry + +------------------------------------------------------------------- Old: ---- retry-0.7.0.1.tar.gz New: ---- retry-0.7.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-retry.spec ++++++ --- /var/tmp/diff_new_pack.PLGn45/_old 2016-01-22 01:08:29.000000000 +0100 +++ /var/tmp/diff_new_pack.PLGn45/_new 2016-01-22 01:08:29.000000000 +0100 @@ -20,7 +20,7 @@ %bcond_with tests Name: ghc-retry -Version: 0.7.0.1 +Version: 0.7.1 Release: 0 Summary: Retry combinators for monadic actions that may fail Group: System/Libraries ++++++ retry-0.7.0.1.tar.gz -> retry-0.7.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/retry-0.7.0.1/changelog.md new/retry-0.7.1/changelog.md --- old/retry-0.7.0.1/changelog.md 2015-11-15 01:28:27.000000000 +0100 +++ new/retry-0.7.1/changelog.md 2016-01-13 18:40:22.000000000 +0100 @@ -1,3 +1,10 @@ +0.7.1 +* Various documentation updates. +* Add stepping combinator for manual retries. +* Add applyPolicy and applyAndDelay +* Add Read instance for RetryStatus +* Fix logic bug in rsPreviousDelay in first retry + 0.7.0.1 * Officially drop support for GHC < 7.6 due to usage of Generics. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/retry-0.7.0.1/retry.cabal new/retry-0.7.1/retry.cabal --- old/retry-0.7.0.1/retry.cabal 2015-11-15 01:28:27.000000000 +0100 +++ new/retry-0.7.1/retry.cabal 2016-01-13 18:40:22.000000000 +0100 @@ -14,7 +14,7 @@ case we should hang back for a bit and retry the query instead of simply raising an exception. -version: 0.7.0.1 +version: 0.7.1 synopsis: Retry combinators for monadic actions that may fail license: BSD3 license-file: LICENSE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/retry-0.7.0.1/src/Control/Retry.hs new/retry-0.7.1/src/Control/Retry.hs --- old/retry-0.7.0.1/src/Control/Retry.hs 2015-11-15 01:28:27.000000000 +0100 +++ new/retry-0.7.1/src/Control/Retry.hs 2016-01-13 18:40:22.000000000 +0100 @@ -32,12 +32,11 @@ RetryPolicyM (..) , RetryPolicy , retryPolicy - , RetryStatus - -- ** Fields for 'RetryStatus' - , rsIterNumber - , rsCumulativeDelay - , rsPreviousDelay + , RetryStatus (..) , defaultRetryStatus + , applyPolicy + , applyAndDelay + -- ** Lenses for 'RetryStatus' , rsIterNumberL @@ -47,6 +46,7 @@ -- * Applying Retry Policies , retrying , recovering + , stepping , recoverAll , logRetries @@ -162,8 +162,8 @@ data RetryStatus = RetryStatus { rsIterNumber :: !Int -- ^ Iteration number, where 0 is the first try , rsCumulativeDelay :: !Int -- ^ Delay incurred so far from retries in microseconds - , rsPreviousDelay :: !(Maybe Int) -- ^ Previous attempt's delay. Will always be Nothing on first run. - } deriving (Show, Eq, Generic) + , rsPreviousDelay :: !(Maybe Int) -- ^ Latest attempt's delay. Will always be Nothing on first run. + } deriving (Read, Show, Eq, Generic) ------------------------------------------------------------------------------- @@ -190,6 +190,45 @@ {-# INLINE rsPreviousDelayL #-} + +------------------------------------------------------------------------------- +-- | Apply policy on status to see what the decision would be. +-- 'Nothing' implies no retry, 'Just' returns updated status. +applyPolicy + :: Monad m + => RetryPolicyM m + -> RetryStatus + -> m (Maybe RetryStatus) +applyPolicy (RetryPolicyM policy) s = do + res <- policy s + case res of + Just delay -> return $! Just $! RetryStatus + { rsIterNumber = rsIterNumber s + 1 + , rsCumulativeDelay = rsCumulativeDelay s + delay + , rsPreviousDelay = Just delay } + Nothing -> return Nothing + + +------------------------------------------------------------------------------- +-- | Apply policy and delay by its amount if it results in a retry. +-- Return updated status. +applyAndDelay + :: MonadIO m + => RetryPolicyM m + -> RetryStatus + -> m (Maybe RetryStatus) +applyAndDelay policy s = do + chk <- applyPolicy policy s + case chk of + Just rs -> do + case (rsPreviousDelay rs) of + Nothing -> return () + Just delay -> liftIO $ threadDelay delay + return (Just rs) + Nothing -> return Nothing + + + ------------------------------------------------------------------------------- -- | Helper for making simplified policies that don't use the monadic -- context. @@ -314,21 +353,17 @@ -> (RetryStatus -> m b) -- ^ Action to run -> m b -retrying (RetryPolicyM policy) chk f = go defaultRetryStatus +retrying policy chk f = go defaultRetryStatus where go s = do res <- f s chk' <- chk s res case chk' of True -> do - chk <- policy s - case chk of - Just delay -> do - liftIO (threadDelay delay) - go $! RetryStatus { rsIterNumber = rsIterNumber s + 1 - , rsCumulativeDelay = rsCumulativeDelay s + delay - , rsPreviousDelay = Just (maybe 0 (const delay) (rsPreviousDelay s))} + rs <- applyAndDelay policy s + case rs of Nothing -> return res + Just rs' -> go $! rs' False -> return res @@ -386,21 +421,21 @@ -- 'recoverAll' recovering #if MIN_VERSION_exceptions(0, 6, 0) - :: (MonadIO m, MonadMask m) + :: (MonadIO m, MonadMask m) #else - :: (MonadIO m, MonadCatch m) + :: (MonadIO m, MonadCatch m) #endif - => RetryPolicyM m - -- ^ Just use 'def' for default settings - -> [(RetryStatus -> Handler m Bool)] - -- ^ Should a given exception be retried? Action will be - -- retried if this returns True *and* the policy allows it. - -- This action will be consulted first even if the policy - -- later blocks it. - -> (RetryStatus -> m a) - -- ^ Action to perform - -> m a -recovering p@(RetryPolicyM policy) hs f = mask $ \restore -> go restore defaultRetryStatus + => RetryPolicyM m + -- ^ Just use 'def' for default settings + -> [(RetryStatus -> Handler m Bool)] + -- ^ Should a given exception be retried? Action will be + -- retried if this returns True *and* the policy allows it. + -- This action will be consulted first even if the policy + -- later blocks it. + -> (RetryStatus -> m a) + -- ^ Action to perform + -> m a +recovering policy hs f = mask $ \restore -> go restore defaultRetryStatus where go restore = loop where @@ -416,18 +451,62 @@ chk <- h e' case chk of True -> do - res <- policy s - case res of - Just delay -> do - liftIO $ threadDelay delay - loop $! RetryStatus { rsIterNumber = rsIterNumber s + 1 - , rsCumulativeDelay = rsCumulativeDelay s + delay - , rsPreviousDelay = Just (maybe 0 (const delay) (rsPreviousDelay s))} + rs <- applyAndDelay policy s + case rs of + Just rs' -> loop $! rs' Nothing -> throwM e' False -> throwM e' | otherwise = recover e hs' + +------------------------------------------------------------------------------- +-- | A version of 'recovering' that tries to run the action only a +-- single time. The control will return immediately upon both success +-- and failure. Useful for implementing retry logic in distributed +-- queues and similar external-interfacing systems. +stepping +#if MIN_VERSION_exceptions(0, 6, 0) + :: (MonadIO m, MonadMask m) +#else + :: (MonadIO m, MonadCatch m) +#endif + => RetryPolicyM m + -- ^ Just use 'def' for default settings + -> [(RetryStatus -> Handler m Bool)] + -- ^ Should a given exception be retried? Action will be + -- retried if this returns True *and* the policy allows it. + -- This action will be consulted first even if the policy + -- later blocks it. + -> (RetryStatus -> m ()) + -- ^ Action to run with updated status upon failure. + -> (RetryStatus -> m a) + -- ^ Main action to perform with current status. + -> RetryStatus + -- ^ Current status of this step + -> m (Maybe a) +stepping policy hs schedule f s = do + r <- try $ f s + case r of + Right x -> return $ Just x + Left e -> recover (e :: SomeException) hs + where + recover e [] = throwM e + recover e ((($ s) -> Handler h) : hs') + | Just e' <- fromException e = do + chk <- h e' + case chk of + True -> do + res <- applyPolicy policy s + case res of + Just rs -> do + schedule $! rs + return Nothing + Nothing -> throwM e' + False -> throwM e' + | otherwise = recover e hs' + + ------------------------------------------------------------------------------- -- | Helper function for constructing handler functions of the form required -- by 'recovering'.

1 0

commit ghc-semigroupoids for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package ghc-semigroupoids for openSUSE:Factory checked in at 2016-01-21 23:43:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-semigroupoids (Old) and /work/SRC/openSUSE:Factory/.ghc-semigroupoids.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-semigroupoids" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-semigroupoids/ghc-semigroupoids.changes 2015-08-27 08:56:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-semigroupoids.new/ghc-semigroupoids.changes 2016-01-22 01:08:25.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Jan 18 11:49:27 UTC 2016 - mimi.vx(a)gmail.com + +- update to 5.0.1 +* transformers-compat 0.5 support +* Removed some redundant constraints. + +------------------------------------------------------------------- Old: ---- semigroupoids-5.0.0.4.tar.gz New: ---- semigroupoids-5.0.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-semigroupoids.spec ++++++ --- /var/tmp/diff_new_pack.1wUt0B/_old 2016-01-22 01:08:27.000000000 +0100 +++ /var/tmp/diff_new_pack.1wUt0B/_new 2016-01-22 01:08:27.000000000 +0100 @@ -21,7 +21,7 @@ %bcond_with tests Name: ghc-semigroupoids -Version: 5.0.0.4 +Version: 5.0.1 Release: 0 Summary: Semigroupoids: Category sans id License: BSD-2-Clause ++++++ semigroupoids-5.0.0.4.tar.gz -> semigroupoids-5.0.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/semigroupoids-5.0.0.4/CHANGELOG.markdown new/semigroupoids-5.0.1/CHANGELOG.markdown --- old/semigroupoids-5.0.0.4/CHANGELOG.markdown 2015-08-19 20:59:47.000000000 +0200 +++ new/semigroupoids-5.0.1/CHANGELOG.markdown 2016-01-16 23:08:19.000000000 +0100 @@ -1,3 +1,9 @@ +5.0.1 +------- +* `transformers-compat` 0.5 support +* Removed some redundant constraints. +* GHC 8 support + 5.0.0.4 ------- * `doctest` 0.10 support diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/semigroupoids-5.0.0.4/semigroupoids.cabal new/semigroupoids-5.0.1/semigroupoids.cabal --- old/semigroupoids-5.0.0.4/semigroupoids.cabal 2015-08-19 20:59:47.000000000 +0200 +++ new/semigroupoids-5.0.1/semigroupoids.cabal 2016-01-16 23:08:19.000000000 +0100 @@ -1,6 +1,6 @@ name: semigroupoids category: Control, Comonads -version: 5.0.0.4 +version: 5.0.1 license: BSD3 cabal-version: >= 1.8 license-file: LICENSE @@ -119,7 +119,7 @@ bifunctors >= 5 && < 6, semigroups >= 0.8.3.1 && < 1, transformers >= 0.2 && < 0.6, - transformers-compat >= 0.3 && < 0.5 + transformers-compat >= 0.3 && < 0.6 if flag(containers) build-depends: containers >= 0.3 && < 0.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/semigroupoids-5.0.0.4/src/Data/Functor/Bind/Trans.hs new/semigroupoids-5.0.1/src/Data/Functor/Bind/Trans.hs --- old/semigroupoids-5.0.0.4/src/Data/Functor/Bind/Trans.hs 2015-08-19 20:59:47.000000000 +0200 +++ new/semigroupoids-5.0.1/src/Data/Functor/Bind/Trans.hs 2016-01-16 23:08:19.000000000 +0100 @@ -46,10 +46,10 @@ instance BindTrans (ReaderT e) where liftB = ReaderT . const -instance (Semigroup w, Monoid w) => BindTrans (Lazy.WriterT w) where +instance Monoid w => BindTrans (Lazy.WriterT w) where liftB = Lazy.WriterT . fmap (\a -> (a, mempty)) -instance (Semigroup w, Monoid w) => BindTrans (Strict.WriterT w) where +instance Monoid w => BindTrans (Strict.WriterT w) where liftB = Strict.WriterT . fmap (\a -> (a, mempty)) instance BindTrans (Lazy.StateT s) where @@ -58,10 +58,10 @@ instance BindTrans (Strict.StateT s) where liftB m = Strict.StateT $ \s -> fmap (\a -> (a, s)) m -instance (Semigroup w, Monoid w) => BindTrans (Lazy.RWST r w s) where +instance Monoid w => BindTrans (Lazy.RWST r w s) where liftB m = Lazy.RWST $ \ _r s -> fmap (\a -> (a, s, mempty)) m -instance (Semigroup w, Monoid w) => BindTrans (Strict.RWST r w s) where +instance Monoid w => BindTrans (Strict.RWST r w s) where liftB m = Strict.RWST $ \ _r s -> fmap (\a -> (a, s, mempty)) m instance BindTrans (ContT r) where diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/semigroupoids-5.0.0.4/src/Data/Functor/Extend.hs new/semigroupoids-5.0.1/src/Data/Functor/Extend.hs --- old/semigroupoids-5.0.0.4/src/Data/Functor/Extend.hs 2015-08-19 20:59:47.000000000 +0200 +++ new/semigroupoids-5.0.1/src/Data/Functor/Extend.hs 2016-01-16 23:08:19.000000000 +0100 @@ -24,7 +24,8 @@ import Control.Category import Control.Monad.Trans.Identity import Data.Functor.Identity -import Data.Semigroup +import Data.Functor.Sum (Sum(..)) +import Data.Semigroup (Semigroup(..)) import Data.List (tails) import Data.List.NonEmpty (NonEmpty(..), toList) @@ -36,7 +37,6 @@ #ifdef MIN_VERSION_comonad -import Data.Functor.Coproduct import Control.Comonad.Trans.Env import Control.Comonad.Trans.Store import Control.Comonad.Trans.Traced @@ -95,10 +95,12 @@ #endif #ifdef MIN_VERSION_comonad +{- instance (Extend f, Extend g) => Extend (Coproduct f g) where extended f = Coproduct . coproduct (Left . extended (f . Coproduct . Left)) (Right . extended (f . Coproduct . Right)) +-} instance Extend w => Extend (EnvT e w) where duplicated (EnvT e wa) = EnvT e (extended (EnvT e) wa) @@ -133,6 +135,10 @@ [] -> [] (a:as) -> toList (extended f (a :| as)) +instance (Extend f, Extend g) => Extend (Sum f g) where + extended f (InL l) = InL (extended (f . InL) l) + extended f (InR r) = InR (extended (f . InR) r) + -- $definition -- There are two ways to define an 'Extend' instance: -- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/semigroupoids-5.0.0.4/src/Data/Semigroup/Foldable/Class.hs new/semigroupoids-5.0.1/src/Data/Semigroup/Foldable/Class.hs --- old/semigroupoids-5.0.0.4/src/Data/Semigroup/Foldable/Class.hs 2015-08-19 20:59:47.000000000 +0200 +++ new/semigroupoids-5.0.1/src/Data/Semigroup/Foldable/Class.hs 2016-01-16 23:08:19.000000000 +0100 @@ -35,10 +35,6 @@ import Data.Foldable import Data.Functor.Compose -#ifdef MIN_VERSION_comonad -import Data.Functor.Coproduct -#endif - import Data.Functor.Identity import Data.Functor.Product as Functor import Data.Functor.Reverse @@ -168,11 +164,6 @@ foldMap1 f (InL x) = foldMap1 f x foldMap1 f (InR y) = foldMap1 f y -#ifdef MIN_VERSION_comonad -instance (Foldable1 f, Foldable1 g) => Foldable1 (Coproduct f g) where - foldMap1 f = coproduct (foldMap1 f) (foldMap1 f) -#endif - instance Foldable1 NonEmpty where foldMap1 f (a :| []) = f a foldMap1 f (a :| b : bs) = f a <> foldMap1 f (b :| bs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/semigroupoids-5.0.0.4/src/Data/Semigroup/Traversable/Class.hs new/semigroupoids-5.0.1/src/Data/Semigroup/Traversable/Class.hs --- old/semigroupoids-5.0.0.4/src/Data/Semigroup/Traversable/Class.hs 2015-08-19 20:59:47.000000000 +0200 +++ new/semigroupoids-5.0.1/src/Data/Semigroup/Traversable/Class.hs 2016-01-16 23:08:19.000000000 +0100 @@ -31,10 +31,6 @@ import Data.Functor.Apply import Data.Functor.Compose -#ifdef MIN_VERSION_comonad -import Data.Functor.Coproduct as Functor -#endif - import Data.Functor.Identity import Data.Functor.Product as Functor import Data.Functor.Reverse @@ -171,13 +167,6 @@ traverse1 f (Functor.InL x) = Functor.InL <$> traverse1 f x traverse1 f (Functor.InR y) = Functor.InR <$> traverse1 f y -#ifdef MIN_VERSION_comonad -instance (Traversable1 f, Traversable1 g) => Traversable1 (Coproduct f g) where - traverse1 f = coproduct - (fmap (Coproduct . Left) . traverse1 f) - (fmap (Coproduct . Right) . traverse1 f) -#endif - #ifdef MIN_VERSION_containers instance Traversable1 Tree where traverse1 f (Node a []) = (`Node`[]) <$> f a

1 0

commit ghc-split for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package ghc-split for openSUSE:Factory checked in at 2016-01-21 23:43:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-split (Old) and /work/SRC/openSUSE:Factory/.ghc-split.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-split" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-split/ghc-split.changes 2015-08-23 17:39:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-split.new/ghc-split.changes 2016-01-22 01:08:24.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Jan 15 10:15:10 UTC 2016 - mimi.vx(a)gmail.com + +- update to 0.2.3 +* New function 'divvy' (with associated tests) from Tim Washington. +* allow base 4.9 +- drop patch split-base.patch + +------------------------------------------------------------------- Old: ---- split-0.2.2.tar.gz split-base.patch New: ---- split-0.2.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-split.spec ++++++ --- /var/tmp/diff_new_pack.EKHSey/_old 2016-01-22 01:08:25.000000000 +0100 +++ /var/tmp/diff_new_pack.EKHSey/_new 2016-01-22 01:08:25.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc-split # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -21,7 +21,7 @@ %bcond_with tests Name: ghc-split -Version: 0.2.2 +Version: 0.2.3 Release: 0 Summary: Combinator library for splitting lists License: BSD-3-Clause @@ -29,8 +29,6 @@ Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… -# PATCH-FIX-UPSTREAM split-base.patch fix cabal file dependency on base -- mimi.vx(a)gmail.com -Patch0: split-base.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -75,7 +73,6 @@ %prep %setup -q -n %{pkg_name}-%{version} -%patch0 -p1 %build %ghc_lib_build ++++++ split-0.2.2.tar.gz -> split-0.2.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/split-0.2.2/CHANGES new/split-0.2.3/CHANGES --- old/split-0.2.2/CHANGES 2013-04-14 20:47:17.000000000 +0200 +++ new/split-0.2.3/CHANGES 2016-01-12 16:34:45.000000000 +0100 @@ -1,3 +1,15 @@ +* 0.2.3 (12 January 2016) + + - New function 'divvy' (with associated tests) from Tim Washington. + +* 0.2.2r2 (7 Jan 2016) + + - allow base-4.9 + +* 0.2.2r1 (12 Dec 2014) + + - allow base-4.8 + * 0.2.2 (14 April 2013) - Add 'dropInnerBlanks' combinator for dropping blank chunks between diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/split-0.2.2/split.cabal new/split-0.2.3/split.cabal --- old/split-0.2.2/split.cabal 2013-04-14 20:47:17.000000000 +0200 +++ new/split-0.2.3/split.cabal 2016-01-12 16:34:45.000000000 +0100 @@ -1,5 +1,5 @@ Name: split -Version: 0.2.2 +Version: 0.2.3 Stability: stable Description: A collection of various methods for splitting @@ -31,11 +31,11 @@ Copyright: (c) Brent Yorgey, Louis Wasserman 2008-2012 Extra-source-files: README, test/Properties.hs, CHANGES Author: Brent Yorgey -Maintainer: byorgey(a)cis.upenn.edu +Maintainer: byorgey(a)gmail.com Category: List Build-type: Simple Cabal-Version: >= 1.10 -Tested-with: GHC ==7.0.4, GHC ==7.2.1, GHC ==7.4.*, GHC ==7.6.1 +Tested-with: GHC ==7.0.4, GHC ==7.2.1, GHC ==7.4.*, GHC ==7.6.1, GHC ==7.8.3, GHC==7.10.3 Bug-reports: http://hub.darcs.net/byorgey/split/issues Test-suite split-tests @@ -51,7 +51,7 @@ Library ghc-options: -Wall - build-depends: base <4.8 + build-depends: base <4.10 exposed-modules: Data.List.Split, Data.List.Split.Internals default-language: Haskell2010 Hs-source-dirs: src diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/split-0.2.2/src/Data/List/Split/Internals.hs new/split-0.2.3/src/Data/List/Split/Internals.hs --- old/split-0.2.2/src/Data/List/Split/Internals.hs 2013-04-14 20:47:17.000000000 +0200 +++ new/split-0.2.3/src/Data/List/Split/Internals.hs 2016-01-12 16:34:45.000000000 +0100 @@ -582,3 +582,33 @@ chop _ [] = [] chop f as = b : chop f as' where (b, as') = f as + +-- | Divides up an input list into a set of sublists, according to 'n' and 'm' +-- input specifications you provide. Each sublist will have 'n' items, and the +-- start of each sublist will be offset by 'm' items from the previous one. +-- +-- > divvy 5 5 [1..20] == [[1,2,3,4,5],[6,7,8,9,10],[11,12,13,14,15],[16,17,18,19,20]] +-- +-- In the case where a source list's trailing elements do no fill an entire +-- sublist, those trailing elements will be dropped. +-- +-- > divvy 5 2 [1..10] == [[1,2,3,4,5],[3,4,5,6,7],[5,6,7,8,9]] +-- +-- As an example, you can generate a moving average over a list of prices: +-- +-- > type Prices = [Float] +-- > type AveragePrices = [Float] +-- > +-- > average :: [Float] -> Float +-- > average xs = sum xs / (fromIntegral $ length xs) +-- > +-- > simpleMovingAverage :: Prices -> AveragePrices +-- > simpleMovingAverage priceList = +-- > map average divvyedPrices +-- > where divvyedPrices = divvy 20 1 priceList + +divvy :: Int -> Int -> [a] -> [[a]] +divvy _ _ [] = [] +divvy n m lst = filter (\ws -> (n == length ws)) choppedl + where choppedl = chop (\xs -> (take n xs , drop m xs)) lst + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/split-0.2.2/src/Data/List/Split.hs new/split-0.2.3/src/Data/List/Split.hs --- old/split-0.2.2/src/Data/List/Split.hs 2013-04-14 20:47:17.000000000 +0200 +++ new/split-0.2.3/src/Data/List/Split.hs 2016-01-12 16:34:45.000000000 +0100 @@ -44,6 +44,7 @@ , splitPlaces , splitPlacesBlanks , chop + , divvy -- * Splitting combinators -- $comb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/split-0.2.2/test/Properties.hs new/split-0.2.3/test/Properties.hs --- old/split-0.2.2/test/Properties.hs 2013-04-14 20:47:17.000000000 +0200 +++ new/split-0.2.3/test/Properties.hs 2016-01-12 16:34:45.000000000 +0100 @@ -120,6 +120,11 @@ , ("linesBy/lines", qc prop_linesBy_lines) , ("chop/group", qc prop_chop_group) , ("chop/words", qc prop_chop_words) + , ("divvy/evenly", qc prop_divvy_evenly) + , ("divvy/discard_remainder", qc prop_divvy_discard_remainder) + , ("divvy/outputlists_allsame_length", qc prop_divvy_outputlists_allsame_length) + , ("divvy/output_are_sublists", qc prop_divvy_output_are_sublists) + , ("divvy/heads", qc prop_divvy_heads) ] prop_default_id :: [Elt] -> Bool @@ -357,3 +362,37 @@ prop_chop_words :: [EltWS] -> Bool prop_chop_words s = words s' == (filter (not . null) . chop (span (not . isSpace) . dropWhile isSpace) $ s') where s' = map unEltWS s + +prop_divvy_evenly :: [Elt] -> Positive Int -> Property +prop_divvy_evenly elems (Positive n) = (length elems `mod` n == 0) ==> concat (divvy n n elems) == elems + +prop_divvy_discard_remainder :: [Elt] -> Positive Int -> Bool +prop_divvy_discard_remainder elems (Positive n) = + concat (divvy n n elems) == (reverse . drop (length elems `mod` n) . reverse $ elems) + +prop_divvy_outputlists_allsame_length :: [Elt] -> Positive Int -> Positive Int -> Bool +prop_divvy_outputlists_allsame_length elems (Positive n) (Positive m) = allSame xs + where + allSame :: [Int] -> Bool + allSame [] = True + allSame zs = and $ map (== head zs) (tail zs) + xs = map length (divvy n m elems) + +prop_divvy_output_are_sublists :: [Elt] -> Positive Int -> Positive Int -> Bool +prop_divvy_output_are_sublists elems (Positive n) (Positive m) = and $ map (\x -> isInfixOf x elems) xs + where xs = divvy n m elems + +takeEvery :: Int -> [a] -> [a] +takeEvery _ [] = [] +takeEvery n lst = (map head . chunksOf n) $ lst + +initNth :: Int -> [a] -> [a] +initNth _ [] = [] +initNth n lst = (reverse . drop n . reverse) $ lst + +prop_divvy_heads :: [Elt] -> Positive Int -> Positive Int -> Bool +prop_divvy_heads [] _ _ = True +prop_divvy_heads elems (Positive n) (Positive m) = hds1 == hds2 + where hds1 = takeEvery m (initNth (n - 1) elems) + hds2 = map head $ divvy n m elems +

1 0

commit ghc-tagsoup for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package ghc-tagsoup for openSUSE:Factory checked in at 2016-01-21 23:43:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-tagsoup (Old) and /work/SRC/openSUSE:Factory/.ghc-tagsoup.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-tagsoup" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-tagsoup/ghc-tagsoup.changes 2016-01-11 19:12:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-tagsoup.new/ghc-tagsoup.changes 2016-01-22 01:08:22.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Jan 11 08:14:21 UTC 2016 - mimi.vx(a)gmail.com + +- update to 0.13.8 +* add parse/render functions directly to the Tree module + +------------------------------------------------------------------- Old: ---- tagsoup-0.13.7.tar.gz New: ---- tagsoup-0.13.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-tagsoup.spec ++++++ --- /var/tmp/diff_new_pack.pfgdUH/_old 2016-01-22 01:08:23.000000000 +0100 +++ /var/tmp/diff_new_pack.pfgdUH/_new 2016-01-22 01:08:23.000000000 +0100 @@ -19,7 +19,7 @@ %global pkg_name tagsoup Name: ghc-tagsoup -Version: 0.13.7 +Version: 0.13.8 Release: 0 Summary: Parsing and extracting information from (possibly malformed) HTML/XML documents License: BSD-3-Clause ++++++ tagsoup-0.13.7.tar.gz -> tagsoup-0.13.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tagsoup-0.13.7/CHANGES.txt new/tagsoup-0.13.8/CHANGES.txt --- old/tagsoup-0.13.7/CHANGES.txt 2016-01-09 22:21:31.000000000 +0100 +++ new/tagsoup-0.13.8/CHANGES.txt 2016-01-10 22:15:15.000000000 +0100 @@ -1,5 +1,7 @@ Changelog for TagSoup +0.13.8 + #30, add parse/render functions directly to the Tree module 0.13.7 #32, make sure upper case &#X works in lookupEntity 0.13.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tagsoup-0.13.7/Text/HTML/TagSoup/Tree.hs new/tagsoup-0.13.8/Text/HTML/TagSoup/Tree.hs --- old/tagsoup-0.13.7/Text/HTML/TagSoup/Tree.hs 2016-01-09 22:21:31.000000000 +0100 +++ new/tagsoup-0.13.8/Text/HTML/TagSoup/Tree.hs 2016-01-10 22:15:15.000000000 +0100 @@ -7,10 +7,11 @@ module Text.HTML.TagSoup.Tree ( - TagTree(..), tagTree, - flattenTree, transformTree, universeTree + TagTree(..), tagTree, parseTree, parseTreeOptions, ParseOptions(..), + flattenTree, renderTree, renderTreeOptions, RenderOptions(..), transformTree, universeTree ) where +import Text.HTML.TagSoup (parseTags, parseTagsOptions, renderTags, renderTagsOptions, ParseOptions(..), RenderOptions(..)) import Text.HTML.TagSoup.Type import Control.Arrow @@ -49,6 +50,11 @@ where (a,b) = f xs f [] = ([], []) +parseTree :: StringLike str => str -> [TagTree str] +parseTree = tagTree . parseTags + +parseTreeOptions :: StringLike str => ParseOptions str -> str -> [TagTree str] +parseTreeOptions opts str = tagTree $ parseTagsOptions opts str flattenTree :: [TagTree str] -> [Tag str] flattenTree xs = concatMap f xs @@ -57,6 +63,11 @@ TagOpen name atts : flattenTree inner ++ [TagClose name] f (TagLeaf x) = [x] +renderTree :: StringLike str => [TagTree str] -> str +renderTree = renderTags . flattenTree + +renderTreeOptions :: StringLike str => RenderOptions str -> [TagTree str] -> str +renderTreeOptions opts trees = renderTagsOptions opts $ flattenTree trees -- | This operation is based on the Uniplate @universe@ function. Given a -- list of trees, it returns those trees, and all the children trees at diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tagsoup-0.13.7/tagsoup.cabal new/tagsoup-0.13.8/tagsoup.cabal --- old/tagsoup-0.13.7/tagsoup.cabal 2016-01-09 22:21:31.000000000 +0100 +++ new/tagsoup-0.13.8/tagsoup.cabal 2016-01-10 22:15:15.000000000 +0100 @@ -1,6 +1,6 @@ cabal-version: >= 1.6 name: tagsoup -version: 0.13.7 +version: 0.13.8 copyright: Neil Mitchell 2006-2016 author: Neil Mitchell <ndmitchell(a)gmail.com> maintainer: Neil Mitchell <ndmitchell(a)gmail.com>

1 0

commit ghc-wai-extra for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package ghc-wai-extra for openSUSE:Factory checked in at 2016-01-21 23:43:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-wai-extra (Old) and /work/SRC/openSUSE:Factory/.ghc-wai-extra.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-wai-extra" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-wai-extra/ghc-wai-extra.changes 2016-01-07 00:25:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-wai-extra.new/ghc-wai-extra.changes 2016-01-22 01:08:20.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Jan 15 10:21:47 UTC 2016 - mimi.vx(a)gmail.com + +- update to 3.0.14 +* Middleware to force domain names. + +------------------------------------------------------------------- Old: ---- wai-extra-3.0.13.1.tar.gz New: ---- wai-extra-3.0.14.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-wai-extra.spec ++++++ --- /var/tmp/diff_new_pack.o5Bz0e/_old 2016-01-22 01:08:22.000000000 +0100 +++ /var/tmp/diff_new_pack.o5Bz0e/_new 2016-01-22 01:08:22.000000000 +0100 @@ -21,7 +21,7 @@ %bcond_with tests Name: ghc-wai-extra -Version: 3.0.13.1 +Version: 3.0.14 Release: 0 Summary: Provides some basic WAI handlers and middleware License: MIT ++++++ wai-extra-3.0.13.1.tar.gz -> wai-extra-3.0.14.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-extra-3.0.13.1/ChangeLog.md new/wai-extra-3.0.14/ChangeLog.md --- old/wai-extra-3.0.13.1/ChangeLog.md 2015-12-30 07:49:09.000000000 +0100 +++ new/wai-extra-3.0.14/ChangeLog.md 2016-01-12 14:53:39.000000000 +0100 @@ -1,3 +1,7 @@ +## 3.0.14 + +* Middleware to force domain names. [#506](https://github.com/yesodweb/wai/issues/506) [#507](https://github.com/yesodweb/wai/pull/507) + ## 3.0.13.1 * Support wai 3.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-extra-3.0.13.1/Network/Wai/Middleware/ForceDomain.hs new/wai-extra-3.0.14/Network/Wai/Middleware/ForceDomain.hs --- old/wai-extra-3.0.13.1/Network/Wai/Middleware/ForceDomain.hs 1970-01-01 01:00:00.000000000 +0100 +++ new/wai-extra-3.0.14/Network/Wai/Middleware/ForceDomain.hs 2016-01-12 14:53:39.000000000 +0100 @@ -0,0 +1,38 @@ +-- | +-- +-- @since 3.0.14 +module Network.Wai.Middleware.ForceDomain where + +import Data.ByteString (ByteString) +import Data.Monoid ((<>), mempty) +import Network.HTTP.Types (hLocation, methodGet, status301, status307) +import Prelude + +import Network.Wai +import Network.Wai.Request + +-- | Force a domain by redirecting. +-- The `checkDomain` function takes the current domain and checks whether it is correct. +-- It should return `Nothing` if the domain is correct, or `Just "domain.com"` if it is incorrect. +-- +-- @since 3.0.14 +forceDomain :: (ByteString -> Maybe ByteString) -> Middleware +forceDomain checkDomain app req sendResponse = + case requestHeaderHost req >>= checkDomain of + Nothing -> + app req sendResponse + Just domain -> + sendResponse $ redirectResponse domain + + where + -- From: Network.Wai.Middleware.ForceSSL + redirectResponse domain = + responseBuilder status [(hLocation, location domain)] mempty + + location h = + let p = if appearsSecure req then "https://" else "http://" in + p <> h <> rawPathInfo req <> rawQueryString req + + status + | requestMethod req == methodGet = status301 + | otherwise = status307 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-extra-3.0.13.1/Network/Wai/Middleware/Gzip.hs new/wai-extra-3.0.14/Network/Wai/Middleware/Gzip.hs --- old/wai-extra-3.0.13.1/Network/Wai/Middleware/Gzip.hs 2015-12-30 07:49:09.000000000 +0100 +++ new/wai-extra-3.0.14/Network/Wai/Middleware/Gzip.hs 2016-01-12 14:53:39.000000000 +0100 @@ -65,6 +65,7 @@ [ "application/json" , "application/javascript" , "application/ecmascript" + , "image/x-icon" ] -- | Use gzip to compress the body of the response. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-extra-3.0.13.1/wai-extra.cabal new/wai-extra-3.0.14/wai-extra.cabal --- old/wai-extra-3.0.13.1/wai-extra.cabal 2015-12-30 07:49:09.000000000 +0100 +++ new/wai-extra-3.0.14/wai-extra.cabal 2016-01-12 14:53:39.000000000 +0100 @@ -1,5 +1,5 @@ Name: wai-extra -Version: 3.0.13.1 +Version: 3.0.14 Synopsis: Provides some basic WAI handlers and middleware. description: Provides basic WAI handler and middleware functionality: @@ -141,6 +141,7 @@ Network.Wai.Middleware.Vhost Network.Wai.Middleware.HttpAuth Network.Wai.Middleware.StreamFile + Network.Wai.Middleware.ForceDomain Network.Wai.Middleware.ForceSSL Network.Wai.Middleware.Routed Network.Wai.Parse

1 0

commit ghc-wai-logger for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package ghc-wai-logger for openSUSE:Factory checked in at 2016-01-21 23:43:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-wai-logger (Old) and /work/SRC/openSUSE:Factory/.ghc-wai-logger.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-wai-logger" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-wai-logger/ghc-wai-logger.changes 2015-06-15 17:49:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-wai-logger.new/ghc-wai-logger.changes 2016-01-22 01:08:18.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Jan 15 10:26:18 UTC 2016 - mimi.vx(a)gmail.com + +- update to 2.2.5 + +------------------------------------------------------------------- Old: ---- wai-logger-2.2.4.1.tar.gz New: ---- wai-logger-2.2.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-wai-logger.spec ++++++ --- /var/tmp/diff_new_pack.6oSDAT/_old 2016-01-22 01:08:20.000000000 +0100 +++ /var/tmp/diff_new_pack.6oSDAT/_new 2016-01-22 01:08:20.000000000 +0100 @@ -21,7 +21,7 @@ %bcond_with tests Name: ghc-wai-logger -Version: 2.2.4.1 +Version: 2.2.5 Release: 0 Summary: A logging system for WAI License: MIT ++++++ wai-logger-2.2.4.1.tar.gz -> wai-logger-2.2.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-logger-2.2.4.1/Network/Wai/Logger/Apache.hs new/wai-logger-2.2.5/Network/Wai/Logger/Apache.hs --- old/wai-logger-2.2.4.1/Network/Wai/Logger/Apache.hs 2015-06-09 05:29:42.000000000 +0200 +++ new/wai-logger-2.2.5/Network/Wai/Logger/Apache.hs 2016-01-13 08:28:24.000000000 +0100 @@ -8,6 +8,9 @@ #ifndef MIN_VERSION_base #define MIN_VERSION_base(x,y,z) 1 #endif +#ifndef MIN_VERSION_wai +#define MIN_VERSION_wai(x,y,z) 1 +#endif import Data.ByteString.Char8 (ByteString) import qualified Data.ByteString.Char8 as BS @@ -55,17 +58,21 @@ <> " " <> toLogStr (maybe "-" show msize) <> " \"" - <> toLogStr (lookupRequestField' "referer" req) + <> toLogStr (fromMaybe "" mr) <> "\" \"" - <> toLogStr (lookupRequestField' "user-agent" req) + <> toLogStr (fromMaybe "" mua) <> "\"\n" where #if !MIN_VERSION_base(4,5,0) (<>) = mappend #endif - -lookupRequestField' :: CI ByteString -> Request -> ByteString -lookupRequestField' k req = fromMaybe "" . lookup k $ requestHeaders req +#if MIN_VERSION_wai(3,2,0) + mr = requestHeaderReferer req + mua = requestHeaderUserAgent req +#else + mr = lookup "referer" $ requestHeaders req + mua = lookup "user-agent" $ requestHeaders req +#endif -- getSourceIP = getSourceIP fromString fromByteString diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-logger-2.2.4.1/test/doctests.hs new/wai-logger-2.2.5/test/doctests.hs --- old/wai-logger-2.2.4.1/test/doctests.hs 2015-06-09 05:29:42.000000000 +0200 +++ new/wai-logger-2.2.5/test/doctests.hs 2016-01-13 08:28:24.000000000 +0100 @@ -3,9 +3,4 @@ import Test.DocTest main :: IO () -main = doctest [ - "-idist/build/autogen/" - , "-optP-include" - , "-optPdist/build/autogen/cabal_macros.h" - , "Network/Wai/Logger.hs" - ] +main = doctest ["Network"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-logger-2.2.4.1/wai-logger.cabal new/wai-logger-2.2.5/wai-logger.cabal --- old/wai-logger-2.2.4.1/wai-logger.cabal 2015-06-09 05:29:42.000000000 +0200 +++ new/wai-logger-2.2.5/wai-logger.cabal 2016-01-13 08:28:24.000000000 +0100 @@ -1,5 +1,5 @@ Name: wai-logger -Version: 2.2.4.1 +Version: 2.2.5 Author: Kazu Yamamoto <kazu(a)iij.ad.jp> Maintainer: Kazu Yamamoto <kazu(a)iij.ad.jp> License: BSD3 @@ -44,7 +44,7 @@ Ghc-Options: -Wall Main-Is: doctests.hs Build-Depends: base - , doctest + , doctest >= 0.10.1 Source-Repository head Type: git

1 0

commit ocfs2-tools for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package ocfs2-tools for openSUSE:Factory checked in at 2016-01-21 23:43:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old) and /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ocfs2-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes 2015-12-24 12:17:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 2016-01-22 01:08:15.000000000 +0100 @@ -5 +5 @@ - with us forever + with us forever bnc#959660 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocfs2-tools.spec ++++++ --- /var/tmp/diff_new_pack.EkWM0j/_old 2016-01-22 01:08:18.000000000 +0100 +++ /var/tmp/diff_new_pack.EkWM0j/_new 2016-01-22 01:08:18.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ocfs2-tools # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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

1 0

commit collectd for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package collectd for openSUSE:Factory checked in at 2016-01-21 23:43:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/collectd (Old) and /work/SRC/openSUSE:Factory/.collectd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "collectd" Changes: -------- --- /work/SRC/openSUSE:Factory/collectd/collectd.changes 2015-06-10 09:16:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.collectd.new/collectd.changes 2016-01-22 01:08:11.000000000 +0100 @@ -1,0 +2,308 @@ +Fri Jan 15 20:48:24 UTC 2016 - mardnh(a)gmx.de + +- packaging: + * removed patches: + - collectd-new_libstatgrab.patch (fixed upstream) + - collectd-lib64.patch (fixed upstream) + - collectd-fix_libltdl_autoreconf.patch (fixed upstream) + * updated patches: + - collectd-javac_target.patch + - collectd-version.patch + +- upstream update release 2015-05-27, Version 5.5.0 + * Build system: Ability to make out-of-tree builds has been fixed. + Thanks to Vincent Bernat. #792 + * Build system, Disk and Users plugins: Detection and use of libstatgrab + ≧ 0.90 has been added. Thanks to Vincent Bernat. #445, #795, #806, + #807, #908 + * Build system, Memory, CPU, TCPConns and Processes plugins: Numerous + fixes related to OpenBSD support have been added. Thanks to Landry + Breuil. #777, #778, #779, #808 + * Build system: Plugins now only export "module_register()". Thanks to + Florian Forster. + * Build system: Various cleanups and improvements have been done. Thanks + to Marc Fournier. + * collectd: Numerous internal changes and improvements to the daemon and + the plugin API have been make. Thanks to Florian Forster, Pierre-Yves + Ritschard and Alex Petrov. #512, #727 + * collectd: Numerous spelling mistakes have been corrected in comments + and documentation and several error messages have been improved. + Thanks to Ruben Kerkhof, Abhinav Upadhyay, Olivier Bazoud, Pierre-Yves + Ritschard, Tim Smith, Moshe Zada, Katelyn Perry and Marc Fournier. + * collectd: Rules/Targets can now be appended to existing Filter Chains. + Thanks to Marc Falzon. #444 + * collectd: Failing Filter Chains destinations will now log the list of + available write targets. Thanks to Wilfried Goesgens. #650, #1043 + * collectd: Support for process signaling and management by upstart and + systemd has been implemented for the Linux platform. Thanks to + Pierre-Yves Ritschard and Marc Fournier. #798, #811, #814 + * collectd: The "CollectInternalStats" option has been added. Thanks to + Yves Mettier. #691 + * collectd: The daemon source code and dependencies have moved to the + "src/daemon/" directory. Thanks to Florian Forster. + * collectd: The new "MaxReadInterval" option allows to cap the + exponential retry interval of plugins read errors. Thanks to Alexey + Remizov and Florian Forster. #713 + * collectd: The "-P" command-line option now has precedence over the + "PIDFile" option. Thanks to Thomas D. #553 + * collection.cgi: Various data-source related adjustments have been + made. Thanks to Fabiano Pires and Sebastian Harl. + * libcollectdclient: Now propagates errors when signing / encrypting + network packets. Thanks to Florian Forster. + * Configuration: Support for unquoted IPv6 addresses has been added. + Thanks to Sebastian Harl. #489 + * Documentation: Various improvements have been done. Thanks to Florian + Forster and Marc Fournier. + * Examples: the sample C plugin has been updated to the current plugin + API. Thanks to Sebastian Harl. + * Licensing: The following components have been relicensed to the MIT + license: the Apple Sensors, Ascent, DBI, E-Mail, Entropy, GenericJMX, + gmond, LogFile, nginx, Notify Desktop, NTPd, NUT, olsrd, Perl, Ping, + PostgreSQL, Protocols, RouterOS, RRDCacheD, SNMP, StatsD, SysLog, + Table, Tail, UnixSock, vmem, VServer, Wireless, Write Riemann and XMMS + plugins, the core collectd daemon, the collectdmon, collectd-nagios + and collectd-tg utilities, all the Targets and Matches, liboconfig, + most of the "utils_*" files and the plugin API. + * Tests: A test suite has been added. Thanks to Florian Forster. + * Threshold: The hysteresis calculation has been made more reliable. + Thanks to Jan Kundrát. #581 + * Threshold: Various fixes and improvements have been made. Thanks to + Manuel Luis Sanmartín Rozada. #649, #644 + * AMQP plugin: The "ConnectionRetryDelay" option has been added, + allowing to delay reconnection. Thanks to Yoga Ramalingam and Marc + Fournier. #833 + * AMQP plugin: The "QueueDurable" and "QueueAutoDelete" options have + been added, giving control over queue creation and deletion. Thanks to + David Blundell and Marc Fournier. #623 + * Apache, Ascent, BIND, cURL, cURL-JSON, cURL-XML, nginx and Write HTTP + plugins: Customizing the "User-Agent" field is now possible at + compile-time. Thanks to Jeremy Katz. #440 + * Apache, Ascent, BIND, cURL, cURL-JSON, cURL-XML, nginx plugins: The + connection will be reset if it hasn't completed within the configured + "Interval". The new "Timeout" option gives control over this behavior. + Thanks to Jan Kundrát and Marc Fournier. #982, #983, #993 + * Apache, Ascent, cURL, cURL-JSON, cURL-XML, nginx, Write HTTP plugins: + Allow usernames and passwords to contain colons if built against + libcurl ≧ 7.19.1. Thanks to Marc Fournier. #695, #947 + * Apache plugin: The "SSLCiphers" option gives control over the + encryption algorithms to use with TLS connections. Thanks to Toni + Moreno. #946 + * Barometer plugin: This new plugin reads sensor data from various + Freescale and Bosch digital barometers. Thanks to Tomas Menzl. #69, + #693 + * Battery plugin: Reporting values as percentages and reporting degraded + batteries has been added. Thanks to Florian Forster. + * Battery plugin: Support for reading values from sysfs on Linux has + been added. Thanks to Andy Parkins, Nicholas Humfrey, Peter Wu and + Florian Forster. #725, #810, #998 + * Battery plugin: The value for current is no longer supplied unless the + battery provides this information. Thanks to Florian Forster. + * BIND plugin: Bind's XML v3 API is now supported; Thanks to Victor + Berger, Bruno Prémont and Michal Humpula. #742, #847 + * Ceph plugin: This new plugin collects statistics from the Ceph + distributed storage system. Thanks to Dan Ryder, Dennis Zou, Colin + McCabe, Sage Weil. #522, #598 + * ConnTrack plugin: Support for reporting values as percentages as well + as legacy conntrack files in "/proc" has been added. Thanks to + Pierre-Yves Ritschard. #497, #680 + * CPU plugin: The plugin is now able to report values as percentages and + aggregate values per-state and per-CPU. Thanks to Pierre-Yves + Ritschard, Florian Forster, Fabien Wernli, Nicholas Humfrey and + Wilfried Goesgens. #499, #516, #639 #734, #812, #802 + * cURL-JSON plugin: Extracting values from complex JSON structures has + been enhanced. Thanks to Jim Radford. #408, #411 + * cURL-JSON plugin: Intervals can now be configured on a per-URL basis. + Thanks to Stan Sawa. #685 + * cURL-JSON, cURL-XML, Write HTTP plugins: These plugins now also follow + HTTP redirects. Thanks to Marc Fournier. + * cURL, cURL-JSON, cURL-XML plugins: HTTP Digest authentication has been + implemented. Thanks to Frank Cornelis. #482 + * DBI, Oracle, PostgreSQL plugins: A "MetadataFrom" parameter has been + added which allows to set metadata from database columns. Thanks to + Mark Wong. #317, #321 + * DBI plugin: Querying several databases in parallel is now possible. + Thanks to Vincent Bernat. #453 + * Disk plugin: On the Linux platform, disk names can now get looked up + in udev with the "UdevNameAttr" option. Thanks to Patrick Mooney. #537 + * Disk plugin: This plugin now collects several additional I/O-related + metrics on the Linux platform. Thanks to Florian Forster and Michael + Schenck. #705, #759 + * DRBD plugin: This new plugin reads Linux's Distributed Replicated + Block Device (DRBD) statistics. Thanks to Tim Laszlo. #566, #700 + * Exec, UnixSock plugins: The "PUTNOTIF" command now allows to set + metadata on notifications. Thanks to John-John Tedro. #416 + * fhcount plugin: This new plugin reports the number of used file + handles. Thanks to Jiri Tyr. #1009 + * GenericJMX plugin: A Class Loader for "JMXConnectorFactory" has been + added, allowing the plugin to work with JBOSS > 7. Thanks to Alexandre + Moutot. #452 + * IPC plugin: This new plugin collects information related to shared + memory. Thanks to Andrés J. Díaz. #925 + * Java plugin: Now uses the hostname defined in the configuration file. + Thanks to Pierre-Yves Ritschard. #530, #681 + * Load plugin: The plugin is now able to report values as percentages. + Thanks to Vedran Bartonicek and Pierre-Yves Ritschard. #344, #498 + * Log Logstash plugin: This new plugin writes collectd logs and events + as Logstash JSON formatted events. Thanks to Pierre-Yves Ritschard. + #360 + * LVM plugin: The plugin collects thin pool data volumes size, and no + longer reports virtual volumes. Thanks to Benjamin Gilbert. #603 + * memcached plugin: "listen_disabled_num" are now also reported. Thanks + to Matt Cottingham. #622 + * Memory plugin: Slab memory reporting on the Linux platform has been + added. Thanks to Manuel CISSÉ and Marc Fournier. #560, #697 + * Memory plugin: The plugin is now able to report values as percentages. + Thanks to Jeremy Katz, Florian Forster and Manuel CISSÉ. #501, #511, + #559 + * Modbus plugin: Selecting between holding and input registers is now + possible. Thanks to Jan Vitek. #338 + * Modbus plugin: Support for accessing devices through an RS-485 serial + port has been added. Thanks to Eric Sandeen. + * Multimeter plugin: This plugin isn't built by default on the AIX + platform anymore. Thanks to Manuel Luis Sanmartin Rozada. #549, #684 + * MySQL and PostgreSQL plugins: Passing "127.0.0.1" as a host will now + result in the global Hostname being used in metric names. Thanks to + Jeremy Katz. #441 + * MySQL plugin: InnoDB, Select and Sort statistics collection has been + added. Thanks to Wilson Felipe, Marek Becka and Pierre-Yves Ritschard. + #248, #621, #699, #824 + * MySQL plugin: The "Alias" and "ConnectTimeout" options have been + added. Thanks to William Tisäter. + * Netlink plugin: Support for 64bit netlink counters has been added. + Thanks to Marek Becka. #435 + * Network plugin: The "ReconnectInterval" configuration option has been + added. Thanks to John Ferlito. #732 + * NFS plugin: Support for NFSv4.0 has been implemented. Thanks to Marek + Becka. #550 + * OneWire plugin: Support for more temperature-providing sensor families + has been added. Thanks to Tomasz Torcz. #672 + * OneWire plugin: Support for full OWFS path and more device families + has been implemented. Thanks to Tomas Menzl. #68 + * OpenLDAP plugin: This new plugin reads monitoring information from + OpenLDAP's "cn=Monitor" subtree. Thanks to Kimo Rosenbaum, Marc + Fournier and Nicholas Humfrey. #719 + * OpenVPN plugin: Support for OpenVPN 2.3.0 has been implemented. Thanks + to Ed Okerson. #252 + * OpenVZ plugin: Various improvements have been made, making the plugin + report values like the other collectd plugins do. Thanks to Chris + Lundquist. #264 + * Perl plugin: A new "listval_filter" method has been added, various + internal cleanups and improvements have been made and a test suite has + been added. Thanks to Matthias Bethke. #728 + * PostgreSQL plugin: The new "ExpireDelay" option allows skipping older + values pending write when the database slows down. Thanks to Stephen + O'Dor. #593 + * PowerDNS plugin: The plugin was updated for stats from pdns 3.4.3. + Thanks to Ruben Kerkhof. #965 + * Processes plugin: A memory-usage related optimization for low-profile ++++ 111 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/collectd/collectd.changes ++++ and /work/SRC/openSUSE:Factory/.collectd.new/collectd.changes Old: ---- _service collectd-5.4.2.tar.bz2 collectd-fix_libltdl_autoreconf.patch collectd-lib64.patch New: ---- collectd-5.5.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ collectd.spec ++++++ --- /var/tmp/diff_new_pack.ciwH2Q/_old 2016-01-22 01:08:13.000000000 +0100 +++ /var/tmp/diff_new_pack.ciwH2Q/_new 2016-01-22 01:08:13.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package collectd # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2005-2013 Pascal Bleser <pascal.bleser(a)opensuse.org> # # All modifications and additions to the file contributed by third parties @@ -17,12 +17,21 @@ # +%bcond_with modbus + %define madwifi_plugin madwifi %define pcap_version %({rpm -q --qf='%{VERSION}\n' libpcap-devel 2>/dev/null || echo 0.0.0} | gawk -F. '{print $1*10000+$2*100+$3}') %define snmp 1 %define with_esmtp 1 %define ipvs_plugin ipvs -%define plugins apache apcups battery %{expand:%{bind_plugin}} cgroups curl %{expand:%{curl_json_plugin}} %{expand:%{curl_xml_plugin}} conntrack contextswitch cpu cpufreq csv df disk %{expand:%{dns_plugin}} email entropy exec filecount fscache hddtemp interface %{expand:%{ipvs_plugin}} irq load logfile match_empty_counter match_hashed match_regex match_timediff match_value mbmon %{expand:%{memcached_plugin}} memory multimeter netlink network nfs nginx ntpd olsrd openvpn perl ping protocols powerdns processes rrdtool sensors serial statsd swap syslog table tail target_notification target_replace target_scale target_set target_v5upgrade tcpconns teamspeak2 ted thermal threshold unixsock uptime users uuid vmem vserver wireless write_http %{expand:%{ascent_plugin}} %{expand:%{iptables_plugin}} %{expand:%{madwifi_plugin}} %{expand:%{rrdcached_plugin}} aggregation ethstat md numa tail_csv write_graphite write_riemann +%define plugins apache apcups battery %{expand:%{bind_plugin}} cgroups curl %{expand:%{curl_json_plugin}} %{expand:%{curl_xml_plugin}} conntrack contextswitch cpu cpufreq csv df disk %{expand:%{dns_plugin}} email entropy exec filecount fscache hddtemp interface %{expand:%{ipvs_plugin}} irq load logfile match_empty_counter match_hashed match_regex match_timediff match_value mbmon %{expand:%{memcached_plugin}} memory multimeter netlink network nfs nginx ntpd olsrd openvpn perl ping protocols powerdns processes rrdtool %{expand:%{sensors_plugin}} serial statsd swap syslog table tail target_notification target_replace target_scale target_set target_v5upgrade tcpconns teamspeak2 ted thermal threshold unixsock uptime users uuid vmem vserver wireless write_http %{expand:%{ascent_plugin}} %{expand:%{iptables_plugin}} %{expand:%{madwifi_plugin}} %{expand:%{rrdcached_plugin}} aggregation ethstat md numa tail_csv write_graphite write_riemann ceph drbd fhcount ipc log_logstash turbostat write_log write_log write_sensu write_tsdb zfs_arc zookeeper +%ifnarch s390 s390x +%define sensors 1 +%define sensors_plugin sensors +%else +%define sensors 0 +%define sensors_plugin %{nil} +%endif %if 0%{?_with_xmms:1}0 %define xmms 1 %else @@ -114,7 +123,7 @@ PreReq: %insserv_prereq %endif Name: collectd -Version: 5.4.2 +Version: 5.5.0 Release: 0 Summary: Statistics Collection Daemon for filling RRD Files License: GPL-2.0 @@ -128,13 +137,11 @@ # see https://bugzilla.novell.com/show_bug.cgi?id=388026 Source20: collectd-pthread.pc Source99: collectd-rpmlintrc -Patch4: collectd-lib64.patch Patch7: collectd-fix-config.patch Patch9: collectd-version.patch Patch10: collectd-perl-vendor.patch # see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=467072 Patch11: collectd-fix_broken_perl-5.10.patch -Patch17: collectd-fix_libltdl_autoreconf.patch Patch18: collectd-fix_collection_cgi.patch Patch19: collectd-fix_spamassassin_doc.patch Patch20: collectd-split_README.patch @@ -157,7 +164,6 @@ BuildRequires: kernel-source BuildRequires: libart_lgpl-devel BuildRequires: libevent-devel -#BuildRequires: libmodbus-devel BuildRequires: libmnl-devel BuildRequires: libnetlink-devel BuildRequires: liboping-devel @@ -172,11 +178,13 @@ BuildRequires: pkgconfig BuildRequires: python-devel BuildRequires: rrdtool -BuildRequires: sensors BuildRequires: xfsprogs-devel BuildRequires: zlib-devel Requires: rrdtool +%if %{sensors} +BuildRequires: sensors Requires: sensors +%endif # FIXME: use proper Requires(pre/post/preun/...) PreReq: %fillup_prereq # in case we'd like to split it later: @@ -253,6 +261,9 @@ %if %{memcachec} BuildRequires: libmemcached-devel %endif +%if %{with modbus} +BuildRequires: libmodbus-devel +%endif %if %{protobuf} BuildRequires: protobuf-c %endif @@ -426,6 +437,16 @@ Optional %{name} plugin to sample memcached statistics. %endif #memcachec +%if %{with modbus} +%package plugin-modbus +Summary: ModBus Plugin for %{name} +Group: System/Monitoring +Requires: %{name} = %{version}-%{release} + +%description plugin-modbus +Optional %{name} plugin to collect data using ModBus protocol. +%endif #modbus + %if %{protobuf} %package plugin-pinba Summary: Pinba Collector Plugin for %{name} @@ -471,6 +492,9 @@ %if %{memcachec} Requires: %{name}-plugin-memcachec = %{version}-%{release} %endif #memcachec +%if %{with modbus} +Requires: %{name}-plugin-modbus = %{version}-%{release} +%endif #modbus %if %{protobuf} Requires: %{name}-plugin-pinba = %{version}-%{release} %endif #protobuf @@ -511,19 +535,15 @@ %prep %setup -q -n "collectd-%{version}" -%if "%{_lib}"=="lib64" -%patch4 -%endif %patch7 %patch9 -p1 %patch10 %patch11 -%patch17 %patch18 %patch19 %patch20 %patch21 -%patch23 +%patch23 -p1 %if 0%{?suse_version} <= 1140 && !0%{?sles_version} %patch24 -p1 %endif @@ -608,6 +628,11 @@ %else --disable-memcached \ %endif #memcachec +%if %{with modbus} + --enable-modbus \ +%else + --disable-modbus \ +%endif #modbus %if 0%{?suse_version} < 930 --disable-mysql \ %endif @@ -908,8 +933,8 @@ %if %{virt} %files plugin-virt %defattr(-,root,root) -%{_libdir}/collectd/libvirt.so -%{_libdir}/collectd/libvirt.la +%{_libdir}/collectd/virt.so +%{_libdir}/collectd/virt.la %endif #virt %if %{xmms} @@ -933,6 +958,13 @@ %{_libdir}/collectd/memcachec.la %endif #memcachec +%if %{with modbus} +%files plugin-modbus +%defattr(-,root,root) +%{_libdir}/collectd/modbus.so +%{_libdir}/collectd/modbus.la +%endif #modbus + %files spamassassin %defattr(-,root,root) %dir %{_datadir}/spamassassin ++++++ collectd-5.4.2.tar.bz2 -> collectd-5.5.0.tar.bz2 ++++++ ++++ 86272 lines of diff (skipped) ++++++ collectd-javac_target.patch ++++++ --- /var/tmp/diff_new_pack.ciwH2Q/_old 2016-01-22 01:08:15.000000000 +0100 +++ /var/tmp/diff_new_pack.ciwH2Q/_new 2016-01-22 01:08:15.000000000 +0100 @@ -1,9 +1,11 @@ ---- bindings/java/Makefile.in.orig 2010-07-12 20:27:41.000000000 +0200 -+++ bindings/java/Makefile.in 2010-07-12 20:28:09.000000000 +0200 -@@ -490,8 +490,8 @@ - +diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am +index 8d2e49d..549d81a 100644 +--- a/bindings/java/Makefile.am ++++ b/bindings/java/Makefile.am +@@ -25,8 +25,8 @@ EXTRA_DIST = org/collectd/api/CollectdConfigInterface.java \ + org/collectd/java/JMXMemory.java - java-build-stamp: org/collectd/api/*.java org/collectd/java/*.java + java-build-stamp: $(srcdir)/org/collectd/api/*.java $(srcdir)/org/collectd/java/*.java - $(JAVAC) -d "." "$(srcdir)/org/collectd/api"/*.java - $(JAVAC) -d "." "$(srcdir)/org/collectd/java"/*.java + $(JAVAC) $(JAVAC_TARGET) -d "." "$(srcdir)/org/collectd/api"/*.java @@ -11,12 +13,14 @@ mkdir -p .libs $(JAR) cf .libs/collectd-api.jar "org/collectd/api"/*.class $(JAR) cf .libs/generic-jmx.jar "org/collectd/java"/*.class ---- bindings/java/Makefile.am.orig 2010-07-12 20:26:48.000000000 +0200 -+++ bindings/java/Makefile.am 2010-07-12 20:27:35.000000000 +0200 -@@ -25,8 +25,8 @@ - org/collectd/java/JMXMemory.java +diff --git a/bindings/java/Makefile.in b/bindings/java/Makefile.in +index 1c57558..c8ab086 100644 +--- a/bindings/java/Makefile.in ++++ b/bindings/java/Makefile.in +@@ -597,8 +597,8 @@ uninstall-am: uninstall-local + - java-build-stamp: org/collectd/api/*.java org/collectd/java/*.java + java-build-stamp: $(srcdir)/org/collectd/api/*.java $(srcdir)/org/collectd/java/*.java - $(JAVAC) -d "." "$(srcdir)/org/collectd/api"/*.java - $(JAVAC) -d "." "$(srcdir)/org/collectd/java"/*.java + $(JAVAC) $(JAVAC_TARGET) -d "." "$(srcdir)/org/collectd/api"/*.java ++++++ collectd-version.patch ++++++ --- /var/tmp/diff_new_pack.ciwH2Q/_old 2016-01-22 01:08:15.000000000 +0100 +++ /var/tmp/diff_new_pack.ciwH2Q/_new 2016-01-22 01:08:15.000000000 +0100 @@ -1,9 +1,11 @@ ---- a/configure.ac 2014-01-26 09:09:23.000000000 +0100 -+++ b/configure.ac 2014-03-11 07:41:44.326748635 +0100 +diff --git a/configure.ac b/configure.ac +index 87d1502..15efa43 100644 +--- a/configure.ac ++++ b/configure.ac @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([collectd],[m4_esyscmd(./version-gen.sh)]) +AC_INIT([collectd],[@@VERSION@@]) - AC_CONFIG_SRCDIR(src/collectd.c) + AC_CONFIG_SRCDIR(src/) AC_CONFIG_HEADERS(src/config.h) AC_CONFIG_AUX_DIR([libltdl/config])

1 0

commit xtrabackup for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package xtrabackup for openSUSE:Factory checked in at 2016-01-21 23:43:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xtrabackup (Old) and /work/SRC/openSUSE:Factory/.xtrabackup.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xtrabackup" Changes: -------- --- /work/SRC/openSUSE:Factory/xtrabackup/xtrabackup.changes 2016-01-01 19:49:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xtrabackup.new/xtrabackup.changes 2016-01-22 01:08:07.000000000 +0100 @@ -1,0 +2,34 @@ +Sun Jan 17 18:54:37 UTC 2016 - ecsos(a)opensuse.org + +- Percona XtraBackup 2.3.3, a bugfix release: + * Database directories were not removed if DROP DATABASE happened + during the backup. + * Backup would fail if Store backup history on the server feature + was enabled and backup was taken from server without binary + log enabled. + * Percona XtraBackup now fails with descriptive error message if + --defaults-extra-file is not specified first. + * Backup would fail if --rsync option was used without specifying + temporary folder. + * Fixed Percona XtraBackup crash which happened when it was used + for SST on MariaDB Galera Cluster caused by double free of + datadir‘ variable. + * --move-back did not respect the innodb_log_group_home_dir and + innodb_data_home_dir options which caused ib_logfiles and data + files not to be moved to correct location. + * xtrabackup_binlog_info was not updated correctly when applying + incremental backups. + * When using a --defaults-file option Percona XtraBackup would + complain about datadir being mismatched if it wasn’t explicitly + set in the defaults file. + * Fixed build issues by adding missing check in cmake script for + xxd presence. + * Percona XtraBackup would terminate backup process without error + if --slave-info option was used on a server not running as a + replication slave. + * innobackupex when used with --stream option would create an + empty directory with a timestamp as a name. +- update percona-xtrabackup-2.3.2-disable-version-check.patch + to percona-xtrabackup-2.3.3-disable-version-check.patch + +------------------------------------------------------------------- Old: ---- percona-xtrabackup-2.3.2-disable-version-check.patch percona-xtrabackup-2.3.2-nodoc.tar.xz New: ---- percona-xtrabackup-2.3.3-disable-version-check.patch percona-xtrabackup-2.3.3-nodoc.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xtrabackup.spec ++++++ --- /var/tmp/diff_new_pack.BjfCeC/_old 2016-01-22 01:08:11.000000000 +0100 +++ /var/tmp/diff_new_pack.BjfCeC/_new 2016-01-22 01:08:11.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xtrabackup # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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,7 +17,7 @@ Name: xtrabackup -Version: 2.3.2 +Version: 2.3.3 Release: 0 Summary: Online backup for MySQL / InnoDB License: GPL-2.0 @@ -29,7 +29,7 @@ Source4: xtrabackup-nodoc.sh Patch1: percona-xtrabackup-2.2.x-srv_buf_size.patch Patch3: percona-xtrabackup-2.2.9-nodoc.patch -Patch4: percona-xtrabackup-2.3.2-disable-version-check.patch +Patch4: percona-xtrabackup-2.3.3-disable-version-check.patch Patch5: percona-xtrabackup-2.3.2-unbundle-jsnm.patch BuildRequires: autoconf BuildRequires: automake ++++++ percona-xtrabackup-2.3.2-disable-version-check.patch -> percona-xtrabackup-2.3.3-disable-version-check.patch ++++++ --- /work/SRC/openSUSE:Factory/xtrabackup/percona-xtrabackup-2.3.2-disable-version-check.patch 2015-11-12 19:40:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xtrabackup.new/percona-xtrabackup-2.3.3-disable-version-check.patch 2016-01-22 01:08:07.000000000 +0100 @@ -1,16 +1,16 @@ -Index: percona-xtrabackup-2.3.2/storage/innobase/xtrabackup/src/backup_copy.cc -=================================================================== ---- percona-xtrabackup-2.3.2.orig/storage/innobase/xtrabackup/src/backup_copy.cc -+++ percona-xtrabackup-2.3.2/storage/innobase/xtrabackup/src/backup_copy.cc -@@ -48,7 +48,6 @@ Place, Suite 330, Boston, MA 02111-1307 +diff -Pdpru percona-xtrabackup-2.3.3.orig/storage/innobase/xtrabackup/src/backup_copy.cc percona-xtrabackup-2.3.3/storage/innobase/xtrabackup/src/backup_copy.cc +--- percona-xtrabackup-2.3.3.orig/storage/innobase/xtrabackup/src/backup_copy.cc 2015-12-14 20:49:07.000000000 +0100 ++++ percona-xtrabackup-2.3.3/storage/innobase/xtrabackup/src/backup_copy.cc 2016-01-17 23:26:10.661829261 +0100 +@@ -48,7 +48,7 @@ Place, Suite 330, Boston, MA 02111-1307 #include <set> #include <string> #include <mysqld.h> -#include <version_check_pl.h> ++/* #include <version_check_pl.h> */ #include <sstream> #include "fil_cur.h" #include "xtrabackup.h" -@@ -1866,6 +1865,7 @@ decrypt_decompress() +@@ -1882,6 +1882,7 @@ decrypt_decompress() return(ret); } @@ -18,15 +18,14 @@ void version_check() { -@@ -1896,3 +1896,4 @@ version_check() +@@ -1912,3 +1913,4 @@ version_check() pclose(pipe); } +*/ -Index: percona-xtrabackup-2.3.2/storage/innobase/xtrabackup/src/backup_copy.h -=================================================================== ---- percona-xtrabackup-2.3.2.orig/storage/innobase/xtrabackup/src/backup_copy.h -+++ percona-xtrabackup-2.3.2/storage/innobase/xtrabackup/src/backup_copy.h +diff -Pdpru percona-xtrabackup-2.3.3.orig/storage/innobase/xtrabackup/src/backup_copy.h percona-xtrabackup-2.3.3/storage/innobase/xtrabackup/src/backup_copy.h +--- percona-xtrabackup-2.3.3.orig/storage/innobase/xtrabackup/src/backup_copy.h 2015-12-14 20:49:07.000000000 +0100 ++++ percona-xtrabackup-2.3.3/storage/innobase/xtrabackup/src/backup_copy.h 2016-01-17 23:16:15.044500527 +0100 @@ -37,8 +37,10 @@ bool copy_back(); bool @@ -38,32 +37,54 @@ bool is_path_separator(char); bool -Index: percona-xtrabackup-2.3.2/storage/innobase/xtrabackup/src/xtrabackup.cc -=================================================================== ---- percona-xtrabackup-2.3.2.orig/storage/innobase/xtrabackup/src/xtrabackup.cc -+++ percona-xtrabackup-2.3.2/storage/innobase/xtrabackup/src/xtrabackup.cc -@@ -6688,7 +6688,7 @@ xb_init() +diff -Pdpru percona-xtrabackup-2.3.3.orig/storage/innobase/xtrabackup/src/CMakeLists.txt percona-xtrabackup-2.3.3/storage/innobase/xtrabackup/src/CMakeLists.txt +--- percona-xtrabackup-2.3.3.orig/storage/innobase/xtrabackup/src/CMakeLists.txt 2015-12-14 20:49:07.000000000 +0100 ++++ percona-xtrabackup-2.3.3/storage/innobase/xtrabackup/src/CMakeLists.txt 2016-01-17 23:37:22.286376304 +0100 +@@ -25,11 +25,11 @@ FIND_CURL() + FIND_EV() + + # xxd is needed to embed version_check script +-FIND_PROGRAM(XXD_PATH xxd) ++#FIND_PROGRAM(XXD_PATH xxd) + +-IF(NOT XXD_PATH) +- MESSAGE(FATAL_ERROR "xxd not found. Try to install vim-common.") +-ENDIF(NOT XXD_PATH) ++#IF(NOT XXD_PATH) ++# MESSAGE(FATAL_ERROR "xxd not found. Try to install vim-common.") ++#ENDIF(NOT XXD_PATH) + + INCLUDE_DIRECTORIES( + ${CMAKE_SOURCE_DIR}/include +@@ -50,13 +50,13 @@ INCLUDE_DIRECTORIES( + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/xtrabackup_version.h.in + ${CMAKE_CURRENT_BINARY_DIR}/xtrabackup_version.h ) + +-ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version_check_pl.h +- COMMAND ${XXD_PATH} --include version_check.pl +- ${CMAKE_CURRENT_BINARY_DIR}/version_check_pl.h +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) ++#ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version_check_pl.h ++# COMMAND ${XXD_PATH} --include version_check.pl ++# ${CMAKE_CURRENT_BINARY_DIR}/version_check_pl.h ++# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + +-ADD_CUSTOM_TARGET(GenVersionCheck +- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/version_check_pl.h) ++#ADD_CUSTOM_TARGET(GenVersionCheck ++# DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/version_check_pl.h) + + + MYSQL_ADD_EXECUTABLE(xtrabackup +diff -Pdpru percona-xtrabackup-2.3.3.orig/storage/innobase/xtrabackup/src/xtrabackup.cc percona-xtrabackup-2.3.3/storage/innobase/xtrabackup/src/xtrabackup.cc +--- percona-xtrabackup-2.3.3.orig/storage/innobase/xtrabackup/src/xtrabackup.cc 2015-12-14 20:49:07.000000000 +0100 ++++ percona-xtrabackup-2.3.3/storage/innobase/xtrabackup/src/xtrabackup.cc 2016-01-17 23:17:32.535859179 +0100 +@@ -6699,7 +6699,7 @@ xb_init() if (xtrabackup_backup) { if (!opt_noversioncheck) { - version_check(); -+ // version_check(); ++ //version_check(); } if ((mysql_connection = xb_mysql_connect()) == NULL) { -Index: percona-xtrabackup-2.3.2/storage/innobase/xtrabackup/src/CMakeLists.txt -=================================================================== ---- percona-xtrabackup-2.3.2.orig/storage/innobase/xtrabackup/src/CMakeLists.txt -+++ percona-xtrabackup-2.3.2/storage/innobase/xtrabackup/src/CMakeLists.txt -@@ -43,11 +43,6 @@ INCLUDE_DIRECTORIES( - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/xtrabackup_version.h.in - ${CMAKE_CURRENT_BINARY_DIR}/xtrabackup_version.h ) - --EXECUTE_PROCESS(COMMAND xxd --include version_check.pl -- ${CMAKE_CURRENT_BINARY_DIR}/version_check_pl.h -- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) -- -- - MYSQL_ADD_EXECUTABLE(xtrabackup - xtrabackup.cc - innobackupex.cc ++++++ percona-xtrabackup-2.3.2-nodoc.tar.xz -> percona-xtrabackup-2.3.3-nodoc.tar.xz ++++++ /work/SRC/openSUSE:Factory/xtrabackup/percona-xtrabackup-2.3.2-nodoc.tar.xz /work/SRC/openSUSE:Factory/.xtrabackup.new/percona-xtrabackup-2.3.3-nodoc.tar.xz differ: char 26, line 1

1 0

commit unidings-fonts for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package unidings-fonts for openSUSE:Factory checked in at 2016-01-21 23:43:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/unidings-fonts (Old) and /work/SRC/openSUSE:Factory/.unidings-fonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "unidings-fonts" Changes: -------- --- /work/SRC/openSUSE:Factory/unidings-fonts/unidings-fonts.changes 2014-01-23 15:57:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.unidings-fonts.new/unidings-fonts.changes 2016-01-22 01:08:05.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Jan 17 13:27:20 UTC 2016 - aloisio(a)gmx.com + +- Update to version 8.00 + * added pdf documentation + * replaced README file with a note from the website + +------------------------------------------------------------------- Old: ---- unidings-fonts-7.12.tar.bz2 New: ---- unidings-fonts-8.00.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unidings-fonts.spec ++++++ --- /var/tmp/diff_new_pack.04WSTI/_old 2016-01-22 01:08:06.000000000 +0100 +++ /var/tmp/diff_new_pack.04WSTI/_new 2016-01-22 01:08:06.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package unidings-fonts # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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,7 +17,7 @@ Name: unidings-fonts -Version: 7.12 +Version: 8.00 Release: 0 Summary: Font with Basic Icon Glyphs License: SUSE-Permissive @@ -45,7 +45,7 @@ %files %defattr(-,root,root) -%doc README +%doc README-SUSE Unidings.pdf %{_ttfontsdir} %changelog ++++++ unidings-fonts-7.12.tar.bz2 -> unidings-fonts-8.00.tar.bz2 ++++++ Files old/unidings-fonts-7.12/README and new/unidings-fonts-8.00/README differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unidings-fonts-7.12/README-SUSE new/unidings-fonts-8.00/README-SUSE --- old/unidings-fonts-7.12/README-SUSE 1970-01-01 01:00:00.000000000 +0100 +++ new/unidings-fonts-8.00/README-SUSE 2016-01-17 14:26:11.000000000 +0100 @@ -0,0 +1,8 @@ +Cited from http://users.teilar.gr/~g1951d/ as of 20160117 + +In lieu of a licence + +Fonts and documents in this site are free for any use. + +George Douros + Files old/unidings-fonts-7.12/Unidings.docx and new/unidings-fonts-8.00/Unidings.docx differ Files old/unidings-fonts-7.12/Unidings.pdf and new/unidings-fonts-8.00/Unidings.pdf differ Files old/unidings-fonts-7.12/Unidings.ttf and new/unidings-fonts-8.00/Unidings.ttf differ Files old/unidings-fonts-7.12/Unidings_hint.ttf and new/unidings-fonts-8.00/Unidings_hint.ttf differ

1 0

commit gdouros-symbola-fonts for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package gdouros-symbola-fonts for openSUSE:Factory checked in at 2016-01-21 23:43:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gdouros-symbola-fonts (Old) and /work/SRC/openSUSE:Factory/.gdouros-symbola-fonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gdouros-symbola-fonts" Changes: -------- --- /work/SRC/openSUSE:Factory/gdouros-symbola-fonts/gdouros-symbola-fonts.changes 2015-06-23 12:00:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gdouros-symbola-fonts.new/gdouros-symbola-fonts.changes 2016-01-22 01:08:01.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Jan 17 14:08:09 UTC 2016 - aloisio(a)gmx.com + +- Refreshed archive + * updated pdf documentation + * updated README-SUSE + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdouros-symbola-fonts.spec ++++++ --- /var/tmp/diff_new_pack.cVeyyb/_old 2016-01-22 01:08:03.000000000 +0100 +++ /var/tmp/diff_new_pack.cVeyyb/_new 2016-01-22 01:08:03.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gdouros-symbola-fonts # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 ++++++ symbola-fonts-8.00.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/symbola-fonts-8.00/README-SUSE new/symbola-fonts-8.00/README-SUSE --- old/symbola-fonts-8.00/README-SUSE 2015-06-21 15:14:35.000000000 +0200 +++ new/symbola-fonts-8.00/README-SUSE 2016-01-17 15:04:12.000000000 +0100 @@ -1,11 +1,7 @@ -Cited from http://users.teilar.gr/~g1951d/ as of 20150620 +Cited from http://users.teilar.gr/~g1951d/ as of 20160117 In lieu of a licence - -Fonts and documents in this site are not pieces of property or merchandise items; -they carry no trademark, copyright, license or other market tags; they are -free for any use. +Fonts and documents in this site are free for any use. George Douros - Files old/symbola-fonts-8.00/Symbola.docx and new/symbola-fonts-8.00/Symbola.docx differ Files old/symbola-fonts-8.00/Symbola.pdf and new/symbola-fonts-8.00/Symbola.pdf differ Files old/symbola-fonts-8.00/Symbola.ttf and new/symbola-fonts-8.00/Symbola.ttf differ Files old/symbola-fonts-8.00/Symbola_hint.ttf and new/symbola-fonts-8.00/Symbola_hint.ttf differ

1 0

commit gdouros-maya-fonts for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package gdouros-maya-fonts for openSUSE:Factory checked in at 2016-01-21 23:43:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gdouros-maya-fonts (Old) and /work/SRC/openSUSE:Factory/.gdouros-maya-fonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gdouros-maya-fonts" Changes: -------- --- /work/SRC/openSUSE:Factory/gdouros-maya-fonts/gdouros-maya-fonts.changes 2015-06-30 10:15:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gdouros-maya-fonts.new/gdouros-maya-fonts.changes 2016-01-22 01:07:58.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Jan 17 13:38:35 UTC 2016 - aloisio(a)gmx.com + +- Refreshed archive + * updated pdf documentation + * updated README-SUSE + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdouros-maya-fonts.spec ++++++ --- /var/tmp/diff_new_pack.xDelBX/_old 2016-01-22 01:08:00.000000000 +0100 +++ /var/tmp/diff_new_pack.xDelBX/_new 2016-01-22 01:08:00.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gdouros-maya-fonts # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 ++++++ maya-fonts-4.14.tar.bz2 ++++++ Files old/maya-fonts-4.14/Maya.docx and new/maya-fonts-4.14/Maya.docx differ Files old/maya-fonts-4.14/Maya.pdf and new/maya-fonts-4.14/Maya.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maya-fonts-4.14/README-SUSE new/maya-fonts-4.14/README-SUSE --- old/maya-fonts-4.14/README-SUSE 2015-06-22 13:24:49.000000000 +0200 +++ new/maya-fonts-4.14/README-SUSE 2016-01-17 14:37:43.000000000 +0100 @@ -1,11 +1,7 @@ -Cited from http://users.teilar.gr/~g1951d/ as of 20150620 +Cited from http://users.teilar.gr/~g1951d/ as of 20160117 In lieu of a licence - -Fonts and documents in this site are not pieces of property or merchandise items; -they carry no trademark, copyright, license or other market tags; they are -free for any use. +Fonts and documents in this site are free for any use. George Douros -

1 0

commit gdouros-asea-fonts for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package gdouros-asea-fonts for openSUSE:Factory checked in at 2016-01-21 23:43:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gdouros-asea-fonts (Old) and /work/SRC/openSUSE:Factory/.gdouros-asea-fonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gdouros-asea-fonts" Changes: -------- --- /work/SRC/openSUSE:Factory/gdouros-asea-fonts/gdouros-asea-fonts.changes 2015-06-23 12:00:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gdouros-asea-fonts.new/gdouros-asea-fonts.changes 2016-01-22 01:07:55.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Jan 17 14:44:45 UTC 2016 - aloisio(a)gmx.com + +- Update to version 6.00 + * new pdf documentation + * refreshed README-SUSE from the website + +------------------------------------------------------------------- Old: ---- asea-fonts-5.01.tar.bz2 New: ---- asea-fonts-6.00.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdouros-asea-fonts.spec ++++++ --- /var/tmp/diff_new_pack.FDgICU/_old 2016-01-22 01:07:57.000000000 +0100 +++ /var/tmp/diff_new_pack.FDgICU/_new 2016-01-22 01:07:57.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gdouros-asea-fonts # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -19,7 +19,7 @@ %define fontname asea-fonts Name: gdouros-%{fontname} -Version: 5.01 +Version: 6.00 Release: 0 Summary: The font of Greek Typography License: SUSE-Permissive ++++++ asea-fonts-5.01.tar.bz2 -> asea-fonts-6.00.tar.bz2 ++++++ Files old/asea-fonts-5.01/AseaB.ttf and new/asea-fonts-6.00/AseaB.ttf differ Files old/asea-fonts-5.01/AseaB_hint.ttf and new/asea-fonts-6.00/AseaB_hint.ttf differ Files old/asea-fonts-5.01/AseaI.ttf and new/asea-fonts-6.00/AseaI.ttf differ Files old/asea-fonts-5.01/AseaI_hint.ttf and new/asea-fonts-6.00/AseaI_hint.ttf differ Files old/asea-fonts-5.01/AseaJ.ttf and new/asea-fonts-6.00/AseaJ.ttf differ Files old/asea-fonts-5.01/AseaJ_hint.ttf and new/asea-fonts-6.00/AseaJ_hint.ttf differ Files old/asea-fonts-5.01/AseaR.ttf and new/asea-fonts-6.00/AseaR.ttf differ Files old/asea-fonts-5.01/AseaR_hint.ttf and new/asea-fonts-6.00/AseaR_hint.ttf differ Files old/asea-fonts-5.01/Asea_B.ttf and new/asea-fonts-6.00/Asea_B.ttf differ Files old/asea-fonts-5.01/Asea_BI.ttf and new/asea-fonts-6.00/Asea_BI.ttf differ Files old/asea-fonts-5.01/Asea_BI_hint.ttf and new/asea-fonts-6.00/Asea_BI_hint.ttf differ Files old/asea-fonts-5.01/Asea_B_hint.ttf and new/asea-fonts-6.00/Asea_B_hint.ttf differ Files old/asea-fonts-5.01/Asea_I.ttf and new/asea-fonts-6.00/Asea_I.ttf differ Files old/asea-fonts-5.01/Asea_I_hint.ttf and new/asea-fonts-6.00/Asea_I_hint.ttf differ Files old/asea-fonts-5.01/Asea_R.ttf and new/asea-fonts-6.00/Asea_R.ttf differ Files old/asea-fonts-5.01/Asea_R_hint.ttf and new/asea-fonts-6.00/Asea_R_hint.ttf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asea-fonts-5.01/README-SUSE new/asea-fonts-6.00/README-SUSE --- old/asea-fonts-5.01/README-SUSE 2015-06-21 13:33:22.000000000 +0200 +++ new/asea-fonts-6.00/README-SUSE 2016-01-17 15:43:40.000000000 +0100 @@ -1,11 +1,7 @@ -Cited from http://users.teilar.gr/~g1951d/ as of 20150620 +Cited from http://users.teilar.gr/~g1951d/ as of 20160117 In lieu of a licence - -Fonts and documents in this site are not pieces of property or merchandise items; -they carry no trademark, copyright, license or other market tags; they are -free for any use. +Fonts and documents in this site are free for any use. George Douros - Files old/asea-fonts-5.01/Textfonts.pdf and new/asea-fonts-6.00/Textfonts.pdf differ

1 0

commit gdouros-aroania-fonts for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package gdouros-aroania-fonts for openSUSE:Factory checked in at 2016-01-21 23:43:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gdouros-aroania-fonts (Old) and /work/SRC/openSUSE:Factory/.gdouros-aroania-fonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gdouros-aroania-fonts" Changes: -------- --- /work/SRC/openSUSE:Factory/gdouros-aroania-fonts/gdouros-aroania-fonts.changes 2015-06-23 12:00:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gdouros-aroania-fonts.new/gdouros-aroania-fonts.changes 2016-01-22 01:07:52.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Jan 17 14:38:54 UTC 2016 - aloisio(a)gmx.com + +- Refreshed archive + * updated pdf documentation + * updated README-SUSE from website + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdouros-aroania-fonts.spec ++++++ --- /var/tmp/diff_new_pack.G9sGvR/_old 2016-01-22 01:07:54.000000000 +0100 +++ /var/tmp/diff_new_pack.G9sGvR/_new 2016-01-22 01:07:54.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gdouros-aroania-fonts # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 ++++++ aroania-fonts-6.00.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aroania-fonts-6.00/README-SUSE new/aroania-fonts-6.00/README-SUSE --- old/aroania-fonts-6.00/README-SUSE 2015-06-21 13:55:13.000000000 +0200 +++ new/aroania-fonts-6.00/README-SUSE 2016-01-17 15:39:27.000000000 +0100 @@ -1,11 +1,7 @@ -Cited from http://users.teilar.gr/~g1951d/ as of 20150620 +Cited from http://users.teilar.gr/~g1951d/ as of 20160117 In lieu of a licence - -Fonts and documents in this site are not pieces of property or merchandise items; -they carry no trademark, copyright, license or other market tags; they are -free for any use. +Fonts and documents in this site are free for any use. George Douros - Files old/aroania-fonts-6.00/Textfonts.pdf and new/aroania-fonts-6.00/Textfonts.pdf differ

1 0

commit gdouros-anatolian-fonts for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package gdouros-anatolian-fonts for openSUSE:Factory checked in at 2016-01-21 23:43:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gdouros-anatolian-fonts (Old) and /work/SRC/openSUSE:Factory/.gdouros-anatolian-fonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gdouros-anatolian-fonts" Changes: -------- --- /work/SRC/openSUSE:Factory/gdouros-anatolian-fonts/gdouros-anatolian-fonts.changes 2015-06-23 12:00:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gdouros-anatolian-fonts.new/gdouros-anatolian-fonts.changes 2016-01-22 01:07:50.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Jan 17 13:46:32 UTC 2016 - aloisio(a)gmx.com + +- Refreshed package + * updated pdf documentation + * updated README-SUSE + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdouros-anatolian-fonts.spec ++++++ --- /var/tmp/diff_new_pack.wNaBLu/_old 2016-01-22 01:07:52.000000000 +0100 +++ /var/tmp/diff_new_pack.wNaBLu/_new 2016-01-22 01:07:52.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gdouros-anatolian-fonts # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 ++++++ anatolian-fonts-5.02.tar.bz2 ++++++ Files old/anatolian-fonts-5.02/Anatolian.docx and new/anatolian-fonts-5.02/Anatolian.docx differ Files old/anatolian-fonts-5.02/Anatolian.pdf and new/anatolian-fonts-5.02/Anatolian.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/anatolian-fonts-5.02/README-SUSE new/anatolian-fonts-5.02/README-SUSE --- old/anatolian-fonts-5.02/README-SUSE 2015-06-21 11:11:27.000000000 +0200 +++ new/anatolian-fonts-5.02/README-SUSE 2016-01-17 14:45:58.000000000 +0100 @@ -1,11 +1,7 @@ -Cited from http://users.teilar.gr/~g1951d/ as of 20150620 +Cited from http://users.teilar.gr/~g1951d/ as of 20160117 In lieu of a licence - -Fonts and documents in this site are not pieces of property or merchandise items; -they carry no trademark, copyright, license or other market tags; they are -free for any use. +Fonts and documents in this site are free for any use. George Douros -

1 0

commit gdouros-aegean-fonts for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package gdouros-aegean-fonts for openSUSE:Factory checked in at 2016-01-21 23:42:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gdouros-aegean-fonts (Old) and /work/SRC/openSUSE:Factory/.gdouros-aegean-fonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gdouros-aegean-fonts" Changes: -------- --- /work/SRC/openSUSE:Factory/gdouros-aegean-fonts/gdouros-aegean-fonts.changes 2015-06-23 12:00:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gdouros-aegean-fonts.new/gdouros-aegean-fonts.changes 2016-01-22 01:07:47.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 16 20:54:29 UTC 2016 - aloisio(a)gmx.com + +- Update to version 8.01 + * Aegean font 8.01 + * CyproMinoan font 7.82 + * Updated pdf documentation + * Refreshed README-SUSE from the website + +------------------------------------------------------------------- Old: ---- aegean-fonts-8.00.tar.bz2 New: ---- aegean-fonts-8.01.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdouros-aegean-fonts.spec ++++++ --- /var/tmp/diff_new_pack.wXHj5Y/_old 2016-01-22 01:07:49.000000000 +0100 +++ /var/tmp/diff_new_pack.wXHj5Y/_new 2016-01-22 01:07:49.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gdouros-aegean-fonts # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -19,7 +19,7 @@ %define fontname aegean-fonts Name: gdouros-aegean-fonts -Version: 8.00 +Version: 8.01 Release: 0 Summary: Font with Support for Ancient Aegean and Eastern Mediterranean Scripts License: SUSE-Permissive ++++++ aegean-fonts-8.00.tar.bz2 -> aegean-fonts-8.01.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/gdouros-aegean-fonts/aegean-fonts-8.00.tar.bz2 /work/SRC/openSUSE:Factory/.gdouros-aegean-fonts.new/aegean-fonts-8.01.tar.bz2 differ: char 11, line 1

1 0

commit gdouros-analecta-fonts for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package gdouros-analecta-fonts for openSUSE:Factory checked in at 2016-01-21 23:42:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gdouros-analecta-fonts (Old) and /work/SRC/openSUSE:Factory/.gdouros-analecta-fonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gdouros-analecta-fonts" Changes: -------- --- /work/SRC/openSUSE:Factory/gdouros-analecta-fonts/gdouros-analecta-fonts.changes 2015-06-23 12:00:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gdouros-analecta-fonts.new/gdouros-analecta-fonts.changes 2016-01-22 01:07:45.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Jan 17 13:18:08 UTC 2016 - aloisio(a)gmx.com + +- Update to version 5.00 + * updated pdf documentation + * updated README-SUSE file from the website + +------------------------------------------------------------------- Old: ---- analecta-fonts-4.02.tar.bz2 New: ---- analecta-fonts-5.00.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdouros-analecta-fonts.spec ++++++ --- /var/tmp/diff_new_pack.DyFXN4/_old 2016-01-22 01:07:47.000000000 +0100 +++ /var/tmp/diff_new_pack.DyFXN4/_new 2016-01-22 01:07:47.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gdouros-analecta-fonts # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -19,7 +19,7 @@ %define fontname analecta-fonts Name: gdouros-analecta-fonts -Version: 4.02 +Version: 5.00 Release: 0 Summary: An Ecclesiastic Scripts Font License: SUSE-Permissive ++++++ analecta-fonts-4.02.tar.bz2 -> analecta-fonts-5.00.tar.bz2 ++++++ Files old/analecta-fonts-4.02/Analecta.docx and new/analecta-fonts-5.00/Analecta.docx differ Files old/analecta-fonts-4.02/Analecta.pdf and new/analecta-fonts-5.00/Analecta.pdf differ Files old/analecta-fonts-4.02/Analecta.ttf and new/analecta-fonts-5.00/Analecta.ttf differ Files old/analecta-fonts-4.02/Analecta_hint.ttf and new/analecta-fonts-5.00/Analecta_hint.ttf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/analecta-fonts-4.02/README-SUSE new/analecta-fonts-5.00/README-SUSE --- old/analecta-fonts-4.02/README-SUSE 2015-06-21 10:23:55.000000000 +0200 +++ new/analecta-fonts-5.00/README-SUSE 2016-01-17 17:38:43.000000000 +0100 @@ -1,11 +1,7 @@ -Cited from http://users.teilar.gr/~g1951d/ as of 20150620 +Cited from http://users.teilar.gr/~g1951d/ as of 20160117 In lieu of a licence - -Fonts and documents in this site are not pieces of property or merchandise items; -they carry no trademark, copyright, license or other market tags; they are -free for any use. +Fonts and documents in this site are free for any use. George Douros -

1 0

commit gdouros-anaktoria-fonts for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package gdouros-anaktoria-fonts for openSUSE:Factory checked in at 2016-01-21 23:42:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gdouros-anaktoria-fonts (Old) and /work/SRC/openSUSE:Factory/.gdouros-anaktoria-fonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gdouros-anaktoria-fonts" Changes: -------- --- /work/SRC/openSUSE:Factory/gdouros-anaktoria-fonts/gdouros-anaktoria-fonts.changes 2015-06-23 12:00:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gdouros-anaktoria-fonts.new/gdouros-anaktoria-fonts.changes 2016-01-22 01:07:43.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Jan 17 14:34:07 UTC 2016 - aloisio(a)gmx.com + +- Refreshed archive + * updated pdf documentation + * updated README-SUSE from the website + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdouros-anaktoria-fonts.spec ++++++ --- /var/tmp/diff_new_pack.1gchSj/_old 2016-01-22 01:07:44.000000000 +0100 +++ /var/tmp/diff_new_pack.1gchSj/_new 2016-01-22 01:07:44.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gdouros-anaktoria-fonts # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 ++++++ anaktoria-fonts-6.00.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/anaktoria-fonts-6.00/README-SUSE new/anaktoria-fonts-6.00/README-SUSE --- old/anaktoria-fonts-6.00/README-SUSE 2015-06-21 14:05:10.000000000 +0200 +++ new/anaktoria-fonts-6.00/README-SUSE 2016-01-17 15:32:48.000000000 +0100 @@ -1,11 +1,7 @@ -Cited from http://users.teilar.gr/~g1951d/ as of 20150620 +Cited from http://users.teilar.gr/~g1951d/ as of 20160117 In lieu of a licence - -Fonts and documents in this site are not pieces of property or merchandise items; -they carry no trademark, copyright, license or other market tags; they are -free for any use. +Fonts and documents in this site are free for any use. George Douros - Files old/anaktoria-fonts-6.00/Textfonts.pdf and new/anaktoria-fonts-6.00/Textfonts.pdf differ

1 0

commit gdouros-alexander-fonts for openSUSE:Factory
by root＠hilbert.suse.de 22 Jan '16

22 Jan '16

Hello community, here is the log from the commit of package gdouros-alexander-fonts for openSUSE:Factory checked in at 2016-01-21 23:42:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gdouros-alexander-fonts (Old) and /work/SRC/openSUSE:Factory/.gdouros-alexander-fonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gdouros-alexander-fonts" Changes: -------- --- /work/SRC/openSUSE:Factory/gdouros-alexander-fonts/gdouros-alexander-fonts.changes 2015-06-23 12:00:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gdouros-alexander-fonts.new/gdouros-alexander-fonts.changes 2016-01-22 01:07:40.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Jan 17 14:25:19 UTC 2016 - aloisio(a)gmx.com + +- Refreshed archive + * updated pdf documentation + * updated README-SUSE from website + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdouros-alexander-fonts.spec ++++++ --- /var/tmp/diff_new_pack.B9yOWz/_old 2016-01-22 01:07:42.000000000 +0100 +++ /var/tmp/diff_new_pack.B9yOWz/_new 2016-01-22 01:07:42.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gdouros-alexander-fonts # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 ++++++ alexander-fonts-6.00.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alexander-fonts-6.00/README-SUSE new/alexander-fonts-6.00/README-SUSE --- old/alexander-fonts-6.00/README-SUSE 2015-06-21 14:28:56.000000000 +0200 +++ new/alexander-fonts-6.00/README-SUSE 2016-01-17 15:24:32.000000000 +0100 @@ -1,11 +1,7 @@ -Cited from http://users.teilar.gr/~g1951d/ as of 20150620 +Cited from http://users.teilar.gr/~g1951d/ as of 20160117 In lieu of a licence - -Fonts and documents in this site are not pieces of property or merchandise items; -they carry no trademark, copyright, license or other market tags; they are -free for any use. +Fonts and documents in this site are free for any use. George Douros - Files old/alexander-fonts-6.00/Textfonts.pdf and new/alexander-fonts-6.00/Textfonts.pdf differ

1 0