sys-apps/systemd: add 252_rc2, drop 252_rc1

Signed-off-by: Mike Gilbert <floppym@gentoo.org>

3 files changed, 1 insertions, 228 deletions

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index a6bf7d23cced..b02fcebfbc4c 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,4 +1,4 @@
-DIST systemd-252-rc1.tar.gz 11718698 BLAKE2B 599c5c125c0fb0477ea71195491962db230cbaa2c610afbb14a475263f356f160a77ba7321f425cb6db837649ccbce971f80daaf5524ace03362777a71e7a9b5 SHA512 e249eb39da41aca1bc371c9e2b61f135227b0653e4e175c4c6453b0ca4e1cd50894c005d4ef267b5122af4f339cd9b5a4b90a98c4f84f998f96a7ca1ed637d28
+DIST systemd-252-rc2.tar.gz 11736313 BLAKE2B 58efe76846b034ec61136fe01f535b40aabc993ffee687d4a22a20d93a3952fd15e4ac46591934a441f4e74cffec29145f441d97a69a5c456e7a3caee92602cc SHA512 f67703dcd03b300cddc2e8bfbeb843ef66ba0b0c548973797a920c1bed9e3a14a740e08936f7d906141da714bccbae0d4fcb47a7ce13e69c8a2f17d7928e218c
 DIST systemd-stable-251.4.tar.gz 11440203 BLAKE2B 58a0ee4adcc9d35b15b9cc98b3da81d1103b61a6c0bee722468a5113cd7d6de1d40c46ef964ba9ecc4746e81b516ae4b2f1d046874d62db066735c652592612e SHA512 7bbfadd80b88a4c3510a5e4e3572e4eab71dafbf6289da038e552988e09ee8da16da3c9bb8a4fbbde6c6236e0e3c352b0a33f9ee0b84f10241f3499383387738
 DIST systemd-stable-251.5.tar.gz 11444428 BLAKE2B 96df35dae789b11ead1960e1139046972a29c41f74ca800e0fafd84e6a8c238f8d4a30e2991ee94e07e866bc0c3137774ee116f276ac1203cca85254ccf91913 SHA512 2c645a694d45a2670920115529c5f34001153dafe26e5c4e65f8d1a37922a351569d056fc002f1af72dfc173988f93e11893460f64b497e3d5fc339083dcb2fa
 DIST systemd-stable-251.6.tar.gz 11448383 BLAKE2B 987ea88ea23662fd4119e3c796cc2e5f428fcce6cf0b033a5f8da7974c0026d41851f517e489354bbc22973b33c3932ac7280c56527f03a1fcbce3092148b638 SHA512 2da41ac7e939a893ada3ce682a6fe7dd326e8e0132221589da3d2b1d994e1a879118e0c6025f03351dac6567d754223a5f5401d64a5ca9256ab95512800370f8
