* [gentoo-commits] repo/gentoo:master commit in: dev-lang/perl/files/
@ 2021-08-26 22:32 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-08-26 22:32 UTC (permalink / raw
To: gentoo-commits
commit: 879530c9d5c8958c94b3cc19184dc920971337fb
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Aug 25 14:36:55 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 26 22:32:31 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=879530c9
dev-lang/perl: remove unused patch
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../perl/files/perl-5.30.3-darwin-macos11.patch | 180 ---------------------
1 file changed, 180 deletions(-)
diff --git a/dev-lang/perl/files/perl-5.30.3-darwin-macos11.patch b/dev-lang/perl/files/perl-5.30.3-darwin-macos11.patch
deleted file mode 100644
index 73879b398c4..00000000000
--- a/dev-lang/perl/files/perl-5.30.3-darwin-macos11.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-https://github.com/Perl/perl5/pull/17946
-https://bugs.gentoo.org/757249
----
-From b382aafc793fe1007f9058a5145a1d39d56cef70 Mon Sep 17 00:00:00 2001
-From: Adam Hartley <git@ahartley.com>
-Date: Mon, 6 Jul 2020 22:59:42 +0100
-Subject: [PATCH 1/7] Add 11.x support for darwin.sh
-
----
- hints/darwin.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/hints/darwin.sh b/hints/darwin.sh
-index 0a91bc083c0..c0f06de1cab 100644
---- a/hints/darwin.sh
-+++ b/hints/darwin.sh
-@@ -301,7 +301,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x
- # We now use MACOSX_DEPLOYMENT_TARGET, if set, as an override by
- # capturing its value and adding it to the flags.
- case "$MACOSX_DEPLOYMENT_TARGET" in
-- 10.*)
-+ 10.* | 11.*)
- add_macosx_version_min ccflags $MACOSX_DEPLOYMENT_TARGET
- add_macosx_version_min ldflags $MACOSX_DEPLOYMENT_TARGET
- ;;
-@@ -327,7 +327,7 @@ EOM
- # "ProductVersion: 10.11" "10.11"
- prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
- case "$prodvers" in
-- 10.*)
-+ 10.* | 11.*)
- add_macosx_version_min ccflags $prodvers
- add_macosx_version_min ldflags $prodvers
- ;;
-
-From 960d1a5c4225d1dd12636a469e10a568464e4e7c Mon Sep 17 00:00:00 2001
-From: Adam Hartley <git@ahartley.com>
-Date: Wed, 8 Jul 2020 19:10:33 +0100
-Subject: [PATCH 3/7] Update error message
-
----
- hints/darwin.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hints/darwin.sh b/hints/darwin.sh
-index c0f06de1cab..988b766c4f4 100644
---- a/hints/darwin.sh
-+++ b/hints/darwin.sh
-@@ -313,7 +313,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x
-
- *** Unexpected MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET
- ***
--*** Please either set it to 10.something, or to empty.
-+*** Please either set it to 10.something, 11.something or to empty.
-
- EOM
- exit 1
-
-From d633cced1d5174e19c5f2234a9fb4c7603cfb9db Mon Sep 17 00:00:00 2001
-From: Adam Hartley <git@ahartley.com>
-Date: Sat, 11 Jul 2020 11:41:27 +0100
-Subject: [PATCH 4/7] Update deprecated syscall check for 11.x and greater
-
----
- hints/darwin.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/hints/darwin.sh b/hints/darwin.sh
-index 988b766c4f4..4f73a9995e7 100644
---- a/hints/darwin.sh
-+++ b/hints/darwin.sh
-@@ -342,11 +342,11 @@ EOM
- exit 1
- esac
-
-- # The X in 10.X
-+ prodvers_major=$(echo $prodvers|awk -F. '{print $1}')
- prodvers_minor=$(echo $prodvers|awk -F. '{print $2}')
-
- # macOS (10.12) deprecated syscall().
-- if [ "$prodvers_minor" -ge 12 ]; then
-+ if [[ ( "$prodvers_minor" -ge 12 && "$prodvers_major" -eq 10 ) || "$prodvers_major" -ge 11 ]]; then
- d_syscall='undef'
- # If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime()
- case "$MACOSX_DEPLOYMENT_TARGET" in
-
-From 9c3890f8521a7db6d9b2aa21561c7d0dae9fb91d Mon Sep 17 00:00:00 2001
-From: Adam Hartley <BytesGuy@users.noreply.github.com>
-Date: Wed, 22 Jul 2020 13:15:30 +0100
-Subject: [PATCH 5/7] Simplify syscall check
-
----
- hints/darwin.sh | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/hints/darwin.sh b/hints/darwin.sh
-index 4f73a9995e7..40c84cf267a 100644
---- a/hints/darwin.sh
-+++ b/hints/darwin.sh
-@@ -342,11 +342,10 @@ EOM
- exit 1
- esac
-
-- prodvers_major=$(echo $prodvers|awk -F. '{print $1}')
-- prodvers_minor=$(echo $prodvers|awk -F. '{print $2}')
-+ darwin_major=$(echo $osvers|awk -F. '{print $1}')
-
-- # macOS (10.12) deprecated syscall().
-- if [[ ( "$prodvers_minor" -ge 12 && "$prodvers_major" -eq 10 ) || "$prodvers_major" -ge 11 ]]; then
-+ # macOS 10.12 (darwin 6.0.0) deprecated syscall().
-+ if [ "$darwin_major" -ge 6 ]; then
- d_syscall='undef'
- # If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime()
- case "$MACOSX_DEPLOYMENT_TARGET" in
-
-From 99ff8934992102a3db63805e8ba9710577de164e Mon Sep 17 00:00:00 2001
-From: Adam Hartley <BytesGuy@users.noreply.github.com>
-Date: Wed, 22 Jul 2020 13:15:53 +0100
-Subject: [PATCH 6/7] Update darwin.sh
-
----
- hints/darwin.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/hints/darwin.sh b/hints/darwin.sh
-index 40c84cf267a..1709d224f7c 100644
---- a/hints/darwin.sh
-+++ b/hints/darwin.sh
-@@ -344,8 +344,8 @@ EOM
-
- darwin_major=$(echo $osvers|awk -F. '{print $1}')
-
-- # macOS 10.12 (darwin 6.0.0) deprecated syscall().
-- if [ "$darwin_major" -ge 6 ]; then
-+ # macOS 10.12 (darwin 16.0.0) deprecated syscall().
-+ if [ "$darwin_major" -ge 16 ]; then
- d_syscall='undef'
- # If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime()
- case "$MACOSX_DEPLOYMENT_TARGET" in
-
-From 1b712e4b359d9508461a0a832d06baa6e589b955 Mon Sep 17 00:00:00 2001
-From: Adam Hartley <BytesGuy@users.noreply.github.com>
-Date: Thu, 23 Jul 2020 19:53:07 +0100
-Subject: [PATCH 7/7] Future proof version check
-
----
- hints/darwin.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/hints/darwin.sh b/hints/darwin.sh
-index 1709d224f7c..fdfbdd4a3b9 100644
---- a/hints/darwin.sh
-+++ b/hints/darwin.sh
-@@ -301,7 +301,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x
- # We now use MACOSX_DEPLOYMENT_TARGET, if set, as an override by
- # capturing its value and adding it to the flags.
- case "$MACOSX_DEPLOYMENT_TARGET" in
-- 10.* | 11.*)
-+ [1-9][0-9].*)
- add_macosx_version_min ccflags $MACOSX_DEPLOYMENT_TARGET
- add_macosx_version_min ldflags $MACOSX_DEPLOYMENT_TARGET
- ;;
-@@ -313,7 +313,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x
-
- *** Unexpected MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET
- ***
--*** Please either set it to 10.something, 11.something or to empty.
-+*** Please either set it to a valid macOS version number (e.g., 10.15) or to empty.
-
- EOM
- exit 1
-@@ -327,7 +327,7 @@ EOM
- # "ProductVersion: 10.11" "10.11"
- prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
- case "$prodvers" in
-- 10.* | 11.*)
-+ [1-9][0-9].*)
- add_macosx_version_min ccflags $prodvers
- add_macosx_version_min ldflags $prodvers
- ;;
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/perl/files/
@ 2023-08-29 7:49 Conrad Kostecki
0 siblings, 0 replies; 6+ messages in thread
From: Conrad Kostecki @ 2023-08-29 7:49 UTC (permalink / raw
To: gentoo-commits
commit: cff22ee58e44213ef9c8d5ad4014c8c415ccd9ae
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Aug 20 15:09:56 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Aug 29 07:49:06 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cff22ee5
dev-lang/perl: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/32392
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/perl-5.34.0-fallback-getcwd-pwd.patch | 263 ---------------------
1 file changed, 263 deletions(-)
diff --git a/dev-lang/perl/files/perl-5.34.0-fallback-getcwd-pwd.patch b/dev-lang/perl/files/perl-5.34.0-fallback-getcwd-pwd.patch
deleted file mode 100644
index 849a09a39a05..000000000000
--- a/dev-lang/perl/files/perl-5.34.0-fallback-getcwd-pwd.patch
+++ /dev/null
@@ -1,263 +0,0 @@
-https://github.com/Perl/perl5/pull/18791
-https://github.com/Perl/perl5/issues/18703
-https://bugs.gentoo.org/818172
-
-From: Tony Cook <tony@develop-help.com>
-Date: Tue, 4 May 2021 14:55:50 +1000
-Subject: [PATCH 1/4] remove code that assuming finding pwd on the path is
- reasonable
-
-We deliberately clear PATH when invoking pwd, so this search is
-useless.
----
- dist/PathTools/Cwd.pm | 14 --------------
- 1 file changed, 14 deletions(-)
-
-diff --git a/dist/PathTools/Cwd.pm b/dist/PathTools/Cwd.pm
-index 6a1d2f17ee57..49c12885b32e 100644
---- a/dist/PathTools/Cwd.pm
-+++ b/dist/PathTools/Cwd.pm
-@@ -213,20 +213,6 @@ sub _backtick_pwd {
- # we take care not to override an existing definition for cwd().
-
- unless ($METHOD_MAP{$^O}{cwd} or defined &cwd) {
-- # The pwd command is not available in some chroot(2)'ed environments
-- my $sep = $Config::Config{path_sep} || ':';
-- my $os = $^O; # Protect $^O from tainting
--
--
-- # Try again to find a pwd, this time searching the whole PATH.
-- if (defined $ENV{PATH} and $os ne 'MSWin32') { # no pwd on Windows
-- my @candidates = split($sep, $ENV{PATH});
-- while (!$found_pwd_cmd and @candidates) {
-- my $candidate = shift @candidates;
-- $found_pwd_cmd = 1 if -x "$candidate/pwd";
-- }
-- }
--
- if( $found_pwd_cmd )
- {
- *cwd = \&_backtick_pwd;
-
-From e5378ea37c6c4910107975d8099c1d552af0c7b3 Mon Sep 17 00:00:00 2001
-From: Tony Cook <tony@develop-help.com>
-Date: Wed, 5 May 2021 10:12:31 +1000
-Subject: [PATCH 2/4] don't fallback to simple pwd
-
-When _backtick_pwd invokes $pwd_cmd it first clears the PATH, and since
-the command has no shell metacharacters, it perl won't invoke the
-shell, so it will always fail.
-
-An alternative here might be to use "/bin/sh -c pwd" but there's no
-guarantee that pwd is available as a shell builtin.
----
- dist/PathTools/Cwd.pm | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/dist/PathTools/Cwd.pm b/dist/PathTools/Cwd.pm
-index 49c12885b32e..fbe683e20b8a 100644
---- a/dist/PathTools/Cwd.pm
-+++ b/dist/PathTools/Cwd.pm
-@@ -181,12 +181,6 @@ if ($^O =~ /android/) {
- }
-
- my $found_pwd_cmd = defined($pwd_cmd);
--unless ($pwd_cmd) {
-- # Isn't this wrong? _backtick_pwd() will fail if someone has
-- # pwd in their path but it is not /bin/pwd or /usr/bin/pwd?
-- # See [perl #16774]. --jhi
-- $pwd_cmd = 'pwd';
--}
-
- # Lazy-load Carp
- sub _carp { require Carp; Carp::carp(@_) }
-
-From e14ffd3c21efe708a5fb5e25f29d61ccb6ee0a0a Mon Sep 17 00:00:00 2001
-From: Tony Cook <tony@develop-help.com>
-Date: Tue, 4 May 2021 15:04:25 +1000
-Subject: [PATCH 3/4] avoid a prototype warning assigning \&getcwd to *cwd
-
-This would produce a warning if we fallback to using getcwd() where
-getcwd() has a prototype.
----
- dist/PathTools/Cwd.pm | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/dist/PathTools/Cwd.pm b/dist/PathTools/Cwd.pm
-index fbe683e20b8a..b6dc0b798e8c 100644
---- a/dist/PathTools/Cwd.pm
-+++ b/dist/PathTools/Cwd.pm
-@@ -212,7 +212,8 @@ unless ($METHOD_MAP{$^O}{cwd} or defined &cwd) {
- *cwd = \&_backtick_pwd;
- }
- else {
-- *cwd = \&getcwd;
-+ # getcwd() might have an empty prototype
-+ *cwd = sub { getcwd(); };
- }
- }
-
-
-From e725e6ced4d2bbb6a5866992509c2ac3e995c228 Mon Sep 17 00:00:00 2001
-From: Tony Cook <tony@develop-help.com>
-Date: Wed, 12 May 2021 12:24:59 +1000
-Subject: [PATCH 4/4] bump PathTools to 3.81
-
----
- dist/PathTools/Cwd.pm | 2 +-
- dist/PathTools/lib/File/Spec.pm | 2 +-
- dist/PathTools/lib/File/Spec/AmigaOS.pm | 2 +-
- dist/PathTools/lib/File/Spec/Cygwin.pm | 2 +-
- dist/PathTools/lib/File/Spec/Epoc.pm | 2 +-
- dist/PathTools/lib/File/Spec/Functions.pm | 2 +-
- dist/PathTools/lib/File/Spec/Mac.pm | 2 +-
- dist/PathTools/lib/File/Spec/OS2.pm | 2 +-
- dist/PathTools/lib/File/Spec/Unix.pm | 2 +-
- dist/PathTools/lib/File/Spec/VMS.pm | 2 +-
- dist/PathTools/lib/File/Spec/Win32.pm | 2 +-
- 11 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/dist/PathTools/Cwd.pm b/dist/PathTools/Cwd.pm
-index b6dc0b798e8c..4a9c786c1c3c 100644
---- a/dist/PathTools/Cwd.pm
-+++ b/dist/PathTools/Cwd.pm
-@@ -3,7 +3,7 @@ use strict;
- use Exporter;
-
-
--our $VERSION = '3.80';
-+our $VERSION = '3.81';
- my $xs_version = $VERSION;
- $VERSION =~ tr/_//d;
-
-diff --git a/dist/PathTools/lib/File/Spec.pm b/dist/PathTools/lib/File/Spec.pm
-index 30d883b61b3e..fe738acf58bd 100644
---- a/dist/PathTools/lib/File/Spec.pm
-+++ b/dist/PathTools/lib/File/Spec.pm
-@@ -2,7 +2,7 @@ package File::Spec;
-
- use strict;
-
--our $VERSION = '3.80';
-+our $VERSION = '3.81';
- $VERSION =~ tr/_//d;
-
- my %module = (
-diff --git a/dist/PathTools/lib/File/Spec/AmigaOS.pm b/dist/PathTools/lib/File/Spec/AmigaOS.pm
-index fd9da81cdf5a..1398379ca57c 100644
---- a/dist/PathTools/lib/File/Spec/AmigaOS.pm
-+++ b/dist/PathTools/lib/File/Spec/AmigaOS.pm
-@@ -3,7 +3,7 @@ package File::Spec::AmigaOS;
- use strict;
- require File::Spec::Unix;
-
--our $VERSION = '3.80';
-+our $VERSION = '3.81';
- $VERSION =~ tr/_//d;
-
- our @ISA = qw(File::Spec::Unix);
-diff --git a/dist/PathTools/lib/File/Spec/Cygwin.pm b/dist/PathTools/lib/File/Spec/Cygwin.pm
-index 953c23361a10..55d551ce0663 100644
---- a/dist/PathTools/lib/File/Spec/Cygwin.pm
-+++ b/dist/PathTools/lib/File/Spec/Cygwin.pm
-@@ -3,7 +3,7 @@ package File::Spec::Cygwin;
- use strict;
- require File::Spec::Unix;
-
--our $VERSION = '3.80';
-+our $VERSION = '3.81';
- $VERSION =~ tr/_//d;
-
- our @ISA = qw(File::Spec::Unix);
-diff --git a/dist/PathTools/lib/File/Spec/Epoc.pm b/dist/PathTools/lib/File/Spec/Epoc.pm
-index fcb9e894e33c..4cde744231aa 100644
---- a/dist/PathTools/lib/File/Spec/Epoc.pm
-+++ b/dist/PathTools/lib/File/Spec/Epoc.pm
-@@ -2,7 +2,7 @@ package File::Spec::Epoc;
-
- use strict;
-
--our $VERSION = '3.80';
-+our $VERSION = '3.81';
- $VERSION =~ tr/_//d;
-
- require File::Spec::Unix;
-diff --git a/dist/PathTools/lib/File/Spec/Functions.pm b/dist/PathTools/lib/File/Spec/Functions.pm
-index e14ad2f74538..4b3d7bbde130 100644
---- a/dist/PathTools/lib/File/Spec/Functions.pm
-+++ b/dist/PathTools/lib/File/Spec/Functions.pm
-@@ -3,7 +3,7 @@ package File::Spec::Functions;
- use File::Spec;
- use strict;
-
--our $VERSION = '3.80';
-+our $VERSION = '3.81';
- $VERSION =~ tr/_//d;
-
- require Exporter;
-diff --git a/dist/PathTools/lib/File/Spec/Mac.pm b/dist/PathTools/lib/File/Spec/Mac.pm
-index 8026edcb1261..51d00a01f6f7 100644
---- a/dist/PathTools/lib/File/Spec/Mac.pm
-+++ b/dist/PathTools/lib/File/Spec/Mac.pm
-@@ -4,7 +4,7 @@ use strict;
- use Cwd ();
- require File::Spec::Unix;
-
--our $VERSION = '3.80';
-+our $VERSION = '3.81';
- $VERSION =~ tr/_//d;
-
- our @ISA = qw(File::Spec::Unix);
-diff --git a/dist/PathTools/lib/File/Spec/OS2.pm b/dist/PathTools/lib/File/Spec/OS2.pm
-index 3c35ba99b48a..57d67ba01e93 100644
---- a/dist/PathTools/lib/File/Spec/OS2.pm
-+++ b/dist/PathTools/lib/File/Spec/OS2.pm
-@@ -4,7 +4,7 @@ use strict;
- use Cwd ();
- require File::Spec::Unix;
-
--our $VERSION = '3.80';
-+our $VERSION = '3.81';
- $VERSION =~ tr/_//d;
-
- our @ISA = qw(File::Spec::Unix);
-diff --git a/dist/PathTools/lib/File/Spec/Unix.pm b/dist/PathTools/lib/File/Spec/Unix.pm
-index c06d18f46819..df98f580c3ea 100644
---- a/dist/PathTools/lib/File/Spec/Unix.pm
-+++ b/dist/PathTools/lib/File/Spec/Unix.pm
-@@ -3,7 +3,7 @@ package File::Spec::Unix;
- use strict;
- use Cwd ();
-
--our $VERSION = '3.80';
-+our $VERSION = '3.81';
- $VERSION =~ tr/_//d;
-
- =head1 NAME
-diff --git a/dist/PathTools/lib/File/Spec/VMS.pm b/dist/PathTools/lib/File/Spec/VMS.pm
-index 9b78c8b4bc6e..bbff3ad7d807 100644
---- a/dist/PathTools/lib/File/Spec/VMS.pm
-+++ b/dist/PathTools/lib/File/Spec/VMS.pm
-@@ -4,7 +4,7 @@ use strict;
- use Cwd ();
- require File::Spec::Unix;
-
--our $VERSION = '3.80';
-+our $VERSION = '3.81';
- $VERSION =~ tr/_//d;
-
- our @ISA = qw(File::Spec::Unix);
-diff --git a/dist/PathTools/lib/File/Spec/Win32.pm b/dist/PathTools/lib/File/Spec/Win32.pm
-index 153744202338..b38419cdf1a6 100644
---- a/dist/PathTools/lib/File/Spec/Win32.pm
-+++ b/dist/PathTools/lib/File/Spec/Win32.pm
-@@ -5,7 +5,7 @@ use strict;
- use Cwd ();
- require File::Spec::Unix;
-
--our $VERSION = '3.80';
-+our $VERSION = '3.81';
- $VERSION =~ tr/_//d;
-
- our @ISA = qw(File::Spec::Unix);
-
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/perl/files/
@ 2022-10-30 9:28 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-10-30 9:28 UTC (permalink / raw
To: gentoo-commits
commit: 6aa1c4d810e67092ac80f42f006e086a42269fcf
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Oct 30 07:52:08 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 09:27:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6aa1c4d8
dev-lang/perl: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28035
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/perl/files/perl-5.34.0-gdbm-1.20.patch | 40 -------------------------
1 file changed, 40 deletions(-)
diff --git a/dev-lang/perl/files/perl-5.34.0-gdbm-1.20.patch b/dev-lang/perl/files/perl-5.34.0-gdbm-1.20.patch
deleted file mode 100644
index fc4c55c6899f..000000000000
--- a/dev-lang/perl/files/perl-5.34.0-gdbm-1.20.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Sergey Poznyakoff <gray@gnu.org>
-Date: Wed, 23 Jun 2021 10:26:50 +0300
-Subject: Fix GDBM_File to compile with version 1.20 and earlier
-
-* ext/GDBM_File/GDBM_File.xs (ITEM_NOT_FOUND): Define conditionally,
-depending on the GDBM_VERSION_MAJOR and GDBM_VERSION_MINOR.
-Don't assume GDBM_ITEM_NOT_FOUND is a define (it isn't since
-gdbm commit d3e27957).
-
-Origin: backport, https://github.com/Perl/perl5/pull/18924/commits/aacd2398e766500cb5d83c4d76b642fcf31d997a
-Bug: https://github.com/Perl/perl5/issues/18915
-Bug-Debian: https://bugs.debian.org/993514
----
- ext/GDBM_File/GDBM_File.xs | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/ext/GDBM_File/GDBM_File.xs b/ext/GDBM_File/GDBM_File.xs
-index cd0bb6f..494c288 100644
---- a/ext/GDBM_File/GDBM_File.xs
-+++ b/ext/GDBM_File/GDBM_File.xs
-@@ -145,14 +145,13 @@ output_datum(pTHX_ SV *arg, char *str, int size)
- #define gdbm_setopt(db,optflag,optval,optlen) not_here("gdbm_setopt")
- #endif
-
--#ifndef GDBM_ITEM_NOT_FOUND
--# define GDBM_ITEM_NOT_FOUND GDBM_NO_ERROR
--#endif
--
-+#if GDBM_VERSION_MAJOR == 1 && GDBM_VERSION_MINOR < 13
- /* Prior to 1.13, gdbm_fetch family functions set gdbm_errno to GDBM_NO_ERROR
- if the requested key did not exist */
--#define ITEM_NOT_FOUND() \
-- (gdbm_errno == GDBM_ITEM_NOT_FOUND || gdbm_errno == GDBM_NO_ERROR)
-+# define ITEM_NOT_FOUND() (gdbm_errno == GDBM_NO_ERROR)
-+#else
-+# define ITEM_NOT_FOUND() (gdbm_errno == GDBM_ITEM_NOT_FOUND)
-+#endif
-
- #define CHECKDB(db) do { \
- if (!db->dbp) { \
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/perl/files/
@ 2020-07-21 23:17 Kent Fredric
0 siblings, 0 replies; 6+ messages in thread
From: Kent Fredric @ 2020-07-21 23:17 UTC (permalink / raw
To: gentoo-commits
commit: 00bfaba4292d55832f34e8377c612be31ccf58fe
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Jul 21 14:05:35 2020 +0000
Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Tue Jul 21 23:16:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00bfaba4
dev-lang/perl: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/16762
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Kent Fredric <kentnl <AT> gentoo.org>
dev-lang/perl/files/perl-5.30.1-gcc-10.patch | 99 ----------------------------
1 file changed, 99 deletions(-)
diff --git a/dev-lang/perl/files/perl-5.30.1-gcc-10.patch b/dev-lang/perl/files/perl-5.30.1-gcc-10.patch
deleted file mode 100644
index bb92527853f..00000000000
--- a/dev-lang/perl/files/perl-5.30.1-gcc-10.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-https://bugs.gentoo.org/708744
-
-From 6bd6308fcea3541e505651bf8e8127a4a03d22cd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Tue, 12 Nov 2019 09:19:18 +0100
-Subject: [PATCH] Adapt Configure to GCC version 10
-
-I got a notice from Jeff Law <law@redhat.com>:
-
- Your particular package fails its testsuite. This was ultimately
- tracked down to a Configure problem. The perl configure script treated
- gcc-10 as gcc-1 and turned on -fpcc-struct-return. This is an ABI
- changing flag and caused Perl to not be able to interact properly with
- the dbm libraries on the system leading to a segfault.
-
-His proposed patch corrected only this one instance of the version
-mismatch. Reading the Configure script revealed more issues. This
-patch fixes all of them I found.
-
-Please note I do not have GCC 10 available, I tested it by faking the version
-with:
-
---- a/Configure
-+++ b/Configure
-@@ -4701,7 +4701,7 @@ else
- fi
- $rm -f try try.*
- case "$gccversion" in
--1*) cpp=`./loc gcc-cpp $cpp $pth` ;;
-+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;;
- esac
- case "$gccversion" in
- '') gccosandvers='' ;;
-@@ -4741,7 +4741,7 @@ esac
- # gcc 3.* complain about adding -Idirectories that they already know about,
- # so we will take those off from locincpth.
- case "$gccversion" in
--3*)
-+3.*)
- echo "main(){}">try.c
- for incdir in $locincpth; do
- warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
-@@ -5467,13 +5467,13 @@ fi
- case "$hint" in
- default|recommended)
- case "$gccversion" in
-- 1*) dflt="$dflt -fpcc-struct-return" ;;
-+ 1.*) dflt="$dflt -fpcc-struct-return" ;;
- esac
- case "$optimize:$DEBUGGING" in
- *-g*:old) dflt="$dflt -DDEBUGGING";;
- esac
- case "$gccversion" in
-- 2*) if $test -d /etc/conf/kconfig.d &&
-+ 2.*) if $test -d /etc/conf/kconfig.d &&
- $contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
- then
- # Interactive Systems (ISC) POSIX mode.
-@@ -5482,7 +5482,7 @@ default|recommended)
- ;;
- esac
- case "$gccversion" in
-- 1*) ;;
-+ 1.*) ;;
- 2.[0-8]*) ;;
- ?*) set strict-aliasing -fno-strict-aliasing
- eval $checkccflag
-@@ -5600,7 +5600,7 @@ case "$cppflags" in
- ;;
- esac
- case "$gccversion" in
--1*) cppflags="$cppflags -D__GNUC__"
-+1.*) cppflags="$cppflags -D__GNUC__"
- esac
- case "$mips_type" in
- '');;
-@@ -23103,7 +23103,7 @@ fi
-
- : add -D_FORTIFY_SOURCE if feasible and not already there
- case "$gccversion" in
--[456789].*) case "$optimize$ccflags" in
-+[456789].*|[1-9][0-9]*) case "$optimize$ccflags" in
- *-O*) case "$ccflags$cppsymbols" in
- *_FORTIFY_SOURCE=*) # Don't add it again.
- echo "You seem to have -D_FORTIFY_SOURCE already, not adding it." >&4
---- a/cflags.SH
-+++ b/cflags.SH
-@@ -156,7 +156,7 @@ esac
-
- case "$gccversion" in
- '') ;;
--[12]*) ;; # gcc versions 1 (gasp!) and 2 are not good for this.
-+[12].*) ;; # gcc versions 1 (gasp!) and 2 are not good for this.
- Intel*) ;; # # Is that you, Intel C++?
- #
- # NOTE 1: the -std=c89 without -pedantic is a bit pointless.
---
-2.25.0
-
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/perl/files/
@ 2020-06-15 2:35 Aaron Bauman
0 siblings, 0 replies; 6+ messages in thread
From: Aaron Bauman @ 2020-06-15 2:35 UTC (permalink / raw
To: gentoo-commits
commit: 2ffd59f21c979527bb1c7360c075ece11d53cb73
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Jun 14 07:30:56 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Jun 15 02:33:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ffd59f2
dev-lang/perl: remove unused patch
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16231
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
dev-lang/perl/files/perl-5.24-libnsl.patch | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/dev-lang/perl/files/perl-5.24-libnsl.patch b/dev-lang/perl/files/perl-5.24-libnsl.patch
deleted file mode 100644
index 5cd6f88c998..00000000000
--- a/dev-lang/perl/files/perl-5.24-libnsl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Configure b/Configure
-index e32d18ce1f..85ab0249bc 100755
---- a/Configure
-+++ b/Configure
-@@ -1497,7 +1497,7 @@ archname=''
- usereentrant='undef'
- : List of libraries we want.
- : If anyone needs extra -lxxx, put those in a hint file.
--libswanted="cl pthread socket bind inet nsl ndbm gdbm dbm db malloc dl ld"
-+libswanted="cl pthread socket bind inet ndbm gdbm dbm db malloc dl ld"
- libswanted="$libswanted sun m crypt sec util c cposix posix ucb bsd BSD"
- : We probably want to search /usr/shlib before most other libraries.
- : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/perl/files/
@ 2019-07-20 19:39 Aaron Bauman
0 siblings, 0 replies; 6+ messages in thread
From: Aaron Bauman @ 2019-07-20 19:39 UTC (permalink / raw
To: gentoo-commits
commit: cfec1a98eb1fa59061d5e780a799f02f021c6548
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Jun 22 15:58:46 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Jul 20 19:38:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfec1a98
dev-lang/perl: remove unused patch
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12306
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
dev-lang/perl/files/perl-5.28.0-dirhandle.patch | 99 -------------------------
1 file changed, 99 deletions(-)
diff --git a/dev-lang/perl/files/perl-5.28.0-dirhandle.patch b/dev-lang/perl/files/perl-5.28.0-dirhandle.patch
deleted file mode 100644
index 02debe5ac2b..00000000000
--- a/dev-lang/perl/files/perl-5.28.0-dirhandle.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From e0eae03760cafde89463c4d3d238be9a629f7fca Mon Sep 17 00:00:00 2001
-From: Tony Cook <tony@develop-help.com>
-Date: Mon, 2 Jul 2018 10:43:19 +1000
-Subject: [PATCH] (perl #133314) always close the directory handle on clean up
-
-Previously the directory handle was only closed if the rest of the
-magic free clean up is done, but in most success cases that code
-doesn't run, leaking the directory handle.
-
-So always close the directory if our AV is available.
-
-(cherry picked from commit 3d5e9c119db6b727684fe75dfcfe5831c4351bec)
----
- doio.c | 56 +++++++++++++++++++++++++++++++-------------------------
- 1 file changed, 31 insertions(+), 25 deletions(-)
-
-diff --git a/doio.c b/doio.c
-index 4b8923f77c..16daf9fd11 100644
---- a/doio.c
-+++ b/doio.c
-@@ -1163,44 +1163,50 @@ S_argvout_free(pTHX_ SV *io, MAGIC *mg) {
-
- /* mg_obj can be NULL if a thread is created with the handle open, in which
- case we leave any clean up to the parent thread */
-- if (mg->mg_obj && IoIFP(io)) {
-- SV **pid_psv;
-+ if (mg->mg_obj) {
- #ifdef ARGV_USE_ATFUNCTIONS
- SV **dir_psv;
- DIR *dir;
-+
-+ dir_psv = av_fetch((AV*)mg->mg_obj, ARGVMG_ORIG_DIRP, FALSE);
-+ assert(dir_psv && *dir_psv && SvIOK(*dir_psv));
-+ dir = INT2PTR(DIR *, SvIV(*dir_psv));
- #endif
-- PerlIO *iop = IoIFP(io);
-+ if (IoIFP(io)) {
-+ SV **pid_psv;
-+ PerlIO *iop = IoIFP(io);
-
-- assert(SvTYPE(mg->mg_obj) == SVt_PVAV);
-+ assert(SvTYPE(mg->mg_obj) == SVt_PVAV);
-
-- pid_psv = av_fetch((AV*)mg->mg_obj, ARGVMG_ORIG_PID, FALSE);
-+ pid_psv = av_fetch((AV*)mg->mg_obj, ARGVMG_ORIG_PID, FALSE);
-
-- assert(pid_psv && *pid_psv);
-+ assert(pid_psv && *pid_psv);
-
-- if (SvIV(*pid_psv) == (IV)PerlProc_getpid()) {
-- /* if we get here the file hasn't been closed explicitly by the
-- user and hadn't been closed implicitly by nextargv(), so
-- abandon the edit */
-- SV **temp_psv = av_fetch((AV*)mg->mg_obj, ARGVMG_TEMP_NAME, FALSE);
-- const char *temp_pv = SvPVX(*temp_psv);
-+ if (SvIV(*pid_psv) == (IV)PerlProc_getpid()) {
-+ /* if we get here the file hasn't been closed explicitly by the
-+ user and hadn't been closed implicitly by nextargv(), so
-+ abandon the edit */
-+ SV **temp_psv = av_fetch((AV*)mg->mg_obj, ARGVMG_TEMP_NAME, FALSE);
-+ const char *temp_pv = SvPVX(*temp_psv);
-
-- assert(temp_psv && *temp_psv && SvPOK(*temp_psv));
-- (void)PerlIO_close(iop);
-- IoIFP(io) = IoOFP(io) = NULL;
-+ assert(temp_psv && *temp_psv && SvPOK(*temp_psv));
-+ (void)PerlIO_close(iop);
-+ IoIFP(io) = IoOFP(io) = NULL;
- #ifdef ARGV_USE_ATFUNCTIONS
-- dir_psv = av_fetch((AV*)mg->mg_obj, ARGVMG_ORIG_DIRP, FALSE);
-- assert(dir_psv && *dir_psv && SvIOK(*dir_psv));
-- dir = INT2PTR(DIR *, SvIV(*dir_psv));
-- if (dir) {
-- if (unlinkat(my_dirfd(dir), temp_pv, 0) < 0 &&
-- NotSupported(errno))
-- (void)UNLINK(temp_pv);
-- closedir(dir);
-- }
-+ if (dir) {
-+ if (unlinkat(my_dirfd(dir), temp_pv, 0) < 0 &&
-+ NotSupported(errno))
-+ (void)UNLINK(temp_pv);
-+ }
- #else
-- (void)UNLINK(temp_pv);
-+ (void)UNLINK(temp_pv);
- #endif
-+ }
- }
-+#ifdef ARGV_USE_ATFUNCTIONS
-+ if (dir)
-+ closedir(dir);
-+#endif
- }
-
- return 0;
---
-2.21.0
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-08-29 7:49 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-26 22:32 [gentoo-commits] repo/gentoo:master commit in: dev-lang/perl/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-08-29 7:49 Conrad Kostecki
2022-10-30 9:28 Sam James
2020-07-21 23:17 Kent Fredric
2020-06-15 2:35 Aaron Bauman
2019-07-20 19:39 Aaron Bauman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox