Skip to contentSkip to conversation

package/libxcrypt: drop upstream patches

PATCH Applied Daniel Lang 2 participants 2 messages Sep 11, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/libxcrypt: drop upstream patches

These patches were backported (47b7947 and 7dd5233) before the 2023.08 release. Meanwhile the package was bumped on next (be5e4a1) to a version containing these patches. Therefore they can be dropped.

Fixes:
- http://autobuild.buildroot.net/results/7f7ec74e80cd1ab782d87f5db3e4631c12611101/

---
 ...ommon.pm-compatible-with-latest-perl.patch | 50 ---------------
 ...ve-smartmatch-usage-from-gen-crypt-h.patch | 61 -------------------
 2 files changed, 111 deletions(-)
 delete mode 100644 package/libxcrypt/0001-Make-BuildCommon.pm-compatible-with-latest-perl.patch
 delete mode 100644 package/libxcrypt/0002-Remove-smartmatch-usage-from-gen-crypt-h.patch
package/libxcrypt/0001-Make-BuildCommon.pm-compatible-with-latest-perl.patch deleted +0 -50
deleted file mode 100644
index 7a17fa5c12..0000000000
@@ -1,50 +0,0 @@
-From ce562f4d33dc090fcd8f6ea1af3ba32cdc2b3c9c Mon Sep 17 00:00:00 2001
-From: Leon Timmermans <[email protected]>
-Date: Tue, 6 Jun 2023 17:03:57 +0200
-Subject: [PATCH] Make BuildCommon.pm compatible with latest perl
-
-It was previously using an experimental feature that has since been dropped.
-This removes the use of that feature.
-
-Upstream: https://github.com/besser82/libxcrypt/commit/ce562f4d33dc090fcd8f6ea1af3ba32cdc2b3c9c
-Signed-off-by: Daniel Lang <[email protected]>
----
- build-aux/scripts/BuildCommon.pm | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/build-aux/scripts/BuildCommon.pm b/build-aux/scripts/BuildCommon.pm
-index 0e6f2a31..c38ba21b 100644
---- a/build-aux/scripts/BuildCommon.pm
-+++ b/build-aux/scripts/BuildCommon.pm
-@@ -11,7 +11,6 @@ use v5.14;    # implicit use strict, use feature ':5.14'
- use warnings FATAL => 'all';
- use utf8;
- use open qw(:utf8);
--no  if $] >= 5.018, warnings => 'experimental::smartmatch';
- no  if $] >= 5.022, warnings => 'experimental::re_strict';
- use if $] >= 5.022, re       => 'strict';
-
-@@ -519,19 +518,19 @@ sub parse_symver_args {
-     my $COMPAT_ABI;
-     local $_;
-     for (@args) {
--        when (/^SYMVER_MIN=(.+)$/) {
-+        if (/^SYMVER_MIN=(.+)$/) {
-             $usage_error->() if defined $SYMVER_MIN;
-             $SYMVER_MIN = $1;
-         }
--        when (/^SYMVER_FLOOR=(.+)$/) {
-+        elsif (/^SYMVER_FLOOR=(.+)$/) {
-             $usage_error->() if defined $SYMVER_FLOOR;
-             $SYMVER_FLOOR = $1;
-         }
--        when (/^COMPAT_ABI=(.+)$/) {
-+        elsif (/^COMPAT_ABI=(.+)$/) {
-             $usage_error->() if defined $COMPAT_ABI;
-             $COMPAT_ABI = $1;
-         }
--        default {
-+        else {
-             $usage_error->() if defined $map_in;
-             $map_in = $_;
-         }
package/libxcrypt/0002-Remove-smartmatch-usage-from-gen-crypt-h.patch deleted +0 -61

61 lines not on this page · raw message

Signature · 6 lines
2.42.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw
Quoted 7 lines · On Mon, 11 Sep 2023 05:52:02 +0200 Daniel Lang <[email protected]> wrote:

These patches were backported (47b7947 and 7dd5233) before the 2023.08 release. Meanwhile the package was bumped on next (be5e4a1) to a version containing these patches. Therefore they can be dropped.

Fixes:
- http://autobuild.buildroot.net/results/7f7ec74e80cd1ab782d87f5db3e4631c12611101/

Quoted 7 lines
---
 ...ommon.pm-compatible-with-latest-perl.patch | 50 ---------------
 ...ve-smartmatch-usage-from-gen-crypt-h.patch | 61 -------------------
 2 files changed, 111 deletions(-)
 delete mode 100644 package/libxcrypt/0001-Make-BuildCommon.pm-compatible-with-latest-perl.patch
 delete mode 100644 package/libxcrypt/0002-Remove-smartmatch-usage-from-gen-crypt-h.patch

Applied to master, thanks.

Thomas

Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot