mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-16 02:23:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge updates from master

Browse Source
This commit is contained in:
Repository mirror & CI
2022-04-08 02:49:14 +00:00
parent 7d17234831 9b63bb1d8c
commit 5669c54dcd
32 changed files with 635 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app-crypt/clevis/Manifest Normal file
View File

@@ -0,0 +1 @@
DIST clevis-18.tar.gz 78191 BLAKE2B 317f30df3c05a9a651363daf17b9320e47a903929af991ecfd9d4d3d630a0ab8e92815db2e5736e9b9ca7f3fb4a41f4cf198ec447f04a9849f4d2a03bb196b22 SHA512 19b6743ff61ff7e29699bbc3fb69dfa31567a37ab824629330b57c92aa89b70759d63c1770be68d4525681ec9ba56d980cae2bb1cdeee6192992ede449a0e4ff

32
app-crypt/clevis/clevis-18.ebuild Normal file
View File

@@ -0,0 +1,32 @@
# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit meson
PATCHES=(
"${FILESDIR}/${PN}-dracut.patch"
)
DESCRIPTION="Automated Encryption Framework"
HOMEPAGE="https://github.com/latchset/clevis"
SRC_URI="https://github.com/latchset/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
IUSE="+luks +tpm"
DEPEND="luks? ( app-misc/jq )
>=dev-libs/jose-8
luks? ( dev-libs/libpwquality )
luks? ( dev-libs/luksmeta )
tpm? ( app-crypt/tpm2-tools )
sys-fs/cryptsetup"
RDEPEND="${DEPEND}"
BDEPEND=""
src_configure() {
meson_src_configure
}

250
app-crypt/clevis/files/clevis-dracut.patch Normal file
View File

