May 2011 - openSUSE Commits - openSUSE Mailing Lists

commit mx for openSUSE:Factory
by root＠hilbert.suse.de 31 May '11

31 May '11

Hello community, here is the log from the commit of package mx for openSUSE:Factory checked in at Tue May 31 17:17:33 CEST 2011. -------- --- mx/mx.changes 2011-04-28 08:42:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/mx/mx.changes 2011-05-26 21:59:26.000000000 +0200 @@ -1,0 +2,17 @@ +Wed May 18 07:50:24 CEST 2011 - dimstar(a)opensuse.org + +- Update to version 1.1.12: + + Apply the paint opacity to both textures correctly in MxImage + + Draw rectangles around actors when using the layout debug flag + + MxBin: + - don't request space for the child when it is not visible + - hide the label when it is empty or no text has been set + + Don't animate MxToggle if it is not mapped + + Remove the hover state from MxToggle if the pointer left during + a drag + + Add a function to MxImage to animate changing the scale mode + + Update documentation + + Bugs fixed: bco#2470, bco#2609, bco#2613, bco#2618, bco#2635, + bco#2636, bco#2641, bco#2642. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- mx-1.1.11.tar.bz2 New: ---- mx-1.1.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mx.spec ++++++ --- /var/tmp/diff_new_pack.jNCcwR/_old 2011-05-31 17:17:14.000000000 +0200 +++ /var/tmp/diff_new_pack.jNCcwR/_new 2011-05-31 17:17:14.000000000 +0200 @@ -18,7 +18,7 @@ Name: mx -Version: 1.1.11 +Version: 1.1.12 Release: 1 License: LGPLv2.1 Summary: Clutter-based Toolkit ++++++ mx-1.1.11.tar.bz2 -> mx-1.1.12.tar.bz2 ++++++ ++++ 69960 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nagios-nrpe for openSUSE:Factory
by root＠hilbert.suse.de 31 May '11

31 May '11

Hello community, here is the log from the commit of package nagios-nrpe for openSUSE:Factory checked in at Tue May 31 17:17:04 CEST 2011. -------- --- nagios-nrpe/nagios-nrpe.changes 2011-02-10 01:03:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/nagios-nrpe/nagios-nrpe.changes 2011-05-30 17:38:06.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 30 14:43:59 UTC 2011 - lrupp(a)suse.de + +- specfile cleanup using spec-cleaner (add comments to patches) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios-nrpe.spec ++++++ --- /var/tmp/diff_new_pack.Kk4W0o/_old 2011-05-31 17:12:41.000000000 +0200 +++ /var/tmp/diff_new_pack.Kk4W0o/_new 2011-05-31 17:12:41.000000000 +0200 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild # default %define nagios3only 0 @@ -27,38 +26,56 @@ %define _libexecdir %{_prefix}/lib/nagios/plugins Name: nagios-nrpe -Summary: Nagios Remote Plug-In Executor Version: 2.12 -Release: 18 +Release: 25 License: GPLv2+ -Group: System/Monitoring +Summary: Nagios Remote Plug-In Executor Url: http://www.nagios.org/ -Source0: nrpe-%version.tar.bz2 +Group: System/Monitoring +Source0: nrpe-%{version}.tar.bz2 Source1: nrpe.init Source2: nagios-nrpe-rpmlintrc Source3: nagios-nrpe-SuSEfirewall2 Source4: nrpe.8 Source10: README.SuSE +# PATCH-FIX-openSUSE change the installation order Patch0: nrpe-2.12-Makefile.patch +# PATCH-FIX-openSUSE place the service disabled in the directory Patch1: nrpe-2.12-xinetd.patch +# PATCH-FIX-openSUSE adapts NRPE to support the standard buffersize of Nagios 3.x Patch2: nagios-nrpe-buffersize.patch +# PATCH-FIX-UPSTREAM produce more randomness and do not reduce entropy on Linux kernels Patch3: nrpe-more_random.patch +# PATCH-FIX-UPSTREAM improve help output of nrpe and check_nrpe Patch4: nrpe-improved_help.patch +# PATCH-FIX-UPSTREAM null buffer before using it Patch5: nrpe-weird_output.patch +# PATCH-FIX-UPSTREAM drop privileges before writing the pidfile for more safety Patch6: nrpe-drop_privileges_before_writing_pidfile.patch +# PATCH-FIX-UPSTREAM compiler complains about this unused variable Patch7: nrpe-unused_variable.patch +# PATCH-FIX-UPSTREAM fix compiler warnings Patch8: nrpe-return_value.patch +# PATCH-FIX-UPSTREAM fix compiler warnings Patch9: nrpe-uninitialized_variable.patch +# PATCH-FIX-openSUSE fix pathnames for nrpe_check_control command Patch10: nrpe_check_control.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: %insserv_prereq %fillup_prereq -PreReq: coreutils grep pwdutils sed netcfg +PreReq: %fillup_prereq +PreReq: %insserv_prereq PreReq: /bin/logger +PreReq: coreutils +PreReq: grep +PreReq: netcfg +PreReq: pwdutils +PreReq: sed +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1130 -PreReq: sysvinit(network) sysvinit(syslog) +PreReq: sysvinit(network) +PreReq: sysvinit(syslog) %endif # -BuildRequires: nagios-plugins tcpd-devel +BuildRequires: nagios-plugins +BuildRequires: tcpd-devel # %if 0%{?suse_version} > 1000 BuildRequires: krb5-devel @@ -67,7 +84,8 @@ %endif # %if 0%{?suse_version} > 1020 -BuildRequires: libopenssl-devel openssl +BuildRequires: libopenssl-devel +BuildRequires: openssl %else BuildRequires: openssl-devel %endif @@ -89,12 +107,6 @@ This package contains the software for NRPE server. It could be run by inet-daemon or as stand-alone daemon - - -Authors: --------- - Ethan Galstad <nagios(a)nagios.org> - %package doc License: GPLv2+ Summary: Nagios Remote Plug-In Executor documentation @@ -104,12 +116,6 @@ This package contains the README files, OpenOffice and PDF documentation for the remote plugin executor (NRPE) for nagios. - - -Authors: --------- - Ethan Galstad <nagios(a)nagios.org> - %package -n nagios-plugins-nrpe License: GPLv2+ Summary: Nagios NRPE plugin @@ -131,14 +137,8 @@ The plugin then uses the output and return code from the plugin execution on the remote host for its own output and return code. - - -Authors: --------- - Ethan Galstad <nagios(a)nagios.org> - %prep -%setup -n nrpe-%version +%setup -n nrpe-%{version} %patch0 -p1 %patch1 -p1 %if %{nagios3only} @@ -152,20 +152,20 @@ %patch8 -p0 %patch9 -p0 %patch10 -p0 -%{__cp} -a %{S:10} . +cp -a %{SOURCE10} . %build -%configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -D_GNU_SOURCE" \ - --sbindir=%_prefix/lib/nagios/cgi \ - --libexecdir=%_libexecdir \ - --datadir=%_datadir/nagios \ - --sysconfdir=%_sysconfdir/nagios \ +%configure CFLAGS="%{optflags} -fno-strict-aliasing -D_GNU_SOURCE" \ + --sbindir=%{_prefix}/lib/nagios/cgi \ + --libexecdir=%{_libexecdir} \ + --datadir=%{_datadir}/nagios \ + --sysconfdir=%{_sysconfdir}/nagios \ --localstatedir=/var/log/nagios \ - --exec-prefix=%_sbindir \ - --bindir=%_sbindir \ + --exec-prefix=%{_sbindir} \ + --bindir=%{_sbindir} \ --with-log_facility=daemon \ - --with-kerberos-inc=%_includedir \ - --with-init-dir=%_sysconfdir/init.d \ + --with-kerberos-inc=%{_includedir} \ + --with-init-dir=%{_sysconfdir}/init.d \ --with-nagios-user=%nsusr \ --with-nagios-group=%nsgrp \ --with-nrpe-user=%nsusr \ @@ -173,39 +173,39 @@ --with-nrpe-port=%nrpeport \ --enable-command-args \ --enable-ssl -make %{?jobs:-j%jobs} all +make %{?_smp_mflags} all gcc %{optflags} -o contrib/nrpe_check_control contrib/nrpe_check_control.c %install -%{__make} install-all \ - DESTDIR="%buildroot" \ +make install-all \ + DESTDIR=%{buildroot} \ INSTALL_OPTS="" \ COMMAND_OPTS="" \ - CGICFGDIR="%_sysconfdir/nagios" \ + CGICFGDIR="%{_sysconfdir}/nagios" \ NAGIOS_INSTALL_OPTS="" \ NRPE_INSTALL_OPTS="" \ INIT_OPTS="" -%{__install} -d %buildroot/var/run/nagios -%{__install} -Dm 644 %{S:4} %buildroot%_mandir/man8/nrpe.8 -%{__install} -Dm 755 %{S:1} %buildroot%_sysconfdir/init.d/nrpe -%{__ln_s} -f ../../etc/init.d/nrpe %buildroot%_sbindir/rcnrpe +install -d %{buildroot}%{_localstatedir}/run/nagios +install -Dm 644 %{SOURCE4} %{buildroot}%{_mandir}/man8/nrpe.8 +install -Dm 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/nrpe +ln -s -f ../../etc/init.d/nrpe %{buildroot}%{_sbindir}/rcnrpe # install SuSEfirewall2 script %if 0%{?suse_version} > 1020 -install -Dm644 %{S:3} %buildroot/%_sysconfdir/sysconfig/SuSEfirewall2.d/services/nrpe-service +install -Dm644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nrpe-service %endif # fix pid_file in nrpe.cfg -%{__sed} -i -e "s,^$pid_file=$.*,\1/var/run/nrpe/nrpe.pid," %buildroot/%_sysconfdir/nagios/nrpe.cfg +sed -i -e "s,^$pid_file=$.*,\1/var/run/nrpe/nrpe.pid," %{buildroot}/%{_sysconfdir}/nagios/nrpe.cfg # create directory and pidfile (package them as ghost) -%{__mkdir_p} %{buildroot}/var/run/nrpe -touch %{buildroot}/var/run/nrpe/nrpe.pid +mkdir -p %{buildroot}%{_localstatedir}/run/nrpe +touch %{buildroot}%{_localstatedir}/run/nrpe/nrpe.pid # create home directory of nagios user -mkdir -p %buildroot/var/lib/nagios +mkdir -p %{buildroot}%{_localstatedir}/lib/nagios # create contrib plugin install -m0755 contrib/nrpe_check_control %{buildroot}%{_libexecdir}/nrpe_check_control @@ -226,7 +226,7 @@ : OK group %nsgrp already present else groupadd -r %nsgrp 2>/dev/null || : - %nnmmsg "Added group %nsgrp for package %name" + %nnmmsg "Added group %nsgrp for package %{name}" fi # default user: nagios if @@ -235,7 +235,7 @@ : OK user %nsusr already present else useradd -r -o -g %nsgrp -s /bin/false -c "User for Nagios" -d /var/lib/nagios %nsusr 2> /dev/null || : - %nnmmsg "Added user %nsusr for package %name" + %nnmmsg "Added user %nsusr for package %{name}" fi # check if the port for nrpe is already defined in /etc/services if grep -q %nrpeport /etc/services ; then @@ -256,24 +256,24 @@ %insserv_cleanup %clean -%{__rm} -rf %buildroot +rm -rf %{buildroot} %files %defattr(-,root,root) %doc README.SuSE -%_mandir/man8/nrpe.8* -%dir %_sysconfdir/nagios/ -%dir /var/lib/nagios -%config(noreplace) %_sysconfdir/nagios/nrpe.cfg -%config(noreplace) %_sysconfdir/xinetd.d/nrpe +%{_mandir}/man8/nrpe.8* +%dir %{_sysconfdir}/nagios/ +%dir %{_localstatedir}/lib/nagios +%config(noreplace) %{_sysconfdir}/nagios/nrpe.cfg +%config(noreplace) %{_sysconfdir}/xinetd.d/nrpe %if 0%{?suse_version} > 1020 -%config %_sysconfdir/sysconfig/SuSEfirewall2.d/services/nrpe-service +%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nrpe-service %endif -%_sysconfdir/init.d/nrpe -%_sbindir/nrpe -%_sbindir/rcnrpe -%ghost %dir /var/run/nrpe -%ghost /var/run/nrpe/nrpe.pid +%{_sysconfdir}/init.d/nrpe +%{_sbindir}/nrpe +%{_sbindir}/rcnrpe +%ghost %dir %{_localstatedir}/run/nrpe +%ghost %{_localstatedir}/run/nrpe/nrpe.pid %files doc %defattr(644,root,root,755) @@ -282,7 +282,7 @@ %files -n nagios-plugins-nrpe %defattr(-,root,root) %doc contrib/README.nrpe_check_control -%_libexecdir/check_nrpe +%{_libexecdir}/check_nrpe %dir %{_sysconfdir}/nagios/objects %config(noreplace) %{_sysconfdir}/nagios/objects/nrpe_check_control.cfg %{_libexecdir}/nrpe_check_control ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-B-Utils for openSUSE:Factory
by root＠hilbert.suse.de 31 May '11

