r3069 - in
/packages/libhttp-server-simple-perl/branches/upstream/current:
./ inc/Module/ inc/Module/Install/ lib/HTTP/Server/
gregoa-guest at users.alioth.debian.org
gregoa-guest at users.alioth.debian.org
Sat Jun 17 14:34:36 UTC 2006
Author: gregoa-guest
Date: Sat Jun 17 14:34:32 2006
New Revision: 3069
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=3069
Log:
Load /tmp/tmp.ChiRY28526/libhttp-server-simple-perl-0.20 into
packages/libhttp-server-simple-perl/branches/upstream/current.
Modified:
packages/libhttp-server-simple-perl/branches/upstream/current/Changes
packages/libhttp-server-simple-perl/branches/upstream/current/META.yml
packages/libhttp-server-simple-perl/branches/upstream/current/SIGNATURE
packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install.pm
packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/Base.pm
packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/Can.pm
packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/Fetch.pm
packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/Makefile.pm
packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/Metadata.pm
packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/Win32.pm
packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/WriteAll.pm
packages/libhttp-server-simple-perl/branches/upstream/current/lib/HTTP/Server/Simple.pm
Modified: packages/libhttp-server-simple-perl/branches/upstream/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libhttp-server-simple-perl/branches/upstream/current/Changes?rev=3069&op=diff
==============================================================================
--- packages/libhttp-server-simple-perl/branches/upstream/current/Changes (original)
+++ packages/libhttp-server-simple-perl/branches/upstream/current/Changes Sat Jun 17 14:34:32 2006
@@ -1,3 +1,8 @@
+0.20
+
+ Require POSIX only if we need it, rather than "use" it all the time
+ [cpan #17533] - Brad Bowman
+
0.18
new method: valid_http_method() from Chris Dent to make it easier to
Modified: packages/libhttp-server-simple-perl/branches/upstream/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libhttp-server-simple-perl/branches/upstream/current/META.yml?rev=3069&op=diff
==============================================================================
--- packages/libhttp-server-simple-perl/branches/upstream/current/META.yml (original)
+++ packages/libhttp-server-simple-perl/branches/upstream/current/META.yml Sat Jun 17 14:34:32 2006
@@ -1,13 +1,13 @@
distribution_type: module
-generated_by: Module::Install version 0.52
+generated_by: Module::Install version 0.62
license: perl
name: HTTP-Server-Simple
-no_index:
- directory:
+no_index:
+ directory:
- inc
- t
-requires:
+requires:
CGI: 0
Socket: 0
Test::More: 0
-version: 0.18
+version: 0.20
Modified: packages/libhttp-server-simple-perl/branches/upstream/current/SIGNATURE
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libhttp-server-simple-perl/branches/upstream/current/SIGNATURE?rev=3069&op=diff
==============================================================================
--- packages/libhttp-server-simple-perl/branches/upstream/current/SIGNATURE (original)
+++ packages/libhttp-server-simple-perl/branches/upstream/current/SIGNATURE Sat Jun 17 14:34:32 2006
@@ -1,5 +1,5 @@
This file contains message digests of all files listed in MANIFEST,
-signed via the Module::Signature module, version 0.50.
+signed via the Module::Signature module, version 0.54.
To verify the content in this distribution, first make sure you have
Module::Signature installed, then type:
@@ -14,21 +14,21 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-SHA1 5fb9209da2f06d0bf15387dafcac44f8c53aa06f Changes
+SHA1 51733cb90c63ff78f2b240a8daee74300c28de6f Changes
SHA1 0ac508c50476dcc2bf8fe3094cb341425291e1ee MANIFEST
-SHA1 51a91151f855b6d04d73b0611ab2d3c498bfa1c7 META.yml
+SHA1 9df9a468f970dd286ef72b010842afb1017f9324 META.yml
SHA1 490f3fd115e09cb05b725580e5ed5cdd58241049 Makefile.PL
SHA1 ed0c107672daac3bc9e266876666e1059dbe44b7 README
SHA1 4ea1e9072ca87399184a46233df52a21e285604d ex/sample_server
-SHA1 e8ed0773fed846d6f5480bf3bf1735c2d551da63 inc/Module/Install.pm
-SHA1 9dbed9ff1790473ec3136a606f062fa050326c43 inc/Module/Install/Base.pm
-SHA1 d37430abee4687a4861b1312e5bea6953e6afe4d inc/Module/Install/Can.pm
-SHA1 a784ba7d2b096084b2ffed3a7d853e2847f4dedb inc/Module/Install/Fetch.pm
-SHA1 044cd2f160364fe36eca2ba35e16e7cf46c79138 inc/Module/Install/Makefile.pm
-SHA1 49e0d839edeb0f3e9af12fd2444b98365393a23e inc/Module/Install/Metadata.pm
-SHA1 2a1b494a7e5adaa3216e86d909dd5bf87d084c80 inc/Module/Install/Win32.pm
-SHA1 4a23fafe534363a99f0d936df9086ad243e692c9 inc/Module/Install/WriteAll.pm
-SHA1 6c1a08a64406bdf937a0996d1803286df7a223f6 lib/HTTP/Server/Simple.pm
+SHA1 e28cf2d3ba35f6ca3a448acc7bee191b7c390379 inc/Module/Install.pm
+SHA1 e7c1c86f57b6778f4bdc7fd8c1b950e60ef41bc0 inc/Module/Install/Base.pm
+SHA1 e1829448769445cdaac384a888bf9ccf42e0d89a inc/Module/Install/Can.pm
+SHA1 70aa5e2055e8e38b4eecc5fc8c91762c0e97f551 inc/Module/Install/Fetch.pm
+SHA1 8ac832baf4f9e8e72d3e8f103cee6e8a94ac80e1 inc/Module/Install/Makefile.pm
+SHA1 0807e79d6dbfda4fcd3db0fc7df2e33e0cba263b inc/Module/Install/Metadata.pm
+SHA1 4da0a1fce2339cc3f8c296c7716480d2564d9470 inc/Module/Install/Win32.pm
+SHA1 9a903a1d178954ad864c7dcc98f9fa5c005d1553 inc/Module/Install/WriteAll.pm
+SHA1 b139883aeec8fc0d1a17261164daf2a1be784a60 lib/HTTP/Server/Simple.pm
SHA1 2d7348b166f654a460ddae4cb4183f4a544c85fc lib/HTTP/Server/Simple/CGI.pm
SHA1 27c4b8c97f00d3427a320c8087e2b77b128a1992 lib/HTTP/Server/Simple/CGI/Environment.pm
SHA1 db064af54cab345a71daec576e32e64b8fb1033d t/00smoke.t
@@ -37,9 +37,9 @@
SHA1 90f0be3e6b0fab021155953742f5cc5c5e47a5aa t/03podcoverage.t
SHA1 0ca7d32c396129b38a33a8077171b84076feb8d9 t/04cgi.t
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.3 (Darwin)
-iD8DBQFD6qfhEi9d9xCOQEYRAjyLAKCLKcijRrqA9NW7JZkfnOVlHuxifwCeMZuU
-nrm1Jro4k1y4NyyOj9r7ee8=
-=K+Ut
+iD8DBQFEkWmyEi9d9xCOQEYRAmmoAKCA6RHTxab01NdvkfvsHBnj8kLbfwCfWOS7
+NrOuVXMr09xE3cCxeLmZJFs=
+=4JaR
-----END PGP SIGNATURE-----
Modified: packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install.pm?rev=3069&op=diff
==============================================================================
--- packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install.pm (original)
+++ packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install.pm Sat Jun 17 14:34:32 2006
@@ -1,16 +1,44 @@
-#line 1 "/home/jesse/svk/HTTP-Server-Simple/inc/Module/Install.pm - /usr/local/share/perl/5.8.7/Module/Install.pm"
+#line 1
package Module::Install;
+
+# For any maintainers:
+# The load order for Module::Install is a bit magic.
+# It goes something like this...
+#
+# IF ( host has Module::Install installed, creating author mode ) {
+# 1. Makefile.PL calls "use inc::Module::Install"
+# 2. $INC{inc/Module/Install.pm} set to installed version of inc::Module::Install
+# 3. The installed version of inc::Module::Install loads
+# 4. inc::Module::Install calls "require Module::Install"
+# 5. The ./inc/ version of Module::Install loads
+# } ELSE {
+# 1. Makefile.PL calls "use inc::Module::Install"
+# 2. $INC{inc/Module/Install.pm} set to ./inc/ version of Module::Install
+# 3. The ./inc/ version of Module::Install loads
+# }
use 5.004;
use strict 'vars';
+
use vars qw{$VERSION};
BEGIN {
- # Don't forget to update Module::Install::Admin too!
- $VERSION = '0.52';
-}
-
-# inc::Module::Install must be loaded first
-unless ( $INC{join('/', inc => split(/::/, __PACKAGE__)).'.pm'} ) {
+ # All Module::Install core packages now require synchronised versions.
+ # This will be used to ensure we don't accidentally load old or
+ # different versions of modules.
+ # 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.62';
+}
+
+# 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:
@@ -24,26 +52,25 @@
}
use Cwd ();
-use FindBin;
use File::Find ();
use File::Path ();
+use FindBin;
*inc::Module::Install::VERSION = *VERSION;
- at inc::Module::Install::ISA = 'Module::Install';
+ at inc::Module::Install::ISA = __PACKAGE__;
sub autoload {
- my $self = shift;
- my $caller = $self->_caller;
- my $cwd = Cwd::cwd();
- my $sym = "$caller\::AUTOLOAD";
-
+ my $self = shift;
+ my $who = $self->_caller;
+ my $cwd = Cwd::cwd();
+ my $sym = "${who}::AUTOLOAD";
$sym->{$cwd} = sub {
my $pwd = Cwd::cwd();
if ( my $code = $sym->{$pwd} ) {
# delegate back to parent dirs
goto &$code unless $cwd eq $pwd;
}
- $$sym =~ /([^:]+)$/ or die "Cannot autoload $caller - $sym";
+ $$sym =~ /([^:]+)$/ or die "Cannot autoload $who - $sym";
unshift @_, ($self, $1);
goto &{$self->can('call')} unless uc($1) eq $1;
};
@@ -52,18 +79,18 @@
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} = "$self->{name}::$self->{dispatch}"->new( _top => $self );
$self->{admin}->init;
@_ = ($class, _self => $self);
goto &{"$self->{name}::import"};
}
- *{$self->_caller . "::AUTOLOAD"} = $self->autoload;
+ *{"${who}::AUTOLOAD"} = $self->autoload;
$self->preload;
# Unregister loader and worker packages so subdirs can use them again
@@ -74,11 +101,11 @@
sub preload {
my ($self) = @_;
- unless ( $self->{extentions} ) {
- $self->load_extensions(
- "$self->{prefix}/$self->{path}", $self
- );
- }
+ unless ( $self->{extensions} ) {
+ $self->load_extensions(
+ "$self->{prefix}/$self->{path}", $self
+ );
+ }
my @exts = @{$self->{extensions}};
unless ( @exts ) {
@@ -86,21 +113,21 @@
@exts = $admin->load_all_extensions;
}
- my %seen_method;
+ my %seen;
foreach my $obj ( @exts ) {
while (my ($method, $glob) = each %{ref($obj) . '::'}) {
- next unless defined *{$glob}{CODE};
+ next unless $obj->can($method);
next if $method =~ /^_/;
next if $method eq uc($method);
- $seen_method{$method}++;
- }
- }
-
- my $caller = $self->_caller;
- foreach my $name (sort keys %seen_method) {
- *{"${caller}::$name"} = sub {
- ${"${caller}::AUTOLOAD"} = "${caller}::$name";
- goto &{"${caller}::AUTOLOAD"};
+ $seen{$method}++;
+ }
+ }
+
+ my $who = $self->_caller;
+ foreach my $name ( sort keys %seen ) {
+ *{"${who}::$name"} = sub {
+ ${"${who}::AUTOLOAD"} = "${who}::$name";
+ goto &{"${who}::AUTOLOAD"};
};
}
}
@@ -118,30 +145,26 @@
$args{dispatch} ||= 'Admin';
$args{prefix} ||= 'inc';
- $args{author} ||= '.author';
+ $args{author} ||= ($^O eq 'VMS' ? '_author' : '.author');
$args{bundle} ||= 'inc/BUNDLES';
$args{base} ||= $base_path;
-
$class =~ s/^\Q$args{prefix}\E:://;
$args{name} ||= $class;
$args{version} ||= $class->VERSION;
-
- unless ($args{path}) {
+ unless ( $args{path} ) {
$args{path} = $args{name};
$args{path} =~ s!::!/!g;
}
$args{file} ||= "$args{base}/$args{prefix}/$args{path}.pm";
- bless(\%args, $class);
+ bless( \%args, $class );
}
sub call {
- my $self = shift;
- my $method = shift;
- my $obj = $self->load($method) or return;
-
- unshift @_, $obj;
- goto &{$obj->can($method)};
+ my ($self, $method) = @_;
+ my $obj = $self->load($method) or return;
+ splice(@_, 0, 2, $obj);
+ goto &{$obj->can($method)};
}
sub load {
@@ -167,13 +190,13 @@
}
sub load_extensions {
- my ($self, $path, $top_obj) = @_;
-
- unshift @INC, $self->{prefix}
- unless grep { $_ eq $self->{prefix} } @INC;
-
- local @INC = ($path, @INC);
- foreach my $rv ($self->find_extensions($path)) {
+ my ($self, $path, $top) = @_;
+
+ unless ( grep { lc $_ eq lc $self->{prefix} } @INC ) {
+ unshift @INC, $self->{prefix};
+ }
+
+ foreach my $rv ( $self->find_extensions($path) ) {
my ($file, $pkg) = @{$rv};
next if $self->{pathnames}{$pkg};
@@ -184,7 +207,7 @@
next;
}
$self->{pathnames}{$pkg} = delete $INC{$file};
- push @{$self->{extensions}}, &{$new}($pkg, _top => $top_obj );
+ push @{$self->{extensions}}, &{$new}($pkg, _top => $top );
}
$self->{extensions} ||= [];
@@ -197,10 +220,32 @@
File::Find::find( sub {
my $file = $File::Find::name;
return unless $file =~ m!^\Q$path\E/(.+)\.pm\Z!is;
- return if $1 eq $self->{dispatch};
-
- $file = "$self->{path}/$1.pm";
- my $pkg = "$self->{name}::$1"; $pkg =~ s!/!::!g;
+ my $subpath = $1;
+ return if lc($subpath) eq lc($self->{dispatch});
+
+ $file = "$self->{path}/$subpath.pm";
+ my $pkg = "$self->{name}::$subpath";
+ $pkg =~ s!/!::!g;
+
+ # If we have a mixed-case package name, assume case has been preserved
+ # correctly. Otherwise, root through the file to locate the case-preserved
+ # version of the package name.
+ if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) {
+ open PKGFILE, "<$subpath.pm" or die "find_extensions: Can't open $subpath.pm: $!";
+ my $in_pod = 0;
+ while ( <PKGFILE> ) {
+ $in_pod = 1 if /^=\w/;
+ $in_pod = 0 if /^=cut/;
+ next if ($in_pod || /^=cut/); # skip pod text
+ next if /^\s*#/; # and comments
+ if ( m/^\s*package\s+($pkg)\s*;/i ) {
+ $pkg = $1;
+ last;
+ }
+ }
+ close PKGFILE;
+ }
+
push @found, [ $file, $pkg ];
}, $path ) if -d $path;
@@ -208,15 +253,13 @@
}
sub _caller {
- my $depth = 0;
- my $caller = caller($depth);
-
- while ($caller eq __PACKAGE__) {
+ my $depth = 0;
+ my $call = caller($depth);
+ while ( $call eq __PACKAGE__ ) {
$depth++;
- $caller = caller($depth);
- }
-
- $caller;
+ $call = caller($depth);
+ }
+ return $call;
}
1;
Modified: packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/Base.pm?rev=3069&op=diff
==============================================================================
--- packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/Base.pm (original)
+++ packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/Base.pm Sat Jun 17 14:34:32 2006
@@ -1,47 +1,52 @@
-#line 1 "inc/Module/Install/Base.pm - /usr/local/share/perl/5.8.7/Module/Install/Base.pm"
+#line 1
package Module::Install::Base;
+$VERSION = '0.62';
+
# Suspend handler for "redefined" warnings
-BEGIN { my $w = $SIG{__WARN__}; $SIG{__WARN__} = sub { $w } };
+BEGIN {
+ my $w = $SIG{__WARN__};
+ $SIG{__WARN__} = sub { $w };
+}
-#line 30
+### This is the ONLY module that shouldn't have strict on
+# use strict;
+
+#line 41
sub new {
my ($class, %args) = @_;
- foreach my $method (qw(call load)) {
+ foreach my $method ( qw(call load) ) {
*{"$class\::$method"} = sub {
- +shift->_top->$method(@_);
+ shift()->_top->$method(@_);
} unless defined &{"$class\::$method"};
}
- bless(\%args, $class);
+ bless( \%args, $class );
}
-#line 48
+#line 61
sub AUTOLOAD {
my $self = shift;
-
local $@;
my $autoload = eval { $self->_top->autoload } or return;
goto &$autoload;
}
-#line 62
+#line 76
sub _top { $_[0]->{_top} }
-#line 73
+#line 89
sub admin {
- my $self = shift;
- $self->_top->{admin} or Module::Install::Base::FakeAdmin->new;
+ $_[0]->_top->{admin} or Module::Install::Base::FakeAdmin->new;
}
sub is_admin {
- my $self = shift;
- $self->admin->VERSION;
+ $_[0]->admin->VERSION;
}
sub DESTROY {}
@@ -50,14 +55,16 @@
my $Fake;
sub new { $Fake ||= bless(\@_, $_[0]) }
+
sub AUTOLOAD {}
+
sub DESTROY {}
+
+# Restore warning handler
+BEGIN {
+ $SIG{__WARN__} = $SIG{__WARN__}->();
+}
1;
-# Restore warning handler
-BEGIN { $SIG{__WARN__} = $SIG{__WARN__}->() };
-
-__END__
-
-#line 120
+#line 138
Modified: packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/Can.pm?rev=3069&op=diff
==============================================================================
--- packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/Can.pm (original)
+++ packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/Can.pm Sat Jun 17 14:34:32 2006
@@ -1,69 +1,82 @@
-#line 1 "inc/Module/Install/Can.pm - /usr/local/share/perl/5.8.7/Module/Install/Can.pm"
+#line 1
package Module::Install::Can;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
-$VERSION = '0.01';
use strict;
+use Module::Install::Base;
use Config ();
+### This adds a 5.005 Perl version dependency.
+### This is a bug and will be fixed.
use File::Spec ();
use ExtUtils::MakeMaker ();
+use vars qw{$VERSION $ISCORE @ISA};
+BEGIN {
+ $VERSION = '0.62';
+ $ISCORE = 1;
+ @ISA = qw{Module::Install::Base};
+}
+
# check if we can load some module
+### Upgrade this to not have to load the module if possible
sub can_use {
- my ($self, $mod, $ver) = @_;
- $mod =~ s{::|\\}{/}g;
- $mod .= ".pm" unless $mod =~ /\.pm$/i;
+ my ($self, $mod, $ver) = @_;
+ $mod =~ s{::|\\}{/}g;
+ $mod .= '.pm' unless $mod =~ /\.pm$/i;
- my $pkg = $mod;
- $pkg =~ s{/}{::}g;
- $pkg =~ s{\.pm$}{}i;
+ my $pkg = $mod;
+ $pkg =~ s{/}{::}g;
+ $pkg =~ s{\.pm$}{}i;
- local $@;
- eval { require $mod; $pkg->VERSION($ver || 0); 1 };
+ local $@;
+ eval { require $mod; $pkg->VERSION($ver || 0); 1 };
}
# check if we can run some command
sub can_run {
- my ($self, $cmd) = @_;
+ my ($self, $cmd) = @_;
- my $_cmd = $cmd;
- return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd));
+ my $_cmd = $cmd;
+ return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd));
- for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
- my $abs = File::Spec->catfile($dir, $_[1]);
- return $abs if (-x $abs or $abs = MM->maybe_command($abs));
- }
+ for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
+ my $abs = File::Spec->catfile($dir, $_[1]);
+ return $abs if (-x $abs or $abs = MM->maybe_command($abs));
+ }
- return;
+ return;
}
+# can we locate a (the) C compiler
sub can_cc {
- my $self = shift;
- my @chunks = split(/ /, $Config::Config{cc}) or return;
+ my $self = shift;
+ my @chunks = split(/ /, $Config::Config{cc}) or return;
- # $Config{cc} may contain args; try to find out the program part
- while (@chunks) {
- return $self->can_run("@chunks") || (pop(@chunks), next);
- }
+ # $Config{cc} may contain args; try to find out the program part
+ while (@chunks) {
+ return $self->can_run("@chunks") || (pop(@chunks), next);
+ }
- return;
+ return;
}
# Fix Cygwin bug on maybe_command();
-if ($^O eq 'cygwin') {
- require ExtUtils::MM_Cygwin;
- require ExtUtils::MM_Win32;
- if (!defined(&ExtUtils::MM_Cygwin::maybe_command)) {
- *ExtUtils::MM_Cygwin::maybe_command = sub {
- my ($self, $file) = @_;
- if ($file =~ m{^/cygdrive/}i) {
- ExtUtils::MM_Win32->maybe_command($file);
- }
- else {
- $self->SUPER::maybe_command($file);
- }
- }
- }
+if ( $^O eq 'cygwin' ) {
+ require ExtUtils::MM_Cygwin;
+ require ExtUtils::MM_Win32;
+ if ( ! defined(&ExtUtils::MM_Cygwin::maybe_command) ) {
+ *ExtUtils::MM_Cygwin::maybe_command = sub {
+ my ($self, $file) = @_;
+ if ($file =~ m{^/cygdrive/}i and ExtUtils::MM_Win32->can('maybe_command')) {
+ ExtUtils::MM_Win32->maybe_command($file);
+ } else {
+ ExtUtils::MM_Unix->maybe_command($file);
+ }
+ }
+ }
}
1;
+
+__END__
+
+#line 157
Modified: packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/Fetch.pm?rev=3069&op=diff
==============================================================================
--- packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/Fetch.pm (original)
+++ packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/Fetch.pm Sat Jun 17 14:34:32 2006
@@ -1,15 +1,22 @@
-#line 1 "inc/Module/Install/Fetch.pm - /usr/local/share/perl/5.8.7/Module/Install/Fetch.pm"
+#line 1
package Module::Install::Fetch;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
-$VERSION = '0.01';
+use strict;
+use Module::Install::Base;
+
+use vars qw{$VERSION $ISCORE @ISA};
+BEGIN {
+ $VERSION = '0.62';
+ $ISCORE = 1;
+ @ISA = qw{Module::Install::Base};
+}
sub get_file {
my ($self, %args) = @_;
my ($scheme, $host, $path, $file) =
$args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return;
- if ($scheme eq 'http' and !eval { require LWP::Simple; 1 }) {
+ if ( $scheme eq 'http' and ! eval { require LWP::Simple; 1 } ) {
$args{url} = $args{ftp_url}
or (warn("LWP support unavailable!\n"), return);
($scheme, $host, $path, $file) =
@@ -53,14 +60,14 @@
chdir $dir; return;
}
- my @dialog = split(/\n/, << ".");
+ my @dialog = split(/\n/, <<"END_FTP");
open $host
user anonymous anonymous\@example.com
cd $path
binary
get $file $file
quit
-.
+END_FTP
foreach (@dialog) { $fh->print("$_\n") }
$fh->close;
} }
Modified: packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/Makefile.pm?rev=3069&op=diff
==============================================================================
--- packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/Makefile.pm (original)
+++ packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/Makefile.pm Sat Jun 17 14:34:32 2006
@@ -1,19 +1,37 @@
-#line 1 "inc/Module/Install/Makefile.pm - /usr/local/share/perl/5.8.7/Module/Install/Makefile.pm"
+#line 1
package Module::Install::Makefile;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
-
-$VERSION = '0.01';
use strict 'vars';
-use vars '$VERSION';
-
+use Module::Install::Base;
use ExtUtils::MakeMaker ();
+use vars qw{$VERSION $ISCORE @ISA};
+BEGIN {
+ $VERSION = '0.62';
+ $ISCORE = 1;
+ @ISA = qw{Module::Install::Base};
+}
+
sub Makefile { $_[0] }
-sub prompt {
+my %seen = ();
+
+sub prompt {
shift;
- goto &ExtUtils::MakeMaker::prompt;
+
+ # Infinite loop protection
+ my @c = caller();
+ if ( ++$seen{"$c[1]|$c[2]|$_[0]"} > 3 ) {
+ 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} ) {
+ local $ENV{PERL_MM_USE_DEFAULT} = 1;
+ goto &ExtUtils::MakeMaker::prompt;
+ } else {
+ goto &ExtUtils::MakeMaker::prompt;
+ }
}
sub makemaker_args {
@@ -23,8 +41,19 @@
$args;
}
+# For mm args that take multiple space-seperated args,
+# append an argument to the current list.
+sub makemaker_append {
+ my $self = shift;
+ my $name = shift;
+ my $args = $self->makemaker_args;
+ $args->{name} = defined $args->{$name}
+ ? join( ' ', $args->{name}, @_ )
+ : join( ' ', @_ );
+}
+
sub build_subdirs {
- my $self = shift;
+ my $self = shift;
my $subdirs = $self->makemaker_args->{DIR} ||= [];
for my $subdir (@_) {
push @$subdirs, $subdir;
@@ -32,17 +61,26 @@
}
sub clean_files {
- my $self = shift;
+ my $self = shift;
my $clean = $self->makemaker_args->{clean} ||= {};
%$clean = (
%$clean,
- FILES => join(" ", grep length, $clean->{FILES}, @_),
+ FILES => join(' ', grep length, $clean->{FILES}, @_),
);
}
+sub realclean_files {
+ my $self = shift;
+ my $realclean = $self->makemaker_args->{realclean} ||= {};
+ %$realclean = (
+ %$realclean,
+ FILES => join(' ', grep length, $realclean->{FILES}, @_),
+ );
+}
+
sub libs {
my $self = shift;
- my $libs = ref $_[0] ? shift : [shift];
+ my $libs = ref $_[0] ? shift : [ shift ];
$self->makemaker_args( LIBS => $libs );
}
@@ -56,25 +94,26 @@
die "&Makefile->write() takes no arguments\n" if @_;
my $args = $self->makemaker_args;
-
$args->{DISTNAME} = $self->name;
- $args->{NAME} = $self->module_name || $self->name || $self->determine_NAME($args);
- $args->{VERSION} = $self->version || $self->determine_VERSION($args);
- $args->{NAME} =~ s/-/::/g;
-
- $args->{test} = {TESTS => $self->tests} if $self->tests;
-
+ $args->{NAME} = $self->module_name || $self->name || $self->determine_NAME($args);
+ $args->{VERSION} = $self->version || $self->determine_VERSION($args);
+ $args->{NAME} =~ s/-/::/g;
+ if ( $self->tests ) {
+ $args->{test} = { TESTS => $self->tests };
+ }
if ($] >= 5.005) {
$args->{ABSTRACT} = $self->abstract;
- $args->{AUTHOR} = $self->author;
+ $args->{AUTHOR} = $self->author;
}
if ( eval($ExtUtils::MakeMaker::VERSION) >= 6.10 ) {
$args->{NO_META} = 1;
}
- if ( eval($ExtUtils::MakeMaker::VERSION) > 6.17 ) {
- $args->{SIGN} = 1 if $self->sign;
- }
- delete $args->{SIGN} unless $self->is_admin;
+ if ( eval($ExtUtils::MakeMaker::VERSION) > 6.17 and $self->sign ) {
+ $args->{SIGN} = 1;
+ }
+ unless ( $self->is_admin ) {
+ delete $args->{SIGN};
+ }
# merge both kinds of requires into prereq_pm
my $prereq = ($args->{PREREQ_PM} ||= {});
@@ -91,49 +130,62 @@
}
}
- if (my $perl_version = $self->perl_version) {
+ 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";
- }
-
- my %args = map {($_ => $args->{$_})} grep {defined($args->{$_})} keys %$args;
-
+ or die "ERROR: perl: Version $] is installed, "
+ . "but we need version >= $perl_version";
+ }
+
+ my %args = map { ( $_ => $args->{$_} ) } grep {defined($args->{$_})} keys %$args;
if ($self->admin->preop) {
$args{dist} = $self->admin->preop;
}
- ExtUtils::MakeMaker::WriteMakefile(%args);
-
- $self->fix_up_makefile();
+ my $mm = ExtUtils::MakeMaker::WriteMakefile(%args);
+ $self->fix_up_makefile($mm->{FIRST_MAKEFILE} || 'Makefile');
}
sub fix_up_makefile {
- my $self = shift;
- my $top_class = ref($self->_top) || '';
- my $top_version = $self->_top->VERSION || '';
+ my $self = shift;
+ my $makefile_name = shift;
+ my $top_class = ref($self->_top) || '';
+ my $top_version = $self->_top->VERSION || '';
my $preamble = $self->preamble
- ? "# Preamble by $top_class $top_version\n" . $self->preamble
- : '';
- my $postamble = "# Postamble by $top_class $top_version\n" .
- ($self->postamble || '');
+ ? "# Preamble by $top_class $top_version\n"
+ . $self->preamble
+ : '';
+ my $postamble = "# Postamble by $top_class $top_version\n"
+ . ($self->postamble || '');
local *MAKEFILE;
- open MAKEFILE, '< Makefile' or die $!;
+ open MAKEFILE, "< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!";
my $makefile = do { local $/; <MAKEFILE> };
- close MAKEFILE;
+ close MAKEFILE or die $!;
$makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /;
$makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g;
$makefile =~ s/( "-I\$\(INST_LIB\)")/ "-Iinc"$1/g;
-
- $makefile =~ s/^(FULLPERL = .*)/$1 -Iinc/m;
- $makefile =~ s/^(PERL = .*)/$1 -Iinc/m;
-
- open MAKEFILE, '> Makefile' or die $!;
- print MAKEFILE "$preamble$makefile$postamble";
- close MAKEFILE;
+ $makefile =~ s/^(FULLPERL = .*)/$1 "-Iinc"/m;
+ $makefile =~ s/^(PERL = .*)/$1 "-Iinc"/m;
+
+ # Module::Install will never be used to build the Core Perl
+ # Sometimes PERL_LIB and PERL_ARCHLIB get written anyway, which breaks
+ # PREFIX/PERL5LIB, and thus, install_share. Blank them if they exist
+ $makefile =~ s/^PERL_LIB = .+/PERL_LIB =/m;
+ #$makefile =~ s/^PERL_ARCHLIB = .+/PERL_ARCHLIB =/m;
+
+ # Perl 5.005 mentions PERL_LIB explicitly, so we have to remove that as well.
+ $makefile =~ s/("?)-I\$\(PERL_LIB\)\1//g;
+
+ # 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: $!";
+ print MAKEFILE "$preamble$makefile$postamble" or die $!;
+ close MAKEFILE or die $!;
+
+ 1;
}
sub preamble {
@@ -144,7 +196,6 @@
sub postamble {
my ($self, $text) = @_;
-
$self->{postamble} ||= $self->admin->postamble;
$self->{postamble} .= $text if defined $text;
$self->{postamble}
@@ -154,4 +205,4 @@
__END__
-#line 286
+#line 334
Modified: packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/Metadata.pm?rev=3069&op=diff
==============================================================================
--- packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/Metadata.pm (original)
+++ packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/Metadata.pm Sat Jun 17 14:34:32 2006
@@ -1,13 +1,14 @@
-#line 1 "inc/Module/Install/Metadata.pm - /usr/local/share/perl/5.8.7/Module/Install/Metadata.pm"
+#line 1
package Module::Install::Metadata;
use strict 'vars';
use Module::Install::Base;
-use vars qw($VERSION @ISA);
+use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.06';
- @ISA = 'Module::Install::Base';
+ $VERSION = '0.62';
+ $ISCORE = 1;
+ @ISA = qw{Module::Install::Base};
}
my @scalar_keys = qw{
@@ -62,6 +63,16 @@
return $self;
}
+sub dynamic_config {
+ my $self = shift;
+ unless ( @_ ) {
+ warn "You MUST provide an explicit true/false value to dynamic_config, skipping\n";
+ return $self;
+ }
+ $self->{'values'}{'dynamic_config'} = $_[0] ? 1 : 0;
+ return $self;
+}
+
sub all_from {
my ( $self, $file ) = @_;
@@ -130,8 +141,7 @@
# The user used ->feature like ->features by passing in the second
# argument as a reference. Accomodate for that.
$mods = $_[0];
- }
- else {
+ } else {
$mods = \@_;
}
@@ -154,7 +164,9 @@
while ( my ( $name, $mods ) = splice( @_, 0, 2 ) ) {
$self->feature( $name, @$mods );
}
- return @{ $self->{values}{features} };
+ return $self->{values}->{features}
+ ? @{ $self->{values}->{features} }
+ : ();
}
sub no_index {
@@ -226,11 +238,13 @@
^
use \s*
v?
- ([\d\.]+)
+ ([\d_\.]+)
\s* ;
/ixms
)
{
+ my $v = $1;
+ $v =~ s{_}{}g;
$self->perl_version($1);
}
else {
Modified: packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/Win32.pm?rev=3069&op=diff
==============================================================================
--- packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/Win32.pm (original)
+++ packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/Win32.pm Sat Jun 17 14:34:32 2006
@@ -1,40 +1,45 @@
-#line 1 "inc/Module/Install/Win32.pm - /usr/local/share/perl/5.8.7/Module/Install/Win32.pm"
+#line 1
package Module::Install::Win32;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
-
-$VERSION = '0.02';
use strict;
+use Module::Install::Base;
+
+use vars qw{$VERSION $ISCORE @ISA};
+BEGIN {
+ $VERSION = '0.62';
+ $ISCORE = 1;
+ @ISA = qw{Module::Install::Base};
+}
# determine if the user needs nmake, and download it if needed
sub check_nmake {
- my $self = shift;
- $self->load('can_run');
- $self->load('get_file');
+ my $self = shift;
+ $self->load('can_run');
+ $self->load('get_file');
+
+ require Config;
+ return unless (
+ $^O eq 'MSWin32' and
+ $Config::Config{make} and
+ $Config::Config{make} =~ /^nmake\b/i and
+ ! $self->can_run('nmake')
+ );
- require Config;
- return unless (
- $Config::Config{make} and
- $Config::Config{make} =~ /^nmake\b/i and
- $^O eq 'MSWin32' and
- !$self->can_run('nmake')
- );
+ print "The required 'nmake' executable not found, fetching it...\n";
- print "The required 'nmake' executable not found, fetching it...\n";
+ require File::Basename;
+ my $rv = $self->get_file(
+ url => 'http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe',
+ ftp_url => 'ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe',
+ local_dir => File::Basename::dirname($^X),
+ size => 51928,
+ run => 'Nmake15.exe /o > nul',
+ check_for => 'Nmake.exe',
+ remove => 1,
+ );
- require File::Basename;
- my $rv = $self->get_file(
- url => 'http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe',
- ftp_url => 'ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe',
- local_dir => File::Basename::dirname($^X),
- size => 51928,
- run => 'Nmake15.exe /o > nul',
- check_for => 'Nmake.exe',
- remove => 1,
- );
-
- if (!$rv) {
- die << '.';
+ if (!$rv) {
+ die <<'END_MESSAGE';
-------------------------------------------------------------------------------
@@ -53,11 +58,8 @@
You may then resume the installation process described in README.
-------------------------------------------------------------------------------
-.
- }
+END_MESSAGE
+ }
}
1;
-
-__END__
-
Modified: packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/WriteAll.pm?rev=3069&op=diff
==============================================================================
--- packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/WriteAll.pm (original)
+++ packages/libhttp-server-simple-perl/branches/upstream/current/inc/Module/Install/WriteAll.pm Sat Jun 17 14:34:32 2006
@@ -1,6 +1,15 @@
-#line 1 "inc/Module/Install/WriteAll.pm - /usr/local/share/perl/5.8.7/Module/Install/WriteAll.pm"
+#line 1
package Module::Install::WriteAll;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+
+use strict;
+use Module::Install::Base;
+
+use vars qw{$VERSION $ISCORE @ISA};
+BEGIN {
+ $VERSION = '0.62';
+ $ISCORE = 1;
+ @ISA = qw{Module::Install::Base};
+}
sub WriteAll {
my $self = shift;
@@ -12,22 +21,20 @@
@_
);
- $self->sign(1) if $args{sign};
- $self->Meta->write if $args{meta};
+ $self->sign(1) if $args{sign};
+ $self->Meta->write if $args{meta};
$self->admin->WriteAll(%args) if $self->is_admin;
- if ($0 =~ /Build.PL$/i) {
+ if ( $0 =~ /Build.PL$/i ) {
$self->Build->write;
- }
- else {
+ } else {
$self->check_nmake if $args{check_nmake};
- $self->makemaker_args( PL_FILES => {} )
- unless $self->makemaker_args->{'PL_FILES'};
-
+ unless ( $self->makemaker_args->{'PL_FILES'} ) {
+ $self->makemaker_args( PL_FILES => {} );
+ }
if ($args{inline}) {
$self->Inline->write;
- }
- else {
+ } else {
$self->Makefile->write;
}
}
Modified: packages/libhttp-server-simple-perl/branches/upstream/current/lib/HTTP/Server/Simple.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libhttp-server-simple-perl/branches/upstream/current/lib/HTTP/Server/Simple.pm?rev=3069&op=diff
==============================================================================
--- packages/libhttp-server-simple-perl/branches/upstream/current/lib/HTTP/Server/Simple.pm (original)
+++ packages/libhttp-server-simple-perl/branches/upstream/current/lib/HTTP/Server/Simple.pm Sat Jun 17 14:34:32 2006
@@ -5,7 +5,7 @@
use Socket;
use Carp;
-our $VERSION = '0.18';
+our $VERSION = '0.20';
=head1 NAME
@@ -161,9 +161,9 @@
my $child = fork;
die "Can't fork: $!" unless defined($child);
return $child if $child;
- use POSIX;
if ( $^O !~ /MSWin32/ ) {
+ require POSIX;
POSIX::setsid()
or die "Can't start a new session: $!";
}
@@ -223,6 +223,7 @@
}
else {
$self->setup_listener;
+ $self->after_setup_listener();
*{"$pkg\::run"} = $self->_default_run;
}
@@ -421,7 +422,7 @@
=cut
sub setup {
- my ($self) = @_;
+ my $self = shift;
while ( my ( $item, $value ) = splice @_, 0, 2 ) {
$self->$item($value) if $self->can($item);
}
@@ -586,6 +587,16 @@
}
+
+=head2 after_setup_listener
+
+This method is called immediately after setup_listener. It's here just for you to override.
+
+=cut
+
+sub after_setup_listener {
+}
+
=head2 bad_request
This method should print a valid HTTP response that says that the
More information about the Pkg-perl-cvs-commits
mailing list