gentoo auto-resync : 25:06:2023 - 07:29:14

3 files changed, 68 insertions, 1 deletions

diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 5badae561dcb..02c8aee48a2b 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,4 +1,5 @@
 AUX libxcrypt-4.4.19-multibuild.patch 303 BLAKE2B cd342eef2a8ce3e305e544d37373370748690878b4171709028b7b894ad2c76c9188496ab089a46645ad6f9fca09fa4f89cdcb444e1400747ee358c079441661 SHA512 3cbd4bbd0827801faaaa2198eccccb285100cdfc43525b70816121aa70b32dc2c8479c53e16b9e99920926b1b11014dcc19909c4f72a09d9d19fcdb0fa6350cd
+AUX libxcrypt-4.4.35-smartmatch.patch 2223 BLAKE2B 0e350f511d1f4fdc123d17da1acbc25e4355d307932654d82fda7726f71a25723f70f533f125426f3ebd68bfd133e70dad95e7a2b4c789147ab3ae04077f0979 SHA512 ff6f783d18427e9de809ce3d9e4960125294515c66276e3608729ecafa30a5a25988fd016ab2b54b5187820879215299e422dc503b47903e59b69b9d7727e2e9
 DIST libxcrypt-4.4.28-autotools.tar.xz 618560 BLAKE2B c56d510201651e36cbd950b5a0a32273fdbce1f053109aa5867b2c6a57e2a896c34c981c1a2e732a8f34539b754ebe7f50d1b5bf59f9549a75ad6420921f3e1d SHA512 3c60fd32dea308152c4272522c29668c83e88bea47c98b9fe796ed70f5460ad2a9616ffbe789c03e417b28d3c792361b16031bda3d8bc5b6c06f0ebdc66c8217
 DIST libxcrypt-4.4.33-autotools.tar.xz 624316 BLAKE2B 6a396d079ea011fabc46ae2f972e230f3e047f75f9c79c8345fe4f31bad24b9bcb50b3f1131fd5d34cfaf0d6e0ca4fa0a0418448390de95bdf78b0ab8022a72d SHA512 998ef7ca565339853458961c28a0bffe04a4859de305019efae9b586d7b28ba42210b238695680dc10d739e7947f94e4392b9022a96ed25a613ef9a29a888329
 DIST libxcrypt-4.4.34-autotools.tar.xz 621732 BLAKE2B acf1801d890f522b9a098943f55f8551652ef3e0620bee5e7f3c297b7d0867ba6bace71fcf106474d25e95bcf4bd57e4ced6b51782cbaf0d42cca1643668407b SHA512 ef04ee78bf2e28e715fa673a1af728209c11838c66f7ec13cef40332595f77b878ac698616d6ef861b86879b0addd5581350041e889f2cef2ed1363f0ed93ffb
@@ -6,5 +7,5 @@ DIST libxcrypt-4.4.35-autotools.tar.xz 622972 BLAKE2B 93e8ee0d028aa8b2d1b3882c48
 EBUILD libxcrypt-4.4.28-r2.ebuild 9464 BLAKE2B d5171d0edf8f3028b0e099273a4adfed9a4e7b4f8374f181f0802c37fccd096a6ab2e1823b2915191f54f7b7d48a2e7cd9fe7c91ca156e3f08fc09a50c33a885 SHA512 7e66fd6af9a2f925b881d23351ea3df2e50d8bce59830b253925b9b813b649594fd26b9700c8823a1ebd29c52079d0002b1a99c7367a82c2a6978986b357f640
 EBUILD libxcrypt-4.4.33.ebuild 9290 BLAKE2B 950410645ae7c368f5498ca33d26080af50f7e7123b62bb56c7c06c1599fda660efdfd00cf58ad3ef5015562b4541deba9c4791419223413591cc6786880550e SHA512 6623e4c543384119cf360b1de1ed00b775c51fc8d69653a94cfea2095491c8ae576299ab498a524b51ca477bcb5fbd14c659e886a7a12dd41371ac87b974e3cf
 EBUILD libxcrypt-4.4.34.ebuild 9289 BLAKE2B 8a18e3f0c65d971b0733845424cde5f0332feca059c3caabe42b3b3ffcb3778c8609a9a904e8d56a3f88dfa4e1cfc742052794c0b0c6789baaa66b8895fbc346 SHA512 06edc8cfbefe910761d669631e33c1e9ae96670e65668a2e5cd8858c6ae760bb86ec26b7c847d8e28050d74731a8b9ec54f7f4174a12f975f1b96f7a491ebe38
-EBUILD libxcrypt-4.4.35.ebuild 9289 BLAKE2B 8a18e3f0c65d971b0733845424cde5f0332feca059c3caabe42b3b3ffcb3778c8609a9a904e8d56a3f88dfa4e1cfc742052794c0b0c6789baaa66b8895fbc346 SHA512 06edc8cfbefe910761d669631e33c1e9ae96670e65668a2e5cd8858c6ae760bb86ec26b7c847d8e28050d74731a8b9ec54f7f4174a12f975f1b96f7a491ebe38
+EBUILD libxcrypt-4.4.35.ebuild 9339 BLAKE2B 08ba04ff9516af517090474e43b7c26f6aad59a34cc1fa220cf5aa236efbe0fb158b6c09459f8031ade49e1209b26dc524495c5b547705b28e4220628a3b602e SHA512 6979069b86306531d0fcd646422b501d5e31f1706a5533c19cde61fbaeb250002c803bb8cda950c00f754904a84829aca684eb17d6c14ebe26eb5b75cd6de589
 MISC metadata.xml 913 BLAKE2B c2b3f52bd72bb46b0de4eb4a5f47dcb3aacfd248b811bcdc88db88c6f9cbe3ed1af4fda3e643b350fd22131273af03f2f888d78d306f0f7274d9432eb65075a3 SHA512 0ebbc3c2aa661f1a40e7f654384a395662b1b0235f145c7778b7b86bfb65ad09d4e8900bc6ede94413f057e769397c355bfd1bcafe8540acbf7e00e5451400c9
diff --git a/sys-libs/libxcrypt/files/libxcrypt-4.4.35-smartmatch.patch b/sys-libs/libxcrypt/files/libxcrypt-4.4.35-smartmatch.patch
new file mode 100644
index 000000000000..1956df921bdd
--- /dev/null
+++ b/sys-libs/libxcrypt/files/libxcrypt-4.4.35-smartmatch.patch
@@ -0,0 +1,62 @@
+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
+---
+ 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 12aecf6..b113b79 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.39.3
+
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.35.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.35.ebuild
index 331a6cc1c58c..69a9af2f77ba 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.35.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.35.ebuild
@@ -55,6 +55,10 @@ BDEPEND="
 	test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-smartmatch.patch"
+)
+
 python_check_deps() {
 	python_has_version "dev-python/passlib[${PYTHON_USEDEP}]"
 }