diff --git a/sys-apps/systemd/files/252-rc1-cryptsetup.patch b/sys-apps/systemd/files/252-rc1-cryptsetup.patch
deleted file mode 100644
index 54b4ce1ea0aa..000000000000
--- a/sys-apps/systemd/files/252-rc1-cryptsetup.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-From bbf73b00697e77ca35ae60109418da77f257be52 Mon Sep 17 00:00:00 2001
-From: Daan De Meyer <daan.j.demeyer@gmail.com>
-Date: Tue, 11 Oct 2022 20:35:34 +0200
-Subject: [PATCH 1/2] cryptsetup-util: Always define dlopen_cryptsetup()
-
----
- src/shared/cryptsetup-util.c | 118 ++++++++++++++++++-----------------
- src/shared/cryptsetup-util.h |   4 +-
- 2 files changed, 63 insertions(+), 59 deletions(-)
-
-diff --git a/src/shared/cryptsetup-util.c b/src/shared/cryptsetup-util.c
-index da6dcb2f093a..401e7a3f9c7d 100644
---- a/src/shared/cryptsetup-util.c
-+++ b/src/shared/cryptsetup-util.c
-@@ -50,63 +50,6 @@ int (*sym_crypt_token_max)(const char *type);
- crypt_token_info (*sym_crypt_token_status)(struct crypt_device *cd, int token, const char **type);
- int (*sym_crypt_volume_key_get)(struct crypt_device *cd, int keyslot, char *volume_key, size_t *volume_key_size, const char *passphrase, size_t passphrase_size);
- 
--int dlopen_cryptsetup(void) {
--        int r;
--
--        r = dlopen_many_sym_or_warn(
--                        &cryptsetup_dl, "libcryptsetup.so.12", LOG_DEBUG,
--                        DLSYM_ARG(crypt_activate_by_passphrase),
--#if HAVE_CRYPT_ACTIVATE_BY_SIGNED_KEY
--                        DLSYM_ARG(crypt_activate_by_signed_key),
--#endif
--                        DLSYM_ARG(crypt_activate_by_volume_key),
--                        DLSYM_ARG(crypt_deactivate_by_name),
--                        DLSYM_ARG(crypt_format),
--                        DLSYM_ARG(crypt_free),
--                        DLSYM_ARG(crypt_get_cipher),
--                        DLSYM_ARG(crypt_get_cipher_mode),
--                        DLSYM_ARG(crypt_get_data_offset),
--                        DLSYM_ARG(crypt_get_device_name),
--                        DLSYM_ARG(crypt_get_dir),
--                        DLSYM_ARG(crypt_get_type),
--                        DLSYM_ARG(crypt_get_uuid),
--                        DLSYM_ARG(crypt_get_verity_info),
--                        DLSYM_ARG(crypt_get_volume_key_size),
--                        DLSYM_ARG(crypt_init),
--                        DLSYM_ARG(crypt_init_by_name),
--                        DLSYM_ARG(crypt_keyslot_add_by_volume_key),
--                        DLSYM_ARG(crypt_keyslot_destroy),
--                        DLSYM_ARG(crypt_keyslot_max),
--                        DLSYM_ARG(crypt_load),
--                        DLSYM_ARG(crypt_resize),
--                        DLSYM_ARG(crypt_resume_by_passphrase),
--                        DLSYM_ARG(crypt_set_data_device),
--                        DLSYM_ARG(crypt_set_debug_level),
--                        DLSYM_ARG(crypt_set_log_callback),
--#if HAVE_CRYPT_SET_METADATA_SIZE
--                        DLSYM_ARG(crypt_set_metadata_size),
--#endif
--                        DLSYM_ARG(crypt_set_pbkdf_type),
--                        DLSYM_ARG(crypt_suspend),
--                        DLSYM_ARG(crypt_token_json_get),
--                        DLSYM_ARG(crypt_token_json_set),
--#if HAVE_CRYPT_TOKEN_MAX
--                        DLSYM_ARG(crypt_token_max),
--#endif
--                        DLSYM_ARG(crypt_token_status),
--                        DLSYM_ARG(crypt_volume_key_get));
--        if (r <= 0)
--                return r;
--
--        /* Redirect the default logging calls of libcryptsetup to our own logging infra. (Note that
--         * libcryptsetup also maintains per-"struct crypt_device" log functions, which we'll also set
--         * whenever allocating a "struct crypt_device" context. Why set both? To be defensive: maybe some
--         * other code loaded into this process also changes the global log functions of libcryptsetup, who
--         * knows? And if so, we still want our own objects to log via our own infra, at the very least.) */
--        cryptsetup_enable_logging(NULL);
--        return 1;
--}
--
- static void cryptsetup_log_glue(int level, const char *msg, void *usrptr) {
- 
-         switch (level) {
-@@ -246,6 +189,67 @@ int cryptsetup_add_token_json(struct crypt_device *cd, JsonVariant *v) {
- }
- #endif
- 
-+int dlopen_cryptsetup(void) {
-+#if HAVE_LIBCRYPTSETUP
-+        int r;
-+
-+        r = dlopen_many_sym_or_warn(
-+                        &cryptsetup_dl, "libcryptsetup.so.12", LOG_DEBUG,
-+                        DLSYM_ARG(crypt_activate_by_passphrase),
-+#if HAVE_CRYPT_ACTIVATE_BY_SIGNED_KEY
-+                        DLSYM_ARG(crypt_activate_by_signed_key),
-+#endif
-+                        DLSYM_ARG(crypt_activate_by_volume_key),
-+                        DLSYM_ARG(crypt_deactivate_by_name),
-+                        DLSYM_ARG(crypt_format),
-+                        DLSYM_ARG(crypt_free),
-+                        DLSYM_ARG(crypt_get_cipher),
-+                        DLSYM_ARG(crypt_get_cipher_mode),
-+                        DLSYM_ARG(crypt_get_data_offset),
-+                        DLSYM_ARG(crypt_get_device_name),
-+                        DLSYM_ARG(crypt_get_dir),
-+                        DLSYM_ARG(crypt_get_type),
-+                        DLSYM_ARG(crypt_get_uuid),
-+                        DLSYM_ARG(crypt_get_verity_info),
-+                        DLSYM_ARG(crypt_get_volume_key_size),
-+                        DLSYM_ARG(crypt_init),
-+                        DLSYM_ARG(crypt_init_by_name),
-+                        DLSYM_ARG(crypt_keyslot_add_by_volume_key),
-+                        DLSYM_ARG(crypt_keyslot_destroy),
-+                        DLSYM_ARG(crypt_keyslot_max),
-+                        DLSYM_ARG(crypt_load),
-+                        DLSYM_ARG(crypt_resize),
-+                        DLSYM_ARG(crypt_resume_by_passphrase),
-+                        DLSYM_ARG(crypt_set_data_device),
-+                        DLSYM_ARG(crypt_set_debug_level),
-+                        DLSYM_ARG(crypt_set_log_callback),
-+#if HAVE_CRYPT_SET_METADATA_SIZE
-+                        DLSYM_ARG(crypt_set_metadata_size),
-+#endif
-+                        DLSYM_ARG(crypt_set_pbkdf_type),
-+                        DLSYM_ARG(crypt_suspend),
-+                        DLSYM_ARG(crypt_token_json_get),
-+                        DLSYM_ARG(crypt_token_json_set),
-+#if HAVE_CRYPT_TOKEN_MAX
-+                        DLSYM_ARG(crypt_token_max),
-+#endif
-+                        DLSYM_ARG(crypt_token_status),
-+                        DLSYM_ARG(crypt_volume_key_get));
-+        if (r <= 0)
-+                return r;
-+
-+        /* Redirect the default logging calls of libcryptsetup to our own logging infra. (Note that
-+         * libcryptsetup also maintains per-"struct crypt_device" log functions, which we'll also set
-+         * whenever allocating a "struct crypt_device" context. Why set both? To be defensive: maybe some
-+         * other code loaded into this process also changes the global log functions of libcryptsetup, who
-+         * knows? And if so, we still want our own objects to log via our own infra, at the very least.) */
-+        cryptsetup_enable_logging(NULL);
-+        return 1;
-+#else
-+        return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), "cryptsetup support is not compiled in.");
-+#endif
-+}
-+
- int cryptsetup_get_keyslot_from_token(JsonVariant *v) {
-         int keyslot, r;
-         JsonVariant *w;
-diff --git a/src/shared/cryptsetup-util.h b/src/shared/cryptsetup-util.h
-index b1ce07ec8a50..b390dc9a5cbb 100644
---- a/src/shared/cryptsetup-util.h
-+++ b/src/shared/cryptsetup-util.h
-@@ -65,8 +65,6 @@ static inline int crypt_token_max(_unused_ const char *type) {
- extern crypt_token_info (*sym_crypt_token_status)(struct crypt_device *cd, int token, const char **type);
- extern int (*sym_crypt_volume_key_get)(struct crypt_device *cd, int keyslot, char *volume_key, size_t *volume_key_size, const char *passphrase, size_t passphrase_size);
- 
--int dlopen_cryptsetup(void);
--
- DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(struct crypt_device *, crypt_free, NULL);
- DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(struct crypt_device *, sym_crypt_free, NULL);
- 
-@@ -91,6 +89,8 @@ static inline void sym_crypt_freep(struct crypt_device** cd) {}
- 
- #endif
- 
-+int dlopen_cryptsetup(void);
-+
- int cryptsetup_get_keyslot_from_token(JsonVariant *v);
- 
- static inline const char *mangle_none(const char *s) {
-
-From 86bebe385f6e35ecec708e44dae2b896f5bfa770 Mon Sep 17 00:00:00 2001
-From: Daan De Meyer <daan.j.demeyer@gmail.com>
-Date: Tue, 11 Oct 2022 20:36:03 +0200
-Subject: [PATCH 2/2] repart: Always define VerityMode from/to string functions
-
----
- src/partition/repart.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/partition/repart.c b/src/partition/repart.c
-index a0f7d4164500..dd544d6415a9 100644
---- a/src/partition/repart.c
-+++ b/src/partition/repart.c
-@@ -255,12 +255,11 @@ static const char *verity_mode_table[_VERITY_MODE_MAX] = {
- 
- #if HAVE_LIBCRYPTSETUP
- DEFINE_PRIVATE_STRING_TABLE_LOOKUP_WITH_BOOLEAN(encrypt_mode, EncryptMode, ENCRYPT_KEY_FILE);
--DEFINE_PRIVATE_STRING_TABLE_LOOKUP(verity_mode, VerityMode);
- #else
- DEFINE_PRIVATE_STRING_TABLE_LOOKUP_FROM_STRING_WITH_BOOLEAN(encrypt_mode, EncryptMode, ENCRYPT_KEY_FILE);
--DEFINE_PRIVATE_STRING_TABLE_LOOKUP_FROM_STRING(verity_mode, VerityMode);
- #endif
- 
-+DEFINE_PRIVATE_STRING_TABLE_LOOKUP(verity_mode, VerityMode);
- 
- static uint64_t round_down_size(uint64_t v, uint64_t p) {
-         return (v / p) * p;
-From 748367c72368031ca0ef32fadd394c4bcacc126a Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Wed, 12 Oct 2022 21:47:29 +0200
-Subject: [PATCH] gpt-auto: allow using without cryptsetup
-
-Fixes #24978
----
- src/gpt-auto-generator/gpt-auto-generator.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
-index 31377d877d5c..5584eb22af1a 100644
---- a/src/gpt-auto-generator/gpt-auto-generator.c
-+++ b/src/gpt-auto-generator/gpt-auto-generator.c
-@@ -571,11 +571,15 @@ static int add_root_rw(DissectedPartition *p) {
- 
- #if ENABLE_EFI
- static int add_root_cryptsetup(void) {
-+#if HAVE_LIBCRYPTSETUP
- 
-         /* If a device /dev/gpt-auto-root-luks appears, then make it pull in systemd-cryptsetup-root.service, which
-          * sets it up, and causes /dev/gpt-auto-root to appear which is all we are looking for. */
- 
-         return add_cryptsetup("root", "/dev/gpt-auto-root-luks", true, false, NULL);
-+#else
-+        return 0;
-+#endif
- }
- #endif
- 
diff --git a/sys-apps/systemd/systemd-252_rc1.ebuild b/sys-apps/systemd/systemd-252_rc2.ebuild
index 6d2654a50d90..2b38fab6fdb7 100644
--- a/sys-apps/systemd/systemd-252_rc1.ebuild
+++ b/sys-apps/systemd/systemd-252_rc2.ebuild
@@ -235,7 +235,6 @@ src_unpack() {
 
 src_prepare() {
 	local PATCHES=(
-		"${FILESDIR}/252-rc1-cryptsetup.patch"
 	)
 
 	if ! use vanilla; then