[Buildroot] [PATCH] package/libxcrypt: drop upstream patches

* [Buildroot] [PATCH] package/libxcrypt: drop upstream patches
@ 2023-09-11  3:52 Daniel Lang
  2023-09-11 20:08 ` Thomas Petazzoni via buildroot
  0 siblings, 1 reply; 2+ messages in thread
From: Daniel Lang @ 2023-09-11  3:52 UTC (permalink / raw)
  To: buildroot; +Cc: Guillaume William Brs

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/

Signed-off-by: Daniel Lang <dalang@gmx.at>
---
 ...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

diff --git a/package/libxcrypt/0001-Make-BuildCommon.pm-compatible-with-latest-perl.patch b/package/libxcrypt/0001-Make-BuildCommon.pm-compatible-with-latest-perl.patch
deleted file mode 100644
index 7a17fa5c12..0000000000
--- a/package/libxcrypt/0001-Make-BuildCommon.pm-compatible-with-latest-perl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From ce562f4d33dc090fcd8f6ea1af3ba32cdc2b3c9c Mon Sep 17 00:00:00 2001
-From: Leon Timmermans <fawaka@gmail.com>
-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 <dalang@gmx.at>
----
- 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 = $_;
-         }
diff --git a/package/libxcrypt/0002-Remove-smartmatch-usage-from-gen-crypt-h.patch b/package/libxcrypt/0002-Remove-smartmatch-usage-from-gen-crypt-h.patch
deleted file mode 100644
index 444896b53f..0000000000
--- a/package/libxcrypt/0002-Remove-smartmatch-usage-from-gen-crypt-h.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 95d6e03ae37f4ec948474d111105bbdd2938aba2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
-Date: Sun, 25 Jun 2023 01:35:08 +0200
-Subject: [PATCH] Remove smartmatch usage from gen-crypt-h
-
-Needed for Perl 5.38
-
-Upstream: https://github.com/besser82/libxcrypt/commit/95d6e03ae37f4ec948474d111105bbdd2938aba2
-Signed-off-by: Daniel Lang <dalang@gmx.at>
----
- build-aux/scripts/gen-crypt-h | 31 ++++++++++++++-----------------
- 1 file changed, 14 insertions(+), 17 deletions(-)
-
-diff --git a/build-aux/scripts/gen-crypt-h b/build-aux/scripts/gen-crypt-h
-index 12aecf6d..b113b791 100644
---- a/build-aux/scripts/gen-crypt-h
-+++ b/build-aux/scripts/gen-crypt-h
-@@ -12,7 +12,6 @@ use v5.14;    # implicit use strict, use feature ':5.14'
- use warnings FATAL => 'all';
- use utf8;
- use open qw(:std :utf8);
--no  if $] >= 5.018, warnings => 'experimental::smartmatch';
- no  if $] >= 5.022, warnings => 'experimental::re_strict';
- use if $] >= 5.022, re       => 'strict';
-
-@@ -37,22 +36,20 @@ sub process_config_h {
-     local $_;
-     while (<$fh>) {
-         chomp;
--        # Yes, 'given $_' is really required here.
--        given ($_) {
--            when ('#define HAVE_SYS_CDEFS_H 1') {
--                $have_sys_cdefs_h = 1;
--            }
--            when ('#define HAVE_SYS_CDEFS_BEGIN_END_DECLS 1') {
--                $have_sys_cdefs_begin_end_decls = 1;
--            }
--            when ('#define HAVE_SYS_CDEFS_THROW 1') {
--                $have_sys_cdefs_throw = 1;
--            }
--            when (/^#define PACKAGE_VERSION "((\d+)\.(\d+)\.\d+)"$/) {
--                $substs{XCRYPT_VERSION_STR}   = $1;
--                $substs{XCRYPT_VERSION_MAJOR} = $2;
--                $substs{XCRYPT_VERSION_MINOR} = $3;
--            }
-+
-+        if ($_ eq '#define HAVE_SYS_CDEFS_H 1') {
-+            $have_sys_cdefs_h = 1;
-+        }
-+        elsif ($_ eq '#define HAVE_SYS_CDEFS_BEGIN_END_DECLS 1') {
-+            $have_sys_cdefs_begin_end_decls = 1;
-+        }
-+        elsif ($_ eq '#define HAVE_SYS_CDEFS_THROW 1') {
-+            $have_sys_cdefs_throw = 1;
-+        }
-+        elsif (/^#define PACKAGE_VERSION "((\d+)\.(\d+)\.\d+)"$/) {
-+            $substs{XCRYPT_VERSION_STR}   = $1;
-+            $substs{XCRYPT_VERSION_MAJOR} = $2;
-+            $substs{XCRYPT_VERSION_MINOR} = $3;
-         }
-     }
-- 
2.42.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread