August 2015 - openSUSE Commits - openSUSE Mailing Lists

commit perl-Data-Util for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '15

29 Aug '15

Hello community, here is the log from the commit of package perl-Data-Util for openSUSE:Factory checked in at 2015-08-29 20:04:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Data-Util (Old) and /work/SRC/openSUSE:Factory/.perl-Data-Util.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Data-Util" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Data-Util/perl-Data-Util.changes 2014-03-09 18:37:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Data-Util.new/perl-Data-Util.changes 2015-08-29 20:04:48.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 27 13:51:06 UTC 2015 - hsk(a)imb-jena.de + +- added perl522.patch: patch from rt.cpan.org, #99097, to get + module built with perl-5.22 + +------------------------------------------------------------------- New: ---- perl522.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Data-Util.spec ++++++ --- /var/tmp/diff_new_pack.8zsPMM/_old 2015-08-29 20:04:49.000000000 +0200 +++ /var/tmp/diff_new_pack.8zsPMM/_new 2015-08-29 20:04:49.000000000 +0200 @@ -25,6 +25,7 @@ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Data-Util/ Source: http://www.cpan.org/authors/id/G/GF/GFUJI/%{cpan_name}-%{version}.tar.gz +Patch0: perl522.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros @@ -47,6 +48,7 @@ %prep %setup -q -n %{cpan_name}-%{version} find . -type f -print0 | xargs -0 chmod 644 +%patch0 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" ++++++ perl522.patch ++++++ diff -rup Data-Util-0.63-eMJzy2-orig/DataUtil.xs Data-Util-0.63-eMJzy2/DataUtil.xs --- Data-Util-0.63-eMJzy2-orig/DataUtil.xs 2013-04-03 00:06:08.000000000 -0700 +++ Data-Util-0.63-eMJzy2/DataUtil.xs 2014-09-23 18:48:48.000000000 -0700 @@ -674,7 +674,14 @@ my_uninstall_sub(pTHX_ HV* const stash, CV* code; if(!isGV(gv)){ /* a subroutine stub or special constant*/ - if(SvROK((SV*)gv) && ckWARN(WARN_MISC)){ + /* or perhaps a sub ref */ + if(SvROK((SV*)gv)) { + if(SvTYPE(SvRV(gv)) == SVt_PVCV) { + if( specified_code && + specified_code != (CV*)SvRV(gv) ) + return; + } + else if(ckWARN(WARN_MISC)) Perl_warner(aTHX_ packWARN(WARN_MISC), "Constant subroutine %s uninstalled", name); } (void)hv_delete(stash, name, namelen, G_DISCARD); diff -rup Data-Util-0.63-eMJzy2-orig/lib/Data/Util/PurePerl.pm Data-Util-0.63-eMJzy2/lib/Data/Util/PurePerl.pm --- Data-Util-0.63-eMJzy2-orig/lib/Data/Util/PurePerl.pm 2012-10-20 04:54:44.000000000 -0700 +++ Data-Util-0.63-eMJzy2/lib/Data/Util/PurePerl.pm 2014-09-23 18:44:36.000000000 -0700 @@ -246,8 +246,16 @@ sub uninstall_subroutine { my $glob = $stash->{$name}; if(ref(\$glob) ne 'GLOB'){ - if(ref $glob){ + if(ref $glob) { + if(Scalar::Util::reftype $glob eq 'CODE'){ + if(defined $specified_code && + $specified_code != $glob) { + next; + } + } + else { warnings::warnif(misc => "Constant subroutine $name uninstalled"); + } } delete $stash->{$name}; next;

1 0

commit perl-HTML-FillInForm for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '15

29 Aug '15

Hello community, here is the log from the commit of package perl-HTML-FillInForm for openSUSE:Factory checked in at 2015-08-29 20:04:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-HTML-FillInForm (Old) and /work/SRC/openSUSE:Factory/.perl-HTML-FillInForm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-HTML-FillInForm" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-HTML-FillInForm/perl-HTML-FillInForm.changes 2015-04-16 14:13:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-HTML-FillInForm.new/perl-HTML-FillInForm.changes 2015-08-29 20:04:47.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Aug 27 13:19:06 UTC 2015 - hsk(a)imb-jena.de + +- add CGI to Requires:, BuildRequires:, as that module is not in + perl core since perl 5.22 +- rt-100926.patch: patch from rt.cpan.org, #100926 / github, pr #9, + to avoid security warning + +------------------------------------------------------------------- New: ---- rt-100926.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-HTML-FillInForm.spec ++++++ --- /var/tmp/diff_new_pack.qdaqVa/_old 2015-08-29 20:04:47.000000000 +0200 +++ /var/tmp/diff_new_pack.qdaqVa/_new 2015-08-29 20:04:47.000000000 +0200 @@ -27,12 +27,15 @@ Url: http://search.cpan.org/dist/HTML-FillInForm/ Source0: http://www.cpan.org/authors/id/M/MA/MARKSTOS/%{cpan_name}-%{version}.tar.gz Source1: cpanspec.yml +Patch0: rt-100926.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros +BuildRequires: perl(CGI) BuildRequires: perl(HTML::Parser) >= 3.26 BuildRequires: perl(HTML::TokeParser) >= 3.26 +Requires: perl(CGI) Requires: perl(HTML::Parser) >= 3.26 Requires: perl(HTML::TokeParser) >= 3.26 %{perl_requires} ++++++ rt-100926.patch ++++++ diff -ur a/HTML-FillInForm-2.21/lib/HTML/FillInForm.pm b/HTML-FillInForm-2.21/lib/HTML/FillInForm.pm --- a/HTML-FillInForm-2.21/lib/HTML/FillInForm.pm 2014-08-14 17:21:43.000000000 +0200 +++ b/HTML-FillInForm-2.21/lib/HTML/FillInForm.pm 2015-08-27 15:10:07.462905794 +0200 @@ -424,7 +424,12 @@ # traverse the list in reverse order for backwards compatibility # with the previous implementation. for my $o (reverse @{$self->{objects}}) { - my @v = $o->param($param); + my @v; + if ($o->can('multi_param')) { + @v = $o->multi_param($param); + } else { + @v = $o->param($param); + } next unless @v;

1 0

commit perl-HTTP-Server-Simple for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '15

29 Aug '15

Hello community, here is the log from the commit of package perl-HTTP-Server-Simple for openSUSE:Factory checked in at 2015-08-29 20:04:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-HTTP-Server-Simple (Old) and /work/SRC/openSUSE:Factory/.perl-HTTP-Server-Simple.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-HTTP-Server-Simple" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-HTTP-Server-Simple/perl-HTTP-Server-Simple.changes 2015-04-16 14:14:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-HTTP-Server-Simple.new/perl-HTTP-Server-Simple.changes 2015-08-29 20:04:45.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 27 12:51:06 UTC 2015 - hsk(a)imb-jena.de + +- add CGI to Requires:, BuildRequires:, as that module is not in + perl core since perl 5.22 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-HTTP-Server-Simple.spec ++++++ --- /var/tmp/diff_new_pack.OczVGC/_old 2015-08-29 20:04:46.000000000 +0200 +++ /var/tmp/diff_new_pack.OczVGC/_new 2015-08-29 20:04:46.000000000 +0200 @@ -30,6 +30,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros +BuildRequires: perl(CGI) +Requires: perl(CGI) BuildRequires: perl(Socket) >= 1.94 Requires: perl(Socket) >= 1.94 %{perl_requires}

1 0

commit perl-Nagios-Plugin for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '15

29 Aug '15

Hello community, here is the log from the commit of package perl-Nagios-Plugin for openSUSE:Factory checked in at 2015-08-29 20:04:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Nagios-Plugin (Old) and /work/SRC/openSUSE:Factory/.perl-Nagios-Plugin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Nagios-Plugin" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Nagios-Plugin/perl-Nagios-Plugin.changes 2014-09-26 11:21:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Nagios-Plugin.new/perl-Nagios-Plugin.changes 2015-08-29 20:04:45.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Aug 27 10:20:20 UTC 2015 - hsk(a)imb-jena.de + +- perl522.patch: fix test to work with perl-5.22 + +------------------------------------------------------------------- New: ---- perl522.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Nagios-Plugin.spec ++++++ --- /var/tmp/diff_new_pack.oLHyjP/_old 2015-08-29 20:04:45.000000000 +0200 +++ /var/tmp/diff_new_pack.oLHyjP/_new 2015-08-29 20:04:45.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Nagios-Plugin # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -26,6 +26,7 @@ Group: Development/Languages/Perl Url: http://search.cpan.org/perldoc?Nagios%3A%3APlugin Source: %cpan_name-%{version}.tar.gz +Patch0: perl522.patch BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(Class::Accessor) @@ -53,6 +54,7 @@ %prep %setup -q -n %cpan_name-%{version} +%patch0 -p2 %build perl Makefile.PL OPTIMIZE="%{optflags} -Wall" ++++++ perl522.patch ++++++ --- a/Nagios-Plugin-0.36/t/Nagios-Plugin-Functions-01.t 2010-12-03 12:46:21.000000000 +0100 +++ b/Nagios-Plugin-0.36/t/Nagios-Plugin-Functions-01.t 2015-08-27 12:16:13.649140550 +0200 @@ -19,7 +19,7 @@ is(get_shortname, "NAGIOS-PLUGIN-FUNCTIONS-01", "get_shortname ok"); # Hardcoded checks of constants -ok(defined %ERRORS, '%ERRORS defined'); +ok(%ERRORS, '%ERRORS defined'); is(OK, $ERRORS{OK}, "OK => $ERRORS{OK}"); is(WARNING, $ERRORS{WARNING}, "WARNING => $ERRORS{WARNING}"); is(CRITICAL, $ERRORS{CRITICAL}, "CRITICAL => $ERRORS{CRITICAL}");

1 0

commit perl-CGI-Session for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '15

29 Aug '15

Hello community, here is the log from the commit of package perl-CGI-Session for openSUSE:Factory checked in at 2015-08-29 20:04:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-CGI-Session (Old) and /work/SRC/openSUSE:Factory/.perl-CGI-Session.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-CGI-Session" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-CGI-Session/perl-CGI-Session.changes 2011-09-23 12:36:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-CGI-Session.new/perl-CGI-Session.changes 2015-08-29 20:04:44.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 27 11:05:06 UTC 2015 - hsk(a)imb-jena.de + +- add "BuildRequires: CGI" to .spec file so "make test" succeeds + with perl-5.22 + +------------------------------------------------------------------- New: ---- cpanspec.yml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-CGI-Session.spec ++++++ --- /var/tmp/diff_new_pack.c5lgoM/_old 2015-08-29 20:04:44.000000000 +0200 +++ /var/tmp/diff_new_pack.c5lgoM/_new 2015-08-29 20:04:44.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-CGI-Session # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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,61 +15,59 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: perl-CGI-Session -Summary: Persistent session data in CGI applications Version: 4.48 -Release: 1 -Group: Development/Libraries/Perl +Release: 0 +#Upstream: Artistic-1.0 +%define cpan_name CGI-Session +Summary: Persistent Session Data in Cgi Applications License: GPL-1.0+ or Artistic-1.0 -Url: http://search.cpan.org/perldoc?CGI::Session +Group: Development/Libraries/Perl +Url: http://search.cpan.org/dist/CGI-Session/ +Source0: http://www.cpan.org/authors/id/M/MA/MARKSTOS/%{cpan_name}-%{version}.tar.gz +Source1: cpanspec.yml +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros +BuildRequires: perl(CGI) >= 3.26 +BuildRequires: perl(Module::Build) >= 0.380000 +Requires: perl(CGI) >= 3.26 +%{perl_requires} +# MANUAL BEGIN # DB tests need a running database and the following # variables set to proceed: DBI_DSN/DBI_USER/DBI_PASS # Disabled by not installing the perl modules for now, as # this needs to be done for all backends during build which # increases the dependencies of the package # running SQLite tests should be enough for now -#BuildRequires: perl(DBI) -#BuildRequires: perl(DBD::mysql) BuildRequires: perl-DBD-SQLite BuildRequires: perl(CGI::Simple) BuildRequires: perl(FreezeThaw) -Source: CGI-Session-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{perl_requires} +# MANUAL END %description -CGI-Session is a Perl5 library that provides an easy, reliable and -modular session management system across HTTP requests. Persistency is -a key feature for such applications as shopping carts, -login/authentication routines, and application that need to carry data -across HTTP requests. CGI::Session does that and many more. - +CGI::Session provides an easy, reliable and modular session management +system across HTTP requests. %prep -%setup -q -n CGI-Session-%{version} +%setup -q -n %{cpan_name}-%{version} +find . -type f -print0 | xargs -0 chmod 644 %build -perl Makefile.PL -make %{?jobs:-j%jobs} +%{__perl} Build.PL installdirs=vendor +./Build build flags=%{?_smp_mflags} %check -make test +./Build test %install -%perl_make_install -%perl_process_packlist +./Build install destdir=%{buildroot} create_packlist=0 %perl_gen_filelist -%clean -rm -rf $RPM_BUILD_ROOT - %files -f %{name}.files -%defattr(-, root, root) -%doc Changes MANIFEST MANIFEST.SKIP README examples +%defattr(-,root,root,755) +%doc Changes examples README %changelog ++++++ cpanspec.yml ++++++ --- #description_paragraphs: 3 #no_testing: broken upstream #sources: # - source1 # - source2 #patches: # foo.patch: -p1 # bar.patch: preamble: |- # DB tests need a running database and the following # variables set to proceed: DBI_DSN/DBI_USER/DBI_PASS # Disabled by not installing the perl modules for now, as # this needs to be done for all backends during build which # increases the dependencies of the package # running SQLite tests should be enough for now BuildRequires: perl-DBD-SQLite BuildRequires: perl(CGI::Simple) BuildRequires: perl(FreezeThaw) #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_install: |- # sed on %{name}.files license: GPL-1.0+ or Artistic-1.0 #skip_noarch: 1 #custom_build: |- #./Build build flags=%{?_smp_mflags} --myflag #custom_test: |- #startserver && make test #ignore_requires: Bizarre::Module

1 0

commit perl-Mock-Quick for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '15

29 Aug '15

Hello community, here is the log from the commit of package perl-Mock-Quick for openSUSE:Factory checked in at 2015-08-29 20:04:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Mock-Quick (Old) and /work/SRC/openSUSE:Factory/.perl-Mock-Quick.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Mock-Quick" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Mock-Quick/perl-Mock-Quick.changes 2014-09-17 17:27:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Mock-Quick.new/perl-Mock-Quick.changes 2015-08-29 20:04:42.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 27 08:47:21 UTC 2015 - coolo(a)suse.com + +- updated to 1.110 + see /usr/share/doc/packages/perl-Mock-Quick/Changes + +------------------------------------------------------------------- Old: ---- Mock-Quick-1.108.tar.gz New: ---- Mock-Quick-1.110.tar.gz cpanspec.yml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Mock-Quick.spec ++++++ --- /var/tmp/diff_new_pack.HkK4XA/_old 2015-08-29 20:04:42.000000000 +0200 +++ /var/tmp/diff_new_pack.HkK4XA/_new 2015-08-29 20:04:42.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Mock-Quick # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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,22 +17,23 @@ Name: perl-Mock-Quick -Version: 1.108 +Version: 1.110 Release: 0 %define cpan_name Mock-Quick Summary: Quickly mock objects and classes, even temporarily replace them, License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Mock-Quick/ -Source: http://www.cpan.org/authors/id/E/EX/EXODIST/%{cpan_name}-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/E/EX/EXODIST/%{cpan_name}-%{version}.tar.gz +Source1: cpanspec.yml BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(Exporter::Declare) >= 0.103 BuildRequires: perl(Fennec::Lite) >= 0.004 -BuildRequires: perl(Module::Build) >= 0.42 -BuildRequires: perl(Test::Exception) >= 0.29 +BuildRequires: perl(Module::Build) >= 0.420000 +BuildRequires: perl(Test::Exception) >= 0.290000 BuildRequires: perl(Test::Simple) >= 0.88 Requires: perl(Exporter::Declare) >= 0.103 %{perl_requires} @@ -75,6 +76,6 @@ %files -f %{name}.files %defattr(-,root,root,755) -%doc README +%doc Changes README %changelog ++++++ Mock-Quick-1.108.tar.gz -> Mock-Quick-1.110.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mock-Quick-1.108/Changes new/Mock-Quick-1.110/Changes --- old/Mock-Quick-1.108/Changes 1970-01-01 01:00:00.000000000 +0100 +++ new/Mock-Quick-1.110/Changes 2015-08-26 19:03:38.000000000 +0200 @@ -0,0 +1,7 @@ +1.110 2015-08-26 10:02:22-07:00 America/Los_Angeles + + - Fix Test from 1.109 to skip when required module is missing + +1.109 2015-08-26 08:51:08-07:00 America/Los_Angeles + + - Fix #16, overloading + compare warning diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mock-Quick-1.108/MANIFEST new/Mock-Quick-1.110/MANIFEST --- old/Mock-Quick-1.108/MANIFEST 2014-08-27 19:37:00.000000000 +0200 +++ new/Mock-Quick-1.110/MANIFEST 2015-08-26 19:03:38.000000000 +0200 @@ -1,4 +1,5 @@ Build.PL +Changes lib/Mock/Quick.pm lib/Mock/Quick/Class.pm lib/Mock/Quick/Method.pm @@ -7,12 +8,10 @@ lib/Mock/Quick/Util.pm lib/Object/Quick.pm MANIFEST This list of files -MANIFEST.bak MANIFEST.SKIP -META.json -META.yml README t/Class.t +t/clear_warn.t t/intercept.t t/Method.t t/metrics.t @@ -21,3 +20,5 @@ t/Object.t t/object_control.t t/Util.t +META.yml +META.json diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mock-Quick-1.108/MANIFEST.bak new/Mock-Quick-1.110/MANIFEST.bak --- old/Mock-Quick-1.108/MANIFEST.bak 2014-08-27 19:37:00.000000000 +0200 +++ new/Mock-Quick-1.110/MANIFEST.bak 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -Build.PL -lib/Mock/Quick.pm -lib/Mock/Quick/Class.pm -lib/Mock/Quick/Method.pm -lib/Mock/Quick/Object.pm -lib/Mock/Quick/Object/Control.pm -lib/Mock/Quick/Util.pm -lib/Object/Quick.pm -MANIFEST This list of files -MANIFEST.SKIP -README -t/Class.t -t/intercept.t -t/Method.t -t/metrics.t -t/Mock-Quick.t -t/Object-Quick.t -t/Object.t -t/object_control.t -t/Util.t -META.yml -META.json diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mock-Quick-1.108/META.json new/Mock-Quick-1.110/META.json --- old/Mock-Quick-1.108/META.json 2014-08-27 19:37:00.000000000 +0200 +++ new/Mock-Quick-1.110/META.json 2015-08-26 19:03:38.000000000 +0200 @@ -4,7 +4,7 @@ "Chad Granum <exodist7(a)gmail.com>" ], "dynamic_config" : 1, - "generated_by" : "Module::Build version 0.4208", + "generated_by" : "Module::Build version 0.4214", "license" : [ "perl_5" ], @@ -37,7 +37,7 @@ "provides" : { "Mock::Quick" : { "file" : "lib/Mock/Quick.pm", - "version" : "1.108" + "version" : "1.110" }, "Mock::Quick::Class" : { "file" : "lib/Mock/Quick/Class.pm" @@ -70,5 +70,5 @@ "url" : "http://github.com/exodist/Mock-Quick" } }, - "version" : "1.108" + "version" : "1.110" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mock-Quick-1.108/META.yml new/Mock-Quick-1.110/META.yml --- old/Mock-Quick-1.108/META.yml 2014-08-27 19:37:00.000000000 +0200 +++ new/Mock-Quick-1.110/META.yml 2015-08-26 19:03:38.000000000 +0200 @@ -9,7 +9,7 @@ configure_requires: Module::Build: '0.42' dynamic_config: 1 -generated_by: 'Module::Build version 0.4208, CPAN::Meta::Converter version 2.140640' +generated_by: 'Module::Build version 0.4214, CPAN::Meta::Converter version 2.150001' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -18,7 +18,7 @@ provides: Mock::Quick: file: lib/Mock/Quick.pm - version: '1.108' + version: '1.110' Mock::Quick::Class: file: lib/Mock/Quick/Class.pm Mock::Quick::Method: @@ -39,4 +39,4 @@ bugtracker: http://github.com/exodist/Mock-Quick/issues license: http://dev.perl.org/licenses/ repository: http://github.com/exodist/Mock-Quick -version: '1.108' +version: '1.110' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mock-Quick-1.108/lib/Mock/Quick/Util.pm new/Mock-Quick-1.110/lib/Mock/Quick/Util.pm --- old/Mock-Quick-1.108/lib/Mock/Quick/Util.pm 2014-08-27 19:37:00.000000000 +0200 +++ new/Mock-Quick-1.110/lib/Mock/Quick/Util.pm 2015-08-26 19:03:38.000000000 +0200 @@ -41,7 +41,7 @@ unless exists $self->{$name}; } - if ( @_ && ref $_[0] && $_[0] == \$CLEAR ) { + if ( @_ && ref $_[0] && "$_[0]" eq "" . \$CLEAR ) { delete $self->{ $name }; delete $control->metrics->{$name}; return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mock-Quick-1.108/lib/Mock/Quick.pm new/Mock-Quick-1.110/lib/Mock/Quick.pm --- old/Mock-Quick-1.108/lib/Mock/Quick.pm 2014-08-27 19:37:00.000000000 +0200 +++ new/Mock-Quick-1.110/lib/Mock/Quick.pm 2015-08-26 19:03:38.000000000 +0200 @@ -9,7 +9,7 @@ use Mock::Quick::Util; use Carp qw/carp/; -our $VERSION = '1.108'; +our $VERSION = '1.110'; import_arguments qw/intercept/; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mock-Quick-1.108/t/clear_warn.t new/Mock-Quick-1.110/t/clear_warn.t --- old/Mock-Quick-1.108/t/clear_warn.t 1970-01-01 01:00:00.000000000 +0100 +++ new/Mock-Quick-1.110/t/clear_warn.t 2015-08-26 19:03:38.000000000 +0200 @@ -0,0 +1,25 @@ +use strict; +use warnings; + +use Test::More; + +BEGIN { + unless(eval { require Path::Class; 1 }) { + Test::More->import(skip_all => 'Path::Class is needed for this test'); + exit 0; + } +} + +use Mock::Quick; +use Path::Class; + +my $x = qobj(foo => qmeth { print "# My file is $_[1]\n" }); + +my @warnings; +{ + local $SIG{__WARN__} = sub { push @warnings => @_ }; + $x->foo( file(".") ); +} +ok(!@warnings, "No warnings") || print STDERR @warnings; + +done_testing; ++++++ cpanspec.yml ++++++ --- #description_paragraphs: 3 #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_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 git-review for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '15

29 Aug '15

Hello community, here is the log from the commit of package git-review for openSUSE:Factory checked in at 2015-08-29 20:04:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/git-review (Old) and /work/SRC/openSUSE:Factory/.git-review.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "git-review" Changes: -------- --- /work/SRC/openSUSE:Factory/git-review/git-review.changes 2015-06-15 17:49:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.git-review.new/git-review.changes 2015-08-29 20:04:43.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 27 11:16:55 UTC 2015 - tbechtold(a)suse.com + +- Remove %{_sysconfdir}/git-review/git-review.conf from package. + File is deprecated. + +------------------------------------------------------------------- Old: ---- git-review.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git-review.spec ++++++ --- /var/tmp/diff_new_pack.CObekq/_old 2015-08-29 20:04:43.000000000 +0200 +++ /var/tmp/diff_new_pack.CObekq/_new 2015-08-29 20:04:43.000000000 +0200 @@ -25,7 +25,6 @@ Url: https://launchpad.net/git-review #Source0: http://pypi.python.org/packages/source/g/git-review/git-review-%{version}.t… Source: %{name}-%{version}.tar.gz -Source1: git-review.conf BuildRequires: python-devel BuildRequires: python-pbr BuildRequires: python-setuptools @@ -58,7 +57,6 @@ %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} install -m 0644 -D git-review.1 %{buildroot}/%{_mandir}/man1/git-review.1 -install -m 0644 -D %{SOURCE1} %{buildroot}/%{_sysconfdir}/git-review/git-review.conf %files %defattr(-,root,root,-) @@ -66,7 +64,5 @@ %{python_sitelib}/* %{_bindir}/git-review %{_mandir}/man1/git-review.1.gz -%dir %{_sysconfdir}/git-review -%config(noreplace) %{_sysconfdir}/git-review/git-review.conf %changelog

1 0

commit perl-Proc-ProcessTable for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '15

29 Aug '15

Hello community, here is the log from the commit of package perl-Proc-ProcessTable for openSUSE:Factory checked in at 2015-08-29 20:04:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Proc-ProcessTable (Old) and /work/SRC/openSUSE:Factory/.perl-Proc-ProcessTable.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Proc-ProcessTable" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Proc-ProcessTable/perl-Proc-ProcessTable.changes 2015-08-27 08:57:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Proc-ProcessTable.new/perl-Proc-ProcessTable.changes 2015-08-29 20:04:41.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 27 08:59:31 UTC 2015 - coolo(a)suse.com + +- updated to 0.53 + see /usr/share/doc/packages/perl-Proc-ProcessTable/Changes + +------------------------------------------------------------------- Old: ---- Proc-ProcessTable-0.52.tar.gz New: ---- Proc-ProcessTable-0.53.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Proc-ProcessTable.spec ++++++ --- /var/tmp/diff_new_pack.S9fIZm/_old 2015-08-29 20:04:42.000000000 +0200 +++ /var/tmp/diff_new_pack.S9fIZm/_new 2015-08-29 20:04:42.000000000 +0200 @@ -17,7 +17,7 @@ Name: perl-Proc-ProcessTable -Version: 0.52 +Version: 0.53 Release: 0 #Upstream: Artistic-1.0 or GPL-1.0+ %define cpan_name Proc-ProcessTable ++++++ Proc-ProcessTable-0.52.tar.gz -> Proc-ProcessTable-0.53.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Proc-ProcessTable-0.52/Changes new/Proc-ProcessTable-0.53/Changes --- old/Proc-ProcessTable-0.52/Changes 2015-08-23 12:05:08.000000000 +0200 +++ new/Proc-ProcessTable-0.53/Changes 2015-08-24 21:33:47.000000000 +0200 @@ -326,7 +326,11 @@ #99163 (segfault from canonicalize_file_name), pulled patch from Borislav Nikolov. 0.52 2015-08-23 - * Incorporated mainly bugfixes (see github repor for details); + * Incorporated mainly bugfixes (see github repo for details); OS affected: NetBSD, cygwin, AIX, bsdi, Linux * Added test for another odd command name ([]) * Added some scripts for process tracking. Still in beta-phase. +0.53 2015-08-24 + * Fixed bug in Linux occurring if process name is empty (RT#106571) + * Added missing includes on AIX (RT#39748) + * Some minor changes on tests and documentation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Proc-ProcessTable-0.52/META.json new/Proc-ProcessTable-0.53/META.json --- old/Proc-ProcessTable-0.52/META.json 2015-08-23 12:11:16.000000000 +0200 +++ new/Proc-ProcessTable-0.53/META.json 2015-08-24 21:35:47.000000000 +0200 @@ -43,5 +43,5 @@ "url" : "https://github.com/jwbargsten/perl-proc-processtable" } }, - "version" : "0.52" + "version" : "0.53" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Proc-ProcessTable-0.52/META.yml new/Proc-ProcessTable-0.53/META.yml --- old/Proc-ProcessTable-0.52/META.yml 2015-08-23 12:11:16.000000000 +0200 +++ new/Proc-ProcessTable-0.53/META.yml 2015-08-24 21:35:47.000000000 +0200 @@ -22,4 +22,4 @@ Storable: '0' resources: repository: https://github.com/jwbargsten/perl-proc-processtable -version: '0.52' +version: '0.53' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Proc-ProcessTable-0.52/ProcessTable.pm new/Proc-ProcessTable-0.53/ProcessTable.pm --- old/Proc-ProcessTable-0.52/ProcessTable.pm 2015-08-23 11:58:08.000000000 +0200 +++ new/Proc-ProcessTable-0.53/ProcessTable.pm 2015-08-24 21:34:37.000000000 +0200 @@ -19,7 +19,7 @@ @EXPORT = qw( ); -$VERSION = '0.52'; +$VERSION = '0.53'; sub AUTOLOAD { # This AUTOLOAD is used to 'autoload' constants from the constant() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Proc-ProcessTable-0.52/os/Linux.c new/Proc-ProcessTable-0.53/os/Linux.c --- old/Proc-ProcessTable-0.52/os/Linux.c 2015-08-23 12:10:05.000000000 +0200 +++ new/Proc-ProcessTable-0.53/os/Linux.c 2015-08-24 21:24:37.000000000 +0200 @@ -329,6 +329,11 @@ * plus a terminating NULL byte; prs->comm will be NULL terminated since * that area of memory is all zerored out when prs is allocated */ if (sscanf(stat_text, "%d (%15c", &prs->pid, prs->comm) != 2) + /* we might get an empty command name, so check for it: + * do the open and close parenteses lie next to each other? + * proceed if yes, finish otherwise + */ + if((strchr(stat_text,'(') + 1) != paren) goto done; /* address at which we pickup again, after the ')' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Proc-ProcessTable-0.52/os/aix_getprocs.c new/Proc-ProcessTable-0.53/os/aix_getprocs.c --- old/Proc-ProcessTable-0.52/os/aix_getprocs.c 2015-08-23 11:57:06.000000000 +0200 +++ new/Proc-ProcessTable-0.53/os/aix_getprocs.c 2015-08-23 17:45:48.000000000 +0200 @@ -10,9 +10,11 @@ * */ +#include <cf.h> #include <odmi.h> #include <procinfo.h> #include <stdlib.h> +#include <unistd.h> #include <sys/cfgodm.h> #include <sys/types.h> @@ -34,7 +36,7 @@ static unsigned long long memory; static int pagesize = 0; -static int ncpus = 0; +static long int ncpus = 0; static double now_time = 0.0; static char format[F_LASTFIELD+2];

1 0

commit perl-Perl-Tidy for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '15

29 Aug '15

Hello community, here is the log from the commit of package perl-Perl-Tidy for openSUSE:Factory checked in at 2015-08-29 20:04:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Perl-Tidy (Old) and /work/SRC/openSUSE:Factory/.perl-Perl-Tidy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Perl-Tidy" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Perl-Tidy/perl-Perl-Tidy.changes 2014-09-17 17:26:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Perl-Tidy.new/perl-Perl-Tidy.changes 2015-08-29 20:04:40.000000000 +0200 @@ -1,0 +2,41 @@ +Sun Aug 23 09:13:37 UTC 2015 - coolo(a)suse.com + +- updated to 20150815 + see /usr/share/doc/packages/perl-Perl-Tidy/CHANGES + + 2015 08 15 + - Fixed RT# 105484, Invalid warning about 'else' in 'switch' statement. The + warning happened if a 'case' statement did not use parens. + + - Fixed RT# 101547, misparse of // caused error message. Also.. + + - Fixed RT# 102371, misparse of // caused unwated space in //= + + - Fixed RT# 100871, "silent failure of HTML Output on Windows". + Changed calls to tempfile() from: + my ( $fh_tmp, $tmpfile ) = tempfile(); + to have the full path name: + my ( $fh_tmp, $tmpfile ) = File::Temp::tempfile() + because of problems in the Windows version reported by Dean Pearce. + + - Fixed RT# 99514, calling the perltidy module multiple times with + a .perltidyrc file containing the parameter --output-line-ending + caused a crash. This was a glitch in the memoization logic. + + - Fixed RT#99961, multiple lines inside a cast block caused unwanted + continuation indentation. + + - RT# 32905, broken handling of UTF-8 strings. + A new flag -utf8 causes perltidy assume UTF-8 encoding for input and + output of an io stream. Thanks to Sebastian Podjasek for a patch. + This feature may not work correctly in older versions of Perl. + It worked in a linux version 5.10.1 but not in a Windows version 5.8.3 (but + otherwise perltidy ran correctly). + + - Warning files now report perltidy VERSION. Suggested by John Karr. + + - Fixed long flag --nostack-closing-tokens (-nsct has always worked though). + This was due to a typo. This also fixed --nostack-opening-tokens to + behave correctly. Thanks to Rob Dixon. + +------------------------------------------------------------------- Old: ---- Perl-Tidy-20140711.tar.gz New: ---- Perl-Tidy-20150815.tar.gz cpanspec.yml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Perl-Tidy.spec ++++++ --- /var/tmp/diff_new_pack.PZelJb/_old 2015-08-29 20:04:40.000000000 +0200 +++ /var/tmp/diff_new_pack.PZelJb/_new 2015-08-29 20:04:40.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Perl-Tidy # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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,14 +17,16 @@ Name: perl-Perl-Tidy -Version: 20140711 +Version: 20150815 Release: 0 +#Upstream: This package is free software; you can redistribute it and/or modify it under the terms of the "GNU General Public License". Please refer to the file "COPYING" for details. %define cpan_name Perl-Tidy Summary: Parses and beautifies perl source License: GPL-2.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Perl-Tidy/ -Source: http://www.cpan.org/authors/id/S/SH/SHANCOCK/%{cpan_name}-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/S/SH/SHANCOCK/%{cpan_name}-%{version}.tar.gz +Source1: cpanspec.yml BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl @@ -64,6 +66,6 @@ %files -f %{name}.files %defattr(-,root,root,755) -%doc BUGS CHANGES COPYING examples Makefile.npm pm2pl README TODO +%doc BUGS CHANGES COPYING docs examples Makefile.npm pm2pl README TODO %changelog ++++++ Perl-Tidy-20140711.tar.gz -> Perl-Tidy-20150815.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Perl-Tidy-20140711/BUGS new/Perl-Tidy-20150815/BUGS --- old/Perl-Tidy-20140711/BUGS 2014-03-28 02:03:28.000000000 +0100 +++ new/Perl-Tidy-20150815/BUGS 2015-08-14 17:01:42.000000000 +0200 @@ -29,10 +29,6 @@ which uses double brackets to contain single brackets does not render correctly. - Perltidy does not handle UTF-8 encoded files - This has long been requested but unfortunately I don't have time, so - it won't happen unless someone wants to work on it. - Two iterations are sometimes needed Usually the code produced by perltidy on the first pass does not change if it is run again, but sometimes a second pass will produce some small diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Perl-Tidy-20140711/CHANGES new/Perl-Tidy-20150815/CHANGES --- old/Perl-Tidy-20140711/CHANGES 2014-07-11 13:16:51.000000000 +0200 +++ new/Perl-Tidy-20150815/CHANGES 2015-08-15 02:05:30.000000000 +0200 @@ -1,4 +1,39 @@ Perltidy Change Log + 2015 08 15 + - Fixed RT# 105484, Invalid warning about 'else' in 'switch' statement. The + warning happened if a 'case' statement did not use parens. + + - Fixed RT# 101547, misparse of // caused error message. Also.. + + - Fixed RT# 102371, misparse of // caused unwated space in //= + + - Fixed RT# 100871, "silent failure of HTML Output on Windows". + Changed calls to tempfile() from: + my ( $fh_tmp, $tmpfile ) = tempfile(); + to have the full path name: + my ( $fh_tmp, $tmpfile ) = File::Temp::tempfile() + because of problems in the Windows version reported by Dean Pearce. + + - Fixed RT# 99514, calling the perltidy module multiple times with + a .perltidyrc file containing the parameter --output-line-ending + caused a crash. This was a glitch in the memoization logic. + + - Fixed RT#99961, multiple lines inside a cast block caused unwanted + continuation indentation. + + - RT# 32905, broken handling of UTF-8 strings. + A new flag -utf8 causes perltidy assume UTF-8 encoding for input and + output of an io stream. Thanks to Sebastian Podjasek for a patch. + This feature may not work correctly in older versions of Perl. + It worked in a linux version 5.10.1 but not in a Windows version 5.8.3 (but + otherwise perltidy ran correctly). + + - Warning files now report perltidy VERSION. Suggested by John Karr. + + - Fixed long flag --nostack-closing-tokens (-nsct has always worked though). + This was due to a typo. This also fixed --nostack-opening-tokens to + behave correctly. Thanks to Rob Dixon. + 2014 07 11 - Fixed RT #94902: abbreviation parsing in .perltidyrc files was not working for multi-line abbreviations. Thanks to Eric Fung for diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Perl-Tidy-20140711/MANIFEST new/Perl-Tidy-20150815/MANIFEST --- old/Perl-Tidy-20140711/MANIFEST 2014-03-28 01:54:27.000000000 +0100 +++ new/Perl-Tidy-20150815/MANIFEST 2015-08-14 05:09:26.000000000 +0200 @@ -35,4 +35,6 @@ t/test.t t/testsa.t t/testss.t +t/testwide.t +t/testwide.pl.src META.yml Module meta-data (added by MakeMaker) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Perl-Tidy-20140711/META.yml new/Perl-Tidy-20150815/META.yml --- old/Perl-Tidy-20140711/META.yml 2014-07-11 13:21:00.000000000 +0200 +++ new/Perl-Tidy-20150815/META.yml 2015-08-15 03:06:20.000000000 +0200 @@ -1,6 +1,6 @@ --- #YAML:1.0 name: Perl-Tidy -version: 20140711 +version: 20150815 abstract: indent and reformat perl scripts author: - Steve Hancock <perltidy(a)perltidy.sourceforge.net> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Perl-Tidy-20140711/TODO new/Perl-Tidy-20150815/TODO --- old/Perl-Tidy-20140711/TODO 2014-03-28 01:59:50.000000000 +0100 +++ new/Perl-Tidy-20150815/TODO 2015-08-15 01:53:40.000000000 +0200 @@ -1,6 +1,7 @@ Perltidy TODO List - This is a partial "wish-list" of features to add and things to do. + This is a partial "wish-list" of features to add and things to do. + Automatically Detect UTF-8 Character Streams Improved Vertical Alignment There are still many opportunities for improving vertical alignment. @@ -22,7 +23,9 @@ A -r flag might be nice, but this is best handled by an exterior shell script. - Make perltidy support the syntax of some module XXX. + Make perltidy support the syntax of module XXX This generally won't be done unless the module is part of the core perl - distribution. But in some cases it might be possible to use the prefilter - and postfilter capabilities of the Tidy.pm module to help. + distribution because it is such an open-ended problem. But in some cases + it might be possible to use the prefilter and postfilter capabilities of + the Tidy.pm module may help. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Perl-Tidy-20140711/bin/perltidy new/Perl-Tidy-20150815/bin/perltidy --- old/Perl-Tidy-20140711/bin/perltidy 2014-07-11 13:20:58.000000000 +0200 +++ new/Perl-Tidy-20150815/bin/perltidy 2015-08-15 03:06:18.000000000 +0200 @@ -525,6 +525,24 @@ prevent long comment lines from being outdented, you can add either B<-noll> or B<-l=0>. +=item B<-enc=s>, B<--character-encoding=s> + +where B<s>=B<none> or B<utf8>. This flag tells perltidy the character encoding +of both the input and output character streams. The value B<utf8> causes the +stream to be read and written as UTF-8. The value B<none> causes the stream to +be processed without special encoding assumptions. At present there is no +automatic detection of character encoding (even if there is a C<'use utf8'> +statement in your code) so this flag must be set for streams encoded in UTF-8. +Incorrectly setting this parameter can cause data corruption, so please +carefully check the output. + +The default is B<none>. + +The abbreviations B<-utf8> or B<-UTF8> are equivalent to B<-enc=utf8>. +So to process a file named B<file.pl> which is encoded in UTF-8 you can use: + + perltidy -utf8 file.pl + =item B<-ole=s>, B<--output-line-ending=s> where s=C<win>, C<dos>, C<unix>, or C<mac>. This flag tells perltidy @@ -3098,7 +3116,7 @@ =head1 VERSION -This man page documents perltidy version 20140711. +This man page documents perltidy version 20150815. =head1 CREDITS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Perl-Tidy-20140711/docs/perltidy.1 new/Perl-Tidy-20150815/docs/perltidy.1 --- old/Perl-Tidy-20140711/docs/perltidy.1 2014-07-11 13:16:50.000000000 +0200 +++ new/Perl-Tidy-20150815/docs/perltidy.1 2015-08-15 02:45:41.000000000 +0200 @@ -124,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "PERLTIDY 1" -.TH PERLTIDY 1 "2014-07-11" "perl v5.14.2" "User Contributed Perl Documentation" +.TH PERLTIDY 1 "2015-08-14" "perl v5.14.2" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -638,6 +638,25 @@ outdenting) of code and comments as it normally would. If you also want to prevent long comment lines from being outdented, you can add either \fB\-noll\fR or \&\fB\-l=0\fR. +.IP "\fB\-enc=s\fR, \fB\-\-character\-encoding=s\fR" 4 +.IX Item "-enc=s, --character-encoding=s" +where \fBs\fR=\fBnone\fR or \fButf8\fR. This flag tells perltidy the character encoding +of both the input and output character streams. The value \fButf8\fR causes the +stream to be read and written as \s-1UTF\-8\s0. The value \fBnone\fR causes the stream to +be processed without special encoding assumptions. At present there is no +automatic detection of character encoding (even if there is a \f(CW\*(Aquse utf8\*(Aq\fR +statement in your code) so this flag must be set for streams encoded in \s-1UTF\-8\s0. +Incorrectly setting this parameter can cause data corruption, so please +carefully check the output. +.Sp +The default is \fBnone\fR. +.Sp +The abbreviations \fB\-utf8\fR or \fB\-UTF8\fR are equivalent to \fB\-enc=utf8\fR. +So to process a file named \fBfile.pl\fR which is encoded in \s-1UTF\-8\s0 you can use: +.Sp +.Vb 1 +\& perltidy \-utf8 file.pl +.Ve .IP "\fB\-ole=s\fR, \fB\-\-output\-line\-ending=s\fR" 4 .IX Item "-ole=s, --output-line-ending=s" where s=\f(CW\*(C`win\*(C'\fR, \f(CW\*(C`dos\*(C'\fR, \f(CW\*(C`unix\*(C'\fR, or \f(CW\*(C`mac\*(C'\fR. This flag tells perltidy @@ -3188,7 +3207,7 @@ \&\fIperlstyle\fR\|(1), \fIPerl::Tidy\fR\|(3) .SH "VERSION" .IX Header "VERSION" -This man page documents perltidy version 20140711. +This man page documents perltidy version 20150815. .SH "CREDITS" .IX Header "CREDITS" Michael Cartmell supplied code for adaptation to \s-1VMS\s0 and helped with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Perl-Tidy-20140711/lib/Perl/Tidy.pm new/Perl-Tidy-20150815/lib/Perl/Tidy.pm --- old/Perl-Tidy-20140711/lib/Perl/Tidy.pm 2014-07-11 13:15:31.000000000 +0200 +++ new/Perl-Tidy-20150815/lib/Perl/Tidy.pm 2015-08-15 02:18:51.000000000 +0200 @@ -3,7 +3,7 @@ # # perltidy - a perl script indenter and formatter # -# Copyright (c) 2000-2014 by Steve Hancock +# Copyright (c) 2000-2015 by Steve Hancock # Distributed under the GPL license agreement; see file COPYING # # This program is free software; you can redistribute it and/or modify @@ -67,6 +67,7 @@ @EXPORT $missing_file_spec $fh_stderr + $rOpts_character_encoding }; @ISA = qw( Exporter ); @@ -79,7 +80,7 @@ use File::Temp qw(tempfile); BEGIN { - ( $VERSION = q($Id: Tidy.pm,v 1.74 2014/07/11 13:56:49 perltidy Exp $) ) =~ s/^.*\s+(\d+)\/(\d+)\/(\d+).*$/$1$2$3/; # all one line for MakeMaker + ( $VERSION = q($Id: Tidy.pm,v 1.74 2015/08/15 13:56:49 perltidy Exp $) ) =~ s/^.*\s+(\d+)\/(\d+)\/(\d+).*$/$1$2$3/; # all one line for MakeMaker } sub streamhandle { @@ -121,7 +122,10 @@ # skipped and we can just let it crash if there is no # getline. if ( $mode =~ /[rR]/ ) { - if ( $ref eq 'IO::File' || defined &{ $ref . "::getline" } ) { + + # RT#97159; part 1 of 2: updated to use 'can' + ##if ( $ref eq 'IO::File' || defined &{ $ref . "::getline" } ) { + if ( $ref->can('getline') ) { $New = sub { $filename }; } else { @@ -138,7 +142,10 @@ # Accept an object with a print method for writing. # See note above about IO::File if ( $mode =~ /[wW]/ ) { - if ( $ref eq 'IO::File' || defined &{ $ref . "::print" } ) { + + # RT#97159; part 2 of 2: updated to use 'can' + ##if ( $ref eq 'IO::File' || defined &{ $ref . "::print" } ) { + if ( $ref->can('print') ) { $New = sub { $filename }; } else { @@ -165,6 +172,13 @@ } $fh = $New->( $filename, $mode ) or Warn("Couldn't open file:$filename in mode:$mode : $!\n"); + + # The first call here will be to read the config file, which is before + # the --encoding has been set, so the config file cannot be read as utf8 + $fh->binmode(':encoding(utf8)') + if ( $rOpts_character_encoding + && $rOpts_character_encoding eq 'utf8' + && $fh->can('binmode') ); return $fh, ( $ref or $filename ); } @@ -545,6 +559,8 @@ user => '', ); + $rOpts_character_encoding = $rOpts->{'character-encoding'}; + # be sure we have a valid output format unless ( exists $default_file_extension{ $rOpts->{'format'} } ) { my $formats = join ' ', @@ -1305,7 +1321,7 @@ my ( $fh_stream, $fh_name ) = Perl::Tidy::streamhandle( $stream, 'r' ); if ($fh_stream) { - my ( $fout, $tmpnam ) = tempfile(); + my ( $fout, $tmpnam ) = File::Temp::tempfile(); if ($fout) { $fname = $tmpnam; $is_tmpfile = 1; @@ -1529,6 +1545,7 @@ $add_option->( 'standard-error-output', 'se', '!' ); $add_option->( 'standard-output', 'st', '!' ); $add_option->( 'warning-output', 'w', '!' ); + $add_option->( 'character-encoding', 'enc', '=s' ); # options which are both toggle switches and values moved here # to hide from tidyview (which does not show category 0 flags): @@ -1760,6 +1777,7 @@ %option_range = ( 'format' => [ 'tidy', 'html', 'user' ], 'output-line-ending' => [ 'dos', 'win', 'mac', 'unix' ], + 'character-encoding' => [ 'none', 'utf8' ], 'block-brace-tightness' => [ 0, 2 ], 'brace-tightness' => [ 0, 2 ], @@ -1846,6 +1864,7 @@ nostatic-side-comments notabs nowarning-output + character-encoding=none outdent-labels outdent-long-quotes outdent-long-comments @@ -1911,6 +1930,9 @@ 'nhtml' => [qw(format=tidy)], 'tidy' => [qw(format=tidy)], + 'utf8' => [qw(character-encoding=utf8)], + 'UTF8' => [qw(character-encoding=utf8)], + 'swallow-optional-blank-lines' => [qw(kbl=0)], 'noswallow-optional-blank-lines' => [qw(kbl=1)], 'sob' => [qw(kbl=0)], @@ -1969,7 +1991,7 @@ 'sct' => [qw(scp schb scsb)], 'stack-closing-tokens' => => [qw(scp schb scsb)], 'nsct' => [qw(nscp nschb nscsb)], - 'nostack-opening-tokens' => [qw(nscp nschb nscsb)], + 'nostack-closing-tokens' => [qw(nscp nschb nscsb)], 'sac' => [qw(sot sct)], 'nsac' => [qw(nsot nsct)], @@ -3306,7 +3328,7 @@ print STDOUT <<"EOM"; This is perltidy, v$VERSION -Copyright 2000-2014, Steve Hancock +Copyright 2000-2015, Steve Hancock Perltidy is free software and may be copied under the terms of the GNU General Public License, which is included in the distribution files. @@ -4357,6 +4379,7 @@ Perl::Tidy::Warn "## Please see file $filename\n" unless ref($warning_file); $self->{_fh_warnings} = $fh_warnings; + $fh_warnings->print("Perltidy version is $Perl::Tidy::VERSION\n"); } if ( $warning_count < WARNING_LIMIT ) { @@ -5134,7 +5157,7 @@ } # Pod::Html requires a real temporary filename - my ( $fh_tmp, $tmpfile ) = tempfile(); + my ( $fh_tmp, $tmpfile ) = File::Temp::tempfile(); unless ($fh_tmp) { Perl::Tidy::Warn "unable to open temporary file $tmpfile; cannot use pod2html\n"; @@ -7793,6 +7816,13 @@ $rOpts->{'long-block-line-count'} = 1000000; } + my $enc = $rOpts->{'character-encoding'}; + if ( $enc && $enc !~ /^(none|utf8)$/i ) { + Perl::Tidy::Die <<EOM; +Unrecognized character-encoding '$enc'; expecting one of: (none, utf8) +EOM + } + my $ole = $rOpts->{'output-line-ending'}; if ($ole) { my %endings = ( @@ -7801,16 +7831,38 @@ mac => "\015", unix => "\012", ); - $ole = lc $ole; - unless ( $rOpts->{'output-line-ending'} = $endings{$ole} ) { - my $str = join " ", keys %endings; - Perl::Tidy::Die <<EOM; + + # Patch for RT #99514, a memoization issue. + # Normally, the user enters one of 'dos', 'win', etc, and we change the + # value in the options parameter to be the corresponding line ending + # character. But, if we are using memoization, on later passes through + # here the option parameter will already have the desired ending + # character rather than the keyword 'dos', 'win', etc. So + # we must check to see if conversion has already been done and, if so, + # bypass the conversion step. + my %endings_inverted = ( + "\015\012" => 'dos', + "\015\012" => 'win', + "\015" => 'mac', + "\012" => 'unix', + ); + + if ( defined( $endings_inverted{$ole} ) ) { + + # we already have valid line ending, nothing more to do + } + else { + $ole = lc $ole; + unless ( $rOpts->{'output-line-ending'} = $endings{$ole} ) { + my $str = join " ", keys %endings; + Perl::Tidy::Die <<EOM; Unrecognized line ending '$ole'; expecting one of: $str EOM - } - if ( $rOpts->{'preserve-line-endings'} ) { - Perl::Tidy::Warn "Ignoring -ple; conflicts with -ole\n"; - $rOpts->{'preserve-line-endings'} = undef; + } + if ( $rOpts->{'preserve-line-endings'} ) { + Perl::Tidy::Warn "Ignoring -ple; conflicts with -ole\n"; + $rOpts->{'preserve-line-endings'} = undef; + } } } @@ -9502,10 +9554,19 @@ } # This is a good place to kill incomplete one-line blocks - if ( ( $semicolons_before_block_self_destruct == 0 ) - && ( $max_index_to_go >= 0 ) - && ( $types_to_go[$max_index_to_go] eq ';' ) - && ( $$rtokens[0] ne '}' ) ) + if ( + ( + ( $semicolons_before_block_self_destruct == 0 ) + && ( $max_index_to_go >= 0 ) + && ( $types_to_go[$max_index_to_go] eq ';' ) + && ( $$rtokens[0] ne '}' ) + ) + + # Patch for RT #98902. Honor request to break at old commas. + || ( $rOpts_break_at_old_comma_breakpoints + && $max_index_to_go >= 0 + && $types_to_go[$max_index_to_go] eq ',' ) + ) { destroy_one_line_block(); output_line_to_go(); @@ -10644,7 +10705,7 @@ sub want_blank_line { flush(); - $file_writer_object->want_blank_line(); + $file_writer_object->want_blank_line() unless $in_format_skipping_section; } sub write_unindented_line { @@ -25352,11 +25413,20 @@ # '//' must be defined_or operator if an operator is expected. # TODO: Code for other ambiguous digraphs (/=, x=, **, *=) # could be migrated here for clarity - if ( $test_tok eq '//' ) { + + # Patch for RT#102371, misparsing a // in the following snippet: + # state $b //= ccc(); + # The solution is to always accept the digraph (or trigraph) after + # token type 'Z' (possible file handle). The reason is that + # sub operator_expected gives TERM expected here, which is + # wrong in this case. + if ( $test_tok eq '//' && $last_nonblank_type ne 'Z' ) { my $next_type = $$rtokens[ $i + 1 ]; my $expecting = operator_expected( $prev_type, $tok, $next_type ); - $combine_ok = 0 unless ( $expecting == OPERATOR ); + + # Patched for RT#101547, was 'unless ($expecting==OPERATOR)' + $combine_ok = 0 if ( $expecting == TERM ); } } @@ -25711,9 +25781,17 @@ elsif ( $tok eq 'else' ) { # patched for SWITCH/CASE - if ( $last_nonblank_token ne ';' + if ( + $last_nonblank_token ne ';' && $last_nonblank_block_type !~ - /^(if|elsif|unless|case|when)$/ ) + /^(if|elsif|unless|case|when)$/ + + # patch to avoid an unwanted error message for + # the case of a parenless 'case' (RT 105484): + # switch ( 1 ) { case x { 2 } else { } } + && $statement_type !~ + /^(if|elsif|unless|case|when)$/ + ) { warning( "expecting '$tok' to follow one of 'if|elsif|unless|case|when'\n" @@ -26452,8 +26530,15 @@ $in_statement_continuation = 0; } - # otherwise, the next token after a ',' starts a new term - elsif ( $type eq ',' ) { + # otherwise, the token after a ',' starts a new term + + # Patch FOR RT#99961; no continuation after a ';' + # This is needed because perltidy currently marks + # a block preceded by a type character like % or @ + # as a non block, to simplify formatting. But these + # are actually blocks and can have semicolons. + # See code_block_type() and is_non_structural_brace(). + elsif ( $type eq ',' || $type eq ';' ) { $in_statement_continuation = 0; } @@ -26871,9 +26956,11 @@ } } + ################################################################ # NOTE: braces after type characters start code blocks, but for # simplicity these are not identified as such. See also # sub is_non_structural_brace. + ################################################################ ## elsif ( $last_nonblank_type eq 't' ) { ## return $last_nonblank_token; @@ -27127,9 +27214,11 @@ # return 0; # } + ################################################################ # NOTE: braces after type characters start code blocks, but for # simplicity these are not identified as such. See also # sub code_block_type + ################################################################ ##if ($last_nonblank_type eq 't') {return 0} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Perl-Tidy-20140711/lib/Perl/Tidy.pod new/Perl-Tidy-20150815/lib/Perl/Tidy.pod --- old/Perl-Tidy-20140711/lib/Perl/Tidy.pod 2014-07-11 13:12:22.000000000 +0200 +++ new/Perl-Tidy-20150815/lib/Perl/Tidy.pod 2015-08-15 02:14:25.000000000 +0200 @@ -415,7 +415,7 @@ =head1 VERSION -This man page documents Perl::Tidy version 20140711. +This man page documents Perl::Tidy version 20150815. =head1 LICENSE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Perl-Tidy-20140711/t/testsa.t new/Perl-Tidy-20150815/t/testsa.t --- old/Perl-Tidy-20140711/t/testsa.t 2012-08-15 00:06:03.000000000 +0200 +++ new/Perl-Tidy-20150815/t/testsa.t 2015-08-15 01:53:02.000000000 +0200 @@ -36,7 +36,9 @@ my $ok=1; if (@expected_output == @tidy_output) { while ( $_ = pop @tidy_output ) { + s/\s+$//; my $expect = pop @expected_output; + $expect=~s/\s+$//; if ( $expect ne $_ ) { print STDERR "got:$_"; print STDERR "---\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Perl-Tidy-20140711/t/testwide.pl.src new/Perl-Tidy-20150815/t/testwide.pl.src --- old/Perl-Tidy-20140711/t/testwide.pl.src 1970-01-01 01:00:00.000000000 +0100 +++ new/Perl-Tidy-20150815/t/testwide.pl.src 2015-08-14 05:08:29.000000000 +0200 @@ -0,0 +1,4 @@ +%pangrams=("Plain","ASCII", +"Zwölf große Boxkämpfer jagen Vik quer über den Sylter.","DE", +"Jeż wlókł gęś. Uf! Bądź choć przy nim, stań!","PL", +"Любя, съешь щипцы, — вздохнёт мэр, — кайф жгуч.","RU"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Perl-Tidy-20140711/t/testwide.t new/Perl-Tidy-20150815/t/testwide.t --- old/Perl-Tidy-20140711/t/testwide.t 1970-01-01 01:00:00.000000000 +0100 +++ new/Perl-Tidy-20150815/t/testwide.t 2015-08-14 16:46:18.000000000 +0200 @@ -0,0 +1,50 @@ +use strict; +use utf8; +use Test; +use Carp; +use FindBin; +BEGIN {unshift @INC, "./"} +BEGIN {plan tests => 2} +use Perl::Tidy; + + +my $source = <<'EOM'; +%pangrams=("Plain","ASCII", +"Zwölf große Boxkämpfer jagen Vik quer über den Sylter.","DE", +"Jeż wlókł gęś. Uf! Bądź choć przy nim, stań!","PL", +"Любя, съешь щипцы, — вздохнёт мэр, — кайф жгуч.","RU"); +EOM + +my $expected_output=<<'EOM'; +%pangrams = ( + "Plain", "ASCII", + "Zwölf große Boxkämpfer jagen Vik quer über den Sylter.", "DE", + "Jeż wlókł gęś. Uf! Bądź choć przy nim, stań!", "PL", + "Любя, съешь щипцы, — вздохнёт мэр, — кайф жгуч.", "RU" + ); +EOM + +my $perltidyrc = <<'EOM'; +-gnu -enc=utf8 +EOM + +my $output; + +Perl::Tidy::perltidy( + source => \$source, + destination => \$output, + perltidyrc => \$perltidyrc, + argv => '-nsyn', +); + +ok($output, $expected_output); + +Perl::Tidy::perltidy( + source => $FindBin::Bin . '/testwide.pl.src', + destination => \$output, + perltidyrc => \$perltidyrc, + argv => '-nsyn', +); + +ok($output, $expected_output); + ++++++ cpanspec.yml ++++++ --- description_paragraphs: 4 #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_install: |- # sed on %{name}.files license: GPL-2.0+ #skip_noarch: 1 #custom_build: |- #./Build build flags=%{?_smp_mflags} --myflag #custom_test: |- #startserver && make test #ignore_requires: Bizarre::Module

1 0

commit hawk for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '15

29 Aug '15

Hello community, here is the log from the commit of package hawk for openSUSE:Factory checked in at 2015-08-29 20:04:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hawk (Old) and /work/SRC/openSUSE:Factory/.hawk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hawk" Changes: -------- --- /work/SRC/openSUSE:Factory/hawk/hawk.changes 2015-08-12 15:15:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hawk.new/hawk.changes 2015-08-29 20:04:38.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 24 07:15:35 UTC 2015 - kgronlund(a)suse.com + +- Add provides for ha-cluster-webui (bsc#942723) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hawk.spec ++++++ --- /var/tmp/diff_new_pack.1VdqDi/_old 2015-08-29 20:04:39.000000000 +0200 +++ /var/tmp/diff_new_pack.1VdqDi/_new 2015-08-29 20:04:39.000000000 +0200 @@ -45,6 +45,7 @@ Source: %{name}-%{version}.tar.bz2 Source100: hawk-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build +Provides: ha-cluster-webui Requires: crmsh Requires: graphviz Requires: graphviz-gd

1 0