From 9768ced4fc2a5dfb5bd31dc6a81f928313d9f090 Mon Sep 17 00:00:00 2001
From: radek <radek@pld-linux.org>
Date: Mon, 13 Jan 2003 16:13:44 +0000
Subject: [PATCH] - full update to Safe 2.09

Changed files:
    perl-Safe.patch -> 1.2
---
 perl-Safe.patch | 74 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 70 insertions(+), 4 deletions(-)

diff --git a/perl-Safe.patch b/perl-Safe.patch
index 45da3ec..8e2395a 100644
--- a/perl-Safe.patch
+++ b/perl-Safe.patch
@@ -1,15 +1,56 @@
 --- perl-5.6.1.orig/ext/Opcode/Safe.pm
 +++ perl-5.6.1/ext/Opcode/Safe.pm
-@@ -213,7 +213,7 @@
+@@ -3,7 +3,7 @@
+ use 5.003_11;
+ use strict;
+ 
+-our $VERSION = "2.06";
++$Safe::VERSION = "2.09";
+ 
+ use Carp;
+ 
+@@ -47,6 +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}) if($Opcode::VERSION > 1.04);
+     return $obj;
+ }
+ 
+@@ -154,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\::"};
+@@ -189,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);
+@@ -213,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 $evalcode = sprintf('package %s; sub { @_ = (); eval $expr; }', $root);
      my $evalsub;
  
- 	if ($strict) { use strict; $evalsub = eval $evalcode; }
-@@ -227,7 +227,7 @@
+-	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);
+ }
+@@ -227,7 +228,7 @@
      my $root = $obj->{Root};
  
      my $evalsub = eval
@@ -18,3 +59,28 @@
      return Opcode::_safe_call_sv($root, $obj->{Mask}, $evalsub);
  }
  
+@@ -379,11 +380,12 @@
+ =item share (NAME, ...)
+ 
+ This shares the variable(s) in the argument list with the compartment.
+-This is almost identical to exporting variables using the L<Exporter(3)>
++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'
+@@ -425,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
-- 
2.44.0