3236e174dbe06a03c3baa48d59d4171c perl_580-Safe.patch

Changed files:
    perl_580-Safe.patch -> 1.1

diff --git a/perl_580-Safe.patch b/perl_580-Safe.patch
new file mode 100644 (file)
index 0000000..5bc7dca
--- /dev/null
+++ b/perl_580-Safe.patch
@@ -0,0 +1,83 @@
+--- perl-5.8.0/ext/Opcode/Safe.pm      Sat Jun  1 17:03:08 2002
++++ Safe-2.09/Safe.pm  Sun Oct  6 12:09:03 2002
+@@ -3,7 +3,7 @@
+ use 5.003_11;
+ use strict;
+ 
+-our $VERSION = "2.07";
++$Safe::VERSION = "2.09";
+ 
+ use Carp;
+ 
+@@ -47,7 +47,7 @@
+     # the whole glob *_ rather than $_ and @_ separately, otherwise
+     # @_ in non default packages within the compartment don't work.
+     $obj->share_from('main', $default_share);
+-    Opcode::_safe_pkg_prep($obj->{Root});
++    Opcode::_safe_pkg_prep($obj->{Root}) if($Opcode::VERSION > 1.04);
+     return $obj;
+ }
+ 
+@@ -155,7 +155,7 @@
+     my $no_record = shift || 0;
+     my $root = $obj->root();
+     croak("vars not an array ref") unless ref $vars eq 'ARRAY';
+-      no strict 'refs';
++    no strict 'refs';
+     # Check that 'from' package actually exists
+     croak("Package \"$pkg\" does not exist")
+       unless keys %{"$pkg\::"};
+@@ -190,7 +190,7 @@
+ sub share_redo {
+     my $obj = shift;
+     my $shares = \%{$obj->{Shares} ||= {}};
+-      my($var, $pkg);
++    my($var, $pkg);
+     while(($var, $pkg) = each %$shares) {
+       # warn "share_redo $pkg\:: $var";
+       $obj->share_from($pkg,  [ $var ], 1);
+@@ -214,11 +214,11 @@
+     # Create anon sub ref in root of compartment.
+     # Uses a closure (on $expr) to pass in the code to be executed.
+     # (eval on one line to keep line numbers as expected by caller)
+-      my $evalcode = sprintf('package %s; sub { eval $expr; }', $root);
++    my $evalcode = sprintf('package %s; sub { @_ = (); eval $expr; }', $root);
+     my $evalsub;
+ 
+-      if ($strict) { use strict; $evalsub = eval $evalcode; }
+-      else         {  no strict; $evalsub = eval $evalcode; }
++    if ($strict) { use strict; $evalsub = eval $evalcode; }
++    else         {  no strict; $evalsub = eval $evalcode; }
+ 
+     return Opcode::_safe_call_sv($root, $obj->{Mask}, $evalsub);
+ }
+@@ -228,7 +228,7 @@
+     my $root = $obj->{Root};
+ 
+     my $evalsub = eval
+-          sprintf('package %s; sub { do $file }', $root);
++          sprintf('package %s; sub { @_ = (); do $file }', $root);
+     return Opcode::_safe_call_sv($root, $obj->{Mask}, $evalsub);
+ }
+ 
+@@ -383,8 +383,9 @@
+ This is almost identical to exporting variables using the L<Exporter>
+ module.
+ 
+-Each NAME must be the B<name> of a variable, typically with the leading
+-type identifier included. A bareword is treated as a function name.
++Each NAME must be the B<name> of a non-lexical variable, typically
++with the leading type identifier included. A bareword is treated as a
++function name.
+ 
+ Examples of legal names are '$foo' for a scalar, '@foo' for an
+ array, '%foo' for a hash, '&foo' or 'foo' for a subroutine and '*foo'
+@@ -426,7 +427,7 @@
+ Any attempt by the code in STRING to use an operator which is not permitted
+ by the compartment will cause an error (at run-time of the main program
+ but at compile-time for the code in STRING).  The error is of the form
+-"%s trapped by operation mask operation...".
++"'%s' trapped by operation mask...".
+ 
+ If an operation is trapped in this way, then the code in STRING will
+ not be executed. If such a trapped operation occurs or any other