diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2026-05-07 19:15:22 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2026-05-07 19:15:22 +0000 |
| commit | 299816f0c09b4fa9b0ed7e30ea69cbd6942edbf7 (patch) | |
| tree | b0cfe55c53a1cfe6c89afc96b9d2b9947d694bff /sys-apps | |
| parent | 6dd565aea2fc1e47796bb22fc2ec929c74dfa246 (diff) | |
| download | baldeagleos-repo-299816f0c09b4fa9b0ed7e30ea69cbd6942edbf7.tar.gz baldeagleos-repo-299816f0c09b4fa9b0ed7e30ea69cbd6942edbf7.tar.xz baldeagleos-repo-299816f0c09b4fa9b0ed7e30ea69cbd6942edbf7.zip | |
Adding metadata
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/hexyl/hexyl-0.17.0.ebuild | 26 | ||||
| -rw-r--r-- | sys-apps/hexyl/metadata.xml | 6 | ||||
| -rw-r--r-- | sys-apps/seedfiles/Manifest | 3 | ||||
| -rw-r--r-- | sys-apps/seedfiles/seedfiles-1.2.ebuild | 39 | ||||
| -rw-r--r-- | sys-apps/seedfiles/seedfiles-1.4.2.ebuild (renamed from sys-apps/seedfiles/seedfiles-1.1-r1.ebuild) | 0 | ||||
| -rw-r--r-- | sys-apps/systemd/files/systemd-260.1-gcc-17.patch | 45 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-260.1.ebuild | 1 |
7 files changed, 72 insertions, 48 deletions
diff --git a/sys-apps/hexyl/hexyl-0.17.0.ebuild b/sys-apps/hexyl/hexyl-0.17.0.ebuild index ac667b6697fb..0225cbb7eace 100644 --- a/sys-apps/hexyl/hexyl-0.17.0.ebuild +++ b/sys-apps/hexyl/hexyl-0.17.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2026 Gentoo Authors +# Copyright 2017-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -75,12 +75,12 @@ CRATES=" yansi@1.0.1 " -inherit cargo +inherit cargo shell-completion DESCRIPTION="A command-line hex viewer" HOMEPAGE="https://github.com/sharkdp/hexyl" SRC_URI=" - https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/sharkdp/hexyl/archive/v${PV}.tar.gz -> ${P}.tar.gz ${CARGO_CRATE_URIS} " @@ -89,10 +89,28 @@ LICENSE="|| ( Apache-2.0 MIT )" LICENSE+=" Apache-2.0 ISC MIT Unicode-DFS-2016 ZLIB" SLOT="0" KEYWORDS="~amd64" +QA_FLAGS_IGNORED="usr/bin/hexyl" -DOCS=( README.md CHANGELOG.md ) +RESTRICT="mirror" + +BDEPEND=" + virtual/pandoc +" + +src_compile() { + cargo_src_compile + pandoc -s -f markdown -t man -o "doc/${PN}.1" "doc/${PN}.1.md" +} src_install() { cargo_src_install einstalldocs + doman "doc/${PN}.1" + + "target/release/${PN}" --completion bash > "${PN}" + dobashcomp "${PN}" + "target/release/${PN}" --completion zsh > "_${PN}" + dozshcomp "_${PN}" + "target/release/${PN}" --completion fish > "${PN}.fish" + dofishcomp "${PN}.fish" } diff --git a/sys-apps/hexyl/metadata.xml b/sys-apps/hexyl/metadata.xml index 24ccbb8a7ce2..1bd26735cdca 100644 --- a/sys-apps/hexyl/metadata.xml +++ b/sys-apps/hexyl/metadata.xml @@ -2,9 +2,9 @@ <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>thomas@binaryden.de</email> - <name>Thomas Kemmer</name> + <email>Wuzy01@qq.com</email> + <name>Wu, Zhenyu</name> </maintainer> - <origin>binaryden-overlay</origin> + <origin>gentoo-guru-overlay</origin> </pkgmetadata>
\ No newline at end of file diff --git a/sys-apps/seedfiles/Manifest b/sys-apps/seedfiles/Manifest index fa66a294f48a..95bacc2d6474 100644 --- a/sys-apps/seedfiles/Manifest +++ b/sys-apps/seedfiles/Manifest @@ -1,4 +1,3 @@ -DIST seedfiles-1.1.tar.gz 47156 BLAKE2B 8d24034ed6264bc4da621791eb10d376464fbb3eea265bb2ee09ce24e6dc13838588181b80bb8422d4c0660a104dd055473234dba2ca034fb21302fcb14ded1f SHA512 337f9b275bf8d3f379ad54edb6687be91e03973b4f1ebfc15adecd7a10fe141d3c3b563f47a431884ff85c346fb583ddca202512086ba7da1930d7f0da26cc66 -DIST seedfiles-1.2.tar.gz 47949 BLAKE2B 38aeda916cd491d485a7efab995ce558d1d3380b631039ea60d1ca70febe54764be1de9502fb31629890c3fe992a080ecd18ff942bc429fd561d472143ec4143 SHA512 b480c328b219dab59e5b107b1b2287e52951e97427ad37b5f1acc09d42a4428aed34648f70adbd22f3104eb47646c1530eb20be1b2f2df7004bb1baa0f62fa26 DIST seedfiles-1.4.1.tar.gz 48690 BLAKE2B a7265ee7814129b4be52c6c3c62c22c30ee9f83f98a89a32f58f805ad66fbfb44c5a1bf8f8a6b5492a41f4c62b0b32e3c8816f14175ad68773898fb36ab289fd SHA512 9e8a96ffbe71a851378b249f3583d67feabfbb40e0221794cf3b1fe9258df17f07230770f3beae12172b3e5faddbf2b3c8af93539884172720c983f5334f80ae +DIST seedfiles-1.4.2.tar.gz 48801 BLAKE2B a7cb8dd72de3155dad971dafcf042c5646f1ed8e79619d2064de8bd657c6e68aeda4b1e1d057f494b2cf31de61cc31daf4f0fd4de0de30b71b334f317d9f3e98 SHA512 127941ed1acdece24f850454152956ec28129c63bf75370d9a2c532f12c0a0068902688ee8f79bb7b00854bb14982b79aefa31572f32bcc1fa89e1c8fe1c026c DIST seedfiles-1.4.tar.gz 48386 BLAKE2B a26b57d4616f8ca4872d75a4be4990e65b3fd88b6f4d0fbf038b0fdb8807fab0f2718602ce9cfa19d416f81df7afc7afb6ca652a025b62e07f934a41973225f9 SHA512 830a6b4afc2dce026d10bd28e58dea94a7b341707bfa030440080971894e3fbb86c87ea9a840bc324da25414a8df957b44ee6438611f5d6c330ff1e7bb9a2368 diff --git a/sys-apps/seedfiles/seedfiles-1.2.ebuild b/sys-apps/seedfiles/seedfiles-1.2.ebuild deleted file mode 100644 index 286d449107b8..000000000000 --- a/sys-apps/seedfiles/seedfiles-1.2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# We want to avoid tmpfiles.eclass because we provide it -TMPFILES_OPTIONAL=1 - -inherit meson - -DESCRIPTION="Portable drop-in reimplementation of systemd-tmpfiles" -HOMEPAGE="https://git.pinkro.se/Rose/gardenhouse/seedfiles.git/about/" - -if [[ ${PV} = 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://clone.git.pinkro.se/Rose/gardenhouse/seedfiles.git" - EGIT_BRANCH="main" -else - SRC_URI="https://git.pinkro.se/Rose/gardenhouse/seedfiles.git/snapshot/${P}.tar.gz" - KEYWORDS="~amd64" -fi - -LICENSE="GPL-3+" -SLOT="0" - -RDEPEND="virtual/acl - !sys-apps/systemd - !sys-apps/systemd-utils[tmpfiles]" -DEPEND="${RDEPEND}" - -src_install() { - meson_src_install - doinitd "${FILESDIR}"/seedfiles-setup - doinitd "${FILESDIR}"/seedfiles-setup-dev - - # We want to avoid tmpfiles.eclass because we provide it - insinto /usr/lib/tmpfiles.d - doins "${FILESDIR}"/{tmp,legacy}.conf -} diff --git a/sys-apps/seedfiles/seedfiles-1.1-r1.ebuild b/sys-apps/seedfiles/seedfiles-1.4.2.ebuild index 286d449107b8..286d449107b8 100644 --- a/sys-apps/seedfiles/seedfiles-1.1-r1.ebuild +++ b/sys-apps/seedfiles/seedfiles-1.4.2.ebuild diff --git a/sys-apps/systemd/files/systemd-260.1-gcc-17.patch b/sys-apps/systemd/files/systemd-260.1-gcc-17.patch new file mode 100644 index 000000000000..a73c6c7957b5 --- /dev/null +++ b/sys-apps/systemd/files/systemd-260.1-gcc-17.patch @@ -0,0 +1,45 @@ +From 64b1e6be83f49b9fdebc9e07cc3b7485169970c2 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyich@gmail.com> +Date: Tue, 5 May 2026 21:55:30 +0100 +Subject: [PATCH] sd-boot: efi-log: fix `__stack_chk_guard` type + +In https://gcc.gnu.org/PR121911 `gcc` started enforcing the type of +`__stack_chk_guard` to `uintptr_t` and broke `systemd` build as: + +``` +../src/boot/efi-log.c:136:17: error: conflicting types for '__stack_chk_guard'; have 'intptr_t' {aka 'long int'} + 136 | _used_ intptr_t __stack_chk_guard = (intptr_t) 0x70f6967de78acae3; + | ^~~~~~~~~~~~~~~~~ +cc1: note: previous declaration of '__stack_chk_guard' with type 'long unsigned int' +../src/boot/efi-log.c:136:17: error: declaration of '__stack_chk_guard' shadows a global declaration [-Werror=shadow] + 136 | _used_ intptr_t __stack_chk_guard = (intptr_t) 0x70f6967de78acae3; + | ^~~~~~~~~~~~~~~~~ +``` + +Let's match the declaration to unsigned type as suggested by upstream in +https://gcc.gnu.org/PR121911#c6. +--- + src/boot/efi-log.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/boot/efi-log.c b/src/boot/efi-log.c +index ed0a2746933e0..520f985389c55 100644 +--- a/src/boot/efi-log.c ++++ b/src/boot/efi-log.c +@@ -133,7 +133,7 @@ void log_wait(void) { + } + + // NOLINTNEXTLINE(misc-use-internal-linkage) +-_used_ intptr_t __stack_chk_guard = (intptr_t) 0x70f6967de78acae3; ++_used_ uintptr_t __stack_chk_guard = (uintptr_t) 0x70f6967de78acae3; + + /* We can only set a random stack canary if this function attribute is available, + * otherwise this may create a stack check fail. */ +@@ -144,7 +144,7 @@ void __stack_chk_guard_init(void) { + (void) rng->GetRNG(rng, NULL, sizeof(__stack_chk_guard), (void *) &__stack_chk_guard); + else + /* Better than no extra entropy. */ +- __stack_chk_guard ^= (intptr_t) __executable_start; ++ __stack_chk_guard ^= (uintptr_t) __executable_start; + } + #endif diff --git a/sys-apps/systemd/systemd-260.1.ebuild b/sys-apps/systemd/systemd-260.1.ebuild index b53f9b8951b8..155c99b8ea45 100644 --- a/sys-apps/systemd/systemd-260.1.ebuild +++ b/sys-apps/systemd/systemd-260.1.ebuild @@ -258,6 +258,7 @@ src_prepare() { local PATCHES=( "${FILESDIR}/systemd-260.1-fuzz-journald.patch" "${FILESDIR}/systemd-260.1-openssl-4.patch" + "${FILESDIR}/systemd-260.1-gcc-17.patch" ) if ! use vanilla; then |
