[libperl5i-perl] 03/07: Drop patches which were cherry-picked from upstream or have been merged.
gregor herrmann
gregoa at debian.org
Mon Oct 31 00:16:57 UTC 2016
This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository libperl5i-perl.
commit 83538d535987f2517998ae2f3879fa6044e0cf9a
Author: gregor herrmann <gregoa at debian.org>
Date: Mon Oct 31 01:08:01 2016 +0100
Drop patches which were cherry-picked from upstream or have been merged.
---
...ick-d096ee5e-fix-perl5i-dash-e-from-segfaulting | 64 ----------------------
debian/patches/series | 3 -
debian/patches/spelling.patch | 40 --------------
debian/patches/stat_perl_5.23.3.patch | 31 -----------
4 files changed, 138 deletions(-)
diff --git a/debian/patches/cherry-pick-d096ee5e-fix-perl5i-dash-e-from-segfaulting b/debian/patches/cherry-pick-d096ee5e-fix-perl5i-dash-e-from-segfaulting
deleted file mode 100644
index c4d77cb..0000000
--- a/debian/patches/cherry-pick-d096ee5e-fix-perl5i-dash-e-from-segfaulting
+++ /dev/null
@@ -1,64 +0,0 @@
-Description: Fix "perl5i -e" from segfaulting.
-Bug-Debian: https://bugs.debian.org/716296
-Bug: https://github.com/schwern/perl5i/issues/269
-Origin: commit d096ee5e26603630a6bae5ee711000e09a038ab3
-Author: Michael G. Schwern <schwern at pobox.com>
-Date: Fri Feb 6 23:26:00 2015 -0800
-
-diff --git a/bin/perl5i.c.PL b/bin/perl5i.c.PL
-index 560ff07..ad2bcb0 100644
---- a/bin/perl5i.c.PL
-+++ b/bin/perl5i.c.PL
-@@ -39,7 +39,7 @@ int main (int argc, char* argv[]) {
- const char* perl_cmd = "%s";
- char* perl_args[argc+1];
- char* dash_m = (char *)malloc(sizeof(char) * (strlen(argv[0]) + 20));
-- char* program;
-+ char* program = "";
- int saw_dash_e = 0;
-
- strcpy(dash_m, "-Mperl5i::cmd=");
-@@ -56,6 +56,7 @@ int main (int argc, char* argv[]) {
- && dash_e > argv[i]
- && *(dash_e-1) == '-'
- && (strchr(argv[i], '-') == argv[i])
-+ && i+1 < argc
- )
- {
- saw_dash_e = 1;
-@@ -70,8 +71,8 @@ int main (int argc, char* argv[]) {
- }
-
- /* Skip the next argument, its the program */
-- program = argv[i+1];
- i++;
-+ program = argv[i];
- continue;
- }
-
-diff --git a/t/command_line_wrapper.t b/t/command_line_wrapper.t
-index c7b100f..509cd01 100755
---- a/t/command_line_wrapper.t
-+++ b/t/command_line_wrapper.t
-@@ -64,4 +64,21 @@ is capture {system @perl5icmd, '-e', q($fun="yay"; say $fun;)}, "yay\n", 'no str
- is capture {system ($^X, '-Ilib', '-Mperl5i::latest', '-e', q|$fun="yay"; say $fun;|)},
- "yay\n", q{no strict vars for perl -Mperl5i::latest -e '...'};
-
-+# It acts like Perl when given weird arguments.
-+{
-+ # We expect these system calls to return non-zero
-+ no autodie "system";
-+
-+ my %tests = (
-+ "-e with no code" => ["-e"],
-+ "null byte" => ["\\000", "-e"],
-+ );
-+
-+ %tests->each(func($test_name,$args) {
-+ is capture {system @perl5icmd, $args},
-+ capture {system $^X, $args},
-+ $test_name;
-+ });
-+}
-+
- done_testing;
diff --git a/debian/patches/series b/debian/patches/series
index dc928ba..660709a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
fix-test-for-mips
-cherry-pick-d096ee5e-fix-perl5i-dash-e-from-segfaulting
dont-use-dash-Ilib
-stat_perl_5.23.3.patch
-spelling.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
deleted file mode 100644
index bbefd22..0000000
--- a/debian/patches/spelling.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: fix some spelling mistakes on the POD
-Origin: vendor
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2016-05-29
-Forwarded: https://github.com/evalEmpire/perl5i/issues/294
-Bug: https://github.com/evalEmpire/perl5i/issues/294
-
---- a/lib/perl5i.pm
-+++ b/lib/perl5i.pm
-@@ -825,7 +825,7 @@
- my %things = ( foo => 1, bar => 2, baz => 5 );
- my %flipped = %things->flip; # { 1 => foo, 2 => bar, 5 => baz }
-
--If there is more than one occurence of a certain value, any one of the
-+If there is more than one occurrence of a certain value, any one of the
- keys may end up as the value. This is because of the random ordering
- of hash keys.
-
---- a/lib/perl5i/Meta.pod
-+++ b/lib/perl5i/Meta.pod
-@@ -67,7 +67,7 @@
-
- my $id = $object->mo->id;
-
--Returns an identifer for $object.
-+Returns an identifier for $object.
-
- The identifier is guaranteed to be:
-
---- a/lib/perl5ifaq.pod
-+++ b/lib/perl5ifaq.pod
-@@ -28,7 +28,7 @@
- DateTime>.
-
- Not only does this cause you to litter your code with a dozen use
--statements, it also requires tribal knowledge not neccessarily
-+statements, it also requires tribal knowledge not necessarily
- available to the new programmer. To use Perl 5 well requires an
- experienced Perl programmer looking over your shoulder, giving you
- advice.
diff --git a/debian/patches/stat_perl_5.23.3.patch b/debian/patches/stat_perl_5.23.3.patch
deleted file mode 100644
index 5293603..0000000
--- a/debian/patches/stat_perl_5.23.3.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 26a254ddaabe2a35d60ff4b9336e522bceb2e5a5 Mon Sep 17 00:00:00 2001
-From: Slaven Rezic <srezic at cpan.org>
-Date: Tue, 22 Mar 2016 00:54:30 +0000
-Subject: [PATCH] fix stat() and lstat() calls for perl 5.23.3+ (#291)
-
-Bug: https://github.com/evalEmpire/perl5i/issues/291
-Bug-Debian: https://bugs.debian.org/825612
-
----
- lib/perl5i/2.pm | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/perl5i/2.pm b/lib/perl5i/2.pm
-index 961f08d..aa3682c 100644
---- a/lib/perl5i/2.pm
-+++ b/lib/perl5i/2.pm
-@@ -188,12 +188,12 @@ sub perl5i_die {
-
- # File::stat does not play nice in list context
- sub stat {
-- return CORE::stat(@_) if wantarray;
-+ return CORE::stat($_[0]) if wantarray;
- return File::stat::stat(@_);
- }
-
- sub lstat {
-- return CORE::lstat(@_) if wantarray;
-+ return CORE::lstat($_[0]) if wantarray;
- return File::stat::lstat(@_);
- }
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libperl5i-perl.git
More information about the Pkg-perl-cvs-commits
mailing list