commit perl-YAML-LibYAML for openSUSE:Factory
Hello community, here is the log from the commit of package perl-YAML-LibYAML for openSUSE:Factory checked in at 2012-05-31 17:09:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-YAML-LibYAML (Old) and /work/SRC/openSUSE:Factory/.perl-YAML-LibYAML.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-YAML-LibYAML", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-YAML-LibYAML/perl-YAML-LibYAML.changes 2012-05-03 10:59:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-YAML-LibYAML.new/perl-YAML-LibYAML.changes 2012-05-31 17:09:03.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 30 07:57:03 UTC 2012 - coolo@suse.com + +- updated to 0.38 + - Apply SPROUT++ deparse test patch. Thanks! + +------------------------------------------------------------------- Old: ---- YAML-LibYAML-0.37.tar.gz New: ---- YAML-LibYAML-0.38.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-YAML-LibYAML.spec ++++++ --- /var/tmp/diff_new_pack.jXCi2k/_old 2012-05-31 17:09:04.000000000 +0200 +++ /var/tmp/diff_new_pack.jXCi2k/_new 2012-05-31 17:09:04.000000000 +0200 @@ -17,15 +17,14 @@ Name: perl-YAML-LibYAML -Version: 0.37 +Version: 0.38 Release: 0 %define cpan_name YAML-LibYAML Summary: YAML::LibYAML Perl module License: GPL-1.0+ or Artistic-1.0 Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/YAML-LibYAML/ -#Source: http://www.cpan.org/authors/id/I/IN/INGY/YAML-LibYAML-%{version}.tar.gz -Source: %{cpan_name}-%{version}.tar.gz +Source: http://www.cpan.org/authors/id/I/IN/INGY/%{cpan_name}-%{version}.tar.gz Patch1: CVE-2012-1152-YAML-LibYAML-0.35-format-error.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl @@ -59,9 +58,6 @@ %perl_process_packlist %perl_gen_filelist -%clean -%{__rm} -rf %{buildroot} - %files -f %{name}.files %defattr(644,root,root,755) %doc Changes README ++++++ YAML-LibYAML-0.37.tar.gz -> YAML-LibYAML-0.38.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-LibYAML-0.37/Changes new/YAML-LibYAML-0.38/Changes --- old/YAML-LibYAML-0.37/Changes 2011-09-29 20:10:08.000000000 +0200 +++ new/YAML-LibYAML-0.38/Changes 2012-01-04 07:56:39.000000000 +0100 @@ -1,4 +1,9 @@ --- +version: 0.38 +date: Tue Jan 3 22:56:01 PST 2012 +changes: +- Apply SPROUT++ deparse test patch. Thanks! +--- version: 0.37 date: Thu Sep 29 20:09:20 CEST 2011 changes: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-LibYAML-0.37/LICENSE new/YAML-LibYAML-0.38/LICENSE --- old/YAML-LibYAML-0.37/LICENSE 2011-09-29 20:10:08.000000000 +0200 +++ new/YAML-LibYAML-0.38/LICENSE 2012-01-04 07:56:39.000000000 +0100 @@ -1,4 +1,4 @@ -This software is copyright (c) 2011 by Ingy döt Net <ingy@cpan.org>. +This software is copyright (c) 2012 by Ingy döt Net <ingy@cpan.org>. This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. @@ -12,21 +12,22 @@ --- The GNU General Public License, Version 1, February 1989 --- -This software is Copyright (c) 2011 by Ingy döt Net <ingy@cpan.org>. +This software is Copyright (c) 2012 by Ingy döt Net <ingy@cpan.org>. This is free software, licensed under: The GNU General Public License, Version 1, February 1989 - GNU GENERAL PUBLIC LICENSE - Version 1, February 1989 + GNU GENERAL PUBLIC LICENSE + Version 1, February 1989 Copyright (C) 1989 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The license agreements of most software companies try to keep users at the mercy of those companies. By contrast, our General Public @@ -67,7 +68,7 @@ The precise terms and conditions for copying, distribution and modification follow. - GNU GENERAL PUBLIC LICENSE + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License Agreement applies to any program or other work which @@ -185,7 +186,7 @@ of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 9. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -207,9 +208,9 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS - Appendix: How to Apply These Terms to Your New Programs + Appendix: How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to humanity, the best way to achieve this is to make it @@ -235,8 +236,9 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA + Also add information on how to contact you by electronic and paper mail. @@ -270,7 +272,7 @@ --- The Artistic License 1.0 --- -This software is Copyright (c) 2011 by Ingy döt Net <ingy@cpan.org>. +This software is Copyright (c) 2012 by Ingy döt Net <ingy@cpan.org>. This is free software, licensed under: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-LibYAML-0.37/LibYAML/Makefile new/YAML-LibYAML-0.38/LibYAML/Makefile --- old/YAML-LibYAML-0.37/LibYAML/Makefile 2011-09-29 20:10:09.000000000 +0200 +++ new/YAML-LibYAML-0.38/LibYAML/Makefile 2012-01-04 07:56:40.000000000 +0100 @@ -1,7 +1,7 @@ # This Makefile is for the YAML::XS::LibYAML extension to perl. # # It was generated automatically by MakeMaker version -# 6.56 (Revision: 65600) from the contents of +# 6.62 (Revision: 66200) from the contents of # Makefile.PL. Don't edit this file, edit Makefile.PL instead. # # ANY CHANGES MADE HERE WILL BE LOST! @@ -12,8 +12,9 @@ # MakeMaker Parameters: # ABSTRACT_FROM => q[lib/YAML/XS/LibYAML.pm] -# AUTHOR => q[Ingy döt Net <ingy@cpan.org>] +# AUTHOR => [q[Ingy döt Net <ingy@cpan.org>]] # BUILD_REQUIRES => { } +# CONFIGURE_REQUIRES => { } # DEFINE => q[-DHAVE_CONFIG_H] # INC => q[-I.] # LIBS => [q[]] @@ -26,7 +27,7 @@ # --- MakeMaker const_config section: -# These definitions are from config.sh (via /usr/lib/perl/5.10/Config.pm). +# These definitions are from config.sh (via /usr/lib/perl/5.12/Config.pm). # They may have been overridden via Makefile.PL or on the command line. AR = ar CC = cc @@ -43,10 +44,10 @@ LIB_EXT = .a OBJ_EXT = .o OSNAME = linux -OSVERS = 2.6.24-27-server +OSVERS = 2.6.24-28-server RANLIB = : -SITELIBEXP = /usr/local/share/perl/5.10.1 -SITEARCHEXP = /usr/local/lib/perl/5.10.1 +SITELIBEXP = /usr/local/share/perl/5.12.4 +SITEARCHEXP = /usr/local/lib/perl/5.12.4 SO = so VENDORARCHEXP = /usr/lib/perl5 VENDORLIBEXP = /usr/share/perl5 @@ -79,15 +80,15 @@ PERLPREFIX = /usr SITEPREFIX = /usr/local VENDORPREFIX = /usr -INSTALLPRIVLIB = /usr/share/perl/5.10 +INSTALLPRIVLIB = /usr/share/perl/5.12 DESTINSTALLPRIVLIB = $(DESTDIR)$(INSTALLPRIVLIB) -INSTALLSITELIB = /usr/local/share/perl/5.10.1 +INSTALLSITELIB = /usr/local/share/perl/5.12.4 DESTINSTALLSITELIB = $(DESTDIR)$(INSTALLSITELIB) INSTALLVENDORLIB = /usr/share/perl5 DESTINSTALLVENDORLIB = $(DESTDIR)$(INSTALLVENDORLIB) -INSTALLARCHLIB = /usr/lib/perl/5.10 +INSTALLARCHLIB = /usr/lib/perl/5.12 DESTINSTALLARCHLIB = $(DESTDIR)$(INSTALLARCHLIB) -INSTALLSITEARCH = /usr/local/lib/perl/5.10.1 +INSTALLSITEARCH = /usr/local/lib/perl/5.12.4 DESTINSTALLSITEARCH = $(DESTDIR)$(INSTALLSITEARCH) INSTALLVENDORARCH = /usr/lib/perl5 DESTINSTALLVENDORARCH = $(DESTDIR)$(INSTALLVENDORARCH) @@ -115,14 +116,14 @@ DESTINSTALLSITEMAN3DIR = $(DESTDIR)$(INSTALLSITEMAN3DIR) INSTALLVENDORMAN3DIR = /usr/share/man/man3 DESTINSTALLVENDORMAN3DIR = $(DESTDIR)$(INSTALLVENDORMAN3DIR) -PERL_LIB = /usr/share/perl/5.10 -PERL_ARCHLIB = /usr/lib/perl/5.10 +PERL_LIB = /usr/share/perl/5.12 +PERL_ARCHLIB = /usr/lib/perl/5.12 LIBPERL_A = libperl.a FIRST_MAKEFILE = Makefile MAKEFILE_OLD = Makefile.old MAKE_APERL_FILE = Makefile.aperl PERLMAINCC = $(CC) -PERL_INC = /usr/lib/perl/5.10/CORE +PERL_INC = /usr/lib/perl/5.12/CORE PERL = /usr/bin/perl FULLPERL = /usr/bin/perl ABSPERL = $(PERL) @@ -137,9 +138,9 @@ PERM_RW = 644 PERM_RWX = 755 -MAKEMAKER = /usr/share/perl/5.10/ExtUtils/MakeMaker.pm -MM_VERSION = 6.56 -MM_REVISION = 65600 +MAKEMAKER = /usr/share/perl/5.12/ExtUtils/MakeMaker.pm +MM_VERSION = 6.62 +MM_REVISION = 66200 # FULLEXT = Pathname for extension directory (eg Foo/Bar/Oracle). # BASEEXT = Basename part of FULLEXT. May be just equal FULLEXT. (eg Oracle) @@ -216,7 +217,7 @@ # --- MakeMaker platform_constants section: -MM_Unix_VERSION = 6.56 +MM_Unix_VERSION = 6.62 PERL_MALLOC_DEF = -DPERL_EXTMALLOC_DEF -Dmalloc=Perl_malloc -Dfree=Perl_mfree -Drealloc=Perl_realloc -Dcalloc=Perl_calloc @@ -228,12 +229,12 @@ # --- MakeMaker tool_xsubpp section: -XSUBPPDIR = /usr/share/perl/5.10.1/ExtUtils +XSUBPPDIR = /usr/share/perl/5.12.4/ExtUtils XSUBPP = $(XSUBPPDIR)$(DFSEP)xsubpp XSUBPPRUN = $(PERLRUN) $(XSUBPP) XSPROTOARG = -XSUBPPDEPS = /usr/share/perl/5.10/ExtUtils/typemap $(XSUBPP) -XSUBPPARGS = -typemap /usr/share/perl/5.10/ExtUtils/typemap +XSUBPPDEPS = /usr/share/perl/5.12/ExtUtils/typemap $(XSUBPP) +XSUBPPARGS = -typemap /usr/share/perl/5.12/ExtUtils/typemap XSUBPP_EXTRA_ARGS = @@ -540,15 +541,16 @@ *$(LIB_EXT) core \ core.[0-9] $(INST_ARCHAUTODIR)/extralibs.all \ core.[0-9][0-9] $(BASEEXT).bso \ - pm_to_blib.ts core.[0-9][0-9][0-9][0-9] \ + pm_to_blib.ts MYMETA.json \ + core.[0-9][0-9][0-9][0-9] MYMETA.yml \ $(BASEEXT).x $(BOOTSTRAP) \ perl$(EXE_EXT) tmon.out \ *$(OBJ_EXT) pm_to_blib \ $(INST_ARCHAUTODIR)/extralibs.ld blibdirs.ts \ LibYAML.c core.[0-9][0-9][0-9][0-9][0-9] \ *perl.core core.*perl.*.? \ - $(MAKE_APERL_FILE) perl \ - $(BASEEXT).def core.[0-9][0-9][0-9] \ + $(MAKE_APERL_FILE) $(BASEEXT).def \ + perl core.[0-9][0-9][0-9] \ mon.out lib$(BASEEXT).def \ perlmain.c perl.exe \ so_locations $(BASEEXT).exp @@ -573,30 +575,8 @@ # --- MakeMaker metafile section: -metafile : create_distdir - $(NOECHO) $(ECHO) Generating META.yml - $(NOECHO) $(ECHO) '--- #YAML:1.0' > META_new.yml - $(NOECHO) $(ECHO) 'name: YAML-XS-LibYAML' >> META_new.yml - $(NOECHO) $(ECHO) 'version: ' >> META_new.yml - $(NOECHO) $(ECHO) 'abstract: An XS Wrapper Module of libyaml' >> META_new.yml - $(NOECHO) $(ECHO) 'author:' >> META_new.yml - $(NOECHO) $(ECHO) ' - Ingy döt Net <ingy@cpan.org>' >> META_new.yml - $(NOECHO) $(ECHO) 'license: unknown' >> META_new.yml - $(NOECHO) $(ECHO) 'distribution_type: module' >> META_new.yml - $(NOECHO) $(ECHO) 'configure_requires:' >> META_new.yml - $(NOECHO) $(ECHO) ' ExtUtils::MakeMaker: 0' >> META_new.yml - $(NOECHO) $(ECHO) 'build_requires:' >> META_new.yml - $(NOECHO) $(ECHO) ' ExtUtils::MakeMaker: 0' >> META_new.yml - $(NOECHO) $(ECHO) 'requires: {}' >> META_new.yml - $(NOECHO) $(ECHO) 'no_index:' >> META_new.yml - $(NOECHO) $(ECHO) ' directory:' >> META_new.yml - $(NOECHO) $(ECHO) ' - t' >> META_new.yml - $(NOECHO) $(ECHO) ' - inc' >> META_new.yml - $(NOECHO) $(ECHO) 'generated_by: ExtUtils::MakeMaker version 6.56' >> META_new.yml - $(NOECHO) $(ECHO) 'meta-spec:' >> META_new.yml - $(NOECHO) $(ECHO) ' url: http://module-build.sourceforge.net/META-spec-v1.4.html' >> META_new.yml - $(NOECHO) $(ECHO) ' version: 1.4' >> META_new.yml - -$(NOECHO) $(MV) META_new.yml $(DISTVNAME)/META.yml +metafile : + $(NOECHO) $(NOOP) # --- MakeMaker signature section: @@ -616,8 +596,12 @@ # --- MakeMaker distmeta section: distmeta : create_distdir metafile - $(NOECHO) cd $(DISTVNAME) && $(ABSPERLRUN) -MExtUtils::Manifest=maniadd -e 'eval { maniadd({q{META.yml} => q{Module meta-data (added by MakeMaker)}}) } ' \ + $(NOECHO) cd $(DISTVNAME) && $(ABSPERLRUN) -MExtUtils::Manifest=maniadd -e 'exit unless -e q{META.yml};' \ + -e 'eval { maniadd({q{META.yml} => q{Module YAML meta-data (added by MakeMaker)}}) }' \ -e ' or print "Could not add META.yml to MANIFEST: $${'\''@'\''}\n"' -- + $(NOECHO) cd $(DISTVNAME) && $(ABSPERLRUN) -MExtUtils::Manifest=maniadd -e 'exit unless -f q{META.json};' \ + -e 'eval { maniadd({q{META.json} => q{Module JSON meta-data (added by MakeMaker)}}) }' \ + -e ' or print "Could not add META.json to MANIFEST: $${'\''@'\''}\n"' -- @@ -645,7 +629,6 @@ $(PERL_INC)/INTERN.h \ $(PERL_INC)/XSUB.h \ $(PERL_INC)/av.h \ - $(PERL_INC)/cc_runtime.h \ $(PERL_INC)/config.h \ $(PERL_INC)/cop.h \ $(PERL_INC)/cv.h \ @@ -753,7 +736,7 @@ $(NOECHO) $(ECHO) ' <ABSTRACT>An XS Wrapper Module of libyaml</ABSTRACT>' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' <AUTHOR>Ingy döt Net <ingy@cpan.org></AUTHOR>' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' <IMPLEMENTATION>' >> $(DISTNAME).ppd - $(NOECHO) $(ECHO) ' <ARCHITECTURE NAME="i686-linux-gnu-thread-multi-5.10" />' >> $(DISTNAME).ppd + $(NOECHO) $(ECHO) ' <ARCHITECTURE NAME="i686-linux-gnu-thread-multi-64int-5.12" />' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' <CODEBASE HREF="" />' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' </IMPLEMENTATION>' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) '</SOFTPKG>' >> $(DISTNAME).ppd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-LibYAML-0.37/MANIFEST new/YAML-LibYAML-0.38/MANIFEST --- old/YAML-LibYAML-0.37/MANIFEST 2011-09-29 20:10:09.000000000 +0200 +++ new/YAML-LibYAML-0.38/MANIFEST 2012-01-04 07:56:41.000000000 +0100 @@ -63,6 +63,7 @@ t/leak.t t/load.t t/loadfile-empty.t +t/long_plain_wrap.t t/magic.t t/native.t t/null.t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-LibYAML-0.37/META.yml new/YAML-LibYAML-0.38/META.yml --- old/YAML-LibYAML-0.37/META.yml 2011-09-29 20:10:09.000000000 +0200 +++ new/YAML-LibYAML-0.38/META.yml 2012-01-04 07:56:40.000000000 +0100 @@ -7,7 +7,7 @@ configure_requires: ExtUtils::MakeMaker: 6.42 distribution_type: module -generated_by: 'Module::Install version 1.01' +generated_by: 'Module::Install version 1.02' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -21,7 +21,10 @@ Filter::Util::Call: 0 perl: 5.8.1 resources: - homepage: http://github.com/ingydotnet/yaml-libyaml-pm/tree + homepage: https://github.com/ingydotnet/yaml-libyaml-pm/tree license: http://dev.perl.org/licenses/ - repository: git://github.com/ingydotnet/yaml-libyaml-pm.git -version: 0.37 + repository: + type: git + url: git://github.com/ingydotnet/yaml-libyaml-pm.git + web: https://github.com/ingydotnet/yaml-libyaml-pm/tree +version: 0.38 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-LibYAML-0.37/inc/Module/Install/Base.pm new/YAML-LibYAML-0.38/inc/Module/Install/Base.pm --- old/YAML-LibYAML-0.37/inc/Module/Install/Base.pm 2011-09-29 20:10:08.000000000 +0200 +++ new/YAML-LibYAML-0.38/inc/Module/Install/Base.pm 2012-01-04 07:56:39.000000000 +0100 @@ -4,7 +4,7 @@ use strict 'vars'; use vars qw{$VERSION}; BEGIN { - $VERSION = '1.01'; + $VERSION = '1.02'; } # Suspend handler for "redefined" warnings diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-LibYAML-0.37/inc/Module/Install/Can.pm new/YAML-LibYAML-0.38/inc/Module/Install/Can.pm --- old/YAML-LibYAML-0.37/inc/Module/Install/Can.pm 2011-09-29 20:10:08.000000000 +0200 +++ new/YAML-LibYAML-0.38/inc/Module/Install/Can.pm 2012-01-04 07:56:39.000000000 +0100 @@ -9,7 +9,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.01'; + $VERSION = '1.02'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-LibYAML-0.37/inc/Module/Install/Fetch.pm new/YAML-LibYAML-0.38/inc/Module/Install/Fetch.pm --- old/YAML-LibYAML-0.37/inc/Module/Install/Fetch.pm 2011-09-29 20:10:09.000000000 +0200 +++ new/YAML-LibYAML-0.38/inc/Module/Install/Fetch.pm 2012-01-04 07:56:40.000000000 +0100 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.01'; + $VERSION = '1.02'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-LibYAML-0.37/inc/Module/Install/GithubMeta.pm new/YAML-LibYAML-0.38/inc/Module/Install/GithubMeta.pm --- old/YAML-LibYAML-0.37/inc/Module/Install/GithubMeta.pm 2011-09-29 20:10:08.000000000 +0200 +++ new/YAML-LibYAML-0.38/inc/Module/Install/GithubMeta.pm 2012-01-04 07:56:39.000000000 +0100 @@ -7,20 +7,27 @@ use base qw(Module::Install::Base); use vars qw($VERSION); -$VERSION = '0.10'; +$VERSION = '0.16'; sub githubmeta { my $self = shift; return unless $Module::Install::AUTHOR; return unless _under_git(); return unless $self->can_run('git'); - return unless my ($git_url) = `git remote show -n origin` =~ /URL: (.*)$/m; + my $remote = shift || 'origin'; + return unless my ($git_url) = `git remote show -n $remote` =~ /URL: (.*)$/m; return unless $git_url =~ /github\.com/; # Not a Github repository my $http_url = $git_url; $git_url =~ s![\w\-]+\@([^:]+):!git://$1/!; - $http_url =~ s![\w\-]+\@([^:]+):!http://$1/!; + $http_url =~ s![\w\-]+\@([^:]+):!https://$1/!; $http_url =~ s!\.git$!/tree!; - $self->repository( $git_url ); + $self->repository( + { + type => 'git', + url => $git_url, + web => $http_url, + }, + ); $self->homepage( $http_url ) unless $self->homepage(); return 1; } @@ -47,4 +54,4 @@ 'Github'; __END__ -#line 108 +#line 117 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-LibYAML-0.37/inc/Module/Install/Include.pm new/YAML-LibYAML-0.38/inc/Module/Install/Include.pm --- old/YAML-LibYAML-0.37/inc/Module/Install/Include.pm 2011-09-29 20:10:08.000000000 +0200 +++ new/YAML-LibYAML-0.38/inc/Module/Install/Include.pm 2012-01-04 07:56:39.000000000 +0100 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.01'; + $VERSION = '1.02'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-LibYAML-0.37/inc/Module/Install/Makefile.pm new/YAML-LibYAML-0.38/inc/Module/Install/Makefile.pm --- old/YAML-LibYAML-0.37/inc/Module/Install/Makefile.pm 2011-09-29 20:10:08.000000000 +0200 +++ new/YAML-LibYAML-0.38/inc/Module/Install/Makefile.pm 2012-01-04 07:56:39.000000000 +0100 @@ -8,7 +8,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.01'; + $VERSION = '1.02'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-LibYAML-0.37/inc/Module/Install/Metadata.pm new/YAML-LibYAML-0.38/inc/Module/Install/Metadata.pm --- old/YAML-LibYAML-0.37/inc/Module/Install/Metadata.pm 2011-09-29 20:10:08.000000000 +0200 +++ new/YAML-LibYAML-0.38/inc/Module/Install/Metadata.pm 2012-01-04 07:56:39.000000000 +0100 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.01'; + $VERSION = '1.02'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-LibYAML-0.37/inc/Module/Install/Package.pm new/YAML-LibYAML-0.38/inc/Module/Install/Package.pm --- old/YAML-LibYAML-0.37/inc/Module/Install/Package.pm 2011-09-29 20:10:08.000000000 +0200 +++ new/YAML-LibYAML-0.38/inc/Module/Install/Package.pm 2012-01-04 07:56:39.000000000 +0100 @@ -16,7 +16,7 @@ use Module::Install::Base; use vars qw'@ISA $VERSION'; @ISA = 'Module::Install::Base'; -$VERSION = '0.29'; +$VERSION = '0.30'; #-----------------------------------------------------------------------------# # XXX BOOTBUGHACK @@ -54,6 +54,7 @@ # plugin directive: my $module_install_plugin; my $module_package_plugin; +my $module_package_dist_plugin; # XXX ARGVHACK This @argv thing is a temporary fix for an ugly bug somewhere in the # Wikitext module usage. my @argv; @@ -67,6 +68,10 @@ $module_package_plugin->mi($module_install_plugin); $module_package_plugin->version_check($VERSION); } + else { + $module_package_dist_plugin = $self->_load_dist_plugin($plugin_spec); + $module_package_dist_plugin->mi($module_install_plugin) if ref $module_package_dist_plugin; + } # NOTE - This is the point in time where the body of Makefile.PL runs... return; @@ -80,7 +85,9 @@ } else { $module_install_plugin->_initial(); + $module_package_dist_plugin->_initial() if ref $module_package_dist_plugin; $module_install_plugin->_main(); + $module_package_dist_plugin->_main() if ref $module_package_dist_plugin; } }; if ($@) { @@ -101,7 +108,10 @@ $module_package_plugin->final; $module_package_plugin->replicate_module_package; } - : $module_install_plugin->_final; + : do { + $module_install_plugin->_final; + $module_package_dist_plugin->_final() if ref $module_package_dist_plugin; + } } } @@ -123,8 +133,9 @@ # Find and load the author side plugin: sub _load_plugin { - my ($self, $spec) = @_; + my ($self, $spec, $namespace) = @_; $spec ||= ''; + $namespace ||= 'Module::Package'; my $version = ''; $Module::Package::plugin_version = 0; if ($spec =~ s/\s+(\S+)\s*//) { @@ -137,12 +148,22 @@ ($spec =~ /^:(\w+)$/) ? ('Plugin', "Plugin::$1") : ($spec =~ /^(\S*\w):(\w+)$/) ? ($1, "$1::$2") : die "$spec is invalid"; - $module = "Module::Package::$module"; - $plugin = "Module::Package::$plugin"; + $module = "${namespace}::${module}"; + $plugin = "${namespace}::${plugin}"; eval "use $module $version (); 1" or die $@; return $plugin->new(); } +# Find and load the user side plugin: +sub _load_dist_plugin { + my ($self, $spec, $namespace) = @_; + $spec ||= ''; + $namespace ||= 'Module::Package::Dist'; + my $r = eval { $self->_load_plugin($spec, $namespace); }; + return $r if ref $r; + return; +} + #-----------------------------------------------------------------------------# # These are the user side analogs to the author side plugin API calls. # Prefix with '_' to not pollute Module::Install plugin space. @@ -218,6 +239,32 @@ $self->WriteAll(@_); } +# Base package for Module::Package plugin distributed components. +package Module::Package::Dist; + +sub new { + my ($class, %args) = @_; + bless \%args, $class; +} + +sub mi { + @_ > 1 ? ($_[0]->{mi}=$_[1]) : $_[0]->{mi}; +} + +sub _initial { + my ($self) = @_; +} + +sub _main { + my ($self) = @_; +} + +sub _final { + my ($self) = @_; +} + +1; + #-----------------------------------------------------------------------------# # Take a guess at the primary .pm and .pod files for 'all_from', and friends. # Put them in global magical vars in the main:: namespace. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-LibYAML-0.37/inc/Module/Install/Win32.pm new/YAML-LibYAML-0.38/inc/Module/Install/Win32.pm --- old/YAML-LibYAML-0.37/inc/Module/Install/Win32.pm 2011-09-29 20:10:09.000000000 +0200 +++ new/YAML-LibYAML-0.38/inc/Module/Install/Win32.pm 2012-01-04 07:56:40.000000000 +0100 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.01'; + $VERSION = '1.02'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-LibYAML-0.37/inc/Module/Install/WriteAll.pm new/YAML-LibYAML-0.38/inc/Module/Install/WriteAll.pm --- old/YAML-LibYAML-0.37/inc/Module/Install/WriteAll.pm 2011-09-29 20:10:09.000000000 +0200 +++ new/YAML-LibYAML-0.38/inc/Module/Install/WriteAll.pm 2012-01-04 07:56:40.000000000 +0100 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.01'; + $VERSION = '1.02'; @ISA = qw{Module::Install::Base}; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-LibYAML-0.37/inc/Module/Install.pm new/YAML-LibYAML-0.38/inc/Module/Install.pm --- old/YAML-LibYAML-0.37/inc/Module/Install.pm 2011-09-29 20:10:08.000000000 +0200 +++ new/YAML-LibYAML-0.38/inc/Module/Install.pm 2012-01-04 07:56:39.000000000 +0100 @@ -31,7 +31,7 @@ # This is not enforced yet, but will be some time in the next few # releases once we can make sure it won't clash with custom # Module::Install extensions. - $VERSION = '1.01'; + $VERSION = '1.02'; # Storage for the pseudo-singleton $MAIN = undef; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-LibYAML-0.37/inc/Module/Package.pm new/YAML-LibYAML-0.38/inc/Module/Package.pm --- old/YAML-LibYAML-0.37/inc/Module/Package.pm 2011-09-29 20:10:09.000000000 +0200 +++ new/YAML-LibYAML-0.38/inc/Module/Package.pm 2012-01-04 07:56:40.000000000 +0100 @@ -15,7 +15,7 @@ use strict; BEGIN { - $Module::Package::VERSION = '0.29'; + $Module::Package::VERSION = '0.30'; $inc::Module::Package::VERSION ||= $Module::Package::VERSION; @inc::Module::Package::ISA = __PACKAGE__; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-LibYAML-0.37/lib/YAML/XS.pm new/YAML-LibYAML-0.38/lib/YAML/XS.pm --- old/YAML-LibYAML-0.37/lib/YAML/XS.pm 2011-09-29 20:08:07.000000000 +0200 +++ new/YAML-LibYAML-0.38/lib/YAML/XS.pm 2012-01-04 07:51:19.000000000 +0100 @@ -2,7 +2,7 @@ use strict; package YAML::XS; -$YAML::XS::VERSION = '0.37'; +$YAML::XS::VERSION = '0.38'; use base 'Exporter'; @YAML::XS::EXPORT = qw(Load Dump); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-LibYAML-0.37/t/code.t new/YAML-LibYAML-0.38/t/code.t --- old/YAML-LibYAML-0.37/t/code.t 2011-04-03 18:28:08.000000000 +0200 +++ new/YAML-LibYAML-0.38/t/code.t 2012-01-04 07:52:00.000000000 +0100 @@ -18,11 +18,17 @@ --- !!perl/code:Barry::White |- { use warnings; - use strict 'refs'; + use strict; print "Bye.\n"; } ... +use B::Deparse; +if (new B::Deparse -> coderef2text ( sub { no strict; 1; use strict; 1; }) + =~ 'refs') { + $yaml =~ s/use strict/use strict 'refs'/g; +} + $YAML::XS::DumpCode = 1; is Dump($sub), $yaml, "Dumping a blessed code ref works (with B::Deparse)"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-LibYAML-0.37/t/long_plain_wrap.t new/YAML-LibYAML-0.38/t/long_plain_wrap.t --- old/YAML-LibYAML-0.37/t/long_plain_wrap.t 1970-01-01 01:00:00.000000000 +0100 +++ new/YAML-LibYAML-0.38/t/long_plain_wrap.t 2012-01-04 07:55:42.000000000 +0100 @@ -0,0 +1,12 @@ +use Test::More; # tests => 1; + +use YAML::XS; + +plan skip_all => 'Failing test. Not yet implemented'; + +my $p = {my_key => "When foo or foobar is used, everyone understands that these are just examples, and they dont really exist."}; +my $e = <<'...'; +--- +my_key: When foo or foobar is used, everyone understands that these are just examples, and they dont really exist. +... +is Dump($p), $e, "Long plain scalars don't wrap"; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de