31 May '11

Hello community, here is the log from the commit of package perl-B-Utils for openSUSE:Factory checked in at Tue May 31 17:10:18 CEST 2011. -------- --- perl-B-Utils/perl-B-Utils.changes 2011-04-04 19:16:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-B-Utils/perl-B-Utils.changes 2011-05-30 17:20:34.000000000 +0200 @@ -1,0 +2,7 @@ +Mon May 30 15:19:57 UTC 2011 - coolo(a)novell.com + +- updated to 0.15 + - Try harder to add ExtUtils::Depends to META.yml's + configure_requires + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- B-Utils-0.14.tar.gz New: ---- B-Utils-0.15.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-B-Utils.spec ++++++ --- /var/tmp/diff_new_pack.ZMqVPl/_old 2011-05-31 17:09:31.000000000 +0200 +++ /var/tmp/diff_new_pack.ZMqVPl/_new 2011-05-31 17:09:31.000000000 +0200 @@ -18,38 +18,25 @@ Name: perl-B-Utils -Version: 0.14 +Version: 0.15 Release: 1 License: GPL+ or Artistic %define cpan_name B-Utils Summary: Helper functions for op tree manipulation Url: http://search.cpan.org/dist/B-Utils/ Group: Development/Libraries/Perl -#Source: http://www.cpan.org/authors/id/J/JJ/JJORE/B-Utils-%{version}.tar.gz -Source: %{cpan_name}-%{version}.tar.gz +Source: http://www.cpan.org/authors/id/J/JJ/JJORE/%{cpan_name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -BuildRequires: perl(B) -BuildRequires: perl(Carp) -BuildRequires: perl(DynaLoader) -BuildRequires: perl(Exporter) -BuildRequires: perl(List::Util) -BuildRequires: perl(Scalar::Util) -BuildRequires: perl(ExtUtils::Depends) -BuildRequires: perl(vars) -Requires: perl(B) -Requires: perl(Carp) -Requires: perl(DynaLoader) -Requires: perl(Exporter) -Requires: perl(List::Util) -Requires: perl(Scalar::Util) -Requires: perl(ExtUtils::Depends) -Requires: perl(vars) +BuildRequires: perl(ExtUtils::CBuilder) +BuildRequires: perl(ExtUtils::Depends) >= 0.301 +BuildRequires: perl(Task::Weaken) +Requires: perl(Task::Weaken) %{perl_requires} %description -sorry, no description found +Helper functions for op tree manipulation %prep %setup -q -n %{cpan_name}-%{version} @@ -70,7 +57,7 @@ %{__rm} -rf %{buildroot} %files -f %{name}.files -%defattr(644,root,root,755) +%defattr(-,root,root,755) %doc build Changes LICENSE README weaver.ini xt %changelog ++++++ B-Utils-0.14.tar.gz -> B-Utils-0.15.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/B-Utils-0.14/Changes new/B-Utils-0.15/Changes --- old/B-Utils-0.14/Changes 2011-03-19 07:26:39.000000000 +0100 +++ new/B-Utils-0.15/Changes 2011-04-19 04:26:15.000000000 +0200 @@ -1,5 +1,8 @@ Revision history for Perl extension B::Utils. +0.15 Mon Apr 18 2011 + - Try harder to add ExtUtils::Depends to META.yml's configure_requires + 0.14 Sat Mar 18 2011 - Predeclare carp and croak with proper signature - Add ExtUtils::Depends to META.yml's configure_requires diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/B-Utils-0.14/META.yml new/B-Utils-0.15/META.yml --- old/B-Utils-0.14/META.yml 2011-03-19 07:26:40.000000000 +0100 +++ new/B-Utils-0.15/META.yml 2011-04-19 04:26:16.000000000 +0200 @@ -3,7 +3,11 @@ author: - 'Josh Jore <jjore(a)cpan.org>' build_requires: + ExtUtils::CBuilder: 0 Test::More: 0 +configure_requires: + ExtUtils::CBuilder: 0 + ExtUtils::Depends: 0.301 dynamic_config: 0 generated_by: 'Dist::Zilla version 4.200000, CPAN::Meta::Converter version 2.102400' license: perl @@ -12,17 +16,12 @@ version: 1.4 name: B-Utils requires: - B: 0 - Carp: 0 - DynaLoader: 0 Exporter: 0 - List::Util: 0 Scalar::Util: 0 - perl: 5.006 - subs: 0 - vars: 0 + Task::Weaken: 0 + perl: 5.6.0 resources: bugtracker: https://rt.cpan.org/Public/Dist/Display.html?Name=B-Utils homepage: http://search.cpan.org/dist/B-Utils repository: git://github.com/jbenjore/b-utils.git -version: 0.14 +version: 0.15 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/B-Utils-0.14/README new/B-Utils-0.15/README --- old/B-Utils-0.14/README 2011-03-19 07:26:40.000000000 +0100 +++ new/B-Utils-0.15/README 2011-04-19 04:26:16.000000000 +0200 @@ -1,7 +1,7 @@ This archive contains the distribution B-Utils, -version 0.14: +version 0.15: Helper functions for op tree manipulation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/B-Utils-0.14/dist.ini new/B-Utils-0.15/dist.ini --- old/B-Utils-0.14/dist.ini 2011-03-19 07:26:39.000000000 +0100 +++ new/B-Utils-0.15/dist.ini 2011-04-19 04:26:15.000000000 +0200 @@ -4,13 +4,23 @@ copyright_holder = Josh Jore copyright_year = 2011 -version = 0.14 +version = 0.15 -[Prereqs] +[Prereqs / ConfigureRequires] +ExtUtils::Depends = 0.301 +ExtUtils::CBuilder = 0 + +[Prereqs / BuildRequires] +Test::More = 0 +ExtUtils::CBuilder = 0 + +[Prereqs / RuntimeRequires] perl = 5.6.0 +Scalar::Util = 0 +Task::Weaken = 0 +Exporter = 0 [@Git] -[AutoPrereqs] [AutoMetaResources] bugtracker.rt = 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/B-Utils-0.14/lib/B/Utils/OP.pm new/B-Utils-0.15/lib/B/Utils/OP.pm --- old/B-Utils-0.14/lib/B/Utils/OP.pm 2011-03-19 07:26:39.000000000 +0100 +++ new/B-Utils-0.15/lib/B/Utils/OP.pm 2011-04-19 04:26:15.000000000 +0200 @@ -8,7 +8,7 @@ our @ISA = 'Exporter'; require Exporter; -our $VERSION = '0.14'; +our $VERSION = '0.15'; our @EXPORT = qw(parent_op return_op); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/B-Utils-0.14/lib/B/Utils.pm new/B-Utils-0.15/lib/B/Utils.pm --- old/B-Utils-0.14/lib/B/Utils.pm 2011-03-19 07:26:39.000000000 +0100 +++ new/B-Utils-0.15/lib/B/Utils.pm 2011-04-19 04:26:15.000000000 +0200 @@ -29,11 +29,11 @@ =head1 VERSION -0.14 +0.15 =cut -$VERSION = '0.14'; +$VERSION = '0.15'; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Catalyst-Manual for openSUSE:Factory
by root＠hilbert.suse.de 31 May '11

31 May '11

Hello community, here is the log from the commit of package perl-Catalyst-Manual for openSUSE:Factory checked in at Tue May 31 17:09:22 CEST 2011. -------- --- perl-Catalyst-Manual/perl-Catalyst-Manual.changes 2011-01-19 13:43:57.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-Catalyst-Manual/perl-Catalyst-Manual.changes 2011-05-01 12:41:48.000000000 +0200 @@ -1,0 +2,27 @@ +Sun May 1 10:37:02 UTC 2011 - coolo(a)opensuse.org + +- updated to 5.8007 + - Tutorial + - Switch to use of DBIx::Class::PassphraseColumn for hashed & salted + passwords. It's much more flexible than the previously used + DBIx::Class::EncodedColumn. + + - Fix metadata to refer to the new git repository + - Cookbook + - Small fixes and typos + - Tutorial + - Various typo fixes. + - RT #57989: typo + - RT #61486: correct instructions for MySQL + - RT #62095: prevent XSS + - RT #62095: persistent message on /login + - RT #63057: typo + - RT #64087: typos + - RT #64126: Use precise name of licence + - RT #64126: typos + - RT #67820: fix relationship decleration + - Do not recommend FastMmap + - DevelopmentProcess + - RT #62610: typo + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Catalyst-Manual-5.8005.tar.bz2 New: ---- Catalyst-Manual-5.8007.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Catalyst-Manual.spec ++++++ --- /var/tmp/diff_new_pack.SO0XVQ/_old 2011-05-31 17:08:56.000000000 +0200 +++ /var/tmp/diff_new_pack.SO0XVQ/_new 2011-05-31 17:08:56.000000000 +0200 @@ -18,23 +18,22 @@ Name: perl-Catalyst-Manual -Version: 5.8005 +Version: 5.8007 Release: 1 License: GPL+ or Artistic %define cpan_name Catalyst-Manual Summary: The Catalyst developer's manual Url: http://search.cpan.org/dist/Catalyst-Manual/ Group: Development/Libraries/Perl -#Source: http://www.cpan.org/authors/id/Z/ZA/ZARQUON/Catalyst-Manual-%{version}.tar.… -Source: %{cpan_name}-%{version}.tar.bz2 +Source: http://www.cpan.org/authors/id/B/BO/BOBTFISH/%{cpan_name}-%{version}.tar.gz +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch %{perl_requires} %description -sorry, no description found +The Catalyst developer's manual %prep %setup -q -n %{cpan_name}-%{version} @@ -55,7 +54,7 @@ %{__rm} -rf %{buildroot} %files -f %{name}.files -%defattr(644,root,root,755) +%defattr(-,root,root,755) %doc Changes README TODO %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Class-Method-Modifiers for openSUSE:Factory
by root＠hilbert.suse.de 31 May '11

31 May '11

