Re: Plans for Catalyst in Wheezy
Hi,
(Cc'ing Jonas Genannt, given he maintains a Catalyst application that
was not updated for compatibility with recent Catalyst.)
intrigeri wrote (13 Jul 2012 03:46:34 GMT) :
> I discussed this matter with Jotam Jr., and in the end, we agreed that
> the sanest way for Wheezy is to ship Catalyst 5.90015, and fix the few
> remaining bugs caused by the upgrade.
> So, basically, our plan is:
> 1. rebuild all reverse {build-,}dependencies of libcatalyst-perl
> against 5.90015-1 to check if it breaks anything new [Jotam Jr.]
> 2. have 5.90014-1 migrate into testing (by requesting the removal of
> libcatalyst-controller-actionrole-perl from the archive)
> [gregoa, do you want to follow-up on the Conflicts you declared?]
This cannot happen due to reverse dependencies.
Consequence: the release team will not be happy, with good reasons, to
look at unstable-to-potential-upload diff, instead of
testing-to-unstable :(
> 3. have upstream fix whatever extension is broken by the latest
> Catalyst (TTBOMK, that is #680819 and #680829) [intrigeri]
> after a short while, patch ourselves or remove what remains
> broken
Done, ready in Git.
> 4. ask freeze exceptions for libcatalyst-perl 5.90015-1 and the
> modules the new version breaks [intrigeri]
Please review and comment my email draft to the release team:
http://paste.debian.net/180093/. debdiffs are attached.
The discussion about Gitalist should reach a conclusion before we
send this email, though.
Cheers,
--
intrigeri
| GnuPG key @ https://gaffer.ptitcanardnoir.org/intrigeri/intrigeri.asc
| OTR fingerprint @ https://gaffer.ptitcanardnoir.org/intrigeri/otr.asc
diff -Nru libcatalyst-actionrole-acl-perl-0.06/Changes libcatalyst-actionrole-acl-perl-0.07/Changes
--- libcatalyst-actionrole-acl-perl-0.06/Changes 2011-08-05 09:18:02.000000000 +0200
+++ libcatalyst-actionrole-acl-perl-0.07/Changes 2012-07-13 14:42:20.000000000 +0200
@@ -1,3 +1,7 @@
+v0.07 Fri Jul 13 13:39:00 BST 2011
+ - Change to work with (and require) Catalyst::Runtime >= 5.90013
+ RT#78334
+
v0.06 Fri Aug 5 08:14:00 BST 2011
- Fix to work with Catalyst 5.9. RT#67863
- Add repository metadata
diff -Nru libcatalyst-actionrole-acl-perl-0.06/debian/changelog libcatalyst-actionrole-acl-perl-0.07/debian/changelog
--- libcatalyst-actionrole-acl-perl-0.06/debian/changelog 2012-04-06 22:36:48.000000000 +0200
+++ libcatalyst-actionrole-acl-perl-0.07/debian/changelog 2012-07-18 03:13:40.000000000 +0200
@@ -1,3 +1,19 @@
+libcatalyst-actionrole-acl-perl (0.07-1) unstable; urgency=low
+
+ * Imported Upstream version 0.07
+ * debian/control:
+ + added versioned dependency against libcatalyst-perl >= 5.90013
+ since the new changes provided by upstream rely on changes in
+ libcatalyst-perl 5.90013 and later versions
+ + removed libcatalyst-controller-actionrole-perl from the dependencys
+ because Catalyst::Controller::ActionRole is provided by
+ libcatalyst-perl since version 5.90013
+ * Added myself to Uploaders and Copyright
+ * This new version use Catalyst::Controller instead of
+ Catalyst::Controller::ActionRole fixing FTBFS (Closes: #680819)
+
+ -- Jotam Jr. Trejo <jotamjr@debian.org.sv> Fri, 13 Jul 2012 11:29:42 -0600
+
libcatalyst-actionrole-acl-perl (0.06-1) unstable; urgency=low
* Initial release (closes: #667822).
diff -Nru libcatalyst-actionrole-acl-perl-0.06/debian/control libcatalyst-actionrole-acl-perl-0.07/debian/control
--- libcatalyst-actionrole-acl-perl-0.06/debian/control 2012-04-06 22:36:48.000000000 +0200
+++ libcatalyst-actionrole-acl-perl-0.07/debian/control 2012-07-18 03:13:40.000000000 +0200
@@ -2,11 +2,11 @@
Section: perl
Priority: optional
Maintainer: Debian Perl Group <pkg-perl-maintainers@lists.alioth.debian.org>
-Uploaders: gregor herrmann <gregoa@debian.org>
+Uploaders: gregor herrmann <gregoa@debian.org>,
+ Jotam Jr. Trejo <jotamjr@debian.org.sv>
Build-Depends: debhelper (>= 8)
Build-Depends-Indep: perl,
- libcatalyst-controller-actionrole-perl,
- libcatalyst-perl,
+ libcatalyst-perl (>= 5.90013),
libmoose-perl,
libnamespace-autoclean-perl
Standards-Version: 3.9.3
@@ -17,8 +17,7 @@
Package: libcatalyst-actionrole-acl-perl
Architecture: all
Depends: ${misc:Depends}, ${perl:Depends},
- libcatalyst-controller-actionrole-perl,
- libcatalyst-perl,
+ libcatalyst-perl (>= 5.90013),
libmoose-perl,
libnamespace-autoclean-perl
Description: Catalyst ActionRole for user role-based authorization
diff -Nru libcatalyst-actionrole-acl-perl-0.06/debian/copyright libcatalyst-actionrole-acl-perl-0.07/debian/copyright
--- libcatalyst-actionrole-acl-perl-0.06/debian/copyright 2012-04-06 22:36:48.000000000 +0200
+++ libcatalyst-actionrole-acl-perl-0.07/debian/copyright 2012-07-18 03:13:40.000000000 +0200
@@ -15,6 +15,7 @@
Files: debian/*
Copyright: 2012, gregor herrmann <gregoa@debian.org>
+ 2012, Jotam Jr. Trejo <jotamjr@debian.org.sv>
License: Artistic or GPL-1+
License: Artistic
diff -Nru libcatalyst-actionrole-acl-perl-0.06/inc/Module/Install/Base.pm libcatalyst-actionrole-acl-perl-0.07/inc/Module/Install/Base.pm
--- libcatalyst-actionrole-acl-perl-0.06/inc/Module/Install/Base.pm 2011-08-05 09:18:20.000000000 +0200
+++ libcatalyst-actionrole-acl-perl-0.07/inc/Module/Install/Base.pm 2012-07-13 14:40:48.000000000 +0200
@@ -4,7 +4,7 @@
use strict 'vars';
use vars qw{$VERSION};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
}
# Suspend handler for "redefined" warnings
diff -Nru libcatalyst-actionrole-acl-perl-0.06/inc/Module/Install/Can.pm libcatalyst-actionrole-acl-perl-0.07/inc/Module/Install/Can.pm
--- libcatalyst-actionrole-acl-perl-0.06/inc/Module/Install/Can.pm 2011-08-05 09:18:20.000000000 +0200
+++ libcatalyst-actionrole-acl-perl-0.07/inc/Module/Install/Can.pm 2012-07-13 14:40:48.000000000 +0200
@@ -3,13 +3,12 @@
use strict;
use Config ();
-use File::Spec ();
use ExtUtils::MakeMaker ();
use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -29,7 +28,7 @@
eval { require $mod; $pkg->VERSION($ver || 0); 1 };
}
-# check if we can run some command
+# Check if we can run some command
sub can_run {
my ($self, $cmd) = @_;
@@ -38,14 +37,88 @@
for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
next if $dir eq '';
- my $abs = File::Spec->catfile($dir, $_[1]);
+ require File::Spec;
+ my $abs = File::Spec->catfile($dir, $cmd);
return $abs if (-x $abs or $abs = MM->maybe_command($abs));
}
return;
}
-# can we locate a (the) C compiler
+# Can our C compiler environment build XS files
+sub can_xs {
+ my $self = shift;
+
+ # Ensure we have the CBuilder module
+ $self->configure_requires( 'ExtUtils::CBuilder' => 0.27 );
+
+ # Do we have the configure_requires checker?
+ local $@;
+ eval "require ExtUtils::CBuilder;";
+ if ( $@ ) {
+ # They don't obey configure_requires, so it is
+ # someone old and delicate. Try to avoid hurting
+ # them by falling back to an older simpler test.
+ return $self->can_cc();
+ }
+
+ # Do we have a working C compiler
+ my $builder = ExtUtils::CBuilder->new(
+ quiet => 1,
+ );
+ unless ( $builder->have_compiler ) {
+ # No working C compiler
+ return 0;
+ }
+
+ # Write a C file representative of what XS becomes
+ require File::Temp;
+ my ( $FH, $tmpfile ) = File::Temp::tempfile(
+ "compilexs-XXXXX",
+ SUFFIX => '.c',
+ );
+ binmode $FH;
+ print $FH <<'END_C';
+#include "EXTERN.h"
+#include "perl.h"
+#include "XSUB.h"
+
+int main(int argc, char **argv) {
+ return 0;
+}
+
+int boot_sanexs() {
+ return 1;
+}
+
+END_C
+ close $FH;
+
+ # Can the C compiler access the same headers XS does
+ my @libs = ();
+ my $object = undef;
+ eval {
+ local $^W = 0;
+ $object = $builder->compile(
+ source => $tmpfile,
+ );
+ @libs = $builder->link(
+ objects => $object,
+ module_name => 'sanexs',
+ );
+ };
+ my $result = $@ ? 0 : 1;
+
+ # Clean up all the build files
+ foreach ( $tmpfile, $object, @libs ) {
+ next unless defined $_;
+ 1 while unlink;
+ }
+
+ return $result;
+}
+
+# Can we locate a (the) C compiler
sub can_cc {
my $self = shift;
my @chunks = split(/ /, $Config::Config{cc}) or return;
@@ -78,4 +151,4 @@
__END__
-#line 156
+#line 236
diff -Nru libcatalyst-actionrole-acl-perl-0.06/inc/Module/Install/Fetch.pm libcatalyst-actionrole-acl-perl-0.07/inc/Module/Install/Fetch.pm
--- libcatalyst-actionrole-acl-perl-0.06/inc/Module/Install/Fetch.pm 2011-08-05 09:18:20.000000000 +0200
+++ libcatalyst-actionrole-acl-perl-0.07/inc/Module/Install/Fetch.pm 2012-07-13 14:40:48.000000000 +0200
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff -Nru libcatalyst-actionrole-acl-perl-0.06/inc/Module/Install/Makefile.pm libcatalyst-actionrole-acl-perl-0.07/inc/Module/Install/Makefile.pm
--- libcatalyst-actionrole-acl-perl-0.06/inc/Module/Install/Makefile.pm 2011-08-05 09:18:20.000000000 +0200
+++ libcatalyst-actionrole-acl-perl-0.07/inc/Module/Install/Makefile.pm 2012-07-13 14:40:48.000000000 +0200
@@ -8,7 +8,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -215,18 +215,22 @@
require ExtUtils::MakeMaker;
if ( $perl_version and $self->_cmp($perl_version, '5.006') >= 0 ) {
- # MakeMaker can complain about module versions that include
- # an underscore, even though its own version may contain one!
- # Hence the funny regexp to get rid of it. See RT #35800
- # for details.
- my $v = $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/;
- $self->build_requires( 'ExtUtils::MakeMaker' => $v );
- $self->configure_requires( 'ExtUtils::MakeMaker' => $v );
+ # This previous attempted to inherit the version of
+ # ExtUtils::MakeMaker in use by the module author, but this
+ # was found to be untenable as some authors build releases
+ # using future dev versions of EU:MM that nobody else has.
+ # Instead, #toolchain suggests we use 6.59 which is the most
+ # stable version on CPAN at time of writing and is, to quote
+ # ribasushi, "not terminally fucked, > and tested enough".
+ # TODO: We will now need to maintain this over time to push
+ # the version up as new versions are released.
+ $self->build_requires( 'ExtUtils::MakeMaker' => 6.59 );
+ $self->configure_requires( 'ExtUtils::MakeMaker' => 6.59 );
} 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->configure_requires( 'ExtUtils::MakeMaker' => 6.42 );
+ $self->build_requires( 'ExtUtils::MakeMaker' => 6.36 );
+ $self->configure_requires( 'ExtUtils::MakeMaker' => 6.36 );
}
# Generate the MakeMaker params
@@ -241,7 +245,6 @@
'all_from' if you prefer) in Makefile.PL.
EOT
- $DB::single = 1;
if ( $self->tests ) {
my @tests = split ' ', $self->tests;
my %seen;
@@ -412,4 +415,4 @@
__END__
-#line 541
+#line 544
diff -Nru libcatalyst-actionrole-acl-perl-0.06/inc/Module/Install/Metadata.pm libcatalyst-actionrole-acl-perl-0.07/inc/Module/Install/Metadata.pm
--- libcatalyst-actionrole-acl-perl-0.06/inc/Module/Install/Metadata.pm 2011-08-05 09:18:20.000000000 +0200
+++ libcatalyst-actionrole-acl-perl-0.07/inc/Module/Install/Metadata.pm 2012-07-13 14:40:48.000000000 +0200
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -151,15 +151,21 @@
sub install_as_vendor { $_[0]->installdirs('vendor') }
sub dynamic_config {
- my $self = shift;
- unless ( @_ ) {
- warn "You MUST provide an explicit true/false value to dynamic_config\n";
- return $self;
+ my $self = shift;
+ my $value = @_ ? shift : 1;
+ if ( $self->{values}->{dynamic_config} ) {
+ # Once dynamic we never change to static, for safety
+ return 0;
}
- $self->{values}->{dynamic_config} = $_[0] ? 1 : 0;
+ $self->{values}->{dynamic_config} = $value ? 1 : 0;
return 1;
}
+# Convenience command
+sub static_config {
+ shift->dynamic_config(0);
+}
+
sub perl_version {
my $self = shift;
return $self->{values}->{perl_version} unless @_;
@@ -170,7 +176,7 @@
# Normalize the version
$version = $self->_perl_version($version);
- # We don't support the reall old versions
+ # We don't support the really old versions
unless ( $version >= 5.005 ) {
die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n";
}
@@ -582,7 +588,7 @@
sub requires_from {
my $self = shift;
my $content = Module::Install::_readperl($_[0]);
- my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg;
+ my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+(v?[\d\.]+)/mg;
while ( @requires ) {
my $module = shift @requires;
my $version = shift @requires;
diff -Nru libcatalyst-actionrole-acl-perl-0.06/inc/Module/Install/Win32.pm libcatalyst-actionrole-acl-perl-0.07/inc/Module/Install/Win32.pm
--- libcatalyst-actionrole-acl-perl-0.06/inc/Module/Install/Win32.pm 2011-08-05 09:18:20.000000000 +0200
+++ libcatalyst-actionrole-acl-perl-0.07/inc/Module/Install/Win32.pm 2012-07-13 14:40:48.000000000 +0200
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff -Nru libcatalyst-actionrole-acl-perl-0.06/inc/Module/Install/WriteAll.pm libcatalyst-actionrole-acl-perl-0.07/inc/Module/Install/WriteAll.pm
--- libcatalyst-actionrole-acl-perl-0.06/inc/Module/Install/WriteAll.pm 2011-08-05 09:18:20.000000000 +0200
+++ libcatalyst-actionrole-acl-perl-0.07/inc/Module/Install/WriteAll.pm 2012-07-13 14:40:48.000000000 +0200
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
diff -Nru libcatalyst-actionrole-acl-perl-0.06/inc/Module/Install.pm libcatalyst-actionrole-acl-perl-0.07/inc/Module/Install.pm
--- libcatalyst-actionrole-acl-perl-0.06/inc/Module/Install.pm 2011-08-05 09:18:20.000000000 +0200
+++ libcatalyst-actionrole-acl-perl-0.07/inc/Module/Install.pm 2012-07-13 14:40:48.000000000 +0200
@@ -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.06';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -451,7 +451,7 @@
}
sub _cmp ($$) {
- _version($_[0]) <=> _version($_[1]);
+ _version($_[1]) <=> _version($_[2]);
}
# Cloned from Params::Util::_CLASS
@@ -467,4 +467,4 @@
1;
-# Copyright 2008 - 2011 Adam Kennedy.
+# Copyright 2008 - 2012 Adam Kennedy.
diff -Nru libcatalyst-actionrole-acl-perl-0.06/lib/Catalyst/Action/Role/ACL.pm libcatalyst-actionrole-acl-perl-0.07/lib/Catalyst/Action/Role/ACL.pm
--- libcatalyst-actionrole-acl-perl-0.06/lib/Catalyst/Action/Role/ACL.pm 2011-08-05 09:18:02.000000000 +0200
+++ libcatalyst-actionrole-acl-perl-0.07/lib/Catalyst/Action/Role/ACL.pm 2012-07-13 14:42:20.000000000 +0200
@@ -6,7 +6,7 @@
with 'Catalyst::ActionRole::ACL';
use vars qw($VERSION);
-$VERSION = '0.06'; # Note - Remember to keep in sync with Catalyst::ActionRole::ACL
+$VERSION = '0.07'; # Note - Remember to keep in sync with Catalyst::ActionRole::ACL
{
my $has_warned = 0;
diff -Nru libcatalyst-actionrole-acl-perl-0.06/lib/Catalyst/ActionRole/ACL.pm libcatalyst-actionrole-acl-perl-0.07/lib/Catalyst/ActionRole/ACL.pm
--- libcatalyst-actionrole-acl-perl-0.06/lib/Catalyst/ActionRole/ACL.pm 2011-08-05 09:18:02.000000000 +0200
+++ libcatalyst-actionrole-acl-perl-0.07/lib/Catalyst/ActionRole/ACL.pm 2012-07-13 14:42:20.000000000 +0200
@@ -3,7 +3,7 @@
use namespace::autoclean;
use vars qw($VERSION);
-$VERSION = '0.06'; # REMEMBER TO BUMP VERSION IN Action::Role::ACL ALSO!
+$VERSION = '0.07'; # REMEMBER TO BUMP VERSION IN Action::Role::ACL ALSO!
=head1 NAME
@@ -15,7 +15,7 @@
use Moose;
use namespace::autoclean;
- BEGIN { extends 'Catalyst::Controller::ActionRole' }
+ BEGIN { extends 'Catalyst::Controller' }
sub foo
:Local
@@ -36,7 +36,7 @@
=head1 DESCRIPTION
-Provides a L<Catalyst reusable action role|Catalyst::Controller::ActionRole>
+Provides a reusable action role
for user role-based authorization.
ACLs are applied via the assignment of attributes to
application action subroutines.
diff -Nru libcatalyst-actionrole-acl-perl-0.06/Makefile.PL libcatalyst-actionrole-acl-perl-0.07/Makefile.PL
--- libcatalyst-actionrole-acl-perl-0.06/Makefile.PL 2011-08-05 09:16:54.000000000 +0200
+++ libcatalyst-actionrole-acl-perl-0.07/Makefile.PL 2012-07-13 14:36:37.000000000 +0200
@@ -3,7 +3,7 @@
name 'Catalyst-ActionRole-ACL';
all_from 'lib/Catalyst/ActionRole/ACL.pm';
-requires 'Catalyst::Runtime';
+requires 'Catalyst::Runtime' => '5.90013';
requires 'Moose';
requires 'Catalyst::Controller::ActionRole';
requires 'namespace::autoclean';
diff -Nru libcatalyst-actionrole-acl-perl-0.06/MANIFEST libcatalyst-actionrole-acl-perl-0.07/MANIFEST
--- libcatalyst-actionrole-acl-perl-0.06/MANIFEST 2011-08-05 09:18:23.000000000 +0200
+++ libcatalyst-actionrole-acl-perl-0.07/MANIFEST 2012-07-13 14:40:51.000000000 +0200
@@ -13,6 +13,7 @@
MANIFEST This list of files
MANIFEST.SKIP
META.yml
+MYMETA.json
README
t/00-load.t
t/02-action-class.t
diff -Nru libcatalyst-actionrole-acl-perl-0.06/META.yml libcatalyst-actionrole-acl-perl-0.07/META.yml
--- libcatalyst-actionrole-acl-perl-0.06/META.yml 2011-08-05 09:18:20.000000000 +0200
+++ libcatalyst-actionrole-acl-perl-0.07/META.yml 2012-07-13 14:40:48.000000000 +0200
@@ -3,12 +3,13 @@
author:
- 'David P.C. Wollmann <converter42@gmail.com>'
build_requires:
- ExtUtils::MakeMaker: 6.42
+ ExtUtils::MakeMaker: 6.36
Test::More: 0
configure_requires:
- ExtUtils::MakeMaker: 6.42
+ ExtUtils::MakeMaker: 6.36
distribution_type: module
-generated_by: 'Module::Install version 1.01'
+dynamic_config: 1
+generated_by: 'Module::Install version 1.06'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -20,10 +21,10 @@
- t
requires:
Catalyst::Controller::ActionRole: 0
- Catalyst::Runtime: 0
+ Catalyst::Runtime: 5.90013
Moose: 0
namespace::autoclean: 0
resources:
license: http://dev.perl.org/licenses/
repository: git://github.com/bobtfish/catalyst-actionrole-acl.git
-version: 0.06
+version: 0.07
diff -Nru libcatalyst-actionrole-acl-perl-0.06/MYMETA.json libcatalyst-actionrole-acl-perl-0.07/MYMETA.json
--- libcatalyst-actionrole-acl-perl-0.06/MYMETA.json 1970-01-01 01:00:00.000000000 +0100
+++ libcatalyst-actionrole-acl-perl-0.07/MYMETA.json 2012-07-13 14:42:50.000000000 +0200
@@ -0,0 +1,53 @@
+{
+ "abstract" : "User role-based authorization action class",
+ "author" : [
+ "David P.C. Wollmann <converter42@gmail.com>"
+ ],
+ "dynamic_config" : 0,
+ "generated_by" : "Module::Install version 1.06, CPAN::Meta::Converter version 2.120921",
+ "license" : [
+ "perl_5"
+ ],
+ "meta-spec" : {
+ "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec";,
+ "version" : "2"
+ },
+ "name" : "Catalyst-ActionRole-ACL",
+ "no_index" : {
+ "directory" : [
+ "inc",
+ "t"
+ ]
+ },
+ "prereqs" : {
+ "build" : {
+ "requires" : {
+ "ExtUtils::MakeMaker" : "6.36",
+ "Test::More" : "0"
+ }
+ },
+ "configure" : {
+ "requires" : {
+ "ExtUtils::MakeMaker" : "6.36"
+ }
+ },
+ "runtime" : {
+ "requires" : {
+ "Catalyst::Controller::ActionRole" : "0",
+ "Catalyst::Runtime" : "5.90013",
+ "Moose" : "0",
+ "namespace::autoclean" : "0"
+ }
+ }
+ },
+ "release_status" : "stable",
+ "resources" : {
+ "license" : [
+ "http://dev.perl.org/licenses/";
+ ],
+ "repository" : {
+ "url" : "git://github.com/bobtfish/catalyst-actionrole-acl.git"
+ }
+ },
+ "version" : "0.07"
+}
diff -Nru libcatalyst-actionrole-acl-perl-0.06/README libcatalyst-actionrole-acl-perl-0.07/README
--- libcatalyst-actionrole-acl-perl-0.06/README 2011-08-05 09:18:20.000000000 +0200
+++ libcatalyst-actionrole-acl-perl-0.07/README 2012-07-13 14:40:48.000000000 +0200
@@ -6,7 +6,7 @@
use Moose;
use namespace::autoclean;
- BEGIN { extends 'Catalyst::Controller::ActionRole' }
+ BEGIN { extends 'Catalyst::Controller' }
sub foo
:Local
@@ -26,9 +26,9 @@
}
DESCRIPTION
- Provides a Catalyst reusable action role for user role-based
- authorization. ACLs are applied via the assignment of attributes to
- application action subroutines.
+ Provides a reusable action role for user role-based authorization. ACLs
+ are applied via the assignment of attributes to application action
+ subroutines.
REQUIRED ATTRIBUTES
Failure to include the following required attributes will result in an
diff -Nru libcatalyst-actionrole-acl-perl-0.06/t/lib/TestApp/Controller/Root.pm libcatalyst-actionrole-acl-perl-0.07/t/lib/TestApp/Controller/Root.pm
--- libcatalyst-actionrole-acl-perl-0.06/t/lib/TestApp/Controller/Root.pm 2009-07-28 10:39:08.000000000 +0200
+++ libcatalyst-actionrole-acl-perl-0.07/t/lib/TestApp/Controller/Root.pm 2012-07-13 14:37:57.000000000 +0200
@@ -2,7 +2,7 @@
use Moose;
use namespace::autoclean;
-BEGIN { extends 'Catalyst::Controller::ActionRole' };
+BEGIN { extends 'Catalyst::Controller' };
__PACKAGE__->config(namespace => q{});
diff -Nru libcatalyst-actionrole-acl-perl-0.06/t/lib/TestCanVisit/Controller/Root.pm libcatalyst-actionrole-acl-perl-0.07/t/lib/TestCanVisit/Controller/Root.pm
--- libcatalyst-actionrole-acl-perl-0.06/t/lib/TestCanVisit/Controller/Root.pm 2009-07-28 10:39:08.000000000 +0200
+++ libcatalyst-actionrole-acl-perl-0.07/t/lib/TestCanVisit/Controller/Root.pm 2012-07-13 14:38:05.000000000 +0200
@@ -2,7 +2,7 @@
use Moose;
use namespace::autoclean;
-BEGIN { extends 'Catalyst::Controller::ActionRole' };
+BEGIN { extends 'Catalyst::Controller' };
__PACKAGE__->config(namespace => q{});
diff -Nru libcatalyst-actionrole-acl-perl-0.06/t/lib/TestChained/Controller/Root.pm libcatalyst-actionrole-acl-perl-0.07/t/lib/TestChained/Controller/Root.pm
--- libcatalyst-actionrole-acl-perl-0.06/t/lib/TestChained/Controller/Root.pm 2009-07-28 10:39:08.000000000 +0200
+++ libcatalyst-actionrole-acl-perl-0.07/t/lib/TestChained/Controller/Root.pm 2012-07-13 14:38:11.000000000 +0200
@@ -2,7 +2,7 @@
use Moose;
use namespace::autoclean;
-BEGIN { extends 'Catalyst::Controller::ActionRole' };
+BEGIN { extends 'Catalyst::Controller' };
my $msg = '';
diff -Nru libcatalystx-simplelogin-perl-0.15/Changes libcatalystx-simplelogin-perl-0.17/Changes
--- libcatalystx-simplelogin-perl-0.15/Changes 2011-09-06 10:59:30.000000000 +0200
+++ libcatalystx-simplelogin-perl-0.17/Changes 2012-07-15 19:23:57.000000000 +0200
@@ -1,3 +1,11 @@
+0.17 Sun, 15 July 2012 18:23:00 +0100
+ * Better fix for Catalyst versions >= 5.90013 RT#78340, one module
+ and some documentation was missed.
+
+0.16 Fri, 13 July 2012 15:41:00 +0100
+ * Ensure that temp directories created in tests get removed.
+ * Fix for Catalyst versions >= 5.90013 RT#78340
+
0.15 Tue, 6 Sept 2011 09:59:00 +0100
* Various documentation fixes and improvements
* Add tab index to forms
diff -Nru libcatalystx-simplelogin-perl-0.15/debian/changelog libcatalystx-simplelogin-perl-0.17/debian/changelog
--- libcatalystx-simplelogin-perl-0.15/debian/changelog 2012-04-07 00:00:16.000000000 +0200
+++ libcatalystx-simplelogin-perl-0.17/debian/changelog 2012-07-21 15:02:56.000000000 +0200
@@ -1,3 +1,21 @@
+libcatalystx-simplelogin-perl (0.17-1) unstable; urgency=low
+
+ * Team upload.
+
+ [ Jotam Jr. Trejo ]
+ * Imported Upstream version 0.16
+ * Removed debian/patches since upstream integrated
+ the whatis entries for the controllers
+ CatalystX::SimpleLogin::TraitFor::Controller::Login::Logout and
+ CatalystX::SimpleLogin::TraitFor::Controller::Login::RenderAsTTTemplate
+
+ [ intrigeri ]
+ * Imported Upstream version 0.17
+ * Depend on recent enough libcatalyst-perl,
+ drop obsolete dependency on libcatalyst-controller-actionrole-perl.
+
+ -- intrigeri <intrigeri@debian.org> Wed, 18 Jul 2012 03:10:31 +0200
+
libcatalystx-simplelogin-perl (0.15-1) unstable; urgency=low
* Initial release (closes: #604200).
diff -Nru libcatalystx-simplelogin-perl-0.15/debian/control libcatalystx-simplelogin-perl-0.17/debian/control
--- libcatalystx-simplelogin-perl-0.15/debian/control 2012-04-07 00:00:16.000000000 +0200
+++ libcatalystx-simplelogin-perl-0.17/debian/control 2012-07-21 15:02:56.000000000 +0200
@@ -7,9 +7,8 @@
Build-Depends-Indep: perl,
libcatalyst-action-rest-perl,
libcatalyst-actionrole-acl-perl,
- libcatalyst-controller-actionrole-perl,
libcatalyst-modules-perl,
- libcatalyst-perl,
+ libcatalyst-perl (>= 5.90013),
libcatalyst-view-tt-perl,
libcatalystx-injectcomponent-perl,
libhtml-formhandler-perl,
@@ -33,7 +32,7 @@
Depends: ${misc:Depends}, ${perl:Depends},
libcatalyst-action-rest-perl,
libcatalyst-modules-perl,
- libcatalyst-perl,
+ libcatalyst-perl (>= 5.90013),
libcatalyst-view-tt-perl,
libcatalystx-injectcomponent-perl,
libhtml-formhandler-perl,
diff -Nru libcatalystx-simplelogin-perl-0.15/debian/patches/pod.patch libcatalystx-simplelogin-perl-0.17/debian/patches/pod.patch
--- libcatalystx-simplelogin-perl-0.15/debian/patches/pod.patch 2012-04-07 00:00:16.000000000 +0200
+++ libcatalystx-simplelogin-perl-0.17/debian/patches/pod.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-Description: add whatis entries
-Origin: vendor
-Bug: https://rt.cpan.org/Ticket/Display.html?id=76365
-Forwarded: https://rt.cpan.org/Ticket/Display.html?id=76365
-Author: gregor herrmann <gregoa@debian.org>
-Last-Update: 2012-04-06
-
---- a/lib/CatalystX/SimpleLogin/TraitFor/Controller/Login/Logout.pm
-+++ b/lib/CatalystX/SimpleLogin/TraitFor/Controller/Login/Logout.pm
-@@ -36,7 +36,7 @@
-
- =head1 NAME
-
--CatalystX::SimpleLogin::TraitFor::Controller::Login::Logout
-+CatalystX::SimpleLogin::TraitFor::Controller::Login::Logout - log users out
-
- =head1 DESCRIPTION
-
---- a/lib/CatalystX/SimpleLogin/TraitFor/Controller/Login/RenderAsTTTemplate.pm
-+++ b/lib/CatalystX/SimpleLogin/TraitFor/Controller/Login/RenderAsTTTemplate.pm
-@@ -19,7 +19,7 @@
-
- =head1 NAME
-
--CatalystX::SimpleLogin::TraitFor::Controller::Login::RenderAsTTTemplate
-+CatalystX::SimpleLogin::TraitFor::Controller::Login::RenderAsTTTemplate - render a login form with no template file
-
- =head1 DESCRIPTION
-
diff -Nru libcatalystx-simplelogin-perl-0.15/debian/patches/series libcatalystx-simplelogin-perl-0.17/debian/patches/series
--- libcatalystx-simplelogin-perl-0.15/debian/patches/series 2012-04-07 00:00:16.000000000 +0200
+++ libcatalystx-simplelogin-perl-0.17/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-pod.patch
diff -Nru libcatalystx-simplelogin-perl-0.15/inc/Module/AutoInstall.pm libcatalystx-simplelogin-perl-0.17/inc/Module/AutoInstall.pm
--- libcatalystx-simplelogin-perl-0.15/inc/Module/AutoInstall.pm 2011-09-06 11:00:02.000000000 +0200
+++ libcatalystx-simplelogin-perl-0.17/inc/Module/AutoInstall.pm 2012-07-15 19:24:12.000000000 +0200
@@ -3,11 +3,12 @@
use strict;
use Cwd ();
+use File::Spec ();
use ExtUtils::MakeMaker ();
use vars qw{$VERSION};
BEGIN {
- $VERSION = '1.03';
+ $VERSION = '1.06';
}
# special map on pre-defined feature sets
@@ -17,11 +18,14 @@
);
# various lexical flags
-my ( @Missing, @Existing, %DisabledTests, $UnderCPAN, $HasCPANPLUS );
+my ( @Missing, @Existing, %DisabledTests, $UnderCPAN, $InstallDepsTarget, $HasCPANPLUS );
my (
- $Config, $CheckOnly, $SkipInstall, $AcceptDefault, $TestOnly, $AllDeps
+ $Config, $CheckOnly, $SkipInstall, $AcceptDefault, $TestOnly, $AllDeps,
+ $UpgradeDeps
);
-my ( $PostambleActions, $PostambleUsed );
+my ( $PostambleActions, $PostambleActionsNoTest, $PostambleActionsUpgradeDeps,
+ $PostambleActionsUpgradeDepsNoTest, $PostambleActionsListDeps,
+ $PostambleActionsListAllDeps, $PostambleUsed, $NoTest);
# See if it's a testing or non-interactive session
_accept_default( $ENV{AUTOMATED_TESTING} or ! -t STDIN );
@@ -31,6 +35,10 @@
$AcceptDefault = shift;
}
+sub _installdeps_target {
+ $InstallDepsTarget = shift;
+}
+
sub missing_modules {
return @Missing;
}
@@ -63,6 +71,11 @@
__PACKAGE__->install( $Config, @Missing = split( /,/, $1 ) );
exit 0;
}
+ elsif ( $arg =~ /^--upgradedeps=(.*)$/ ) {
+ $UpgradeDeps = 1;
+ __PACKAGE__->install( $Config, @Missing = split( /,/, $1 ) );
+ exit 0;
+ }
elsif ( $arg =~ /^--default(?:deps)?$/ ) {
$AcceptDefault = 1;
}
@@ -125,7 +138,7 @@
# check entirely since we don't want to have to load (and configure)
# an old CPAN just for a cosmetic message
- $UnderCPAN = _check_lock(1) unless $SkipInstall;
+ $UnderCPAN = _check_lock(1) unless $SkipInstall || $InstallDepsTarget;
while ( my ( $feature, $modules ) = splice( @args, 0, 2 ) ) {
my ( @required, @tests, @skiptests );
@@ -175,7 +188,7 @@
}
# XXX: check for conflicts and uninstalls(!) them.
- my $cur = _load($mod);
+ my $cur = _version_of($mod);
if (_version_cmp ($cur, $arg) >= 0)
{
print "loaded. ($cur" . ( $arg ? " >= $arg" : '' ) . ")\n";
@@ -207,6 +220,7 @@
$CheckOnly
or ($mandatory and $UnderCPAN)
or $AllDeps
+ or $InstallDepsTarget
or _prompt(
qq{==> Auto-install the }
. ( @required / 2 )
@@ -237,10 +251,17 @@
}
}
- if ( @Missing and not( $CheckOnly or $UnderCPAN ) ) {
+ if ( @Missing and not( $CheckOnly or $UnderCPAN) ) {
require Config;
- print
-"*** Dependencies will be installed the next time you type '$Config::Config{make}'.\n";
+ my $make = $Config::Config{make};
+ if ($InstallDepsTarget) {
+ print
+"*** To install dependencies type '$make installdeps' or '$make installdeps_notest'.\n";
+ }
+ else {
+ print
+"*** Dependencies will be installed the next time you type '$make'.\n";
+ }
# make an educated guess of whether we'll need root permission.
print " (You may need to do that as the 'root' user.)\n"
@@ -271,6 +292,10 @@
sub _check_lock {
return unless @Missing or @_;
+ if ($ENV{PERL5_CPANM_IS_RUNNING}) {
+ return _running_under('cpanminus');
+ }
+
my $cpan_env = $ENV{PERL5_CPAN_IS_RUNNING};
if ($ENV{PERL5_CPANPLUS_IS_RUNNING}) {
@@ -324,7 +349,7 @@
while ( my ( $pkg, $ver ) = splice( @_, 0, 2 ) ) {
# grep out those already installed
- if ( _version_cmp( _load($pkg), $ver ) >= 0 ) {
+ if ( _version_cmp( _version_of($pkg), $ver ) >= 0 ) {
push @installed, $pkg;
}
else {
@@ -332,6 +357,11 @@
}
}
+ if ($UpgradeDeps) {
+ push @modules, @installed;
+ @installed = ();
+ }
+
return @installed unless @modules; # nothing to do
return @installed if _check_lock(); # defer to the CPAN shell
@@ -363,7 +393,7 @@
# see if we have successfully installed them
while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) {
- if ( _version_cmp( _load($pkg), $ver ) >= 0 ) {
+ if ( _version_cmp( _version_of($pkg), $ver ) >= 0 ) {
push @installed, $pkg;
}
elsif ( $args{do_once} and open( FAILED, '>> .#autoinstall.failed' ) ) {
@@ -463,6 +493,11 @@
} else {
die "*** Cannot convert option $key = '$value' to CPANPLUS version.\n";
}
+ push @config, 'prereqs', $value;
+ } elsif ( $key eq 'force' ) {
+ push @config, $key, $value;
+ } elsif ( $key eq 'notest' ) {
+ push @config, 'skiptest', $value;
} else {
die "*** Cannot convert option $key to CPANPLUS version.\n";
}
@@ -497,10 +532,14 @@
# set additional options
while ( my ( $opt, $arg ) = splice( @config, 0, 2 ) ) {
( $args{$opt} = $arg, next )
- if $opt =~ /^force$/; # pseudo-option
+ if $opt =~ /^(?:force|notest)$/; # pseudo-option
$CPAN::Config->{$opt} = $arg;
}
+ if ($args{notest} && (not CPAN::Shell->can('notest'))) {
+ die "Your version of CPAN is too old to support the 'notest' pragma";
+ }
+
local $CPAN::Config->{prerequisites_policy} = 'follow';
while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) {
@@ -519,8 +558,16 @@
delete $INC{$inc};
}
- my $rv = $args{force} ? CPAN::Shell->force( install => $pkg )
- : CPAN::Shell->install($pkg);
+ my $rv = do {
+ if ($args{force}) {
+ CPAN::Shell->force( install => $pkg )
+ } elsif ($args{notest}) {
+ CPAN::Shell->notest( install => $pkg )
+ } else {
+ CPAN::Shell->install($pkg)
+ }
+ };
+
$rv ||= eval {
$CPAN::META->instance( 'CPAN::Distribution', $obj->cpan_file, )
->{install}
@@ -575,7 +622,7 @@
my $ver = shift;
return
- if _version_cmp( _load($class), $ver ) >= 0; # no need to upgrade
+ if _version_cmp( _version_of($class), $ver ) >= 0; # no need to upgrade
if (
_prompt( "==> A newer version of $class ($ver) is required. Install?",
@@ -660,16 +707,30 @@
# load a module and return the version it reports
sub _load {
- my $mod = pop; # class/instance doesn't matter
+ my $mod = pop; # method/function doesn't matter
my $file = $mod;
-
$file =~ s|::|/|g;
$file .= '.pm';
-
local $@;
return eval { require $file; $mod->VERSION } || ( $@ ? undef: 0 );
}
+# report version without loading a module
+sub _version_of {
+ my $mod = pop; # method/function doesn't matter
+ my $file = $mod;
+ $file =~ s|::|/|g;
+ $file .= '.pm';
+ foreach my $dir ( @INC ) {
+ next if ref $dir;
+ my $path = File::Spec->catfile($dir, $file);
+ next unless -e $path;
+ require ExtUtils::MM_Unix;
+ return ExtUtils::MM_Unix->parse_version($path);
+ }
+ return undef;
+}
+
# Load CPAN.pm and it's configuration
sub _load_cpan {
return if $CPAN::VERSION and $CPAN::Config and not @_;
@@ -763,6 +824,35 @@
: "\$(NOECHO) \$(NOOP)"
);
+ my $deps_list = join( ',', @Missing, @Existing );
+
+ $PostambleActionsUpgradeDeps =
+ "\$(PERL) $0 --config=$config --upgradedeps=$deps_list";
+
+ my $config_notest =
+ join( ',', (UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config}),
+ 'notest', 1 )
+ if $Config;
+
+ $PostambleActionsNoTest = (
+ ($missing and not $UnderCPAN)
+ ? "\$(PERL) $0 --config=$config_notest --installdeps=$missing"
+ : "\$(NOECHO) \$(NOOP)"
+ );
+
+ $PostambleActionsUpgradeDepsNoTest =
+ "\$(PERL) $0 --config=$config_notest --upgradedeps=$deps_list";
+
+ $PostambleActionsListDeps =
+ '@$(PERL) -le "print for @ARGV" '
+ . join(' ', map $Missing[$_], grep $_ % 2 == 0, 0..$#Missing);
+
+ my @all = (@Missing, @Existing);
+
+ $PostambleActionsListAllDeps =
+ '@$(PERL) -le "print for @ARGV" '
+ . join(' ', map $all[$_], grep $_ % 2 == 0, 0..$#all);
+
return %args;
}
@@ -797,11 +887,15 @@
sub postamble {
$PostambleUsed = 1;
+ my $fragment;
- return <<"END_MAKE";
+ $fragment .= <<"AUTO_INSTALL" if !$InstallDepsTarget;
config :: installdeps
\t\$(NOECHO) \$(NOOP)
+AUTO_INSTALL
+
+ $fragment .= <<"END_MAKE";
checkdeps ::
\t\$(PERL) $0 --checkdeps
@@ -809,12 +903,28 @@
installdeps ::
\t$PostambleActions
+installdeps_notest ::
+\t$PostambleActionsNoTest
+
+upgradedeps ::
+\t$PostambleActionsUpgradeDeps
+
+upgradedeps_notest ::
+\t$PostambleActionsUpgradeDepsNoTest
+
+listdeps ::
+\t$PostambleActionsListDeps
+
+listalldeps ::
+\t$PostambleActionsListAllDeps
+
END_MAKE
+ return $fragment;
}
1;
__END__
-#line 1071
+#line 1193
diff -Nru libcatalystx-simplelogin-perl-0.15/inc/Module/Install/AutoInstall.pm libcatalystx-simplelogin-perl-0.17/inc/Module/Install/AutoInstall.pm
--- libcatalystx-simplelogin-perl-0.15/inc/Module/Install/AutoInstall.pm 2011-09-06 11:00:02.000000000 +0200
+++ libcatalystx-simplelogin-perl-0.17/inc/Module/Install/AutoInstall.pm 2012-07-15 19:24:12.000000000 +0200
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -73,6 +73,17 @@
);
}
+sub installdeps_target {
+ my ($self, @args) = @_;
+
+ $self->include('Module::AutoInstall');
+ require Module::AutoInstall;
+
+ Module::AutoInstall::_installdeps_target(1);
+
+ $self->auto_install(@args);
+}
+
sub auto_install_now {
my $self = shift;
$self->auto_install(@_);
diff -Nru libcatalystx-simplelogin-perl-0.15/inc/Module/Install/Base.pm libcatalystx-simplelogin-perl-0.17/inc/Module/Install/Base.pm
--- libcatalystx-simplelogin-perl-0.15/inc/Module/Install/Base.pm 2011-09-06 11:00:01.000000000 +0200
+++ libcatalystx-simplelogin-perl-0.17/inc/Module/Install/Base.pm 2012-07-15 19:24:11.000000000 +0200
@@ -4,7 +4,7 @@
use strict 'vars';
use vars qw{$VERSION};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
}
# Suspend handler for "redefined" warnings
diff -Nru libcatalystx-simplelogin-perl-0.15/inc/Module/Install/Can.pm libcatalystx-simplelogin-perl-0.17/inc/Module/Install/Can.pm
--- libcatalystx-simplelogin-perl-0.15/inc/Module/Install/Can.pm 2011-09-06 11:00:02.000000000 +0200
+++ libcatalystx-simplelogin-perl-0.17/inc/Module/Install/Can.pm 2012-07-15 19:24:11.000000000 +0200
@@ -3,13 +3,12 @@
use strict;
use Config ();
-use File::Spec ();
use ExtUtils::MakeMaker ();
use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -29,7 +28,7 @@
eval { require $mod; $pkg->VERSION($ver || 0); 1 };
}
-# check if we can run some command
+# Check if we can run some command
sub can_run {
my ($self, $cmd) = @_;
@@ -38,14 +37,88 @@
for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
next if $dir eq '';
- my $abs = File::Spec->catfile($dir, $_[1]);
+ require File::Spec;
+ my $abs = File::Spec->catfile($dir, $cmd);
return $abs if (-x $abs or $abs = MM->maybe_command($abs));
}
return;
}
-# can we locate a (the) C compiler
+# Can our C compiler environment build XS files
+sub can_xs {
+ my $self = shift;
+
+ # Ensure we have the CBuilder module
+ $self->configure_requires( 'ExtUtils::CBuilder' => 0.27 );
+
+ # Do we have the configure_requires checker?
+ local $@;
+ eval "require ExtUtils::CBuilder;";
+ if ( $@ ) {
+ # They don't obey configure_requires, so it is
+ # someone old and delicate. Try to avoid hurting
+ # them by falling back to an older simpler test.
+ return $self->can_cc();
+ }
+
+ # Do we have a working C compiler
+ my $builder = ExtUtils::CBuilder->new(
+ quiet => 1,
+ );
+ unless ( $builder->have_compiler ) {
+ # No working C compiler
+ return 0;
+ }
+
+ # Write a C file representative of what XS becomes
+ require File::Temp;
+ my ( $FH, $tmpfile ) = File::Temp::tempfile(
+ "compilexs-XXXXX",
+ SUFFIX => '.c',
+ );
+ binmode $FH;
+ print $FH <<'END_C';
+#include "EXTERN.h"
+#include "perl.h"
+#include "XSUB.h"
+
+int main(int argc, char **argv) {
+ return 0;
+}
+
+int boot_sanexs() {
+ return 1;
+}
+
+END_C
+ close $FH;
+
+ # Can the C compiler access the same headers XS does
+ my @libs = ();
+ my $object = undef;
+ eval {
+ local $^W = 0;
+ $object = $builder->compile(
+ source => $tmpfile,
+ );
+ @libs = $builder->link(
+ objects => $object,
+ module_name => 'sanexs',
+ );
+ };
+ my $result = $@ ? 0 : 1;
+
+ # Clean up all the build files
+ foreach ( $tmpfile, $object, @libs ) {
+ next unless defined $_;
+ 1 while unlink;
+ }
+
+ return $result;
+}
+
+# Can we locate a (the) C compiler
sub can_cc {
my $self = shift;
my @chunks = split(/ /, $Config::Config{cc}) or return;
@@ -78,4 +151,4 @@
__END__
-#line 156
+#line 236
diff -Nru libcatalystx-simplelogin-perl-0.15/inc/Module/Install/Fetch.pm libcatalystx-simplelogin-perl-0.17/inc/Module/Install/Fetch.pm
--- libcatalystx-simplelogin-perl-0.15/inc/Module/Install/Fetch.pm 2011-09-06 11:00:04.000000000 +0200
+++ libcatalystx-simplelogin-perl-0.17/inc/Module/Install/Fetch.pm 2012-07-15 19:24:12.000000000 +0200
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff -Nru libcatalystx-simplelogin-perl-0.15/inc/Module/Install/Include.pm libcatalystx-simplelogin-perl-0.17/inc/Module/Install/Include.pm
--- libcatalystx-simplelogin-perl-0.15/inc/Module/Install/Include.pm 2011-09-06 11:00:02.000000000 +0200
+++ libcatalystx-simplelogin-perl-0.17/inc/Module/Install/Include.pm 2012-07-15 19:24:12.000000000 +0200
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff -Nru libcatalystx-simplelogin-perl-0.15/inc/Module/Install/Makefile.pm libcatalystx-simplelogin-perl-0.17/inc/Module/Install/Makefile.pm
--- libcatalystx-simplelogin-perl-0.15/inc/Module/Install/Makefile.pm 2011-09-06 11:00:01.000000000 +0200
+++ libcatalystx-simplelogin-perl-0.17/inc/Module/Install/Makefile.pm 2012-07-15 19:24:11.000000000 +0200
@@ -8,7 +8,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -215,18 +215,22 @@
require ExtUtils::MakeMaker;
if ( $perl_version and $self->_cmp($perl_version, '5.006') >= 0 ) {
- # MakeMaker can complain about module versions that include
- # an underscore, even though its own version may contain one!
- # Hence the funny regexp to get rid of it. See RT #35800
- # for details.
- my $v = $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/;
- $self->build_requires( 'ExtUtils::MakeMaker' => $v );
- $self->configure_requires( 'ExtUtils::MakeMaker' => $v );
+ # This previous attempted to inherit the version of
+ # ExtUtils::MakeMaker in use by the module author, but this
+ # was found to be untenable as some authors build releases
+ # using future dev versions of EU:MM that nobody else has.
+ # Instead, #toolchain suggests we use 6.59 which is the most
+ # stable version on CPAN at time of writing and is, to quote
+ # ribasushi, "not terminally fucked, > and tested enough".
+ # TODO: We will now need to maintain this over time to push
+ # the version up as new versions are released.
+ $self->build_requires( 'ExtUtils::MakeMaker' => 6.59 );
+ $self->configure_requires( 'ExtUtils::MakeMaker' => 6.59 );
} 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->configure_requires( 'ExtUtils::MakeMaker' => 6.42 );
+ $self->build_requires( 'ExtUtils::MakeMaker' => 6.36 );
+ $self->configure_requires( 'ExtUtils::MakeMaker' => 6.36 );
}
# Generate the MakeMaker params
@@ -241,7 +245,6 @@
'all_from' if you prefer) in Makefile.PL.
EOT
- $DB::single = 1;
if ( $self->tests ) {
my @tests = split ' ', $self->tests;
my %seen;
@@ -412,4 +415,4 @@
__END__
-#line 541
+#line 544
diff -Nru libcatalystx-simplelogin-perl-0.15/inc/Module/Install/Metadata.pm libcatalystx-simplelogin-perl-0.17/inc/Module/Install/Metadata.pm
--- libcatalystx-simplelogin-perl-0.15/inc/Module/Install/Metadata.pm 2011-09-06 11:00:01.000000000 +0200
+++ libcatalystx-simplelogin-perl-0.17/inc/Module/Install/Metadata.pm 2012-07-15 19:24:11.000000000 +0200
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -151,15 +151,21 @@
sub install_as_vendor { $_[0]->installdirs('vendor') }
sub dynamic_config {
- my $self = shift;
- unless ( @_ ) {
- warn "You MUST provide an explicit true/false value to dynamic_config\n";
- return $self;
+ my $self = shift;
+ my $value = @_ ? shift : 1;
+ if ( $self->{values}->{dynamic_config} ) {
+ # Once dynamic we never change to static, for safety
+ return 0;
}
- $self->{values}->{dynamic_config} = $_[0] ? 1 : 0;
+ $self->{values}->{dynamic_config} = $value ? 1 : 0;
return 1;
}
+# Convenience command
+sub static_config {
+ shift->dynamic_config(0);
+}
+
sub perl_version {
my $self = shift;
return $self->{values}->{perl_version} unless @_;
@@ -170,7 +176,7 @@
# Normalize the version
$version = $self->_perl_version($version);
- # We don't support the reall old versions
+ # We don't support the really old versions
unless ( $version >= 5.005 ) {
die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n";
}
@@ -582,7 +588,7 @@
sub requires_from {
my $self = shift;
my $content = Module::Install::_readperl($_[0]);
- my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg;
+ my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+(v?[\d\.]+)/mg;
while ( @requires ) {
my $module = shift @requires;
my $version = shift @requires;
diff -Nru libcatalystx-simplelogin-perl-0.15/inc/Module/Install/Win32.pm libcatalystx-simplelogin-perl-0.17/inc/Module/Install/Win32.pm
--- libcatalystx-simplelogin-perl-0.15/inc/Module/Install/Win32.pm 2011-09-06 11:00:04.000000000 +0200
+++ libcatalystx-simplelogin-perl-0.17/inc/Module/Install/Win32.pm 2012-07-15 19:24:12.000000000 +0200
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff -Nru libcatalystx-simplelogin-perl-0.15/inc/Module/Install/WriteAll.pm libcatalystx-simplelogin-perl-0.17/inc/Module/Install/WriteAll.pm
--- libcatalystx-simplelogin-perl-0.15/inc/Module/Install/WriteAll.pm 2011-09-06 11:00:04.000000000 +0200
+++ libcatalystx-simplelogin-perl-0.17/inc/Module/Install/WriteAll.pm 2012-07-15 19:24:12.000000000 +0200
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
diff -Nru libcatalystx-simplelogin-perl-0.15/inc/Module/Install.pm libcatalystx-simplelogin-perl-0.17/inc/Module/Install.pm
--- libcatalystx-simplelogin-perl-0.15/inc/Module/Install.pm 2011-09-06 11:00:01.000000000 +0200
+++ libcatalystx-simplelogin-perl-0.17/inc/Module/Install.pm 2012-07-15 19:24:11.000000000 +0200
@@ -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.06';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -451,7 +451,7 @@
}
sub _cmp ($$) {
- _version($_[0]) <=> _version($_[1]);
+ _version($_[1]) <=> _version($_[2]);
}
# Cloned from Params::Util::_CLASS
@@ -467,4 +467,4 @@
1;
-# Copyright 2008 - 2011 Adam Kennedy.
+# Copyright 2008 - 2012 Adam Kennedy.
diff -Nru libcatalystx-simplelogin-perl-0.15/lib/Catalyst/ActionRole/NeedsLogin.pm libcatalystx-simplelogin-perl-0.17/lib/Catalyst/ActionRole/NeedsLogin.pm
--- libcatalystx-simplelogin-perl-0.15/lib/Catalyst/ActionRole/NeedsLogin.pm 2011-09-06 00:06:58.000000000 +0200
+++ libcatalystx-simplelogin-perl-0.17/lib/Catalyst/ActionRole/NeedsLogin.pm 2012-07-15 19:22:33.000000000 +0200
@@ -30,13 +30,13 @@
=head1 SYNOPSIS
package MyApp::Controller::NeedsAuth;
-
+
use Moose;
use namespace::autoclean;
- # One needs to inherit from Catalyst::Controller::ActionRole in order
+ # One needs to inherit from Catalyst::Controller in order
# to get the Does('NeedsLogin') functionality.
- BEGIN { extends 'Catalyst::Controller::ActionRole'; }
+ BEGIN { extends 'Catalyst::Controller'; }
sub inbox : Path Does('NeedsLogin') {
# Redirects to /login if not logged in
@@ -74,9 +74,9 @@
=over
-=item L<CatalystX::SimpleLogin::ControllerRole::Login::WithRedirect>
+=item L<CatalystX::SimpleLogin::TraitFor::Controller::Login::WithRedirect>
-=item L<CatalystX::SimpleLogin::ControllerRole::Login>
+=item L<CatalystX::SimpleLogin::Controller::Login>
=item L<CatalystX::SimpleLogin::Form::Login>
diff -Nru libcatalystx-simplelogin-perl-0.15/lib/CatalystX/SimpleLogin/Controller/Login.pm libcatalystx-simplelogin-perl-0.17/lib/CatalystX/SimpleLogin/Controller/Login.pm
--- libcatalystx-simplelogin-perl-0.15/lib/CatalystX/SimpleLogin/Controller/Login.pm 2011-09-06 00:06:58.000000000 +0200
+++ libcatalystx-simplelogin-perl-0.17/lib/CatalystX/SimpleLogin/Controller/Login.pm 2012-07-15 19:22:39.000000000 +0200
@@ -6,7 +6,7 @@
use CatalystX::SimpleLogin::Form::Login;
use namespace::autoclean;
-BEGIN { extends 'Catalyst::Controller::ActionRole'; }
+BEGIN { extends 'Catalyst::Controller'; }
with qw(
CatalystX::Component::Traits
diff -Nru libcatalystx-simplelogin-perl-0.15/lib/CatalystX/SimpleLogin/Manual.pod libcatalystx-simplelogin-perl-0.17/lib/CatalystX/SimpleLogin/Manual.pod
--- libcatalystx-simplelogin-perl-0.15/lib/CatalystX/SimpleLogin/Manual.pod 2011-09-06 00:06:09.000000000 +0200
+++ libcatalystx-simplelogin-perl-0.17/lib/CatalystX/SimpleLogin/Manual.pod 2012-07-15 19:22:42.000000000 +0200
@@ -77,7 +77,7 @@
use Moose;
use namespace::autoclean;
- BEGIN { extends 'Catalyst::Controller::ActionRole' }
+ BEGIN { extends 'Catalyst::Controller' }
Now add a new action to C< lib/MyApp/Controller/Root.pm > and include
C< Does('NeedsLogin') > to use the Catalyst ActionRole that is part of SimpleLogin:
@@ -136,7 +136,7 @@
);
package MyApp::Controller::Foo;
- BEGIN { extends 'Catalyst::Controller::ActionRole' }
+ BEGIN { extends 'Catalyst::Controller' }
sub do_something : Chained('/login/required')
: Does('ACL') RequiresRole('createinvoice') ACLDetachTo('/login') {}
diff -Nru libcatalystx-simplelogin-perl-0.15/lib/CatalystX/SimpleLogin/TraitFor/Controller/Login/Logout.pm libcatalystx-simplelogin-perl-0.17/lib/CatalystX/SimpleLogin/TraitFor/Controller/Login/Logout.pm
--- libcatalystx-simplelogin-perl-0.15/lib/CatalystX/SimpleLogin/TraitFor/Controller/Login/Logout.pm 2011-09-06 00:06:09.000000000 +0200
+++ libcatalystx-simplelogin-perl-0.17/lib/CatalystX/SimpleLogin/TraitFor/Controller/Login/Logout.pm 2012-05-05 13:42:48.000000000 +0200
@@ -36,7 +36,7 @@
=head1 NAME
-CatalystX::SimpleLogin::TraitFor::Controller::Login::Logout
+CatalystX::SimpleLogin::TraitFor::Controller::Login::Logout - log users out
=head1 DESCRIPTION
diff -Nru libcatalystx-simplelogin-perl-0.15/lib/CatalystX/SimpleLogin/TraitFor/Controller/Login/RenderAsTTTemplate.pm libcatalystx-simplelogin-perl-0.17/lib/CatalystX/SimpleLogin/TraitFor/Controller/Login/RenderAsTTTemplate.pm
--- libcatalystx-simplelogin-perl-0.15/lib/CatalystX/SimpleLogin/TraitFor/Controller/Login/RenderAsTTTemplate.pm 2011-09-06 00:06:09.000000000 +0200
+++ libcatalystx-simplelogin-perl-0.17/lib/CatalystX/SimpleLogin/TraitFor/Controller/Login/RenderAsTTTemplate.pm 2012-05-05 13:42:48.000000000 +0200
@@ -19,7 +19,7 @@
=head1 NAME
-CatalystX::SimpleLogin::TraitFor::Controller::Login::RenderAsTTTemplate
+CatalystX::SimpleLogin::TraitFor::Controller::Login::RenderAsTTTemplate - render a login form with no template file
=head1 DESCRIPTION
diff -Nru libcatalystx-simplelogin-perl-0.15/lib/CatalystX/SimpleLogin/TraitFor/Controller/Login/WithRedirect.pm libcatalystx-simplelogin-perl-0.17/lib/CatalystX/SimpleLogin/TraitFor/Controller/Login/WithRedirect.pm
--- libcatalystx-simplelogin-perl-0.15/lib/CatalystX/SimpleLogin/TraitFor/Controller/Login/WithRedirect.pm 2011-09-06 00:09:17.000000000 +0200
+++ libcatalystx-simplelogin-perl-0.17/lib/CatalystX/SimpleLogin/TraitFor/Controller/Login/WithRedirect.pm 2012-07-15 19:22:50.000000000 +0200
@@ -41,9 +41,9 @@
use Moose;
use namespace::autoclean;
- # One needs to inherit from Catalyst::Controller::ActionRole in order
+ # One needs to inherit from Catalyst::Controller in order
# to get the Does('NeedsLogin') functionality.
- BEGIN { extends 'Catalyst::Controller::ActionRole'; }
+ BEGIN { extends 'Catalyst::Controller'; }
sub inbox : Path Does('NeedsLogin') {
# Redirects to /login if not logged in
diff -Nru libcatalystx-simplelogin-perl-0.15/lib/CatalystX/SimpleLogin.pm libcatalystx-simplelogin-perl-0.17/lib/CatalystX/SimpleLogin.pm
--- libcatalystx-simplelogin-perl-0.15/lib/CatalystX/SimpleLogin.pm 2011-09-06 10:59:41.000000000 +0200
+++ libcatalystx-simplelogin-perl-0.17/lib/CatalystX/SimpleLogin.pm 2012-07-15 19:23:40.000000000 +0200
@@ -3,7 +3,7 @@
use CatalystX::InjectComponent;
use namespace::autoclean;
-our $VERSION = '0.15';
+our $VERSION = '0.17';
after 'setup_components' => sub {
my $class = shift;
@@ -193,7 +193,7 @@
=item *
-L<Catalyst::Controller::ActionRole> - Allows you to decorate actions with roles (E.g L<Catalyst::ActionRole::NeedsLogin|To force a redirect to the login page>)
+L<Catalyst::Controller> - Allows you to decorate actions with roles (E.g L<Catalyst::ActionRole::NeedsLogin|To force a redirect to the login page>)
=item *
diff -Nru libcatalystx-simplelogin-perl-0.15/Makefile.PL libcatalystx-simplelogin-perl-0.17/Makefile.PL
--- libcatalystx-simplelogin-perl-0.15/Makefile.PL 2010-06-02 18:04:18.000000000 +0200
+++ libcatalystx-simplelogin-perl-0.17/Makefile.PL 2012-07-13 16:39:40.000000000 +0200
@@ -27,6 +27,7 @@
test_requires 'Test::More' => '0.94';
test_requires 'Test::Exception';
+test_requires 'File::Temp';
test_requires 'Catalyst::Action::RenderView';
test_requires 'Catalyst::Plugin::Session::State::Cookie';
test_requires 'Catalyst::Plugin::Session::Store::File';
@@ -36,7 +37,6 @@
test_requires 'CatalystX::InjectComponent';
test_requires 'SQL::Translator';
-author_requires 'Catalyst::Authentication::Credential::OpenID';
author_requires 'Test::EOL' => '0.3';
author_requires 'Test::NoTabs';
author_requires 'Test::Pod' => '1.14';
diff -Nru libcatalystx-simplelogin-perl-0.15/META.yml libcatalystx-simplelogin-perl-0.17/META.yml
--- libcatalystx-simplelogin-perl-0.15/META.yml 2011-09-06 11:00:04.000000000 +0200
+++ libcatalystx-simplelogin-perl-0.17/META.yml 2012-07-15 19:24:13.000000000 +0200
@@ -9,15 +9,17 @@
Catalyst::Plugin::Session::State::Cookie: 0
Catalyst::Plugin::Session::Store::File: 0
CatalystX::InjectComponent: 0
- ExtUtils::MakeMaker: 6.42
+ ExtUtils::MakeMaker: 6.36
+ File::Temp: 0
HTTP::Request::Common: 0
SQL::Translator: 0
Test::Exception: 0
Test::More: 0.94
configure_requires:
- ExtUtils::MakeMaker: 6.42
+ ExtUtils::MakeMaker: 6.36
distribution_type: module
-generated_by: 'Module::Install version 1.01'
+dynamic_config: 1
+generated_by: 'Module::Install version 1.06'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -32,7 +34,7 @@
file: lib/Catalyst/ActionRole/NeedsLogin.pm
CatalystX::SimpleLogin:
file: lib/CatalystX/SimpleLogin.pm
- version: 0.15
+ version: 0.17
CatalystX::SimpleLogin::Controller::Login:
file: lib/CatalystX/SimpleLogin/Controller/Login.pm
CatalystX::SimpleLogin::Form::Login:
@@ -66,4 +68,4 @@
resources:
license: http://dev.perl.org/licenses/
repository: git://github.com/bobtfish/catalystx-simplelogin.git
-version: 0.15
+version: 0.17
diff -Nru libcatalystx-simplelogin-perl-0.15/README libcatalystx-simplelogin-perl-0.17/README
--- libcatalystx-simplelogin-perl-0.15/README 2011-09-06 11:00:02.000000000 +0200
+++ libcatalystx-simplelogin-perl-0.17/README 2012-07-15 19:24:12.000000000 +0200
@@ -125,8 +125,8 @@
* Catalyst::Plugin::Session
- * Catalyst::Controller::ActionRole - Allows you to decorate actions
- with roles (E.g Catalyst::ActionRole::NeedsLogin)
+ * Catalyst::Controller - Allows you to decorate actions with roles
+ (E.g Catalyst::ActionRole::NeedsLogin)
* CatalystX::Component::Traits - Allows Moose::Role to be composed
onto components from config
diff -Nru libcatalystx-simplelogin-perl-0.15/t/author/pod-coverage.t libcatalystx-simplelogin-perl-0.17/t/author/pod-coverage.t
--- libcatalystx-simplelogin-perl-0.15/t/author/pod-coverage.t 2009-07-28 10:36:52.000000000 +0200
+++ libcatalystx-simplelogin-perl-0.17/t/author/pod-coverage.t 2012-07-13 15:10:37.000000000 +0200
@@ -1,4 +1,4 @@
-#!perl -T
+#!perl
use Test::More;
eval "use Test::Pod::Coverage 1.08";
diff -Nru libcatalystx-simplelogin-perl-0.15/t/lib/TestApp/Controller/ChainedExample.pm libcatalystx-simplelogin-perl-0.17/t/lib/TestApp/Controller/ChainedExample.pm
--- libcatalystx-simplelogin-perl-0.15/t/lib/TestApp/Controller/ChainedExample.pm 2010-02-20 19:09:34.000000000 +0100
+++ libcatalystx-simplelogin-perl-0.17/t/lib/TestApp/Controller/ChainedExample.pm 2012-07-13 15:01:16.000000000 +0200
@@ -2,7 +2,7 @@
use Moose;
use namespace::autoclean;
-BEGIN { extends 'Catalyst::Controller::ActionRole' }
+BEGIN { extends 'Catalyst::Controller' }
sub base : Chained('/login/required') PathPart('chainedexample') CaptureArgs(0) {} # Chain everything in the controller off of here.
diff -Nru libcatalystx-simplelogin-perl-0.15/t/lib/TestApp/Controller/NeedsAuth.pm libcatalystx-simplelogin-perl-0.17/t/lib/TestApp/Controller/NeedsAuth.pm
--- libcatalystx-simplelogin-perl-0.15/t/lib/TestApp/Controller/NeedsAuth.pm 2010-01-27 22:48:54.000000000 +0100
+++ libcatalystx-simplelogin-perl-0.17/t/lib/TestApp/Controller/NeedsAuth.pm 2012-07-13 15:01:18.000000000 +0200
@@ -2,7 +2,7 @@
use Moose;
use namespace::autoclean;
-BEGIN { extends 'Catalyst::Controller::ActionRole' }
+BEGIN { extends 'Catalyst::Controller' }
sub foo : Chained('/') PathPart('needsauth') Args(0) Does('NeedsLogin') {
my ($self, $c) = @_;
diff -Nru libcatalystx-simplelogin-perl-0.15/t/lib/TestAppBase/Controller/Root.pm libcatalystx-simplelogin-perl-0.17/t/lib/TestAppBase/Controller/Root.pm
--- libcatalystx-simplelogin-perl-0.15/t/lib/TestAppBase/Controller/Root.pm 2010-02-20 19:09:34.000000000 +0100
+++ libcatalystx-simplelogin-perl-0.17/t/lib/TestAppBase/Controller/Root.pm 2012-07-13 15:01:20.000000000 +0200
@@ -2,7 +2,7 @@
use Moose;
use namespace::autoclean;
-BEGIN { extends 'Catalyst::Controller::ActionRole' }
+BEGIN { extends 'Catalyst::Controller' }
__PACKAGE__->config(
namespace => '',
diff -Nru libcatalystx-simplelogin-perl-0.15/t/lib/TestAppBase.pm libcatalystx-simplelogin-perl-0.17/t/lib/TestAppBase.pm
--- libcatalystx-simplelogin-perl-0.15/t/lib/TestAppBase.pm 2009-12-13 20:58:36.000000000 +0100
+++ libcatalystx-simplelogin-perl-0.17/t/lib/TestAppBase.pm 2012-07-13 16:39:27.000000000 +0200
@@ -1,6 +1,7 @@
package TestAppBase;
use Moose;
use CatalystX::InjectComponent;
+use File::Temp qw/ tempdir /;
use namespace::autoclean;
use Catalyst qw/
@@ -42,6 +43,9 @@
},
},
},
+ 'Plugin::Session' => {
+ storage => tempdir( CLEANUP => 1 ),
+ },
);
after 'setup_components' => sub {
@@ -55,7 +59,7 @@
into => $app,
component => 'TestAppBase::View::HTML',
as => 'HTML',
- ) unless $app->controller('HTML');
+ ) unless $app->view('HTML');
};
1;
diff -Nru libcatalystx-simplelogin-perl-0.15/t/lib/TestAppFormArgs/Controller/NeedsAuth.pm libcatalystx-simplelogin-perl-0.17/t/lib/TestAppFormArgs/Controller/NeedsAuth.pm
--- libcatalystx-simplelogin-perl-0.15/t/lib/TestAppFormArgs/Controller/NeedsAuth.pm 2010-09-20 14:45:01.000000000 +0200
+++ libcatalystx-simplelogin-perl-0.17/t/lib/TestAppFormArgs/Controller/NeedsAuth.pm 2012-07-13 15:01:25.000000000 +0200
@@ -2,7 +2,7 @@
use Moose;
use namespace::autoclean;
-BEGIN { extends 'Catalyst::Controller::ActionRole' }
+BEGIN { extends 'Catalyst::Controller' }
sub foo : Chained('/') PathPart('needsauth') Args(0) Does('NeedsLogin') {
my ($self, $c) = @_;
diff -Nru libcatalyst-perl-5.90014/Changes libcatalyst-perl-5.90015/Changes
--- libcatalyst-perl-5.90014/Changes 2012-06-26 08:58:27.000000000 -0500
+++ libcatalyst-perl-5.90015/Changes 2012-06-30 12:53:37.000000000 -0500
@@ -1,5 +1,11 @@
# This file documents the revision history for Perl extension Catalyst.
+5.90015 - 2012-06-30 16:57:00
+ - Fix $c->finalize_headers getting called twice. RT#78090
+ - Fix test fails in Catalyst-Plugin-Session-State-Cookie. RT#76179
+ - Fix test fails in Catalyst-Plugin-StackTrace
+ - Fix test fails in Test-WWW-Mechanize-Catalyst
+
5.90014 - 2012-06-26 10:00:00
- Fix calling finalize_headers before writing body when using $c->write /
diff -Nru libcatalyst-perl-5.90014/debian/changelog libcatalyst-perl-5.90015/debian/changelog
--- libcatalyst-perl-5.90014/debian/changelog 2012-06-27 17:59:24.000000000 -0500
+++ libcatalyst-perl-5.90015/debian/changelog 2012-07-17 19:15:07.000000000 -0500
@@ -1,3 +1,20 @@
+libcatalyst-perl (5.90015-1) unstable; urgency=low
+
+ * Team upload.
+
+ [ Jotam Jr. Trejo ]
+ * Imported Upstream version 5.90015
+ - fixes the FTBFS in libtest-www-mechanize-catalyst-perl (Closes: #681422)
+ - fixes Catalyst-Plugin-StackTrace (Closes: #681423)
+ - fixes Catalyst-Plugin-Session-State-Cookie (Closes: #681425)
+ * Added myself to Uploaders and Copyright
+
+ [ intrigeri ]
+ * Drop erroneous and harmful Conflicts/Provides/Replaces
+ on libcatalyst-controller-actionrole-perl.
+
+ -- intrigeri <intrigeri@debian.org> Tue, 17 Jul 2012 19:10:37 -0500
+
libcatalyst-perl (5.90014-1) unstable; urgency=low
* Team upload.
diff -Nru libcatalyst-perl-5.90014/debian/control libcatalyst-perl-5.90015/debian/control
--- libcatalyst-perl-5.90014/debian/control 2012-06-27 17:59:24.000000000 -0500
+++ libcatalyst-perl-5.90015/debian/control 2012-07-17 19:15:07.000000000 -0500
@@ -59,7 +59,8 @@
Uploaders: Krzysztof Krzyżaniak (eloy) <eloy@debian.org>,
gregor herrmann <gregoa@debian.org>, Jonathan Yu <jawnsy@cpan.org>,
Franck Joncourt <franck@debian.org>, Ansgar Burchardt <ansgar@debian.org>,
- Florian Schlichting <fschlich@zedat.fu-berlin.de>
+ Florian Schlichting <fschlich@zedat.fu-berlin.de>,
+ Jotam Jr. Trejo <jotamjr@debian.org.sv>
Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/pkg-perl/packages/libcatalyst-perl.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libcatalyst-perl.git
@@ -122,9 +123,6 @@
libtest-pod-perl,
perl (>= 5.10.1) | libtest-simple-perl (>= 0.88)
Breaks: libcatalyst-modules-perl (<< 32~)
-Conflicts: libcatalyst-controller-actionrole-perl
-Replaces: libcatalyst-controller-actionrole-perl
-Provides: libcatalyst-controller-actionrole-perl
Description: elegant Model-View-Controller Web Application Framework
Catalyst is an elegant web application framework, extremely flexible yet very
simple. It's similar to Ruby on Rails, Spring (Java) and Maypole, upon which
diff -Nru libcatalyst-perl-5.90014/debian/copyright libcatalyst-perl-5.90015/debian/copyright
--- libcatalyst-perl-5.90014/debian/copyright 2012-06-27 17:59:24.000000000 -0500
+++ libcatalyst-perl-5.90015/debian/copyright 2012-07-17 19:15:07.000000000 -0500
@@ -94,6 +94,7 @@
2009-2011, gregor herrmann <gregoa@debian.org>
2005-2008, Florian Ragwitz <rafl@debian.org>
2012, Florian Schlichting <fschlich@zedat.fu-berlin.de>
+ 2012, Jotam Jr. Trejo <jotamjr@debian.org.sv>
License: Artistic or GPL-1+
License: Artistic
diff -Nru libcatalyst-perl-5.90014/lib/Catalyst/Engine.pm libcatalyst-perl-5.90015/lib/Catalyst/Engine.pm
--- libcatalyst-perl-5.90014/lib/Catalyst/Engine.pm 2012-06-26 08:55:12.000000000 -0500
+++ libcatalyst-perl-5.90015/lib/Catalyst/Engine.pm 2012-06-30 12:49:47.000000000 -0500
@@ -331,7 +331,7 @@
sub finalize_headers {
my ($self, $ctx) = @_;
- $ctx->response->finalize_headers;
+ $ctx->finalize_headers unless $ctx->response->finalized_headers;
return;
}
diff -Nru libcatalyst-perl-5.90014/lib/Catalyst/Response.pm libcatalyst-perl-5.90015/lib/Catalyst/Response.pm
--- libcatalyst-perl-5.90014/lib/Catalyst/Response.pm 2012-06-26 08:55:12.000000000 -0500
+++ libcatalyst-perl-5.90015/lib/Catalyst/Response.pm 2012-06-30 10:50:42.000000000 -0500
@@ -57,7 +57,7 @@
my ( $self, $buffer ) = @_;
# Finalize headers if someone manually writes output
- $self->_context->finalize_headers;
+ $self->_context->finalize_headers unless $self->finalized_headers;
$buffer = q[] unless defined $buffer;
diff -Nru libcatalyst-perl-5.90014/lib/Catalyst/Runtime.pm libcatalyst-perl-5.90015/lib/Catalyst/Runtime.pm
--- libcatalyst-perl-5.90014/lib/Catalyst/Runtime.pm 2012-06-26 09:01:47.000000000 -0500
+++ libcatalyst-perl-5.90015/lib/Catalyst/Runtime.pm 2012-06-30 10:57:38.000000000 -0500
@@ -7,7 +7,7 @@
# Remember to update this in Catalyst as well!
-our $VERSION = '5.90014';
+our $VERSION = '5.90015';
=head1 NAME
diff -Nru libcatalyst-perl-5.90014/lib/Catalyst.pm libcatalyst-perl-5.90015/lib/Catalyst.pm
--- libcatalyst-perl-5.90014/lib/Catalyst.pm 2012-06-26 08:58:58.000000000 -0500
+++ libcatalyst-perl-5.90015/lib/Catalyst.pm 2012-06-30 10:57:38.000000000 -0500
@@ -100,7 +100,7 @@
# Remember to update this in Catalyst::Runtime as well!
-our $VERSION = '5.90014';
+our $VERSION = '5.90015';
sub import {
my ( $class, @arguments ) = @_;
@@ -1788,7 +1788,7 @@
$c->finalize_error;
}
- $c->finalize_headers;
+ $c->finalize_headers unless $c->response->finalized_headers;
# HEAD request
if ( $c->request->method eq 'HEAD' ) {
@@ -1898,7 +1898,7 @@
$c->finalize_cookies;
- $c->engine->finalize_headers( $c, @_ );
+ $c->response->finalize_headers();
# Done
$response->finalized_headers(1);
diff -Nru libcatalyst-perl-5.90014/META.yml libcatalyst-perl-5.90015/META.yml
--- libcatalyst-perl-5.90014/META.yml 2012-06-26 09:09:35.000000000 -0500
+++ libcatalyst-perl-5.90015/META.yml 2012-06-30 12:53:43.000000000 -0500
@@ -74,5 +74,5 @@
homepage: http://dev.catalyst.perl.org/
license: http://dev.perl.org/licenses/
repository: git://git.shadowcat.co.uk/catagits/Catalyst-Runtime.git
-version: 5.90014
+version: 5.90015
x_authority: MSTROUT
diff -Nru libcatalyst-perl-5.90014/t/aggregate/live_component_controller_action_streaming.t libcatalyst-perl-5.90015/t/aggregate/live_component_controller_action_streaming.t
--- libcatalyst-perl-5.90014/t/aggregate/live_component_controller_action_streaming.t 2012-06-26 08:55:12.000000000 -0500
+++ libcatalyst-perl-5.90015/t/aggregate/live_component_controller_action_streaming.t 2012-06-30 10:50:42.000000000 -0500
@@ -30,6 +30,7 @@
ok( $response->is_success, 'Response Successful 2xx' );
is( $response->content_type, 'text/plain', 'Response Content-Type' );
is( $response->header('X-Test-Header'), 'valid', 'Headers sent properly' );
+ is( $response->header('X-Test-Header-Call-Count'), 1);
SKIP:
{
@@ -69,6 +70,7 @@
is( $response->content_type, 'text/plain', 'Response Content-Type' );
is( $response->content_length, -s $file, 'Response Content-Length' );
is( $response->header('X-Test-Header'), 'valid', 'Headers sent properly' );
+ is( $response->header('X-Test-Header-Call-Count'), 1);
is( $response->content, $buffer, 'Content is read from filehandle' );
ok( $response = request('http://localhost/action/streaming/body_glob'),
@@ -77,6 +79,7 @@
is( $response->content_type, 'text/plain', 'Response Content-Type' );
is( $response->content_length, -s $file, 'Response Content-Length' );
is( $response->header('X-Test-Header'), 'valid', 'Headers sent properly' );
+ is( $response->header('X-Test-Header-Call-Count'), 1);
is( $response->content, $buffer, 'Content is read from filehandle' );
}
@@ -87,6 +90,7 @@
ok( $response->is_success, 'Response Successful 2xx' );
is( $response->content_type, 'text/plain', 'Response Content-Type' );
is( $response->header('X-Test-Header'), 'valid', 'Headers sent properly' );
+ is( $response->header('X-Test-Header-Call-Count'), 1);
is( $response->content_length, $size, 'Response Content-Length' );
is( $response->content, "\0" x $size, 'Content is read from filehandle' );
}
diff -Nru libcatalyst-perl-5.90014/t/lib/TestApp.pm libcatalyst-perl-5.90015/t/lib/TestApp.pm
--- libcatalyst-perl-5.90014/t/lib/TestApp.pm 2012-06-26 08:55:12.000000000 -0500
+++ libcatalyst-perl-5.90015/t/lib/TestApp.pm 2012-06-30 10:50:42.000000000 -0500
@@ -131,6 +131,11 @@
$c->res->header('X-Test-Header', 'valid');
+ my $call_count = $c->stash->{finalize_headers_call_count} || 0;
+ $call_count++;
+ $c->stash(finalize_headers_call_count => $call_count);
+ $c->res->header('X-Test-Header-Call-Count' => $call_count);
+
return $c->maybe::next::method(@_);
}
Reply to: