Fix merge issues, remove excess files - match perl-5.32.1 dist

OK sthen@

1 files changed, 12 insertions, 2 deletions

diff --git a/gnu/usr.bin/perl/ext/Opcode/Opcode.pm b/gnu/usr.bin/perl/ext/Opcode/Opcode.pm
index 9d97ef15401..9351c3ba207 100644
--- a/gnu/usr.bin/perl/ext/Opcode/Opcode.pm
+++ b/gnu/usr.bin/perl/ext/Opcode/Opcode.pm
@@ -6,7 +6,7 @@ use strict;
 
 our($VERSION, @ISA, @EXPORT_OK);
 
-$VERSION = "1.43";
+$VERSION = "1.48";
 
 use Carp;
 use Exporter ();
@@ -117,6 +117,13 @@ Safe modules for more typical uses.
 
 =head1 WARNING
 
+The Opcode module does not implement an effective sandbox for
+evaluating untrusted code with the perl interpreter.
+
+Bugs in the perl interpreter that could be abused to bypass
+Opcode restrictions are not treated as vulnerabilities. See
+L<perlsecpolicy> for additional information.
+
 The authors make B<no warranty>, implied or otherwise, about the
 suitability of this software for safety or security purposes.
 
@@ -324,6 +331,7 @@ invert_opset function.
 
     lt i_lt gt i_gt le i_le ge i_ge eq i_eq ne i_ne ncmp i_ncmp
     slt sgt sle sge seq sne scmp
+    isa
 
     substr vec stringify study pos length index rindex ord chr
 
@@ -344,6 +352,8 @@ invert_opset function.
     method_super method_redir method_redir_super
      -- XXX loops via recursion?
 
+    cmpchain_and cmpchain_dup
+
     leaveeval -- needed for Safe to operate, is safe
 		 without entereval
 
@@ -493,7 +503,7 @@ A handy tag name for a I<reasonable> default set of ops beyond the
 :default optag.  Like :default (and indeed all the other optags) its
 current definition is unstable while development continues. It will change.
 
-The :browse tag represents the next step beyond :default. It it a
+The :browse tag represents the next step beyond :default. It is a
 superset of the :default ops and adds :filesys_read the :sys_db.
 The intent being that scripts can access more (possibly sensitive)
 information about your system but not be able to change it.