Hello community, here is the log from the commit of package perl-Class-Method-Modifiers for openSUSE:Factory checked in at Tue May 31 17:08:46 CEST 2011. -------- --- perl-Class-Method-Modifiers/perl-Class-Method-Modifiers.changes 2010-11-30 20:24:21.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-Class-Method-Modifiers/perl-Class-Method-Modifiers.changes 2011-05-11 16:58:26.000000000 +0200 @@ -1,0 +2,8 @@ +Wed May 11 14:54:44 UTC 2011 - dbahi(a)novell.com + +- 1.07 Wed Feb 23 2011 + Move from Test::Exception to Test::Fatal (Justin Hunter) +- 1.06 Fri Nov 26 2010 + Add support for: modifier ["name1", "name2"] => sub {} + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Class-Method-Modifiers-1.05.tar.bz2 New: ---- Class-Method-Modifiers-1.07.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Class-Method-Modifiers.spec ++++++ --- /var/tmp/diff_new_pack.GWraig/_old 2011-05-31 17:06:54.000000000 +0200 +++ /var/tmp/diff_new_pack.GWraig/_new 2011-05-31 17:06:54.000000000 +0200 @@ -21,7 +21,7 @@ Name: perl-Class-Method-Modifiers %define cpan_name Class-Method-Modifiers Summary: Provides Moose-like method modifiers -Version: 1.05 +Version: 1.07 Release: 1 License: GPL+ or Artistic Group: Development/Libraries/Perl @@ -33,7 +33,7 @@ %{perl_requires} BuildRequires: perl BuildRequires: perl-macros -BuildRequires: perl(Test::Exception) +BuildRequires: perl(Test::Fatal) %description Method modifiers are a powerful feature from the CLOS (Common Lisp Object ++++++ Class-Method-Modifiers-1.05.tar.bz2 -> Class-Method-Modifiers-1.07.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Method-Modifiers-1.05/Changes new/Class-Method-Modifiers-1.07/Changes --- old/Class-Method-Modifiers-1.05/Changes 2009-10-21 20:01:59.000000000 +0200 +++ new/Class-Method-Modifiers-1.07/Changes 2011-02-24 05:54:25.000000000 +0100 @@ -1,5 +1,11 @@ Revision history for Class-Method-Modifiers +1.07 Wed Feb 23 2011 + Move from Test::Exception to Test::Fatal (Justin Hunter) + +1.06 Fri Nov 26 2010 + Add support for: modifier ["name1", "name2"] => sub {} + 1.05 Wed Oct 21 14:01:11 2009 Add install_modifier as a public API (Goro Fuji) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Method-Modifiers-1.05/MANIFEST new/Class-Method-Modifiers-1.07/MANIFEST --- old/Class-Method-Modifiers-1.05/MANIFEST 2009-10-21 20:04:35.000000000 +0200 +++ new/Class-Method-Modifiers-1.07/MANIFEST 2011-02-24 05:55:38.000000000 +0100 @@ -36,4 +36,3 @@ t/081-sub-and-modifier.t t/090-diamond.t t/100-class-mop-method-modifiers.t -t/101-bank-account.t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Method-Modifiers-1.05/META.yml new/Class-Method-Modifiers-1.07/META.yml --- old/Class-Method-Modifiers-1.05/META.yml 2009-10-21 20:04:26.000000000 +0200 +++ new/Class-Method-Modifiers-1.07/META.yml 2011-02-24 05:55:20.000000000 +0100 @@ -4,11 +4,11 @@ - 'Shawn M Moore, C<sartak(a)gmail.com>' build_requires: ExtUtils::MakeMaker: 6.42 - Test::Exception: 0 + Test::Fatal: 0 configure_requires: ExtUtils::MakeMaker: 6.42 distribution_type: module -generated_by: 'Module::Install version 0.91' +generated_by: 'Module::Install version 1.00' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -22,4 +22,4 @@ homepage: http://github.com/sartak/Class-Method-Modifiers/tree license: http://dev.perl.org/licenses/ repository: git://github.com/sartak/Class-Method-Modifiers.git -version: 1.05 +version: 1.07 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Method-Modifiers-1.05/Makefile.PL new/Class-Method-Modifiers-1.07/Makefile.PL --- old/Class-Method-Modifiers-1.05/Makefile.PL 2009-06-14 20:38:39.000000000 +0200 +++ new/Class-Method-Modifiers-1.07/Makefile.PL 2011-02-24 05:50:59.000000000 +0100 @@ -6,7 +6,7 @@ all_from 'lib/Class/Method/Modifiers.pm'; githubmeta; -build_requires 'Test::Exception'; +build_requires 'Test::Fatal'; WriteAll; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Method-Modifiers-1.05/inc/Module/Install/Base.pm new/Class-Method-Modifiers-1.07/inc/Module/Install/Base.pm --- old/Class-Method-Modifiers-1.05/inc/Module/Install/Base.pm 2009-10-21 20:04:24.000000000 +0200 +++ new/Class-Method-Modifiers-1.07/inc/Module/Install/Base.pm 2011-02-24 05:55:20.000000000 +0100 @@ -4,7 +4,7 @@ use strict 'vars'; use vars qw{$VERSION}; BEGIN { - $VERSION = '0.91'; + $VERSION = '1.00'; } # Suspend handler for "redefined" warnings @@ -51,13 +51,18 @@ #line 106 sub is_admin { - $_[0]->admin->VERSION; + ! $_[0]->admin->isa('Module::Install::Base::FakeAdmin'); } sub DESTROY {} package Module::Install::Base::FakeAdmin; +use vars qw{$VERSION}; +BEGIN { + $VERSION = $Module::Install::Base::VERSION; +} + my $fake; sub new { @@ -75,4 +80,4 @@ 1; -#line 154 +#line 159 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Method-Modifiers-1.05/inc/Module/Install/Can.pm new/Class-Method-Modifiers-1.07/inc/Module/Install/Can.pm --- old/Class-Method-Modifiers-1.05/inc/Module/Install/Can.pm 2009-10-21 20:04:25.000000000 +0200 +++ new/Class-Method-Modifiers-1.07/inc/Module/Install/Can.pm 2011-02-24 05:55:20.000000000 +0100 @@ -9,7 +9,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.91'; + $VERSION = '1.00'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Method-Modifiers-1.05/inc/Module/Install/Fetch.pm new/Class-Method-Modifiers-1.07/inc/Module/Install/Fetch.pm --- old/Class-Method-Modifiers-1.05/inc/Module/Install/Fetch.pm 2009-10-21 20:04:26.000000000 +0200 +++ new/Class-Method-Modifiers-1.07/inc/Module/Install/Fetch.pm 2011-02-24 05:55:20.000000000 +0100 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.91'; + $VERSION = '1.00'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Method-Modifiers-1.05/inc/Module/Install/GithubMeta.pm new/Class-Method-Modifiers-1.07/inc/Module/Install/GithubMeta.pm --- old/Class-Method-Modifiers-1.05/inc/Module/Install/GithubMeta.pm 2009-10-21 20:04:24.000000000 +0200 +++ new/Class-Method-Modifiers-1.07/inc/Module/Install/GithubMeta.pm 2011-02-24 05:55:20.000000000 +0100 @@ -7,14 +7,14 @@ use base qw(Module::Install::Base); use vars qw($VERSION); -$VERSION = '0.08'; +$VERSION = '0.10'; 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 origin` =~ /URL: (.*)$/m; + return unless my ($git_url) = `git remote show -n origin` =~ /URL: (.*)$/m; return unless $git_url =~ /github\.com/; # Not a Github repository my $http_url = $git_url; $git_url =~ s![\w\-]+\@([^:]+):!git://$1/!; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Method-Modifiers-1.05/inc/Module/Install/Makefile.pm new/Class-Method-Modifiers-1.07/inc/Module/Install/Makefile.pm --- old/Class-Method-Modifiers-1.05/inc/Module/Install/Makefile.pm 2009-10-21 20:04:26.000000000 +0200 +++ new/Class-Method-Modifiers-1.07/inc/Module/Install/Makefile.pm 2011-02-24 05:55:20.000000000 +0100 @@ -4,10 +4,11 @@ use strict 'vars'; use ExtUtils::MakeMaker (); use Module::Install::Base (); +use Fcntl qw/:flock :seek/; use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.91'; + $VERSION = '1.00'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } @@ -25,8 +26,8 @@ die "Caught an potential prompt infinite loop ($c[1]|$c[2]|$_[0])"; } - # In automated testing, always use defaults - if ( $ENV{AUTOMATED_TESTING} and ! $ENV{PERL_MM_USE_DEFAULT} ) { + # In automated testing or non-interactive session, always use defaults + if ( ($ENV{AUTOMATED_TESTING} or -! -t STDIN) and ! $ENV{PERL_MM_USE_DEFAULT} ) { local $ENV{PERL_MM_USE_DEFAULT} = 1; goto &ExtUtils::MakeMaker::prompt; } else { @@ -34,21 +35,112 @@ } } +# Store a cleaned up version of the MakeMaker version, +# since we need to behave differently in a variety of +# ways based on the MM version. +my $makemaker = eval $ExtUtils::MakeMaker::VERSION; + +# If we are passed a param, do a "newer than" comparison. +# Otherwise, just return the MakeMaker version. +sub makemaker { + ( @_ < 2 or $makemaker >= eval($_[1]) ) ? $makemaker : 0 +} + +# Ripped from ExtUtils::MakeMaker 6.56, and slightly modified +# as we only need to know here whether the attribute is an array +# or a hash or something else (which may or may not be appendable). +my %makemaker_argtype = ( + C => 'ARRAY', + CONFIG => 'ARRAY', +# CONFIGURE => 'CODE', # ignore + DIR => 'ARRAY', + DL_FUNCS => 'HASH', + DL_VARS => 'ARRAY', + EXCLUDE_EXT => 'ARRAY', + EXE_FILES => 'ARRAY', + FUNCLIST => 'ARRAY', + H => 'ARRAY', + IMPORTS => 'HASH', + INCLUDE_EXT => 'ARRAY', + LIBS => 'ARRAY', # ignore '' + MAN1PODS => 'HASH', + MAN3PODS => 'HASH', + META_ADD => 'HASH', + META_MERGE => 'HASH', + PL_FILES => 'HASH', + PM => 'HASH', + PMLIBDIRS => 'ARRAY', + PMLIBPARENTDIRS => 'ARRAY', + PREREQ_PM => 'HASH', + CONFIGURE_REQUIRES => 'HASH', + SKIP => 'ARRAY', + TYPEMAPS => 'ARRAY', + XS => 'HASH', +# VERSION => ['version',''], # ignore +# _KEEP_AFTER_FLUSH => '', + + clean => 'HASH', + depend => 'HASH', + dist => 'HASH', + dynamic_lib=> 'HASH', + linkext => 'HASH', + macro => 'HASH', + postamble => 'HASH', + realclean => 'HASH', + test => 'HASH', + tool_autosplit => 'HASH', + + # special cases where you can use makemaker_append + CCFLAGS => 'APPENDABLE', + DEFINE => 'APPENDABLE', + INC => 'APPENDABLE', + LDDLFLAGS => 'APPENDABLE', + LDFROM => 'APPENDABLE', +); + sub makemaker_args { - my $self = shift; + my ($self, %new_args) = @_; my $args = ( $self->{makemaker_args} ||= {} ); - %$args = ( %$args, @_ ); + foreach my $key (keys %new_args) { + if ($makemaker_argtype{$key}) { + if ($makemaker_argtype{$key} eq 'ARRAY') { + $args->{$key} = [] unless defined $args->{$key}; + unless (ref $args->{$key} eq 'ARRAY') { + $args->{$key} = [$args->{$key}] + } + push @{$args->{$key}}, + ref $new_args{$key} eq 'ARRAY' + ? @{$new_args{$key}} + : $new_args{$key}; + } + elsif ($makemaker_argtype{$key} eq 'HASH') { + $args->{$key} = {} unless defined $args->{$key}; + foreach my $skey (keys %{ $new_args{$key} }) { + $args->{$key}{$skey} = $new_args{$key}{$skey}; + } + } + elsif ($makemaker_argtype{$key} eq 'APPENDABLE') { + $self->makemaker_append($key => $new_args{$key}); + } + } + else { + if (defined $args->{$key}) { + warn qq{MakeMaker attribute "$key" is overriden; use "makemaker_append" to append values\n}; + } + $args->{$key} = $new_args{$key}; + } + } return $args; } # For mm args that take multiple space-seperated args, # append an argument to the current list. sub makemaker_append { - my $self = sShift; + my $self = shift; my $name = shift; my $args = $self->makemaker_args; - $args->{name} = defined $args->{$name} - ? join( ' ', $args->{name}, @_ ) + $args->{$name} = defined $args->{$name} + ? join( ' ', $args->{$name}, @_ ) : join( ' ', @_ ); } @@ -89,25 +181,22 @@ $self->makemaker_args( INC => shift ); } -my %test_dir = (); - sub _wanted_t { - /\.t$/ and -f $_ and $test_dir{$File::Find::dir} = 1; } sub tests_recursive { my $self = shift; - if ( $self->tests ) { - die "tests_recursive will not work if tests are already defined"; - } my $dir = shift || 't'; unless ( -d $dir ) { die "tests_recursive dir '$dir' does not exist"; } - %test_dir = (); + my %tests = map { $_ => 1 } split / /, ($self->tests || ''); require File::Find; - File::Find::find( \&_wanted_t, $dir ); - $self->tests( join ' ', map { "$_/*.t" } sort keys %test_dir ); + File::Find::find( + sub { /\.t$/ and -f $_ and $tests{"$File::Find::dir/*.t"} = 1 }, + $dir + ); + $self->tests( join ' ', sort keys %tests ); } sub write { @@ -130,12 +219,13 @@ # an underscore, even though its own version may contain one! # Hence the funny regexp to get rid of it. See RT #35800 # for details. - $self->build_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ ); - $self->configure_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ ); + my $v = $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/; + $self->build_requires( 'ExtUtils::MakeMaker' => $v ); + $self->configure_requires( 'ExtUtils::MakeMaker' => $v ); } else { # Allow legacy-compatibility with 5.005 by depending on the # most recent EU:MM that supported 5.005. - $self->build_requires( 'ExtUtils::MakeMaker' => 6.42 ); + $self->build_requires( 'ExtUtils::MakeMaker' => 6.42 ); $self->configure_requires( 'ExtUtils::MakeMaker' => 6.42 ); } @@ -143,59 +233,115 @@ my $args = $self->makemaker_args; $args->{DISTNAME} = $self->name; $args->{NAME} = $self->module_name || $self->name; - $args->{VERSION} = $self->version; $args->{NAME} =~ s/-/::/g; + $args->{VERSION} = $self->version or die <<'EOT'; +ERROR: Can't determine distribution version. Please specify it +explicitly via 'version' in Makefile.PL, or set a valid $VERSION +in a module, and provide its file path via 'version_from' (or +'all_from' if you prefer) in Makefile.PL. +EOT + + $DB::single = 1; if ( $self->tests ) { - $args->{test} = { TESTS => $self->tests }; + my @tests = split ' ', $self->tests; + my %seen; + $args->{test} = { + TESTS => (join ' ', grep {!$seen{$_}++} @tests), + }; + } elsif ( $Module::Install::ExtraTests::use_extratests ) { + # Module::Install::ExtraTests doesn't set $self->tests and does its own tests via harness. + # So, just ignore our xt tests here. + } elsif ( -d 'xt' and ($Module::Install::AUTHOR or $ENV{RELEASE_TESTING}) ) { + $args->{test} = { + TESTS => join( ' ', map { "$_/*.t" } grep { -d $_ } qw{ t xt } ), + }; } if ( $] >= 5.005 ) { $args->{ABSTRACT} = $self->abstract; - $args->{AUTHOR} = $self->author; + $args->{AUTHOR} = join ', ', @{$self->author || []}; } - if ( eval($ExtUtils::MakeMaker::VERSION) >= 6.10 ) { - $args->{NO_META} = 1; + if ( $self->makemaker(6.10) ) { + $args->{NO_META} = 1; + #$args->{NO_MYMETA} = 1; } - if ( eval($ExtUtils::MakeMaker::VERSION) > 6.17 and $self->sign ) { + if ( $self->makemaker(6.17) and $self->sign ) { $args->{SIGN} = 1; } unless ( $self->is_admin ) { delete $args->{SIGN}; } + if ( $self->makemaker(6.31) and $self->license ) { + $args->{LICENSE} = $self->license; + } - # Merge both kinds of requires into prereq_pm my $prereq = ($args->{PREREQ_PM} ||= {}); %$prereq = ( %$prereq, - map { @$_ } + map { @$_ } # flatten [module => version] map { @$_ } grep $_, - ($self->configure_requires, $self->build_requires, $self->requires) + ($self->requires) ); # Remove any reference to perl, PREREQ_PM doesn't support it delete $args->{PREREQ_PM}->{perl}; - # merge both kinds of requires into prereq_pm - my $subdirs = ($args->{DIR} ||= []); + # Merge both kinds of requires into BUILD_REQUIRES + my $build_prereq = ($args->{BUILD_REQUIRES} ||= {}); + %$build_prereq = ( %$build_prereq, + map { @$_ } # flatten [module => version] + map { @$_ } + grep $_, + ($self->configure_requires, $self->build_requires) + ); + + # Remove any reference to perl, BUILD_REQUIRES doesn't support it + delete $args->{BUILD_REQUIRES}->{perl}; + + # Delete bundled dists from prereq_pm, add it to Makefile DIR + my $subdirs = ($args->{DIR} || []); if ($self->bundles) { + my %processed; foreach my $bundle (@{ $self->bundles }) { - my ($file, $dir) = @$bundle; - push @$subdirs, $dir if -d $dir; - delete $prereq->{$file}; + my ($mod_name, $dist_dir) = @$bundle; + delete $prereq->{$mod_name}; + $dist_dir = File::Basename::basename($dist_dir); # dir for building this module + if (not exists $processed{$dist_dir}) { + if (-d $dist_dir) { + # List as sub-directory to be processed by make + push @$subdirs, $dist_dir; + } + # Else do nothing: the module is already present on the system + $processed{$dist_dir} = undef; + } } } + unless ( $self->makemaker('6.55_03') ) { + %$prereq = (%$prereq,%$build_prereq); + delete $args->{BUILD_REQUIRES}; + } + if ( my $perl_version = $self->perl_version ) { eval "use $perl_version; 1" or die "ERROR: perl: Version $] is installed, " . "but we need version >= $perl_version"; + + if ( $self->makemaker(6.48) ) { + $args->{MIN_PERL_VERSION} = $perl_version; + } } - $args->{INSTALLDIRS} = $self->installdirs; + if ($self->installdirs) { + warn qq{old INSTALLDIRS (probably set by makemaker_args) is overriden by installdirs\n} if $args->{INSTALLDIRS}; + $args->{INSTALLDIRS} = $self->installdirs; + } - my %args = map { ( $_ => $args->{$_} ) } grep {defined($args->{$_})} keys %$args; + my %args = map { + ( $_ => $args->{$_} ) } grep {defined($args->{$_} ) + } keys %$args; my $user_preop = delete $args{dist}->{PREOP}; - if (my $preop = $self->admin->preop($user_preop)) { + if ( my $preop = $self->admin->preop($user_preop) ) { foreach my $key ( keys %$preop ) { $args{dist}->{$key} = $preop->{$key}; } @@ -219,9 +365,9 @@ . ($self->postamble || ''); local *MAKEFILE; - open MAKEFILE, "< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!"; + open MAKEFILE, "+< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!"; + eval { flock MAKEFILE, LOCK_EX }; my $makefile = do { local $/; <MAKEFILE> }; - close MAKEFILE or die $!; $makefile =~ s/\b(test_harness$\$\(TEST_VERBOSE$, )/$1'inc', /; $makefile =~ s/( -I\$$INST_ARCHLIB$)/ -Iinc$1/g; @@ -241,7 +387,8 @@ # XXX - This is currently unused; not sure if it breaks other MM-users # $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg; - open MAKEFILE, "> $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!"; + seek MAKEFILE, 0, SEEK_SET; + truncate MAKEFILE, 0; print MAKEFILE "$preamble$makefile$postamble" or die $!; close MAKEFILE or die $!; @@ -265,4 +412,4 @@ __END__ -#line 394 +#line 541 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Method-Modifiers-1.05/inc/Module/Install/Metadata.pm new/Class-Method-Modifiers-1.07/inc/Module/Install/Metadata.pm --- old/Class-Method-Modifiers-1.05/inc/Module/Install/Metadata.pm 2009-10-21 20:04:24.000000000 +0200 +++ new/Class-Method-Modifiers-1.07/inc/Module/Install/Metadata.pm 2011-02-24 05:55:20.000000000 +0100 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.91'; + $VERSION = '1.00'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } @@ -19,7 +19,6 @@ name module_name abstract - author version distribution_type tests @@ -43,8 +42,11 @@ my @array_keys = qw{ keywords + author }; +*authors = \&author; + sub Meta { shift } sub Meta_BooleanKeys { @boolean_keys } sub Meta_ScalarKeys { @scalar_keys } @@ -176,43 +178,6 @@ $self->{values}->{perl_version} = $version; } -#Stolen from M::B -my %license_urls = ( - perl => 'http://dev.perl.org/licenses/', - apache => 'http://apache.org/licenses/LICENSE-2.0', - artistic => 'http://opensource.org/licenses/artistic-license.php', - artistic_2 => 'http://opensource.org/licenses/artistic-license-2.0.php', - lgpl => 'http://opensource.org/licenses/lgpl-license.php', - lgpl2 => 'http://opensource.org/licenses/lgpl-2.1.php', - lgpl3 => 'http://opensource.org/licenses/lgpl-3.0.html', - bsd => 'http://opensource.org/licenses/bsd-license.php', - gpl => 'http://opensource.org/licenses/gpl-license.php', - gpl2 => 'http://opensource.org/licenses/gpl-2.0.php', - gpl3 => 'http://opensource.org/licenses/gpl-3.0.html', - mit => 'http://opensource.org/licenses/mit-license.php', - mozilla => 'http://opensource.org/licenses/mozilla1.1.php', - open_source => undef, - unrestricted => undef, - restrictive => undef, - unknown => undef, -); - -sub license { - my $self = shift; - return $self->{values}->{license} unless @_; - my $license = shift or die( - 'Did not provide a value to license()' - ); - $self->{values}->{license} = $license; - - # Automatically fill in license URLs - if ( $license_urls{$license} ) { - $self->resources( license => $license_urls{$license} ); - } - - return 1; -} - sub all_from { my ( $self, $file ) = @_; @@ -230,6 +195,8 @@ die("The path '$file' does not exist, or is not a file"); } + $self->{values}{all_from} = $file; + # Some methods pull from POD instead of code. # If there is a matching .pod, use that instead my $pod = $file; @@ -240,7 +207,7 @@ $self->name_from($file) unless $self->name; $self->version_from($file) unless $self->version; $self->perl_version_from($file) unless $self->perl_version; - $self->author_from($pod) unless $self->author; + $self->author_from($pod) unless @{$self->author || []}; $self->license_from($pod) unless $self->license; $self->abstract_from($pod) unless $self->abstract; @@ -350,6 +317,9 @@ require ExtUtils::MM_Unix; my ( $self, $file ) = @_; $self->version( ExtUtils::MM_Unix->parse_version($file) ); + + # for version integrity check + $self->makemaker_args( VERSION_FROM => $file ); } sub abstract_from { @@ -360,7 +330,7 @@ { DISTNAME => $self->name }, 'ExtUtils::MM_Unix' )->parse_abstract($file) - ); + ); } # Add both distribution and module name @@ -385,11 +355,10 @@ } } -sub perl_version_from { - my $self = shift; +sub _extract_perl_version { if ( - Module::Install::_read($_[0]) =~ m/ - ^ + $_[0] =~ m/ + ^\s* (?:use|require) \s* v? ([\d_\.]+) @@ -398,6 +367,16 @@ ) { my $perl_version = $1; $perl_version =~ s{_}{}g; + return $perl_version; + } else { + return; + } +} + +sub perl_version_from { + my $self = shift; + my $perl_version=_extract_perl_version(Module::Install::_read($_[0])); + if ($perl_version) { $self->perl_version($perl_version); } else { warn "Cannot determine perl version info from $_[0]\n"; @@ -417,59 +396,164 @@ ([^\n]*) /ixms) { my $author = $1 || $2; - $author =~ s{E<lt>}{<}g; - $author =~ s{E<gt>}{>}g; + + # XXX: ugly but should work anyway... + if (eval "require Pod::Escapes; 1") { + # Pod::Escapes has a mapping table. + # It's in core of perl >= 5.9.3, and should be installed + # as one of the Pod::Simple's prereqs, which is a prereq + # of Pod::Text 3.x (see also below). + $author =~ s{ E<( (\d+) | ([A-Za-z]+) )> } + { + defined $2 + ? chr($2) + : defined $Pod::Escapes::Name2character_number{$1} + ? chr($Pod::Escapes::Name2character_number{$1}) + : do { + warn "Unknown escape: E<$1>"; + "E<$1>"; + }; + }gex; + } + elsif (eval "require Pod::Text; 1" && $Pod::Text::VERSION < 3) { + # Pod::Text < 3.0 has yet another mapping table, + # though the table name of 2.x and 1.x are different. + # (1.x is in core of Perl < 5.6, 2.x is in core of + # Perl < 5.9.3) + my $mapping = ($Pod::Text::VERSION < 2) + ? \%Pod::Text::HTML_Escapes + : \%Pod::Text::ESCAPES; + $author =~ s{ E<( (\d+) | ([A-Za-z]+) )> } + { + defined $2 + ? chr($2) + : defined $mapping->{$1} + ? $mapping->{$1} + : do { + warn "Unknown escape: E<$1>"; + "E<$1>"; + }; + }gex; + } + else { + $author =~ s{E<lt>}{<}g; + $author =~ s{E<gt>}{>}g; + } $self->author($author); } else { warn "Cannot determine author info from $_[0]\n"; } } -sub license_from { +#Stolen from M::B +my %license_urls = ( + perl => 'http://dev.perl.org/licenses/', + apache => 'http://apache.org/licenses/LICENSE-2.0', + apache_1_1 => 'http://apache.org/licenses/LICENSE-1.1', + artistic => 'http://opensource.org/licenses/artistic-license.php', + artistic_2 => 'http://opensource.org/licenses/artistic-license-2.0.php', + lgpl => 'http://opensource.org/licenses/lgpl-license.php', + lgpl2 => 'http://opensource.org/licenses/lgpl-2.1.php', + lgpl3 => 'http://opensource.org/licenses/lgpl-3.0.html', + bsd => 'http://opensource.org/licenses/bsd-license.php', + gpl => 'http://opensource.org/licenses/gpl-license.php', + gpl2 => 'http://opensource.org/licenses/gpl-2.0.php', + gpl3 => 'http://opensource.org/licenses/gpl-3.0.html', + mit => 'http://opensource.org/licenses/mit-license.php', + mozilla => 'http://opensource.org/licenses/mozilla1.1.php', + open_source => undef, + unrestricted => undef, + restrictive => undef, + unknown => undef, +); + +sub license { my $self = shift; - if ( - Module::Install::_read($_[0]) =~ m/ - ( - =head \d \s+ - (?:licen[cs]e|licensing|copyright|legal)\b - .*? - ) - (=head\\d.*|=cut.*|) - \z - /ixms ) { - my $license_text = $1; - my @phrases = ( - 'under the same (?:terms|license) as (?:perl|the perl programming language) itself' => 'perl', 1, - 'GNU general public license' => 'gpl', 1, - 'GNU public license' => 'gpl', 1, - 'GNU lesser general public license' => 'lgpl', 1, - 'GNU lesser public license' => 'lgpl', 1, - 'GNU library general public license' => 'lgpl', 1, - 'GNU library public license' => 'lgpl', 1, - 'BSD license' => 'bsd', 1, - 'Artistic license' => 'artistic', 1, - 'GPL' => 'gpl', 1, - 'LGPL' => 'lgpl', 1, - 'BSD' => 'bsd', 1, - 'Artistic' => 'artistic', 1, - 'MIT' => 'mit', 1, - 'proprietary' => 'proprietary', 0, - ); - while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) { - $pattern =~ s{\s+}{\\s+}g; - if ( $license_text =~ /\b$pattern\b/i ) { - $self->license($license); - return 1; - } + return $self->{values}->{license} unless @_; + my $license = shift or die( + 'Did not provide a value to license()' + ); + $license = __extract_license($license) || lc $license; + $self->{values}->{license} = $license; + + # Automatically fill in license URLs + if ( $license_urls{$license} ) { + $self->resources( license => $license_urls{$license} ); + } + + return 1; +} + +sub _extract_license { + my $pod = shift; + my $matched; + return __extract_license( + ($matched) = $pod =~ m/ + (=head \d \s+ L(?i:ICEN[CS]E|ICENSING)\b.*?) + (=head \d.*|=cut.*|)\z + /xms + ) || __extract_license( + ($matched) = $pod =~ m/ + (=head \d \s+ (?:C(?i:OPYRIGHTS?)|L(?i:EGAL))\b.*?) + (=head \d.*|=cut.*|)\z + /xms + ); +} + +sub __extract_license { + my $license_text = shift or return; + my @phrases = ( + '(?:under )?the same (?:terms|license) as (?:perl|the perl (?:\d )?programming language)' => 'perl', 1, + '(?:under )?the terms of (?:perl|the perl programming language) itself' => 'perl', 1, + 'Artistic and GPL' => 'perl', 1, + 'GNU general public license' => 'gpl', 1, + 'GNU public license' => 'gpl', 1, + 'GNU lesser general public license' => 'lgpl', 1, + 'GNU lesser public license' => 'lgpl', 1, + 'GNU library general public license' => 'lgpl', 1, + 'GNU library public license' => 'lgpl', 1, + 'GNU Free Documentation license' => 'unrestricted', 1, + 'GNU Affero General Public License' => 'open_source', 1, + '(?:Free)?BSD license' => 'bsd', 1, + 'Artistic license' => 'artistic', 1, + 'Apache (?:Software )?license' => 'apache', 1, + 'GPL' => 'gpl', 1, + 'LGPL' => 'lgpl', 1, + 'BSD' => 'bsd', 1, + 'Artistic' => 'artistic', 1, + 'MIT' => 'mit', 1, + 'Mozilla Public License' => 'mozilla', 1, + 'Q Public License' => 'open_source', 1, + 'OpenSSL License' => 'unrestricted', 1, + 'SSLeay License' => 'unrestricted', 1, + 'zlib License' => 'open_source', 1, + 'proprietary' => 'proprietary', 0, + ); + while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) { + $pattern =~ s#\s+#\\s+#gs; + if ( $license_text =~ /\b$pattern\b/i ) { + return $license; } } + return ''; +} - warn "Cannot determine license info from $_[0]\n"; - return 'unknown'; +sub license_from { + my $self = shift; + if (my $license=_extract_license(Module::Install::_read($_[0]))) { + $self->license($license); + } else { + warn "Cannot determine license info from $_[0]\n"; + return 'unknown'; + } } sub _extract_bugtracker { - my @links = $_[0] =~ m#L<(\Qhttp://rt.cpan.org/\E[^>]+)>#g; + my @links = $_[0] =~ m#L<( + \Qhttp://rt.cpan.org/\E[^>]+| + \Qhttp://github.com/\E[\w_]+/[\w_]+/issues| + \Qhttp://code.google.com/p/\E[\w_\-]+/issues/list + )>#gx; my %links; @links{@links}=(); @links=keys %links; @@ -485,7 +569,7 @@ return 0; } if ( @links > 1 ) { - warn "Found more than on rt.cpan.org link in $_[0]\n"; + warn "Found more than one bugtracker link in $_[0]\n"; return 0; } @@ -532,8 +616,15 @@ return $v; } - - +sub add_metadata { + my $self = shift; + my %hash = @_; + for my $key (keys %hash) { + warn "add_metadata: $key is not prefixed with 'x_'.\n" . + "Use appopriate function to add non-private metadata.\n" unless $key =~ /^x_/; + $self->{values}->{$key} = $hash{$key}; + } +} ###################################################################### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Method-Modifiers-1.05/inc/Module/Install/Win32.pm new/Class-Method-Modifiers-1.07/inc/Module/Install/Win32.pm --- old/Class-Method-Modifiers-1.05/inc/Module/Install/Win32.pm 2009-10-21 20:04:26.000000000 +0200 +++ new/Class-Method-Modifiers-1.07/inc/Module/Install/Win32.pm 2011-02-24 05:55:20.000000000 +0100 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.91'; + $VERSION = '1.00'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Method-Modifiers-1.05/inc/Module/Install/WriteAll.pm new/Class-Method-Modifiers-1.07/inc/Module/Install/WriteAll.pm --- old/Class-Method-Modifiers-1.05/inc/Module/Install/WriteAll.pm 2009-10-21 20:04:26.000000000 +0200 +++ new/Class-Method-Modifiers-1.07/inc/Module/Install/WriteAll.pm 2011-02-24 05:55:20.000000000 +0100 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.91';; + $VERSION = '1.00'; @ISA = qw{Module::Install::Base}; $ISCORE = 1; } @@ -26,7 +26,10 @@ $self->check_nmake if $args{check_nmake}; unless ( $self->makemaker_args->{PL_FILES} ) { - $self->makemaker_args( PL_FILES => {} ); + # XXX: This still may be a bit over-defensive... + unless ($self->makemaker(6.25)) { + $self->makemaker_args( PL_FILES => {} ) if -f 'Build.PL'; + } } # Until ExtUtils::MakeMaker support MYMETA.yml, make sure diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Method-Modifiers-1.05/inc/Module/Install.pm new/Class-Method-Modifiers-1.07/inc/Module/Install.pm --- old/Class-Method-Modifiers-1.05/inc/Module/Install.pm 2009-10-21 20:04:24.000000000 +0200 +++ new/Class-Method-Modifiers-1.07/inc/Module/Install.pm 2011-02-24 05:55:19.000000000 +0100 @@ -19,6 +19,9 @@ use 5.005; use strict 'vars'; +use Cwd (); +use File::Find (); +use File::Path (); use vars qw{$VERSION $MAIN}; BEGIN { @@ -28,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 = '0.91'; + $VERSION = '1.00'; # Storage for the pseudo-singleton $MAIN = undef; @@ -38,18 +41,25 @@ } +sub import { + my $class = shift; + my $self = $class->new(@_); + my $who = $self->_caller; - - - -# Whether or not inc::Module::Install is actually loaded, the -# $INC{inc/Module/Install.pm} is what will still get set as long as -# the caller loaded module this in the documented manner. -# If not set, the caller may NOT have loaded the bundled version, and thus -# they may not have a MI version that works with the Makefile.PL. This would -# result in false errors or unexpected behaviour. And we don't want that. -my $file = join( '/', 'inc', split /::/, __PACKAGE__ ) . '.pm'; -unless ( $INC{$file} ) { die <<"END_DIE" } + #------------------------------------------------------------- + # all of the following checks should be included in import(), + # to allow "eval 'require Module::Install; 1' to test + # installation of Module::Install. (RT #51267) + #------------------------------------------------------------- + + # Whether or not inc::Module::Install is actually loaded, the + # $INC{inc/Module/Install.pm} is what will still get set as long as + # the caller loaded module this in the documented manner. + # If not set, the caller may NOT have loaded the bundled version, and thus + # they may not have a MI version that works with the Makefile.PL. This would + # result in false errors or unexpected behaviour. And we don't want that. + my $file = join( '/', 'inc', split /::/, __PACKAGE__ ) . '.pm'; + unless ( $INC{$file} ) { die <<"END_DIE" } Please invoke ${\__PACKAGE__} with: @@ -61,26 +71,28 @@ END_DIE - - - - -# If the script that is loading Module::Install is from the future, -# then make will detect this and cause it to re-run over and over -# again. This is bad. Rather than taking action to touch it (which -# is unreliable on some platforms and requires write permissions) -# for now we should catch this and refuse to run. -if ( -f $0 ) { - my $s = (stat($0))[9]; - - # If the modification time is only slightly in the future, - # sleep briefly to remove the problem. - my $a = $s - time; - if ( $a > 0 and $a < 5 ) { sleep 5 } - - # Too far in the future, throw an error. - my $t = time; - if ( $s > $t ) { die <<"END_DIE" } + # This reportedly fixes a rare Win32 UTC file time issue, but + # as this is a non-cross-platform XS module not in the core, + # we shouldn't really depend on it. See RT #24194 for detail. + # (Also, this module only supports Perl 5.6 and above). + eval "use Win32::UTCFileTime" if $^O eq 'MSWin32' && $] >= 5.006; + + # If the script that is loading Module::Install is from the future, + # then make will detect this and cause it to re-run over and over + # again. This is bad. Rather than taking action to touch it (which + # is unreliable on some platforms and requires write permissions) + # for now we should catch this and refuse to run. + if ( -f $0 ) { + my $s = (stat($0))[9]; + + # If the modification time is only slightly in the future, + # sleep briefly to remove the problem. + my $a = $s - time; + if ( $a > 0 and $a < 5 ) { sleep 5 } + + # Too far in the future, throw an error. + my $t = time; + if ( $s > $t ) { die <<"END_DIE" } Your installer $0 has a modification time in the future ($s > $t). @@ -89,15 +101,12 @@ Please correct this, then run $0 again. END_DIE -} - - - + } -# Build.PL was formerly supported, but no longer is due to excessive -# difficulty in implementing every single feature twice. -if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" } + # Build.PL was formerly supported, but no longer is due to excessive + # difficulty in implementing every single feature twice. + if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" } Module::Install no longer supports Build.PL. @@ -107,23 +116,42 @@ END_DIE + #------------------------------------------------------------- + # To save some more typing in Module::Install installers, every... + # use inc::Module::Install + # ...also acts as an implicit use strict. + $^H |= strict::bits(qw(refs subs vars)); + #------------------------------------------------------------- + unless ( -f $self->{file} ) { + foreach my $key (keys %INC) { + delete $INC{$key} if $key =~ /Module\/Install/; + } -# To save some more typing in Module::Install installers, every... -# use inc::Module::Install -# ...also acts as an implicit use strict. -$^H |= strict::bits(qw(refs subs vars)); - + local $^W; + require "$self->{path}/$self->{dispatch}.pm"; + File::Path::mkpath("$self->{prefix}/$self->{author}"); + $self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self ); + $self->{admin}->init; + @_ = ($class, _self => $self); + goto &{"$self->{name}::import"}; + } + local $^W; + *{"${who}::AUTOLOAD"} = $self->autoload; + $self->preload; + # Unregister loader and worker packages so subdirs can use them again + delete $INC{'inc/Module/Install.pm'}; + delete $INC{'Module/Install.pm'}; + # Save to the singleton + $MAIN = $self; -use Cwd (); -use File::Find (); -use File::Path (); -use FindBin; + return 1; +} sub autoload { my $self = shift; @@ -136,7 +164,21 @@ # Delegate back to parent dirs goto &$code unless $cwd eq $pwd; } - $$sym =~ /([^:]+)$/ or die "Cannot autoload $who - $sym"; + unless ($$sym =~ s/([^:]+)$//) { + # XXX: it looks like we can't retrieve the missing function + # via $$sym (usually $main::AUTOLOAD) in this case. + # I'm still wondering if we should slurp Makefile.PL to + # get some context or not ... + my ($package, $file, $line) = caller; + die <<"EOT"; +Unknown function is found at $file line $line. +Execution of $file aborted due to runtime errors. + +If you're a contributor to a project, you may need to install +some Module::Install extensions from CPAN (or other repository). +If you're a user of a module, please contact the author. +EOT + } my $method = $1; if ( uc($method) eq $method ) { # Do nothing @@ -152,33 +194,6 @@ }; } -sub import { - my $class = shift; - my $self = $class->new(@_); - my $who = $self->_caller; - - unless ( -f $self->{file} ) { - require "$self->{path}/$self->{dispatch}.pm"; - File::Path::mkpath("$self->{prefix}/$self->{author}"); - $self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self ); - $self->{admin}->init; - @_ = ($class, _self => $self); - goto &{"$self->{name}::import"}; - } - - *{"${who}::AUTOLOAD"} = $self->autoload; - $self->preload; - - # Unregister loader and worker packages so subdirs can use them again - delete $INC{"$self->{file}"}; - delete $INC{"$self->{path}.pm"}; - - # Save to the singleton - $MAIN = $self; - - return 1; -} - sub preload { my $self = shift; unless ( $self->{extensions} ) { @@ -204,6 +219,7 @@ my $who = $self->_caller; foreach my $name ( sort keys %seen ) { + local $^W; *{"${who}::$name"} = sub { ${"${who}::AUTOLOAD"} = "${who}::$name"; goto &{"${who}::AUTOLOAD"}; @@ -214,12 +230,18 @@ sub new { my ($class, %args) = @_; + delete $INC{'FindBin.pm'}; + { + # to suppress the redefine warning + local $SIG{__WARN__} = sub {}; + require FindBin; + } + # ignore the prefix on extension modules built from top level. my $base_path = Cwd::abs_path($FindBin::Bin); unless ( Cwd::abs_path(Cwd::cwd()) eq $base_path ) { delete $args{prefix}; } - return $args{_self} if $args{_self}; $args{dispatch} ||= 'Admin'; @@ -272,8 +294,10 @@ sub load_extensions { my ($self, $path, $top) = @_; + my $should_reload = 0; unless ( grep { ! ref $_ and lc $_ eq lc $self->{prefix} } @INC ) { unshift @INC, $self->{prefix}; + $should_reload = 1; } foreach my $rv ( $self->find_extensions($path) ) { @@ -281,12 +305,13 @@ next if $self->{pathnames}{$pkg}; local $@; - my $new = eval { require $file; $pkg->can('new') }; + my $new = eval { local $^W; require $file; $pkg->can('new') }; unless ( $new ) { warn $@ if $@; next; } - $self->{pathnames}{$pkg} = delete $INC{$file}; + $self->{pathnames}{$pkg} = + $should_reload ? delete $INC{$file} : $INC{$file}; push @{$self->{extensions}}, &{$new}($pkg, _top => $top ); } @@ -348,17 +373,24 @@ return $call; } +# Done in evals to avoid confusing Perl::MinimumVersion +eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@; sub _read { local *FH; - if ( $] >= 5.006 ) { - open( FH, '<', $_[0] ) or die "open($_[0]): $!"; - } else { - open( FH, "< $_[0]" ) or die "open($_[0]): $!"; - } + open( FH, '<', $_[0] ) or die "open($_[0]): $!"; + my $string = do { local $/; <FH> }; + close FH or die "close($_[0]): $!"; + return $string; +} +END_NEW +sub _read { + local *FH; + open( FH, "< $_[0]" ) or die "open($_[0]): $!"; my $string = do { local $/; <FH> }; close FH or die "close($_[0]): $!"; return $string; } +END_OLD sub _readperl { my $string = Module::Install::_read($_[0]); @@ -379,18 +411,26 @@ return $string; } +# Done in evals to avoid confusing Perl::MinimumVersion +eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@; sub _write { local *FH; - if ( $] >= 5.006 ) { - open( FH, '>', $_[0] ) or die "open($_[0]): $!"; - } else { - open( FH, "> $_[0]" ) or die "open($_[0]): $!"; + open( FH, '>', $_[0] ) or die "open($_[0]): $!"; + foreach ( 1 .. $#_ ) { + print FH $_[$_] or die "print($_[0]): $!"; } + close FH or die "close($_[0]): $!"; +} +END_NEW +sub _write { + local *FH; + open( FH, "> $_[0]" ) or die "open($_[0]): $!"; foreach ( 1 .. $#_ ) { print FH $_[$_] or die "print($_[0]): $!"; } close FH or die "close($_[0]): $!"; } +END_OLD # _version is for processing module versions (eg, 1.03_05) not # Perl versions (eg, 5.8.1). @@ -427,4 +467,4 @@ 1; -# Copyright 2008 - 2009 Adam Kennedy. +# Copyright 2008 - 2010 Adam Kennedy. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Method-Modifiers-1.05/lib/Class/Method/Modifiers.pm new/Class-Method-Modifiers-1.07/lib/Class/Method/Modifiers.pm --- old/Class-Method-Modifiers-1.05/lib/Class/Method/Modifiers.pm 2009-10-21 20:02:31.000000000 +0200 +++ new/Class-Method-Modifiers-1.07/lib/Class/Method/Modifiers.pm 2011-02-24 05:54:55.000000000 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; -our $VERSION = '1.05'; +our $VERSION = '1.07'; use base 'Exporter'; our @EXPORT = qw(before after around); @@ -24,6 +24,8 @@ my $code = pop; my @names = @_; + @names = @{ $names[0] } if ref($names[0]) eq 'ARRAY'; + for my $name (@names) { my $hit = $into->can($name) or do { require Carp; @@ -161,9 +163,14 @@ return $ret =~ /\d/ ? $ret : lc $ret; }; + after 'private', 'protected' => sub { + debug "finished calling a dangerous method"; + }; + + =head1 DESCRIPTION -Method modifiers are a powerful feature from the CLOS (Common Lisp Object +Method modifiers are a convenient feature from the CLOS (Common Lisp Object System) world. In its most basic form, a method modifier is just a method that calls diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Method-Modifiers-1.05/t/001-error.t new/Class-Method-Modifiers-1.07/t/001-error.t --- old/Class-Method-Modifiers-1.05/t/001-error.t 2009-06-14 20:50:02.000000000 +0200 +++ new/Class-Method-Modifiers-1.07/t/001-error.t 2011-02-24 05:50:59.000000000 +0100 @@ -2,33 +2,36 @@ use strict; use warnings; use Test::More tests => 4; -use Test::Exception; +use Test::Fatal; do { package Class1; use Class::Method::Modifiers; - ::throws_ok { - before foo => sub {}; - } qr/The method 'foo' is not found in the inheritance hierarchy for class Class1/; + ::like( + ::exception { before foo => sub {}; }, + qr/The method 'foo' is not found in the inheritance hierarchy for class Class1/, + ); }; do { package Class2; use Class::Method::Modifiers; - ::throws_ok { - after foo => sub {}; - } qr/The method 'foo' is not found in the inheritance hierarchy for class Class2/; + ::like( + ::exception { after foo => sub {}; }, + qr/The method 'foo' is not found in the inheritance hierarchy for class Class2/, + ); }; do { package Class3; use Class::Method::Modifiers; - ::throws_ok { - around foo => sub {}; - } qr/The method 'foo' is not found in the inheritance hierarchy for class Class3/; + ::like( + ::exception { around foo => sub {}; }, + qr/The method 'foo' is not found in the inheritance hierarchy for class Class3/, + ); }; do { @@ -37,8 +40,9 @@ sub foo {} - ::throws_ok { - around 'foo', 'bar' => sub {}; - } qr/The method 'bar' is not found in the inheritance hierarchy for class Class4/; + ::like( + ::exception { around 'foo', 'bar' => sub {}; }, + qr/The method 'bar' is not found in the inheritance hierarchy for class Class4/, + ); }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Method-Modifiers-1.05/t/070-modify-multiple-at-once.t new/Class-Method-Modifiers-1.07/t/070-modify-multiple-at-once.t --- old/Class-Method-Modifiers-1.05/t/070-modify-multiple-at-once.t 2009-06-14 20:40:27.000000000 +0200 +++ new/Class-Method-Modifiers-1.07/t/070-modify-multiple-at-once.t 2010-11-26 21:06:07.000000000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env perl use strict; use warnings; -use Test::More tests => 2; +use Test::More tests => 4; my @seen; package Parent; @@ -14,13 +14,24 @@ use Class::Method::Modifiers; before 'left', 'right' => sub { push @seen, 'before' }; +package Grandchild; +our @ISA = 'Child'; +use Class::Method::Modifiers; +before ['left', 'right'] => sub { push @seen, 'grandbefore' }; + package main; my $child = Child->new(); $child->left; -is_deeply(\@seen, [qw/before orig-left/], "correct 'left' results"); +is_deeply([splice @seen], [qw/before orig-left/], "correct 'left' results"); -@seen = (); $child->right; -is_deeply(\@seen, [qw/before orig-right/], "correct 'right' results"); +is_deeply([splice @seen], [qw/before orig-right/], "correct 'right' results"); + +my $grand = Grandchild->new(); +$grand->left; +is_deeply([splice @seen], [qw/grandbefore before orig-left/], "correct 'left' results"); + +$grand->right; +is_deeply([splice @seen], [qw/grandbefore before orig-right/], "correct 'right' results"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-Method-Modifiers-1.05/t/101-bank-account.t new/Class-Method-Modifiers-1.07/t/101-bank-account.t --- old/Class-Method-Modifiers-1.05/t/101-bank-account.t 2009-06-14 20:40:27.000000000 +0200 +++ new/Class-Method-Modifiers-1.07/t/101-bank-account.t 1970-01-01 01:00:00.000000000 +0100 @@ -1,133 +0,0 @@ -#!/usr/bin/env perl -use strict; -use warnings; -use Test::More qw/no_plan/; -use Carp; - -# another test file stolen from Class::MOP - -# no need to bring in Test::Exception .. >_> -sub lives_ok (&$) -{ - my ($code, $name) = @_; - - eval { $code->() }; - ok(!$@, $name); -} - -sub dies_ok (&$) -{ - my ($code, $name) = @_; - - eval { $code->() }; - ok($@, $name); -} - -{ - package BankAccount; - - use strict; - use warnings; - - sub new { - my $class = shift; - my $self = {}; - bless $self, $class; - $self->BUILD(@_); - return $self; - } - - sub BUILD { - my $self = shift; - my %args = @_; - $self->{balance} = delete $args{balance} || 0; - } - - sub balance { - my $self = shift; - $self->{balance} = shift if @_; - return $self->{balance}; - } - - sub deposit { - my ($self, $amount) = @_; - $self->balance($self->balance + $amount); - } - - sub withdraw { - my ($self, $amount) = @_; - my $current_balance = $self->balance(); - ($current_balance >= $amount) - || Carp::confess "Account overdrawn"; - $self->balance($current_balance - $amount); - } - - package CheckingAccount; - - use strict; - use warnings; - our @ISA = 'BankAccount'; - use Class::Method::Modifiers; - - sub BUILD { - my $self = shift; - my %args = @_; - $self->{overdraft_account} = delete $args{overdraft} || 0; - $self->SUPER::BUILD(%args); - } - - sub overdraft_account { - my $self = shift; - $self->{overdraft_account} = shift if @_; - return $self->{overdraft_account}; - } - - before 'withdraw' => sub { - my ($self, $amount) = @_; - my $overdraft_amount = $amount - $self->balance(); - if ($overdraft_amount > 0) { - $self->overdraft_account->withdraw($overdraft_amount); - $self->deposit($overdraft_amount); - } - }; -} - -my $savings_account = BankAccount->new(balance => 250); -isa_ok($savings_account, 'BankAccount'); - -is($savings_account->balance, 250, '... got the right savings balance'); -lives_ok { - $savings_account->withdraw(50); -} '... withdrew from savings successfully'; -is($savings_account->balance, 200, '... got the right savings balance after withdrawl'); -dies_ok { - $savings_account->withdraw(250); -} '... could not withdraw from savings successfully'; - - -$savings_account->deposit(150); -is($savings_account->balance, 350, '... got the right savings balance after deposit'); - -my $checking_account = CheckingAccount->new( - balance => 100, - overdraft => $savings_account - ); -isa_ok($checking_account, 'CheckingAccount'); -isa_ok($checking_account, 'BankAccount'); - -is($checking_account->overdraft_account, $savings_account, '... got the right overdraft account'); - -is($checking_account->balance, 100, '... got the right checkings balance'); - -lives_ok { - $checking_account->withdraw(50); -} '... withdrew from checking successfully'; -is($checking_account->balance, 50, '... got the right checkings balance after withdrawl'); -is($savings_account->balance, 350, '... got the right savings balance after checking withdrawl (no overdraft)'); - -lives_ok { - $checking_account->withdraw(200); -} '... withdrew from checking successfully'; -is($checking_account->balance, 0, '... got the right checkings balance after withdrawl'); -is($savings_account->balance, 200, '... got the right savings balance after overdraft withdrawl'); - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Config-Auto for openSUSE:Factory
by root＠hilbert.suse.de 31 May '11

31 May '11

Hello community, here is the log from the commit of package perl-Config-Auto for openSUSE:Factory checked in at Tue May 31 17:01:30 CEST 2011. -------- --- perl-Config-Auto/perl-Config-Auto.changes 2011-04-04 10:31:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Config-Auto/perl-Config-Auto.changes 2011-05-30 17:18:59.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 30 15:18:31 UTC 2011 - coolo(a)novell.com + +- rengerate with cpanspec 1.78.04 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Config-Auto.spec ++++++ --- /var/tmp/diff_new_pack.wG2PpG/_old 2011-05-31 17:00:28.000000000 +0200 +++ /var/tmp/diff_new_pack.wG2PpG/_new 2011-05-31 17:00:28.000000000 +0200 @@ -19,32 +19,22 @@ Name: perl-Config-Auto Version: 0.34 -Release: 1 +Release: 3 License: GPL+ or Artistic %define cpan_name Config-Auto Summary: Magical config file parser Url: http://search.cpan.org/dist/Config-Auto/ Group: Development/Libraries/Perl -#Source: http://www.cpan.org/authors/id/B/BI/BINGOS/Config-Auto-%{version}.tar.gz -Source: %{cpan_name}-%{version}.tar.gz +Source: http://www.cpan.org/authors/id/B/BI/BINGOS/%{cpan_name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(Config::IniFiles) -BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(File::Spec::Functions) -BuildRequires: perl(File::Temp) BuildRequires: perl(IO::String) -BuildRequires: perl(Test::More) -BuildRequires: perl(Text::ParseWords) BuildRequires: perl(YAML) >= 0.67 Requires: perl(Config::IniFiles) -Requires: perl(File::Spec::Functions) -Requires: perl(File::Temp) Requires: perl(IO::String) -Requires: perl(Test::More) -Requires: perl(Text::ParseWords) Requires: perl(YAML) >= 0.67 %{perl_requires} @@ -78,6 +68,6 @@ %files -f %{name}.files %defattr(-,root,root,755) -%doc %attr(644,-,-) Changes README +%doc Changes README %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Devel-StackTrace-AsHTML for openSUSE:Factory
by root＠hilbert.suse.de 31 May '11

31 May '11

Hello community, here is the log from the commit of package perl-Devel-StackTrace-AsHTML for openSUSE:Factory checked in at Tue May 31 17:00:19 CEST 2011. -------- --- perl-Devel-StackTrace-AsHTML/perl-Devel-StackTrace-AsHTML.changes 2010-11-30 20:25:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-Devel-StackTrace-AsHTML/perl-Devel-StackTrace-AsHTML.changes 2011-04-30 17:33:34.000000000 +0200 @@ -1,0 +2,8 @@ +Sat Apr 30 15:31:02 UTC 2011 - coolo(a)opensuse.org + +- updated to 0.11 + - You should now pass the error message in 'message' parameter explicitly to display as an error + - Use the first frame, not the second frame to capture error message + - Don't ignore the top frame. This should be donw using the ignore_package option (Jonathan Swartz) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Devel-StackTrace-AsHTML-0.09.tar.bz2 New: ---- Devel-StackTrace-AsHTML-0.11.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Devel-StackTrace-AsHTML.spec ++++++ --- /var/tmp/diff_new_pack.y6NT5i/_old 2011-05-31 16:55:38.000000000 +0200 +++ /var/tmp/diff_new_pack.y6NT5i/_new 2011-05-31 16:55:38.000000000 +0200 @@ -15,35 +15,31 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: perl-Devel-StackTrace-AsHTML -%define cpan_name Devel-StackTrace-AsHTML -Summary: Displays stack trace in HTML -Version: 0.09 +Version: 0.11 Release: 1 License: GPL+ or Artistic -Group: Development/Libraries/Perl +%define cpan_name Devel-StackTrace-AsHTML +Summary: Displays stack trace in HTML Url: http://search.cpan.org/dist/Devel-StackTrace-AsHTML/ -#Source: http://www.cpan.org/authors/id/M/MI/MIYAGAWA/Devel-StackTrace-AsHTML-%{vers… -Source: %{cpan_name}-%{version}.tar.bz2 +Group: Development/Libraries/Perl +Source: http://www.cpan.org/authors/id/M/MI/MIYAGAWA/%{cpan_name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{perl_requires} BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(Devel::StackTrace) -BuildRequires: perl >= 5.8.1 Requires: perl(Devel::StackTrace) -Requires: perl >= 5.8.1 +%{perl_requires} %description -Devel::StackTrace::AsHTML adds as_html method to Devel::StackTrace which -displays the stack trace in beautiful HTML, with code snippet context and -function parameters. If you call it on an instance of -Devel::StackTrace::WithLexicals, you even get to see the lexical variables -of each stack frame. +Devel::StackTrace::AsHTML adds 'as_html' method to the Devel::StackTrace +manpage which displays the stack trace in beautiful HTML, with code snippet +context and function parameters. If you call it on an instance of the +Devel::StackTrace::WithLexicals manpage, you even get to see the lexical +variables of each stack frame. %prep %setup -q -n %{cpan_name}-%{version} @@ -57,18 +53,14 @@ %install %perl_make_install -# do not perl_process_packlist (noarch) -# remove .packlist file -%{__rm} -rf $RPM_BUILD_ROOT%perl_vendorarch -# remove perllocal.pod file -%{__rm} -rf $RPM_BUILD_ROOT%perl_archlib +%perl_process_packlist %perl_gen_filelist %clean -%{__rm} -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} %files -f %{name}.files -%defattr(-,root,root,-) +%defattr(-,root,root,755) %doc Changes README %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Gravatar-URL for openSUSE:Factory
by root＠hilbert.suse.de 31 May '11

31 May '11

Hello community, here is the log from the commit of package perl-Gravatar-URL for openSUSE:Factory checked in at Tue May 31 16:55:31 CEST 2011. -------- --- perl-Gravatar-URL/perl-Gravatar-URL.changes 2011-04-08 21:47:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Gravatar-URL/perl-Gravatar-URL.changes 2011-05-30 17:24:45.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 30 15:24:22 UTC 2011 - coolo(a)novell.com + +- regenerate with newest cpanspec + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Gravatar-URL.spec ++++++ --- /var/tmp/diff_new_pack.NWQt9l/_old 2011-05-31 16:55:03.000000000 +0200 +++ /var/tmp/diff_new_pack.NWQt9l/_new 2011-05-31 16:55:03.000000000 +0200 @@ -19,30 +19,23 @@ Name: perl-Gravatar-URL Version: 1.04 -Release: 1 +Release: 3 License: GPL+ or Artistic %define cpan_name Gravatar-URL Summary: Make URLs for Gravatars from an email address Url: http://search.cpan.org/dist/Gravatar-URL/ Group: Development/Libraries/Perl -#Source: http://www.cpan.org/authors/id/F/FM/FMARIER/Gravatar-URL-%{version}.tar.gz -Source: %{cpan_name}-%{version}.tar.gz +Source: http://www.cpan.org/authors/id/F/FM/FMARIER/%{cpan_name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl -BuildRequires: perl(Module::Build) BuildRequires: perl-macros -BuildRequires: perl(Carp) -BuildRequires: perl(Digest::MD5) BuildRequires: perl(Digest::SHA) BuildRequires: perl(Module::Build) BuildRequires: perl(Net::DNS::Resolver) BuildRequires: perl(parent) -BuildRequires: perl(Test::More) >= 0.4 BuildRequires: perl(Test::Warn) >= 0.11 BuildRequires: perl(URI::Escape) -Requires: perl(Carp) -Requires: perl(Digest::MD5) Requires: perl(Digest::SHA) Requires: perl(Net::DNS::Resolver) Requires: perl(parent) @@ -62,6 +55,7 @@ %prep %setup -q -n %{cpan_name}-%{version} +find . -type f -print0 | xargs -0 chmod 644 %build %{__perl} Build.PL installdirs=vendor @@ -79,6 +73,6 @@ %files -f %{name}.files %defattr(-,root,root,755) -%doc %attr(644,-,-) Changes +%doc Changes %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-HTTP-Body for openSUSE:Factory
by root＠hilbert.suse.de 31 May '11

31 May '11

Hello community, here is the log from the commit of package perl-HTTP-Body for openSUSE:Factory checked in at Tue May 31 16:54:57 CEST 2011. -------- --- perl-HTTP-Body/perl-HTTP-Body.changes 2010-12-01 14:46:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-HTTP-Body/perl-HTTP-Body.changes 2011-05-11 19:41:52.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 11 17:36:51 UTC 2011 - dbahi(a)novell.com + +- Fixed the t/08 test +- Added param_order capability +- Patch for test failure + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- HTTP-Body-1.09.tar.bz2 New: ---- HTTP-Body-1.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-HTTP-Body.spec ++++++ --- /var/tmp/diff_new_pack.R78O5x/_old 2011-05-31 16:53:54.000000000 +0200 +++ /var/tmp/diff_new_pack.R78O5x/_new 2011-05-31 16:53:54.000000000 +0200 @@ -21,7 +21,7 @@ Name: perl-HTTP-Body %define cpan_name HTTP-Body Summary: HTTP Body Parser -Version: 1.09 +Version: 1.12 Release: 1 License: GPL+ or Artistic Group: Development/Libraries/Perl @@ -38,6 +38,8 @@ BuildRequires: perl(HTTP::Headers) BuildRequires: perl(IO::File) >= 1.14 BuildRequires: perl(Test::Deep) +BuildRequires: perl(Test::Pod) +BuildRequires: perl(Test::Pod::Coverage) Requires: perl(Carp) Requires: perl(File::Temp) >= 0.14 Requires: perl(HTTP::Headers) ++++++ HTTP-Body-1.09.tar.bz2 -> HTTP-Body-1.12.tar.bz2 ++++++ ++++ 2523 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-HTTP-Request-AsCGI for openSUSE:Factory
by root＠hilbert.suse.de 31 May '11

31 May '11

Hello community, here is the log from the commit of package perl-HTTP-Request-AsCGI for openSUSE:Factory checked in at Tue May 31 16:53:48 CEST 2011. -------- --- perl-HTTP-Request-AsCGI/perl-HTTP-Request-AsCGI.changes 2010-12-01 14:46:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-HTTP-Request-AsCGI/perl-HTTP-Request-AsCGI.changes 2011-05-11 21:04:47.000000000 +0200 @@ -1,0 +2,8 @@ +Wed May 11 18:47:22 UTC 2011 - dbahi(a)novell.com + +- Fixed the %ENV concatenation that's broken in 1.1 but wasn't shipped to CPAN +- REQUEST_URI is trying to replicate as raw values as possible, without being canonicalized +- added test to check that %ENV is preserved after setup is called +- setup now concatenates its environment to %ENV instead of replacing it + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- HTTP-Request-AsCGI-1.0.tar.gz New: ---- HTTP-Request-AsCGI-1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-HTTP-Request-AsCGI.spec ++++++ --- /var/tmp/diff_new_pack.ypDARX/_old 2011-05-31 16:51:24.000000000 +0200 +++ /var/tmp/diff_new_pack.ypDARX/_new 2011-05-31 16:51:24.000000000 +0200 @@ -18,15 +18,16 @@ Name: perl-HTTP-Request-AsCGI -Version: 1.0 +Version: 1.2 Release: 1 Summary: Set up a CGI environment from an HTTP::Request License: GPL+ or Artistic +%define cpan_name HTTP-Request-AsCGI Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/HTTP-Request-AsCGI/ -Source0: http://www.cpan.org/modules/by-module/HTTP/HTTP-Request-AsCGI-%{version}.ta… +#Source: http://www.cpan.org/modules/by-module/HTTP/HTTP-Request-AsCGI-%{version}.ta… +Source: %{cpan_name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{perl_requires} BuildArch: noarch BuildRequires: perl BuildRequires: perl-macros @@ -42,13 +43,14 @@ Requires: perl(HTTP::Response) >= 1.53 Requires: perl(IO::File) Requires: perl(URI::Escape) +%{perl_requires} %description Provides a convenient way of setting up an CGI environment from an HTTP::Request. %prep -%setup -q -n HTTP-Request-AsCGI-%{version} +%setup -q -n %{cpan_name}-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor ++++++ HTTP-Request-AsCGI-1.0.tar.gz -> HTTP-Request-AsCGI-1.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-Request-AsCGI-1.0/Changes new/HTTP-Request-AsCGI-1.2/Changes --- old/HTTP-Request-AsCGI-1.0/Changes 2009-11-30 21:53:46.000000000 +0100 +++ new/HTTP-Request-AsCGI-1.2/Changes 2010-01-12 23:03:40.000000000 +0100 @@ -1,6 +1,14 @@ This file documents the revision history for Perl extension HTTP::Request::AsCGI. -1.0 +1.2 2010-01-12 + - Fixed the %ENV concatenation that's broken in 1.1 but wasn't shipped to CPAN (miyagawa) + - REQUEST_URI is trying to replicate as raw values as possible, without being canonicalized (miyagawa) + +1.1 2009-12-07 + - added test to check that %ENV is preserved after setup is called + - setup now concatenates its environment to %ENV instead of replacing it + +1.0 2009-11-30 - Change how PATH_INFO is decoded so that everything is decoded, including URI reserved characters (RT#50082) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-Request-AsCGI-1.0/LICENSE new/HTTP-Request-AsCGI-1.2/LICENSE --- old/HTTP-Request-AsCGI-1.0/LICENSE 2009-11-30 21:53:46.000000000 +0100 +++ new/HTTP-Request-AsCGI-1.2/LICENSE 2010-01-12 23:03:40.000000000 +0100 @@ -1,9 +1,9 @@ -This software is copyright (c) 2009 by Christian Hansen <ch(a)ngmedia.com>. +This software is copyright (c) 2010 by Christian Hansen <ch(a)ngmedia.com>. This is free software; you can redistribute it and/or modify it under -the same terms as perl itself. +the same terms as the Perl 5 programming language system itself. -Terms of Perl itself +Terms of the Perl programming language system itself a) the GNU General Public License as published by the Free Software Foundation; either version 1, or (at your option) any @@ -12,7 +12,7 @@ --- The GNU General Public License, Version 1, February 1989 --- -This software is Copyright (c) 2009 by Christian Hansen <ch(a)ngmedia.com>. +This software is Copyright (c) 2010 by Christian Hansen <ch(a)ngmedia.com>. This is free software, licensed under: @@ -270,7 +270,7 @@ --- The Artistic License 1.0 --- -This software is Copyright (c) 2009 by Christian Hansen <ch(a)ngmedia.com>. +This software is Copyright (c) 2010 by Christian Hansen <ch(a)ngmedia.com>. This is free software, licensed under: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-Request-AsCGI-1.0/META.yml new/HTTP-Request-AsCGI-1.2/META.yml --- old/HTTP-Request-AsCGI-1.0/META.yml 2009-11-30 21:53:46.000000000 +0100 +++ new/HTTP-Request-AsCGI-1.2/META.yml 2010-01-12 23:03:40.000000000 +0100 @@ -3,7 +3,7 @@ author: - 'Christian Hansen <ch(a)ngmedia.com>' - 'Hans Dieter Pearcey <hdp(a)cpan.org>' -generated_by: 'Dist::Zilla version 1.093290' +generated_by: 'Dist::Zilla version 1.093400' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -17,4 +17,6 @@ IO::File: 0 Test::More: 0 URI::Escape: 0 -version: 1.0 +resources: + repository: http://dev.catalyst.perl.org/repos/Catalyst/HTTP-Request-AsCGI +version: 1.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-Request-AsCGI-1.0/Makefile.PL new/HTTP-Request-AsCGI-1.2/Makefile.PL --- old/HTTP-Request-AsCGI-1.0/Makefile.PL 2009-11-30 21:53:46.000000000 +0100 +++ new/HTTP-Request-AsCGI-1.2/Makefile.PL 2010-01-12 23:03:40.000000000 +0100 @@ -11,7 +11,7 @@ NAME => 'HTTP::Request::AsCGI', AUTHOR => "Christian\ Hansen\ \<ch\(a)ngmedia\.com\>\,\ Hans\ Dieter\ Pearcey\ \<hdp\(a)cpan\.org\>", ABSTRACT => "Set\ up\ a\ CGI\ environment\ from\ an\ HTTP\:\:Request", - VERSION => '1.0', + VERSION => '1.2', EXE_FILES => [ qw() ], (eval { ExtUtils::MakeMaker->VERSION(6.31) } ? (LICENSE => 'perl') : ()), PREREQ_PM => { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-Request-AsCGI-1.0/README new/HTTP-Request-AsCGI-1.2/README --- old/HTTP-Request-AsCGI-1.0/README 2009-11-30 21:53:46.000000000 +0100 +++ new/HTTP-Request-AsCGI-1.2/README 2010-01-12 23:03:40.000000000 +0100 @@ -1,12 +1,12 @@ This archive contains the distribution HTTP-Request-AsCGI, version -1.0: +1.2: Set up a CGI environment from an HTTP::Request -This software is copyright (c) 2009 by Christian Hansen <ch(a)ngmedia.com>. +This software is copyright (c) 2010 by Christian Hansen <ch(a)ngmedia.com>. This is free software; you can redistribute it and/or modify it under -the same terms as perl itself. +the same terms as the Perl 5 programming language system itself. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-Request-AsCGI-1.0/dist.ini new/HTTP-Request-AsCGI-1.2/dist.ini --- old/HTTP-Request-AsCGI-1.0/dist.ini 2009-11-30 21:53:46.000000000 +0100 +++ new/HTTP-Request-AsCGI-1.2/dist.ini 2010-01-12 23:03:40.000000000 +0100 @@ -1,5 +1,5 @@ name = HTTP-Request-AsCGI -version = 1.0 +version = 1.2 license = Perl_5 author = Christian Hansen <ch(a)ngmedia.com> author = Hans Dieter Pearcey <hdp(a)cpan.org> @@ -17,3 +17,6 @@ [@Classic] [PodPurler] + +[MetaResources] +repository = http://dev.catalyst.perl.org/repos/Catalyst/HTTP-Request-AsCGI diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-Request-AsCGI-1.0/lib/HTTP/Request/AsCGI.pm new/HTTP-Request-AsCGI-1.2/lib/HTTP/Request/AsCGI.pm --- old/HTTP-Request-AsCGI-1.0/lib/HTTP/Request/AsCGI.pm 2009-11-30 21:53:46.000000000 +0100 +++ new/HTTP-Request-AsCGI-1.2/lib/HTTP/Request/AsCGI.pm 2010-01-12 23:03:40.000000000 +0100 @@ -1,12 +1,11 @@ package HTTP::Request::AsCGI; +our $VERSION = '1.2'; # ABSTRACT: Set up a CGI environment from an HTTP::Request use strict; use warnings; use bytes; use base 'Class::Accessor::Fast'; -our $VERSION = '1.0'; - use Carp; use HTTP::Response; use IO::Handle; @@ -47,6 +46,9 @@ $uri->port(80) unless $uri->port; $uri->host_port($host) unless !$host || ( $host eq $uri->host_port ); + # Get it before canonicalized so REQUEST_URI can be as raw as possible + my $request_uri = $uri->path_query; + $uri = $uri->canonical; my $environment = { @@ -63,7 +65,7 @@ REMOTE_ADDR => '127.0.0.1', REMOTE_HOST => 'localhost', REMOTE_PORT => int( rand(64000) + 1000 ), # not in RFC 3875 - REQUEST_URI => $uri->path_query, # not in RFC 3875 + REQUEST_URI => $request_uri, # not in RFC 3875 REQUEST_METHOD => $request->method, @_ }; @@ -149,7 +151,7 @@ { no warnings 'uninitialized'; - %ENV = %{ $self->environment }; + %ENV = (%ENV, %{ $self->environment }); } if ( $INC{'CGI.pm'} ) { @@ -174,7 +176,7 @@ $headers .= $line; last if $headers =~ /\x0d?\x0a\x0d?\x0a$/; } - + unless ( defined $headers ) { $headers = "HTTP/1.1 500 Internal Server Error\x0d\x0a"; } @@ -201,7 +203,7 @@ $response->code($code); $response->message($message); } - + my $length = ( stat( $self->stdout ) )[7] - tell( $self->stdout ); if ( $response->code == 500 && !$length ) { @@ -294,7 +296,6 @@ - =pod =head1 NAME @@ -303,14 +304,13 @@ =head1 VERSION -version 1.0 - -=begin Pod::Coverage +version 1.2 - enviroment +=for Pod::Coverage enviroment -=end Pod::Coverage +=cut +=pod =head1 SYNOPSIS @@ -347,7 +347,7 @@ =head1 METHODS -=over 4 +=over 4 =item new ( $request [, key => value ] ) @@ -356,7 +356,7 @@ =item environment -Returns a hashref containing the environment that will be used in setup. +Returns a hashref containing the environment that will be used in setup. Changing the hashref after setup has been called will have no effect. =item setup @@ -390,7 +390,7 @@ Accessor for handle that will be used for STDERR, must be a real seekable handle with an file descriptor. -=back +=back =head1 SEE ALSO @@ -402,28 +402,25 @@ =item L<Test::WWW::Mechanize::CGI> -=back +=back =head1 THANKS TO Thomas L. Shinnick for his valuable win32 testing. - - =head1 AUTHORS - Christian Hansen <ch(a)ngmedia.com> - Hans Dieter Pearcey <hdp(a)cpan.org> +Christian Hansen <ch(a)ngmedia.com> +Hans Dieter Pearcey <hdp(a)cpan.org> =head1 COPYRIGHT AND LICENSE -This software is copyright (c) 2009 by Christian Hansen <ch(a)ngmedia.com>. +This software is copyright (c) 2010 by Christian Hansen <ch(a)ngmedia.com>. This is free software; you can redistribute it and/or modify it under -the same terms as perl itself. - -=cut +the same terms as the Perl 5 programming language system itself. +=cut __END__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-Request-AsCGI-1.0/t/05env.t new/HTTP-Request-AsCGI-1.2/t/05env.t --- old/HTTP-Request-AsCGI-1.0/t/05env.t 2009-11-30 21:53:46.000000000 +0100 +++ new/HTTP-Request-AsCGI-1.2/t/05env.t 2010-01-12 23:03:40.000000000 +0100 @@ -1,6 +1,6 @@ #!perl -use Test::More tests => 10; +use Test::More tests => 11; use strict; use warnings; @@ -9,6 +9,8 @@ use HTTP::Request::AsCGI; use Encode; +$ENV{__PRESERVE_ENV_TEST} = 1; + my $r = HTTP::Request->new( GET => 'http://www.host.com/cgi-bin/script.cgi/my%20path%2F?a=1&b=2', [ 'X-Test' => 'Test' ] ); my %e = ( SCRIPT_NAME => '/cgi-bin/script.cgi', @@ -31,6 +33,8 @@ is( $ENV{SERVER_NAME}, 'www.host.com', 'SERVER_NAME' ); is( $ENV{SERVER_PORT}, '80', 'SERVER_PORT' ); +is( $ENV{__PRESERVE_ENV_TEST}, 1, 'PRESERVE_ENV' ); + $c->restore; is( $ENV{GATEWAY_INTERFACE}, undef, 'No CGI env after restore' ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0