diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-05-01 00:00:05 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-05-01 00:00:05 +0100 |
commit | 3d12b65aa1b4bb8b02b1f8d3e77bccf230b79a09 (patch) | |
tree | cb6347688c91bfbdebe49a78a55dad3d72cc193e /sys-auth/elogind | |
parent | 4c2b70adc6484c35ff05e412de08a7b7f50cfb34 (diff) |
gentoo auto-resync : 01:05:2024 - 00:00:04
Diffstat (limited to 'sys-auth/elogind')
-rw-r--r-- | sys-auth/elogind/Manifest | 3 | ||||
-rw-r--r-- | sys-auth/elogind/elogind-252.9.ebuild | 1 | ||||
-rw-r--r-- | sys-auth/elogind/files/elogind-252.9-musl-1.2.5.patch | 34 |
3 files changed, 37 insertions, 1 deletions
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest index ac6d392f8d18..c467ec52db8d 100644 --- a/sys-auth/elogind/Manifest +++ b/sys-auth/elogind/Manifest @@ -4,6 +4,7 @@ AUX elogind-246.10-clang-undefined-symbol.patch 1090 BLAKE2B aaad5048696084e0a01 AUX elogind-246.10-loong.patch 1493 BLAKE2B 40fbeae11f4f8387e0880e0ad91dc42577e0e8b160a0d916471ae852b5e40ff425b85668c04cb1e54c7f7087d05f3fcf0216938616b07bb413dfcc7be2220f34 SHA512 befb95281c83ec0421a16e26402c58a49d8a3c9e3100c8c164c1537073be5af2416ac2561271d7e4965d88c2693e8e2face3ca0b486bbef2f00216fa0c20396f AUX elogind-246.10-musl-selinux.patch 3857 BLAKE2B 831b48c0b7eff35099325ca586ac39ed4c477c9298aa740da85d82c05625aeeab47aff4b19eb10318834f9d6e8256079e9c148c19f66d65b2a7433e2baeecf51 SHA512 9db4f7e1c4bcf7bbf743c89ce36162b3976f116ca0257081d6e74f46dab67b6f9bd3db8e33b06dd6a334fa1d20d513a631220924028ec330af815434adac85c3 AUX elogind-246.10-revert-polkit-automagic.patch 1345 BLAKE2B 115c8f38f23b140b5f232cb80fa2486ad90895a0fad3717d79302ac2205fa260d35aab9fdbc98bf490790749b109d32f59cfee166da26a9457676943cf6a57b7 SHA512 84e7b8e09ffd41bd0ea466e4f7fbc333c42544d9ed6877b881dc68c55607e81406ca977c3c0c045db8e151f76df1c7c813395ccb73b6e38583ddd40c642244f1 +AUX elogind-252.9-musl-1.2.5.patch 1646 BLAKE2B 105ed799d16997f86d5c05a33b95bb6514c2e2f7ada84e8ba9c9dc513e93bb6fa057ee45ec873fae5c1a148097425bc2b3e858567f887423e244652de23fdea4 SHA512 dc5f6d75668a4058587cb0f8b19d6192059e733a878814ba06af2004d61ab4231a879688390f6ec184e7a6a1a83c1a2fa4c7b5cca7c664ddaa683216597c0727 AUX elogind-252.9-musl-getdents.patch 1806 BLAKE2B 5d79695d51a06785bd2d83e57d0379c38f812890e567e96b6ccc00aa61feedb987c5a34b754b4682fe50d6bda8870290f026f800d91f4a9b445d784884db191d SHA512 d684b546762ca6a133e7b4395be514dfb1516c9e8e28c97ea216f4fa1bb66caa64db90cff19f68ac2cc2c5eb347ef813b9e030245c9fe1159f7d40ad8d63e666 AUX elogind-252.9-musl-gshadow.patch 357 BLAKE2B ed804dee44af417163b7a286f83393457720712bbb2feabc202221925f2fa44149530a9b0adb30063e7d6f9846abb7a350644b4edc5c3f77da3d21b0eda62a6a SHA512 b69598c6ff56155b8f73bb4684bca6fd66011a9088e0007499617621d2f2b8b5683efabb414d1376a27f931d5372cfda845ad50e4e2efa498391529a22909108 AUX elogind-252.9-musl-lfs.patch 2152 BLAKE2B cad592f4cec32add7acc62ba1de3d9706fe4f872709704bf1ee43c8ff1ec1ec067d50d5db66932fc2fc3049cf9ca165679939bfea063dec392639bface036245 SHA512 64865ab3c84bc59b1b9df993014ee68cb41c03140c28a3c58875de7cb54cc5a94a33c355a4ae068b275686850f540ca92e2cec792297fc6a440cc9df2440d444 @@ -19,5 +20,5 @@ AUX elogind.init-r1 503 BLAKE2B 7e54688c91f78b46411edff04dd8544dea778864d34ec00a DIST elogind-246.10.tar.gz 1559256 BLAKE2B 17a8146ee08c8ccf167f25d89b1d4525050ed0b0baaad0d36924ad3c40ffc820ef1528b33557cf285ad06c9ac9c440137428c5a235a2acf563e56f2f8f07e208 SHA512 9db0f068ed94ec07bab4d764ccb38840af3d05a4b7c9c539721906f5381b509cb9a3cbfb0453a978210d306136368de6162578c600d522416ef2a7ac1b9f348b DIST elogind-252.9.tar.gz 1922777 BLAKE2B dd566125e407b3479a44b007890f97c9c87a325b3fed2d3505499d2163f113affd998e14b1c1fc50b9b86b0d155b51dae344dcc1cddafb6a48c631d0a0f00c9a SHA512 eed620cbc2f03bfeae6a80c9a421c21d3293fa40adffb96c7e4d86508c06712041f6623fb2bac15ecbb85faca4b5674ea6423b3067840809fb27d023fd9e5ffd EBUILD elogind-246.10-r3.ebuild 4203 BLAKE2B 27ca3d6145112f3b6c6dd368630c3758b2cb958f143ac5eba9529d944ea7dce5417e922a4f359a78bb56442a910c8a7b31ebd524e49407b116c63cc89fd611ea SHA512 d8a0ab1c4e5ad35fd6f6ee0cd4375fdc4c737cc26448bd1c1c013ffaf472eaf9f19e778124376f11eb073b6ac392f9cd76f3d300cf87c714f7f06d15561f9180 -EBUILD elogind-252.9.ebuild 5089 BLAKE2B ae8618ee42d223275ff6b6d90ff60a3d8ebbb299d28225a6b6d2e11a328e02f940fb2c790c004ce7598625068a3bfff0d687c3258408131e89692456b64034c5 SHA512 6a6a58e72a2376083db914d809a84c13896110e9d316ebfef57618aae759b967ba9ee3a5d512647242b536aa80e3dec995c57d8bb6b11652fc59f6c7fb37c6c3 +EBUILD elogind-252.9.ebuild 5133 BLAKE2B 617ec5bf74abaa2d2b9bab49023bee3ef09211a72b251b96e3384ec85e61a76d4227725e1c249516914acf659af744e87ad51fa7c9c92aabed07a110748918f0 SHA512 9382a5b6d71ceec0a192ae70861307b1da5cd513667b05ae94c71ff61e4d69d74247847b795f5938bb77ee92f68c5fcab1f4c2be153f190342c8a635346976a2 MISC metadata.xml 416 BLAKE2B b354229184d72f8b392f62a1ba04925265e78b4b6b824edf500b0dceb1d9dccc72932b3e1005b6d6fd4746a9ab1612adb3de363dcda27a724ab40a8023ce52c1 SHA512 2155a8329bc7fb9b7bc455d4ee4ae55d877179453ef2c83e8829a1debc40898120d708f502741939762b6931b1febc3a23857491f323a49c3b3a611e9d00f4a1 diff --git a/sys-auth/elogind/elogind-252.9.ebuild b/sys-auth/elogind/elogind-252.9.ebuild index 8ca3fd96ae06..1da0c8672fff 100644 --- a/sys-auth/elogind/elogind-252.9.ebuild +++ b/sys-auth/elogind/elogind-252.9.ebuild @@ -55,6 +55,7 @@ DOCS=( README.md) PATCHES=( "${FILESDIR}/${P}-nodocs.patch" "${FILESDIR}/${PN}-252.9-musl-lfs.patch" + "${FILESDIR}/${PN}-252.9-musl-1.2.5.patch" ) python_check_deps() { diff --git a/sys-auth/elogind/files/elogind-252.9-musl-1.2.5.patch b/sys-auth/elogind/files/elogind-252.9-musl-1.2.5.patch new file mode 100644 index 000000000000..cfd979170795 --- /dev/null +++ b/sys-auth/elogind/files/elogind-252.9-musl-1.2.5.patch @@ -0,0 +1,34 @@ + +This is a backport from +https://github.com/elogind/elogind/commit/d8dc8f66d6e64dfb45fc55c430a31b08b27c5165?diff=split&w=0 +effectively squashing several commits. + +diff -ruN elogind-252.9.orig/meson.build elogind-252.9/meson.build +--- elogind-252.9.orig/meson.build 2024-05-01 02:51:35.602756227 +1100 ++++ elogind-252.9/meson.build 2024-05-01 02:53:31.763434742 +1100 +@@ -655,7 +655,8 @@ + # ['pivot_root', '''#include <stdlib.h> + # #include <unistd.h>'''], # no known header declares pivot_root + #endif // 0 +-#if 1 /// elogind supports musl, but upstream refuses to add qsort_r ++#if 1 /// elogind supports musl, but upstream refuses to add qsort_r and has removed basename ++ ['basename', '''#include <string.h>'''], # _GNU_SOURCE is defined, so test for GNU basename() + ['qsort_r', '''#include <stdlib.h>'''], + #endif // 1 + ['ioprio_get', '''#include <sched.h>'''], # no known header declares ioprio_get +diff -ruN elogind-252.9.orig/src/basic/musl_missing.h elogind-252.9/src/basic/musl_missing.h +--- elogind-252.9.orig/src/basic/musl_missing.h 2023-05-15 22:35:29.000000000 +1100 ++++ elogind-252.9/src/basic/musl_missing.h 2024-05-01 02:54:48.293885181 +1100 +@@ -44,6 +44,12 @@ + # define HAVE_SECURE_GETENV 1 + #endif // HAVE_[__]SECURE_GETENV + ++#if ! HAVE_BASENAME ++/* Poor man's basename */ ++# define basename(path) \ ++ (strrchr(path, '/') ? strrchr(path, '/')+1 : path) ++#endif // HAVE_BASENAME ++ + /* strndupa may already be defined in another compatibility header */ + #if !defined(strndupa) + #define strndupa(x_src, x_n) \ |