From a0fc678cbe51537c2ffa66f38854eb7cb3aabc2ceba0a80280d780324b26378f Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 22 Sep 2021 17:09:22 +0000 Subject: [PATCH 1/4] fix duplicate patch test error OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-local-lib?expand=0&rev=48 --- cpanspec.yml | 4 ++-- perl-local-lib.changes | 5 +++++ perl-local-lib.spec | 4 +++- perl5.34_dedup.patch | 12 ++++++++++++ 4 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 perl5.34_dedup.patch diff --git a/cpanspec.yml b/cpanspec.yml index 7f28e38..afee931 100644 --- a/cpanspec.yml +++ b/cpanspec.yml @@ -7,8 +7,8 @@ sources: - perl-homedir.sh - perl-homedir.csh -#patches: -# foo.patch: -p1 +patches: + perl5.34_dedup.patch: -p1 PATCH-FIX-UPSTREAM inc_version_list now contains values which cause duplicate paths # bar.patch: #preamble: |- # BuildRequires: gcc-c++ diff --git a/perl-local-lib.changes b/perl-local-lib.changes index 93c3608..c4d5d43 100644 --- a/perl-local-lib.changes +++ b/perl-local-lib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 22 17:07:32 UTC 2021 - Dirk Stoecker + +- add perl5.34_dedup.patch to fix duplicate paths + ------------------------------------------------------------------- Tue Sep 14 20:03:17 UTC 2021 - Dirk Stoecker diff --git a/perl-local-lib.spec b/perl-local-lib.spec index 802f931..129eb4f 100644 --- a/perl-local-lib.spec +++ b/perl-local-lib.spec @@ -27,6 +27,8 @@ Source0: https://cpan.metacpan.org/authors/id/H/HA/HAARG/%{cpan_name}-%{v Source1: perl-homedir.sh Source2: perl-homedir.csh Source3: cpanspec.yml +# PATCH-FIX-UPSTREAM inc_version_list now contains values which cause duplicate paths +Patch0: perl5.34_dedup.patch BuildArch: noarch BuildRequires: perl BuildRequires: perl-macros @@ -73,7 +75,7 @@ When possible, these will be appended to instead of overwritten entirely. These values are then available for reference by any code after import. %prep -%autosetup -n %{cpan_name}-%{version} +%autosetup -n %{cpan_name}-%{version} -p1 %build perl Makefile.PL INSTALLDIRS=vendor diff --git a/perl5.34_dedup.patch b/perl5.34_dedup.patch new file mode 100644 index 0000000..0d69481 --- /dev/null +++ b/perl5.34_dedup.patch @@ -0,0 +1,12 @@ +diff -ur local-lib-2.000024/lib/local/lib.pm local-lib-2.000024_fix/lib/local/lib.pm +--- local-lib-2.000024/lib/local/lib.pm 2017-10-08 17:21:28.000000000 +0200 ++++ local-lib-2.000024_fix/lib/local/lib.pm 2021-09-22 19:04:37.510246455 +0200 +@@ -248,7 +248,7 @@ + [$_version, $_archname], + [$_version], + [$_archname], +- (map [$_], @_inc_version_list), ++ (map [$_], grep {$_ ne $_version && $_ ne "$_version/$_archname"} @_inc_version_list), + [], + ); + From a34bfd9f892f402ece14fa5ab0c23d5c6f41b851d58b25a78cd558b0e1dadb12 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 22 Sep 2021 17:48:27 +0000 Subject: [PATCH 2/4] revert last change OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-local-lib?expand=0&rev=49 --- cpanspec.yml | 4 ++-- perl-local-lib.changes | 5 ----- perl-local-lib.spec | 4 +--- perl5.34_dedup.patch | 12 ------------ 4 files changed, 3 insertions(+), 22 deletions(-) diff --git a/cpanspec.yml b/cpanspec.yml index afee931..7f28e38 100644 --- a/cpanspec.yml +++ b/cpanspec.yml @@ -7,8 +7,8 @@ sources: - perl-homedir.sh - perl-homedir.csh -patches: - perl5.34_dedup.patch: -p1 PATCH-FIX-UPSTREAM inc_version_list now contains values which cause duplicate paths +#patches: +# foo.patch: -p1 # bar.patch: #preamble: |- # BuildRequires: gcc-c++ diff --git a/perl-local-lib.changes b/perl-local-lib.changes index c4d5d43..93c3608 100644 --- a/perl-local-lib.changes +++ b/perl-local-lib.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Wed Sep 22 17:07:32 UTC 2021 - Dirk Stoecker - -- add perl5.34_dedup.patch to fix duplicate paths - ------------------------------------------------------------------- Tue Sep 14 20:03:17 UTC 2021 - Dirk Stoecker diff --git a/perl-local-lib.spec b/perl-local-lib.spec index 129eb4f..802f931 100644 --- a/perl-local-lib.spec +++ b/perl-local-lib.spec @@ -27,8 +27,6 @@ Source0: https://cpan.metacpan.org/authors/id/H/HA/HAARG/%{cpan_name}-%{v Source1: perl-homedir.sh Source2: perl-homedir.csh Source3: cpanspec.yml -# PATCH-FIX-UPSTREAM inc_version_list now contains values which cause duplicate paths -Patch0: perl5.34_dedup.patch BuildArch: noarch BuildRequires: perl BuildRequires: perl-macros @@ -75,7 +73,7 @@ When possible, these will be appended to instead of overwritten entirely. These values are then available for reference by any code after import. %prep -%autosetup -n %{cpan_name}-%{version} -p1 +%autosetup -n %{cpan_name}-%{version} %build perl Makefile.PL INSTALLDIRS=vendor diff --git a/perl5.34_dedup.patch b/perl5.34_dedup.patch index 0d69481..473a0f4 100644 --- a/perl5.34_dedup.patch +++ b/perl5.34_dedup.patch @@ -1,12 +0,0 @@ -diff -ur local-lib-2.000024/lib/local/lib.pm local-lib-2.000024_fix/lib/local/lib.pm ---- local-lib-2.000024/lib/local/lib.pm 2017-10-08 17:21:28.000000000 +0200 -+++ local-lib-2.000024_fix/lib/local/lib.pm 2021-09-22 19:04:37.510246455 +0200 -@@ -248,7 +248,7 @@ - [$_version, $_archname], - [$_version], - [$_archname], -- (map [$_], @_inc_version_list), -+ (map [$_], grep {$_ ne $_version && $_ ne "$_version/$_archname"} @_inc_version_list), - [], - ); - From 2f8c379e1c536252fda041a49e36420d20bad16336df37b6b747edfb19e966d0 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 22 Sep 2021 17:48:49 +0000 Subject: [PATCH 3/4] revert last change OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-local-lib?expand=0&rev=50 --- perl5.34_dedup.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 perl5.34_dedup.patch diff --git a/perl5.34_dedup.patch b/perl5.34_dedup.patch deleted file mode 100644 index 473a0f4..0000000 From ea54a120de64bfebf2ee9adfdc3560776fbaea38cc31f9952797db0c6ba57ae5 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Tue, 8 Aug 2023 06:09:53 +0000 Subject: [PATCH 4/4] Accepting request 1102787 from home:dimstar:Factory - Update to version 2.000029: - fix taint protection code to delete environment variables rather than leaving them as an empty string. - fix author test for CPAN.pm's bootstrapping process to work with new versions - Changes from.version 2.000028 - fix skips in shell test when shell has unpredictable startup actions - Changes from version 2.000027: - releasing as stable - Changes from version 2.000026: - fix output redirection used in fish shell to work with newer versions - fix optional function used on Win32 for finding the current directory - Changes from version 2.000025 - add documentation for --quiet option - added --always option to always add requested directory to env vars, even if they are already included - improve shell test to be more resiliant against custom init scripts - improved test diagnostics - reorganized documentation for bootstrapping into a non-standard directory - remove mentions of File::HomeDir from documentation, as it is no longer used OBS-URL: https://build.opensuse.org/request/show/1102787 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-local-lib?expand=0&rev=51 --- local-lib-2.000024.tar.gz | 3 --- local-lib-2.000029.tar.gz | 3 +++ perl-local-lib.changes | 25 +++++++++++++++++++++++++ perl-local-lib.spec | 2 +- 4 files changed, 29 insertions(+), 4 deletions(-) delete mode 100644 local-lib-2.000024.tar.gz create mode 100644 local-lib-2.000029.tar.gz diff --git a/local-lib-2.000024.tar.gz b/local-lib-2.000024.tar.gz deleted file mode 100644 index 54259ad..0000000 --- a/local-lib-2.000024.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2e9b917bd48a0615e42633b2a327494e04610d8f710765b9493d306cead98a05 -size 62941 diff --git a/local-lib-2.000029.tar.gz b/local-lib-2.000029.tar.gz new file mode 100644 index 0000000..b76df26 --- /dev/null +++ b/local-lib-2.000029.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8df87a10c14c8e909c5b47c5701e4b8187d519e5251e87c80709b02bb33efdd7 +size 63789 diff --git a/perl-local-lib.changes b/perl-local-lib.changes index 93c3608..10846c8 100644 --- a/perl-local-lib.changes +++ b/perl-local-lib.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Mon Aug 7 22:35:54 UTC 2023 - Dominique Leuenberger + +- Update to version 2.000029: + - fix taint protection code to delete environment variables rather than + leaving them as an empty string. + - fix author test for CPAN.pm's bootstrapping process to work with new + versions +- Changes from.version 2.000028 + - fix skips in shell test when shell has unpredictable startup actions +- Changes from version 2.000027: + - releasing as stable +- Changes from version 2.000026: + - fix output redirection used in fish shell to work with newer versions + - fix optional function used on Win32 for finding the current directory +- Changes from version 2.000025 + - add documentation for --quiet option + - added --always option to always add requested directory to env vars, even + if they are already included + - improve shell test to be more resiliant against custom init scripts + - improved test diagnostics + - reorganized documentation for bootstrapping into a non-standard directory + - remove mentions of File::HomeDir from documentation, as it is no longer + used + ------------------------------------------------------------------- Tue Sep 14 20:03:17 UTC 2021 - Dirk Stoecker diff --git a/perl-local-lib.spec b/perl-local-lib.spec index 802f931..b6e5cd9 100644 --- a/perl-local-lib.spec +++ b/perl-local-lib.spec @@ -18,7 +18,7 @@ %define cpan_name local-lib Name: perl-local-lib -Version: 2.000024 +Version: 2.000029 Release: 0 License: Artistic-1.0 OR GPL-1.0-or-later Summary: Create and use a local lib/ for perl modules with PERL5LIB