@@ -0,0 +1,250 @@
From a5aa695821e34fb218c7d705065aaf7077737c8c Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Fri, 5 Nov 2021 15:24:12 +0000
Subject: [PATCH] Moved dracut directory up to top-level to decouple it with
systemd.
Adds a clevis-luks-generic-unlocker for alternative use without systemd.
Based on patch by Sergio Correia <scorreia@redhat.com>
Closes: #346
Signed-off-by: Jonathan Davies <jpds@protonmail.com>
---
.../dracut/clevis-pin-sss/meson.build | 0
.../dracut/clevis-pin-sss/module-setup.sh.in | 0
.../dracut/clevis-pin-tang/meson.build | 0
.../dracut/clevis-pin-tang/module-setup.sh.in | 0
.../dracut/clevis-pin-tpm2/meson.build | 0
.../dracut/clevis-pin-tpm2/module-setup.sh.in | 0
src/dracut/clevis/clevis-hook.sh.in | 3 +
.../clevis/clevis-luks-generic-unlocker | 70 +++++++++++++++++++
.../systemd => }/dracut/clevis/meson.build | 1 +
.../dracut/clevis/module-setup.sh.in | 19 +++--
src/{luks/systemd => }/dracut/meson.build | 0
.../systemd/dracut/clevis/clevis-hook.sh.in | 2 -
src/luks/systemd/meson.build | 1 -
src/meson.build | 1 +
14 files changed, 90 insertions(+), 7 deletions(-)
rename src/{luks/systemd => }/dracut/clevis-pin-sss/meson.build (100%)
rename src/{luks/systemd => }/dracut/clevis-pin-sss/module-setup.sh.in (100%)
rename src/{luks/systemd => }/dracut/clevis-pin-tang/meson.build (100%)
rename src/{luks/systemd => }/dracut/clevis-pin-tang/module-setup.sh.in (100%)
rename src/{luks/systemd => }/dracut/clevis-pin-tpm2/meson.build (100%)
rename src/{luks/systemd => }/dracut/clevis-pin-tpm2/module-setup.sh.in (100%)
create mode 100755 src/dracut/clevis/clevis-hook.sh.in
create mode 100755 src/dracut/clevis/clevis-luks-generic-unlocker
rename src/{luks/systemd => }/dracut/clevis/meson.build (87%)
rename src/{luks/systemd => }/dracut/clevis/module-setup.sh.in (76%)
rename src/{luks/systemd => }/dracut/meson.build (100%)
delete mode 100755 src/luks/systemd/dracut/clevis/clevis-hook.sh.in
diff --git a/src/luks/systemd/dracut/clevis-pin-sss/meson.build b/src/dracut/clevis-pin-sss/meson.build
similarity index 100%
rename from src/luks/systemd/dracut/clevis-pin-sss/meson.build
rename to src/dracut/clevis-pin-sss/meson.build
diff --git a/src/luks/systemd/dracut/clevis-pin-sss/module-setup.sh.in b/src/dracut/clevis-pin-sss/module-setup.sh.in
similarity index 100%
rename from src/luks/systemd/dracut/clevis-pin-sss/module-setup.sh.in
rename to src/dracut/clevis-pin-sss/module-setup.sh.in
diff --git a/src/luks/systemd/dracut/clevis-pin-tang/meson.build b/src/dracut/clevis-pin-tang/meson.build
similarity index 100%
rename from src/luks/systemd/dracut/clevis-pin-tang/meson.build
rename to src/dracut/clevis-pin-tang/meson.build
diff --git a/src/luks/systemd/dracut/clevis-pin-tang/module-setup.sh.in b/src/dracut/clevis-pin-tang/module-setup.sh.in
similarity index 100%
rename from src/luks/systemd/dracut/clevis-pin-tang/module-setup.sh.in
rename to src/dracut/clevis-pin-tang/module-setup.sh.in
diff --git a/src/luks/systemd/dracut/clevis-pin-tpm2/meson.build b/src/dracut/clevis-pin-tpm2/meson.build
similarity index 100%
rename from src/luks/systemd/dracut/clevis-pin-tpm2/meson.build
rename to src/dracut/clevis-pin-tpm2/meson.build
diff --git a/src/luks/systemd/dracut/clevis-pin-tpm2/module-setup.sh.in b/src/dracut/clevis-pin-tpm2/module-setup.sh.in
similarity index 100%
rename from src/luks/systemd/dracut/clevis-pin-tpm2/module-setup.sh.in
rename to src/dracut/clevis-pin-tpm2/module-setup.sh.in
diff --git a/src/dracut/clevis/clevis-hook.sh.in b/src/dracut/clevis/clevis-hook.sh.in
new file mode 100755
index 0000000..91ff2bd
--- /dev/null
+++ b/src/dracut/clevis/clevis-hook.sh.in
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+@libexecdir@/clevis-luks-generic-unlocker -l
diff --git a/src/dracut/clevis/clevis-luks-generic-unlocker b/src/dracut/clevis/clevis-luks-generic-unlocker
new file mode 100755
index 0000000..a3b9d62
--- /dev/null
+++ b/src/dracut/clevis/clevis-luks-generic-unlocker
@@ -0,0 +1,70 @@
+#!/bin/bash
+set -eu
+# vim: set ts=8 shiftwidth=4 softtabstop=4 expandtab smarttab colorcolumn=80:
+#
+# Copyright (c) 2020-2021 Red Hat, Inc.
+# Author: Sergio Correia <scorreia@redhat.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+. clevis-luks-common-functions
+
+# Make sure to exit cleanly if SIGTERM is received.
+trap 'echo "Exiting due to SIGTERM" && exit 0' TERM
+
+loop=
+while getopts ":l" o; do
+ case "${o}" in
+ l) loop=true;;
+ *) ;;
+ esac
+done
+
+to_unlock() {
+ local _devices='' _d _uuid
+ for _d in $(lsblk -o PATH,FSTYPE,RM \
+ | awk '$2 == "crypto_LUKS" && $3 == "0" { print $1 }' | sort -u);
+ do
+ if ! bindings="$(clevis luks list -d "${_d}" 2>/dev/null)" \
+ || [ -z "${bindings}" ]; then
+ continue
+ fi
+ _uuid="$(cryptsetup luksUUID "${_d}")"
+ if clevis_is_luks_device_by_uuid_open "${_uuid}"; then
+ continue
+ fi
+ _devices="$(printf '%s\n%s' "${_devices}" "${_d}")"
+ done
+ echo "${_devices}" | sed -e 's/^\n$//'
+}
+
+while true; do
+ for d in $(to_unlock); do
+ uuid="$(cryptsetup luksUUID "${d}")"
+ if ! clevis luks unlock -d "${d}"; then
+ echo "Unable to unlock ${d} (UUID=${uuid})" >&2
+ continue
+ fi
+ echo "Unlocked ${d} (UUID=${uuid}) successfully" >&2
+ done
+
+ [ "${loop}" != true ] && break
+ # Checking for pending devices to be unlocked.
+ if remaining=$(to_unlock) && [ -z "${remaining}" ]; then
+ break;
+ fi
+
+ sleep 0.5
+done
diff --git a/src/luks/systemd/dracut/clevis/meson.build b/src/dracut/clevis/meson.build
similarity index 87%
rename from src/luks/systemd/dracut/clevis/meson.build
rename to src/dracut/clevis/meson.build
index 167e708..224e27f 100644
--- a/src/luks/systemd/dracut/clevis/meson.build
+++ b/src/dracut/clevis/meson.build
@@ -16,6 +16,7 @@ if dracut.found()
install_dir: dracutdir,
configuration: data,
)
+ install_data('clevis-luks-generic-unlocker', install_dir: libexecdir)
else
warning('Will not install dracut module due to missing dependencies!')
endif
diff --git a/src/luks/systemd/dracut/clevis/module-setup.sh.in b/src/dracut/clevis/module-setup.sh.in
similarity index 76%
rename from src/luks/systemd/dracut/clevis/module-setup.sh.in
rename to src/dracut/clevis/module-setup.sh.in
index bfe657c..dbce790 100755
--- a/src/luks/systemd/dracut/clevis/module-setup.sh.in
+++ b/src/dracut/clevis/module-setup.sh.in
@@ -19,7 +19,11 @@
#
depends() {
- echo crypt systemd
+ local __depends=crypt
+ if dracut_module_included "systemd"; then
+ __depends=$(printf '%s systemd' "${_depends}")
+ fi
+ echo "${__depends}"
return 255
}
@@ -27,17 +31,24 @@ install() {
if dracut_module_included "systemd"; then
inst_multiple \
$systemdsystemunitdir/clevis-luks-askpass.service \
- $systemdsystemunitdir/clevis-luks-askpass.path
+ $systemdsystemunitdir/clevis-luks-askpass.path \
+ @SYSTEMD_REPLY_PASS@ \
+ @libexecdir@/clevis-luks-askpass
systemctl -q --root "$initdir" add-wants cryptsetup.target clevis-luks-askpass.path
else
inst_hook initqueue/online 60 "$moddir/clevis-hook.sh"
inst_hook initqueue/settled 60 "$moddir/clevis-hook.sh"
+
+ inst_multiple \
+ @libexecdir@/clevis-luks-generic-unlocker \
+ clevis-luks-unlock \
+ lsblk \
+ sort \
+ awk
fi
inst_multiple \
/etc/services \
- @SYSTEMD_REPLY_PASS@ \
- @libexecdir@/clevis-luks-askpass \
clevis-luks-common-functions \
grep sed cut \
clevis-decrypt \
diff --git a/src/luks/systemd/dracut/meson.build b/src/dracut/meson.build
similarity index 100%
rename from src/luks/systemd/dracut/meson.build
rename to src/dracut/meson.build
diff --git a/src/luks/systemd/dracut/clevis/clevis-hook.sh.in b/src/luks/systemd/dracut/clevis/clevis-hook.sh.in
deleted file mode 100755
index cb257c9..0000000
--- a/src/luks/systemd/dracut/clevis/clevis-hook.sh.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-@libexecdir@/clevis-luks-askpass
diff --git a/src/luks/systemd/meson.build b/src/luks/systemd/meson.build
index e3b3d91..b10494e 100644
--- a/src/luks/systemd/meson.build
+++ b/src/luks/systemd/meson.build
@@ -10,7 +10,6 @@ sd_reply_pass = find_program(
if systemd.found() and sd_reply_pass.found()
data.set('SYSTEMD_REPLY_PASS', sd_reply_pass.path())
- subdir('dracut')
unitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
diff --git a/src/meson.build b/src/meson.build
index c4e696f..a0dff5b 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,6 +1,7 @@
subdir('bash')
subdir('luks')
subdir('pins')
+subdir('dracut')
subdir('initramfs-tools')
bins += join_paths(meson.current_source_dir(), 'clevis-decrypt')

12
app-crypt/clevis/metadata.xml Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>julien@jroy.ca</email>
<name>Julien Roy</name>
</maintainer>
<use>
<flag name="luks">Enable LUKS support</flag>
<flag name="tpm">Enable TPM support</flag>
</use>
</pkgmetadata>

5
app-misc/lf/Manifest
View File

@@ -2,6 +2,8 @@ DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.mod 77 BLAKE2B 1b81c4c20a8900
DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.zip 19867 BLAKE2B a772206ce6dc48b32d7125a25b26694325d367ebcbad85466b2e6cfdb9fc9f0e08b98b7ecede5397344e5f7e623c4c76edcf69dcee99917adccf5b31aad80bf8 SHA512 127767c725e376b43fe4e2003ddc12fe89693d6d7e52b01e6d47d73fd04496decc0fd60b64c7a65303428e00a52ece1848610ea35231789a814187ef8503bee3
DIST github.com%2Fgdamore%2Ftcell%2Fv2%2F@v%2Fv2.0.0.mod 253 BLAKE2B 972ed39f4848b39eac6662d8f0f3dfc1ff4ec14f5da35fb8c41ada758932df35d4bdc1cf1fd91e54626ae74fc1cdfbbaf93261d793ce828f6a08d0120b5168ed SHA512 8d9fcc68e635c163c1f3f29367988ed5af2d3a2a9acd0c142cc95571bb920618d09e828aa0bf26718c330e5e199d66f2c6c618cab20618ca00be284b013dd833
DIST github.com%2Fgdamore%2Ftcell%2Fv2%2F@v%2Fv2.0.0.zip 219838 BLAKE2B e6d587643ad89f8428931a5aa9dd085a028bf5de1ae01ee5cb9e54b93cb760b81be79f54d2f555afeffe5846915f11f58037be20948e782e3089e0f2937ee3bf SHA512 6992b07bfe24152dd8b867bef52be9fdd17da27d0007ed4fc1c3701d3060bbc71854709ce74456a8d280949abd5b3224f1daf92f18c4a36b89bb78ccbbb16aac
DIST github.com%2Fgdamore%2Ftcell%2Fv2%2F@v%2Fv2.3.1.mod 308 BLAKE2B f53f87ed7d2310c09408d55be26ed053edd625203a7d860da4136849e5d44c6cb9cdd025b8b5d5d58b8649a3dadde10ed8861df75aa9e36989bf45549375c8ed SHA512 933a68f338fab6b8676db5abef19e3d521b546051dc8459cf11cca1bcedbdff94ee93bb0cde94e84c72f75ab1a2ee724ae3d0a2b116f9ec827862cd9a882d21c
DIST github.com%2Fgdamore%2Ftcell%2Fv2%2F@v%2Fv2.3.1.zip 222653 BLAKE2B 089865a73e6ac2b533b9fdb33885a1ed3464ef2ce808d95e8bc338735986ecfce06411cd3a83424dc5f016203dbdb424c2d58d6c211c1ba6081f0441f68ee5d0 SHA512 910b269598fa879e547e372e8fdcafd52ad20669f8ac97b1ae746b9c2fdbcf308dd69bd6b6f2737f62b40573b1e4160685bfc613a6786668beb7aa080436d72e
DIST github.com%2Fgokcehan%2Ftcell%2Fv2%2F@v%2Fv2.2.1-0.20210329222449-4dd2d52e83ef.mod 308 BLAKE2B f53f87ed7d2310c09408d55be26ed053edd625203a7d860da4136849e5d44c6cb9cdd025b8b5d5d58b8649a3dadde10ed8861df75aa9e36989bf45549375c8ed SHA512 933a68f338fab6b8676db5abef19e3d521b546051dc8459cf11cca1bcedbdff94ee93bb0cde94e84c72f75ab1a2ee724ae3d0a2b116f9ec827862cd9a882d21c
DIST github.com%2Fgokcehan%2Ftcell%2Fv2%2F@v%2Fv2.2.1-0.20210329222449-4dd2d52e83ef.zip 227557 BLAKE2B 6d3a65a1d8a4e3944cb8bf562c52e52f933afe03bc508236126a20cd14e59c3439b5fea5814602a987abaa263a2d326f393ece6bd7fbc29b870f7e7228884d1a SHA512 4721e4fb265bcac520c5ef82eff0853671740915a31cb431136bb31c946a0bf6070680aaeb3d53c87f0b524545752069e8627c92425607101f1770cdada6906d
DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.mod 51 BLAKE2B be532e33c9a0e83b9d0b760b21d97ac83850299adb329f754f31e4b46dc7fb7a7157d2a41cdc258924ef8ee5c111a95ac3b0037d749cc936e1988a46612522cd SHA512 270b19446ac9a396f5ce7a000873928a44edb1457f86d294971dae08be37cd64ddb8edc0293e100ee60d56c504851aa69ab11db0b4cfd46649c5f79459e40011
@@ -17,6 +19,8 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.mod 33 BLAKE
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.zip 1810550 BLAKE2B e0bcc6235d88e1728797c178d10261e851b18814ecad679674349596f5fc0aa2784b0b4fee440488ffe8188b47dbf8474e5a5078b1220188ac6c25b0c371068d SHA512 98442115bb11ccc8061eb7c39e2e7efcc809d45ed6051456d6ec5439e20823b4b4d2ce16f4ba02530b58f74e9c1b9f3bf0d3dd0b4327b1b8158f395022ab2d80
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.zip 1529034 BLAKE2B a30815639bc723fe9c7078c1fc5214e43aa946520c8d2d1efdc2cfb88b53c1faf50054f693d4f3b92461a64c07c8dbb845901c87a8deb86650cfcfc0482aae08 SHA512 113ecd43b0aecd6050a3a7319bbb43d351e62d71f01f9b98af7ab15b179fff616ebbb81920447f3b1192a9230c230c95bb20e9172981d4c8b926804ee92af508
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20220209214540-3681064d5158.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20220209214540-3681064d5158.zip 1705205 BLAKE2B 7dbb357942b0c0b68473d25b05df1bfc47dc5af98b702a2a4f372409e669b631f99311146d4e4dfd7c15917c0fec6993134d44ef21407b8db615cd5f4aec2188 SHA512 541db3174ff73c4266f351e687a52c7d54bec4ff2320f4e2baf34d6327c46b46fac8156b602a97739aaa483a821b731a4579033bbc48e3a591bcf7970246cf15
DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201210144234-2321bbc49cbf.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.zip 23402 BLAKE2B 03ef6b566c4f9539fe7310adff76e37bac4e3aaf32559f1a228690195207530ff68ad1179b22594cb7a62f9dcceb41631452052eb8bdab852848ffa1e19c0fbb SHA512 3aaf366b00d38d9dfe1ab23a0c6df05e2fb586f44470ec9b7cc59fc113cc68567a4102352b4a416da137df619b44c61e28042124cebcc525e3c6ebf10f8fbff2
@@ -25,4 +29,5 @@ DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec
DIST gopkg.in%2Fdjherbis%2Ftimes.v1%2F@v%2Fv1.2.0.mod 34 BLAKE2B 994760ba91670807a6a9daa1781637b17e67721dc15124e262cfff7eb23a9bb7191d15925a7cf824a51ba6560816995ec24b3c175960e98669b41febbd69db5c SHA512 2983ea900dc8faee385d721e0d5062317f8d475c690d93d64b5863e7a0c8256077ed884b7dca284431af6696b0088a2a61bbf03aa19d14397f1a04b15f420bcc
DIST gopkg.in%2Fdjherbis%2Ftimes.v1%2F@v%2Fv1.2.0.zip 16389 BLAKE2B 1b10d96f25305726184fe72c5f77a8d740a5e5d211fbc4cd78c89f8c5dac863ea24a940d3491c173879cd45e893f92565568a0f5c168fc2aad20e35141a6a12c SHA512 aca66545aa32b274864b4e84b6ef7284b5c63218f346230bf97587c69aaab6b9d5beb11ca3da9c1e9952b68ebc2fda974859757b91a66ede42d64339848ee069
DIST lf-22.tar.gz 102883 BLAKE2B 6e1357ba2038c383ddb6369bdf1f36c673964a34614423e6defeed8aa6094a7167436549bfd65d20ecd04b83ea618e3da7498ce0848ab98af778eb5628ff64ac SHA512 efdca3639d9042ad1ef84529b0b9be21cd8924ac094985b3d978046edb5e11303591a8bebc41df7b2837a3add196f94a8cc482a001a508c4fbc79ba1d2f8c54c
DIST lf-27.tar.gz 112266 BLAKE2B e03cd38042661d35dd7d110894fe7ca4866e491c810e76d6cfe1d34efedbda5f2b4b6e626ab72c72450252dca8f82c3e1804a686e7437d6f7475f3b9fa0ca796 SHA512 1a9cd0a3206f01f75a9ea0dbef4fcd3a2e28e9d283b19c74e821c5e90229b9ff64524e9d151dec44d9b2c06b3f8b424c4053034b58bcc7fa38345ce7c662f013
DIST lf-r20.tar.gz 101838 BLAKE2B 085b7331d65f3e93bf8c0767b08f528bb7f28f4432a25fd7b83eed270e17df4744433fe4e0d736eedfae04edb60dc6bf3663dcd403c0503c6ec4985009ad39b7 SHA512 7706950d11847638eaed3afa2c277945a18364781339d530d4c8829f0e4ec382f133aac43519237646b852a6899b28eb7279dc72f26833b50fdf2c4641ecc109

85
app-misc/lf/lf-27.ebuild Normal file
View File

@@ -0,0 +1,85 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit go-module bash-completion-r1
EGO_SUM=(
"github.com/gdamore/encoding v1.0.0"
"github.com/gdamore/encoding v1.0.0/go.mod"
"github.com/gdamore/tcell/v2 v2.3.1"
"github.com/gdamore/tcell/v2 v2.3.1/go.mod"
"github.com/lucasb-eyer/go-colorful v1.0.3"
"github.com/lucasb-eyer/go-colorful v1.0.3/go.mod"
"github.com/mattn/go-runewidth v0.0.10"
"github.com/mattn/go-runewidth v0.0.10/go.mod"
"github.com/rivo/uniseg v0.1.0"
"github.com/rivo/uniseg v0.1.0/go.mod"
"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
"golang.org/x/sys v0.0.0-20220209214540-3681064d5158"
"golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod"
"golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod"
"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d"
"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod"
"golang.org/x/text v0.3.0"
"golang.org/x/text v0.3.0/go.mod"
"gopkg.in/djherbis/times.v1 v1.2.0"
"gopkg.in/djherbis/times.v1 v1.2.0/go.mod"
)
go-module_set_globals
SRC_URI="https://github.com/gokcehan/lf/archive/r${PV}.tar.gz -> ${P}.tar.gz
${EGO_SUM_SRC_URI}"
DESCRIPTION="Terminal file manager"
HOMEPAGE="https://github.com/gokcehan/lf"
IUSE="+static X"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
LICENSE="MIT"
SLOT="0"
S="${WORKDIR}/${PN}-r${PV}"
src_compile() {
local ldflags="-s -w -X main.gVersion=r${PV}"
use static && {
export CGO_ENABLED=0
ldflags+=' -extldflags "-static"'
}
go build -ldflags="${ldflags}" || die 'go build failed'
}
src_install() {
local DOCS=( README.md etc/lfrc.example )
dobin "${PN}"
einstalldocs
doman "${PN}.1"
# bash & zsh
insinto "/usr/share/${PN}"
doins "etc/${PN}cd.sh"
# bash-completion
newbashcomp "etc/${PN}.bash" "${PN}"
# zsh-completion
insinto /usr/share/zsh/site-functions
newins "etc/${PN}.zsh" "_${PN}"
# fish-completion
insinto /usr/share/fish/vendor_completions.d
doins "etc/${PN}.fish"
insinto /usr/share/fish/vendor_functions.d
doins "etc/${PN}cd.fish"
use X && {
insinto /usr/share/applications
doins "${PN}.desktop"
}
}

4
app-misc/lf/metadata.xml
View File

@@ -5,4 +5,8 @@
<email>svdm-gentoo@protonmail.com</email>
<name>Simon van der Maas</name>
</maintainer>
<maintainer type="person">
<email>cantcuckthis@danwin1210.de</email>
<name>Dex Conner</name>
</maintainer>
</pkgmetadata>

1
app-shells/zsh-async/Manifest
View File

@@ -1 +1,2 @@
DIST zsh-async-1.8.5.tar.gz 18346 BLAKE2B 9ac98ca71caa569ca5ede093f9a4c690ac2aa4266b8a0b4ded9304ee241269ca7d3a3c6eb7e0aaa55a0da372725f65d66eb627fe7cae0c9c59f09c867d498038 SHA512 ad9139330c57cbfb115c0ee58763db19578279e9834593f06ab97857fd416bd40a0be3215e35b5d58e212f58f46359fe3b6c2caf9820cf946efeb541cccb7d0c
DIST zsh-async-1.8.5_p20211005.tar.gz 18508 BLAKE2B 25fe3dc647679571e7baeef4f92138062b9d658bc45aec8110736a1b186a7fe07d54660159bd85cb6c89ec793457ea453a833b656fb406d768c7f25329d085c7 SHA512 8a65a150772aa3e0b6ba1308affc2e008705430d46825803d029c8f4bee6eda7ee657239b3cfe7b87ba829aba929e8921912aa405f9707a9ae623e7b1e17fbff

49
app-shells/zsh-async/zsh-async-1.8.5_p20211005.ebuild Normal file
View File

@@ -0,0 +1,49 @@
# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit readme.gentoo-r1
MY_COMMIT="3ba6e2d1ea874bfb6badb8522ab86c1ae272923d"
DESCRIPTION="Run multiple asynchronous jobs with callbacks"
HOMEPAGE="https://github.com/mafredri/zsh-async"
SRC_URI="https://github.com/mafredri/zsh-async/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${PN}-${MY_COMMIT}"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
IUSE="test"
RDEPEND="app-shells/zsh"
BDEPEND="
test? (
app-shells/zsh
dev-vcs/git
)
"
RESTRICT="!test? ( test )"
DISABLE_AUTOFORMATTING="true"
DOC_CONTENTS="In order to use ${CATEGORY}/${PN} add
. /usr/share/zsh/site-functions/async.zsh
at the end of your ~/.zshrc"
src_test() {
git init || die "git repository initialization for testing failed"
./test.zsh -v || die "One or more tests failed"
}
src_install() {
insinto /usr/share/zsh/site-functions
doins async.zsh
readme.gentoo_create_doc
einstalldocs
}
pkg_postinst() {
readme.gentoo_print_elog
}

2
app-shells/zsh-history-substring-search/zsh-history-substring-search-1.0.2.ebuild
View File

@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zsh-users/zsh-history-substring-search/archive/refs/
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
KEYWORDS="~amd64 ~arm"
RDEPEND="app-shells/zsh"

2
app-text/koodo-reader-bin/Manifest
View File

@@ -1 +1 @@
DIST Koodo.Reader-1.3.0.rpm 60493844 BLAKE2B 1227a35cf6efba5467267cae1d783cfdcfe3b8c7c06f85a2c78e3e11e50a080600ee9106dafaead1dc95ffdd42b4f7cc2322511dca9f0354fa243ca282b56aff SHA512 2811f878fc327f8db94fddec850cbd25f65533808d915af65578a070e269c49e8b8fe98ddfbcb1a8ab975ad7963dc6f90cd730da333ce9a881c332165e4fb34e
DIST Koodo.Reader-1.4.1.rpm 62384804 BLAKE2B fcf46b8df7690eaba90173e197d2c72280908cf254e0fa8efbf6d57eef14a9096671b654ff28edc68e61705fb517367ecf683302981f20878178d35f4f7129c9 SHA512 b2608a6e5ad52f246faf6e2fa1a8ce16836903603d7a778c3f9b14dd6fa048a5e3ca0efd011438b1f53965054192e5aa9173e917903c112aabf0c346d1824f63

0
app-text/koodo-reader-bin/koodo-reader-bin-1.3.0.ebuild → app-text/koodo-reader-bin/koodo-reader-bin-1.4.1.ebuild
View File

1
dev-libs/jose/Manifest Normal file
View File

@@ -0,0 +1 @@
DIST jose-11.tar.gz 841374 BLAKE2B 5ffe35ebd48ed72d140e1dbf3ad37fcc3b4fd5534a5e1a5d9c43e82ad1901f989610baee2e2eb17209fd72f73c4f17227bed01d168bb4d243f067ec25051f913 SHA512 ffe09000837f79cefa549734d13c5d5d51042a42a055867241777ccbff3a127bac86a6155638fdf5ee52aad3598829e19724fd4e7de541117ed9b1c77c2ce457

22
dev-libs/jose/jose-11.ebuild Normal file
View File

@@ -0,0 +1,22 @@
# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit meson
DESCRIPTION="C-language implementation of Javascript Object Signing and Encryption"
HOMEPAGE="https://github.com/latchset/jose"
SRC_URI="https://github.com/latchset/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64"
DEPEND="dev-libs/jansson"
RDEPEND="${DEPEND}"
BDEPEND=""
src_configure() {
meson_src_configure
}

8
dev-libs/jose/metadata.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>julien@jroy.ca</email>
<name>Julien Roy</name>
</maintainer>
</pkgmetadata>

1
dev-libs/luksmeta/Manifest Normal file
View File

@@ -0,0 +1 @@
DIST luksmeta-9.tar.gz 27650 BLAKE2B e55796929410e9a3124c3f28066bac42b46e71df98ab7a1e58c1f973d4fda41d7c8d64b735ae0d1e192054297932951407083f89a7f255c09d22dce370865036 SHA512 874331988fe2648d4924779b348f190ed5c6e4d71da4ad027f176e3f8dcbc78fc26e9f9b8402a97437db5b884db31b72598afc70e025cd8533168a5986417a76

23
dev-libs/luksmeta/luksmeta-9.ebuild Normal file
View File

@@ -0,0 +1,23 @@
# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit autotools
DESCRIPTION="UKSMeta is a simple library for storing metadata in the LUKSv1 header"
HOMEPAGE="https://github.com/latchset/luksmeta"
SRC_URI="https://github.com/latchset/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64"
DEPEND="sys-fs/cryptsetup"
RDEPEND="${DEPEND}"
BDEPEND=""
src_prepare() {
default
eautoreconf
}

8
dev-libs/luksmeta/metadata.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>julien@jroy.ca</email>
<name>Julien Roy</name>
</maintainer>
</pkgmetadata>

2
dev-python/bidict/Manifest
View File

@@ -1 +1 @@
DIST bidict-0.21.3.tar.gz 406100 BLAKE2B d6fe581d3114e03fda76a0dcc47a65a5d0a840f17e5eb492341a6498f79b0f57f1d342220016001da4342baecdc1e5b575268d73a21fc01a0520fc11f31ff5ab SHA512 1c1cd17d44c0fbd0bb718a135f31650736a5a8b3979201f7cf19093a96bbf69a978363195f29dab6dd1ef0e28afe11d3f3fe84ad3311d7ea1190aa5e1842c609
DIST bidict-0.22.0.tar.gz 197969 BLAKE2B 511bea446922c959c7ab2c42fadfe63dc486f9b8f4d060779048195ed02344c36819be917716be6773e2173aa9dbd9e5452e747ee325db6ee92057644789653e SHA512 28384e1f63413023c00c199558eb49298c146602a676226d995aa01ccb0f9a6958750f4e34637d0823d659a092e74bb0ce4d75969d105312f73f5e692d9f82af

2
dev-python/bidict/bidict-0.21.3.ebuild → dev-python/bidict/bidict-0.22.0.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 2021 Gentoo Authors
# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8

4
dev-python/orjson-bin/Manifest
View File

@@ -1,2 +1,2 @@
DIST orjson-bin-3.6.4-amd64.zip 250007 BLAKE2B 8d4032eb347b551752203844ecf60e12f6fb12faa5a0bba5f294ad00c876afc006bc6759719d4532794c46b0f129cb370f30b57d6b5a9827078cbcc7d62b8331 SHA512 171cc20ffa26ddce0fdc771ff24c1172e0f9bb2be892c810c5c18b0a7421d833b722da925c987a18f57256600301e7c3f46f83e324935d3d857d2026a581de26
DIST orjson-bin-3.6.4-arm64.zip 231011 BLAKE2B a91e9c3c0872e568d41f259dfccaecd35be18e6d01b7d9df89151887019f7951bdf13ecf79edc391fbe39786259ef210971718d32a7a49eb21f0d420d45bf79b SHA512 669ffc93c34275842d9819e3c0f8a0174034d80cf733a5cc988bdc997c3028b68ae8d526698a3e0d582a1339d60d6a99bf7f42cebcfe2e3d5fb2e2cda65a1b10
DIST orjson-bin-3.6.7-amd64.zip 255321 BLAKE2B 5c10b6da6e388754e8ba3eac65d96ad5af8cce745877de8c0c73f2747841613b5aaca70be6b718b813e8c0376a33e8e6e8d4ee472bcd86962f47482766392429 SHA512 3ace1ab1d610b2a435b09a00b5dea62aec688bc186422397cc7191b910d904e54bc51768c50fe1c67f27d51503cf57e1209597c9281f2972653c171e0c4b0b0b
DIST orjson-bin-3.6.7-arm64.zip 235165 BLAKE2B 292a28851d23eb386f5065a336826482c3f96468bebf95c606c30df0d5249ec5b09f0331423349a9e616bbdd59cb465b50d5be77ab42e8216eeadaa41c42ed5b SHA512 a6520cb6744765d939003f39efa8aeda8e6b8fac6f96d8772a3842d0d08a775e2b2a21e775f99ca0b9656a7dbe270d0b83f6ea8f1b9b77f2cb26e71f61800afe

0
dev-python/orjson-bin/orjson-bin-3.6.4.ebuild → dev-python/orjson-bin/orjson-bin-3.6.7.ebuild
View File

23
games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
View File

@@ -12,19 +12,34 @@ S="${WORKDIR}/AC-${PV}"
LICENSE="ZLIB assaultcube"
SLOT="0"
KEYWORDS="~amd64"
RDEPEND="sys-libs/zlib media-libs/libsdl2 media-libs/sdl2-image x11-libs/libX11 media-libs/libogg media-libs/libvorbis media-libs/openal"
RDEPEND="sys-libs/zlib
media-libs/libsdl2[opengl]
media-libs/sdl2-image[jpeg,png]
x11-libs/libX11
media-libs/libogg
media-libs/libvorbis
media-libs/openal"
DEPEND="${RDEPEND}"
BDEPEND="sys-devel/clang"
PATCHES=(
"${FILESDIR}/assaultcube-1.3.0.2-respect-ldflags.patch
${FILESDIR}/assaultcube-1.3.0.2-fix-checkinstall.patch" # a script which checks for required libs and certain parts of the game
)
IUSE="debug"
src_prepare() {
eapply ${PATCHES}
eapply_user
sed -i 's|//#define PRODUCTION|#define PRODUCTION|' "${S}/source/src/cube.h"
rm -rf "${S}/source/include"
}
src_compile() {
cd "${S}/source/src"
emake
if use debug; then
DEBUGBUILD=1 emake
else
emake
fi
}
src_install() {
@@ -33,7 +48,7 @@ src_install() {
install -dm755 "${D}/usr/share/assaultcube"
install -Dm755 "${S}"/{assaultcube.sh,check_install.sh,server.sh,server_wizard.sh} -t "${D}/usr/share/assaultcube"
install -Dm755 "${S}/bin_unix/native_client" -t "${D}/usr/share/assaultcube/bin_unix"
install -Dm755 "${S}"/bin_unix/native_{client,server} -t "${D}/usr/share/assaultcube/bin_unix"
cp -r "${S}"/{bot,config,demos,docs,mods,packages} "${D}/usr/share/assaultcube/"
install -Dm644 "${S}"/{CONTRIBUTING.md,GOVERNANCE.md,README.{html,md},SECURITY.md} -t "${D}/usr/share/assaultcube"

20
games-fps/assaultcube/files/assaultcube-1.3.0.2-respect-ldflags.patch Normal file
View File

@@ -0,0 +1,20 @@
diff --git a/source/src/Makefile b/source/src/Makefile
index bf06195..61da2b7 100644
--- a/source/src/Makefile
+++ b/source/src/Makefile
@@ -202,12 +202,12 @@ server_install: server
else
client: libenet $(CLIENT_OBJS)
- $(CXX) $(CXXFLAGS) -o ac_client $(CLIENT_OBJS) $(CLIENT_LIBS)
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o ac_client $(CLIENT_OBJS) $(CLIENT_LIBS)
server: libenet $(SERVER_OBJS)
- $(CXX) $(CXXFLAGS) -o ac_server $(SERVER_OBJS) $(SERVER_LIBS)
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o ac_server $(SERVER_OBJS) $(SERVER_LIBS)
master: libenet $(MASTER_OBJS)
- $(CXX) $(CXXFLAGS) -o ac_master $(MASTER_OBJS) $(SERVER_LIBS)
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o ac_master $(MASTER_OBJS) $(SERVER_LIBS)
client_install: client
install -d ../../bin_unix/

4
gui-wm/dwl/metadata.xml
View File

@@ -9,4 +9,8 @@
<email>svdm-gentoo@protonmail.com</email>
<name>Simon van der Maas</name>
</maintainer>
<maintainer type="person">
<email>cantcuckthis@danwin1210.de</email>
<name>Dex Conner</name>
</maintainer>
</pkgmetadata>

2
media-video/mpv-mpris/Manifest
View File

@@ -1,2 +1,2 @@
DIST mpv-mpris-0.6.tar.gz 8910 BLAKE2B 44888f9a0945bf850ba48a4b2a5b2d03325e05b17111a6184c3540eaf15745c7bb18006b03dd018599e017837c005bf10dafc910b3e031e440a511a5496d6ab4 SHA512 da92e4cf6541f0f18fc1c779ab87eef914e6e76a94bfe1259b323953a11654b228d02c4d352ea0c588308bedc8aa807bdaa41023917629a90d50269f454e256d
DIST mpv-mpris-0.7.1.tar.gz 13432 BLAKE2B 884204c2186bc3b52378113dde87e58578b3811ec1a40576eb30e779fe3a3575ad9db802a51434e9fc3d22785db6036f898c76acab61780fac4b35276a17524f SHA512 7e928bbbf85b5c8e1e92ce51e65986ef7a7fe27a1e382b0148cdd70e22e5320be37a573c6206b3a1ab05119d9d24b861fd45081a008111f1da37673aa3896f23
DIST mpv-mpris-0.7.tar.gz 12982 BLAKE2B db919cdad6528519211725694f63871e371a33a331c46eebb202fa87d452d1cf30cecf3d4c2b26cb187cfa2c4cdd53411b88e6e7855510ffbaeef28ab3eb8346 SHA512 b370c9550622302cfdd07c21ae2f03a4e66e80da02e8f38c68d447ef273ae582ad6d918e207a9fb8c917a851163c6aadc08d3d68ad8e70ec85b37732c0cac96f

46
media-video/mpv-mpris/mpv-mpris-0.6.ebuild → media-video/mpv-mpris/mpv-mpris-0.7.1.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2021 Gentoo Authors
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,25 +18,41 @@ fi
SLOT="0"
LICENSE="MIT"
IUSE="+autoload"
IUSE="+autoload test"
BDEPEND="virtual/pkgconfig"
RDEPEND="media-video/mpv:=[cplugins,libmpv]
dev-libs/glib"
RDEPEND="
dev-libs/glib:2
media-video/mpv:=[cplugins,libmpv]
"
DEPEND="${RDEPEND}"
DOCS=(
README.md
)
BDEPEND="virtual/pkgconfig
test? (
app-misc/jq
app-shells/bash
app-text/jo
media-sound/playerctl
net-misc/socat
sys-apps/dbus
virtual/awk
x11-apps/xauth
x11-misc/xvfb-run
x11-themes/sound-theme-freedesktop
)
"
RESTRICT="!test? ( test )"
src_compile() {
emake CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)"
tc-export CC
emake PKG_CONFIG="$(tc-getPKG_CONFIG)"
}
src_test() {
emake test
}
src_install() {
insinto "/usr/$(get_libdir)/mpv"
doins mpris.so
use autoload && dosym "/usr/$(get_libdir)/mpv/mpris.so" "/etc/mpv/scripts/mpris.so"
newlib.so mpris.so ${PN}.so
use autoload && dosym -r /usr/$(get_libdir)/${PN}.so /etc/mpv/scripts/mpris.so
einstalldocs
}
@@ -45,8 +61,8 @@ pkg_postinst() {
elog
elog "The plugin has not been installed to /etc/mpv/scripts for autoloading."
elog "You have to activate it manually by passing"
elog " \"/usr/$(get_libdir)/mpv/mpris.so\" "
elog "as script option to mpv or symlinking the library to \"scripts/\" in your mpv"
elog " '${EPREFIX}/usr/$(get_libdir)/${PN}.so'"
elog "as a script option to mpv or symlinking the library to 'scripts' in your mpv"
elog "config directory."
elog "Alternatively, activate the autoload use flag."
elog

2
net-im/discord-ptb-bin/Manifest
View File

@@ -1 +1 @@
DIST discord-ptb-0.0.25.deb 71615052 BLAKE2B 04d822378934ebb5b68f34ca56ef863aa48a232cf08689a44e60ea25a378edc45891ff3033a07620453ac5b1143fbab63675a05bd41b015f9f40d5d1fb4ba31e SHA512 71b6eee347252cbc5e4daf2a85b1f18a9e3b0c602354a37922335c07b85e71918b2fe541418f767efa2db8e1832aca02984298c87058e6e3c9244d61f24a25c7
DIST discord-ptb-0.0.29.deb 77105454 BLAKE2B 191e70c5abb8284220bbc61c312b5feba63bda5833498627abe4829798d2647252933a17b4840f32432fdef5cbd8c494a0789d2620a0853ff6d7ba8fcb78eb02 SHA512 2bfd70927f5b622043abd1e47af0c86c6b5f6adcdfd8b2170a3c47bb5a9904e84d76dd08ddbb5c8da29f0a79a774c3a2106a1d33991cd5acaf7b454e476e5a0c

16
net-im/discord-ptb-bin/discord-ptb-bin-0.0.25.ebuild → net-im/discord-ptb-bin/discord-ptb-bin-0.0.29.ebuild
View File

@@ -18,6 +18,7 @@ SLOT="0"
KEYWORDS="~amd64"
RESTRICT="mirror bindist"
# libXScrnSaver is used through dlopen (bug #825370)
RDEPEND="
app-accessibility/at-spi2-atk:2
app-accessibility/at-spi2-core:2
@@ -27,27 +28,24 @@ RDEPEND="
dev-libs/nspr
dev-libs/nss
media-libs/alsa-lib
media-libs/fontconfig:1.0
media-libs/freetype:2
media-libs/mesa[gbm(+)]
net-print/cups
sys-apps/dbus
sys-apps/util-linux
sys-libs/glibc
x11-libs/cairo
x11-libs/gdk-pixbuf:2
x11-libs/gtk+:3
x11-libs/libdrm
x11-libs/libX11
x11-libs/libXScrnSaver
x11-libs/libxcb
x11-libs/libxkbcommon
x11-libs/libXcomposite
x11-libs/libXcursor
x11-libs/libXdamage
x11-libs/libXext
x11-libs/libXfixes
x11-libs/libXi
x11-libs/libxkbcommon
x11-libs/libXrandr
x11-libs/libXrender
x11-libs/libXtst
x11-libs/libXScrnSaver
x11-libs/libxshmfence
x11-libs/pango
"

41
sys-cluster/pcs/files/remove_bashism.patch Normal file
View File

@@ -0,0 +1,41 @@
From 73e90ae7f31600ff9c0edf0aed3cace9cd8c8a35 Mon Sep 17 00:00:00 2001
From: Alessandro Barbieri <lssndrbarbieri@gmail.com>
Date: Thu, 7 Apr 2022 17:02:55 +0200
Subject: [PATCH] remove bashisms
`==` is not POSIX
---
m4/ac_compare_versions.m4 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/m4/ac_compare_versions.m4 b/m4/ac_compare_versions.m4
index 77d03330a..74846704e 100644
--- a/m4/ac_compare_versions.m4
+++ b/m4/ac_compare_versions.m4
@@ -6,7 +6,7 @@ dnl op can be:
dnl
dnl lt or <
dnl le or <=
-dnl eq or ==
+dnl eq or =
dnl ge or >=
dnl gt or >
dnl
@@ -20,7 +20,7 @@ AC_DEFUN([AC_COMPARE_VERSIONS],[
verA="$1"
op="$2"
verB="$3"
- if test "x$verA" == "x" || test "x$verB" == "x" || test "x$op" == x; then
+ if test "x$verA" = "x" || test "x$verB" = "x" || test "x$op" = x; then
AC_MSG_ERROR([ac_compare_versions: Missing parameters])
fi
case "$op" in
@@ -36,7 +36,7 @@ AC_DEFUN([AC_COMPARE_VERSIONS],[
result=true
fi
;;
- "eq"|"==")
+ "eq"|"=")
if test "$verB" = "$verA"; then
result=true
fi

3
sys-cluster/pcs/pcs-0.11.2.ebuild
View File

@@ -65,7 +65,8 @@ ruby_add_rdepend "
www-servers/thin"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
PATCHES="${FILESDIR}/pcs-0.11-gentoo-support.patch"
PATCHES="${FILESDIR}/pcs-0.11-gentoo-support.patch
${FILESDIR}/remove_bashism.patch"
src_prepare() {
default

2
sys-process/task-spooler/task-spooler-1.3.0.ebuild
View File

@@ -22,7 +22,7 @@ HTML_DOCS=( web/index.html web/ts-0.2.1.png web/ts-0.5.4.ebuild web/article_linu
PATCHES=( "${FILESDIR}"/var-redefinition.patch )
src_test() {
cp $"{BUILD_DIR}/ts" "${S}"/ || die "failed to copy ts executable to source folder for tests"
cp "${BUILD_DIR}/ts" "${S}"/ || die "failed to copy ts executable to source folder for tests"
sh testbench.sh || die "tests failed"
}