Update to 1.08.

Drop Test-Taint-1.06-Test-taintedness-on-X-instead-of-environment-variabl.patch.
This commit is contained in:
Ralf Corsépius 2019-06-20 14:48:24 +02:00
parent 62b79d7914
commit 7179235b1f
4 changed files with 2 additions and 74 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
/Test-Taint-1.06.tar.gz
/Test-Taint-1.08.tar.gz

View File

@ -1,68 +0,0 @@
From cab25a93c2e8383cff35f55271a60f51645c98ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Wed, 18 Jan 2017 11:02:39 +0100
Subject: [PATCH] Test taintedness on $^X instead of environment variables
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Test::Simple adds TEST_ACTIVE and TEST2_ACTIVE members into %Env.
These are not tainted. t/tainted_ok.t and t/tainted.t tests can fail
if they pick up one of them.
This patch changes the tests to use $^X, interpreter path, instead as
discussed and implemented in simalar Scalar-List-Utils' bug
<https://rt.cpan.org/Public/Bug/Display.html?id=119169>.
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
t/tainted.t | 7 ++-----
t/tainted_ok.t | 5 +----
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/t/tainted.t b/t/tainted.t
index bf1e629..f5fb6d1 100644
--- a/t/tainted.t
+++ b/t/tainted.t
@@ -7,11 +7,8 @@ use Test::More tests => 6;
use Test::Taint;
-my @keys = keys %ENV;
-my $key = shift @keys;
-
taint_checking_ok();
-ok( tainted($ENV{$key}), "\$ENV{$key} is tainted" );
+ok( tainted($^X), "\$^X is tainted" );
my $foo = 43;
ok( !tainted($foo), '43 is not tainted' );
@@ -21,7 +18,7 @@ RESET_SIG_DIE: {
local $SIG{__DIE__} = sub { $counter++ };
- ok( tainted($ENV{$key}), "\$ENV{$key} is tainted" );
+ ok( tainted($^X), "\$^X is tainted" );
is($counter, 0, 'counter was not incremented (our die did not fire)');
eval { die 'validly' };
diff --git a/t/tainted_ok.t b/t/tainted_ok.t
index 2dcc9db..ce87343 100644
--- a/t/tainted_ok.t
+++ b/t/tainted_ok.t
@@ -5,11 +5,8 @@ use strict;
use Test::Taint tests=>3;
-my @keys = keys %ENV;
-my $key = shift @keys;
-
taint_checking_ok();
-tainted_ok( $ENV{$key}, "\$ENV{$key} is tainted" );
+tainted_ok( $^X, "\$^X is tainted" );
my $foo = 43;
untainted_ok( $foo );
--
2.7.4

View File

@ -6,9 +6,6 @@ License: GPL+ or Artistic
URL: https://metacpan.org/release/Test-Taint
Source0: https://cpan.metacpan.org/authors/id/P/PE/PETDANCE/Test-Taint-%{version}.tar.gz
# RHBZ#1413022, CPAN#119897
Patch0: Test-Taint-1.06-Test-taintedness-on-X-instead-of-environment-variabl.patch
BuildRequires: gcc
BuildRequires: %{__perl}
BuildRequires: %{__make}
@ -45,7 +42,6 @@ Test::More style.
%prep
%setup -q -n Test-Taint-%{version}
%patch0 -p1
%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="${RPM_OPT_FLAGS}" NO_PACKLIST=1

View File

@ -1 +1 @@
cb639c250f2030262a562ce3376219b0 Test-Taint-1.06.tar.gz
SHA512 (Test-Taint-1.08.tar.gz) = 2a7e3a60756c802dc33ac0b2a4102463de59fe92ba3cd83cb02e01e9f7aa13978c7a8ac7dcfdcf3c0d934af40e5189421874da819be9258e91080b777be71b20