[gentoo-commits] repo/gentoo:master commit in: sys-fs/apfsprogs/
commit: fa9522bb3f2c9bfd74bf26b14cbdcf9f420a1ddf
Author: Zac Medico gentoo org>
AuthorDate: Mon Jun 10 00:35:58 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Jun 10 00:43:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa9522bb
sys-fs/apfsprogs: new package, add 0_pre20240521
Signed-off-by: Zac Medico gentoo.org>
sys-fs/apfsprogs/Manifest | 1 +
sys-fs/apfsprogs/apfsprogs-0_pre20240521.ebuild | 29 +
sys-fs/apfsprogs/metadata.xml | 11 ++
3 files changed, 41 insertions(+)
diff --git a/sys-fs/apfsprogs/Manifest b/sys-fs/apfsprogs/Manifest
new file mode 100644
index ..66d268e43a81
--- /dev/null
+++ b/sys-fs/apfsprogs/Manifest
@@ -0,0 +1 @@
+DIST apfsprogs-0_pre20240521.tar.gz 202087 BLAKE2B
e0fabc489b8719522e2da3ce8ca1f3ed1f1d9bef7ea1b1935f09d250adba2e6369e9df84bed2e883846bd0eb152deed9de5ab801482817ac65538501627ca6ff
SHA512
ad49350464abbdc6c0ca899135265fc6dffe96865d378e8c6105f17ec75e1f3bca2ddfc40ab2b838cd129357607aa33e92e12e30c82a6a1361a343844773d593
diff --git a/sys-fs/apfsprogs/apfsprogs-0_pre20240521.ebuild
b/sys-fs/apfsprogs/apfsprogs-0_pre20240521.ebuild
new file mode 100644
index ..13019944cdb4
--- /dev/null
+++ b/sys-fs/apfsprogs/apfsprogs-0_pre20240521.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EGIT_COMMIT="28c0053dcb77efc267b57013702c17007c21d942"
+SRC_URI="https://github.com/linux-apfs/apfsprogs/archive/${EGIT_COMMIT}.tar.gz
-> ${P}.tar.gz"
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+KEYWORDS="~amd64"
+DESCRIPTION="Experimental APFS tools for linux"
+HOMEPAGE="https://github.com/linux-apfs/apfsprogs;
+LICENSE="GPL-2"
+SLOT="0"
+APFSPROGS=(apfs-snap apfsck mkapfs)
+
+src_compile() {
+ local prog
+ emake -C lib || die
+ for prog in "${APFSPROGS[@]}"; do
+ emake -C "${prog}" || die
+ done
+}
+
+src_install() {
+ local prog
+ for prog in "${APFSPROGS[@]}"; do
+ emake -C "${prog}" install DESTDIR="${ED}" BINDIR=/usr/bin
MANDIR=/usr/share/man/man8
+ done
+}
diff --git a/sys-fs/apfsprogs/metadata.xml b/sys-fs/apfsprogs/metadata.xml
new file mode 100644
index ..9153843468c1
--- /dev/null
+++ b/sys-fs/apfsprogs/metadata.xml
@@ -0,0 +1,11 @@
+
+https://www.gentoo.org/dtd/metadata.dtd;>
+
+
+ zmed...@gentoo.org
+ Zac Medico
+
+
+ linux-apfs/apfsprogs
+
+
[gentoo-commits] repo/gentoo:master commit in: sys-fs/linux-apfs-rw/
commit: 340671b3ef2d93d98fbc49ea23dd3ca76bb86d98
Author: Zac Medico gentoo org>
AuthorDate: Mon Jun 10 00:17:01 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Jun 10 00:43:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=340671b3
sys-fs/linux-apfs-rw: new package, add 0.3.9
Signed-off-by: Zac Medico gentoo.org>
sys-fs/linux-apfs-rw/Manifest | 1 +
sys-fs/linux-apfs-rw/linux-apfs-rw-0.3.9.ebuild | 40 +
sys-fs/linux-apfs-rw/metadata.xml | 11 +++
3 files changed, 52 insertions(+)
diff --git a/sys-fs/linux-apfs-rw/Manifest b/sys-fs/linux-apfs-rw/Manifest
new file mode 100644
index ..09edd1b8f6dc
--- /dev/null
+++ b/sys-fs/linux-apfs-rw/Manifest
@@ -0,0 +1 @@
+DIST linux-apfs-rw-0.3.9.tar.gz 209682 BLAKE2B
663007f1b7c7af6cf4198066b6ba141c3bb625685508fe06f72bb3654438bac03ecc50204227fd724d16a4bb757f0df9ed7d19fb08fece8b98f08da9cfb3c8f5
SHA512
b241044c6faa175c1523f0ba391f9bb9ba336b3c39fd3528f43e0df5e9c6090691ab226091948f9f32f33748e8c435a0881ccc00fed4badca97d195c1982f9a7
diff --git a/sys-fs/linux-apfs-rw/linux-apfs-rw-0.3.9.ebuild
b/sys-fs/linux-apfs-rw/linux-apfs-rw-0.3.9.ebuild
new file mode 100644
index ..5d6a55ecd6d9
--- /dev/null
+++ b/sys-fs/linux-apfs-rw/linux-apfs-rw-0.3.9.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-mod-r1
+
+DESCRIPTION="APFS module for linux, with experimental write support"
+HOMEPAGE="https://github.com/linux-apfs/linux-apfs-rw;
+SRC_URI="https://github.com/linux-apfs/linux-apfs-rw/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CONFIG_CHECK="LIBCRC32C"
+
+pkg_setup() {
+ linux-mod-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ sed -e "s/GIT_COMMIT=.*/GIT_COMMIT=${PV}/" -i genver.sh || die
+}
+
+src_compile() {
+ local modlist=( apfs=extra )
+ local modargs=( KERNEL_DIR=${KV_OUT_DIR} KERNELRELEASE=${KV_FULL} )
+
+ linux-mod-r1_src_compile
+}
+
+src_install() {
+ linux-mod-r1_src_install
+}
+
+pkg_postinst() {
+ linux-mod-r1_pkg_postinst
+}
diff --git a/sys-fs/linux-apfs-rw/metadata.xml
b/sys-fs/linux-apfs-rw/metadata.xml
new file mode 100644
index ..313f7d9cb420
--- /dev/null
+++ b/sys-fs/linux-apfs-rw/metadata.xml
@@ -0,0 +1,11 @@
+
+https://www.gentoo.org/dtd/metadata.dtd;>
+
+
+ zmed...@gentoo.org
+ Zac Medico
+
+
+ linux-apfs/linux-apfs-rw
+
+
[gentoo-commits] repo/gentoo:master commit in: app-crypt/cryptor/
commit: 48bbac0adec5096f2e218b4d2750180203d17c03
Author: Zac Medico gentoo org>
AuthorDate: Sun Jun 9 20:28:59 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Jun 9 20:42:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48bbac0a
app-crypt/cryptor: new package, add 1.1.0
Signed-off-by: Zac Medico gentoo.org>
app-crypt/cryptor/Manifest | 1 +
app-crypt/cryptor/cryptor-1.1.0.ebuild | 50 ++
app-crypt/cryptor/metadata.xml | 11
3 files changed, 62 insertions(+)
diff --git a/app-crypt/cryptor/Manifest b/app-crypt/cryptor/Manifest
new file mode 100644
index ..834b5af2909b
--- /dev/null
+++ b/app-crypt/cryptor/Manifest
@@ -0,0 +1 @@
+DIST cryptor-1.1.0.tar.gz 56776 BLAKE2B
14c576bda70541d09be5029f59ea026d8a0c427547539c27134d9db78c84d4248782da4400b7b763056be7595e2bffda0b907dffa9fd86174deec1f9f5d86fd5
SHA512
4823780796baaf8e70886228b3e39b2e621978c857ddc73861fc635ee22fe54f82536d9f56d44061330c38c2e54734fd4c88bbe15d03dbba88f82f28a523090d
diff --git a/app-crypt/cryptor/cryptor-1.1.0.ebuild
b/app-crypt/cryptor/cryptor-1.1.0.ebuild
new file mode 100644
index ..99fff154c14c
--- /dev/null
+++ b/app-crypt/cryptor/cryptor-1.1.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop meson vala xdg
+
+DESCRIPTION="Simple GUI application for gocryptfs"
+HOMEPAGE="https://github.com/moson-mo/cryptor;
+SRC_URI="https://github.com/moson-mo/cryptor/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ app-crypt/gocryptfs
+ dev-libs/glib:2
+ dev-libs/json-glib
+ dev-libs/libgee
+ x11-libs/gtk+:3
+"
+DEPEND="
+ ${RDEPEND}
+"
+BDEPEND="
+ $(vala_depend)
+"
+
+DOCS=(README.md)
+
+src_prepare() {
+ # The TrayIcon category triggers QA Notice that the "OnlyShowIn" key
must be included.
+ sed -e 's/TrayIcon;//' -i resources/misc/cryptor.desktop || die
+ default
+ vala_setup
+}
+
+src_install() {
+ meson_src_install
+ einstalldocs
+ domenu resources/misc/cryptor.desktop
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+}
diff --git a/app-crypt/cryptor/metadata.xml b/app-crypt/cryptor/metadata.xml
new file mode 100644
index ..bdde076c07b0
--- /dev/null
+++ b/app-crypt/cryptor/metadata.xml
@@ -0,0 +1,11 @@
+
+https://www.gentoo.org/dtd/metadata.dtd;>
+
+
+ zmed...@gentoo.org
+ Zac Medico
+
+
+ moson-mo/cryptor
+
+
[gentoo-commits] repo/gentoo:master commit in: app-crypt/gocryptfs/
commit: 0a34c563fe50f96e4c1fc9aaa71251b9fa1e87e3
Author: Zac Medico gentoo org>
AuthorDate: Sun Jun 9 19:16:11 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Jun 9 19:25:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a34c563
app-crypt/gocryptfs: new package, add 2.4.0
Signed-off-by: Zac Medico gentoo.org>
app-crypt/gocryptfs/Manifest | 1 +
app-crypt/gocryptfs/gocryptfs-2.4.0.ebuild | 39 ++
app-crypt/gocryptfs/metadata.xml | 11 +
3 files changed, 51 insertions(+)
diff --git a/app-crypt/gocryptfs/Manifest b/app-crypt/gocryptfs/Manifest
new file mode 100644
index ..6e4250362ab5
--- /dev/null
+++ b/app-crypt/gocryptfs/Manifest
@@ -0,0 +1 @@
+DIST gocryptfs_v2.4.0_src-deps.tar.gz 2927929 BLAKE2B
e66e91506c5a7abb5413e8797f786145c436ca760e3c7157590ccb1c8430b2ac240b8ba1fd0ed3401ee4277a2e9ef6b8f3a9b3c52c22bac8e6b27b56350d9eec
SHA512
b46d6eee21a0194022a042d6ae2a737f221a0932bb899123438f2cf929ecb50635fcfc90012d6a04928fd4b2856d6e24d19392ce5aa87eea573fb58cf5a5d4e1
diff --git a/app-crypt/gocryptfs/gocryptfs-2.4.0.ebuild
b/app-crypt/gocryptfs/gocryptfs-2.4.0.ebuild
new file mode 100644
index ..1097ebdaab4d
--- /dev/null
+++ b/app-crypt/gocryptfs/gocryptfs-2.4.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Encrypted overlay filesystem written in Go"
+HOMEPAGE="https://github.com/rfjakob/gocryptfs;
+SRC_URI="https://github.com/rfjakob/gocryptfs/releases/download/v${PV}/${PN}_v${PV}_src-deps.tar.gz;
+S=${WORKDIR}/${PN}_v${PV}_src-deps
+LICENSE="MIT"
+LICENSE+=" Apache-2.0 BSD BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+BDEPEND="virtual/pandoc"
+PROPERTIES="test_privileged"
+RESTRICT="test"
+
+src_prepare() {
+ default
+ sed -e 's:ldd gocryptfs 2> /dev/null:! ldd gocryptfs | grep -q
"statically linked":' \
+ -i "${S}/build-without-openssl.bash" || die
+}
+
+src_compile() {
+ emake build
+}
+
+src_install() {
+ emake "DESTDIR=${ED}" install
+ dobin contrib/statfs/statfs
+ doman Documentation/*.1
+ dodoc -r README.md Documentation
+ rm -f
"${ED}"/usr/share/doc/${PF}/Documentation/{.gitignore,gocryptfs.1,gocryptfs-xray.1,statfs.1,MANPAGE-render.bash}
|| die
+}
+
+src_test() {
+ emake test
+}
diff --git a/app-crypt/gocryptfs/metadata.xml b/app-crypt/gocryptfs/metadata.xml
new file mode 100644
index ..90e70502
--- /dev/null
+++ b/app-crypt/gocryptfs/metadata.xml
@@ -0,0 +1,11 @@
+
+https://www.gentoo.org/dtd/metadata.dtd;>
+
+
+ zmed...@gentoo.org
+ Zac Medico
+
+
+ rfjakob/gocryptfs
+
+
[gentoo-commits] proj/portage:master commit in: lib/portage/
commit: f620a0769a509966295954c2b0c76e46e8fb4289
Author: Zac Medico gentoo org>
AuthorDate: Sun Jun 2 21:53:04 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Jun 9 17:53:31 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=f620a076
tar_safe_extract: Use tarfile.fully_trusted_filter
This suppresses a DeprecationWarning triggered because the
tarfile.data_filter will become the new default in python3.14.
The fully_trusted filter should be suitable here because
tar_safe_extract already performs security validation on
tar members prior to extraction.
Bug: https://bugs.gentoo.org/933433
Signed-off-by: Zac Medico gentoo.org>
lib/portage/gpkg.py | 9 +
1 file changed, 9 insertions(+)
diff --git a/lib/portage/gpkg.py b/lib/portage/gpkg.py
index 9606f6d3c8..fdb54c69b8 100644
--- a/lib/portage/gpkg.py
+++ b/lib/portage/gpkg.py
@@ -628,6 +628,15 @@ class tar_safe_extract:
if self.closed:
raise OSError("Tar file is closed.")
temp_dir = tempfile.TemporaryDirectory(dir=dest_dir)
+# The below tar member security checks can be refactored as a filter
function
+# that raises an exception. Use tarfile.fully_trusted_filter for now,
which
+# is simply an identity function:
+# def fully_trusted_filter(member, dest_path):
+# return member
+try:
+self.tar.extraction_filter = tarfile.fully_trusted_filter
+except AttributeError:
+pass
try:
while True:
member = self.tar.next()
[gentoo-commits] repo/gentoo:master commit in: app-misc/gojq/
commit: d97dc17bf25d0a2dcd5dc4ba3cdeeda6a18f543c
Author: Zac Medico gentoo org>
AuthorDate: Sat Jun 8 18:27:25 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sat Jun 8 18:29:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d97dc17b
app-misc/gojq: new package, add 0.12.16
Signed-off-by: Zac Medico gentoo.org>
app-misc/gojq/Manifest| 2 ++
app-misc/gojq/gojq-0.12.16.ebuild | 43 +++
app-misc/gojq/metadata.xml| 11 ++
3 files changed, 56 insertions(+)
diff --git a/app-misc/gojq/Manifest b/app-misc/gojq/Manifest
new file mode 100644
index ..8e9820659bd0
--- /dev/null
+++ b/app-misc/gojq/Manifest
@@ -0,0 +1,2 @@
+DIST gojq-0.12.16-deps.tar.xz 537848 BLAKE2B
11e0a6a03cb88eac6345b4cb02b0a2132b08d0d3198e8d12a7e7cd4d51c0ee4bf6fc0222de9aa1bca75a1a55fef1f60567bb7aaf52a86ea4c09b83d3210fb135
SHA512
b68c7d4401880f8ef232fe2880b9439b9198fd17dd356f95680195a30f8833a80b896e1ab27a075b2aa495657a1cb91ecd48bece5b3db6c6d9d20441af36f617
+DIST gojq-0.12.16.tar.gz 131894 BLAKE2B
094b51e9200ce9cda01b67e68be362ac111418f67e2ef9d96ede1a3da0c9469bde76bd958152b15f9231d84f8d2e6200ea10d1cad9102f2f1ef51c2623af159a
SHA512
08129dac68e280b4a7c2d64ea3da4cf8a00ab0ba8431e76468cb9d4b52e052eb5f2b92d1dc8545c3a5e08e354b0d4ec60c39137a13b4df6ea9027f0278e148c5
diff --git a/app-misc/gojq/gojq-0.12.16.ebuild
b/app-misc/gojq/gojq-0.12.16.ebuild
new file mode 100644
index ..4aee21687e7a
--- /dev/null
+++ b/app-misc/gojq/gojq-0.12.16.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+EGIT_COMMIT=0607aa5
+DESCRIPTION="Pure Go implementation of jq with yaml support"
+HOMEPAGE="https://github.com/itchyny/gojq;
+SRC_URI="https://github.com/itchyny/gojq/archive/refs/tags/v${PV}.tar.gz ->
${P/-go/}.tar.gz
+ https://dev.gentoo.org/~zmedico/dist/${P/-go/}-deps.tar.xz;
+
+LICENSE="MIT"
+LICENSE+=" Apache-2.0 BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+DOCS=(README.md)
+
+src_prepare() {
+ default
+ local -a sed_args=(
+ -e "s/^VERSION := .*/VERSION := ${PV}/"
+ -e "s/^CURRENT_REVISION = .*/CURRENT_REVISION = ${EGIT_COMMIT}/"
+ )
+ # -buildmode=pie not supported when -race is enabled
+ [[ ${GOFLAGS} == *buildmode=pie* ]] && sed_args+=(
+ -e 's/ -race / /'
+ )
+ sed "${sed_args[@]}" -i Makefile || die
+}
+
+src_compile() {
+ emake build
+}
+
+src_install() {
+ einstalldocs
+ dobin "${PN}"
+}
+
+src_test() {
+ emake test
+}
diff --git a/app-misc/gojq/metadata.xml b/app-misc/gojq/metadata.xml
new file mode 100644
index ..c333e701aa29
--- /dev/null
+++ b/app-misc/gojq/metadata.xml
@@ -0,0 +1,11 @@
+
+https://www.gentoo.org/dtd/metadata.dtd;>
+
+
+ zmed...@gentoo.org
+ Zac Medico
+
+
+ itchyny/gojq
+
+
[gentoo-commits] repo/gentoo:master commit in: dev-db/rqlite/
commit: 5693339ee117b177b5c1cfe54db79ac65396445c
Author: Zac Medico gentoo org>
AuthorDate: Sat Jun 8 17:27:21 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sat Jun 8 17:30:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5693339e
dev-db/rqlite: add 8.25.0
Signed-off-by: Zac Medico gentoo.org>
dev-db/rqlite/Manifest | 2 ++
dev-db/rqlite/rqlite-8.25.0.ebuild | 36
2 files changed, 38 insertions(+)
diff --git a/dev-db/rqlite/Manifest b/dev-db/rqlite/Manifest
index 1654d3ee4dfe..32f775612de1 100644
--- a/dev-db/rqlite/Manifest
+++ b/dev-db/rqlite/Manifest
@@ -1,2 +1,4 @@
DIST rqlite-8.23.0-deps.tar.xz 3934116 BLAKE2B
3f56e99ab7cc6e9ae6584bfc3bb10ff28a866961a90bb77ee7acc9442d16d37eaa705b5cc85abbf7de3daea77df24ec9b4b65fbff43a11033bc8e0a11bcb089e
SHA512
cace762d4f7e3a6d973dcba7ccf40ddc45d05a0cb5669d67a4c9fd4917e826828664779ab2bb293757fb46f2d5fc956d7ecae46b59f4914afe8fadc42d9d95b1
DIST rqlite-8.23.0.tar.gz 613529 BLAKE2B
0c6c790f1a211a10f14a2f03a231567c186504c05618509733f94a7cacb6b4b23abdbeb119067a4a884ddcbc5862d301ede0a83b3059e9ff55b20876c27f85dc
SHA512
6247cf72ac295a5892fe992ec90c7733de311142996d4eead2c69752d71ad55326a5f6c4f26f4c5fee229bd0b75a3379460bf69abe0c473517a8fb3ef322889f
+DIST rqlite-8.25.0-deps.tar.xz 3958656 BLAKE2B
f48b155e2f8535a4189ff8403fd33e555ad57edfd16546b80f9040852bab26c5580a0f39ebde232396df1cd21b3f08e0c4a9e83fd54837aca75a89d05d159241
SHA512
49b0b010eff36a5a5fdeb243f9b248beb0f96c3d914e62bf1c6f0638b8502b6a08daa84f23620f17411269a4efd703ef60ffa567da1cb72b04538b0fbe994e6b
+DIST rqlite-8.25.0.tar.gz 619814 BLAKE2B
489e572073ea7c19092c0345881381b39ff40c2728b3b4c443ac5c9b7df3172f45e189ef2fc0ee365a9a4274d0f58476efc23ad95bb5e462e84cc449af78ba79
SHA512
79331a6a24d9d42aded35d4e9250af84f522f6bf42ed817ad93c51e019b7cf2e7149ec78de6499aac39608a31da1fbd208fd0db5bee1b6cf92dd793b60559ac3
diff --git a/dev-db/rqlite/rqlite-8.25.0.ebuild
b/dev-db/rqlite/rqlite-8.25.0.ebuild
new file mode 100644
index ..fb2ae853ec49
--- /dev/null
+++ b/dev-db/rqlite/rqlite-8.25.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+EGIT_COMMIT=312d6b01f44630fc4f425d353bdc8dde1f34d860
+
+DESCRIPTION="Replicated SQLite using the Raft consensus protocol"
+HOMEPAGE="https://github.com/rqlite/rqlite
https://www.philipotoole.com/tag/rqlite/;
+SRC_URI="https://github.com/rqlite/rqlite/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz;
+
+LICENSE="MIT"
+LICENSE+=" Apache-2.0 BSD CC0-1.0 MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_compile() {
+ GOBIN="${S}/bin" \
+ go install \
+ -ldflags="-X main.version=v${PV}
+ -X main.branch=master
+ -X main.commit=${EGIT_COMMIT}
+ -X main.buildtime=$(date +%Y-%m-%dT%T%z)" \
+ ./cmd/... || die
+}
+
+src_test() {
+ GOBIN="${S}/bin" \
+ go test ./... || die
+}
+
+src_install() {
+ dobin bin/*
+ dodoc -r *.md DOC
+}
[gentoo-commits] repo/gentoo:master commit in: dev-db/rqlite/
commit: 625eb321c2c5818a07c56503029d779657d395dc
Author: Zac Medico gentoo org>
AuthorDate: Sat Jun 8 17:17:39 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sat Jun 8 17:30:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=625eb321
dev-db/rqlite: drop 8.16.8
Signed-off-by: Zac Medico gentoo.org>
dev-db/rqlite/Manifest | 1 -
dev-db/rqlite/rqlite-8.16.8.ebuild | 37 -
2 files changed, 38 deletions(-)
diff --git a/dev-db/rqlite/Manifest b/dev-db/rqlite/Manifest
index 4f54ccf8ec50..1654d3ee4dfe 100644
--- a/dev-db/rqlite/Manifest
+++ b/dev-db/rqlite/Manifest
@@ -1,3 +1,2 @@
-DIST rqlite-8.16.8-vendor.tar.gz 7715303 BLAKE2B
50660bdfb8ce9fa8238ae028916d822e9f5d8e027ee4865f543f97f8a49b92a13e549deb07a5b79e7a52c2c9e994cf6891562a15873b09398c74773f82ffc3d2
SHA512
987c9dbe91766f4847233949cd4251aa3d0a56d23b850bbb552d8f9bb255de3908c4fa440c45e730e861e6f4f60e559a41353659ab9d953b978c45ff986ee9b5
DIST rqlite-8.23.0-deps.tar.xz 3934116 BLAKE2B
3f56e99ab7cc6e9ae6584bfc3bb10ff28a866961a90bb77ee7acc9442d16d37eaa705b5cc85abbf7de3daea77df24ec9b4b65fbff43a11033bc8e0a11bcb089e
SHA512
cace762d4f7e3a6d973dcba7ccf40ddc45d05a0cb5669d67a4c9fd4917e826828664779ab2bb293757fb46f2d5fc956d7ecae46b59f4914afe8fadc42d9d95b1
DIST rqlite-8.23.0.tar.gz 613529 BLAKE2B
0c6c790f1a211a10f14a2f03a231567c186504c05618509733f94a7cacb6b4b23abdbeb119067a4a884ddcbc5862d301ede0a83b3059e9ff55b20876c27f85dc
SHA512
6247cf72ac295a5892fe992ec90c7733de311142996d4eead2c69752d71ad55326a5f6c4f26f4c5fee229bd0b75a3379460bf69abe0c473517a8fb3ef322889f
diff --git a/dev-db/rqlite/rqlite-8.16.8.ebuild
b/dev-db/rqlite/rqlite-8.16.8.ebuild
deleted file mode 100644
index fb6d652092cd..
--- a/dev-db/rqlite/rqlite-8.16.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-EGIT_COMMIT=10a5c9bd0e89e05c61e6de1a012470c432ee3591
-
-DESCRIPTION="Replicated SQLite using the Raft consensus protocol"
-HOMEPAGE="https://github.com/rqlite/rqlite
https://www.philipotoole.com/tag/rqlite/;
-SRC_URI="https://github.com/zmedico/rqlite/archive/v${PV}-vendor.tar.gz ->
${P}-vendor.tar.gz"
-
-LICENSE="MIT"
-LICENSE+=" Apache-2.0 BSD CC0-1.0 MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S=${WORKDIR}/${P}-vendor
-
-src_compile() {
- GOBIN="${S}/bin" \
- go install \
- -ldflags="-X main.version=v${PV}
- -X main.branch=master
- -X main.commit=${EGIT_COMMIT}
- -X main.buildtime=$(date +%Y-%m-%dT%T%z)" \
- ./cmd/... || die
-}
-
-src_test() {
- GOBIN="${S}/bin" \
- go test ./... || die
-}
-
-src_install() {
- dobin bin/*
- dodoc -r *.md DOC
-}
[gentoo-commits] repo/gentoo:master commit in: dev-lang/starlark-rust/
commit: 2d9f543f2ecfef9c1fd052d60955d791a239ab70 Author: Zac Medico gentoo org> AuthorDate: Sat Jun 8 17:11:12 2024 + Commit: Zac Medico gentoo org> CommitDate: Sat Jun 8 17:11:40 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d9f543f dev-lang/starlark-rust: update EAPI 7 -> 8 Signed-off-by: Zac Medico gentoo.org> dev-lang/starlark-rust/starlark-rust-0.8.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-lang/starlark-rust/starlark-rust-0.8.0.ebuild b/dev-lang/starlark-rust/starlark-rust-0.8.0.ebuild index 583c4b1b2c2d..e5adc9734c7a 100644 --- a/dev-lang/starlark-rust/starlark-rust-0.8.0.ebuild +++ b/dev-lang/starlark-rust/starlark-rust-0.8.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 CRATES=" Inflector-0.11.4
[gentoo-commits] repo/gentoo:master commit in: dev-python/sqlalchemy-rqlite/
commit: 7826b7a0e97afe03a1d9636c75618d8eb7a5e3d4
Author: Zac Medico gentoo org>
AuthorDate: Fri Jun 7 04:58:41 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Fri Jun 7 05:01:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7826b7a0
dev-python/sqlalchemy-rqlite: add 2.0
Signed-off-by: Zac Medico gentoo.org>
dev-python/sqlalchemy-rqlite/Manifest | 1 +
.../sqlalchemy-rqlite/sqlalchemy-rqlite-2.0.ebuild | 35 ++
2 files changed, 36 insertions(+)
diff --git a/dev-python/sqlalchemy-rqlite/Manifest
b/dev-python/sqlalchemy-rqlite/Manifest
index 2323c644c8ea..a2a3a09d3c59 100644
--- a/dev-python/sqlalchemy-rqlite/Manifest
+++ b/dev-python/sqlalchemy-rqlite/Manifest
@@ -1 +1,2 @@
DIST sqlalchemy-rqlite-1.2.gh.tar.gz 4880 BLAKE2B
ff07c0ee1c80cdbe0c743a4d25946cb260336766ed43a4496c014de4bb1cde0646250e4ede5f2bb73b8e5ecbe9816ec0b5a82e1c7c35ff66bac62b839bba72ab
SHA512
35e11b09c961e6af3bd658c583a0f3621b5798baa2bfd5f85b3d4136b4f134ad4af96e84e7cc52ab3025668ab05fc9e4f178803d8ae570ddbcd5405a43fdedf4
+DIST sqlalchemy-rqlite-2.0.gh.tar.gz 4965 BLAKE2B
b3567b9c4d6aa1b9c2098529f6c1066d5e96cd01e612593844ce87bc79229f5f4d4501fa02a281d4027a39ed0368ac3e4ff20be1daeee639f709569f0c801aed
SHA512
d2f335031add36c4efc91899a143b79c1a047fbd7fd43e61cc76f0a8e843fe3beffd5b9c6507fd8269dcdd60fd56bf18e605dc96f1f12123b5eea1bd2dd4330e
diff --git a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-2.0.ebuild
b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-2.0.ebuild
new file mode 100644
index ..f7589570934b
--- /dev/null
+++ b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-2.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="A SQLAlchemy dialect for rqlite"
+HOMEPAGE="
+ https://github.com/rqlite/sqlalchemy-rqlite/
+ https://pypi.org/project/sqlalchemy-rqlite/
+"
+SRC_URI="
+ https://github.com/rqlite/sqlalchemy-rqlite/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-python/pyrqlite[${PYTHON_USEDEP}]
+ dev-python/sqlalchemy[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ sed -e "s:^__version__ = .*:__version__ = '${PV}':" -i
src/sqlalchemy_rqlite/constants.py || die
+ distutils-r1_src_prepare
+}
[gentoo-commits] repo/gentoo:master commit in: app-misc/dasel/
commit: bdad5d73ad0410cab8e98a25f93e5e498908a7e0
Author: Zac Medico gentoo org>
AuthorDate: Tue Jun 4 16:27:59 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Tue Jun 4 16:46:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdad5d73
app-misc/dasel: drop 1.26.1, 1.27.1
Signed-off-by: Zac Medico gentoo.org>
app-misc/dasel/Manifest| 2 --
app-misc/dasel/dasel-1.26.1.ebuild | 24
app-misc/dasel/dasel-1.27.1.ebuild | 24
3 files changed, 50 deletions(-)
diff --git a/app-misc/dasel/Manifest b/app-misc/dasel/Manifest
index 87353f5567c3..c83719687d93 100644
--- a/app-misc/dasel/Manifest
+++ b/app-misc/dasel/Manifest
@@ -1,4 +1,2 @@
DIST dasel-1.24.3-deps.tar.xz 20531068 BLAKE2B
6cd947a88c54e46300432c2f87c0ef757a53739e0755af48f4596a87ba46faf12c967145a0f263e13abb8f01ffe10c51b45f641de348fc02e7af39417b709d1d
SHA512
27696cd5a5c93b3e29ba12fd2730c04047dc752ef17a32db73e7cbc8e5d38d914705720da9ff0ffb0c8d3fb383b5070eb552b24a4e72e72ebad70c2e1085cab3
-DIST dasel-1.26.1.tar.gz 3054446 BLAKE2B
760f03ee0feb1b6e0e0da9a92922f13bb3786b90ab01bda040d2be2cf10ed5d8a8c2db69ac146ac2ec64f6c4503eaaa87d32c73068f27ebc9ce87045052b4af3
SHA512
07efcf0bf31573decc856a8b41842af9658dc1a3b968510b8e4c642ec8cfe24e97de64b6ef2c296da7d5623ca47e92d42e3f7bb927a8a25e54f97546fac279f0
-DIST dasel-1.27.1.tar.gz 3055281 BLAKE2B
fde309780c2eef80e1efb52eafe1f5c1fc9c6824f88ed5d902564f4831f6628cf03501d52b7f2605be8ee7d5eb84898d752bac1077e3c06243ffe5b1f1eb4527
SHA512
de9a68cd158262d7d216fe54bc05b7bbaed671dbdee2f3c8055957434903364491c79c00e009e357f1650f2d3f2558ccd609b15f5320026b536eb23cb74482bd
DIST dasel-1.27.3.tar.gz 3056021 BLAKE2B
2145f501f837cd16aaa7cc16074e446e07cbb8b6b7ce043c644badbe758d255c9e42f408ca818e6241feb91f22eaa1e8e7fbf74b84275b7eba576687e877b1aa
SHA512
51e5f770f75e34f72692adf0987bcb965dd2100ac3e251c035cf62479462e22f982640bab6adac3c12bebac6987f7852f53cceb2c0c4d6dd009befe843cc1aec
diff --git a/app-misc/dasel/dasel-1.26.1.ebuild
b/app-misc/dasel/dasel-1.26.1.ebuild
deleted file mode 100644
index 261c64912713..
--- a/app-misc/dasel/dasel-1.26.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Query, update and convert data structures from the command line"
-HOMEPAGE="https://github.com/TomWright/dasel;
-SRC_URI="https://github.com/TomWright/dasel/archive/v${PV}.tar.gz ->
${P}.tar.gz
- https://dev.gentoo.org/~zmedico/dist/dasel-1.24.3-deps.tar.xz;
-
-LICENSE="MIT Apache-2.0 BSD BSD-2 ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-src_compile() {
- CGO_ENABLED=0 go build -o bin/dasel -ldflags="-X
'github.com/tomwright/dasel/internal.Version=${PV}'" ./cmd/dasel || die
-}
-
-src_install() {
- dobin bin/dasel
- dodoc CHANGELOG.md README.md
-}
diff --git a/app-misc/dasel/dasel-1.27.1.ebuild
b/app-misc/dasel/dasel-1.27.1.ebuild
deleted file mode 100644
index 261c64912713..
--- a/app-misc/dasel/dasel-1.27.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Query, update and convert data structures from the command line"
-HOMEPAGE="https://github.com/TomWright/dasel;
-SRC_URI="https://github.com/TomWright/dasel/archive/v${PV}.tar.gz ->
${P}.tar.gz
- https://dev.gentoo.org/~zmedico/dist/dasel-1.24.3-deps.tar.xz;
-
-LICENSE="MIT Apache-2.0 BSD BSD-2 ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-src_compile() {
- CGO_ENABLED=0 go build -o bin/dasel -ldflags="-X
'github.com/tomwright/dasel/internal.Version=${PV}'" ./cmd/dasel || die
-}
-
-src_install() {
- dobin bin/dasel
- dodoc CHANGELOG.md README.md
-}
[gentoo-commits] repo/gentoo:master commit in: app-misc/dasel/
commit: 04345b9dc20bacf88582baef954241326c82a0fd
Author: Zac Medico gentoo org>
AuthorDate: Tue Jun 4 16:44:38 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Tue Jun 4 16:46:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04345b9d
app-misc/dasel: add 2.7.0
Signed-off-by: Zac Medico gentoo.org>
app-misc/dasel/Manifest | 2 ++
app-misc/dasel/dasel-2.7.0.ebuild | 24
2 files changed, 26 insertions(+)
diff --git a/app-misc/dasel/Manifest b/app-misc/dasel/Manifest
index c83719687d93..200d99bd1ed8 100644
--- a/app-misc/dasel/Manifest
+++ b/app-misc/dasel/Manifest
@@ -1,2 +1,4 @@
DIST dasel-1.24.3-deps.tar.xz 20531068 BLAKE2B
6cd947a88c54e46300432c2f87c0ef757a53739e0755af48f4596a87ba46faf12c967145a0f263e13abb8f01ffe10c51b45f641de348fc02e7af39417b709d1d
SHA512
27696cd5a5c93b3e29ba12fd2730c04047dc752ef17a32db73e7cbc8e5d38d914705720da9ff0ffb0c8d3fb383b5070eb552b24a4e72e72ebad70c2e1085cab3
DIST dasel-1.27.3.tar.gz 3056021 BLAKE2B
2145f501f837cd16aaa7cc16074e446e07cbb8b6b7ce043c644badbe758d255c9e42f408ca818e6241feb91f22eaa1e8e7fbf74b84275b7eba576687e877b1aa
SHA512
51e5f770f75e34f72692adf0987bcb965dd2100ac3e251c035cf62479462e22f982640bab6adac3c12bebac6987f7852f53cceb2c0c4d6dd009befe843cc1aec
+DIST dasel-2.7.0-deps.tar.xz 1219584 BLAKE2B
91cfc1225588ba397d9dc5b62297876164644c08260288d09fb843cf7c8619909c11126f54e5c1be1a225a55e3f60184bbdad6ed5e86dafe27c2892eb646066f
SHA512
d2f6545ddb3f62acaa0b98894321f53e01e8fefbc0c8e4327e051dd513fa3a47bbc822ffb7b856a3897915962cfac01d080adc7778d9349ff3282d1cce1debeb
+DIST dasel-2.7.0.tar.gz 2793422 BLAKE2B
27fdc70f998c389453c7b6c6ec59491f3482ff7df1a043499e985179c5a51f6b58328272d733eddb28009ada0dd206b0e4fed37ec6bc43229314a0c1906e215e
SHA512
37753bc124511bc2105186ad62090bda25e8574b5c1ec2cc2583f91e9f8ab41de261f870600ea1a501f41c5ad3b13999c64ca995eee50ee120359f819f6f334a
diff --git a/app-misc/dasel/dasel-2.7.0.ebuild
b/app-misc/dasel/dasel-2.7.0.ebuild
new file mode 100644
index ..ebf04bd39740
--- /dev/null
+++ b/app-misc/dasel/dasel-2.7.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Query, update and convert data structures from the command line"
+HOMEPAGE="https://github.com/TomWright/dasel;
+SRC_URI="https://github.com/TomWright/dasel/archive/v${PV}.tar.gz ->
${P}.tar.gz
+ https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz;
+
+LICENSE="MIT Apache-2.0 BSD BSD-2 ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+src_compile() {
+ CGO_ENABLED=0 go build -o bin/dasel -ldflags="-X
'github.com/tomwright/dasel/internal.Version=${PV}'" ./cmd/dasel || die
+}
+
+src_install() {
+ dobin bin/dasel
+ dodoc CHANGELOG.md README.md
+}
[gentoo-commits] repo/gentoo:master commit in: app-shells/nushell/
commit: 43d7735a913098ece3d3afd986ca6e2cd5b6305f Author: Jonas Frei pm me> AuthorDate: Fri May 31 03:37:34 2024 + Commit: Zac Medico gentoo org> CommitDate: Tue Jun 4 16:27:04 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43d7735a app-shells/nushell: drop 0.92.1 Signed-off-by: Jonas Frei pm.me> Closes: https://github.com/gentoo/gentoo/pull/36909 Signed-off-by: Zac Medico gentoo.org> app-shells/nushell/Manifest | 6 - app-shells/nushell/nushell-0.92.1.ebuild | 713 --- 2 files changed, 719 deletions(-) diff --git a/app-shells/nushell/Manifest b/app-shells/nushell/Manifest index ac728d78de10..37648ffd4127 100644 --- a/app-shells/nushell/Manifest +++ b/app-shells/nushell/Manifest @@ -156,7 +156,6 @@ DIST chardetng-0.1.17.crate 56362 BLAKE2B c99d2f1044fc652858e6de0f2be9a24bec6855 DIST charset-0.1.3.crate 14330 BLAKE2B 928771e37cc4f86f49cf09b671cc016cb662275799f34159dff9c22ca61a71d722f199ed36b2fadebde30b5763cc01d87bd6f27e70ff8ad357df10d6ddb652a8 SHA512 61166acd4fba3330c4c71e101e1993717baa448d91dd9773f7d58ac504fa4025322560ce82bd7de1b5935443f96ba84691658e5c982192196b325f52dc48f4b1 DIST chrono-0.4.31.crate 214513 BLAKE2B 2ac43852ea14cb7b129adf68ff62adac1763b3f4802dd3d23c43cb131377b501b4adb22aa93818d7ceded8eb10c17f94a7836257ce2876d0513b063276129c54 SHA512 23276daa2c1bc3b7b2327dc84200fb40cc995a8b599d1a537e92e08138ab8a0d1548a510a8155dcdda18820120d7204e89a4686c866fc3a8d2460cdb30ac6089 DIST chrono-0.4.34.crate 228932 BLAKE2B a2feab8d8b079209f8661fd8c5069f2a5fc3e5b0a6233187ace16f8f2ad8b4a147253e47af306cb31aacd82bdf490a8c8a171ad702b8dc22f9b934205d080c55 SHA512 2aaccde5e5ecaec744613429f807b3c34b92632973de7fdbdafd7ca510b917a23a0abc92a6497754d0d3368d684305648aec1fa2a0a61c88a100a20fab2348f1 -DIST chrono-0.4.35.crate 234267 BLAKE2B 92552b9c8fb40160de9ee62ed8c5bea12bf8bae393caf91c1c64596d6b2efd09dce94355fb757ed46eaf4a13d27ee3ebb43af91e2d8c26df1f9a9f429869f319 SHA512 aed8bc3298c8f8dd8146c6a919610b6dda52c038a28b56c837a21590e41fda605cd466dc1b85e407f365e116d741cb82afbeff5d29f95f3f5bce4a62abf80812 DIST chrono-0.4.37.crate 234441 BLAKE2B d1c10bcdf33324f1dbe9a79cd8c5a70b8223ca289753446aef778c93bf18863714ab2ade88f1e67432d1451b0d408065325a7d8dd3578211a0e39caae733ceee SHA512 46d77f291c7c60a25d0c06ebbd89935ef3ae1b736d504b8faf39aad8210a9fc68b45b5afb024763979f666308750b1a662afdabc36c59974567cadadfc17fcbf DIST chrono-0.4.38.crate 220559 BLAKE2B ab828bfeed56eb737a1797d5e1132cafe87a1e14bf7a1fe4a5098f50e6ceead50ca2e7f041cc2ff63d5f4e41e2853322f6c345bb31ff12a5b412e3e5202f5fea SHA512 858e47e3facebd5383e71898f26b27d92fe4a69027e2cc47da2af59975ead7767355e0b699f4228eabe76a3eff8b2519c7cecf8b60dc3fc60fbf9b28e2f3d4d9 DIST chrono-humanize-0.2.3.crate 15411 BLAKE2B d271f5f34e27edd1ffc10d655f50c47ed1871c3553dd40dc10c5de6fba8fdd2186fc65bf4d229c558314e330bdfada73c663f01e0fe1a9c73fab964f60aff919 SHA512 cb379e678b97749cb6fb5d6aaa1878ae2b106cfd6850ba5ff909b4f22dec67c70d3f738c05980ac3ab691fb959541ceb6f43068f0786c21b2ad1933e5047469b @@ -184,7 +183,6 @@ DIST clap_lex-0.5.0.crate 11792 BLAKE2B 0409c9d957ea6a566eb8b50f4212702df038d04c DIST clap_lex-0.6.0.crate 12272 BLAKE2B 22aa04997fffa15a2efc7013ae27fd223c3247cd31f8fe96aafb4e87e3224f075e887df10a95a2da80b468d4e16088ae9f171ba6551c0ae06d77bf3b8920ff9d SHA512 3651aa5e27ed35b6b75b1d25fd9c20c26a2a6039116e54d84c51469087732a4f0fd71754326456b367e341b017d03749e9a6774cb7b62250ca8745f5af46574e DIST clap_lex-0.7.0.crate 11915 BLAKE2B 03287f02067f6cb33bb3889e8032b0848e9a9cc17446eb0e2767768cf6ea8c579a7455d33c8af735fb8d0c16095b19f991a5e2528dee3a7628d68c16f9307fa4 SHA512 638feb2e4571677dbe15ef0423866d2f0df309723e5ad65ddeaff7fd5e2e83adcb973a32d52a5f3924ea88fcff865e956b7d30dcd569df0412ef47848af14036 DIST clipboard-win-4.5.0.crate 13476 BLAKE2B bfe3e9c21d58e0001b85c69d724b03b2bc7128fe67420948dffe0b9709504924339c93b5acc2a572a7780bb1adcb51ab10ac172b972c26d325f3ceb7f7f6dde7 SHA512 2dfaf30119eb77c9f069310417f11e836e158ba43f988ff49f79647f5fe44bacf7e28dcc11ba2cd95389c685a69be0f5ef8b033ef09b94c9a3e484952e891d8e -DIST clipboard-win-5.2.0.crate 19036 BLAKE2B 395d8609cd92fcb918480ea87ecf32cf91eaf7019a9a88168962c716ed671c6d53216f20d93101f255be6c8a62406fe005f90f4129de6f300701b5ca1745b0f6 SHA512 6bd4d400075a409a29480b8a2e882d16b5e59acea35b9172140339b617f1991e9d63568fce1f50a36956905f96359401e2a981f8a10ff97ebc245b11ed2fabdf DIST clipboard-win-5.3.0.crate 19597 BLAKE2B 1f61d0c7049e6b2d9f09d6ef47196153ca4f592cb0eff7602317cb871cf06a54ecf7b49a121f45842cf49555c171f27db38e41975ba13920e5eed456283b6c10 SHA512 decd0b73e2d879c7b650f525b74e2ff20d271ac21598a64d447d863cd3d1fe344b3f4b4420514644c777d1d1793b585336e877759734c7234627ada0510daffc DIST clipboard-win-5.3.1.crate 19921 BLAKE2B b0b3b9e30bf4bd897fe6db78cb68a906e8dcaf79f0f4218428f5707f89aa60450d3aed272de10e81ef708e2ddf4737393380593cbd34fae5b1abf87a9119
[gentoo-commits] proj/portage:master commit in: lib/portage/sync/modules/zipfile/, lib/portage/sync/modules/
commit: 8bb7aecf7e5c922911192d0df63853c5c75d9f8a
Author: Alexey Gladkov kernel org>
AuthorDate: Tue Jun 4 15:31:06 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Tue Jun 4 15:40:25 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=8bb7aecf
sync/zipfile: Install zipfile sync method
Add files that were accidentally forgotten when adding zipfile sync
method.
Fixes: 80445d9b0 ("sync: Add method to download zip archives")
Signed-off-by: Alexey Gladkov kernel.org>
Closes: https://github.com/gentoo/portage/pull/1340
Signed-off-by: Zac Medico gentoo.org>
lib/portage/sync/modules/meson.build | 1 +
lib/portage/sync/modules/zipfile/meson.build | 8
2 files changed, 9 insertions(+)
diff --git a/lib/portage/sync/modules/meson.build
b/lib/portage/sync/modules/meson.build
index fab2878e92..ba0b6f278b 100644
--- a/lib/portage/sync/modules/meson.build
+++ b/lib/portage/sync/modules/meson.build
@@ -12,3 +12,4 @@ subdir('mercurial')
subdir('rsync')
subdir('svn')
subdir('webrsync')
+subdir('zipfile')
diff --git a/lib/portage/sync/modules/zipfile/meson.build
b/lib/portage/sync/modules/zipfile/meson.build
new file mode 100644
index 00..46006aea7e
--- /dev/null
+++ b/lib/portage/sync/modules/zipfile/meson.build
@@ -0,0 +1,8 @@
+py.install_sources(
+[
+'zipfile.py',
+'__init__.py',
+],
+subdir : 'portage/sync/modules/zipfile',
+pure : not native_extensions
+)
[gentoo-commits] proj/portage:master commit in: lib/portage/tests/util/, lib/_emerge/
commit: 3a9f2c09eb75f47cf3ae15fa4ebe671548a66870
Author: Zac Medico gentoo org>
AuthorDate: Mon Jun 3 01:18:44 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Jun 3 01:55:08 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=3a9f2c09
Add binpkgs info to mtimedb resume data
In order to fix emerge --resume and --keep-going to make
appropriate binary package selections, store a list of
binpkgs in the resume data. By adding the data as a new
key which older versions of portage will ignore, the
extension is backward compatible.
Without this fix, emerge --resume and --keep-going make
poor package selection choices which do not account for
the --binpkg-respect-use option.
Bug: https://bugs.gentoo.org/933442
Signed-off-by: Zac Medico gentoo.org>
lib/_emerge/Scheduler.py | 13 +
lib/_emerge/actions.py | 7 +++
lib/_emerge/depgraph.py| 21 +
lib/portage/tests/util/test_mtimedb.py | 30 +-
4 files changed, 66 insertions(+), 5 deletions(-)
diff --git a/lib/_emerge/Scheduler.py b/lib/_emerge/Scheduler.py
index d913cd2dc6..614df9e783 100644
--- a/lib/_emerge/Scheduler.py
+++ b/lib/_emerge/Scheduler.py
@@ -2116,6 +2116,19 @@ class Scheduler(PollScheduler):
for x in self._mergelist
if isinstance(x, Package) and x.operation == "merge"
]
+# Store binpkgs using the same keys as $PKGDIR/Packages plus EROOT.
+mtimedb["resume"]["binpkgs"] = [
+{
+"CPV": str(x.cpv),
+"BUILD_ID": x.cpv.build_id,
+"BUILD_TIME": x.cpv.build_time,
+"MTIME": x.cpv.mtime,
+"SIZE": x.cpv.file_size,
+"EROOT": x.root,
+}
+for x in self._mergelist
+if isinstance(x, Package) and x.type_name == "binary"
+]
mtimedb.commit()
diff --git a/lib/_emerge/actions.py b/lib/_emerge/actions.py
index 512e470ad6..43d936fd14 100644
--- a/lib/_emerge/actions.py
+++ b/lib/_emerge/actions.py
@@ -216,6 +216,13 @@ def action_build(
if not isinstance(favorites, list):
del mtimedb[k]
continue
+binpkgs = resume_data.get("binpkgs")
+if binpkgs and (
+not isinstance(binpkgs, list)
+or any(not isinstance(x, dict) for x in binpkgs)
+):
+del mtimedb[k]
+continue
resume = False
if "--resume" in myopts and ("resume" in mtimedb or "resume_backup" in
mtimedb):
diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py
index 3adc04bcfb..a05404d9c2 100644
--- a/lib/_emerge/depgraph.py
+++ b/lib/_emerge/depgraph.py
@@ -11066,6 +11066,13 @@ class depgraph:
else:
args = []
+binpkgs_map = {}
+binpkgs = resume_data.get("binpkgs")
+if binpkgs:
+for x in binpkgs:
+if isinstance(x, dict) and "EROOT" in x and "CPV" in x:
+binpkgs_map[(x["EROOT"], x["CPV"])] = x
+
serialized_tasks = []
masked_tasks = []
for x in mergelist:
@@ -11096,8 +11103,22 @@ class depgraph:
except InvalidAtom:
continue
+if pkg_type == "binary":
+binpkg_info = binpkgs_map.get((myroot, pkg_key))
+else:
+binpkg_info = False
+
pkg = None
for pkg in self._iter_match_pkgs(root_config, pkg_type, atom):
+if binpkg_info:
+if not (
+pkg.cpv.build_id == binpkg_info.get("BUILD_ID")
+and pkg.cpv.build_time == binpkg_info.get("BUILD_TIME")
+and pkg.cpv.mtime == binpkg_info.get("MTIME")
+and pkg.cpv.file_size == binpkg_info.get("SIZE")
+):
+continue
+
if not self._pkg_visibility_check(
pkg
) or self._frozen_config.excluded_pkgs.findAtomForPackage(
diff --git a/lib/portage/tests/util/test_mtimedb.py
b/lib/portage/tests/util/test_mtimedb.py
index d80b4f1daf..6e3c2bee76 100644
--- a/lib/portage/tests/util/test_mtimedb.py
+++ b/lib/portage/tests/util/test_mtimedb.py
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Foundation
+# Copyright 2022-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
from unittest.mock import patch, mock_open
@@ -30,6 +30,16 @@ _ONE_RESUME_LIST_JSON = b"""{
"/usr/local/lib64": 1711784303
},
"resume": {
+
[gentoo-commits] proj/portage:master commit in: lib/portage/
commit: eb855b8cd1248f49649003dcfb9bf009b70e88cb
Author: Zac Medico gentoo org>
AuthorDate: Sun Jun 2 17:56:44 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Jun 2 18:05:35 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=eb855b8c
tar_stream_writer: Add missing error attribute
This attribute was previously initialized only
in an exception handler.
Fixes: b8c3f38ec5ee ("Add more error handling for binpkgs")
Bug: https://bugs.gentoo.org/933385
Signed-off-by: Zac Medico gentoo.org>
lib/portage/gpkg.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/portage/gpkg.py b/lib/portage/gpkg.py
index fc4d7b1fb6..9606f6d3c8 100644
--- a/lib/portage/gpkg.py
+++ b/lib/portage/gpkg.py
@@ -100,6 +100,7 @@ class tar_stream_writer:
self.closed = False
self.container = container
self.killed = False
+self.error = False
self.tar_format = tar_format
self.tarinfo = tarinfo
self.uid = uid
[gentoo-commits] repo/gentoo:master commit in: app-containers/snapd/
commit: e359d098225e9bf9c505c11b9ee45b1fdb14f09f
Author: Zac Medico gentoo org>
AuthorDate: Sat Jun 1 20:14:51 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sat Jun 1 20:30:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e359d098
app-containers/snapd: 2.63 GNU_SOURCE patch for bug 933073
Closes: https://bugs.gentoo.org/933073
Closes: https://github.com/gentoo/gentoo/pull/36957
Signed-off-by: Zac Medico gentoo.org>
app-containers/snapd/Manifest | 1 +
app-containers/snapd/snapd-2.63.ebuild | 6 --
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/app-containers/snapd/Manifest b/app-containers/snapd/Manifest
index 89d58b906a8b..6ddc12332feb 100644
--- a/app-containers/snapd/Manifest
+++ b/app-containers/snapd/Manifest
@@ -1,3 +1,4 @@
DIST snapd-2.58.tar.xz 6980916 BLAKE2B
d3de507513db808fa4f85498b5c238de143f06660f1d677186c8c763b38643a2486e25b747977b3eb584619d79ea0a12e88dc5a909045a853c1d8f849f2c1638
SHA512
555915b8b4d9d2d91a3ba19e9e78cf6b19d9683a9f390ad225aa5876320cb8595b464d6133706c4923fc15fbe04ba2b65a47e403c9a2d8859adae827f8ec000a
DIST snapd-2.61.tar.xz 7626784 BLAKE2B
d716e91df4702fbd415bb6204a4557f37afd3dce187e3bca33b12a2ac5a1b54d1c31473d1537a784f6cbbfaf213f676d1f1b29d716e8c5f45a785229c9f3e018
SHA512
2fd432d7ef2204535576e980de7060ad15a0b3610b25e0f41b630ae34e172f97460f0a38d9d456af08dd36c619e90119219788a49e56a69afc7fbf014fc1db22
+DIST snapd-2.63-bug-933073-GNU_SOURCE.patch 870 BLAKE2B
acc2a9ec7ca16849736701b37e51f238be5700cf0cd40dac6493f126a48235ffc1f103096d546313d05a2262f8bdb6f84966cbb79c4cf3f5c1cdf4dfd5dc231e
SHA512
5e4018d1972e1849cf60c6e132f8655d8f0f4d6f8a77f9a7e5d2063b823f97a17bf26b562e6ab93ea32f081a90df6969a617e77114f37553a350f44f11fb
DIST snapd-2.63.tar.xz 7502152 BLAKE2B
8ae38699227b7f0e6b512526fc8857b3e50ed220ac95860c372ca0a4b26f5a034bd9309688217696444254e41cc70fe3a45c0bf026c84e5f950e7df8aebd47a0
SHA512
956ee142ab6cb5de522307f7844819c861b2831e22dab56f7bfca16ff7f947093f8a8727d49370cc000ed71f3af9c57cff9c4be93ebf199e8c631a152a68ec5b
diff --git a/app-containers/snapd/snapd-2.63.ebuild
b/app-containers/snapd/snapd-2.63.ebuild
index 56a00504636a..994f00213a29 100644
--- a/app-containers/snapd/snapd-2.63.ebuild
+++ b/app-containers/snapd/snapd-2.63.ebuild
@@ -9,11 +9,13 @@ DESCRIPTION="Service and tools for management of snap
packages"
HOMEPAGE="http://snapcraft.io/;
SRC_URI="https://github.com/snapcore/snapd/releases/download/${PV}/snapd_${PV}.vendor.tar.xz
-> ${P}.tar.xz"
+SRC_URI+="
https://github.com/snapcore/snapd/commit/1b035da5d873518ee4be31dacb1191c77ce0b644.patch
-> ${P}-bug-933073-GNU_SOURCE.patch"
+PATCHES=("${DISTDIR}/${P}-bug-933073-GNU_SOURCE.patch")
MY_PV=${PV}
-KEYWORDS="~amd64"
-
LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
SLOT="0"
+KEYWORDS="~amd64"
+
IUSE="apparmor +forced-devmode gtk kde systemd"
REQUIRED_USE="!forced-devmode? ( apparmor ) systemd"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/
commit: 26644346567067d2e3df13ef2888114fee0e0236
Author: Zac Medico gentoo org>
AuthorDate: Sat Jun 1 19:45:54 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sat Jun 1 19:47:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26644346
sys-apps/portage: enable py3.13
Signed-off-by: Zac Medico gentoo.org>
sys-apps/portage/portage-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/portage/portage-.ebuild
b/sys-apps/portage/portage-.ebuild
index ea323e5a917c..56a051fcc8d0 100644
--- a/sys-apps/portage/portage-.ebuild
+++ b/sys-apps/portage/portage-.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
PYTHON_REQ_USE='bzip2(+),threads(+)'
TMPFILES_OPTIONAL=1
[gentoo-commits] proj/portage:master commit in: lib/portage/dbapi/
commit: 1a7fc63d20ad2e1292be3697c105c2d7e1691f91
Author: Zac Medico gentoo org>
AuthorDate: Sat Jun 1 04:56:45 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sat Jun 1 19:18:35 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=1a7fc63d
MergeProcess: Pass bintree to subprocess
It's required for FEATURES=*-backup.
Fixes: b9a85ff987ea ("MergeProcess: Support QueryCommand with spawn start
method")
Bug: https://bugs.gentoo.org/933297
Signed-off-by: Zac Medico gentoo.org>
lib/portage/dbapi/_MergeProcess.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/portage/dbapi/_MergeProcess.py
b/lib/portage/dbapi/_MergeProcess.py
index d9ab2b47aa..34e39eb229 100644
--- a/lib/portage/dbapi/_MergeProcess.py
+++ b/lib/portage/dbapi/_MergeProcess.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2023 Gentoo Authors
+# Copyright 2010-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
import functools
@@ -183,11 +183,12 @@ class MergeProcess(ForkProcess):
# Since the entire QueryCommand._db is not required, only pass
# in tree types that QueryCommand specifically requires.
+# NOTE: For FEATURES=*-backup bintree is needed (bug 933297).
child_db = {}
parent_db = portage.db if QueryCommand._db is None else
QueryCommand._db
for root in parent_db:
child_db[root] = {}
-for tree_type in ("vartree", "porttree"):
+for tree_type in ("bintree", "porttree", "vartree"):
child_db[root][tree_type] = parent_db[root][tree_type]
self.target = functools.partial(
[gentoo-commits] proj/portage:master commit in: lib/portage/tests/util/, lib/portage/util/
commit: 120b2ec988eebf6cd90365d5b50a1a718eebb116
Author: Zac Medico gentoo org>
AuthorDate: Tue May 28 05:37:13 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Tue May 28 05:37:13 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=120b2ec9
atomic_ofstream: fix follow_symlinks fallback and default file mode
Handle OSError from mkstemp for (default) follow_symlinks mode,
not following the symlink if necessary (the target's parent may
not exist or may be readonly). This restores the fallback
behavior that existed before the introduction of mkstemp in
commit de19f3a7215d.
Handle missing _file and _tmp_name attributes during close.
Also set the default file mode respecting umask if a previous
file does not exist, which fixes the mode of CONTENTS files
since mkstemp.
Fixes: de19f3a7215d ("atomic_ofstream: Use mkstemp rather than getpid (pid
namespace safety)")
Signed-off-by: Zac Medico gentoo.org>
lib/portage/tests/util/meson.build | 1 +
lib/portage/tests/util/test_atomic_ofstream.py | 85 ++
lib/portage/util/__init__.py | 45 +-
3 files changed, 116 insertions(+), 15 deletions(-)
diff --git a/lib/portage/tests/util/meson.build
b/lib/portage/tests/util/meson.build
index 010dfa7849..7f4db871f4 100644
--- a/lib/portage/tests/util/meson.build
+++ b/lib/portage/tests/util/meson.build
@@ -1,5 +1,6 @@
py.install_sources(
[
+'test_atomic_ofstream.py',
'test_checksum.py',
'test_digraph.py',
'test_file_copier.py',
diff --git a/lib/portage/tests/util/test_atomic_ofstream.py
b/lib/portage/tests/util/test_atomic_ofstream.py
new file mode 100644
index 00..bbaf0f1b06
--- /dev/null
+++ b/lib/portage/tests/util/test_atomic_ofstream.py
@@ -0,0 +1,85 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+import errno
+import os
+import stat
+import tempfile
+
+from portage.tests import TestCase
+from portage.util import atomic_ofstream
+
+
+class AtomicOFStreamTestCase(TestCase):
+def test_enospc_rollback(self):
+file_name = "foo"
+start_dir = os.getcwd()
+with tempfile.TemporaryDirectory() as tempdir:
+try:
+os.chdir(tempdir)
+with self.assertRaises(OSError):
+with atomic_ofstream(file_name) as f:
+f.write("hello")
+raise OSError(errno.ENOSPC, "No space left on device")
+self.assertFalse(os.path.exists(file_name))
+self.assertEqual(os.listdir(tempdir), [])
+finally:
+os.chdir(start_dir)
+
+def test_open_failure(self):
+file_name = "bad/path"
+start_dir = os.getcwd()
+with tempfile.TemporaryDirectory() as tempdir:
+try:
+os.chdir(tempdir)
+with self.assertRaises(OSError):
+with atomic_ofstream(file_name):
+pass
+self.assertEqual(os.listdir(tempdir), [])
+finally:
+os.chdir(start_dir)
+
+def test_broken_symlink(self):
+content = "foo"
+broken_symlink = "symlink"
+symlink_targets = (("foo/bar/baz", False), ("baz", True))
+start_dir = os.getcwd()
+for symlink_target, can_follow in symlink_targets:
+with tempfile.TemporaryDirectory() as tempdir:
+try:
+os.chdir(tempdir)
+with open(broken_symlink, "w") as f:
+default_file_mode =
stat.S_IMODE(os.fstat(f.fileno()).st_mode)
+os.unlink(broken_symlink)
+os.symlink(symlink_target, broken_symlink)
+with atomic_ofstream(broken_symlink) as f:
+f.write(content)
+with open(broken_symlink) as f:
+self.assertEqual(f.read(), content)
+self.assertEqual(os.path.islink(broken_symlink),
can_follow)
+self.assertEqual(
+stat.S_IMODE(os.stat(broken_symlink).st_mode),
default_file_mode
+)
+finally:
+os.chdir(start_dir)
+
+def test_preserves_mode(self):
+file_name = "foo"
+file_mode = 0o604
+start_dir = os.getcwd()
+with tempfile.TemporaryDirectory() as tempdir:
+try:
+os.chdir(tempdir)
+with open(file_name, "wb"):
+pass
+self.assertNotEqual(stat.S_IMODE(os.stat(file_name).st_mode),
file_mode)
+os.chmod(file_name, file_mode)
+st_before = os.stat(file_na
[gentoo-commits] repo/gentoo:master commit in: sys-apps/flatpak/
commit: df54797554e209a78b7c4f279c64d9e045ebac9c
Author: Zac Medico gentoo org>
AuthorDate: Tue May 28 00:29:29 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Tue May 28 00:30:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df547975
sys-apps/flatpak: drop 1.12.9, 1.14.5
Signed-off-by: Zac Medico gentoo.org>
sys-apps/flatpak/Manifest | 2 -
sys-apps/flatpak/flatpak-1.12.9.ebuild | 108 -
sys-apps/flatpak/flatpak-1.14.5.ebuild | 121 -
3 files changed, 231 deletions(-)
diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
index 55263cd566bc..7e95fff2cd7b 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -1,6 +1,4 @@
DIST flatpak-1.12.8.tar.xz 1568984 BLAKE2B
6db457eba6b5c03ae4b7037e55f0537821152a80cad8746939fe93008922a9a33ff9f08635613e56a84f2d151826130c497c1e9f7f1e41a5b2dc215882f2eb14
SHA512
5a37d94e12c18a746b222c1ddbd20bddfb22079af1d3a79dc819cdb25f04774c9e4b3a51f9b5ed64f210317e7ec9fb97324ae38ec3430c6a515ba4042805fc57
-DIST flatpak-1.12.9.tar.xz 1572536 BLAKE2B
bd9b116bf0e51e60d1e0c420c4c4553a0ebc55a667bce23a0f3116da0dd566c7ffdb063c0b63f466b9b6e451b3c7791daf40cb5d13e2535d988b58cfc947341f
SHA512
9103acfed4cb25e6ff4a9d023864845cc565f688b1a4b49b0c8c2605eda9a142f33a37ad2ce670c5f7bd30a398027c141adf2a6f6d0d7549b2bfca82214d3f85
DIST flatpak-1.14.4.tar.xz 1637484 BLAKE2B
cf208c581ad76d46489ba473d290c35907da0d1d473bf2b4792fb56c31e7110cd38f1c6fc4ad04aa3675868d17116ba52a84b028d7b7789c1736cfe26f3cabfe
SHA512
3f97096affd4f1de184ded353f1ab403d9f1813b199b9a1595596cc7c5d6b46062aa2ef184255823f50ae95ca60d0542d9b9e520f9a605f9bc51091863bf89b0
-DIST flatpak-1.14.5.tar.xz 1637692 BLAKE2B
180dc094ef3feef1ccefceb562836f55f6e875016588a5984435ea3157498a8746305c16aa2c83044c107fd7f0e8f6c034c326b4ae29ade1c657e82cff353d47
SHA512
552deaaf3e6712a56f33698c20e6b8225c8893fe9a375af897fd99e19c487bf79b19c3e4ce3b00f3caf90020019ff67c628ca6a8f2ae1e6e01db397d2081ab2b
DIST flatpak-1.14.6.tar.xz 1644056 BLAKE2B
68bc8bdaf1d1c8a6046a06f800d41c1603e691e60a90f070c694501d50ee6fba3ad1978e222d22a9f99e2b85de9154e670149227b0f2ea6543483c2d103b5093
SHA512
d858682dbf539afe1b91087b6a0e0ebeea6658a0ef02c96d68259f3d8c58d1e6d02dd8b69db1b3c55f6d5df0f4d7e41c6165f668f09763dd3f9c3beb48f8bcf5
DIST flatpak-1.14.8.tar.xz 1698728 BLAKE2B
aecfe77371ec2479ab12f46035213d6cfb672fe9fb1882a3225ae3ee8d3bd23e96848061bc1c778265f3ff4daf369eb19e584f36f804107543b0287f774997f1
SHA512
a34d539f4ed0682459a22afa282de36da964a3545abd78138d3d86d9464d67cb57479f93bf84d1a9d811b80e72e0ea11f64293cb09a559fd5ec2c957be1729a1
diff --git a/sys-apps/flatpak/flatpak-1.12.9.ebuild
b/sys-apps/flatpak/flatpak-1.12.9.ebuild
deleted file mode 100644
index 5d1d9025a7c6..
--- a/sys-apps/flatpak/flatpak-1.12.9.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10,11} )
-
-inherit linux-info python-any-r1
-
-DESCRIPTION="Linux application sandboxing and distribution framework"
-HOMEPAGE="https://flatpak.org/;
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz;
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="doc introspection policykit seccomp systemd X"
-RESTRICT="test"
-
-RDEPEND="
- acct-group/flatpak
- acct-user/flatpak
- >=app-arch/libarchive-2.8:=
- app-arch/zstd:=
- >=app-crypt/gpgme-1.1.8:=
- >=dev-libs/appstream-glib-0.5.10:=
- >=dev-libs/glib-2.56:2=
- >=dev-libs/libxml2-2.4:=
- dev-libs/json-glib:=
- dev-libs/libassuan:=
- >=dev-util/ostree-2020.8:=[gpg(+)]
- || (
- dev-util/ostree[curl]
- dev-util/ostree[soup]
- )
- >=gnome-base/dconf-0.26:=
- gnome-base/gsettings-desktop-schemas
- >=net-libs/libsoup-2.4:2.4=
- >=sys-apps/bubblewrap-0.5.0
- sys-apps/dbus
- >=sys-fs/fuse-2.9.9:0=
- sys-apps/xdg-dbus-proxy
- X? (
- x11-apps/xauth
- x11-libs/libXau:=
- )
- x11-libs/gdk-pixbuf:2=
- policykit? ( >=sys-auth/polkit-0.98:= )
- seccomp? ( sys-libs/libseccomp:= )
- systemd? ( sys-apps/systemd:= )
-"
-
-DEPEND="${RDEPEND}"
-# pyparsing version pinned for https://bugs.gentoo.org/825230
-BDEPEND="
- >=dev-build/automake-1.13.4
- >=sys-devel/gettext-0.18.2
- virtual/pkgconfig
- dev-util/gdbus-codegen
- app-alternatives/yacc
- introspection? ( >=dev-libs/gobject-introspection-1.40 )
- doc? (
- >=dev-util/gtk-doc-1.20
- dev-libs/libxslt
- )
- $(python_gen_any_dep 'dev-python/p
[gentoo-commits] repo/gentoo:master commit in: sys-apps/flatpak/
commit: 02e60f1e0e7de329fa363eb616b2824ed80abd99
Author: Zac Medico gentoo org>
AuthorDate: Tue May 28 00:28:37 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Tue May 28 00:30:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02e60f1e
sys-apps/flatpak: add 1.14.8
Signed-off-by: Zac Medico gentoo.org>
sys-apps/flatpak/Manifest | 1 +
sys-apps/flatpak/flatpak-1.14.8.ebuild | 121 +
2 files changed, 122 insertions(+)
diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
index dc467e2313ab..55263cd566bc 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -3,3 +3,4 @@ DIST flatpak-1.12.9.tar.xz 1572536 BLAKE2B
bd9b116bf0e51e60d1e0c420c4c4553a0ebc5
DIST flatpak-1.14.4.tar.xz 1637484 BLAKE2B
cf208c581ad76d46489ba473d290c35907da0d1d473bf2b4792fb56c31e7110cd38f1c6fc4ad04aa3675868d17116ba52a84b028d7b7789c1736cfe26f3cabfe
SHA512
3f97096affd4f1de184ded353f1ab403d9f1813b199b9a1595596cc7c5d6b46062aa2ef184255823f50ae95ca60d0542d9b9e520f9a605f9bc51091863bf89b0
DIST flatpak-1.14.5.tar.xz 1637692 BLAKE2B
180dc094ef3feef1ccefceb562836f55f6e875016588a5984435ea3157498a8746305c16aa2c83044c107fd7f0e8f6c034c326b4ae29ade1c657e82cff353d47
SHA512
552deaaf3e6712a56f33698c20e6b8225c8893fe9a375af897fd99e19c487bf79b19c3e4ce3b00f3caf90020019ff67c628ca6a8f2ae1e6e01db397d2081ab2b
DIST flatpak-1.14.6.tar.xz 1644056 BLAKE2B
68bc8bdaf1d1c8a6046a06f800d41c1603e691e60a90f070c694501d50ee6fba3ad1978e222d22a9f99e2b85de9154e670149227b0f2ea6543483c2d103b5093
SHA512
d858682dbf539afe1b91087b6a0e0ebeea6658a0ef02c96d68259f3d8c58d1e6d02dd8b69db1b3c55f6d5df0f4d7e41c6165f668f09763dd3f9c3beb48f8bcf5
+DIST flatpak-1.14.8.tar.xz 1698728 BLAKE2B
aecfe77371ec2479ab12f46035213d6cfb672fe9fb1882a3225ae3ee8d3bd23e96848061bc1c778265f3ff4daf369eb19e584f36f804107543b0287f774997f1
SHA512
a34d539f4ed0682459a22afa282de36da964a3545abd78138d3d86d9464d67cb57479f93bf84d1a9d811b80e72e0ea11f64293cb09a559fd5ec2c957be1729a1
diff --git a/sys-apps/flatpak/flatpak-1.14.8.ebuild
b/sys-apps/flatpak/flatpak-1.14.8.ebuild
new file mode 100644
index ..71f8492997bb
--- /dev/null
+++ b/sys-apps/flatpak/flatpak-1.14.8.ebuild
@@ -0,0 +1,121 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit linux-info python-any-r1 systemd tmpfiles
+
+DESCRIPTION="Linux application sandboxing and distribution framework"
+HOMEPAGE="https://flatpak.org/;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz;
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="doc introspection policykit seccomp systemd X"
+RESTRICT="test"
+
+RDEPEND="
+ acct-group/flatpak
+ acct-user/flatpak
+ >=app-arch/libarchive-2.8:=
+ app-arch/zstd:=
+ >=app-crypt/gpgme-1.1.8:=
+ >=dev-libs/appstream-0.12:=
+ >=dev-libs/appstream-glib-0.5.10:=
+ >=dev-libs/glib-2.56:2=
+ >=dev-libs/libxml2-2.4:=
+ dev-libs/json-glib:=
+ dev-libs/libassuan:=
+ >=dev-util/ostree-2020.8:=[gpg(+)]
+ dev-util/ostree[curl]
+ >=gnome-base/dconf-0.26:=
+ gnome-base/gsettings-desktop-schemas
+ net-misc/curl:=
+ >=sys-apps/bubblewrap-0.5.0
+ sys-apps/dbus
+ >=sys-fs/fuse-3.1.1:3=
+ sys-apps/xdg-dbus-proxy
+ X? (
+ x11-apps/xauth
+ x11-libs/libXau:=
+ )
+ x11-libs/gdk-pixbuf:2=
+ policykit? ( >=sys-auth/polkit-0.98:= )
+ seccomp? ( sys-libs/libseccomp:= )
+ systemd? ( sys-apps/systemd:= )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+ >=dev-build/automake-1.13.4
+ >=sys-devel/gettext-0.18.2
+ virtual/pkgconfig
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ app-alternatives/yacc
+ $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
+ introspection? ( >=dev-libs/gobject-introspection-1.40 )
+ doc? (
+ app-text/xmlto
+ dev-libs/libxslt
+ )
+"
+
+PDEPEND="sys-apps/xdg-desktop-portal"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.14.4-fuse-3-slotted.patch
+)
+
+python_check_deps() {
+ python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ local CONFIG_CHECK="~USER_NS"
+ linux-info_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ # This line fails because locales are in /usr/lib/locale/locale-archive.
+ sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh
|| die
+}
+
+src_configure() {
+ local myeconfargs=(
+ --enable-sandboxed-trig
[gentoo-commits] repo/gentoo:master commit in: app-containers/snapd/
commit: b704b44eb578e31ec4bd0f62af3c2e8e4902bdd2
Author: Zac Medico gentoo org>
AuthorDate: Mon May 27 23:28:12 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon May 27 23:28:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b704b44e
app-containers/snapd: add 2.63
Signed-off-by: Zac Medico gentoo.org>
app-containers/snapd/Manifest | 1 +
app-containers/snapd/snapd-2.63.ebuild | 179 +
2 files changed, 180 insertions(+)
diff --git a/app-containers/snapd/Manifest b/app-containers/snapd/Manifest
index 3390efacef34..89d58b906a8b 100644
--- a/app-containers/snapd/Manifest
+++ b/app-containers/snapd/Manifest
@@ -1,2 +1,3 @@
DIST snapd-2.58.tar.xz 6980916 BLAKE2B
d3de507513db808fa4f85498b5c238de143f06660f1d677186c8c763b38643a2486e25b747977b3eb584619d79ea0a12e88dc5a909045a853c1d8f849f2c1638
SHA512
555915b8b4d9d2d91a3ba19e9e78cf6b19d9683a9f390ad225aa5876320cb8595b464d6133706c4923fc15fbe04ba2b65a47e403c9a2d8859adae827f8ec000a
DIST snapd-2.61.tar.xz 7626784 BLAKE2B
d716e91df4702fbd415bb6204a4557f37afd3dce187e3bca33b12a2ac5a1b54d1c31473d1537a784f6cbbfaf213f676d1f1b29d716e8c5f45a785229c9f3e018
SHA512
2fd432d7ef2204535576e980de7060ad15a0b3610b25e0f41b630ae34e172f97460f0a38d9d456af08dd36c619e90119219788a49e56a69afc7fbf014fc1db22
+DIST snapd-2.63.tar.xz 7502152 BLAKE2B
8ae38699227b7f0e6b512526fc8857b3e50ed220ac95860c372ca0a4b26f5a034bd9309688217696444254e41cc70fe3a45c0bf026c84e5f950e7df8aebd47a0
SHA512
956ee142ab6cb5de522307f7844819c861b2831e22dab56f7bfca16ff7f947093f8a8727d49370cc000ed71f3af9c57cff9c4be93ebf199e8c631a152a68ec5b
diff --git a/app-containers/snapd/snapd-2.63.ebuild
b/app-containers/snapd/snapd-2.63.ebuild
new file mode 100644
index ..56a00504636a
--- /dev/null
+++ b/app-containers/snapd/snapd-2.63.ebuild
@@ -0,0 +1,179 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1 flag-o-matic go-module linux-info
readme.gentoo-r1 systemd tmpfiles xdg-utils
+
+DESCRIPTION="Service and tools for management of snap packages"
+HOMEPAGE="http://snapcraft.io/;
+
+SRC_URI="https://github.com/snapcore/snapd/releases/download/${PV}/snapd_${PV}.vendor.tar.xz
-> ${P}.tar.xz"
+MY_PV=${PV}
+KEYWORDS="~amd64"
+
+LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
+SLOT="0"
+IUSE="apparmor +forced-devmode gtk kde systemd"
+REQUIRED_USE="!forced-devmode? ( apparmor ) systemd"
+
+CONFIG_CHECK="~CGROUPS
+ ~CGROUP_DEVICE
+ ~CGROUP_FREEZER
+ ~NAMESPACES
+ ~SQUASHFS
+ ~SQUASHFS_ZLIB
+ ~SQUASHFS_LZO
+ ~SQUASHFS_XZ
+ ~BLK_DEV_LOOP
+ ~SECCOMP
+ ~SECCOMP_FILTER"
+
+RDEPEND="
+ sys-libs/libseccomp:=
+ apparmor? (
+ sec-policy/apparmor-profiles
+ sys-apps/apparmor:=
+ )
+ dev-libs/glib
+ virtual/libudev
+ systemd? ( sys-apps/systemd )
+ sys-libs/libcap:=
+ sys-fs/squashfs-tools[lzma,lzo]"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ >=dev-lang/go-1.9
+ dev-python/docutils
+ sys-devel/gettext
+ sys-fs/xfsprogs"
+
+PDEPEND="sys-auth/polkit[gtk?,kde?]"
+
+README_GENTOO_SUFFIX=""
+
+pkg_setup() {
+ if use apparmor; then
+ CONFIG_CHECK+=" ~SECURITY_APPARMOR"
+ fi
+ linux-info_pkg_setup
+
+ # Seems to have issues building with -O3, switch to -O2
+ replace-flags -O3 -O2
+}
+
+src_prepare() {
+ default
+ # Update apparmor profile to allow libtinfow.so*
+ sed -i 's/libtinfo/libtinfo{,w}/' \
+ "cmd/snap-confine/snap-confine.apparmor.in" || die
+
+ if ! use forced-devmode; then
+ sed -e 's#return !apparmorFull#if !apparmorFull
{\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
+ -i "sandbox/forcedevmode.go" || die
+ grep -q 'panic("USE=forced-devmode is disabled")'
"sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
+ fi
+
+ sed -i 's:command -v git >/dev/null:false:' -i "mkversion.sh" || die
+
+ ./mkversion.sh "${PV}"
+ pushd "cmd" >/dev/null || die
+ eautoreconf
+}
+
+src_configure() {
+ SNAPD_MAKEARGS=(
+ "BINDIR=${EPREFIX}/usr/bin"
+ "DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
+ "LIBEXECDIR=${EPREFIX}/usr/lib"
+ "SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
+ "SYSTEMDSYSTEMUNITDIR=$(systemd_g
[gentoo-commits] repo/gentoo:master commit in: app-containers/snapd/
commit: c0b9dd8245ccdf2c7566167833e9f26dc354cef1
Author: Zac Medico gentoo org>
AuthorDate: Mon May 27 23:11:53 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon May 27 23:12:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0b9dd82
app-containers/snapd: drop 2.57.6, 2.60.3, 2.60.4
Signed-off-by: Zac Medico gentoo.org>
app-containers/snapd/Manifest| 3 -
app-containers/snapd/snapd-2.57.6.ebuild | 178 --
app-containers/snapd/snapd-2.60.3.ebuild | 179 ---
app-containers/snapd/snapd-2.60.4.ebuild | 179 ---
4 files changed, 539 deletions(-)
diff --git a/app-containers/snapd/Manifest b/app-containers/snapd/Manifest
index e8b84e38cac9..3390efacef34 100644
--- a/app-containers/snapd/Manifest
+++ b/app-containers/snapd/Manifest
@@ -1,5 +1,2 @@
-DIST snapd-2.57.6.tar.xz 6889052 BLAKE2B
5d1190f3d1ccc6446f950cc95c09180707c3a96285bcdd197aef06b2d69cfef6daf85a93844f105dd434b29b73d3b9c832dfcbebcdc2451443eb5421046de849
SHA512
cd74fa92cddff3452448a50536ded504c68ca6f786b465b8561ccc43c02856742a895efb71bf92b8d125173e0d083faf61ca563f69da03ebf3c4df1b0b0b8d5e
DIST snapd-2.58.tar.xz 6980916 BLAKE2B
d3de507513db808fa4f85498b5c238de143f06660f1d677186c8c763b38643a2486e25b747977b3eb584619d79ea0a12e88dc5a909045a853c1d8f849f2c1638
SHA512
555915b8b4d9d2d91a3ba19e9e78cf6b19d9683a9f390ad225aa5876320cb8595b464d6133706c4923fc15fbe04ba2b65a47e403c9a2d8859adae827f8ec000a
-DIST snapd-2.60.3.tar.xz 7184964 BLAKE2B
c40c4e041a91de1732c23b5845a322873498da76d50e0c91e97941d1fc4f6f1991fe2b009414952bf0ebb614e8e19a0015c698ff09c61a12940349ea714f77f0
SHA512
630738c956773354006c195bfe954902b0d082e94345b54c6a6795139d36e1f95a236c6e9a8947338e03caca03520c6e8c1a1c44d3788ec93107f7f97b2d952d
-DIST snapd-2.60.4.tar.xz 7187708 BLAKE2B
488ca5b70e9174f07ac54cbc221a323607e337dbde45e7c4d11669ed2f61409fa7bb21b4a5432cd84fb312d92cacf19e5bccc80ef77b71233e19e158d937ac04
SHA512
3035e4e5d52fef00606bc532f855817200d9f6035f660b0377d5dccf5bb64bbf0a94a4e3b8f3941e54b62259378dae4084baa2a29fb5120c714559c899c33c0e
DIST snapd-2.61.tar.xz 7626784 BLAKE2B
d716e91df4702fbd415bb6204a4557f37afd3dce187e3bca33b12a2ac5a1b54d1c31473d1537a784f6cbbfaf213f676d1f1b29d716e8c5f45a785229c9f3e018
SHA512
2fd432d7ef2204535576e980de7060ad15a0b3610b25e0f41b630ae34e172f97460f0a38d9d456af08dd36c619e90119219788a49e56a69afc7fbf014fc1db22
diff --git a/app-containers/snapd/snapd-2.57.6.ebuild
b/app-containers/snapd/snapd-2.57.6.ebuild
deleted file mode 100644
index 35255adff108..
--- a/app-containers/snapd/snapd-2.57.6.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 flag-o-matic go-module linux-info
readme.gentoo-r1 systemd xdg-utils
-
-DESCRIPTION="Service and tools for management of snap packages"
-HOMEPAGE="http://snapcraft.io/;
-
-SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz
-> ${P}.tar.xz"
-MY_PV=${PV}
-KEYWORDS="~amd64"
-
-LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
-SLOT="0"
-IUSE="apparmor +forced-devmode gtk kde systemd"
-REQUIRED_USE="!forced-devmode? ( apparmor ) systemd"
-
-CONFIG_CHECK="~CGROUPS
- ~CGROUP_DEVICE
- ~CGROUP_FREEZER
- ~NAMESPACES
- ~SQUASHFS
- ~SQUASHFS_ZLIB
- ~SQUASHFS_LZO
- ~SQUASHFS_XZ
- ~BLK_DEV_LOOP
- ~SECCOMP
- ~SECCOMP_FILTER"
-
-RDEPEND="
- sys-libs/libseccomp:=
- apparmor? (
- sec-policy/apparmor-profiles
- sys-apps/apparmor:=
- )
- dev-libs/glib
- virtual/libudev
- systemd? ( sys-apps/systemd )
- sys-libs/libcap:=
- sys-fs/squashfs-tools[lzma]"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- >=dev-lang/go-1.9
- dev-python/docutils
- sys-devel/gettext
- sys-fs/xfsprogs"
-
-PDEPEND="sys-auth/polkit[gtk?,kde?]"
-
-README_GENTOO_SUFFIX=""
-
-pkg_setup() {
- if use apparmor; then
- CONFIG_CHECK+=" ~SECURITY_APPARMOR"
- fi
- linux-info_pkg_setup
-
- # Seems to have issues building with -O3, switch to -O2
- replace-flags -O3 -O2
-}
-
-src_prepare() {
- default
- # Update apparmor profile to allow libtinfow.so*
- sed -i 's/libtinfo/libtinfo{,w}/' \
- "cmd/snap-confine/snap-confine.apparmor.in" || die
-
- if ! use forced-devmode; then
- sed -e 's#return !apparmorFull#if !apparmorFull
{\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
-
[gentoo-commits] proj/portage:master commit in: lib/portage/util/
commit: de19f3a7215d64d22dcc0f779314de1f1199963f Author: Zac Medico gentoo org> AuthorDate: Mon May 27 18:47:30 2024 + Commit: Zac Medico gentoo org> CommitDate: Mon May 27 20:01:49 2024 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=de19f3a7 atomic_ofstream: Use mkstemp rather than getpid (pid namespace safety) Bug: https://bugs.gentoo.org/851015 Signed-off-by: Zac Medico gentoo.org> lib/portage/util/__init__.py | 47 ++-- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/lib/portage/util/__init__.py b/lib/portage/util/__init__.py index 0c88068dda..f338f274aa 100644 --- a/lib/portage/util/__init__.py +++ b/lib/portage/util/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2004-2023 Gentoo Authors +# Copyright 2004-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 from portage.cache.mappings import UserDict @@ -70,6 +70,7 @@ import shlex import stat import string import sys +import tempfile import traceback import glob from typing import Optional, TextIO @@ -1446,21 +1447,22 @@ class atomic_ofstream(AbstractContextManager, ObjectProxy): if follow_links: canonical_path = os.path.realpath(filename) object.__setattr__(self, "_real_name", canonical_path) -tmp_name = "%s.%i" % (canonical_path, portage.getpid()) +parent, basename = os.path.split(canonical_path) +fd, tmp_name = tempfile.mkstemp(prefix=basename, dir=parent) +object.__setattr__(self, "_tmp_name", tmp_name) try: object.__setattr__( self, "_file", open_func( -_unicode_encode( -tmp_name, encoding=_encodings["fs"], errors="strict" -), +fd, mode=mode, **kargs, ), ) return -except OSError as e: +except OSError: +os.close(fd) if canonical_path == filename: raise # Ignore this error, since it's irrelevant @@ -1468,16 +1470,22 @@ class atomic_ofstream(AbstractContextManager, ObjectProxy): # new error if necessary. object.__setattr__(self, "_real_name", filename) -tmp_name = "%s.%i" % (filename, portage.getpid()) -object.__setattr__( -self, -"_file", -open_func( -_unicode_encode(tmp_name, encoding=_encodings["fs"], errors="strict"), -mode=mode, -**kargs, -), -) +parent, basename = os.path.split(filename) +fd, tmp_name = tempfile.mkstemp(prefix=basename, dir=parent) +object.__setattr__(self, "_tmp_name", tmp_name) +try: +object.__setattr__( +self, +"_file", +open_func( +fd, +mode=mode, +**kargs, +), +) +except OSError: +os.close(fd) +raise def __exit__(self, exc_type, exc_val, exc_tb): if exc_type is not None: @@ -1498,13 +1506,14 @@ class atomic_ofstream(AbstractContextManager, ObjectProxy): and performs the atomic replacement via os.rename(). If the abort() method has been called, then the temp file is closed and removed.""" f = object.__getattribute__(self, "_file") +tmp_name = object.__getattribute__(self, "_tmp_name") real_name = object.__getattribute__(self, "_real_name") if not f.closed: try: f.close() if not object.__getattribute__(self, "_aborted"): try: -apply_stat_permissions(f.name, os.stat(real_name)) +apply_stat_permissions(tmp_name, os.stat(real_name)) except OperationNotPermitted: pass except FileNotFound: @@ -1514,12 +1523,12 @@ class atomic_ofstream(AbstractContextManager, ObjectProxy): pass else: raise -os.rename(f.name, real_name) +os.rename(tmp_name, real_name) finally: # Make sure we cleanup the temp file # even if an exception is raised. try: -os.unlink(f.name) +os.unlink(tmp_name) except OSError as oe: pass
[gentoo-commits] proj/portage:master commit in: lib/portage/dbapi/
commit: 2db89a16ab87b85004216959ec6bc508575d96a0
Author: Zac Medico gentoo org>
AuthorDate: Mon May 27 18:03:32 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon May 27 18:04:41 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=2db89a16
binarytree: Rewrite remote index only on change
I noticed that the remote index was rewritten with a
new DOWNLOAD_TIMESTAMP even while frozen, and this
patch fixed it.
Signed-off-by: Zac Medico gentoo.org>
lib/portage/dbapi/bintree.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/portage/dbapi/bintree.py b/lib/portage/dbapi/bintree.py
index 64dfee4faa..b32dea1eae 100644
--- a/lib/portage/dbapi/bintree.py
+++ b/lib/portage/dbapi/bintree.py
@@ -1400,6 +1400,7 @@ class binarytree:
except OSError as e:
if e.errno != errno.ENOENT:
raise
+changed = True
local_timestamp = pkgindex.header.get("TIMESTAMP", None)
try:
download_timestamp =
float(pkgindex.header.get("DOWNLOAD_TIMESTAMP", 0))
@@ -1574,6 +1575,7 @@ class binarytree:
noiselevel=-1,
)
except UseCachedCopyOfRemoteIndex:
+changed = False
desc = "frozen" if repo.frozen else "up-to-date"
writemsg_stdout("\n")
writemsg_stdout(
@@ -1611,7 +1613,7 @@ class binarytree:
os.unlink(tmp_filename)
except OSError:
pass
-if pkgindex is rmt_idx:
+if pkgindex is rmt_idx and changed:
pkgindex.modified = False # don't update the header
pkgindex.header["DOWNLOAD_TIMESTAMP"] = "%d" % time.time()
try:
[gentoo-commits] repo/gentoo:master commit in: app-text/yamlfmt/
commit: b2e0a4f533f0a860d9c0db7be6b44cc29f3dc2c8
Author: Zac Medico gentoo org>
AuthorDate: Mon May 27 01:55:34 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon May 27 02:06:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2e0a4f5
app-text/yamlfmt: new package, add 0.12.1
Signed-off-by: Zac Medico gentoo.org>
app-text/yamlfmt/Manifest | 2 ++
app-text/yamlfmt/metadata.xml | 11 +++
app-text/yamlfmt/yamlfmt-0.12.1.ebuild | 29 +
3 files changed, 42 insertions(+)
diff --git a/app-text/yamlfmt/Manifest b/app-text/yamlfmt/Manifest
new file mode 100644
index ..da258b9b1422
--- /dev/null
+++ b/app-text/yamlfmt/Manifest
@@ -0,0 +1,2 @@
+DIST yamlfmt-0.12.1-deps.tar.xz 128404 BLAKE2B
aa976bf73fb0a8094afc0ae480881aaff58c6263a57587ea6ceb22ce67776c424a7ed5d5fae6c38293f1ec5f3821de99e4bfd74f7951b826b2bb211914944c94
SHA512
11c9c45535ace449c3784a55707699923dcc2809db4f86a8fdb72b8b99443a92498b1c329cca40771d63414a6571bd4c590df4a304d798bb4c3709fd0edf0ef4
+DIST yamlfmt-0.12.1.tar.gz 40958 BLAKE2B
3a1187c2a21716a16e6c86ab145eed424bb3eb65ab8b0525c1ad221c27d8be3221f668f0393dcdc117bd4d34c9283bcc30e72ccddf99f61e44050c61e88b3026
SHA512
ac39234977d11751802a3a8c2e2140c16e408f987d29aa4ac8e7dd329067c1cef686b0950fa4e4478aeeb214506e7d3fe498734e584abcbc4f3aa48f9f1c7504
diff --git a/app-text/yamlfmt/metadata.xml b/app-text/yamlfmt/metadata.xml
new file mode 100644
index ..d69deed03841
--- /dev/null
+++ b/app-text/yamlfmt/metadata.xml
@@ -0,0 +1,11 @@
+
+https://www.gentoo.org/dtd/metadata.dtd;>
+
+
+ zmed...@gentoo.org
+ Zac Medico
+
+
+ google/yamlfmt
+
+
diff --git a/app-text/yamlfmt/yamlfmt-0.12.1.ebuild
b/app-text/yamlfmt/yamlfmt-0.12.1.ebuild
new file mode 100644
index ..5f85ed96ccb4
--- /dev/null
+++ b/app-text/yamlfmt/yamlfmt-0.12.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="An extensible command line tool or library to format yaml files"
+HOMEPAGE="https://github.com/google/yamlfmt;
+SRC_URI="https://github.com/google/yamlfmt/archive/refs/tags/v${PV}.tar.gz ->
${P}.tar.gz
+ https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz;
+
+LICENSE="Apache-2.0"
+LICENSE+=" BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+ CGO_ENABLED=0 ego build -ldflags "-X main.version=${PV} -s -w" \
+ -o yamlfmt ./cmd/yamlfmt
+}
+
+src_install() {
+ dodoc -r README.md docs
+ dobin yamlfmt
+}
+
+src_test() {
+ emake test
+}
[gentoo-commits] repo/gentoo:master commit in: app-misc/yq/, app-misc/yq/files/
commit: 8a57422ed97d654ac4f3c072556d24ec219a073f
Author: Zac Medico gentoo org>
AuthorDate: Mon May 27 01:27:24 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon May 27 01:28:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a57422e
app-misc/yq: drop 3.2.2, 3.2.3
Signed-off-by: Zac Medico gentoo.org>
app-misc/yq/Manifest| 2 --
app-misc/yq/files/yq-2.13.0-tests.patch | 13
app-misc/yq/yq-3.2.2.ebuild | 56 -
app-misc/yq/yq-3.2.3.ebuild | 56 -
4 files changed, 127 deletions(-)
diff --git a/app-misc/yq/Manifest b/app-misc/yq/Manifest
index ec8f3754e3ca..54123de89b6a 100644
--- a/app-misc/yq/Manifest
+++ b/app-misc/yq/Manifest
@@ -1,4 +1,2 @@
-DIST yq-3.2.2.tar.gz 30872 BLAKE2B
4386a7972b411159ed909ccdc7c32a878d064ac5101cbddb16b0f1efe37c3791aeefda3b7c18c94e7d79fb01a4a4b43f7fbcc7c55bd275c52e08cc069523c8d3
SHA512
4472006d6997f7d620f71ade53d31e6db4051414c147db4f14cb31e0a16a0d0faf9e5c5a682cec098146bfd4e29f9e62278e4f208487e9e194d317ee82823e60
-DIST yq-3.2.3.tar.gz 31952 BLAKE2B
b0c4548efa08aecc98b77b5988e5dbf652951ecfab3ab01bfbf9610151cee3c3a0b9c3139434cba3bfc08a2176a617a2c9d19c0fcf47bb8a6d3cc3886fa5de6d
SHA512
8b60907536b5f3ae7c18dc157ed8ccf4632f2734803711a18b7fbd6e6efff24ddc9c2221fb926ca99bf538c3bba14517529e6edb37bc487fb69441ad7928
DIST yq-3.4.1.tar.gz 32876 BLAKE2B
628fbb62de0c2f138133444c2f371819f920ac3d7c89787b96cb2de59eaa49f1324227d53f6d33e29dd9a9a804283339b34d87851c6f32a16a1cc94a7451a726
SHA512
d11290d44eefeae23a8e5fe3f536f714ee532a5aa1636c949a9db3e89bdf5ad5480ba5f8d6e809fa06a245de5e671844233ed64eb609e49fa3de8813ab9556cc
DIST yq-3.4.3.tar.gz 33214 BLAKE2B
a1b3d813d9761ac8a8429db3fe8efac64ade69e0d2fa9b137a1ca8c9e367a0f16b636482b6d9381e2de43392007f37388b6ab37def04739723488f271fd56d16
SHA512
db4ec57aafa1d08786ba11897040506c9f13d800cf06f76cea052d2bba88553db53627cdfcfdbbfbdec81324800114d397890759383fb4db31609727a10474eb
diff --git a/app-misc/yq/files/yq-2.13.0-tests.patch
b/app-misc/yq/files/yq-2.13.0-tests.patch
deleted file mode 100644
index 83e77ed97f8e..
--- a/app-misc/yq/files/yq-2.13.0-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/test/test.py b/test/test.py
-index 6ec5e78..558187b 100755
a/test/test.py
-+++ b/test/test.py
-@@ -121,7 +121,7 @@ class TestYq(unittest.TestCase):
- self.assertEqual(self.run_yq("{}", ["--indentless", "-y",
".a=$ARGS.positional", "--args", "a", "b"]),
- "a:\n- a\n- b\n")
- self.assertEqual(self.run_yq("{}", ["-y", ".a=$ARGS.positional",
"--args", "a", "b"]), "a:\n - a\n - b\n")
--self.assertEqual(self.run_yq("{}", [".", "--jsonargs", "a", "b"]), "")
-+#self.assertEqual(self.run_yq("{}", [".", "--jsonargs", "a", "b"]),
"")
-
- def test_short_option_separation(self):
- # self.assertEqual(self.run_yq('{"a": 1}', ["-yCcC", "."]), "a: 1\n")
- Fails on 2.7 and 3.8
diff --git a/app-misc/yq/yq-3.2.2.ebuild b/app-misc/yq/yq-3.2.2.ebuild
deleted file mode 100644
index 98fbab95f2e3..
--- a/app-misc/yq/yq-3.2.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit pypi distutils-r1
-
-DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
-HOMEPAGE="
- https://yq.readthedocs.io/
- https://github.com/kislyuk/yq/
- https://pypi.org/project/yq/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- app-misc/jq
- dev-python/argcomplete[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
- dev-python/xmltodict[${PYTHON_USEDEP}]
- >=dev-python/tomlkit-0.11.6[${PYTHON_USEDEP}]
-"
-DEPEND="
- ${RDEPEND}
- test? (
- dev-python/wheel[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}/yq-2.13.0-tests.patch"
-)
-
-python_prepare_all() {
- sed -e 's:unittest.main():unittest.main(verbosity=2):' \
- -i test/test.py || die
-
- sed -r -e 's:[[:space:]]*"coverage",:: ; s:[[:space:]]*"flake8",::' \
- -i setup.py || die
-
- sed -e '/license_file/ d' -i setup.cfg || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- "
[gentoo-commits] repo/gentoo:master commit in: app-misc/yq/
commit: 9ff0500ed4acebfd185d570d48fe3a0bc79a2490
Author: Zac Medico gentoo org>
AuthorDate: Mon May 27 01:13:29 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon May 27 01:28:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ff0500e
app-misc/yq: add 3.4.3
Also rename the yq command to yq-python and add a yk-symlink
USE flag enabled by default (app-misc/yk-go has a similar
yk-symlink USE flag which both packages cannot enable
simultaneously).
Signed-off-by: Zac Medico gentoo.org>
app-misc/yq/Manifest| 1 +
app-misc/yq/metadata.xml| 5 +++
app-misc/yq/yq-3.4.3.ebuild | 74 +
3 files changed, 80 insertions(+)
diff --git a/app-misc/yq/Manifest b/app-misc/yq/Manifest
index b03c821e4f0c..ec8f3754e3ca 100644
--- a/app-misc/yq/Manifest
+++ b/app-misc/yq/Manifest
@@ -1,3 +1,4 @@
DIST yq-3.2.2.tar.gz 30872 BLAKE2B
4386a7972b411159ed909ccdc7c32a878d064ac5101cbddb16b0f1efe37c3791aeefda3b7c18c94e7d79fb01a4a4b43f7fbcc7c55bd275c52e08cc069523c8d3
SHA512
4472006d6997f7d620f71ade53d31e6db4051414c147db4f14cb31e0a16a0d0faf9e5c5a682cec098146bfd4e29f9e62278e4f208487e9e194d317ee82823e60
DIST yq-3.2.3.tar.gz 31952 BLAKE2B
b0c4548efa08aecc98b77b5988e5dbf652951ecfab3ab01bfbf9610151cee3c3a0b9c3139434cba3bfc08a2176a617a2c9d19c0fcf47bb8a6d3cc3886fa5de6d
SHA512
8b60907536b5f3ae7c18dc157ed8ccf4632f2734803711a18b7fbd6e6efff24ddc9c2221fb926ca99bf538c3bba14517529e6edb37bc487fb69441ad7928
DIST yq-3.4.1.tar.gz 32876 BLAKE2B
628fbb62de0c2f138133444c2f371819f920ac3d7c89787b96cb2de59eaa49f1324227d53f6d33e29dd9a9a804283339b34d87851c6f32a16a1cc94a7451a726
SHA512
d11290d44eefeae23a8e5fe3f536f714ee532a5aa1636c949a9db3e89bdf5ad5480ba5f8d6e809fa06a245de5e671844233ed64eb609e49fa3de8813ab9556cc
+DIST yq-3.4.3.tar.gz 33214 BLAKE2B
a1b3d813d9761ac8a8429db3fe8efac64ade69e0d2fa9b137a1ca8c9e367a0f16b636482b6d9381e2de43392007f37388b6ab37def04739723488f271fd56d16
SHA512
db4ec57aafa1d08786ba11897040506c9f13d800cf06f76cea052d2bba88553db53627cdfcfdbbfbdec81324800114d397890759383fb4db31609727a10474eb
diff --git a/app-misc/yq/metadata.xml b/app-misc/yq/metadata.xml
index 668d57252e5d..e1ba38d97faf 100644
--- a/app-misc/yq/metadata.xml
+++ b/app-misc/yq/metadata.xml
@@ -12,4 +12,9 @@
chutz...@gentoo.org
Patrick McLean
+
+
+ Create a yq symlink to yq-python.
+
+
diff --git a/app-misc/yq/yq-3.4.3.ebuild b/app-misc/yq/yq-3.4.3.ebuild
new file mode 100644
index ..47a37a5e577e
--- /dev/null
+++ b/app-misc/yq/yq-3.4.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..13} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit pypi distutils-r1
+
+DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
+HOMEPAGE="
+ https://yq.readthedocs.io/
+ https://github.com/kislyuk/yq/
+ https://pypi.org/project/yq/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test +yq-symlink"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ app-misc/jq
+ dev-python/argcomplete[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+ dev-python/xmltodict[${PYTHON_USEDEP}]
+ >=dev-python/tomlkit-0.11.6[${PYTHON_USEDEP}]
+ yq-symlink? ( !app-misc/yq-go[yq-symlink] )
+"
+DEPEND="
+ ${RDEPEND}
+ test? (
+ dev-python/wheel[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/yq-3.1.2-test.patch"
+)
+
+python_prepare_all() {
+ cat <<-\EOF > "${T}"/yq-python.patch
+ --- setup.py
+ +++ setup.py
+ @@ -37 +37 @@
+ -"console_scripts": ["yq=yq:cli", "xq=yq:xq_cli",
"tomlq=yq:tq_cli"],
+ +"console_scripts": ["yq-python=yq:cli", "xq=yq:xq_cli",
"tomlq=yq:tq_cli"],
+ EOF
+
+ eapply -p0 "${T}"/yq-python.patch
+
+ sed -e 's:unittest.main():unittest.main(verbosity=2):' \
+ -i test/test.py || die
+
+ sed -r -e 's:[[:space:]]*"coverage",:: ; s:[[:space:]]*"flake8",::' \
+ -i setup.py || die
+
+ sed -e '/license_file/ d' -i setup.cfg || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ "${EPYTHON}" test/test.py
[gentoo-commits] repo/gentoo:master commit in: app-misc/yq-go/
commit: ffa5fffa8e658a043315e1c904ba979b13fc5873
Author: Zac Medico gentoo org>
AuthorDate: Mon May 27 00:28:04 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon May 27 01:28:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffa5fffa
app-misc/yq-go: new package, add 4.44.1
Signed-off-by: Zac Medico gentoo.org>
app-misc/yq-go/Manifest| 2 ++
app-misc/yq-go/metadata.xml| 16
app-misc/yq-go/yq-go-4.44.1.ebuild | 35 +++
3 files changed, 53 insertions(+)
diff --git a/app-misc/yq-go/Manifest b/app-misc/yq-go/Manifest
new file mode 100644
index ..7fbb473a96de
--- /dev/null
+++ b/app-misc/yq-go/Manifest
@@ -0,0 +1,2 @@
+DIST yq-4.44.1-deps.tar.xz 1359068 BLAKE2B
5db0af65b75dab0148e6167d9264e7601e3f07f26d16d63387820c96d9ac28d91a57c81b300d4dd225f0a4941ce43dde4c5e27391ea9603f6862a9cf8c6564f5
SHA512
1670aa675e1776d2ed761c482e29920e1d200bd612e68dd22b62c6d93c8c188ef88ca35262d1f21423924d1337260991e815e332f6af312ea474c5f61226bbff
+DIST yq-4.44.1.tar.gz 296499 BLAKE2B
6cbcc69acead2ae471e91baccc3fcc3853bba0ade0e707307c9fb724bafc1c51905a9cefb86d7d09b056b01b2c404bc30692f47e293df0894ad3b32ad67c22dd
SHA512
afcec4e6f99f38a342a91aff34823823e32df0498c8e617314945a00d2161d28bfcc603dcaac2eb95d510bc57fe63ca2aebf1966b7420536be42f8102564314f
diff --git a/app-misc/yq-go/metadata.xml b/app-misc/yq-go/metadata.xml
new file mode 100644
index ..efec5a80fe09
--- /dev/null
+++ b/app-misc/yq-go/metadata.xml
@@ -0,0 +1,16 @@
+
+https://www.gentoo.org/dtd/metadata.dtd;>
+
+
+ zmed...@gentoo.org
+ Zac Medico
+
+
+ mikefarah/yq
+
+
+
+ Create a yq symlink to yq-go.
+
+
+
diff --git a/app-misc/yq-go/yq-go-4.44.1.ebuild
b/app-misc/yq-go/yq-go-4.44.1.ebuild
new file mode 100644
index ..e5ffdf984aaa
--- /dev/null
+++ b/app-misc/yq-go/yq-go-4.44.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="yq is a lightweight and portable command-line YAML, JSON and XML
processor"
+HOMEPAGE="https://github.com/mikefarah/yq;
+SRC_URI="https://github.com/mikefarah/yq/archive/refs/tags/v${PV}.tar.gz ->
${P/-go/}.tar.gz
+ https://dev.gentoo.org/~zmedico/dist/${P/-go/}-deps.tar.xz;
+
+S=${WORKDIR}/${P/-go/}
+LICENSE="MIT"
+LICENSE+=" Apache-2.0 BSD BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+yq-symlink"
+DOCS=(README.md)
+RDEPEND="yq-symlink? ( !app-misc/yq[yq-symlink(+)] )"
+
+src_compile() {
+ CGO_ENABLED=0 ego build -ldflags "-X main.GitDescribe=v${PV} -s -w"
+}
+
+src_install() {
+ einstalldocs
+ newbin yq yq-go
+ if use yq-symlink; then
+ dosym yq-go /usr/bin/yq
+ fi
+}
+
+src_test() {
+ ./scripts/test.sh || die
+}
[gentoo-commits] repo/gentoo:master commit in: app-containers/podman/
commit: 1728e374db8721b71bad2ad4ac1e76e949849a5f
Author: Krzesimir Nowak microsoft com>
AuthorDate: Fri May 24 11:50:50 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun May 26 23:31:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1728e374
app-containers/podman: Fix cross-compilation issues with gpgme
Need to tell cgo to use proper pkg-config with the PKG_CONFIG
environment variable.
Bug: https://bugs.gentoo.org/930982
Signed-off-by: Krzesimir Nowak microsoft.com>
Closes: https://github.com/gentoo/gentoo/pull/36805
Closes: https://bugs.gentoo.org/930982
Signed-off-by: Zac Medico gentoo.org>
app-containers/podman/podman-4.9.4.ebuild | 8 +++-
app-containers/podman/podman-5.0.2.ebuild | 8 +++-
app-containers/podman/podman-5.0.3.ebuild | 8 +++-
app-containers/podman/podman-.ebuild | 8 +++-
4 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/app-containers/podman/podman-4.9.4.ebuild
b/app-containers/podman/podman-4.9.4.ebuild
index 845dcbc2a7aa..ea2bd34e2507 100644
--- a/app-containers/podman/podman-4.9.4.ebuild
+++ b/app-containers/podman/podman-4.9.4.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{11,12} )
-inherit go-module python-any-r1 tmpfiles linux-info
+inherit go-module python-any-r1 tmpfiles toolchain-funcs linux-info
DESCRIPTION="A tool for managing OCI containers and pods with
Docker-compatible CLI"
HOMEPAGE="https://github.com/containers/podman/ https://podman.io/;
@@ -103,6 +103,12 @@ src_compile() {
# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
[[ ${PV} != * ]] && export COMMIT_NO="" GIT_COMMIT=""
EPOCH_TEST_COMMIT=""
+ # Use proper pkg-config to get gpgme cflags and ldflags when
+ # cross-compiling, bug 930982.
+ if tc-is-cross-compiler; then
+ tc-export PKG_CONFIG
+ fi
+
# BUILD_SECCOMP is used in the patch to toggle seccomp
emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man"
BUILD_SECCOMP="$(usex seccomp)" all $(usev wrapper docker-docs)
}
diff --git a/app-containers/podman/podman-5.0.2.ebuild
b/app-containers/podman/podman-5.0.2.ebuild
index b535f608f817..738613b007dc 100644
--- a/app-containers/podman/podman-5.0.2.ebuild
+++ b/app-containers/podman/podman-5.0.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{11,12} )
-inherit go-module python-any-r1 tmpfiles linux-info
+inherit go-module python-any-r1 tmpfiles toolchain-funcs linux-info
DESCRIPTION="A tool for managing OCI containers and pods with
Docker-compatible CLI"
HOMEPAGE="https://github.com/containers/podman/ https://podman.io/;
@@ -95,6 +95,12 @@ src_compile() {
# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
[[ ${PV} != * ]] && export COMMIT_NO="" GIT_COMMIT=""
EPOCH_TEST_COMMIT=""
+ # Use proper pkg-config to get gpgme cflags and ldflags when
+ # cross-compiling, bug 930982.
+ if tc-is-cross-compiler; then
+ tc-export PKG_CONFIG
+ fi
+
# BUILD_SECCOMP is used in the patch to toggle seccomp
emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man"
BUILD_SECCOMP="$(usex seccomp)" \
all $(usev wrapper docker-docs)
diff --git a/app-containers/podman/podman-5.0.3.ebuild
b/app-containers/podman/podman-5.0.3.ebuild
index b535f608f817..738613b007dc 100644
--- a/app-containers/podman/podman-5.0.3.ebuild
+++ b/app-containers/podman/podman-5.0.3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{11,12} )
-inherit go-module python-any-r1 tmpfiles linux-info
+inherit go-module python-any-r1 tmpfiles toolchain-funcs linux-info
DESCRIPTION="A tool for managing OCI containers and pods with
Docker-compatible CLI"
HOMEPAGE="https://github.com/containers/podman/ https://podman.io/;
@@ -95,6 +95,12 @@ src_compile() {
# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
[[ ${PV} != * ]] && export COMMIT_NO="" GIT_COMMIT=""
EPOCH_TEST_COMMIT=""
+ # Use proper pkg-config to get gpgme cflags and ldflags when
+ # cross-compiling, bug 930982.
+ if tc-is-cross-compiler; then
+ tc-export PKG_CONFIG
+ fi
+
# BUILD_SECCOMP is used in the patch to toggle seccomp
emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man"
BUILD_SECCOMP="$(usex seccomp)" \
all $(usev wrapper docker-docs)
diff --git a/app-containers/podman/podman-.ebuild
b/app-containers/podman/podman-.ebuild
index b535f608f817..738613b007dc 100644
--- a/app-containers/podman/podman-.ebuild
+++ b/app-containers/podman/podman-.ebuild
@@ -5,7 +5,7 @@ EAPI=
[gentoo-commits] repo/gentoo:master commit in: app-misc/jpipe/
commit: 528f3ba533eefc97cd5527f8aafd6d53a7bc39e6
Author: Zac Medico gentoo org>
AuthorDate: Sun May 26 23:20:47 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun May 26 23:25:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=528f3ba5
app-misc/jpipe: enable py3.13
Signed-off-by: Zac Medico gentoo.org>
app-misc/jpipe/jpipe-0.2.0-r1.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/app-misc/jpipe/jpipe-0.2.0-r1.ebuild
b/app-misc/jpipe/jpipe-0.2.0-r1.ebuild
index df98fabb80f0..d10315d56502 100644
--- a/app-misc/jpipe/jpipe-0.2.0-r1.ebuild
+++ b/app-misc/jpipe/jpipe-0.2.0-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=8
GO_OPTIONAL=1
DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
DISTUTILS_USE_PEP517=setuptools
inherit go-module distutils-r1 pypi
@@ -18,7 +18,6 @@ SRC_URI+="
LICENSE="Apache-2.0 BSD BSD-2 MIT"
SLOT="0"
KEYWORDS="~amd64"
-RESTRICT+=" test"
IUSE="jpp-symlink jp-symlink python test"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RESTRICT="!test? ( test )"
[gentoo-commits] proj/portage:master commit in: man/
commit: f3ae6bb0bd495b6b16d7e617515f4504ae2e1839 Author: Waldo Lemmer gmail com> AuthorDate: Sun May 26 14:30:32 2024 + Commit: Zac Medico gentoo org> CommitDate: Sun May 26 19:09:06 2024 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=f3ae6bb0 emerge.1: Fix /var/log/emerge.log description /var/log/emerge.log doesn't "[contain] a log of all emerge output". This commit changes this description to better reflect what emerge.log contains: - Packages that were built - emerge's invocation (i.e. its command-line arguments) Signed-off-by: Waldo Lemmer gmail.com> Closes: https://github.com/gentoo/portage/pull/1331 Signed-off-by: Zac Medico gentoo.org> man/emerge.1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/man/emerge.1 b/man/emerge.1 index dd9cde5722..5c36dc1f0d 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -1,4 +1,4 @@ -.TH "EMERGE" "1" "Jan 2024" "Portage @VERSION@" "Portage" +.TH "EMERGE" "1" "May 2024" "Portage @VERSION@" "Portage" .SH "NAME" emerge \- Command\-line interface to the Portage system .SH "SYNOPSIS" @@ -1520,8 +1520,8 @@ Contains the default variables for the build process. \fBDo not edit this file\fR. .TP .B /var/log/emerge.log -Contains a log of all emerge output. This file is always appended to, so if you -want to clean it, you need to do so manually. +Contains a log of merged packages and invocations of \fBemerge\fR. This file +is always appended to, so if you want to clean it, you need to do so manually. .TP .B /var/log/emerge-fetch.log Contains a log of all the fetches in the previous emerge invocation.
[gentoo-commits] proj/portage:master commit in: lib/portage/tests/resolver/
commit: ff22b5bf954574f1fad789fc148945d67c3a1215 Author: Zac Medico gentoo org> AuthorDate: Sun May 26 18:57:38 2024 + Commit: Zac Medico gentoo org> CommitDate: Sun May 26 18:57:58 2024 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=ff22b5bf test_tar_merge_order.py: Fix unused pytest unused-import Signed-off-by: Zac Medico gentoo.org> lib/portage/tests/resolver/test_tar_merge_order.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/portage/tests/resolver/test_tar_merge_order.py b/lib/portage/tests/resolver/test_tar_merge_order.py index 4bd9b4df4a..c66d01ee31 100644 --- a/lib/portage/tests/resolver/test_tar_merge_order.py +++ b/lib/portage/tests/resolver/test_tar_merge_order.py @@ -2,7 +2,6 @@ # Distributed under the terms of the GNU General Public License v2 import os -import pytest from portage.tests import TestCase from portage.tests.resolver.ResolverPlayground import (
[gentoo-commits] proj/portage:master commit in: lib/portage/tests/resolver/
commit: 11bded10a2a4f143e8d7f8ccb2f91f2b6fed59b5
Author: Sam James gentoo org>
AuthorDate: Sun May 26 14:44:56 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun May 26 18:27:02 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=11bded10
tests: add testcase for app-arch/tar merge order with binpkgs
In the bug, dilfridge reports releng@ is hitting the following:
```
$ emerge -epvk world | grep -E "(app-arch/tar|sys-apps/acl)"
[ebuild N ] sys-apps/acl-2.3.2-r1::gentoo USE="nls -static-libs" 363 KiB
[binary R] app-arch/tar-1.35-1::gentoo USE="acl* nls* xattr* -minimal
(-selinux) -verify-sig" 0 KiB
[...]
```
Test for bug #922629 where binary app-arch/tar[acl] was merged
before its dependency sys-apps/acl (with virtual/acl merged but
unsatisfied).
It (appears to be) a bad interaction with @system containing
app-alternatives/tar
plus a circular dependency on app-arch/tar. The USE change is also important,
as e.g. dropping "sys-apps/attr nls" from package.use makes things okay.
XFAIL'd for now.
Bug: https://bugs.gentoo.org/922629
Signed-off-by: Sam James gentoo.org>
Closes: https://github.com/gentoo/portage/pull/1332
Signed-off-by: Zac Medico gentoo.org>
lib/portage/tests/resolver/meson.build | 1 +
lib/portage/tests/resolver/test_tar_merge_order.py | 495 +
2 files changed, 496 insertions(+)
diff --git a/lib/portage/tests/resolver/meson.build
b/lib/portage/tests/resolver/meson.build
index 8892c78131..ea948982e7 100644
--- a/lib/portage/tests/resolver/meson.build
+++ b/lib/portage/tests/resolver/meson.build
@@ -81,6 +81,7 @@ py.install_sources(
'test_slot_operator_update_probe_parent_downgrade.py',
'test_solve_non_slot_operator_slot_conflicts.py',
'test_targetroot.py',
+'test_tar_merge_order.py',
'test_unmerge_order.py',
'test_unnecessary_slot_upgrade.py',
'test_update.py',
diff --git a/lib/portage/tests/resolver/test_tar_merge_order.py
b/lib/portage/tests/resolver/test_tar_merge_order.py
new file mode 100644
index 00..7e1a18bc21
--- /dev/null
+++ b/lib/portage/tests/resolver/test_tar_merge_order.py
@@ -0,0 +1,495 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+import os
+import pytest
+
+from portage.tests import TestCase
+from portage.tests.resolver.ResolverPlayground import (
+ResolverPlayground,
+ResolverPlaygroundTestCase,
+)
+
+
+class TarMergeOrderTestCase(TestCase):
+@pytest.mark.xfail(reason="bug #922629 isn't yet fixed")
+def testTarMergeOrder(self):
+"""
+Test for bug #922629 where binary app-arch/tar[acl] was merged
+before its dependency sys-apps/acl (with virtual/acl merged but
+unsatisfied).
+
+It poorly interacted with @system containing app-alternatives/tar
+as a circular dependency on app-arch/tar.
+"""
+
+ebuilds = {
+"app-alternatives/tar-0-1": {
+"EAPI": "8",
+"RDEPEND": """
+!=app-arch/tar-1.34-r2 )
+libarchive? ( app-arch/libarchive )
+""",
+"IUSE": "+gnu libarchive",
+"REQUIRED_USE": "^^ ( gnu libarchive )",
+},
+"app-arch/libarchive-3.7.4": {"EAPI": "8"},
+"app-arch/tar-1.35": {
+"EAPI": "8",
+"RDEPEND": """
+acl? ( virtual/acl )
+""",
+"DEPEND": """
+acl? ( virtual/acl )
+xattr? ( sys-apps/attr )
+""",
+"BDEPEND": """
+nls? ( sys-devel/gettext )
+""",
+"IUSE": "acl nls xattr",
+},
+"virtual/acl-0-r2": {
+"EAPI": "8",
+"RDEPEND": ">=sys-apps/acl-2.2.52-r1",
+},
+"sys-devel/gettext-0.22.4": {
+"EAPI": "8",
+"RDEPEND": """
+acl? ( virtual/acl )
+xattr? ( sys-apps/attr )
+""",
+"DEPEND": """
+acl? ( virtual/acl )
+xattr? ( sys-apps/attr )
+""",
+"IUSE": "acl nls xattr",
+
[gentoo-commits] proj/portage:master commit in: lib/_emerge/, lib/portage/tests/resolver/
commit: 96e4f95cc8c0d544d375b28394dafe8809c4bc9b Author: Zac Medico gentoo org> AuthorDate: Sun May 26 18:23:27 2024 + Commit: Zac Medico gentoo org> CommitDate: Sun May 26 18:34:04 2024 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=96e4f95c Revert "find_smallest_cycle: Optimize to traverse fewer nodes" This reverts commit 49e01d041c74680a81860b819daff812d83df02f in order to fix bug 922629. Later we can try to optimize it again but without breaking testTarMergeOrder. Bug: https://bugs.gentoo.org/922629 Signed-off-by: Zac Medico gentoo.org> lib/_emerge/depgraph.py| 36 ++ .../tests/resolver/test_rebuild_ghostscript.py | 2 +- .../resolver/test_runtime_cycle_merge_order.py | 7 ++--- lib/portage/tests/resolver/test_tar_merge_order.py | 4 ++- 4 files changed, 9 insertions(+), 40 deletions(-) diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py index 6b91d5c42d..3adc04bcfb 100644 --- a/lib/_emerge/depgraph.py +++ b/lib/_emerge/depgraph.py @@ -9313,14 +9313,7 @@ class depgraph: asap_nodes.extend(libc_pkgs) -def gather_deps( -ignore_priority, -mergeable_nodes, -selected_nodes, -node, -smallest_cycle=None, -traversed_nodes=None, -): +def gather_deps(ignore_priority, mergeable_nodes, selected_nodes, node): """ Recursively gather a group of nodes that RDEPEND on eachother. This ensures that they are merged as a group @@ -9340,24 +9333,10 @@ class depgraph: # RDEPENDs installed first, but ignore uninstalls # (these occur when new portage blocks an older package version). return False -if traversed_nodes is not None: -if node in traversed_nodes: -# Identical to a previously traversed cycle. -return False -traversed_nodes.add(node) selected_nodes.add(node) -if smallest_cycle is not None and len(selected_nodes) >= len( -smallest_cycle -): -return False for child in mygraph.child_nodes(node, ignore_priority=ignore_priority): if not gather_deps( -ignore_priority, -mergeable_nodes, -selected_nodes, -child, -smallest_cycle=smallest_cycle, -traversed_nodes=traversed_nodes, +ignore_priority, mergeable_nodes, selected_nodes, child ): return False return True @@ -9515,21 +9494,12 @@ class depgraph: local_priority_range.MEDIUM_SOFT + 1, ) ): -# Traversed nodes for current priority -traversed_nodes = set() for node in nodes: if not mygraph.parent_nodes(node): continue -if node in traversed_nodes: -continue selected_nodes = set() if gather_deps( -priority, -mergeable_nodes, -selected_nodes, -node, -smallest_cycle=smallest_cycle, -traversed_nodes=traversed_nodes, +priority, mergeable_nodes, selected_nodes, node ): if smallest_cycle is None or len(selected_nodes) < len( smallest_cycle diff --git a/lib/portage/tests/resolver/test_rebuild_ghostscript.py b/lib/portage/tests/resolver/test_rebuild_ghostscript.py index 8ee3349d6f..dad6a21322 100644 --- a/lib/portage/tests/resolver/test_rebuild_ghostscript.py +++ b/lib/portage/tests/resolver/test_rebuild_ghostscript.py @@ -137,9 +137,9 @@ class RebuildGhostscriptTestCase(TestCase): mergelist=[ "sys-apps/dbus-1.15.6", "x11-libs/gtk+-3.24.38", -"app-text/ghostscript-gpl-10.01.2", "net-dns/avahi-0.8-r7", "net-print/cups-2.4.6", +"app-text/ghostscript-gpl-10.01.2", "app-text/libspectre-0.2.12", "x11-libs/goffice-0.10.55", ], diff --git a/lib/portage/tests/resolver/test_runtime_cycle_merge_order.py b/lib/porta
[gentoo-commits] proj/portage:master commit in: lib/_emerge/
commit: 685908978c48f6bfeab99f47ba7d78ee00294a64 Author: Tatsuyuki Ishi google com> AuthorDate: Wed May 15 07:46:36 2024 + Commit: Zac Medico gentoo org> CommitDate: Sun May 26 18:01:22 2024 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=68590897 Fix a depgraph crash with useoldpkg and subslot bumps This resolves a "list index out of range" error that could happen with when a package's subslot is bumped and --useoldpkg is used. Due to the subslot bump, the code will filter matched_packages to only contain the latest version. However, this didn't update matched_oldpkg, which would now contain stale packages and cause logic errors. Fix this by filtering matched_oldpkg again before its use. Signed-off-by: Tatsuyuki Ishi google.com> Bug: https://bugs.gentoo.org/932804 Closes: https://github.com/gentoo/portage/pull/1322 Signed-off-by: Zac Medico gentoo.org> lib/_emerge/depgraph.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py index 13add990e6..6b91d5c42d 100644 --- a/lib/_emerge/depgraph.py +++ b/lib/_emerge/depgraph.py @@ -8177,6 +8177,7 @@ class depgraph: ): return pkg, existing_node +matched_oldpkg = [x for x in matched_oldpkg if x in matched_packages] visible_matches = [] if matched_oldpkg: visible_matches = [
[gentoo-commits] repo/gentoo:master commit in: dev-python/pyrqlite/
commit: 8465d515f63aa5d14ea52fcbdf65a5e585acb19b
Author: Zac Medico gentoo org>
AuthorDate: Sun May 26 04:16:11 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun May 26 04:18:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8465d515
dev-python/pyrqlite: add 2.2.3
Signed-off-by: Zac Medico gentoo.org>
dev-python/pyrqlite/Manifest | 1 +
dev-python/pyrqlite/pyrqlite-2.2.3.ebuild | 30 ++
2 files changed, 31 insertions(+)
diff --git a/dev-python/pyrqlite/Manifest b/dev-python/pyrqlite/Manifest
index 692e554c63e8..fe7ae7e95276 100644
--- a/dev-python/pyrqlite/Manifest
+++ b/dev-python/pyrqlite/Manifest
@@ -1 +1,2 @@
DIST pyrqlite-2.2.2.gh.tar.gz 21302 BLAKE2B
8a16155287f4a4698ca63d4643c9fde0dbf4fc8238b4259f194b66a30846bab9b6420df0cc8049b2ea16d8ffdcd8c99f2b7e49a135af458e2b239b52e3ac4f5b
SHA512
6faf6d5b1a264a85247ee5a790bc4e718d0632ee4d4bcd16aed2bce65216f23c0cb44d7c367ae73874bdb618d9c56bbefdaeebb40322f228e0ee50d78e03b91b
+DIST pyrqlite-2.2.3.gh.tar.gz 21554 BLAKE2B
1a3c09eaee20a19ab06a4f91a5b12659eafe425f796599ef9abf85f99563a62b40f1f82488611e0bbd1fb18853e2b1e310ecd7f94cb89f5840e34c51a4bd42ef
SHA512
063a9072846c31fd34ea5261fe97f1023a95122c39c58292c7ab08ba148e01ab5001adda28c2856f0e29b67be553a8bae011d274edfdd3028aacd22179d309d7
diff --git a/dev-python/pyrqlite/pyrqlite-2.2.3.ebuild
b/dev-python/pyrqlite/pyrqlite-2.2.3.ebuild
new file mode 100644
index ..ec12bed1b7aa
--- /dev/null
+++ b/dev-python/pyrqlite/pyrqlite-2.2.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+inherit distutils-r1
+
+DESCRIPTION="Python client for rqlite"
+HOMEPAGE="
+ https://github.com/rqlite/pyrqlite/
+ https://pypi.org/project/pyrqlite/
+"
+SRC_URI="
+ https://github.com/rqlite/pyrqlite/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+ test? (
+ >=dev-db/rqlite-6.7.0
+ )
+"
+
+distutils_enable_tests pytest
[gentoo-commits] proj/portage:master commit in: lib/portage/tests/sync/, lib/portage/dbapi/
commit: 5aed7289d516fab5b63557da46348125eabab368
Author: Zac Medico gentoo org>
AuthorDate: Thu Mar 14 04:09:34 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sat May 25 22:08:15 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=5aed7289
bintree: Add REPO_REVISIONS to package index header
As a means for binhost clients to select source repo
revisions which are consistent with binhosts, inject
REPO_REVISIONS from a package into the index header,
using a history of synced revisions to guarantee
forward progress. This queries the relevant repos to
check if any new revisions have appeared in the
absence of a proper sync operation.
Bug: https://bugs.gentoo.org/924772
Signed-off-by: Zac Medico gentoo.org>
lib/portage/dbapi/bintree.py | 67 -
lib/portage/tests/sync/test_sync_local.py | 71 +--
2 files changed, 124 insertions(+), 14 deletions(-)
diff --git a/lib/portage/dbapi/bintree.py b/lib/portage/dbapi/bintree.py
index 221afbd154..64dfee4faa 100644
--- a/lib/portage/dbapi/bintree.py
+++ b/lib/portage/dbapi/bintree.py
@@ -48,6 +48,7 @@ from portage.exception import (
from portage.localization import _
from portage.output import colorize
from portage.package.ebuild.profile_iuse import iter_iuse_vars
+from portage.sync.revision_history import get_repo_revision_history
from portage.util import ensure_dirs
from portage.util.file_copy import copyfile
from portage.util.futures import asyncio
@@ -62,6 +63,7 @@ from portage import _unicode_encode
import codecs
import errno
import io
+import json
import re
import shlex
import stat
@@ -135,13 +137,19 @@ class bindbapi(fakedbapi):
"USE",
"_mtime_",
}
+# Keys required only when initially adding a package.
+self._init_aux_keys = {
+"REPO_REVISIONS",
+}
self._aux_cache = {}
self._aux_cache_slot_dict_cache = None
@property
def _aux_cache_slot_dict(self):
if self._aux_cache_slot_dict_cache is None:
-self._aux_cache_slot_dict_cache =
slot_dict_class(self._aux_cache_keys)
+self._aux_cache_slot_dict_cache = slot_dict_class(
+chain(self._aux_cache_keys, self._init_aux_keys)
+)
return self._aux_cache_slot_dict_cache
def __getstate__(self):
@@ -1791,6 +1799,11 @@ class binarytree:
pkgindex = self._new_pkgindex()
d = self._inject_file(pkgindex, cpv, full_path)
+repo_revisions = (
+json.loads(d["REPO_REVISIONS"]) if d.get("REPO_REVISIONS")
else None
+)
+if repo_revisions:
+self._inject_repo_revisions(pkgindex.header, repo_revisions)
self._update_pkgindex_header(pkgindex.header)
self._pkgindex_write(pkgindex)
@@ -1872,7 +1885,7 @@ class binarytree:
@return: package metadata
"""
if keys is None:
-keys = self.dbapi._aux_cache_keys
+keys = chain(self.dbapi._aux_cache_keys, self.dbapi._init_aux_keys)
metadata = self.dbapi._aux_cache_slot_dict()
else:
metadata = {}
@@ -1916,6 +1929,56 @@ class binarytree:
return metadata
+def _inject_repo_revisions(self, header, repo_revisions):
+"""
+Inject REPO_REVISIONS from a package into the index header,
+using a history of synced revisions to guarantee forward
+progress. This queries the relevant repos to check if any
+new revisions have appeared in the absence of a proper sync
+operation.
+
+This does not expose REPO_REVISIONS that do not appear in
+the sync history, since such revisions suggest that the
+package was not built locally, and in this case its
+REPO_REVISIONS are not intended to be exposed.
+"""
+synced_repo_revisions = get_repo_revision_history(
+self.settings["EROOT"],
+[self.settings.repositories[repo_name] for repo_name in
repo_revisions],
+)
+header_repo_revisions = (
+json.loads(header["REPO_REVISIONS"]) if
header.get("REPO_REVISIONS") else {}
+)
+for repo_name, repo_revision in repo_revisions.items():
+rev_list = synced_repo_revisions.get(repo_name, [])
+header_rev = header_repo_revisions.get(repo_name)
+if not rev_list or header_rev in (repo_revision, rev_list[0]):
+continue
+try:
+header_rev_index = (
+None if header_rev is None else rev_list.index(header_rev)
+)
+except ValueError:
+header_rev_index = None
+try:
+
[gentoo-commits] proj/portage:master commit in: bin/, lib/portage/tests/sync/, lib/portage/, lib/portage/emaint/modules/, man/, ...
commit: 71d9ce40be5bbf533a6d1b59c5a460621c3c91c4
Author: Zac Medico gentoo org>
AuthorDate: Thu Mar 14 04:09:21 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sat May 25 22:08:15 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=71d9ce40
Add get_repo_revision_history function and repo_revisions file
The history of synced revisions is provided by a new
get_repo_revision_history function and corresponding
/var/lib/portage/repo_revisions file, with history
limit currently capped at 25 revisions. If a change
is detected and the current process has permission
to update the repo_revisions file, then the file will
be updated with any newly detected revisions.
For volatile repos the revisions may be unordered,
which makes them unusable for the purposes of the
revision history, so the revisions of volatile repos
are not tracked. This functions detects revisions
which are not yet visible to the current process due
to the sync-rcu option.
The emaint revisions --purgerepos and --purgeallrepos
options allow revisions for some or all repos to be
easily purged from the history. For example, the
emerge-webrsync script uses this emaint commmand to
purge the revision history of the gentoo repo when
the emerge-webrsync --revert option is used to roll
back to a previous snapshot:
emaint revisions --purgerepos="${repo_name}"
Bug: https://bugs.gentoo.org/924772
Signed-off-by: Zac Medico gentoo.org>
bin/emerge-webrsync | 3 +-
lib/portage/const.py | 1 +
lib/portage/emaint/modules/meson.build| 1 +
lib/portage/emaint/modules/revisions/__init__.py | 36 ++
lib/portage/emaint/modules/revisions/meson.build | 8 ++
lib/portage/emaint/modules/revisions/revisions.py | 95
lib/portage/sync/controller.py| 8 +-
lib/portage/sync/meson.build | 1 +
lib/portage/sync/revision_history.py | 133 ++
lib/portage/tests/sync/test_sync_local.py | 75 +++-
man/emaint.1 | 18 ++-
man/portage.5 | 15 +++
12 files changed, 387 insertions(+), 7 deletions(-)
diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index 99da05543a..caa4986da2 100755
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Author: Karl Trygve Kalleberg
# Rewritten from the old, Perl-based emerge-webrsync script
@@ -732,6 +732,7 @@ main() {
[[ ${do_debug} -eq 1 ]] && set -x
if [[ -n ${revert_date} ]] ; then
+ emaint revisions --purgerepos="${repo_name}"
do_snapshot 1 "${revert_date}"
else
do_latest_snapshot
diff --git a/lib/portage/const.py b/lib/portage/const.py
index 2154213b7b..c9a71009a7 100644
--- a/lib/portage/const.py
+++ b/lib/portage/const.py
@@ -51,6 +51,7 @@ PRIVATE_PATH = "var/lib/portage"
WORLD_FILE = f"{PRIVATE_PATH}/world"
WORLD_SETS_FILE = f"{PRIVATE_PATH}/world_sets"
CONFIG_MEMORY_FILE = f"{PRIVATE_PATH}/config"
+REPO_REVISIONS = f"{PRIVATE_PATH}/repo_revisions"
NEWS_LIB_PATH = "var/lib/gentoo"
# these variables get EPREFIX prepended automagically when they are
diff --git a/lib/portage/emaint/modules/meson.build
b/lib/portage/emaint/modules/meson.build
index 48f4f77d83..33b396be94 100644
--- a/lib/portage/emaint/modules/meson.build
+++ b/lib/portage/emaint/modules/meson.build
@@ -12,5 +12,6 @@ subdir('logs')
subdir('merges')
subdir('move')
subdir('resume')
+subdir('revisions')
subdir('sync')
subdir('world')
diff --git a/lib/portage/emaint/modules/revisions/__init__.py
b/lib/portage/emaint/modules/revisions/__init__.py
new file mode 100644
index 00..c51cbb4bf3
--- /dev/null
+++ b/lib/portage/emaint/modules/revisions/__init__.py
@@ -0,0 +1,36 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+doc = """Purge repo_revisions history file."""
+__doc__ = doc
+
+
+module_spec = {
+"name": "revisions",
+"description": doc,
+"provides": {
+"purgerevisions": {
+"name": "revisions",
+"sourcefile": "revisions",
+"class": "PurgeRevisions",
+"description": "Purge repo_revisions history",
+"functions": ["purgeallrepos", "purgerepos"],
+"func_desc": {
+"repo": {
+
[gentoo-commits] proj/portage:master commit in: man/, lib/portage/binrepo/, lib/portage/dbapi/
commit: cd41fb9390fcca9dc8a565b5c52dbba73d9ae59c
Author: Zac Medico gentoo org>
AuthorDate: Sat May 25 21:53:52 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sat May 25 21:53:52 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=cd41fb93
binrepos.conf: Support "frozen" attribute
In order to allow consistent and reproducible dependency calculations
during mixed source and binary updates, add a "frozen" binrepos.conf
attribute which will freeze binrepo index updates and cause messsages
to indicate that the repo is frozen rather than up-to-date:
Local copy of remote index is frozen and will be used.
This should only be set temporarily in order to guarantee consistent
and reproducible dependency calculations for mixed binary and source
updates.
Bug: https://bugs.gentoo.org/932739
Signed-off-by: Zac Medico gentoo.org>
lib/portage/binrepo/config.py | 10 +-
lib/portage/dbapi/bintree.py | 5 +++--
man/portage.5 | 8 +++-
3 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/lib/portage/binrepo/config.py b/lib/portage/binrepo/config.py
index 5601a2e002..c744d1012f 100644
--- a/lib/portage/binrepo/config.py
+++ b/lib/portage/binrepo/config.py
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
from collections import OrderedDict
@@ -12,6 +12,7 @@ from portage.util.configparser import SafeConfigParser,
ConfigParserError, read_
class BinRepoConfig:
__slots__ = (
+"frozen",
"name",
"name_fallback",
"fetchcommand",
@@ -19,6 +20,7 @@ class BinRepoConfig:
"resumecommand",
"sync_uri",
)
+_bool_opts = ("frozen",)
def __init__(self, opts):
"""
@@ -26,6 +28,9 @@ class BinRepoConfig:
"""
for k in self.__slots__:
setattr(self, k, opts.get(k.replace("_", "-")))
+for k in self._bool_opts:
+if isinstance(getattr(self, k, None), str):
+setattr(self, k, getattr(self, k).lower() in ("true", "yes"))
def info_string(self):
"""
@@ -38,6 +43,8 @@ class BinRepoConfig:
if self.priority is not None:
repo_msg.append(indent + "priority: " + str(self.priority))
repo_msg.append(indent + "sync-uri: " + self.sync_uri)
+if self.frozen:
+repo_msg.append(f"{indent}frozen: {str(self.frozen).lower()}")
repo_msg.append("")
return "\n".join(repo_msg)
@@ -48,6 +55,7 @@ class BinRepoConfigLoader(Mapping):
# Defaults for value interpolation.
parser_defaults = {
+"frozen": "false",
"EPREFIX": settings["EPREFIX"],
"EROOT": settings["EROOT"],
"PORTAGE_CONFIGROOT": settings["PORTAGE_CONFIGROOT"],
diff --git a/lib/portage/dbapi/bintree.py b/lib/portage/dbapi/bintree.py
index 22e2995c2f..221afbd154 100644
--- a/lib/portage/dbapi/bintree.py
+++ b/lib/portage/dbapi/bintree.py
@@ -1408,7 +1408,7 @@ class binarytree:
url = base_url.rstrip("/") + "/Packages"
f = None
-if not getbinpkg_refresh and local_timestamp:
+if local_timestamp and (repo.frozen or not getbinpkg_refresh):
raise UseCachedCopyOfRemoteIndex()
try:
@@ -1566,11 +1566,12 @@ class binarytree:
noiselevel=-1,
)
except UseCachedCopyOfRemoteIndex:
+desc = "frozen" if repo.frozen else "up-to-date"
writemsg_stdout("\n")
writemsg_stdout(
colorize(
"GOOD",
-_("Local copy of remote index is up-to-date and will
be used."),
+_("Local copy of remote index is %s and will be
used.") % desc,
)
+ "\n"
)
diff --git a/man/portage.5 b/man/portage.5
index 1f717c4cb8..3b8329bfb2 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1,4 +1,4 @@
-.TH "PORTAGE" "5" "Apr 2023" "Portage @VERSION@" "Portage"
+.TH "PORTAGE" "5" "May 2024" "Portage @VERSION@" "Portage"
.SH NAME
portage \- the heart of Gentoo
.SH "DESCRIPTION"
@@ -642,6 +642,12 @@ is intended to be used as a replacement for the
\fBmake.conf\fR(5)
.I Attributes supported in DEFAULT section:
.RS
.TP
+.B frozen = yes|no|true|false
+Use the most recently cached copy of the remote index, and do not
+attempt to refresh it. This should only be set temporarily in order to
+guarantee consistent and reproducible dependency calculations (for
+mixed binary and source updates).
+.TP
.B fetchcommand
Specifies a \fBFETCHCOMMAND\fR used to fetch files from a repository,
overriding the value from \fBmake.conf\fR(5).
[gentoo-commits] proj/portage:master commit in: lib/_emerge/
commit: cd755af8347c32ea5247b68e6193c8428c9ffd7b Author: Florian Schmaus gentoo org> AuthorDate: Tue May 21 12:55:16 2024 + Commit: Zac Medico gentoo org> CommitDate: Tue May 21 16:07:45 2024 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=cd755af8 SchedulerInterface/PollScheduler: _loadavg_latency's unit is seconds The unit of _loadavg_latency is seconds, not milliseconds, as it is used as first argument to an eventloop's call_later() function. Signed-off-by: Florian Schmaus gentoo.org> Closes: https://github.com/gentoo/portage/pull/1325 Signed-off-by: Zac Medico gentoo.org> lib/_emerge/PollScheduler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/_emerge/PollScheduler.py b/lib/_emerge/PollScheduler.py index b5bfd20b76..fdf88dd04d 100644 --- a/lib/_emerge/PollScheduler.py +++ b/lib/_emerge/PollScheduler.py @@ -11,7 +11,7 @@ from _emerge.getloadavg import getloadavg class PollScheduler: -# max time between loadavg checks (milliseconds) +# max time between loadavg checks (seconds) _loadavg_latency = None def __init__(self, main=False, event_loop=None):
[gentoo-commits] repo/gentoo:master commit in: /
commit: 65ed9ea6eeb7adbaeb4404f963e3d97de17db049 Author: Christopher Bayliss icloud com> AuthorDate: Fri May 17 05:42:08 2024 + Commit: Zac Medico gentoo org> CommitDate: Sun May 19 08:43:41 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65ed9ea6 mailmap: map my old email address, also sort Signed-off-by: Christopher Bayliss icloud.com> From: https://github.com/gentoo/gentoo/pull/36713 Signed-off-by: Zac Medico gentoo.org> .mailmap | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 2b423eb8c36c..9fc2973bdf9e 100644 --- a/.mailmap +++ b/.mailmap @@ -11,6 +11,7 @@ Andrew Ammerlaan Andrew Ammerlaan Andrew Ammerlaan Arsen Arsenović +Christopher Bayliss Florian Schmaus Ionen Wolkens Joonas Niilola @@ -18,9 +19,9 @@ Maciej Barć Maciej Barć Marek Szuba Martin Dummer +Michal Privoznik Michal PrÃvoznÃk Michal Privoznik Michal Privoznik -Michal Privoznik Michal PrÃvoznÃk Petr VanÄ›k Petr VanÄ›k Petr VanÄ›k
[gentoo-commits] repo/gentoo:master commit in: app-shells/nushell/
commit: 54bf5a0f4dd8924de6cbbe43ae3093a336063244
Author: Christopher Bayliss icloud com>
AuthorDate: Fri May 17 06:26:45 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun May 19 08:43:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54bf5a0f
app-shells/nushell: make X11 optional
Signed-off-by: Christopher Bayliss icloud.com>
Closes: https://github.com/gentoo/gentoo/pull/36713
Signed-off-by: Zac Medico gentoo.org>
app-shells/nushell/nushell-0.91.0.ebuild | 8 +---
app-shells/nushell/nushell-0.92.1.ebuild | 8 +---
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/app-shells/nushell/nushell-0.91.0.ebuild
b/app-shells/nushell/nushell-0.91.0.ebuild
index f86a9397232f..06bd2d1c8052 100644
--- a/app-shells/nushell/nushell-0.91.0.ebuild
+++ b/app-shells/nushell/nushell-0.91.0.ebuild
@@ -663,7 +663,7 @@ LICENSE+="
"
SLOT="0"
KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
-IUSE="dataframe extra"
+IUSE="dataframe extra X"
DEPEND="
>=dev-libs/libgit2-0.99:=
@@ -673,8 +673,10 @@ DEPEND="
net-libs/nghttp2:=
net-misc/curl
dev-db/sqlite:3=
- x11-libs/libX11
- x11-libs/libxcb
+ X? (
+ x11-libs/libX11
+ x11-libs/libxcb
+ )
"
RDEPEND="${DEPEND}"
BDEPEND="
diff --git a/app-shells/nushell/nushell-0.92.1.ebuild
b/app-shells/nushell/nushell-0.92.1.ebuild
index 7b18b081b971..8b93f2578ee9 100644
--- a/app-shells/nushell/nushell-0.92.1.ebuild
+++ b/app-shells/nushell/nushell-0.92.1.ebuild
@@ -657,7 +657,7 @@ LICENSE+="
"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
-IUSE="dataframe"
+IUSE="dataframe X"
DEPEND="
>=dev-libs/libgit2-0.99:=
@@ -667,8 +667,10 @@ DEPEND="
net-libs/nghttp2:=
net-misc/curl
dev-db/sqlite:3=
- x11-libs/libX11
- x11-libs/libxcb
+ X? (
+ x11-libs/libX11
+ x11-libs/libxcb
+ )
"
RDEPEND="${DEPEND}"
BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: www-servers/caddy/
commit: 59689314fcd8fc268ccdf0100eddb283a02cc76b
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Sat May 4 09:06:34 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun May 12 22:02:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59689314
www-servers/caddy: add 2.8.0_beta2, guide on deps tar creation
Changes:
* Support versions including beta
* Instead of `mv`ing vendor dir do symlink.
* use aesterisks instead of hardcoding dir name at various
places (dist dir)
Instructions for creating deps tarball:
1. git init, git add ./
2. `go get` ALL the modules
3. import ALL modules in cmd/caddy/main.go
4. git diff > go-mod-sum.patch
5. go mod vendor -v
6. tar -c vendor/ go-mod-sum.patch
Signed-off-by: Rahil Bhimjiani rahil.rocks>
Closes: https://github.com/gentoo/gentoo/pull/36540
Signed-off-by: Zac Medico gentoo.org>
www-servers/caddy/Manifest | 3 +++
.../{caddy-.ebuild => caddy-2.8.0_beta2.ebuild} | 20 +++-
www-servers/caddy/caddy-.ebuild | 20 +++-
3 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest
index 73920dd08a5d..631af198827c 100644
--- a/www-servers/caddy/Manifest
+++ b/www-servers/caddy/Manifest
@@ -2,3 +2,6 @@ DIST caddy-2.7.6-docs.tar.gz 24583 BLAKE2B
d3dbbb701d86cbfaf538f10911fdd3613b8c3
DIST caddy-2.7.6-r1-deps.tar.xz 129331604 BLAKE2B
50b83c012c70637936c83ec765758cdcd80014ca224d76a746de8640a6b36ae15ce11ec57d9fdb20a5f7b3add946209c6dde7bb4e4bd4a47ffe3ffc8971725db
SHA512
a4bc56de4f7ec8e9967dde3d7ca4cbb74cba9ce0b8906ffe16f8dae3f52fff1164827942df8154eadbae80cce3ee603535b9135cf8a5126d84a9017e8aece078
DIST caddy-2.7.6-r2-deps.tar.xz 8511804 BLAKE2B
ad3c78ee483474754ad83284fabf249c376423217c2929740cd171446d0e755f121e380130c80f291422d39ca69ea7e6ac52f5ce5cdec740616099b665cef5af
SHA512
c48d299d9a0b27ebe467f64dc433625de26293674d8153122ad6798a6b95ed4fe55f764a18d3e9211a8e2f966724d20996f1789e2e84dbb0181cfcf5340303fb
DIST caddy-2.7.6.tar.gz 606077 BLAKE2B
1237edc164ec6095c9dff27c332925c4ce9d91a60e629770463bbffb1503b8b11e36033e852df3eb5bb69ffa448833b6ee2891dc0ba6dc9b43b6cce27d492179
SHA512
ef0cb6fd7f6f2a296290b4bb520300e043ad31cc612e734632ffa25cdaa23fd7d601ac4ceaa1c76285d54a07ee773360f795103ef3c2ec79516a4f18a5e844b5
+DIST caddy-2.8.0_beta2-deps.tar.xz 9983432 BLAKE2B
5ce369219b03688a18f01d7e0f14158a4831bdb02f90c9d4cd2554c8a516f8575155473134197c58c6b65b8752b2fc6a2cdf56b4eaacde20a01233c3f5b1dd38
SHA512
e4fd9432adb4cc98b1f765d5b7f3920030fc433e838a5b7f388f8ba220fe0f23e0c0ce5da01507e3241d03f3e7f010a49dde6ba49402f363fb005bb879c2c1a6
+DIST caddy-2.8.0_beta2-docs.tar.gz 24678 BLAKE2B
5e03bada381b63a4549715c25f651e51eed81fc97d9e89cadb1128db55ba8344335590b10ac57a70395f7b57aa8ece93c5a8c2b6f4dd8e199f703bbed2147631
SHA512
d185e77d8020e7afd05a8dd7798fc29a9688268088129be8f813768f2fdd19abbd9e14440d80445c16844976f0740f5aa377ffc8084263c337d313c03adf7556
+DIST caddy-2.8.0_beta2.tar.gz 656863 BLAKE2B
6d1364798629949611c8cc5094e0f91928c9a50fc7de2a084b85402cce07e553d9da2652f1fa55daac8c94c877beb08de7226b7f3befd57367b901e593be1d2c
SHA512
64c3f6fb4e32947ff55307f71b416aeb8610d8fd3273514c59c6ebcf323a3552ceea0e3f6281ba4a879d24f1fa02d232e6f634e53fa9edebbce76f78c174032d
diff --git a/www-servers/caddy/caddy-.ebuild
b/www-servers/caddy/caddy-2.8.0_beta2.ebuild
similarity index 84%
copy from www-servers/caddy/caddy-.ebuild
copy to www-servers/caddy/caddy-2.8.0_beta2.ebuild
index 86a00c5d6ef9..c66b0a78cfe2 100644
--- a/www-servers/caddy/caddy-.ebuild
+++ b/www-servers/caddy/caddy-2.8.0_beta2.ebuild
@@ -13,13 +13,15 @@ if [[ "${PV}" == * ]]; then
EGIT_REPO_URI="https://github.com/caddyserver/caddy.git;
else
SRC_URI="
- https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz ->
${P}.tar.gz
+
https://github.com/caddyserver/caddy/archive/v${PV/_beta/-beta.}.tar.gz ->
${P}.tar.gz
https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz
-> ${P}-deps.tar.xz
-
https://github.com/caddyserver/dist/archive/refs/tags/v${PV}.tar.gz ->
${P}-docs.tar.gz
+
https://github.com/caddyserver/dist/archive/refs/tags/v${PV/_beta/-beta.}.tar.gz
-> ${P}-docs.tar.gz
"
- KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
+ [[ ${PV} != *beta* ]] && \
+ KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
fi
+S="${WORKDIR}/${PN}-${PV/_beta/-beta.}"
# MAIN
LICENSE="Apache-2.0"
# deps
@@ -81,10 +83,10 @@ src_unpack() {
src_prepare() {
default
- sed -i -e "s|User=caddy|User=http|g;s|Group=caddy|Group=http|g;"
../dist-"${PV}"/init/*service || die
+ sed -i -e "s|User=caddy|User=http|g;s|Group=caddy|Group=http|g;"
../dist-*/init/*se
[gentoo-commits] repo/gentoo:master commit in: www-servers/caddy/
commit: 5d31507eca0b9182f758e73023d4700d8f8b4f1d
Author: Zac Medico gentoo org>
AuthorDate: Sun May 12 22:04:14 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun May 12 22:04:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d31507e
www-servers/caddy: Copy deps and docs tarballs to dev space
Signed-off-by: Zac Medico gentoo.org>
www-servers/caddy/caddy-2.8.0_beta2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/www-servers/caddy/caddy-2.8.0_beta2.ebuild
b/www-servers/caddy/caddy-2.8.0_beta2.ebuild
index c66b0a78cfe2..d28390c3b0f9 100644
--- a/www-servers/caddy/caddy-2.8.0_beta2.ebuild
+++ b/www-servers/caddy/caddy-2.8.0_beta2.ebuild
@@ -14,8 +14,8 @@ if [[ "${PV}" == * ]]; then
else
SRC_URI="
https://github.com/caddyserver/caddy/archive/v${PV/_beta/-beta.}.tar.gz ->
${P}.tar.gz
-
https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz
-> ${P}-deps.tar.xz
-
https://github.com/caddyserver/dist/archive/refs/tags/v${PV/_beta/-beta.}.tar.gz
-> ${P}-docs.tar.gz
+ https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz
+ https://dev.gentoo.org/~zmedico/dist/${P}-docs.tar.gz
"
[[ ${PV} != *beta* ]] && \
KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
[gentoo-commits] repo/gentoo:master commit in: net-dns/coredns/
commit: 802bc249208ce61cfd0a728d884eac6a3b9903d2
Author: Zac Medico gentoo org>
AuthorDate: Sun May 12 21:13:36 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun May 12 21:13:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=802bc249
net-dns/coredns: Copy deps tarball to dev space
Signed-off-by: Zac Medico gentoo.org>
net-dns/coredns/coredns-1.11.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-dns/coredns/coredns-1.11.3.ebuild
b/net-dns/coredns/coredns-1.11.3.ebuild
index 117795b9f150..7f69279c8135 100644
--- a/net-dns/coredns/coredns-1.11.3.ebuild
+++ b/net-dns/coredns/coredns-1.11.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == * ]]; then
EGIT_REPO_URI="https://github.com/coredns/coredns.git;
else
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- SRC_URI+="
https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz
-> ${P}-deps.tar.xz"
+ SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz;
KEYWORDS="~amd64"
fi
[gentoo-commits] repo/gentoo:master commit in: net-dns/coredns/
commit: 9944f0cbce1bba286093ab452fb0f7d046c0468d
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Fri May 3 06:34:58 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun May 12 21:07:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9944f0cb
net-dns/coredns: add 1.11.3
* Deps tarball size reduced from 250+ -> 6 MiB
* Switch from Makefile build to direct `go build` because former was
getting messier with Go versions. Latter is simpler.
* Remove test USE flag as not needed anymore
Signed-off-by: Rahil Bhimjiani rahil.rocks>
Closes: https://github.com/gentoo/gentoo/pull/36528
Signed-off-by: Zac Medico gentoo.org>
net-dns/coredns/Manifest | 2 ++
.../{coredns-.ebuild => coredns-1.11.3.ebuild} | 23 ++
net-dns/coredns/coredns-.ebuild| 23 ++
3 files changed, 14 insertions(+), 34 deletions(-)
diff --git a/net-dns/coredns/Manifest b/net-dns/coredns/Manifest
index 7b64f21dc6ff..0deb3578d8d0 100644
--- a/net-dns/coredns/Manifest
+++ b/net-dns/coredns/Manifest
@@ -1,2 +1,4 @@
DIST coredns-1.11.2-r1-deps.tar.xz 6547080 BLAKE2B
19a067a5b402ebe3b8a462e534bbdcf9baade4b5f434c6f24fe8ede0cbe623e2d5d8bdf0ffc06954d796441095688f19caa40f2255a2cc56102fdef36d327ac5
SHA512
caf6e0f1c9be4857059244019d6556f907e4f6907a932c201c856355c3e0b86c1752a90a226d5904c511d0db08ce4869cc5d24203bb4b9e2e1be02e725990332
DIST coredns-1.11.2.tar.gz 651994 BLAKE2B
1a7a272756eaf83170e242a573c8a765d6ea7b70fe422d36a87850b600a88287291aa0fe0d49462c34453d4d3c4d33f9497be409379ff8fccc87f41e2195efc1
SHA512
0e90ef4793555bd46aa5ce84cf639c015d1869b407627c69746eb948abff1920f891c45e5f00c0127f23e2c6394c07cc55c1776af840881210f90faa6ec22b40
+DIST coredns-1.11.3-deps.tar.xz 6662680 BLAKE2B
44bc099586cdaffc381141e347c8921596b0b51bf4f82064d2aca562083597672dfe4b0c965f4c6feebbf4711aff07bd7a301b6ecab28233294978ae94df5fbd
SHA512
49690bc11816e1bbc0a5f325abe64648ea820fecd25695f19bf9921f0a38786cddf30e4a385306470a27d17af9d09a5ec50025ff241ea9f3b6b346eddc859755
+DIST coredns-1.11.3.tar.gz 653856 BLAKE2B
db9efdd1b674f6908ff094866ca5c148e018d7ddae2ae1cc07c13fbf78dcc4e6ed478d2e5946f73d43b8ee6a1924fecd53759e6b9a41935d084fbb1d84b7bb10
SHA512
3ec9296626a2994d1259329e50b032d2972ef8e05bfed742c0ee570414adbfa8f296046b9356ef73d885a1f1c1e3660421762267535ec2d3f357c3064a75d405
diff --git a/net-dns/coredns/coredns-.ebuild
b/net-dns/coredns/coredns-1.11.3.ebuild
similarity index 78%
copy from net-dns/coredns/coredns-.ebuild
copy to net-dns/coredns/coredns-1.11.3.ebuild
index 52c5778f1173..117795b9f150 100644
--- a/net-dns/coredns/coredns-.ebuild
+++ b/net-dns/coredns/coredns-1.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -23,7 +23,6 @@ LICENSE="Apache-2.0"
LICENSE+=" MIT BSD ISC MPL-2.0 BSD-2"
SLOT="0"
-IUSE="test"
# TODO: debug test failure with deps tarball
RESTRICT="test"
@@ -35,32 +34,22 @@ FILECAPS=(
)
src_unpack() {
- if [[ ${PV} == ** ]]; then
+ if [[ ${PV} == * ]]; then
git-r3_src_unpack
go-module_live_vendor
else
- go-module_src_unpack
+ default
fi
}
src_prepare() {
+ [[ ${PV} != * ]] && { ln -sv ../vendor ./ || die ; }
default
- use test || sed -i -e 's|coredns: $(CHECKS)|coredns:|' Makefile
}
src_compile() {
- # For non-live versions, prevent git operations which causes sandbox
violations
- # https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
- [[ ${PV} != * ]] && export GITCOMMIT=''
-
- # Mimicking go-module.eclass's GOFLAGS
- if use amd64 || use arm || use arm64 ||
- ( use ppc64 && [[ $(tc-endian) == "little" ]] ) || use
s390 || use x86; then
- local buildmode="-buildmode=pie"
- fi
- export BUILDOPTS="-buildvcs=false -modcacherw -v -x -p=$(makeopts_jobs)
${buildmode}"
-
- default
+ [[ ${PV} == * ]] && local GIT_COMMIT="$(git describe --dirty
--always)"
+ ego build -ldflags="-s -w -X
github.com/coredns/coredns/coremain.GitCommit=${GIT_COMMIT}"
}
src_install() {
diff --git a/net-dns/coredns/coredns-.ebuild
b/net-dns/coredns/coredns-.ebuild
index 52c5778f1173..117795b9f150 100644
--- a/net-dns/coredns/coredns-.ebuild
+++ b/net-dns/coredns/coredns-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -23,7 +23,6 @@ LICENSE="Apache-2.0"
LICENSE+=" MIT BSD ISC MPL-2.0 BSD-2"
SLOT="0"
-IUSE=&
[gentoo-commits] repo/gentoo:master commit in: net-dns/coredns/
commit: 67005ff6f266e22f7ce15b39fbf4d365a9a8e511
Author: Zac Medico gentoo org>
AuthorDate: Sun May 12 21:05:48 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun May 12 21:05:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67005ff6
net-dns/coredns: drop 1.11.2
Signed-off-by: Zac Medico gentoo.org>
net-dns/coredns/Manifest | 1 -
net-dns/coredns/coredns-1.11.2.ebuild | 121 --
2 files changed, 122 deletions(-)
diff --git a/net-dns/coredns/Manifest b/net-dns/coredns/Manifest
index 9f5b7a662200..7b64f21dc6ff 100644
--- a/net-dns/coredns/Manifest
+++ b/net-dns/coredns/Manifest
@@ -1,3 +1,2 @@
-DIST coredns-1.11.2-deps.tar.xz 261482588 BLAKE2B
39e30800ac1fc404dc60f859b929c4a69614b9f0be8937c3fd7b1a872ec1e163ab4f6a313ed7661d2a101318187aaa2419168c0511cf2108c43ada38db0d1e0b
SHA512
91282766d10d28d564d14fb20d8d82808507e509c58b7bb1959bb03a2665a287057aa4d547bfc8cc60ff080eea807af1c57d86bf9ff000125ef0642d8557e47f
DIST coredns-1.11.2-r1-deps.tar.xz 6547080 BLAKE2B
19a067a5b402ebe3b8a462e534bbdcf9baade4b5f434c6f24fe8ede0cbe623e2d5d8bdf0ffc06954d796441095688f19caa40f2255a2cc56102fdef36d327ac5
SHA512
caf6e0f1c9be4857059244019d6556f907e4f6907a932c201c856355c3e0b86c1752a90a226d5904c511d0db08ce4869cc5d24203bb4b9e2e1be02e725990332
DIST coredns-1.11.2.tar.gz 651994 BLAKE2B
1a7a272756eaf83170e242a573c8a765d6ea7b70fe422d36a87850b600a88287291aa0fe0d49462c34453d4d3c4d33f9497be409379ff8fccc87f41e2195efc1
SHA512
0e90ef4793555bd46aa5ce84cf639c015d1869b407627c69746eb948abff1920f891c45e5f00c0127f23e2c6394c07cc55c1776af840881210f90faa6ec22b40
diff --git a/net-dns/coredns/coredns-1.11.2.ebuild
b/net-dns/coredns/coredns-1.11.2.ebuild
deleted file mode 100644
index 89d7e8f271e2..
--- a/net-dns/coredns/coredns-1.11.2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps go-module multiprocessing systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="CoreDNS is a DNS server that chains plugins"
-HOMEPAGE="https://github.com/coredns/coredns;
-
-if [[ ${PV} == * ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/coredns/coredns.git;
-else
- #SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- # The v1.11.2 tag went missing upstream, so use a previously fetched
copy.
- SRC_URI="https://dev.gentoo.org/~zmedico/dist/${P}.tar.gz;
- SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz;
- KEYWORDS="amd64"
-fi
-
-# main
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" MIT BSD ISC MPL-2.0 BSD-2"
-
-SLOT="0"
-IUSE="test"
-# TODO: debug test failure with deps tarball
-RESTRICT="test"
-
-RDEPEND="acct-user/coredns
- acct-group/coredns"
-
-FILECAPS=(
- -m 755 'cap_net_bind_service=+ep' usr/bin/${PN}
-)
-
-src_unpack() {
- if [[ ${PV} == ** ]]; then
- git-r3_src_unpack
- go-module_live_vendor
- else
- go-module_src_unpack
- fi
-}
-
-src_prepare() {
- default
- use test || sed -i -e 's|coredns: $(CHECKS)|coredns:|' Makefile
-}
-
-src_compile() {
- # For non-live versions, prevent git operations which causes sandbox
violations
- # https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
- [[ ${PV} != * ]] && export GITCOMMIT=''
-
- # Mimicking go-module.eclass's GOFLAGS
- if use amd64 || use arm || use arm64 ||
- ( use ppc64 && [[ $(tc-endian) == "little" ]] ) || use
s390 || use x86; then
- local buildmode="-buildmode=pie"
- fi
- export BUILDOPTS="-buildvcs=false -modcacherw -v -x -p=$(makeopts_jobs)
${buildmode}"
-
- default
-}
-
-src_install() {
- dobin "${PN}"
- einstalldocs
- doman man/*
-
- newinitd "${FILESDIR}"/coredns.initd coredns
- newconfd "${FILESDIR}"/coredns.confd coredns
-
- insinto /etc/coredns/
- newins "${FILESDIR}"/Corefile.example Corefile
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/coredns.logrotated coredns
-
- systemd_dounit "${FILESDIR}"/coredns.service
- newtmpfiles "${FILESDIR}"/coredns.tmpfiles "${PN}.conf"
-}
-
-src_test() {
- # eclass default '-x' makes tests output unreadable
- export GOFLAGS="-v -mod=readonly"
-
- local known_fail=(
- "TestZoneExternalCNAMELookupWithProxy"
- "TestMetricsSeveralBlocs"
- "TestMetricsAvailable"
- "TestMetricsAvailableAfterReload"
-
[gentoo-commits] repo/gentoo:master commit in: app-containers/podman-tui/
commit: 42169fa876a50d08c4201edae69732a15d4ebf38
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Sat May 11 14:31:58 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun May 12 20:49:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42169fa8
app-containers/podman-tui: update to 1.0.1, remove 0.14.0 & 0.17.0
Signed-off-by: Rahil Bhimjiani rahil.rocks>
From: https://github.com/gentoo/gentoo/pull/36642
Signed-off-by: Zac Medico gentoo.org>
app-containers/podman-tui/Manifest | 3 +-
app-containers/podman-tui/podman-tui-0.14.0.ebuild | 37 --
...n-tui-0.17.0.ebuild => podman-tui-1.0.1.ebuild} | 0
3 files changed, 1 insertion(+), 39 deletions(-)
diff --git a/app-containers/podman-tui/Manifest
b/app-containers/podman-tui/Manifest
index 8c13a661d10e..238979100079 100644
--- a/app-containers/podman-tui/Manifest
+++ b/app-containers/podman-tui/Manifest
@@ -1,4 +1,3 @@
-DIST podman-tui-0.14.0.tar.gz 15857429 BLAKE2B
c1a6f056b45d4fa9e0cd749570275da1d98d3f8477a1e85a151afd1cecc9506555c55e065b86d9c49acde36a27c3dac960530218022672fc8044dee0d2284c62
SHA512
d79e5b0cabed6873ff90e4e36fec841b74d53b0e876f6449c9b5512c8a92d7d4bcf733e23abc92a6344d6dcd72957929fde48b4e16dcb1cc33cf10f33074171a
-DIST podman-tui-0.17.0.tar.gz 15853215 BLAKE2B
bfdaf085837497c8ce1525eccb04fc977472291e45417a3993a3e9bc2a742e132d14bce7580c0126be94262a10999da2b81edd6997b8c377a3de8a4da20c153f
SHA512
137740737e4fe5138198923fb5db6dc6ca901ed7739af09c19bcb0a60fdfe0db79d7c2ac83157675ec478ab8e9dc9b1348cd8aa9f0e5298f8d20ff6cf0284afc
DIST podman-tui-0.18.0.tar.gz 15928626 BLAKE2B
80fd4f826a407b4eeeb664c065f836f12dd85cacab35003ad8fbcabf3eb69b3838bf02fb76269124d18c110370e42556cff8e348caabb100aa88a1994f99d4cc
SHA512
77107a9e64b12fd5065698b7065909d5aa45ca49d749056cfb0f76aa2fd0f269708d3d75ecb4cab7939c30571510cdacebcdaac67549979873e3656e1af4db9f
DIST podman-tui-1.0.0.tar.gz 16208356 BLAKE2B
c5ae4274cdc6c4d5abb9f9a18c82949a40a9f2894a9127d8bdf89b8a9445716cc985d8400833c890dec4524fd617babd5791e3062e9e7654ea93d66c34dfe181
SHA512
918b3efb823a543a439ae0f56c59ee2689961ac6e39a40054a7971ddf02056ca50c7c681ca03c45590e9fdfce1822f406bbf90f9b25563a0ef9ae75b88235a8c
+DIST podman-tui-1.0.1.tar.gz 16252864 BLAKE2B
14b28a87aca99d90d9412d7bdd052604bdd8c05b262564eaa6821fd10f1f357bcb5f65d486da53a1abf98cfd45fadaf847f14942a27525136e70f83603ef6d85
SHA512
3c5ff5a77e885a0518a16e8d7fd0581a80b16650b546d2c736c50503c250797be1b8cb1a2da68ee1eed5a7a1dcdbcfa8344f37d0c6724c341470d05446a0591e
diff --git a/app-containers/podman-tui/podman-tui-0.14.0.ebuild
b/app-containers/podman-tui/podman-tui-0.14.0.ebuild
deleted file mode 100644
index 2effb9e6c06b..
--- a/app-containers/podman-tui/podman-tui-0.14.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-DESCRIPTION="Terminal UI frontend for Podman"
-HOMEPAGE="https://github.com/containers/podman-tui;
-
-if [[ ${PV} == * ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/containers/podman-tui.git;
-else
- SRC_URI="https://github.com/containers/podman-tui/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-# main pkg
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" BSD-2 BSD MIT MPL-2.0"
-SLOT="0"
-RESTRICT="test"
-RDEPEND="
- >=app-containers/podman-4.0.2
-"
-
-src_compile() {
- # parse tags from Makefile & make them comma-seperated as
space-seperated list is deprecated
- local BUILDTAGS=$(grep 'BUILDTAGS :=' Makefile | awk -F\" '{ print $2;
}' | sed -e 's| |,|g;')
- ego build -tags "${BUILDTAGS}"
-}
-
-src_install() {
- dobin "${PN}"
- einstalldocs
-}
diff --git a/app-containers/podman-tui/podman-tui-0.17.0.ebuild
b/app-containers/podman-tui/podman-tui-1.0.1.ebuild
similarity index 100%
rename from app-containers/podman-tui/podman-tui-0.17.0.ebuild
rename to app-containers/podman-tui/podman-tui-1.0.1.ebuild
[gentoo-commits] repo/gentoo:master commit in: app-containers/buildah/
commit: 27992946076efece61e52e2958ed411369944b1b
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Sat May 11 14:16:30 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun May 12 20:49:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27992946
app-containers/buildah: update to 1.35.4
Signed-off-by: Rahil Bhimjiani rahil.rocks>
From: https://github.com/gentoo/gentoo/pull/36642
Signed-off-by: Zac Medico gentoo.org>
app-containers/buildah/Manifest | 1 +
app-containers/buildah/buildah-1.35.4.ebuild | 133 +++
2 files changed, 134 insertions(+)
diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest
index 7c70929c83d1..e5c0f32b7762 100644
--- a/app-containers/buildah/Manifest
+++ b/app-containers/buildah/Manifest
@@ -1,3 +1,4 @@
DIST buildah-1.33.7.tar.gz 18604354 BLAKE2B
d2788096d8d6fd6cc528e8f33edc58a2775a561ea3c4a983eb4a6fa1d5b570f6d8dc0f77e464d0c242add5d641e20afce83c9f5157021fbc82a009ea47c9
SHA512
1248ad1dcf0d10608674543caf4d78f5052db7932102226e23b73add5e129bd8c614672f3d06aa8052675dd83fa83ef2742ef08fe1a883037b41df8fde893ea1
DIST buildah-1.34.3.tar.gz 18856476 BLAKE2B
c91c995a2ff4be8b4e84a70c581a817cb2f1333b08ca297163d218f80d538905c41718cfc267c03173330234c3476344be44df799eaaac891395a22bc7a020b3
SHA512
26d5c48cb5b056a274c1a9c6820a6076337f625fc6dd6683000db871f3de9d37907bd962ced3400334bfc230718219cda2108e2e984be5f8c76ecfa4a2f1e1ac
DIST buildah-1.35.3.tar.gz 19372597 BLAKE2B
014bea80b3a8c4482bbe098a0c5293892cf9f4f0d4d74ecaba8f155e49fab326689b95b690b413d64f6b576c7269bdb9d0f446244b832afe311e909b3f96856d
SHA512
ca325ce1a878eb9e9a6caedf236add16702d8dcd83f15a1995b8215998821218104ea8cb7a5d11fc354ee01d9805c339578975d35db859f1d53b08e0a2139fe3
+DIST buildah-1.35.4.tar.gz 19370823 BLAKE2B
6dc8ad2a21c3ce41d4b8a2908d90bcbb32f5598c11fcde49a706334407370998731fedac7d8ee8e080a6a168c10b4a0404bf1120cab8b561e916a9df2bd2d115
SHA512
679f2328f675a39f9965128d51a6e8a3f82d64a6d3c3cdcb862cfcb7691eba272d869b6718147da1590aa573534081329ef05e879875024a11aa9ad52b2f292f
diff --git a/app-containers/buildah/buildah-1.35.4.ebuild
b/app-containers/buildah/buildah-1.35.4.ebuild
new file mode 100644
index ..e1c7e23390e5
--- /dev/null
+++ b/app-containers/buildah/buildah-1.35.4.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module linux-info toolchain-funcs
+
+DESCRIPTION="A tool that facilitates building OCI images"
+HOMEPAGE="https://github.com/containers/buildah;
+
+# main pkg
+LICENSE="Apache-2.0"
+# deps
+LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+
+SLOT="0"
+IUSE="apparmor btrfs +seccomp systemd test"
+RESTRICT="test"
+DOCS=(
+ "CHANGELOG.md"
+ "troubleshooting.md"
+ "docs/tutorials"
+)
+
+if [[ ${PV} == * ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/containers/buildah.git;
+else
+ SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64"
+fi
+
+RDEPEND="
+ systemd? ( sys-apps/systemd )
+ btrfs? ( sys-fs/btrfs-progs )
+ seccomp? ( sys-libs/libseccomp:= )
+ apparmor? ( sys-libs/libapparmor:= )
+ >=app-containers/containers-common-0.58.0-r1
+ app-crypt/gpgme:=
+ dev-libs/libgpg-error:=
+ dev-libs/libassuan:=
+ sys-apps/shadow:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-go/go-md2man"
+
+PATCHES=(
+ "${FILESDIR}"/dont-call-as-directly-upstream-pr-5436.patch
+ "${FILESDIR}"/softcode-strip-upstream-pr-5446.patch
+)
+
+pkg_pretend() {
+ local CONFIG_CHECK=""
+ use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
+ check_extra_config
+
+ linux_config_exists || ewarn "Cannot determine configuration of your
kernel."
+}
+
+src_prepare() {
+ default
+
+ # ensure all necessary files are there
+ local file
+ for file in docs/Makefile hack/libsubid_tag.sh hack/apparmor_tag.sh \
+ hack/systemd_tag.sh btrfs_installed_tag.sh btrfs_tag.sh; do
+ [[ -f "${file}" ]] || die
+ done
+
+ sed -i -e "s|/usr/local|/usr|g" Makefile docs/Makefile || die
+ echo -e '#!/usr/bin/env bash\necho libsubid' > hack/libsubid_tag.sh ||
die
+
+ cat <<-EOF > hack/apparmor_tag.sh || die
+ #!/usr/bin/env bash
+ $(usex apparmor 'echo apparmor' echo)
+ EOF
+
+ use seccomp || {
+ cat <<-'EOF' > "${T}/disable_seccomp.patch"
+--- a/Makefile
++++ b/Makefile
+@@ -5 +5 @@
+-SECURITYTAGS ?= secc
[gentoo-commits] repo/gentoo:master commit in: app-containers/podman/
commit: d537e7498b667cf0f67063b978f362fd23af6968
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Sat May 11 14:06:28 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun May 12 20:49:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d537e749
app-containers/podman: update to 5.0.3, remove 5.0.1
Signed-off-by: Rahil Bhimjiani rahil.rocks>
From: https://github.com/gentoo/gentoo/pull/36642
Signed-off-by: Zac Medico gentoo.org>
app-containers/podman/Manifest | 2 +-
app-containers/podman/{podman-5.0.1.ebuild => podman-5.0.3.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index 5b73dbae0975..8b245d7b6949 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -1,3 +1,3 @@
DIST podman-4.9.4.tar.gz 21733620 BLAKE2B
17d099c0a13fbbb77556742313c39995127fc97b4086ef3c2d74a92cc0a4f825a6c729dd099c6d4f4cd3d2ebfd470494babdeaa85a5653b327ea1a16fb5ea993
SHA512
7b52555789a1c214fcf26b0826bdda6cf0ccca588f87c0f15ac5e8358ddac625e17cafbe6a43de07cad964e1418b5ee0d2e38a5cb5dc6f6d4e638399749a7f7b
-DIST podman-5.0.1.tar.gz 21863115 BLAKE2B
433949d70e7984a278d5231fe4a480d0c758a67e6df30f587f25da727440ba944cf38bb979ab6b6375f0ba65038c6b4c5a8ca73c6bc73df57b92089c5f6c072e
SHA512
4ab64beea9b23839caa35bf8ec0f097ed16b4d2f448ce16039bb55672ac8b1d8d8cadf86c21eb32dc2c1d30dabb5b57a141823aa5fc3f14f09741f76cffa6023
DIST podman-5.0.2.tar.gz 23811875 BLAKE2B
e943eb36eb0b80332223afc5d971c0886f6eaffeb7133c634d28c0a38e9aae6a54266691067dbca7684882f8b6dad72c3d5de2287ec5a7e8fb4b1cfd96df0b4d
SHA512
70dbac9fc81d66eb9b0a5174f5776b805397005cacca917674d2b001591fadd05a776c956e693bad932e9eefe591c35da5c566e8e9e01db8be42bc454cd03104
+DIST podman-5.0.3.tar.gz 23814179 BLAKE2B
46385710e4d24f8eca3a7c98c18a97b96ecd4691b3c965c5a5e7bc690d40d892a6d5fb71c1dd8ec56cc907a2167ab5ee795b4d2c2279c58cef3a5a1cece8b678
SHA512
c605a52cc5aba43d485796c4986f2d1be704e5c931473bf5ba1cf77f703cdb3d16f41d33da0b25287e8d001077f77caf117d3ea5dbd7c56a744274025d9ab07d
diff --git a/app-containers/podman/podman-5.0.1.ebuild
b/app-containers/podman/podman-5.0.3.ebuild
similarity index 100%
rename from app-containers/podman/podman-5.0.1.ebuild
rename to app-containers/podman/podman-5.0.3.ebuild
[gentoo-commits] repo/gentoo:master commit in: net-misc/passt/
commit: 4096f920cd90feb2189b3eadd8e072bb6f0dd118
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Sat May 11 14:34:38 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun May 12 20:49:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4096f920
net-misc/passt: update to 2024.05.10, cleanup
Signed-off-by: Rahil Bhimjiani rahil.rocks>
Closes: https://github.com/gentoo/gentoo/pull/36642
Signed-off-by: Zac Medico gentoo.org>
net-misc/passt/Manifest | 1 +
net-misc/passt/{passt-.ebuild => passt-2024.05.10.ebuild} | 2 +-
net-misc/passt/passt-.ebuild | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/net-misc/passt/Manifest b/net-misc/passt/Manifest
index 9ef071fe8383..58e08ceca1b8 100644
--- a/net-misc/passt/Manifest
+++ b/net-misc/passt/Manifest
@@ -1,3 +1,4 @@
DIST passt-2024.03.26.tar.xz 195348 BLAKE2B
d91e6ac1d50aae04ceb53a34341b545ff644ceccdfcfab461907050612d9d871f61591aac02ebddef9a607a9b39ce5017a2fc47c9189f85b9b9a70a30d010e4c
SHA512
da771f8f334862f81702b22688c9d3552aefc2883b5a44c39156ff7a69f301cabf52fa0fb13f8695240db5411c498806d28d847fca8caff2bedb69d1a4b4e5a7
DIST passt-2024.04.05.tar.xz 195772 BLAKE2B
4c237aeda56455f948d4309624d171612d59fa7ec653e7f89c1aeb05c677ccbdeeaaf6e14c09cda1d5bc88a97fca57dbbe480095e9711045fbd381bd30fb644a
SHA512
bf14689cb1c4780d4249562965ff9a5a0515756cbf5af4b531c17982a066f33001a65210959ff8da691ddaa75560ab5691c685a4c1a4b73e742a883d12d2a24b
DIST passt-2024.04.26.tar.xz 196148 BLAKE2B
f3a9b9d2a9fa42e0dd35894d4c92890af9935965ccfb3b1751c396080ab0482bd541fe22f09ae7b068f336f1e985b6905d2cc93987a17f243ba6ec97d880ee68
SHA512
f25b9bc695de555048f6a24ec9bb603ec6def0449227ce837b6e46f8cda5816c2450aa733257aaa349260b0b7c05b2d5580ad21010a1a45a74e9eb3027e37d98
+DIST passt-2024.05.10.tar.xz 195992 BLAKE2B
9f4b680daa8103c7de0c92c01824df74e1b221a48cf7724c2c09aae13a3575bdc529eeca01d5015095c51194045e1019bbdf38cc7ef2333d61eaa03b4e0249ae
SHA512
04add1113ffbc98d61b7c63352899505d8f19bbdf937a0c025726813163ec7fc31abdb94c12ceefed9b49f18b388acc0687298bce8ba156bbb044d1b1bcdaee3
diff --git a/net-misc/passt/passt-.ebuild
b/net-misc/passt/passt-2024.05.10.ebuild
similarity index 97%
copy from net-misc/passt/passt-.ebuild
copy to net-misc/passt/passt-2024.05.10.ebuild
index c73a0f7c146b..9e4992ffaab0 100644
--- a/net-misc/passt/passt-.ebuild
+++ b/net-misc/passt/passt-2024.05.10.ebuild
@@ -8,7 +8,7 @@ inherit toolchain-funcs
DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement
for Slirp"
HOMEPAGE="https://passt.top/;
-RELEASE_COMMIT="d03c4e2"
+RELEASE_COMMIT="7288448"
if [[ ${PV} == * ]]; then
inherit git-r3
diff --git a/net-misc/passt/passt-.ebuild b/net-misc/passt/passt-.ebuild
index c73a0f7c146b..9e4992ffaab0 100644
--- a/net-misc/passt/passt-.ebuild
+++ b/net-misc/passt/passt-.ebuild
@@ -8,7 +8,7 @@ inherit toolchain-funcs
DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement
for Slirp"
HOMEPAGE="https://passt.top/;
-RELEASE_COMMIT="d03c4e2"
+RELEASE_COMMIT="7288448"
if [[ ${PV} == * ]]; then
inherit git-r3
[gentoo-commits] repo/gentoo:master commit in: dev-lang/jerryscript/
commit: 09af1b7b4285a3083f4221bda80c92dc0838315d
Author: Zac Medico gentoo org>
AuthorDate: Sun May 12 19:21:37 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun May 12 19:27:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09af1b7b
dev-lang/jerryscript: enable py3.12
Closes: https://bugs.gentoo.org/929400
Signed-off-by: Zac Medico gentoo.org>
dev-lang/jerryscript/jerryscript-2.4.0-r4.ebuild | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-lang/jerryscript/jerryscript-2.4.0-r4.ebuild
b/dev-lang/jerryscript/jerryscript-2.4.0-r4.ebuild
index 60be1af801e9..c87480e20a8c 100644
--- a/dev-lang/jerryscript/jerryscript-2.4.0-r4.ebuild
+++ b/dev-lang/jerryscript/jerryscript-2.4.0-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit cmake python-single-r1
DESCRIPTION="Ultra-lightweight JavaScript engine for the Internet of Things"
@@ -17,7 +17,7 @@ IUSE="debugger"
RDEPEND="debugger? ( ${PYTHON_DEPS} )"
BDEPEND="${RDEPEND}"
REQUIRED_USE="debugger? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT+=" test"
+RESTRICT="test"
PATCHES=(
"${FILESDIR}/jerryscript-2.4.0-python3-r4.patch"
[gentoo-commits] repo/gentoo:master commit in: net-misc/passt/
commit: e1c236944737997b3606c1dad93955de8de02430
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Fri May 3 14:25:50 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun May 5 18:36:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1c23694
net-misc/passt: add 2024.04.26 and cleanup
Signed-off-by: Rahil Bhimjiani rahil.rocks>
Closes: https://github.com/gentoo/gentoo/pull/36532
Signed-off-by: Zac Medico gentoo.org>
net-misc/passt/Manifest| 4 +--
net-misc/passt/passt-2023.12.04.ebuild | 29 --
net-misc/passt/passt-2023.12.30.ebuild | 29 --
...t-2024.03.20.ebuild => passt-2024.04.26.ebuild} | 2 +-
net-misc/passt/passt-.ebuild | 2 +-
5 files changed, 3 insertions(+), 63 deletions(-)
diff --git a/net-misc/passt/Manifest b/net-misc/passt/Manifest
index 11f5c4743bd1..9ef071fe8383 100644
--- a/net-misc/passt/Manifest
+++ b/net-misc/passt/Manifest
@@ -1,5 +1,3 @@
-DIST passt-2023.12.04.tar.xz 188136 BLAKE2B
f1d72fbb4bbb25f6a11e9ff87a91cf9bac06e047b8cb9a8b40402ced1422c23b105fa7e64646698d38ad747efa449c34cfdaecf492a3e4984114cbcf60656cdc
SHA512
febd9fa22363438b52b2688481183d81c22966e1775139fc559dbfa50437c9b00ba09800db867738d25fcea8ac05d4589b75dcd2d0c88eeffefc0598d4236001
-DIST passt-2023.12.30.tar.xz 188596 BLAKE2B
75712a7cb7a00fea20427979153090d938b8c7b0e3da61c83cabb3751786034df35ebbe8afbd991d582a680f55b12792547b68efa931a5576dc181040b31e5fd
SHA512
4b19d191e2526bacc61bb8ab2964f5da4e0535656b094a7592f91d6b437c855a586fc772e2abd89138ff4f89aae12ade494c6e0fe7bee1502fe319215200d8f0
-DIST passt-2024.03.20.tar.xz 195332 BLAKE2B
1bed740ddd235f300a4233fb2024f155758809589f1fdd2174ab99a8a93dd16044ab41814b215d12eb1e557966a73a3754bbff2b9acd752b45b385edd88ba3c7
SHA512
3701820e539545771d0f867fe0b8977cb5967e7501413f717fed08d2d2c141f17d86ed7238177b4fb4cf4cfc01c6c9d07e3c218c34b48e0a5a1f2b2ce8a5b903
DIST passt-2024.03.26.tar.xz 195348 BLAKE2B
d91e6ac1d50aae04ceb53a34341b545ff644ceccdfcfab461907050612d9d871f61591aac02ebddef9a607a9b39ce5017a2fc47c9189f85b9b9a70a30d010e4c
SHA512
da771f8f334862f81702b22688c9d3552aefc2883b5a44c39156ff7a69f301cabf52fa0fb13f8695240db5411c498806d28d847fca8caff2bedb69d1a4b4e5a7
DIST passt-2024.04.05.tar.xz 195772 BLAKE2B
4c237aeda56455f948d4309624d171612d59fa7ec653e7f89c1aeb05c677ccbdeeaaf6e14c09cda1d5bc88a97fca57dbbe480095e9711045fbd381bd30fb644a
SHA512
bf14689cb1c4780d4249562965ff9a5a0515756cbf5af4b531c17982a066f33001a65210959ff8da691ddaa75560ab5691c685a4c1a4b73e742a883d12d2a24b
+DIST passt-2024.04.26.tar.xz 196148 BLAKE2B
f3a9b9d2a9fa42e0dd35894d4c92890af9935965ccfb3b1751c396080ab0482bd541fe22f09ae7b068f336f1e985b6905d2cc93987a17f243ba6ec97d880ee68
SHA512
f25b9bc695de555048f6a24ec9bb603ec6def0449227ce837b6e46f8cda5816c2450aa733257aaa349260b0b7c05b2d5580ad21010a1a45a74e9eb3027e37d98
diff --git a/net-misc/passt/passt-2023.12.04.ebuild
b/net-misc/passt/passt-2023.12.04.ebuild
deleted file mode 100644
index 5683bd6f8693..
--- a/net-misc/passt/passt-2023.12.04.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement
for Slirp"
-HOMEPAGE="https://passt.top/;
-
-RELEASE_COMMIT="b86afe3"
-
-if [[ ${PV} == * ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://passt.top/passt"
-else
-
SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz ->
${P}.tar.xz"
- S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
- KEYWORDS="~amd64"
-fi
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-IUSE="static"
-
-src_compile() {
- [[ ${PV} != * ]] && export VERSION="${PV}"
- export prefix="${EPREFIX}/usr" docdir="${EPREFIX}/usr/share/doc/${P}"
-
- emake $(usev static)
-}
diff --git a/net-misc/passt/passt-2023.12.30.ebuild
b/net-misc/passt/passt-2023.12.30.ebuild
deleted file mode 100644
index cf2c6784ce85..
--- a/net-misc/passt/passt-2023.12.30.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement
for Slirp"
-HOMEPAGE="https://passt.top/;
-
-RELEASE_COMMIT="f091893"
-
-if [[ ${PV} == * ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://passt.top/passt"
-else
-
SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz ->
${P}.tar.xz"
- S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
- KEYWORDS="~amd64 ~riscv"
-fi
-
-LICENSE="BSD GPL-2+"
-SLOT="0&qu
[gentoo-commits] repo/gentoo:master commit in: dev-go/go-tools/
commit: 611dc25065c7609af05675b9dec6deb79188a7b6
Author: Zac Medico gentoo org>
AuthorDate: Thu May 2 04:25:51 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Thu May 2 04:30:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=611dc250
dev-go/go-tools: RESTRICT test for 0.1.10
Since we now have RESTRICT="test" in the newer 0.20.0 ebuild
we should also do the same for the old version which we
hopefully can drop soon anyway.
Closes: https://bugs.gentoo.org/904314
Signed-off-by: Zac Medico gentoo.org>
dev-go/go-tools/go-tools-0.1.10.ebuild | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dev-go/go-tools/go-tools-0.1.10.ebuild
b/dev-go/go-tools/go-tools-0.1.10.ebuild
index f0cc27e54838..6b26c11d0b19 100644
--- a/dev-go/go-tools/go-tools-0.1.10.ebuild
+++ b/dev-go/go-tools/go-tools-0.1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -8,12 +8,14 @@ DESCRIPTION="Tools that support the Go programming language
(godoc, etc.)"
HOMEPAGE="https://godoc.org/golang.org/x/tools;
SRC_URI="https://github.com/golang/tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz;
+S=${WORKDIR}/${P#go-}
LICENSE="BSD MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
-S=${WORKDIR}/${P#go-}
+# Many test failures (bug 904314).
+RESTRICT="test"
src_prepare() {
default
[gentoo-commits] repo/gentoo:master commit in: dev-go/go-tools/
commit: 334b68c9fbed092c3622e4d65a8ff2526ec5d3a4
Author: Zac Medico gentoo org>
AuthorDate: Thu May 2 04:11:02 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Thu May 2 04:19:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=334b68c9
dev-go/go-tools: add 0.20.0
Also set RESTRICT="test" because there are many failures.
Bug: https://bugs.gentoo.org/904314
Signed-off-by: Zac Medico gentoo.org>
dev-go/go-tools/Manifest | 2 ++
dev-go/go-tools/go-tools-0.20.0.ebuild | 52 ++
2 files changed, 54 insertions(+)
diff --git a/dev-go/go-tools/Manifest b/dev-go/go-tools/Manifest
index af0b9654c8c0..69c562a90597 100644
--- a/dev-go/go-tools/Manifest
+++ b/dev-go/go-tools/Manifest
@@ -1,2 +1,4 @@
DIST go-tools-0.1.10-deps.tar.xz 16247548 BLAKE2B
7dc27e377eec3c7fa49d37614d2b7b826735228ae3b22b9481bcba4e344afd51145e98a885c33b5b732d9e6382a5f50a94efcd6f3a820088dd528e561bd5fae0
SHA512
a7bcb32b0393640dd603e07958dc70abba750d219b46f2de649d7e3644432364798c5227df5d764ab6e62d01b60f10d74668914ea09f469ce19134bc934d17ba
DIST go-tools-0.1.10.tar.gz 3014465 BLAKE2B
f3b6129ad00385539eab3426bc542a120bd41d3984174d5d8b91bee6435d7a179c0058f2a50de3235a07e5b67f6d9657288bd578591d61187447441bb6408e76
SHA512
9c817c98739a1788b7fb459728528b5c647226e64df495661c1b3027bfa571e884d6c28d8796558b65e2ba54774976897bddcd052568f33d4e30ce8ee5d883e1
+DIST go-tools-0.20.0-deps.tar.xz 383336 BLAKE2B
0bddd81087bae28c2d874a2ea647a5293b32895fded73351813c1542066d7ee1a0d3d8a0aaa5c13cea3e117c692b46690282f992293d83c8fbd2901adc71911f
SHA512
eeaa8a85ec81eed757156f99d6bc99f69c89debf52eb862e870c7effb7a0b800736e04f507efa19be122a5246aed2519d4c33bd850bc790947f065ab8a87a323
+DIST go-tools-0.20.0.tar.gz 3779878 BLAKE2B
42175d921dfb5acb25c9eee224138675619860aefaca09db8e354481c146faa52b2fcc64d99953d8508a79ce8375ebcc42a1e7d20f4721e55b8c843989565fbc
SHA512
c67706593d0a48f941955e40cadc1e39961b07ba51c9342b302ba99f93a1e55b9feec21d6171ee370f96293253be27b480274d48a16eff1055373f81b73f2dd9
diff --git a/dev-go/go-tools/go-tools-0.20.0.ebuild
b/dev-go/go-tools/go-tools-0.20.0.ebuild
new file mode 100644
index ..fe369f14fa0a
--- /dev/null
+++ b/dev-go/go-tools/go-tools-0.20.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Tools that support the Go programming language (godoc, etc.)"
+HOMEPAGE="https://godoc.org/golang.org/x/tools;
+SRC_URI="https://github.com/golang/tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz;
+S=${WORKDIR}/${P#go-}
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+# Many test failures.
+RESTRICT="test"
+
+GO_TOOLS_BINS=(
+ authtest benchcmp bisect bundle callgraph compilebench cookieauth
deadcode
+ defers digraph eg fieldalignment file2fuzz findcall fiximports
fuzz-driver
+ fuzz-runner gitauth go-contrib-init godex godoc goimports gomvpkg gonew
+ gopackages gorename gostacks gotype goyacc html2article httpmux
ifaceassert
+ lostcancel netrcauth nilness nodecount play present present2md shadow
+ splitdwarf ssadump stress stringer stringintconv toolstash unmarshal
+ unusedresult
+)
+
+src_compile() {
+ local bin packages
+ readarray -t packages < <(ego list ./...)
+ GOBIN="${S}/bin" nonfatal ego install -work "${packages[@]}" || true
+ for bin in "${GO_TOOLS_BINS[@]}"; do
+ [[ -x ${S}/bin/${bin} ]] || \
+ die "File not found, check build log: ${S}/bin/${bin}"
+ done
+}
+
+src_test() {
+ ego test -work ./...
+}
+
+src_install() {
+ # bug 558818: install binaries in $GOROOT/bin to avoid file collisions
+ local goroot=$(go env GOROOT)
+ goroot=${goroot#${EPREFIX}}
+ exeinto "${goroot}/bin"
+ doexe bin/*
+ dodir /usr/bin
+ ln "${ED}/${goroot}/bin/godoc" "${ED}/usr/bin/godoc" || die
+}
[gentoo-commits] repo/gentoo:master commit in: app-containers/cri-o/
commit: b8e49df71eb2162f3b8b9a51fdd8538afe68ef7a
Author: Zac Medico gentoo org>
AuthorDate: Mon Apr 22 06:01:09 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Apr 22 06:04:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8e49df7
app-containers/cri-o: add 1.29.2
Signed-off-by: Zac Medico gentoo.org>
app-containers/cri-o/Manifest| 1 +
app-containers/cri-o/cri-o-1.29.2.ebuild | 102 +++
2 files changed, 103 insertions(+)
diff --git a/app-containers/cri-o/Manifest b/app-containers/cri-o/Manifest
index 34d6af512fea..11f94eddc2da 100644
--- a/app-containers/cri-o/Manifest
+++ b/app-containers/cri-o/Manifest
@@ -1 +1,2 @@
DIST cri-o-1.29.0.tar.gz 21371695 BLAKE2B
f670605f07446a78ce04f497207e0205aee23138be448bdc2d2fb172691e5bb309234daa1c5c0adbb37dcb24e9177f24f62e01e183ac6443f48054b9e65b6dfe
SHA512
bb83c906964e61ae68219e1374a3e0810fc982fd0389549e6fe3128156af8d5c6effce4217de4d33d3e29e986db630525694093ca3a99b6065385e1e37927fef
+DIST cri-o-1.29.2.tar.gz 21203342 BLAKE2B
deec88f8a505bdc1f184a3512da7f6d4b78499c4a66cacf0651a9fe56b62d33d62eaaf2ce68e5d8e856e13988b26e076ab69c24b30a62b42d88656441d948fcb
SHA512
dd4105e0097a098b9009b00b59a8e8aeaad85b07177305e2e4b2c68a583a0c342e7a615f47a8cbcb7f179035f2c279573069f15aa1e91e491fe770eec1df326c
diff --git a/app-containers/cri-o/cri-o-1.29.2.ebuild
b/app-containers/cri-o/cri-o-1.29.2.ebuild
new file mode 100644
index ..31584eebabb9
--- /dev/null
+++ b/app-containers/cri-o/cri-o-1.29.2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EGIT_COMMIT=d317b5dc918bbfbc78481072a0d93e572aa8d0e8
+
+inherit go-module
+
+DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime
Interface"
+HOMEPAGE="https://cri-o.io/;
+SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="btrfs +device-mapper selinux systemd"
+
+COMMON_DEPEND="
+ app-crypt/gpgme:=
+ app-containers/conmon
+ app-containers/runc
+ dev-libs/glib:=
+ dev-libs/libassuan:=
+ dev-libs/libgpg-error:=
+ net-firewall/conntrack-tools
+ net-firewall/iptables
+ app-containers/cni-plugins
+ net-misc/socat
+ sys-apps/iproute2
+ sys-libs/libseccomp:=
+ btrfs? ( sys-fs/btrfs-progs )
+ device-mapper? ( sys-fs/lvm2:= )
+ selinux? ( sys-libs/libselinux:= )
+ systemd? ( sys-apps/systemd:= )"
+DEPEND="
+ ${COMMON_DEPEND}
+ dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}
+ !> Makefile || die
+
+ sed -e 's:/usr/local/bin:/usr/bin:' \
+ -i contrib/systemd/* || die
+}
+
+src_compile() {
+ [[ -f hack/btrfs_installed_tag.sh ]] || die
+ use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+ hack/btrfs_installed_tag.sh || die; }
+
+ [[ -f hack/libdm_installed.sh ]] || die
+ use device-mapper || { echo -e "#!/bin/sh\necho
exclude_graphdriver_devicemapper" > \
+ hack/libdm_installed.sh || die; }
+
+ [[ -f hack/selinux_tag.sh ]] || die
+ use selinux || { echo -e "#!/bin/sh\ntrue" > \
+ hack/selinux_tag.sh || die; }
+
+ mkdir -p bin || die
+ emake all \
+ GOBIN="${S}/bin" \
+ GO_BUILD="go build ${GOFLAGS}" \
+ GO_MD2MAN="$(which go-md2man)"
+}
+
+src_install() {
+ emake install install.config install.systemd \
+ DESTDIR="${D}" \
+ GO_MD2MAN="$(which go-md2man)" \
+ PREFIX="${D}${EPREFIX}/usr"
+ keepdir /etc/crio
+ mv "${ED}/etc/crio/crio.conf"{,.example} || die
+
+ newinitd "${FILESDIR}/crio.initd" crio
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+
+ # Suppress crio log error messages triggered if these don't exist.
+ keepdir /etc/containers/oci/hooks.d
+ keepdir /usr/share/containers/oci/hooks.d
+
+ # Suppress crio "Missing CNI default network" log message.
+ keepdir /etc/cni/net.d
+ insinto /etc/cni/net.d
+ doins contrib/cni/99-loopback.conflist
+}
[gentoo-commits] repo/gentoo:master commit in: app-containers/cri-o/
commit: dd3df74b260c383ca385badbf0d60b4806f26318
Author: Zac Medico gentoo org>
AuthorDate: Mon Apr 22 05:50:30 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Apr 22 05:50:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd3df74b
app-containers/cri-o: drop 1.26.0
Signed-off-by: Zac Medico gentoo.org>
app-containers/cri-o/Manifest| 1 -
app-containers/cri-o/cri-o-1.26.0.ebuild | 102 ---
2 files changed, 103 deletions(-)
diff --git a/app-containers/cri-o/Manifest b/app-containers/cri-o/Manifest
index 416317049881..34d6af512fea 100644
--- a/app-containers/cri-o/Manifest
+++ b/app-containers/cri-o/Manifest
@@ -1,2 +1 @@
-DIST cri-o-1.26.0.tar.gz 28306997 BLAKE2B
aa4eb7b9964456ff95572e3e8f4f791141956863b13bb9b0eb3507321b76ef7e815f6a27f003f9265ffdfbeaf59a8f3e291187314ec2137dde741143cbcead2f
SHA512
489cd0b3989764f48d8803e65e152515d77326f3f794cec02f694825fc6e5b0541d3608253d5e8a399c9119e85fa947fc62558b4656bf6a189c52e0bef4d669e
DIST cri-o-1.29.0.tar.gz 21371695 BLAKE2B
f670605f07446a78ce04f497207e0205aee23138be448bdc2d2fb172691e5bb309234daa1c5c0adbb37dcb24e9177f24f62e01e183ac6443f48054b9e65b6dfe
SHA512
bb83c906964e61ae68219e1374a3e0810fc982fd0389549e6fe3128156af8d5c6effce4217de4d33d3e29e986db630525694093ca3a99b6065385e1e37927fef
diff --git a/app-containers/cri-o/cri-o-1.26.0.ebuild
b/app-containers/cri-o/cri-o-1.26.0.ebuild
deleted file mode 100644
index d2510ed1b0e5..
--- a/app-containers/cri-o/cri-o-1.26.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT=214b77367c48acd75a08610ac8d0941540347691
-
-inherit go-module
-
-DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime
Interface"
-HOMEPAGE="https://cri-o.io/;
-SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="btrfs +device-mapper selinux systemd"
-
-COMMON_DEPEND="
- app-crypt/gpgme:=
- app-containers/conmon
- app-containers/runc
- dev-libs/glib:=
- dev-libs/libassuan:=
- dev-libs/libgpg-error:=
- net-firewall/conntrack-tools
- net-firewall/iptables
- app-containers/cni-plugins
- net-misc/socat
- sys-apps/iproute2
- sys-libs/libseccomp:=
- btrfs? ( sys-fs/btrfs-progs )
- device-mapper? ( sys-fs/lvm2:= )
- selinux? ( sys-libs/libselinux:= )
- systemd? ( sys-apps/systemd:= )"
-DEPEND="
- ${COMMON_DEPEND}
- dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}
- !> Makefile || die
-
- sed -e 's:/usr/local/bin:/usr/bin:' \
- -i contrib/systemd/* || die
-}
-
-src_compile() {
- [[ -f hack/btrfs_installed_tag.sh ]] || die
- use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
- hack/btrfs_installed_tag.sh || die; }
-
- [[ -f hack/libdm_installed.sh ]] || die
- use device-mapper || { echo -e "#!/bin/sh\necho
exclude_graphdriver_devicemapper" > \
- hack/libdm_installed.sh || die; }
-
- [[ -f hack/selinux_tag.sh ]] || die
- use selinux || { echo -e "#!/bin/sh\ntrue" > \
- hack/selinux_tag.sh || die; }
-
- mkdir -p bin || die
- emake all \
- GOBIN="${S}/bin" \
- GO_BUILD="go build ${GOFLAGS}" \
- GO_MD2MAN="$(which go-md2man)"
-}
-
-src_install() {
- emake install install.config install.systemd \
- DESTDIR="${D}" \
- GO_MD2MAN="$(which go-md2man)" \
- PREFIX="${D}${EPREFIX}/usr"
- keepdir /etc/crio
- mv "${ED}/etc/crio/crio.conf"{,.example} || die
-
- newinitd "${FILESDIR}/crio.initd" crio
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-
- # Suppress crio log error messages triggered if these don't exist.
- keepdir /etc/containers/oci/hooks.d
- keepdir /usr/share/containers/oci/hooks.d
-
- # Suppress crio "Missing CNI default network" log message.
- keepdir /etc/cni/net.d
- insinto /etc/cni/net.d
- doins contrib/cni/99-loopback.conflist
-}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/flatpak/
commit: 3e5a89cfc048384ddf35268840fea1ebc3e6ee91
Author: Christopher Fore posteo net>
AuthorDate: Sat Apr 20 18:52:49 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Apr 21 07:46:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e5a89cf
sys-apps/flatpak: add 1.12.9, 1.14.6, security bump
- Tests skipped (restricted)
- Fixed trivial QA warnings
- Changed order of HOMEPAGE, SRC_URI, and DESCRIPTION
Bug: https://bugs.gentoo.org/930202
Signed-off-by: Christopher Fore posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/36334
Signed-off-by: Zac Medico gentoo.org>
sys-apps/flatpak/Manifest | 2 +
sys-apps/flatpak/flatpak-1.12.9.ebuild | 108 +
sys-apps/flatpak/flatpak-1.14.6.ebuild | 120 +
3 files changed, 230 insertions(+)
diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
index 56ef409d4835..dc467e2313ab 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -1,3 +1,5 @@
DIST flatpak-1.12.8.tar.xz 1568984 BLAKE2B
6db457eba6b5c03ae4b7037e55f0537821152a80cad8746939fe93008922a9a33ff9f08635613e56a84f2d151826130c497c1e9f7f1e41a5b2dc215882f2eb14
SHA512
5a37d94e12c18a746b222c1ddbd20bddfb22079af1d3a79dc819cdb25f04774c9e4b3a51f9b5ed64f210317e7ec9fb97324ae38ec3430c6a515ba4042805fc57
+DIST flatpak-1.12.9.tar.xz 1572536 BLAKE2B
bd9b116bf0e51e60d1e0c420c4c4553a0ebc55a667bce23a0f3116da0dd566c7ffdb063c0b63f466b9b6e451b3c7791daf40cb5d13e2535d988b58cfc947341f
SHA512
9103acfed4cb25e6ff4a9d023864845cc565f688b1a4b49b0c8c2605eda9a142f33a37ad2ce670c5f7bd30a398027c141adf2a6f6d0d7549b2bfca82214d3f85
DIST flatpak-1.14.4.tar.xz 1637484 BLAKE2B
cf208c581ad76d46489ba473d290c35907da0d1d473bf2b4792fb56c31e7110cd38f1c6fc4ad04aa3675868d17116ba52a84b028d7b7789c1736cfe26f3cabfe
SHA512
3f97096affd4f1de184ded353f1ab403d9f1813b199b9a1595596cc7c5d6b46062aa2ef184255823f50ae95ca60d0542d9b9e520f9a605f9bc51091863bf89b0
DIST flatpak-1.14.5.tar.xz 1637692 BLAKE2B
180dc094ef3feef1ccefceb562836f55f6e875016588a5984435ea3157498a8746305c16aa2c83044c107fd7f0e8f6c034c326b4ae29ade1c657e82cff353d47
SHA512
552deaaf3e6712a56f33698c20e6b8225c8893fe9a375af897fd99e19c487bf79b19c3e4ce3b00f3caf90020019ff67c628ca6a8f2ae1e6e01db397d2081ab2b
+DIST flatpak-1.14.6.tar.xz 1644056 BLAKE2B
68bc8bdaf1d1c8a6046a06f800d41c1603e691e60a90f070c694501d50ee6fba3ad1978e222d22a9f99e2b85de9154e670149227b0f2ea6543483c2d103b5093
SHA512
d858682dbf539afe1b91087b6a0e0ebeea6658a0ef02c96d68259f3d8c58d1e6d02dd8b69db1b3c55f6d5df0f4d7e41c6165f668f09763dd3f9c3beb48f8bcf5
diff --git a/sys-apps/flatpak/flatpak-1.12.9.ebuild
b/sys-apps/flatpak/flatpak-1.12.9.ebuild
new file mode 100644
index ..5d1d9025a7c6
--- /dev/null
+++ b/sys-apps/flatpak/flatpak-1.12.9.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10,11} )
+
+inherit linux-info python-any-r1
+
+DESCRIPTION="Linux application sandboxing and distribution framework"
+HOMEPAGE="https://flatpak.org/;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz;
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="doc introspection policykit seccomp systemd X"
+RESTRICT="test"
+
+RDEPEND="
+ acct-group/flatpak
+ acct-user/flatpak
+ >=app-arch/libarchive-2.8:=
+ app-arch/zstd:=
+ >=app-crypt/gpgme-1.1.8:=
+ >=dev-libs/appstream-glib-0.5.10:=
+ >=dev-libs/glib-2.56:2=
+ >=dev-libs/libxml2-2.4:=
+ dev-libs/json-glib:=
+ dev-libs/libassuan:=
+ >=dev-util/ostree-2020.8:=[gpg(+)]
+ || (
+ dev-util/ostree[curl]
+ dev-util/ostree[soup]
+ )
+ >=gnome-base/dconf-0.26:=
+ gnome-base/gsettings-desktop-schemas
+ >=net-libs/libsoup-2.4:2.4=
+ >=sys-apps/bubblewrap-0.5.0
+ sys-apps/dbus
+ >=sys-fs/fuse-2.9.9:0=
+ sys-apps/xdg-dbus-proxy
+ X? (
+ x11-apps/xauth
+ x11-libs/libXau:=
+ )
+ x11-libs/gdk-pixbuf:2=
+ policykit? ( >=sys-auth/polkit-0.98:= )
+ seccomp? ( sys-libs/libseccomp:= )
+ systemd? ( sys-apps/systemd:= )
+"
+
+DEPEND="${RDEPEND}"
+# pyparsing version pinned for https://bugs.gentoo.org/825230
+BDEPEND="
+ >=dev-build/automake-1.13.4
+ >=sys-devel/gettext-0.18.2
+ virtual/pkgconfig
+ dev-util/gdbus-codegen
+ app-alternatives/yacc
+ introspection? ( >=dev-libs/gobject-introspection-1.40 )
+ doc? (
+ >=dev-util/gtk-doc-1.20
+ dev-libs/libxslt
+ )
+ $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
+"
+
+PDEPEND=&q
[gentoo-commits] repo/gentoo:master commit in: app-containers/podman/
commit: 54254007fd041acfe191a8a7bc269070c184ed78
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Thu Apr 18 01:04:49 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Thu Apr 18 04:07:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54254007
app-containers/podman: update to 5.0.2
Changelog:
Fixed a bug that could leak IPAM entries when a network was removed
(#22034).
Fixed a bug that could cause the rootless network namespace to not be
cleaned up on if an error occurred during setup resulting in errors relating to
a missing resolv.conf being displayed (#22168).
Fixed a bug where Podman would use rootless network namespace logic for
nested containers (#22218).
Fixed a bug where writing to volumes on a Mac could result in EACCESS
failures when using the :z or :Z volume mount options on a directory with read
only files (#19852)
Fixed a bug in the Compat List endpoint for Networks which could result in
a server crash due to concurrent writes to a map (#22330).
Signed-off-by: Rahil Bhimjiani rahil.rocks>
From: https://github.com/gentoo/gentoo/pull/36302
Signed-off-by: Zac Medico gentoo.org>
app-containers/podman/Manifest| 1 +
app-containers/podman/podman-5.0.2.ebuild | 128 ++
2 files changed, 129 insertions(+)
diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index a92bc651bad3..7b7ea893e9aa 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -1,3 +1,4 @@
DIST podman-4.9.4.tar.gz 21733620 BLAKE2B
17d099c0a13fbbb77556742313c39995127fc97b4086ef3c2d74a92cc0a4f825a6c729dd099c6d4f4cd3d2ebfd470494babdeaa85a5653b327ea1a16fb5ea993
SHA512
7b52555789a1c214fcf26b0826bdda6cf0ccca588f87c0f15ac5e8358ddac625e17cafbe6a43de07cad964e1418b5ee0d2e38a5cb5dc6f6d4e638399749a7f7b
DIST podman-5.0.0.tar.gz 21861935 BLAKE2B
1ec7006f272f5da7f93929bc543cd8988d6f9596cb868e9561578ebef85d51cbd6baa4b66571872fc9748c639ca636ce27f6d90303707f04caa321c7b71db81a
SHA512
8800d96d668cbc7a7ff85a09c71b3307a280c124513fd02fe478f415cf8db43ee47dc7e9c3b75046c6bda9f916937a2cc59887c2c4b26766c2f770abb87fd7ce
DIST podman-5.0.1.tar.gz 21863115 BLAKE2B
433949d70e7984a278d5231fe4a480d0c758a67e6df30f587f25da727440ba944cf38bb979ab6b6375f0ba65038c6b4c5a8ca73c6bc73df57b92089c5f6c072e
SHA512
4ab64beea9b23839caa35bf8ec0f097ed16b4d2f448ce16039bb55672ac8b1d8d8cadf86c21eb32dc2c1d30dabb5b57a141823aa5fc3f14f09741f76cffa6023
+DIST podman-5.0.2.tar.gz 23811875 BLAKE2B
e943eb36eb0b80332223afc5d971c0886f6eaffeb7133c634d28c0a38e9aae6a54266691067dbca7684882f8b6dad72c3d5de2287ec5a7e8fb4b1cfd96df0b4d
SHA512
70dbac9fc81d66eb9b0a5174f5776b805397005cacca917674d2b001591fadd05a776c956e693bad932e9eefe591c35da5c566e8e9e01db8be42bc454cd03104
diff --git a/app-containers/podman/podman-5.0.2.ebuild
b/app-containers/podman/podman-5.0.2.ebuild
new file mode 100644
index ..b535f608f817
--- /dev/null
+++ b/app-containers/podman/podman-5.0.2.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11,12} )
+
+inherit go-module python-any-r1 tmpfiles linux-info
+
+DESCRIPTION="A tool for managing OCI containers and pods with
Docker-compatible CLI"
+HOMEPAGE="https://github.com/containers/podman/ https://podman.io/;
+
+if [[ ${PV} == * ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/containers/podman.git;
+else
+
SRC_URI="https://github.com/containers/podman/archive/v${PV/_rc/-rc}.tar.gz ->
${P}.tar.gz"
+ S="${WORKDIR}/${P/_rc/-rc}"
+ [[ ${PV} != *rc* ]] && \
+ KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
+
+# main pkg
+LICENSE="Apache-2.0"
+# deps
+LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="apparmor btrfs +seccomp selinux systemd wrapper"
+RESTRICT="test"
+
+RDEPEND="
+ app-containers/catatonit
+ >=app-containers/conmon-2.1.10
+ >=app-containers/containers-common-0.58.0-r1
+ app-crypt/gpgme:=
+ dev-libs/libassuan:=
+ dev-libs/libgpg-error:=
+ sys-apps/shadow:=
+
+ apparmor? ( sys-libs/libapparmor )
+ btrfs? ( sys-fs/btrfs-progs )
+ wrapper? ( !app-containers/docker-cli )
+ seccomp? ( sys-libs/libseccomp:= )
+ selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= )
+ systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-go/go-md2man
+"
+
+PATCHES=(
+ "${FILESDIR}/seccomp-toggle-4.7.0.patch"
+)
+
+CONFIG_CHECK="
+ ~USER_NS
+"
+
+pkg_setup() {
+ use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
+ linux-info_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_pr
[gentoo-commits] repo/gentoo:master commit in: net-misc/passt/
commit: 70fe93a03cd313515f7f87193282b67f7958a947
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Tue Apr 9 10:10:33 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Thu Apr 18 04:04:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70fe93a0
net-misc/passt: update to 2024.04.05
Signed-off-by: Rahil Bhimjiani rahil.rocks>
Closes: https://github.com/gentoo/gentoo/pull/36173
Signed-off-by: Zac Medico gentoo.org>
net-misc/passt/Manifest | 1 +
net-misc/passt/{passt-.ebuild => passt-2024.04.05.ebuild} | 2 +-
net-misc/passt/passt-.ebuild | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/net-misc/passt/Manifest b/net-misc/passt/Manifest
index 4ed5efa8b832..11f5c4743bd1 100644
--- a/net-misc/passt/Manifest
+++ b/net-misc/passt/Manifest
@@ -2,3 +2,4 @@ DIST passt-2023.12.04.tar.xz 188136 BLAKE2B
f1d72fbb4bbb25f6a11e9ff87a91cf9bac06
DIST passt-2023.12.30.tar.xz 188596 BLAKE2B
75712a7cb7a00fea20427979153090d938b8c7b0e3da61c83cabb3751786034df35ebbe8afbd991d582a680f55b12792547b68efa931a5576dc181040b31e5fd
SHA512
4b19d191e2526bacc61bb8ab2964f5da4e0535656b094a7592f91d6b437c855a586fc772e2abd89138ff4f89aae12ade494c6e0fe7bee1502fe319215200d8f0
DIST passt-2024.03.20.tar.xz 195332 BLAKE2B
1bed740ddd235f300a4233fb2024f155758809589f1fdd2174ab99a8a93dd16044ab41814b215d12eb1e557966a73a3754bbff2b9acd752b45b385edd88ba3c7
SHA512
3701820e539545771d0f867fe0b8977cb5967e7501413f717fed08d2d2c141f17d86ed7238177b4fb4cf4cfc01c6c9d07e3c218c34b48e0a5a1f2b2ce8a5b903
DIST passt-2024.03.26.tar.xz 195348 BLAKE2B
d91e6ac1d50aae04ceb53a34341b545ff644ceccdfcfab461907050612d9d871f61591aac02ebddef9a607a9b39ce5017a2fc47c9189f85b9b9a70a30d010e4c
SHA512
da771f8f334862f81702b22688c9d3552aefc2883b5a44c39156ff7a69f301cabf52fa0fb13f8695240db5411c498806d28d847fca8caff2bedb69d1a4b4e5a7
+DIST passt-2024.04.05.tar.xz 195772 BLAKE2B
4c237aeda56455f948d4309624d171612d59fa7ec653e7f89c1aeb05c677ccbdeeaaf6e14c09cda1d5bc88a97fca57dbbe480095e9711045fbd381bd30fb644a
SHA512
bf14689cb1c4780d4249562965ff9a5a0515756cbf5af4b531c17982a066f33001a65210959ff8da691ddaa75560ab5691c685a4c1a4b73e742a883d12d2a24b
diff --git a/net-misc/passt/passt-.ebuild
b/net-misc/passt/passt-2024.04.05.ebuild
similarity index 97%
copy from net-misc/passt/passt-.ebuild
copy to net-misc/passt/passt-2024.04.05.ebuild
index 90df839f93d9..e4201215e520 100644
--- a/net-misc/passt/passt-.ebuild
+++ b/net-misc/passt/passt-2024.04.05.ebuild
@@ -8,7 +8,7 @@ inherit toolchain-funcs
DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement
for Slirp"
HOMEPAGE="https://passt.top/;
-RELEASE_COMMIT="4988e2b"
+RELEASE_COMMIT="954589b"
if [[ ${PV} == * ]]; then
inherit git-r3
diff --git a/net-misc/passt/passt-.ebuild b/net-misc/passt/passt-.ebuild
index 90df839f93d9..e4201215e520 100644
--- a/net-misc/passt/passt-.ebuild
+++ b/net-misc/passt/passt-.ebuild
@@ -8,7 +8,7 @@ inherit toolchain-funcs
DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement
for Slirp"
HOMEPAGE="https://passt.top/;
-RELEASE_COMMIT="4988e2b"
+RELEASE_COMMIT="954589b"
if [[ ${PV} == * ]]; then
inherit git-r3
[gentoo-commits] repo/gentoo:master commit in: app-containers/podman/
commit: c19e9e2af67853bc196bd1307cbc8f56a4daaa2a
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Thu Apr 18 01:05:51 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Thu Apr 18 04:07:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c19e9e2a
app-containers/podman: remove 5.0.0
Signed-off-by: Rahil Bhimjiani rahil.rocks>
Closes: https://github.com/gentoo/gentoo/pull/36302
Signed-off-by: Zac Medico gentoo.org>
app-containers/podman/Manifest| 1 -
app-containers/podman/podman-5.0.0.ebuild | 128 --
2 files changed, 129 deletions(-)
diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index 7b7ea893e9aa..5b73dbae0975 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -1,4 +1,3 @@
DIST podman-4.9.4.tar.gz 21733620 BLAKE2B
17d099c0a13fbbb77556742313c39995127fc97b4086ef3c2d74a92cc0a4f825a6c729dd099c6d4f4cd3d2ebfd470494babdeaa85a5653b327ea1a16fb5ea993
SHA512
7b52555789a1c214fcf26b0826bdda6cf0ccca588f87c0f15ac5e8358ddac625e17cafbe6a43de07cad964e1418b5ee0d2e38a5cb5dc6f6d4e638399749a7f7b
-DIST podman-5.0.0.tar.gz 21861935 BLAKE2B
1ec7006f272f5da7f93929bc543cd8988d6f9596cb868e9561578ebef85d51cbd6baa4b66571872fc9748c639ca636ce27f6d90303707f04caa321c7b71db81a
SHA512
8800d96d668cbc7a7ff85a09c71b3307a280c124513fd02fe478f415cf8db43ee47dc7e9c3b75046c6bda9f916937a2cc59887c2c4b26766c2f770abb87fd7ce
DIST podman-5.0.1.tar.gz 21863115 BLAKE2B
433949d70e7984a278d5231fe4a480d0c758a67e6df30f587f25da727440ba944cf38bb979ab6b6375f0ba65038c6b4c5a8ca73c6bc73df57b92089c5f6c072e
SHA512
4ab64beea9b23839caa35bf8ec0f097ed16b4d2f448ce16039bb55672ac8b1d8d8cadf86c21eb32dc2c1d30dabb5b57a141823aa5fc3f14f09741f76cffa6023
DIST podman-5.0.2.tar.gz 23811875 BLAKE2B
e943eb36eb0b80332223afc5d971c0886f6eaffeb7133c634d28c0a38e9aae6a54266691067dbca7684882f8b6dad72c3d5de2287ec5a7e8fb4b1cfd96df0b4d
SHA512
70dbac9fc81d66eb9b0a5174f5776b805397005cacca917674d2b001591fadd05a776c956e693bad932e9eefe591c35da5c566e8e9e01db8be42bc454cd03104
diff --git a/app-containers/podman/podman-5.0.0.ebuild
b/app-containers/podman/podman-5.0.0.ebuild
deleted file mode 100644
index b535f608f817..
--- a/app-containers/podman/podman-5.0.0.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11,12} )
-
-inherit go-module python-any-r1 tmpfiles linux-info
-
-DESCRIPTION="A tool for managing OCI containers and pods with
Docker-compatible CLI"
-HOMEPAGE="https://github.com/containers/podman/ https://podman.io/;
-
-if [[ ${PV} == * ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/containers/podman.git;
-else
-
SRC_URI="https://github.com/containers/podman/archive/v${PV/_rc/-rc}.tar.gz ->
${P}.tar.gz"
- S="${WORKDIR}/${P/_rc/-rc}"
- [[ ${PV} != *rc* ]] && \
- KEYWORDS="~amd64 ~arm64 ~riscv"
-fi
-
-# main pkg
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-IUSE="apparmor btrfs +seccomp selinux systemd wrapper"
-RESTRICT="test"
-
-RDEPEND="
- app-containers/catatonit
- >=app-containers/conmon-2.1.10
- >=app-containers/containers-common-0.58.0-r1
- app-crypt/gpgme:=
- dev-libs/libassuan:=
- dev-libs/libgpg-error:=
- sys-apps/shadow:=
-
- apparmor? ( sys-libs/libapparmor )
- btrfs? ( sys-fs/btrfs-progs )
- wrapper? ( !app-containers/docker-cli )
- seccomp? ( sys-libs/libseccomp:= )
- selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= )
- systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- ${PYTHON_DEPS}
- dev-go/go-md2man
-"
-
-PATCHES=(
- "${FILESDIR}/seccomp-toggle-4.7.0.patch"
-)
-
-CONFIG_CHECK="
- ~USER_NS
-"
-
-pkg_setup() {
- use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
- linux-info_pkg_setup
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- # assure necessary files are present
- local file
- for file in apparmor_tag btrfs_installed_tag btrfs_tag systemd_tag; do
- [[ -f hack/"${file}".sh ]] || die
- done
-
- local feature
- for feature in apparmor systemd; do
- cat <<-EOF > hack/"${feature}"_tag.sh || die
- #!/usr/bin/env bash
- $(usex ${feature} "echo ${feature}" echo)
- EOF
- done
-
- echo -e "#!/usr/bin/env bash\n echo" > hack/btrfs_installed_tag.sh ||
die
- cat <<-EOF > hack/btrfs_tag.sh || die
- #!/usr/bin/env bash
- $(
[gentoo-commits] repo/gentoo:master commit in: app-portage/mirrorselect/
commit: 38a1f4bf5a45caa3177a86d092bba3714b737fff
Author: Zac Medico gentoo org>
AuthorDate: Mon Apr 15 01:06:23 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Apr 15 01:06:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38a1f4bf
app-portage/mirrorselect: enable py3.12
Closes: https://bugs.gentoo.org/929354
Signed-off-by: Zac Medico gentoo.org>
app-portage/mirrorselect/mirrorselect-2.4.0.ebuild | 2 +-
app-portage/mirrorselect/mirrorselect-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-portage/mirrorselect/mirrorselect-2.4.0.ebuild
b/app-portage/mirrorselect/mirrorselect-2.4.0.ebuild
index 0fd276c82df9..615af84dc925 100644
--- a/app-portage/mirrorselect/mirrorselect-2.4.0.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.4.0.ebuild
@@ -4,7 +4,7 @@
EAPI="8"
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="xml(+)"
inherit edo distutils-r1 prefix
diff --git a/app-portage/mirrorselect/mirrorselect-.ebuild
b/app-portage/mirrorselect/mirrorselect-.ebuild
index 22dbdc31c49a..e645e60c639b 100644
--- a/app-portage/mirrorselect/mirrorselect-.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-.ebuild
@@ -4,7 +4,7 @@
EAPI="8"
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="xml(+)"
inherit edo distutils-r1 prefix
[gentoo-commits] repo/gentoo:master commit in: dev-python/pydecomp/
commit: 6db4f481e59adfa4beadc4dcbe41e75dd08418a0
Author: Zac Medico gentoo org>
AuthorDate: Mon Apr 15 01:02:45 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Apr 15 01:02:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6db4f481
dev-python/pydecomp: enable py3.12
Closes: https://bugs.gentoo.org/929487
Signed-off-by: Zac Medico gentoo.org>
dev-python/pydecomp/pydecomp-0.3-r3.ebuild | 4 ++--
dev-python/pydecomp/pydecomp-.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-python/pydecomp/pydecomp-0.3-r3.ebuild
b/dev-python/pydecomp/pydecomp-0.3-r3.ebuild
index 83a366d11fbf..2f9f3201db6b 100644
--- a/dev-python/pydecomp/pydecomp-0.3-r3.ebuild
+++ b/dev-python/pydecomp/pydecomp-0.3-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit distutils-r1
diff --git a/dev-python/pydecomp/pydecomp-.ebuild
b/dev-python/pydecomp/pydecomp-.ebuild
index f503d453bce0..210c440ca934 100644
--- a/dev-python/pydecomp/pydecomp-.ebuild
+++ b/dev-python/pydecomp/pydecomp-.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit distutils-r1
[gentoo-commits] repo/gentoo:master commit in: net-misc/socket-burst-dampener/
commit: 5a4d3dc66ce258febd974c1a33f6eff61c0b7431
Author: Zac Medico gentoo org>
AuthorDate: Mon Apr 15 00:43:42 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Apr 15 00:44:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a4d3dc6
net-misc/socket-burst-dampener: enable py3.12
Closes: https://bugs.gentoo.org/929730
Signed-off-by: Zac Medico gentoo.org>
net-misc/socket-burst-dampener/socket-burst-dampener-1.3.1-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/net-misc/socket-burst-dampener/socket-burst-dampener-1.3.1-r1.ebuild
b/net-misc/socket-burst-dampener/socket-burst-dampener-1.3.1-r1.ebuild
index 784e8b2cbbec..66b660705e66 100644
--- a/net-misc/socket-burst-dampener/socket-burst-dampener-1.3.1-r1.ebuild
+++ b/net-misc/socket-burst-dampener/socket-burst-dampener-1.3.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
PYPI_NO_NORMALIZE=1
inherit distutils-r1 pypi
[gentoo-commits] repo/gentoo:master commit in: app-admin/serf/
commit: 577fe498870f5361e115805efec28e2f02197648
Author: Zac Medico gentoo org>
AuthorDate: Mon Apr 15 00:24:53 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Apr 15 00:35:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=577fe498
app-admin/serf: 0.10.1-r1 revbump with smaller vendor deps tarball
$ du -h serf-0.10.1*-deps.tar.xz
24M serf-0.10.1-deps.tar.xz
744Kserf-0.10.1-r1-deps.tar.xz
Signed-off-by: Zac Medico gentoo.org>
app-admin/serf/Manifest | 1 +
app-admin/serf/serf-0.10.1-r1.ebuild | 54
2 files changed, 55 insertions(+)
diff --git a/app-admin/serf/Manifest b/app-admin/serf/Manifest
index 508b4015c08f..eeed98dadb74 100644
--- a/app-admin/serf/Manifest
+++ b/app-admin/serf/Manifest
@@ -1,2 +1,3 @@
DIST serf-0.10.1-deps.tar.xz 24356192 BLAKE2B
f635b7f4ea496aeac3148132ff0c4fcd2de037a2fc4c7c0c3943f2531b816a8002eb1e14a2204a30c206630f94400f953ae872e18bd2164c1d688f80961d54b8
SHA512
401e5bb706b3bf6521401ad4d40b02b331e71c6a0886796002046c83dffcffc735b803634d96bff5220d1069f418881daa9432412c4bcf6b7f3b37036d1a3a20
+DIST serf-0.10.1-r1-deps.tar.xz 760452 BLAKE2B
3e2b55d59fd2d94e8cee9082346e827fc1d7ff7d3fb01663d4ae0001a5c29c47212a29c3a98a544dbd4576f157c4c49abea8477c204f96c012b3f4c469724886
SHA512
2a288309d3e5a9486231ddbcd86cee28e950c778dda60247a23692d7e57f0386fdc88e6aff45f5407acd4e604e122f7b010111668340eee1e77f85c80e69803a
DIST serf-0.10.1.tar.gz 447396 BLAKE2B
a5b1aadf2e7d9b807406d8bd1d2db799f7a629a4db3abb3558c405b7bf81b5bef618157e51887ac631f3b42ca9eab3107ead8ead938ed0a1267299b2c47e0a18
SHA512
50febac6a634b7e19e58a2591371228fe7c1865673f48d082ed57cff1ac9c404d6a3b328d85b82cb92f05973a34396b824fdd9cb81f3e12c586b3f56d6734fa8
diff --git a/app-admin/serf/serf-0.10.1-r1.ebuild
b/app-admin/serf/serf-0.10.1-r1.ebuild
new file mode 100644
index ..97a6a9dac3d6
--- /dev/null
+++ b/app-admin/serf/serf-0.10.1-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+DESCRIPTION="Service orchestration and management tool"
+HOMEPAGE="https://www.serfdom.io/;
+SRC_URI="https://github.com/hashicorp/serf/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~zmedico/dist/${PF}-deps.tar.xz;
+
+LICENSE="MPL-2.0"
+LICENSE+=" Apache-2.0 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT+=" test"
+RDEPEND="
+ acct-user/serf
+ acct-group/serf"
+PATCHES=("${S}/go-mod-sum.patch")
+
+src_prepare() {
+ default
+ sed -e 's|\(^VERSION[[:space:]]*:=\).*|\1'${PV}'|' \
+ -e 's|\(GITSHA[[:space:]]*:=\).*|\1'${PV}'|' \
+ -e 's|\(GITBRANCH[[:space:]]*:=\).*|\1'${PV}'|' \
+ -i GNUmakefile || die
+}
+
+src_compile() {
+ mkdir -p ./bin
+ ego build -o ./bin/serf ./cmd/serf || die
+}
+
+src_install() {
+ local x
+
+ dobin "${S}/bin/${PN}"
+
+ keepdir /etc/serf.d
+ insinto /etc/serf.d
+
+ for x in /var/{lib,log}/${PN}; do
+ keepdir "${x}"
+ fowners serf:serf "${x}"
+ done
+
+ newinitd "${FILESDIR}/serf.initd" "${PN}"
+ newconfd "${FILESDIR}/serf.confd" "${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/serf.service"
+}
[gentoo-commits] repo/gentoo:master commit in: app-admin/serf/
commit: 94d3963df844039f307e0729dab1035fada69017
Author: Zac Medico gentoo org>
AuthorDate: Sun Apr 14 23:55:46 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Apr 14 23:55:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94d3963d
app-admin/serf: drop 0.9.8, 0.10.0
Signed-off-by: Zac Medico gentoo.org>
app-admin/serf/Manifest | 4 ---
app-admin/serf/serf-0.10.0.ebuild | 55 ---
app-admin/serf/serf-0.9.8.ebuild | 55 ---
3 files changed, 114 deletions(-)
diff --git a/app-admin/serf/Manifest b/app-admin/serf/Manifest
index a66d0d5bd131..508b4015c08f 100644
--- a/app-admin/serf/Manifest
+++ b/app-admin/serf/Manifest
@@ -1,6 +1,2 @@
-DIST serf-0.10.0-deps.tar.xz 24363004 BLAKE2B
f0fed10ffa8ff536263f6fde5a87e9584c35a681e7821a91d123aa8bd149ca1b9024d454f8163de458e4b928e887736c3247661afbc3f46b2ba38bef09d4516d
SHA512
73815e512fda8aa00241bff84e1ee2414106a4b1a6189e66aa80967152acafde56eeafd15b87cbaefcbedc093f1c42cfb19b9d5776473c4c580416c2b671931a
-DIST serf-0.10.0.tar.gz 446394 BLAKE2B
627e9ee776e217db09dde4bb22d1f317c884f887d918ba69de9bb65160eb00280c1ae5f53119570732f462c35381bd24a81405761b8ec63193295b6245298049
SHA512
53cb42b4a5f94fbb9e099739af0e31bb00cc261ea16325c3e5b9f081bb31299b5b8e42bc92d0f83ae78e511854589a95ab011930f373c1ad148c152b73adf485
DIST serf-0.10.1-deps.tar.xz 24356192 BLAKE2B
f635b7f4ea496aeac3148132ff0c4fcd2de037a2fc4c7c0c3943f2531b816a8002eb1e14a2204a30c206630f94400f953ae872e18bd2164c1d688f80961d54b8
SHA512
401e5bb706b3bf6521401ad4d40b02b331e71c6a0886796002046c83dffcffc735b803634d96bff5220d1069f418881daa9432412c4bcf6b7f3b37036d1a3a20
DIST serf-0.10.1.tar.gz 447396 BLAKE2B
a5b1aadf2e7d9b807406d8bd1d2db799f7a629a4db3abb3558c405b7bf81b5bef618157e51887ac631f3b42ca9eab3107ead8ead938ed0a1267299b2c47e0a18
SHA512
50febac6a634b7e19e58a2591371228fe7c1865673f48d082ed57cff1ac9c404d6a3b328d85b82cb92f05973a34396b824fdd9cb81f3e12c586b3f56d6734fa8
-DIST serf-0.9.8-deps.tar.xz 24178272 BLAKE2B
6a82fa025245f0c393b55d87a10195a9ed5f314b3cb772b54b01b858b9f6b393991cc206f269b39efe9a9061aeff948191ae48070eb7c1e5bf77781c97173952
SHA512
ec12d4b27044f58e897984adb3855413e2d3a624f62dffe981353bb5bfbbcbe64501080ef543bc446633716bbfe3ef29c3c93c44db8599b5639e2ef8d20d8eee
-DIST serf-0.9.8.tar.gz 444968 BLAKE2B
023413f75444f8e785bd7c5029e84ef58abca1c227f69dd8c16111c30afb38ff331e39cd8c30539f133229829bb9517516ff0e18e49b2dc9fb53df2ed40224b3
SHA512
1501ad6587f77840f7ad95d2886aafa3c28ffa533e862df0ebe5a4822078de09370c2ca1826d47dc6ff84e8598fb3711125a16e399a935ac39bad887e532c402
diff --git a/app-admin/serf/serf-0.10.0.ebuild
b/app-admin/serf/serf-0.10.0.ebuild
deleted file mode 100644
index 540d5af97180..
--- a/app-admin/serf/serf-0.10.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module systemd
-
-KEYWORDS="~amd64"
-EGO_PN="github.com/hashicorp/serf"
-DESCRIPTION="Service orchestration and management tool"
-HOMEPAGE="https://www.serfdom.io/;
-SRC_URI="https://github.com/hashicorp/serf/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz;
-
-SLOT="0"
-LICENSE="MPL-2.0 Apache-2.0 BSD MIT"
-IUSE=""
-RESTRICT+=" test"
-BDEPEND=""
-RDEPEND="
- acct-user/serf
- acct-group/serf"
-
-src_prepare() {
- default
- sed -e 's|\(^VERSION[[:space:]]*:=\).*|\1'${PV}'|' \
- -e 's|\(GITSHA[[:space:]]*:=\).*|\1'${PV}'|' \
- -e 's|\(GITBRANCH[[:space:]]*:=\).*|\1'${PV}'|' \
- -i GNUmakefile || die
-}
-
-src_compile() {
- mkdir -p ./bin
- go build -o ./bin/serf ./cmd/serf || die
-}
-
-src_install() {
- local x
-
- dobin "${S}/bin/${PN}"
-
- keepdir /etc/serf.d
- insinto /etc/serf.d
-
- for x in /var/{lib,log}/${PN}; do
- keepdir "${x}"
- fowners serf:serf "${x}"
- done
-
- newinitd "${FILESDIR}/serf.initd" "${PN}"
- newconfd "${FILESDIR}/serf.confd" "${PN}"
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
- systemd_dounit "${FILESDIR}/serf.service"
-}
diff --git a/app-admin/serf/serf-0.9.8.ebuild b/app-admin/serf/serf-0.9.8.ebuild
deleted file mode 100644
index 540d5af97180..
--- a/app-admin/serf/serf-0.9.8.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module systemd
-
-KEYWORDS="~amd64"
-EGO_PN="github.com/hashicorp/serf"
-DESCRIPTION="Service orchestration
[gentoo-commits] repo/gentoo:master commit in: dev-db/etcd/
commit: ff000cacf061b745739cc93ce117c79b869c265a
Author: Zac Medico gentoo org>
AuthorDate: Sun Apr 14 23:46:19 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Apr 14 23:47:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff000cac
dev-db/etcd: add 3.5.13
Signed-off-by: Zac Medico gentoo.org>
dev-db/etcd/Manifest | 2 ++
dev-db/etcd/etcd-3.5.13.ebuild | 81 ++
2 files changed, 83 insertions(+)
diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index 106cc6f5dc79..a66e5e34c31e 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -4,3 +4,5 @@ DIST etcd-3.4.31-deps.tar.xz 2212704 BLAKE2B
8b30941eefdb3811fb331014b69eb8d5b9c
DIST etcd-3.4.31.tar.gz 6072806 BLAKE2B
30aa5b79d2fd0ba639bc766c104d5df28af50ae5398d860af3b3aff91c143ccd899538b341501386bac55dedc00086654de6e4ab9b237053b199a8de2fa509ec
SHA512
4a7e366ced86ea86a324ab972ea47be56456c0aa8744e5ec07d499a56bdc9179ebc3bc2f33bd67c2d341181a5bcc703abc5a7c2e57879169a351457b4a0274f3
DIST etcd-3.5.12-deps.tar.xz 3935756 BLAKE2B
c043cc55f59549734f38b1a734106bd25a1bbeb47f84e00a6b4308bad6086a6f0e0f3dee151bf1708bac269be124c782ea48c3761ee5e1d130a002989f99f2d3
SHA512
caae360e315756fe933bd87a7ce543d904084a745b5e42844a293bbf17c121d245f9f3645cd9992de5203c9efe4efcd4226ba294afb5a3550c114de78dad3110
DIST etcd-3.5.12.tar.gz 4083299 BLAKE2B
85615cf9095a440ef73aa59f5582293de543f7e473c8049712ff13646276c9441039c96c4e42aaedfddcfb3baede8d37f0ef68bb5ddabdb3f4833c8591ee1c8c
SHA512
6fc8bd64ad63cff71c7645253273418fb3fa262c2da1742dc345576caa733af7cd75acad2f57610c5883e6bf16cffd36bc5a0c89cbbb0793c00c2a4db1c6d14b
+DIST etcd-3.5.13-deps.tar.xz 5004004 BLAKE2B
effc3c3fb8e6fff789f96030e485fb887b0f973e5943e66f744ce2d41c65c0756a81850be8f8cca96f50214a59e0eeac694c4669d809ddcee0771acc1703d9ff
SHA512
ed80d70a14cf049e3af22757ad5cc4abd1ce563e00e0d422d38c82d66fe4381822ef1344de3ef803dedc2bfc038dabb520ad58fd489b8916529d24357628f002
+DIST etcd-3.5.13.tar.gz 4089792 BLAKE2B
be7a46af3978108b7e25adabe736ac111a01ab7fcb8e142b75c0c87aa33905d42d10b721ebc982e834110388669d028e6a612c9745e2f5c93210dd05ffccba7d
SHA512
dc85d80079b61e96eb06eb573d41d8972060392e49140a2414c283ea9edfef7b01d5554e50c7ab37c6ad079b373ae12a1b84dbcc533addc1d4d30a2a5abf7b7b
diff --git a/dev-db/etcd/etcd-3.5.13.ebuild b/dev-db/etcd/etcd-3.5.13.ebuild
new file mode 100644
index ..77d02b80751b
--- /dev/null
+++ b/dev-db/etcd/etcd-3.5.13.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd tmpfiles
+GIT_COMMIT=c9063a0dc
+
+DESCRIPTION="Highly-available key value store for shared configuration and
service discovery"
+HOMEPAGE="https://github.com/etcd-io/etcd;
+SRC_URI="https://github.com/etcd-io/etcd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz;
+
+LICENSE="Apache-2.0"
+LICENSE+=" BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~riscv"
+IUSE="doc +server"
+
+COMMON_DEPEND="server? (
+ acct-group/etcd
+ acct-user/etcd
+ )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+# Tests fail with this error:
+# fatal error: checkptr: unsafe pointer conversion
+RESTRICT="test"
+PATCHES=("${S}/go-mod-sum.patch")
+
+src_prepare() {
+ export GO_BUILD_FLAGS="-v -x"
+ default
+ sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|" \
+ -i "${S}"/build.sh || die
+ sed -e 's:\(for p in \)shellcheck :\1 :' \
+ -e 's:^ gofmt \\$:\\:' \
+ -e 's:^ govet \\$:\\:' \
+ -e 's:^ govet_shadow \\$:\\:' \
+ -i "${S}"/test || die
+
+ sed -e
"s|GO_BUILD_FLAGS=\"[^\"]*\"|GO_BUILD_FLAGS=\"${GO_BUILD_FLAGS}\"|" \
+ -e "s|go test |go test ${GO_BUILD_FLAGS} |" \
+ -i ./test || die
+}
+
+src_compile() {
+ ./build.sh || die
+}
+
+src_test() {
+ ./test || die
+}
+
+src_install() {
+ dobin bin/etcdctl
+ use doc && dodoc -r Documentation
+ if use server; then
+ insinto /etc/${PN}
+ sed -e 's|^data-dir:|\0 /var/lib/etcd|' -i etcd.conf.yml.sample
|| die
+ newins etcd.conf.yml.sample etcd.conf.yml
+ dobin bin/etcd
+ dodoc README.md
+ systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+ newtmpfiles "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
+ newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+ newconfd "${FILESDIR}"/
[gentoo-commits] repo/gentoo:master commit in: app-admin/vault/
commit: 2957f711a0df413e3a826af71a381ab23cbbf9a0
Author: Zac Medico gentoo org>
AuthorDate: Sun Apr 14 23:23:50 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Apr 14 23:23:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2957f711
app-admin/vault: add 1.16.1
Signed-off-by: Zac Medico gentoo.org>
app-admin/vault/Manifest| 3 ++
app-admin/vault/vault-1.16.1.ebuild | 87 +
2 files changed, 90 insertions(+)
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 6e228b28130a..8eb33f53ee11 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -5,3 +5,6 @@ DIST vault-1.14.9-webui.tar.xz 1677212 BLAKE2B
db4da051a8c0a62e99c1f2070f3c022fc
DIST vault-1.15.6-deps.tar.xz 20736608 BLAKE2B
53e21d0664f9bbd8c851a486334e04d3b3151aaee709c8fe88ab4969a81ebd4562cf3a350e383647140bd4826a0aa75b34ef136c81920b868dff7ae6f0522e37
SHA512
c1c24c2c646a441c551849af2d3165fc15db2b61f261608f44b7371214cdef0e76263b5b2f295c19606057e80316b4864fff64bc5603b99901fc8a5d900c6550
DIST vault-1.15.6-webui.tar.xz 1721320 BLAKE2B
3f2d31767c6086e7b17f7445f0cff34ce4ebd7a6a1daeaede96443758096a6b8b94b971af5a74e8bcfb2c95c07b496b1babf3f8ce82f9b360fafe5a4d5138cac
SHA512
6a532258a5c7734863967926d95699b2611959177b9dbf4e60cff115331237e65f3dbc41e842443ee5af9020c69280b27a511f887528dc914f9d9e642f9a3a63
DIST vault-1.15.6.tar.gz 31923253 BLAKE2B
8a4e7b9d8d6753b6f717c6699b2d4822cecff299e3cebd8945d3c34232ff77611611d4e6259ab9c9c4ff91a2e52b7eef707df7da68960be36c314ceba18b124b
SHA512
52be0e47f3028f9c1f3ce5d2a72356c955f20fcaf6e8396a6d5938226d72cd8353bed398ba66a6821fc609aaed465e82c3449aeaa0dfaabe80ff0412a73779b3
+DIST vault-1.16.1-deps.tar.xz 21476528 BLAKE2B
2ba0bd2165ce41bfae6fb56a0ff97fe4ed30ac5e16f30ceba14d618e30851b9bb31a964cf5035cd4089baf87c2cda5acd17558bb363acbbcc371ddf47b453c73
SHA512
a0262f421eacfc729a0bc98c137a580d3ca7b384b5b7a8e3bb81cc27b0791b81fdb9005ff9721159cccaf49f2ec6e86dafe7f4e2dde4b5c8d806a8bf1c68de2c
+DIST vault-1.16.1-webui.tar.xz 2213524 BLAKE2B
40c0811c84c849beba934f110afa21fe1ebe60f9a01750fcb4c6442f6a8ef28babd4c32157e6bb3eaf7545b683a81122f445a1a0d717cf7442a678e87206f67a
SHA512
ca25ffaa85445070310fad9d5a05d6ff477729d64707a4da8bc433781d7f2283e18e680a9a06d6aa37496a21b148ac3bdc5eb3f475246ee3fe3cf4a8db096ffb
+DIST vault-1.16.1.tar.gz 32997180 BLAKE2B
e8c6ccf19ce2c48eee1b4b7544c6d164bd98be3d06a08397b06049bbb6aed9304df592bcb5103e943a629aca4c2e83f661b16469e3353c022e3ca552fa1afedb
SHA512
e970004343abb2792aeea4db55a002d1c18701d309caab4a49e3f387028083b70dfa67b7ff34b60c5d4d34ffa8ac3bef308b7218a0344dffde3b000b0e5d43a9
diff --git a/app-admin/vault/vault-1.16.1.ebuild
b/app-admin/vault/vault-1.16.1.ebuild
new file mode 100644
index ..9956d1f746c1
--- /dev/null
+++ b/app-admin/vault/vault-1.16.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps go-module systemd
+
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/;
+
+VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
+SRC_URI="https://github.com/hashicorp/vault/archive/refs/tags/v${PV}.tar.gz ->
${P}.tar.gz"
+SRC_URI+=" webui? (
https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE} )"
+SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz;
+
+LICENSE="BUSL-1.1 MPL-2.0"
+LICENSE+=" Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+IUSE="+webui"
+
+BDEPEND="
+ app-arch/zip
+ dev-go/gox
+ >=dev-lang/go-1.21"
+COMMON_DEPEND="acct-group/vault
+ acct-user/vault"
+ DEPEND="${COMMON_DEPEND}"
+ RDEPEND="${COMMON_DEPEND}"
+
+FILECAPS=(
+ -m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+RESTRICT="test"
+S=${WORKDIR}/${P}
+PATCHES=("${FILESDIR}/${PN}-1.15.6-stubmaker-outside-git-repo-24678.patch")
+
+src_unpack() {
+ default
+}
+
+src_prepare() {
+ default
+ # Avoid the need to have a git checkout
+ sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+ -e 's:^\(GIT_DIRTY=\).*:\1:' \
+ -e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+ -e "s|^BUILD_DATE=.*|BUILD_DATE=$(date +%Y-%m-%dT%H:%M:%SZ)|" \
+ -i scripts/build.sh || die
+ sed -e "/hooks/d" \
+ -e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
+ -e "s/gofumpt/gofmt/g" \
+ -i Makefile || die
+ if [[ -d "${WORKDIR}/http/web_ui" ]]; then
+ rm -rf "${S}/http/web_ui" || die
+ mv "${WORKDIR}/http/web_ui" "${S}/http/web_ui" ||
+ die "mv failed"
+ else
+ m
[gentoo-commits] repo/gentoo:master commit in: app-arch/tardelta/
commit: 616a947137523e872464e55fbbc19eaad779a5bd
Author: Zac Medico gentoo org>
AuthorDate: Sun Apr 14 22:36:13 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Apr 14 22:36:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=616a9471
app-arch/tardelta: enable py3.12
Closes: https://bugs.gentoo.org/929281
Signed-off-by: Zac Medico gentoo.org>
app-arch/tardelta/tardelta-1.0.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-arch/tardelta/tardelta-1.0.1-r1.ebuild
b/app-arch/tardelta/tardelta-1.0.1-r1.ebuild
index 79626fef5d57..37dfd6b81b3e 100644
--- a/app-arch/tardelta/tardelta-1.0.1-r1.ebuild
+++ b/app-arch/tardelta/tardelta-1.0.1-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit distutils-r1
DESCRIPTION="Generate a tarball of differences between two tarballs"
[gentoo-commits] repo/gentoo:master commit in: www-servers/caddy/
commit: d94b9a7807941794cb98cdd0158a5489126f35fd
Author: Zac Medico gentoo org>
AuthorDate: Sun Apr 14 20:50:01 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Apr 14 20:50:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d94b9a78
www-servers/caddy: drop 2.7.6
Signed-off-by: Zac Medico gentoo.org>
www-servers/caddy/Manifest | 1 -
www-servers/caddy/caddy-2.7.6.ebuild | 94
2 files changed, 95 deletions(-)
diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest
index 7c07f276e8f8..73920dd08a5d 100644
--- a/www-servers/caddy/Manifest
+++ b/www-servers/caddy/Manifest
@@ -1,4 +1,3 @@
-DIST caddy-2.7.6-deps.tar.xz 128958740 BLAKE2B
ffbe682df64a88dac9f50e9712f1d6697e58f2d9854c270321f7a0325f0b5ead7f93316756136a4435b70c5e08742c7130ce507ee4aa4696f4fb906f4eba8754
SHA512
f467144e235e09a7718cffe5ed3c40ec2d63038a6a948fe4f85d34717877af8a9959ef7e2c3ac32fd0cce522d693ccac883877f061f5cefc9512f7eed556b336
DIST caddy-2.7.6-docs.tar.gz 24583 BLAKE2B
d3dbbb701d86cbfaf538f10911fdd3613b8c3c0f49ef9e229487d2a4fcef9eff79b56e9852d5c1ccd5a8d1d1898861fc8183c343c129901562b03a9092af9e61
SHA512
62e534d41e714b47265fd8089ad9e03a1a89903460976d8af27fa5f71173e076bab8574282213595e495be701b769e1a70ff9e7ec9576fbf8e821e672207faa5
DIST caddy-2.7.6-r1-deps.tar.xz 129331604 BLAKE2B
50b83c012c70637936c83ec765758cdcd80014ca224d76a746de8640a6b36ae15ce11ec57d9fdb20a5f7b3add946209c6dde7bb4e4bd4a47ffe3ffc8971725db
SHA512
a4bc56de4f7ec8e9967dde3d7ca4cbb74cba9ce0b8906ffe16f8dae3f52fff1164827942df8154eadbae80cce3ee603535b9135cf8a5126d84a9017e8aece078
DIST caddy-2.7.6-r2-deps.tar.xz 8511804 BLAKE2B
ad3c78ee483474754ad83284fabf249c376423217c2929740cd171446d0e755f121e380130c80f291422d39ca69ea7e6ac52f5ce5cdec740616099b665cef5af
SHA512
c48d299d9a0b27ebe467f64dc433625de26293674d8153122ad6798a6b95ed4fe55f764a18d3e9211a8e2f966724d20996f1789e2e84dbb0181cfcf5340303fb
diff --git a/www-servers/caddy/caddy-2.7.6.ebuild
b/www-servers/caddy/caddy-2.7.6.ebuild
deleted file mode 100644
index cf32d908e71b..
--- a/www-servers/caddy/caddy-2.7.6.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps go-module systemd shell-completion
-
-DESCRIPTION="Fast and extensible multi-platform HTTP/1-2-3 web server with
automatic HTTPS"
-HOMEPAGE="https://caddyserver.com;
-
-if [[ "${PV}" == * ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/caddyserver/caddy.git;
-else
- SRC_URI="https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz;
- SRC_URI+="
https://github.com/caddyserver/dist/archive/refs/tags/v${PV}.tar.gz ->
${P}-docs.tar.gz"
- KEYWORDS="amd64 arm64 ~loong ~riscv"
-fi
-
-LICENSE="Apache-2.0"
-LICENSE+=" BSD ECL-2.0 MIT CC0-1.0"
-SLOT="0"
-RESTRICT="test"
-RDEPEND="
- acct-user/http
- acct-group/http"
-DEPEND="${RDEPEND}"
-
-FILECAPS=(
- -m 755 'cap_net_bind_service=+ep' usr/bin/"${PN}"
-)
-
-PATCHES=(
- "${FILESDIR}"/remove-binary-altering-commands-2.7.5.patch
-)
-
-src_unpack() {
- if [[ "${PV}" == * ]]; then
- # unpack code
- git-r3_src_unpack
-
- # unpack docs and misc
- EGIT_REPO_URI="https://github.com/caddyserver/dist.git;
- EGIT_CHECKOUT_DIR="${WORKDIR}/dist-${PV}"
- git-r3_src_unpack
-
- go-module_live_vendor
- else
- go-module_src_unpack
- fi
-}
-
-src_prepare(){
- default
- sed -i -e "s|User=caddy|User=http|g;s|Group=caddy|Group=http|g;"
../dist-"${PV}"/init/*service || die
-}
-
-src_compile() {
- # https://github.com/caddyserver/caddy/blob/master/caddy.go#L843
- if [[ ${PV} == * ]]; then
- local CUSTOM_VER="git-$(git rev-parse --short HEAD)"
- else
- local CUSTOM_VER="${PV}"
- fi
-
- ego build -ldflags "-X
github.com/caddyserver/caddy/v2.CustomVersion=${CUSTOM_VER}" ./cmd/caddy
- local sh
- for sh in bash fish zsh; do
- ./caddy completion "${sh}" > completion."${sh}" || die
- done
- ./caddy manpage -o manpages || die
-}
-
-src_install() {
- default
-
- dobin "${PN}"
- insinto /etc/"${PN}"
- doins ../dist-"${PV}"/config/Caddyfile
- systemd_dounit ../dist-"${PV}"/init/*.service
- newinitd "${FILESDIR}"/initd-2.7.5 "${PN}"
- newconfd "${F
[gentoo-commits] repo/gentoo:master commit in: app-admin/consul-template/
commit: 1242eaf92ee55887668a044e16e61f66eb0a518a
Author: Zac Medico gentoo org>
AuthorDate: Sun Apr 14 20:46:16 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Apr 14 20:46:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1242eaf9
app-admin/consul-template: drop 0.29.5
Signed-off-by: Zac Medico gentoo.org>
app-admin/consul-template/Manifest | 2 -
.../consul-template/consul-template-0.29.5.ebuild | 58 --
2 files changed, 60 deletions(-)
diff --git a/app-admin/consul-template/Manifest
b/app-admin/consul-template/Manifest
index 97a28e9e68d8..94b93a5de3bc 100644
--- a/app-admin/consul-template/Manifest
+++ b/app-admin/consul-template/Manifest
@@ -1,4 +1,2 @@
-DIST consul-template-0.29.4-deps.tar.xz 59446648 BLAKE2B
9ccd689f38eff50ad448a4226de918920c7acca9eb1e23d4e30fafc124224bb8f123b3dff4a1d433ea683ed523cd604a41472f50cb1919483040fc18c848
SHA512
3c60d88fdb82744f250cf02be3b3423f74360f18a43f4c4204ee97f73c370b878ecdbd5a300f96b74ffd9c7cde66f6c8b974392f7acc07a113b85ab6f1b6d8e9
-DIST consul-template-0.29.5.tar.gz 262722 BLAKE2B
1e3ddf259d76cf487872cebbe8c8b5bb313b89d073b26496340d39cc55c4e56ec531cbefec4bc1c0dd5c8bb3bd707c9bebfd15011e421badf12ea59a5bbbdbe3
SHA512
f753c2ec7f6c97ac73b34820b40568b5b16a3b8d4bebc7390905614a96744e8d4afd4a63b8b911989ba084ea91d85a21e3283d67a36bf65a685aa63154361a14
DIST consul-template-0.37.4-deps.tar.xz 1548760 BLAKE2B
34a4e7926f41578071e60c715c534a8a50c49db3a78b06ae6ee49ed1a1c857faea753f27921cb6345bbc94f44ab81da58d3ffd1d27a0e29220bd2631bb35b58a
SHA512
e28e29034407a5fbf78f9872b2cd85c0d6414cb5ec3c4b023b080c227583ae34ead6ab5b98c6ff4e1d278d9af137e895cedc79def10017d073f2b99561f1d483
DIST consul-template-0.37.4.tar.gz 288565 BLAKE2B
69fc82a482c7fce4201621ee43aca689b328be4e34bb99e1cd552ba844787744a97fb64364adc7d9a180fd424d30881deaed45077851bc10fa037799ea99d189
SHA512
e36a5e444801c8700577df28fb3fbc7398b825d8f549d620c07445d86099a7597d0e95d56ce24daedd44eb573cc33e40dd1bb1e7a6def2c2a1788133bb811c38
diff --git a/app-admin/consul-template/consul-template-0.29.5.ebuild
b/app-admin/consul-template/consul-template-0.29.5.ebuild
deleted file mode 100644
index 6727d40a8f93..
--- a/app-admin/consul-template/consul-template-0.29.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module systemd
-
-DESCRIPTION="Generic template rendering and notifications with Consul"
-HOMEPAGE="https://github.com/hashicorp/consul-template;
-SRC_URI="https://github.com/hashicorp/consul-template/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz
- https://dev.gentoo.org/~zmedico/dist/consul-template-0.29.4-deps.tar.xz;
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-COMMON_DEPEND="
- acct-group/consul-template
- acct-user/consul-template"
-
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-# TODO: debug test failures
-RESTRICT+=" test"
-
-src_prepare() {
- default
- # remove -s and -w from the linker flags
- sed \
- -e '/-s \\/d' \
- -e '/-w \\/d' \
- -i Makefile || die
-}
-
-src_compile() {
- emake GOBIN="${S}"/bin dev
-}
-
-src_test() {
- emake GOBIN="${S}"/bin test
-}
-
-src_install() {
- dobin bin/${PN}
- dodoc CHANGELOG.md README.md
-
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
- newconfd "${FILESDIR}/${PN}.confd" "${PN}"
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
- systemd_dounit "${FILESDIR}/${PN}.service"
-
- keepdir /etc/${PN}.d
-
- keepdir /var/log/${PN}
- fowners ${PN}:${PN} /var/log/${PN}
-}
[gentoo-commits] repo/gentoo:master commit in: dev-db/etcd/
commit: 6c2b936c0198b0da5980384b81094643a949ba93
Author: Zac Medico gentoo org>
AuthorDate: Sun Apr 14 20:43:31 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Apr 14 20:43:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c2b936c
dev-db/etcd: drop 3.4.28, 3.5.10
Signed-off-by: Zac Medico gentoo.org>
dev-db/etcd/Manifest | 4 ---
dev-db/etcd/etcd-3.4.28.ebuild | 79 --
dev-db/etcd/etcd-3.5.10.ebuild | 79 --
3 files changed, 162 deletions(-)
diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index 84e10d8c39af..106cc6f5dc79 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -1,10 +1,6 @@
DIST etcd-3.4.26-deps.tar.xz 39352316 BLAKE2B
8b1a30d645b1ea756ac944d2d3f7e0c5b9491bab54d4d74c6525c519e5297a1e8e2a97f70a50a5681cf8941d2e4978d5c3717fccb552042bcd42e7c4bd2b29a8
SHA512
eb3af2910030a165699158a3dfe7e1267f29c0720865026da2a95941c7e1e19db793e177e9ca5a9f3b134c1a9a83b4a0613a32a30282b68fe3aef75b8dacae59
DIST etcd-3.4.26.tar.gz 6043999 BLAKE2B
03f3bd0388e59dea9300b9a811b426ce03f1001750259dcd8386566efaa64783746f0353f83c1d01960004a77cea08a194aba394d91808aad15b5d4bb8f151cf
SHA512
b2048070adb1df6e98c06e0e951f7940815dab238fe4ba49c36681a638f39eb7e40fed691baf70410d01467965094d70f008d0046b1b550b2ac1ed19ac89ca47
-DIST etcd-3.4.28-deps.tar.xz 66108144 BLAKE2B
81bef927202231a7b8a1856327d371060b15aadf6189dd3950946a8274df5eb6845b6a645f27f8c231d1bf6baef40777b433e0f9f96f6faf136cef53ec66220f
SHA512
5cf3810309c28559a3b793a2c7e329aea13f0e1ec83a033bf8d1f34b4aa7a357446bbe654f56175b52822c08e22e335be39592955b369ddc91a276c90c582820
-DIST etcd-3.4.28.tar.gz 6052858 BLAKE2B
8c6dbebf3570c88e53ff5d13b0192502bc93d50076b9b66bd3ef4a313e734a1dc630366203b8e5d22ce29e9e8498e5e9304a6b02973d2defd4b65425ee24becb
SHA512
409f82c9979ee34327f0f1f6fd171ccbeb6a044ca4e1f137dd803172e2b79f5f14d68eea67b12c90401dc93fe830b7adf77f8c06c2730f3205d367a957fc43cc
DIST etcd-3.4.31-deps.tar.xz 2212704 BLAKE2B
8b30941eefdb3811fb331014b69eb8d5b9c691b8ace1004432e5b05bb787bb3ba3ce872f881af2a559d7b955fae890a4ec0e8b10daa06cf388447af1b6a92679
SHA512
85915f5738493bfe3c09208649e26cfdc612df900916686006a437c44aad5afb2ab69b0840550e37544a50b79d2d3718e2cbdfd037e47bcaa8e33a8a6a95105f
DIST etcd-3.4.31.tar.gz 6072806 BLAKE2B
30aa5b79d2fd0ba639bc766c104d5df28af50ae5398d860af3b3aff91c143ccd899538b341501386bac55dedc00086654de6e4ab9b237053b199a8de2fa509ec
SHA512
4a7e366ced86ea86a324ab972ea47be56456c0aa8744e5ec07d499a56bdc9179ebc3bc2f33bd67c2d341181a5bcc703abc5a7c2e57879169a351457b4a0274f3
-DIST etcd-3.5.10-deps.tar.xz 95341332 BLAKE2B
45aed0b80e5c0b3100b870b3f663a09ca8998f52e462a5a618c871d9baed898bd7bf23d2d1f33ff6eb3ad40fcd6692d4c9e5501b27cdc93a4be23aea464ac769
SHA512
59acb7de1a89014c75054cd06659f3220fd0a361e16a26d7bb26c2177266493808f9817dd7393df04c4ab14d46ddfd9ec9a36442e9656cf871971034ff1c99ed
-DIST etcd-3.5.10.tar.gz 4073085 BLAKE2B
d6b6c60dee15ffc42e3510837eefc543d16bdbda532828cd6a846f9d12921e24df948b93b4951f8e660be9967e540f59ecba558094558f67ec5aa4059dee60de
SHA512
965e853c6012643b01fd9e1bbd3b01294590985e91c54a81ea9f6940ebdf4d6c48f04b082a094e09b4959eba92e0bfed46d364ff54d8791ab7d42d2a725c
DIST etcd-3.5.12-deps.tar.xz 3935756 BLAKE2B
c043cc55f59549734f38b1a734106bd25a1bbeb47f84e00a6b4308bad6086a6f0e0f3dee151bf1708bac269be124c782ea48c3761ee5e1d130a002989f99f2d3
SHA512
caae360e315756fe933bd87a7ce543d904084a745b5e42844a293bbf17c121d245f9f3645cd9992de5203c9efe4efcd4226ba294afb5a3550c114de78dad3110
DIST etcd-3.5.12.tar.gz 4083299 BLAKE2B
85615cf9095a440ef73aa59f5582293de543f7e473c8049712ff13646276c9441039c96c4e42aaedfddcfb3baede8d37f0ef68bb5ddabdb3f4833c8591ee1c8c
SHA512
6fc8bd64ad63cff71c7645253273418fb3fa262c2da1742dc345576caa733af7cd75acad2f57610c5883e6bf16cffd36bc5a0c89cbbb0793c00c2a4db1c6d14b
diff --git a/dev-db/etcd/etcd-3.4.28.ebuild b/dev-db/etcd/etcd-3.4.28.ebuild
deleted file mode 100644
index 9084f1072095..
--- a/dev-db/etcd/etcd-3.4.28.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd tmpfiles
-GIT_COMMIT=adf6bd245
-
-DESCRIPTION="Highly-available key value store for shared configuration and
service discovery"
-HOMEPAGE="https://github.com/etcd-io/etcd;
-SRC_URI="https://github.com/etcd-io/etcd/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz;
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~loong ~riscv"
-IUSE="doc +server"
-
-COMMON_DEPEND="server? (
- acct-group/etcd
- acct-user/etcd
- )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-# Tests fail with this error:
-# fatal error: checkptr: unsafe pointer conversion
-RESTRICT=&qu
[gentoo-commits] repo/gentoo:master commit in: app-containers/containers-common/
commit: 4764a9acb220d0c847225c35d76ce86f5cc6ecab
Author: Zac Medico gentoo org>
AuthorDate: Sun Apr 14 20:31:29 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Apr 14 20:39:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4764a9ac
app-containers/containers-common: destabilize 0.57.0 for ~arm64 (resolve
NonsolvableDepsInStable)
This version requires containers-image-5.29.0 in order to avoid
a file collsion, but that version was never stabilized for arm64.
Fixes: 4ad1a02c2fa3 ("app-containers/containers-common: Make 0.57.0 require
older containers-image")
Bug: https://bugs.gentoo.org/930027
Signed-off-by: Zac Medico gentoo.org>
app-containers/containers-common/containers-common-0.57.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-containers/containers-common/containers-common-0.57.0.ebuild
b/app-containers/containers-common/containers-common-0.57.0.ebuild
index 3a6fabe29163..2d56b46669f2 100644
--- a/app-containers/containers-common/containers-common-0.57.0.ebuild
+++ b/app-containers/containers-common/containers-common-0.57.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]]; then
else
SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz ->
${P}.tar.gz"
S="${WORKDIR}/${P#containers-}"
- KEYWORDS="amd64 arm64 ~riscv"
+ KEYWORDS="amd64 ~arm64 ~riscv"
fi
LICENSE="Apache-2.0"
[gentoo-commits] repo/gentoo:master commit in: app-admin/vault/
commit: 1298eb836feffb51786da193615eb196cf498cb7
Author: Zac Medico gentoo org>
AuthorDate: Sun Apr 14 20:25:34 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Apr 14 20:25:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1298eb83
app-admin/vault: drop 1.14.8
Signed-off-by: Zac Medico gentoo.org>
app-admin/vault/Manifest| 2 -
app-admin/vault/vault-1.14.8.ebuild | 86 -
2 files changed, 88 deletions(-)
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index e143138c3666..6e228b28130a 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -1,7 +1,5 @@
DIST vault-1.14.5-vendor.tar.gz 71839384 BLAKE2B
845416db5d69c400d5e9603bd42b2d73112b1cea884a03ac1345afad627b0d8ed0ff983d97b3086ed69462713cc706aa67f46164df4c1e4e3226aafb66cf0e89
SHA512
ac55e4f9b76ac80eb0f82e5d63ed234c65a9b5c737fcb6f7ad8c9cb9dbe303b6d18a11b329f8223d9fbdcea1a7ee982c622184537fce45fe005df89b8392bbe5
DIST vault-1.14.5-webui.tar.xz 1670796 BLAKE2B
8629de337f2c708553752409a1c8ddc94e421adb34c7b31116f4154e06eed6e7ffb0355cd7ff91d7ec42f1fb1a35737732d530a8587cf515a0636b0a5dbffb38
SHA512
32ff0d720282f0539288f3ee111b91d43b9098bd4ea309d11f638c9f0c4a0a9276fe2f940573d9d664dcea33945f08ac33488ad05d37b372042e859b6d2f7e97
-DIST vault-1.14.8-vendor.tar.gz 71869146 BLAKE2B
5875056d5ec53396ed53db7fd4891a6fbc3c5449a3f2409e11a409ed00cca2c0741e755a31c9d9c1b777c52a0b136cfc30be498a9321e9a0ff317b82e4c35d0e
SHA512
e02c6fa1f09ccbb53420dc3919151a5783c4b861c8601ff5079db03a4be926d00a3a963130942f629dda8178275728ddfdcb537f1188e2279c67733883a0178c
-DIST vault-1.14.8-webui.tar.xz 1680312 BLAKE2B
c698adc325633b1dc59dea3b09692da0476a5f3dbd1f69f1e68243fa903e4590b152846f2dabd4b7f5f492467fcdc52c0afd82bfe1a956b1b69f11da403fab9c
SHA512
a25faa74614b31688bb91c4ac2b6a105426be632cc417e94ef14c60a388f076eaec006e07a9784047422b70ce9d9c9fd33e6fb8ef3595b7f1a6468739da8e1c6
DIST vault-1.14.9-vendor.tar.gz 71845081 BLAKE2B
ea25a6ba8ac293971170688b4ce3845ba19a5af746c3d96860420d74f8c0af33ea118a47d17117dbd520675739c44ed76118ef126c5b53e4c4adb0924cda58d5
SHA512
00ff45f986889d17ebe59c27aeaf8132270e5f06883bf84ce10721c9e2943a25ad8b86be3271991c824369ad5545258b3c01600f1dda06487751ff806b1d76b9
DIST vault-1.14.9-webui.tar.xz 1677212 BLAKE2B
db4da051a8c0a62e99c1f2070f3c022fc934350b255d21b360b3b3b53555942f1ac6c4ef15ed7d8a2519f05752406add63837317615afb387b0fc407f5ab8410
SHA512
2f54dd24fb9a4e2e774dd4212a605126a9d4e4975a97a01c88c94bce8e6f10174fe07235d402dd43ae31aacf4371f77272e4446d972d2e7304745186b0e6dbb7
DIST vault-1.15.6-deps.tar.xz 20736608 BLAKE2B
53e21d0664f9bbd8c851a486334e04d3b3151aaee709c8fe88ab4969a81ebd4562cf3a350e383647140bd4826a0aa75b34ef136c81920b868dff7ae6f0522e37
SHA512
c1c24c2c646a441c551849af2d3165fc15db2b61f261608f44b7371214cdef0e76263b5b2f295c19606057e80316b4864fff64bc5603b99901fc8a5d900c6550
diff --git a/app-admin/vault/vault-1.14.8.ebuild
b/app-admin/vault/vault-1.14.8.ebuild
deleted file mode 100644
index bca60ca1df89..
--- a/app-admin/vault/vault-1.14.8.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps go-module systemd
-
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/;
-
-VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
-SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz
-> ${P}-vendor.tar.gz
- webui? (
- https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
- )"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-IUSE="+webui"
-
-BDEPEND="
- app-arch/zip
- dev-go/gox
- >=dev-lang/go-1.15.3"
-COMMON_DEPEND="acct-group/vault
- acct-user/vault"
- DEPEND="${COMMON_DEPEND}"
- RDEPEND="${COMMON_DEPEND}"
-
-FILECAPS=(
- -m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-RESTRICT="test"
-S=${WORKDIR}/${P}-vendor
-
-src_unpack() {
- default
-}
-
-src_prepare() {
- default
- # Avoid the need to have a git checkout
- sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
- -e 's:^\(GIT_DIRTY=\).*:\1:' \
- -e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
- -e "s|^BUILD_DATE=.*|BUILD_DATE=$(date +%Y-%m-%dT%H:%M:%SZ)|" \
- -i scripts/build.sh || die
- sed -e "/hooks/d" \
- -e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
- -e "s/gofumpt/gofmt/g" \
- -i Makefile || die
- if [[ -d "${WORKDIR}/http/web_ui" ]]; then
- rm -rf "${S}/http/web_ui" || die
- mv "${WORKDIR}/http/web_ui" "${S}/http/web_ui" |
[gentoo-commits] repo/gentoo:master commit in: app-admin/consul/
commit: 05c7076cf6731a60b6778e5b30fb82020e2afa6b
Author: Zac Medico gentoo org>
AuthorDate: Sun Apr 14 20:23:18 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Apr 14 20:23:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05c7076c
app-admin/consul: drop 1.15.10
Signed-off-by: Zac Medico gentoo.org>
app-admin/consul/Manifest | 1 -
app-admin/consul/consul-1.15.10.ebuild | 61 --
2 files changed, 62 deletions(-)
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 23c8480a9d1c..9532d6fa5036 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -1,4 +1,3 @@
-DIST consul-1.15.10-vendor.tar.gz 46702348 BLAKE2B
a04d6f5a4d2f6f8885207f9f72537d4ea1a3adc5aab64873edf7f710984d3b25a602fb93cecc44ed82249280b51bbe1131701ab09f7ebb1b444c80e013fe271d
SHA512
7aade3f90ee689ddca3058f12e7c9f2a691c4eba966993d770d8dc7b171cad54c3c8b6c3f52e03128a8d1b159dd66b6c8b284050c5475d77b51f9a22c4a6af8a
DIST consul-1.15.11-deps.tar.xz 9566892 BLAKE2B
9459a93d78d3e4b991d0cdcfac22603c628c8f9fdacd8d50524a4c826cca66a575f6cd0bdf5fa9033e32b50336c53192567610ed73386f89c3c4e810c1412144
SHA512
d3876433b4ad3e7a062e059ef250bcfba23ede0595d8491f4b39c73c427e28c677b9f6e41317cf853ab8b3b2ce25151a4adf1a13b13a6a73c6e16de7382d2d05
DIST consul-1.15.11.tar.gz 28951114 BLAKE2B
02378088d1bbc4313ec62d644b583c328bc9cc40ccc18516a1a14ae0d7f8d12007f1a5fa7c5e455ec2e782ba986ce60d37b92369b1f89f7dd69871702cd97b31
SHA512
1c5c8f9a3ad79aa34fd82a49e92ef5a21fb0470d60e3f3413901305121cbb677c75f72ffd5405554424b336d4e5ec426b7c35f458c04b1d5ab9350c2649cd688
DIST consul-1.15.3-vendor.tar.gz 43434721 BLAKE2B
7595c98cdecf67e9fb412d8fea1d790dc6b1c29f7bc427e1d0872045a05f8873dc6107f196cea04fe0a2f2553d4fbb1f8d501e5e107b2bea3ae841e5d94eda64
SHA512
b69e3a7c1ebb01c7a64f2c6167e63e8a530b81be9aad8b591d0a71f512f5157ba9a564b46f9effe52a5abd3ae61732e7af10c5ba002110f745eb3d94ebcec256
diff --git a/app-admin/consul/consul-1.15.10.ebuild
b/app-admin/consul/consul-1.15.10.ebuild
deleted file mode 100644
index 7fbf1eb317a7..
--- a/app-admin/consul/consul-1.15.10.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd
-
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="https://www.consul.io;
-GIT_COMMIT="a8dca2405236750fc23fb31dac21507882d111f6"
-
-SRC_URI="https://github.com/zmedico/consul/archive/v${PV}-vendor.tar.gz ->
${P}-vendor.tar.gz"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
-RESTRICT="test"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-BDEPEND="dev-go/gox"
-COMMON_DEPEND="
- acct-group/consul
- acct-user/consul"
- DEPEND="${COMMON_DEPEND}"
- RDEPEND="${COMMON_DEPEND}"
-
-S=${WORKDIR}/${P}-vendor
-
-src_prepare() {
- default
- sed -e 's|^GIT_DATE=.*|GIT_DATE=2023-10-31T14:10:44Z|' -i GNUmakefile
|| die
-}
-
-src_compile() {
- if use x86; then
- #924629 pie breaks build on x86
- GOFLAGS=${GOFLAGS//-buildmode=pie}
- fi
- # The dev target sets causes build.sh to set appropriate XC_OS
- # and XC_ARCH, and skips generation of an unused zip file,
- # avoiding a dependency on app-arch/zip.
- GIT_DESCRIBE="v${PV}" \
- GIT_DIRTY="" \
- GIT_COMMIT="${GIT_COMMIT}" \
- emake dev-build
-}
-
-src_install() {
- dobin bin/consul
-
- keepdir /etc/consul.d
- insinto /etc/consul.d
- doins "${FILESDIR}/"*.json.example
-
- keepdir /var/log/consul
- fowners consul:consul /var/log/consul
-
- newinitd "${FILESDIR}/consul.initd" "${PN}"
- newconfd "${FILESDIR}/consul.confd" "${PN}"
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
- systemd_dounit "${FILESDIR}/consul.service"
-}
[gentoo-commits] repo/gentoo:master commit in: app-containers/containers-common/
commit: 4ad1a02c2fa34c183bf564623d5bc4ca7ad7bd10 Author: Zac Medico gentoo org> AuthorDate: Sun Apr 14 19:59:04 2024 + Commit: Zac Medico gentoo org> CommitDate: Sun Apr 14 20:06:41 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ad1a02c app-containers/containers-common: Make 0.57.0 require older containers-image This version requires a version of containers-image less than 5.29.2 which provides these files that collide with newer versions of containers-common: /etc/containers/policy.json /etc/containers/registries.d/default.yaml Bug: https://bugs.gentoo.org/930027 Signed-off-by: Zac Medico gentoo.org> app-containers/containers-common/containers-common-0.57.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-containers/containers-common/containers-common-0.57.0.ebuild b/app-containers/containers-common/containers-common-0.57.0.ebuild index 0643011c3d6e..3a6fabe29163 100644 --- a/app-containers/containers-common/containers-common-0.57.0.ebuild +++ b/app-containers/containers-common/containers-common-0.57.0.ebuild @@ -19,7 +19,7 @@ LICENSE="Apache-2.0" SLOT="0" RESTRICT="test" RDEPEND=" - app-containers/containers-image +
[gentoo-commits] repo/gentoo:master commit in: app-containers/containers-common/
commit: e85fee1101fc083159109f10a6cdf9a242280e4f
Author: Zac Medico gentoo org>
AuthorDate: Sun Apr 14 19:27:45 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Apr 14 19:42:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e85fee11
app-containers/containers-common: 0.57.0-r1 stable revbump resolves file
collisions
Use a 0.57.0-r1 stable revbump to resolve file collisions with
app-containers/containers-image-5.29.2-r1 which was stabilized
for bug 921771. These files have migrated to containers-image:
/etc/containers/policy.json
/etc/containers/registries.d/default.yaml
This file is no longer installed but there is another copy
installed in /usr/share/containers:
/etc/containers/containers.conf
Closes: https://bugs.gentoo.org/930027
Bug: https://bugs.gentoo.org/921771
Signed-off-by: Zac Medico gentoo.org>
.../containers-common-0.57.0-r1.ebuild | 60 ++
1 file changed, 60 insertions(+)
diff --git
a/app-containers/containers-common/containers-common-0.57.0-r1.ebuild
b/app-containers/containers-common/containers-common-0.57.0-r1.ebuild
new file mode 100644
index ..3cb764cb31ce
--- /dev/null
+++ b/app-containers/containers-common/containers-common-0.57.0-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Common config files and docs for Containers stack"
+HOMEPAGE="https://github.com/containers/common;
+
+if [[ ${PV} == * ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/containers/common.git;
+else
+ SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+ S="${WORKDIR}/${P#containers-}"
+ KEYWORDS="amd64 arm64 ~riscv"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+RESTRICT="test"
+RDEPEND="
+ >=app-containers/containers-image-5.29.2
+ app-containers/containers-storage
+ app-containers/containers-shortnames
+ !=app-containers/netavark-1.6.0
>=app-containers/aardvark-dns-1.6.0 )
+ >=app-containers/cni-plugins-0.9.1
+ )
+"
+
+BDEPEND="
+ >=dev-go/go-md2man-2.0.2
+"
+
+src_prepare() {
+ default
+
+ [[ -f docs/Makefile && -f Makefile ]] || die
+ sed -i -e 's|/usr/local|/usr|g;' docs/Makefile Makefile || die
+
+ # add comments to mounts.conf
+ eapply "${FILESDIR}/examplify-mounts-conf.patch"
+}
+
+src_compile() {
+ emake docs
+}
+
+src_install() {
+ emake DESTDIR="${ED}" install
+
+ insinto /usr/share/containers
+ doins pkg/seccomp/seccomp.json pkg/subscriptions/mounts.conf
+
+ keepdir /etc/containers/certs.d /etc/containers/oci/hooks.d
/etc/containers/systemd /var/lib/containers/sigstore
+}
[gentoo-commits] repo/gentoo:master commit in: app-containers/containers-image/
commit: 445d9f92ddafad40e2a2c0bbc22945dda89d9b47
Author: Zac Medico gentoo org>
AuthorDate: Sun Apr 14 18:59:13 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Apr 14 19:14:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=445d9f92
app-containers/containers-image: Block older containers-common
In 5.29.2 (commit 3ce5be3e30a8d60756b3685d1069788ec801f7f8) the
policy.json and registries.d/default.yaml files moved to the
containers-image package.
Bug: https://bugs.gentoo.org/930027
Signed-off-by: Zac Medico gentoo.org>
app-containers/containers-image/containers-image-5.29.2-r1.ebuild | 1 +
app-containers/containers-image/containers-image-5.30.0.ebuild| 1 +
app-containers/containers-image/containers-image-.ebuild | 1 +
3 files changed, 3 insertions(+)
diff --git a/app-containers/containers-image/containers-image-5.29.2-r1.ebuild
b/app-containers/containers-image/containers-image-5.29.2-r1.ebuild
index 770d024fa41e..5a0b9d37566c 100644
--- a/app-containers/containers-image/containers-image-5.29.2-r1.ebuild
+++ b/app-containers/containers-image/containers-image-5.29.2-r1.ebuild
@@ -21,6 +21,7 @@ SLOT="0"
# https://github.com/gentoo/gentoo/pull/35012#discussion_r1473740969
RESTRICT='test'
BDEPEND=">=dev-go/go-md2man-2.0.3"
+RDEPEND="!<=app-containers/containers-common-0.57.0"
PATCHES=(
"${FILESDIR}"/moving-policy-json-default-yaml.patch
"${FILESDIR}"/prevent-downloading-mods-5.29.2.patch
diff --git a/app-containers/containers-image/containers-image-5.30.0.ebuild
b/app-containers/containers-image/containers-image-5.30.0.ebuild
index f4507f8d00cf..9d755c4cf4ad 100644
--- a/app-containers/containers-image/containers-image-5.30.0.ebuild
+++ b/app-containers/containers-image/containers-image-5.30.0.ebuild
@@ -21,6 +21,7 @@ SLOT="0"
# https://github.com/gentoo/gentoo/pull/35012#discussion_r1473740969
RESTRICT='test'
BDEPEND=">=dev-go/go-md2man-2.0.3"
+RDEPEND="!<=app-containers/containers-common-0.57.0"
PATCHES=(
"${FILESDIR}"/fix-warnings.patch
)
diff --git a/app-containers/containers-image/containers-image-.ebuild
b/app-containers/containers-image/containers-image-.ebuild
index f4507f8d00cf..9d755c4cf4ad 100644
--- a/app-containers/containers-image/containers-image-.ebuild
+++ b/app-containers/containers-image/containers-image-.ebuild
@@ -21,6 +21,7 @@ SLOT="0"
# https://github.com/gentoo/gentoo/pull/35012#discussion_r1473740969
RESTRICT='test'
BDEPEND=">=dev-go/go-md2man-2.0.3"
+RDEPEND="!<=app-containers/containers-common-0.57.0"
PATCHES=(
"${FILESDIR}"/fix-warnings.patch
)
[gentoo-commits] repo/gentoo:master commit in: app-containers/podman/
commit: c09c2e57bcad3303a8dba82ca0562514ceef84e5
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Mon Apr 1 14:35:53 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Apr 1 16:06:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c09c2e57
app-containers/podman: add 5.0.1
Signed-off-by: Rahil Bhimjiani rahil.rocks>
Closes: https://github.com/gentoo/gentoo/pull/36043
Signed-off-by: Zac Medico gentoo.org>
app-containers/podman/Manifest| 1 +
app-containers/podman/podman-5.0.1.ebuild | 128 ++
2 files changed, 129 insertions(+)
diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index 2603fa68fbb5..a92bc651bad3 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -1,2 +1,3 @@
DIST podman-4.9.4.tar.gz 21733620 BLAKE2B
17d099c0a13fbbb77556742313c39995127fc97b4086ef3c2d74a92cc0a4f825a6c729dd099c6d4f4cd3d2ebfd470494babdeaa85a5653b327ea1a16fb5ea993
SHA512
7b52555789a1c214fcf26b0826bdda6cf0ccca588f87c0f15ac5e8358ddac625e17cafbe6a43de07cad964e1418b5ee0d2e38a5cb5dc6f6d4e638399749a7f7b
DIST podman-5.0.0.tar.gz 21861935 BLAKE2B
1ec7006f272f5da7f93929bc543cd8988d6f9596cb868e9561578ebef85d51cbd6baa4b66571872fc9748c639ca636ce27f6d90303707f04caa321c7b71db81a
SHA512
8800d96d668cbc7a7ff85a09c71b3307a280c124513fd02fe478f415cf8db43ee47dc7e9c3b75046c6bda9f916937a2cc59887c2c4b26766c2f770abb87fd7ce
+DIST podman-5.0.1.tar.gz 21863115 BLAKE2B
433949d70e7984a278d5231fe4a480d0c758a67e6df30f587f25da727440ba944cf38bb979ab6b6375f0ba65038c6b4c5a8ca73c6bc73df57b92089c5f6c072e
SHA512
4ab64beea9b23839caa35bf8ec0f097ed16b4d2f448ce16039bb55672ac8b1d8d8cadf86c21eb32dc2c1d30dabb5b57a141823aa5fc3f14f09741f76cffa6023
diff --git a/app-containers/podman/podman-5.0.1.ebuild
b/app-containers/podman/podman-5.0.1.ebuild
new file mode 100644
index ..b535f608f817
--- /dev/null
+++ b/app-containers/podman/podman-5.0.1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11,12} )
+
+inherit go-module python-any-r1 tmpfiles linux-info
+
+DESCRIPTION="A tool for managing OCI containers and pods with
Docker-compatible CLI"
+HOMEPAGE="https://github.com/containers/podman/ https://podman.io/;
+
+if [[ ${PV} == * ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/containers/podman.git;
+else
+
SRC_URI="https://github.com/containers/podman/archive/v${PV/_rc/-rc}.tar.gz ->
${P}.tar.gz"
+ S="${WORKDIR}/${P/_rc/-rc}"
+ [[ ${PV} != *rc* ]] && \
+ KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
+
+# main pkg
+LICENSE="Apache-2.0"
+# deps
+LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="apparmor btrfs +seccomp selinux systemd wrapper"
+RESTRICT="test"
+
+RDEPEND="
+ app-containers/catatonit
+ >=app-containers/conmon-2.1.10
+ >=app-containers/containers-common-0.58.0-r1
+ app-crypt/gpgme:=
+ dev-libs/libassuan:=
+ dev-libs/libgpg-error:=
+ sys-apps/shadow:=
+
+ apparmor? ( sys-libs/libapparmor )
+ btrfs? ( sys-fs/btrfs-progs )
+ wrapper? ( !app-containers/docker-cli )
+ seccomp? ( sys-libs/libseccomp:= )
+ selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= )
+ systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-go/go-md2man
+"
+
+PATCHES=(
+ "${FILESDIR}/seccomp-toggle-4.7.0.patch"
+)
+
+CONFIG_CHECK="
+ ~USER_NS
+"
+
+pkg_setup() {
+ use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
+ linux-info_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ # assure necessary files are present
+ local file
+ for file in apparmor_tag btrfs_installed_tag btrfs_tag systemd_tag; do
+ [[ -f hack/"${file}".sh ]] || die
+ done
+
+ local feature
+ for feature in apparmor systemd; do
+ cat <<-EOF > hack/"${feature}"_tag.sh || die
+ #!/usr/bin/env bash
+ $(usex ${feature} "echo ${feature}" echo)
+ EOF
+ done
+
+ echo -e "#!/usr/bin/env bash\n echo" > hack/btrfs_installed_tag.sh ||
die
+ cat <<-EOF > hack/btrfs_tag.sh || die
+ #!/usr/bin/env bash
+ $(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
+ EOF
+}
+
+src_compile() {
+ export PREFIX="${EPREFIX}/usr"
+
+ # For non-live versions, prevent git operations which causes sandbox
violations
+ # https://github.com/gentoo/gentoo/pull/33531
[gentoo-commits] repo/gentoo:master commit in: app-admin/consul-template/
commit: 85d9e9c1254cb53ea9f697a13e4bf8bd36a562d1
Author: Zac Medico gentoo org>
AuthorDate: Mon Apr 1 07:03:53 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Apr 1 07:04:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85d9e9c1
app-admin/consul-template: add 0.37.4
Signed-off-by: Zac Medico gentoo.org>
app-admin/consul-template/Manifest | 2 +
.../consul-template/consul-template-0.37.4.ebuild | 59 ++
2 files changed, 61 insertions(+)
diff --git a/app-admin/consul-template/Manifest
b/app-admin/consul-template/Manifest
index 1478714eb232..97a28e9e68d8 100644
--- a/app-admin/consul-template/Manifest
+++ b/app-admin/consul-template/Manifest
@@ -1,2 +1,4 @@
DIST consul-template-0.29.4-deps.tar.xz 59446648 BLAKE2B
9ccd689f38eff50ad448a4226de918920c7acca9eb1e23d4e30fafc124224bb8f123b3dff4a1d433ea683ed523cd604a41472f50cb1919483040fc18c848
SHA512
3c60d88fdb82744f250cf02be3b3423f74360f18a43f4c4204ee97f73c370b878ecdbd5a300f96b74ffd9c7cde66f6c8b974392f7acc07a113b85ab6f1b6d8e9
DIST consul-template-0.29.5.tar.gz 262722 BLAKE2B
1e3ddf259d76cf487872cebbe8c8b5bb313b89d073b26496340d39cc55c4e56ec531cbefec4bc1c0dd5c8bb3bd707c9bebfd15011e421badf12ea59a5bbbdbe3
SHA512
f753c2ec7f6c97ac73b34820b40568b5b16a3b8d4bebc7390905614a96744e8d4afd4a63b8b911989ba084ea91d85a21e3283d67a36bf65a685aa63154361a14
+DIST consul-template-0.37.4-deps.tar.xz 1548760 BLAKE2B
34a4e7926f41578071e60c715c534a8a50c49db3a78b06ae6ee49ed1a1c857faea753f27921cb6345bbc94f44ab81da58d3ffd1d27a0e29220bd2631bb35b58a
SHA512
e28e29034407a5fbf78f9872b2cd85c0d6414cb5ec3c4b023b080c227583ae34ead6ab5b98c6ff4e1d278d9af137e895cedc79def10017d073f2b99561f1d483
+DIST consul-template-0.37.4.tar.gz 288565 BLAKE2B
69fc82a482c7fce4201621ee43aca689b328be4e34bb99e1cd552ba844787744a97fb64364adc7d9a180fd424d30881deaed45077851bc10fa037799ea99d189
SHA512
e36a5e444801c8700577df28fb3fbc7398b825d8f549d620c07445d86099a7597d0e95d56ce24daedd44eb573cc33e40dd1bb1e7a6def2c2a1788133bb811c38
diff --git a/app-admin/consul-template/consul-template-0.37.4.ebuild
b/app-admin/consul-template/consul-template-0.37.4.ebuild
new file mode 100644
index ..adf2f99b89be
--- /dev/null
+++ b/app-admin/consul-template/consul-template-0.37.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+DESCRIPTION="Generic template rendering and notifications with Consul"
+HOMEPAGE="https://github.com/hashicorp/consul-template;
+SRC_URI="https://github.com/hashicorp/consul-template/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz;
+
+LICENSE="MPL-2.0"
+LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="
+ acct-group/consul-template
+ acct-user/consul-template"
+
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+# TODO: debug test failures
+RESTRICT+=" test"
+
+src_prepare() {
+ default
+ # remove -s and -w from the linker flags
+ sed \
+ -e '/-s \\/d' \
+ -e '/-w \\/d' \
+ -i Makefile || die
+}
+
+src_compile() {
+ emake GOBIN="${S}"/bin dev
+}
+
+src_test() {
+ emake GOBIN="${S}"/bin test
+}
+
+src_install() {
+ dobin bin/${PN}
+ dodoc CHANGELOG.md README.md
+
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ keepdir /etc/${PN}.d
+
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+}
[gentoo-commits] repo/gentoo:master commit in: app-admin/consul/
commit: b6ea00520e4240b86025fd8c8b478e3275ed51ed
Author: Zac Medico gentoo org>
AuthorDate: Mon Apr 1 06:38:38 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Apr 1 06:43:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6ea0052
app-admin/consul: add 1.18.1
Signed-off-by: Zac Medico gentoo.org>
app-admin/consul/Manifest | 2 ++
app-admin/consul/consul-1.15.11.ebuild | 2 +-
.../consul/{consul-1.15.11.ebuild => consul-1.18.1.ebuild} | 10 --
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 71cc8fa00c88..23c8480a9d1c 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -2,3 +2,5 @@ DIST consul-1.15.10-vendor.tar.gz 46702348 BLAKE2B
a04d6f5a4d2f6f8885207f9f72537
DIST consul-1.15.11-deps.tar.xz 9566892 BLAKE2B
9459a93d78d3e4b991d0cdcfac22603c628c8f9fdacd8d50524a4c826cca66a575f6cd0bdf5fa9033e32b50336c53192567610ed73386f89c3c4e810c1412144
SHA512
d3876433b4ad3e7a062e059ef250bcfba23ede0595d8491f4b39c73c427e28c677b9f6e41317cf853ab8b3b2ce25151a4adf1a13b13a6a73c6e16de7382d2d05
DIST consul-1.15.11.tar.gz 28951114 BLAKE2B
02378088d1bbc4313ec62d644b583c328bc9cc40ccc18516a1a14ae0d7f8d12007f1a5fa7c5e455ec2e782ba986ce60d37b92369b1f89f7dd69871702cd97b31
SHA512
1c5c8f9a3ad79aa34fd82a49e92ef5a21fb0470d60e3f3413901305121cbb677c75f72ffd5405554424b336d4e5ec426b7c35f458c04b1d5ab9350c2649cd688
DIST consul-1.15.3-vendor.tar.gz 43434721 BLAKE2B
7595c98cdecf67e9fb412d8fea1d790dc6b1c29f7bc427e1d0872045a05f8873dc6107f196cea04fe0a2f2553d4fbb1f8d501e5e107b2bea3ae841e5d94eda64
SHA512
b69e3a7c1ebb01c7a64f2c6167e63e8a530b81be9aad8b591d0a71f512f5157ba9a564b46f9effe52a5abd3ae61732e7af10c5ba002110f745eb3d94ebcec256
+DIST consul-1.18.1-deps.tar.xz 10161908 BLAKE2B
da7e3e63470f082bf0f1e92252a2d30cce90c4268e5ad3d180ab4bfed6601e92e26e0a108fe7477a1d596cf44114e97551712bce4c2b3d13c06c3fae0fa948e5
SHA512
f0d3961de4c38052209d79817ba6570fc43f3b9c472c959d591cc8fd23029f32070a98c59c70c02f56b80c214ae60d4a2711ca2ec31472758209538ba00ef786
+DIST consul-1.18.1.tar.gz 34424463 BLAKE2B
1c205471fa5d2500e4421eae37159dc3a3f8ebb46ab50266440302ca814834d39fddf0c27f4da5e78a103a2d7411eebf74bd256153b3954c6bc3c384de660a2f
SHA512
023ee6f2dff82343f9c3382b531c8fa7f032e1820e09d18f67201c8ae839dfc89b145a8197be2f9c241709541a915a073dd117f5523e17ba0cdaa665bffc2f4c
diff --git a/app-admin/consul/consul-1.15.11.ebuild
b/app-admin/consul/consul-1.15.11.ebuild
index d5549a6d2665..f0597622b535 100644
--- a/app-admin/consul/consul-1.15.11.ebuild
+++ b/app-admin/consul/consul-1.15.11.ebuild
@@ -11,7 +11,7 @@ GIT_COMMIT="4fc94919996f7b7e5d16145f8d89cc5ee644b094"
SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz ->
${P}.tar.gz"
SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz;
LICENSE="BUSL-1.1 MPL-2.0"
-LICENSE=+=" Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+LICENSE+=" Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
RESTRICT="test"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
diff --git a/app-admin/consul/consul-1.15.11.ebuild
b/app-admin/consul/consul-1.18.1.ebuild
similarity index 87%
copy from app-admin/consul/consul-1.15.11.ebuild
copy to app-admin/consul/consul-1.18.1.ebuild
index d5549a6d2665..b54c5f6b26e6 100644
--- a/app-admin/consul/consul-1.15.11.ebuild
+++ b/app-admin/consul/consul-1.18.1.ebuild
@@ -6,14 +6,14 @@ inherit go-module systemd
DESCRIPTION="A tool for service discovery, monitoring and configuration"
HOMEPAGE="https://www.consul.io;
-GIT_COMMIT="4fc94919996f7b7e5d16145f8d89cc5ee644b094"
+GIT_COMMIT="98cb473cc11f2de0ccb61106381b0c7e92819c58"
SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz ->
${P}.tar.gz"
SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz;
LICENSE="BUSL-1.1 MPL-2.0"
-LICENSE=+=" Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
-RESTRICT="test"
+LICENSE+=" Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
SLOT="0"
+RESTRICT="test"
KEYWORDS="~amd64 ~arm64 ~x86"
BDEPEND="dev-go/gox"
@@ -23,11 +23,9 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}"
RDEPEND="${COMMON_DEPEND}"
-S=${WORKDIR}/${P}
-
src_prepare() {
default
- sed -e 's|^GIT_DATE=.*|GIT_DATE=2024-03-26T21:43:41Z|' -i GNUmakefile
|| die
+ sed -e 's|^GIT_DATE=.*|GIT_DATE=2024-03-26T21:59:08Z|' -i Makefile ||
die
}
src_compile() {
[gentoo-commits] repo/gentoo:master commit in: app-admin/consul/
commit: 846938833acc65b1cc32a169decf4641887c748e
Author: Zac Medico gentoo org>
AuthorDate: Mon Apr 1 06:24:03 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Apr 1 06:24:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84693883
app-admin/consul: add 1.15.11
Signed-off-by: Zac Medico gentoo.org>
app-admin/consul/Manifest | 2 ++
app-admin/consul/consul-1.15.11.ebuild | 62 ++
2 files changed, 64 insertions(+)
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 7d80f2efa108..02c61d0bc02a 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -1,3 +1,5 @@
DIST consul-1.15.10-vendor.tar.gz 46702348 BLAKE2B
a04d6f5a4d2f6f8885207f9f72537d4ea1a3adc5aab64873edf7f710984d3b25a602fb93cecc44ed82249280b51bbe1131701ab09f7ebb1b444c80e013fe271d
SHA512
7aade3f90ee689ddca3058f12e7c9f2a691c4eba966993d770d8dc7b171cad54c3c8b6c3f52e03128a8d1b159dd66b6c8b284050c5475d77b51f9a22c4a6af8a
+DIST consul-1.15.11-deps.tar.xz 9566892 BLAKE2B
9459a93d78d3e4b991d0cdcfac22603c628c8f9fdacd8d50524a4c826cca66a575f6cd0bdf5fa9033e32b50336c53192567610ed73386f89c3c4e810c1412144
SHA512
d3876433b4ad3e7a062e059ef250bcfba23ede0595d8491f4b39c73c427e28c677b9f6e41317cf853ab8b3b2ce25151a4adf1a13b13a6a73c6e16de7382d2d05
+DIST consul-1.15.11.tar.gz 28951114 BLAKE2B
02378088d1bbc4313ec62d644b583c328bc9cc40ccc18516a1a14ae0d7f8d12007f1a5fa7c5e455ec2e782ba986ce60d37b92369b1f89f7dd69871702cd97b31
SHA512
1c5c8f9a3ad79aa34fd82a49e92ef5a21fb0470d60e3f3413901305121cbb677c75f72ffd5405554424b336d4e5ec426b7c35f458c04b1d5ab9350c2649cd688
DIST consul-1.15.3-vendor.tar.gz 43434721 BLAKE2B
7595c98cdecf67e9fb412d8fea1d790dc6b1c29f7bc427e1d0872045a05f8873dc6107f196cea04fe0a2f2553d4fbb1f8d501e5e107b2bea3ae841e5d94eda64
SHA512
b69e3a7c1ebb01c7a64f2c6167e63e8a530b81be9aad8b591d0a71f512f5157ba9a564b46f9effe52a5abd3ae61732e7af10c5ba002110f745eb3d94ebcec256
DIST consul-1.15.7-vendor.tar.gz 46252048 BLAKE2B
c63d69fb206895c535ffd60ada3589d99ec6aec81d7abe6b27169d4638bcc272f5d7c0b37d0bbe6be54f5e2d32f1e40fa1f4088da7fb4931f0c5c10007838197
SHA512
1e52f133f822cf11ee8498b7e92a7460c74d3ed4736c02e0957e3d950608f4aeaec8e8df7e9eb72ae7d4c31c4dcf5d827c9c42bdc7c4b991be53df22c150658a
diff --git a/app-admin/consul/consul-1.15.11.ebuild
b/app-admin/consul/consul-1.15.11.ebuild
new file mode 100644
index ..d5549a6d2665
--- /dev/null
+++ b/app-admin/consul/consul-1.15.11.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io;
+GIT_COMMIT="4fc94919996f7b7e5d16145f8d89cc5ee644b094"
+
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz;
+LICENSE="BUSL-1.1 MPL-2.0"
+LICENSE=+=" Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+RESTRICT="test"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="dev-go/gox"
+COMMON_DEPEND="
+ acct-group/consul
+ acct-user/consul"
+ DEPEND="${COMMON_DEPEND}"
+ RDEPEND="${COMMON_DEPEND}"
+
+S=${WORKDIR}/${P}
+
+src_prepare() {
+ default
+ sed -e 's|^GIT_DATE=.*|GIT_DATE=2024-03-26T21:43:41Z|' -i GNUmakefile
|| die
+}
+
+src_compile() {
+ if use x86; then
+ #924629 pie breaks build on x86
+ GOFLAGS=${GOFLAGS//-buildmode=pie}
+ fi
+ # The dev target sets causes build.sh to set appropriate XC_OS
+ # and XC_ARCH, and skips generation of an unused zip file,
+ # avoiding a dependency on app-arch/zip.
+ GIT_DESCRIBE="v${PV}" \
+ GIT_DIRTY="" \
+ GIT_COMMIT="${GIT_COMMIT}" \
+ emake dev-build
+}
+
+src_install() {
+ dobin bin/consul
+
+ keepdir /etc/consul.d
+ insinto /etc/consul.d
+ doins "${FILESDIR}/"*.json.example
+
+ keepdir /var/log/consul
+ fowners consul:consul /var/log/consul
+
+ newinitd "${FILESDIR}/consul.initd" "${PN}"
+ newconfd "${FILESDIR}/consul.confd" "${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/consul.service"
+}
[gentoo-commits] repo/gentoo:master commit in: app-admin/consul/
commit: 66cdfe8862bca8783aea8c83e0c301db1afa2333
Author: Zac Medico gentoo org>
AuthorDate: Mon Apr 1 06:24:24 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Apr 1 06:24:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66cdfe88
app-admin/consul: drop 1.15.7
Signed-off-by: Zac Medico gentoo.org>
app-admin/consul/Manifest | 1 -
app-admin/consul/consul-1.15.7.ebuild | 61 ---
2 files changed, 62 deletions(-)
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 02c61d0bc02a..71cc8fa00c88 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -2,4 +2,3 @@ DIST consul-1.15.10-vendor.tar.gz 46702348 BLAKE2B
a04d6f5a4d2f6f8885207f9f72537
DIST consul-1.15.11-deps.tar.xz 9566892 BLAKE2B
9459a93d78d3e4b991d0cdcfac22603c628c8f9fdacd8d50524a4c826cca66a575f6cd0bdf5fa9033e32b50336c53192567610ed73386f89c3c4e810c1412144
SHA512
d3876433b4ad3e7a062e059ef250bcfba23ede0595d8491f4b39c73c427e28c677b9f6e41317cf853ab8b3b2ce25151a4adf1a13b13a6a73c6e16de7382d2d05
DIST consul-1.15.11.tar.gz 28951114 BLAKE2B
02378088d1bbc4313ec62d644b583c328bc9cc40ccc18516a1a14ae0d7f8d12007f1a5fa7c5e455ec2e782ba986ce60d37b92369b1f89f7dd69871702cd97b31
SHA512
1c5c8f9a3ad79aa34fd82a49e92ef5a21fb0470d60e3f3413901305121cbb677c75f72ffd5405554424b336d4e5ec426b7c35f458c04b1d5ab9350c2649cd688
DIST consul-1.15.3-vendor.tar.gz 43434721 BLAKE2B
7595c98cdecf67e9fb412d8fea1d790dc6b1c29f7bc427e1d0872045a05f8873dc6107f196cea04fe0a2f2553d4fbb1f8d501e5e107b2bea3ae841e5d94eda64
SHA512
b69e3a7c1ebb01c7a64f2c6167e63e8a530b81be9aad8b591d0a71f512f5157ba9a564b46f9effe52a5abd3ae61732e7af10c5ba002110f745eb3d94ebcec256
-DIST consul-1.15.7-vendor.tar.gz 46252048 BLAKE2B
c63d69fb206895c535ffd60ada3589d99ec6aec81d7abe6b27169d4638bcc272f5d7c0b37d0bbe6be54f5e2d32f1e40fa1f4088da7fb4931f0c5c10007838197
SHA512
1e52f133f822cf11ee8498b7e92a7460c74d3ed4736c02e0957e3d950608f4aeaec8e8df7e9eb72ae7d4c31c4dcf5d827c9c42bdc7c4b991be53df22c150658a
diff --git a/app-admin/consul/consul-1.15.7.ebuild
b/app-admin/consul/consul-1.15.7.ebuild
deleted file mode 100644
index 2b693c361655..
--- a/app-admin/consul/consul-1.15.7.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd
-
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="https://www.consul.io;
-GIT_COMMIT="8e803db6b98d10b2d310800f2aef7e20d3add03c"
-
-SRC_URI="https://github.com/zmedico/consul/archive/v${PV}-vendor.tar.gz ->
${P}-vendor.tar.gz"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
-RESTRICT="test"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-BDEPEND="dev-go/gox"
-COMMON_DEPEND="
- acct-group/consul
- acct-user/consul"
- DEPEND="${COMMON_DEPEND}"
- RDEPEND="${COMMON_DEPEND}"
-
-S=${WORKDIR}/${P}-vendor
-
-src_prepare() {
- default
- sed -e 's|^GIT_DATE=.*|GIT_DATE=2023-10-31T14:10:44Z|' -i GNUmakefile
|| die
-}
-
-src_compile() {
- if use x86; then
- #924629 pie breaks build on x86
- GOFLAGS=${GOFLAGS//-buildmode=pie}
- fi
- # The dev target sets causes build.sh to set appropriate XC_OS
- # and XC_ARCH, and skips generation of an unused zip file,
- # avoiding a dependency on app-arch/zip.
- GIT_DESCRIBE="v${PV}" \
- GIT_DIRTY="" \
- GIT_COMMIT="${GIT_COMMIT}" \
- emake dev-build
-}
-
-src_install() {
- dobin bin/consul
-
- keepdir /etc/consul.d
- insinto /etc/consul.d
- doins "${FILESDIR}/"*.json.example
-
- keepdir /var/log/consul
- fowners consul:consul /var/log/consul
-
- newinitd "${FILESDIR}/consul.initd" "${PN}"
- newconfd "${FILESDIR}/consul.confd" "${PN}"
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
- systemd_dounit "${FILESDIR}/consul.service"
-}
[gentoo-commits] repo/gentoo:master commit in: app-containers/buildah/files/, app-containers/buildah/
commit: a279dcf6a4f66dafab10abd264da57b9ac7d13bd
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Mon Apr 1 04:38:18 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Apr 1 05:57:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a279dcf6
app-containers/buildah: stoppeg calling strip directly
Closes: https://bugs.gentoo.org/928309
Signed-off-by: Rahil Bhimjiani rahil.rocks>
Closes: https://github.com/gentoo/gentoo/pull/36031
Signed-off-by: Zac Medico gentoo.org>
app-containers/buildah/buildah-1.33.7.ebuild | 12 ++---
app-containers/buildah/buildah-1.34.3.ebuild | 14 ---
app-containers/buildah/buildah-1.35.3.ebuild | 3 ++-
app-containers/buildah/buildah-.ebuild | 4 +--
.../files/softcode-strip-upstream-pr-5446.patch| 29 ++
5 files changed, 53 insertions(+), 9 deletions(-)
diff --git a/app-containers/buildah/buildah-1.33.7.ebuild
b/app-containers/buildah/buildah-1.33.7.ebuild
index 60b99c3a6057..a24bd18a767c 100644
--- a/app-containers/buildah/buildah-1.33.7.ebuild
+++ b/app-containers/buildah/buildah-1.33.7.ebuild
@@ -60,15 +60,16 @@ src_prepare() {
cat <<'EOF' > "${T}/dont-call-as-directly-upstream-pr-5436.patch"
--- a/Makefile
+++ b/Makefile
-@@ -10,6 +10,7 @@
+@@ -10,6 +10,8 @@
BASHINSTALLDIR = $(PREFIX)/share/bash-completion/completions
BUILDFLAGS := -tags "$(BUILDTAGS)"
BUILDAH := buildah
+AS ?= as
++STRIP ?= strip
GO := go
GO_LDFLAGS := $(shell if $(GO) version|grep -q gccgo; then echo
"-gccgoflags"; else echo "-ldflags"; fi)
-@@ -72,7 +73,7 @@
+@@ -72,11 +74,11 @@
bin/buildah: $(SOURCES) cmd/buildah/*.go internal/mkcw/embed/entrypoint.gz
$(GO_BUILD) $(BUILDAH_LDFLAGS) $(GO_GCFLAGS) "$(GOGCFLAGS)" -o $@
$(BUILDFLAGS) ./cmd/buildah
@@ -77,6 +78,11 @@ src_prepare() {
internal/mkcw/embed/entrypoint: internal/mkcw/embed/entrypoint.s
$(AS) -o $(patsubst %.s,%.o,$^) $^
$(LD) -o $@ $(patsubst %.s,%.o,$^)
+- strip $@
++ $(STRIP) $@
+ else
+ .PHONY: internal/mkcw/embed/entrypoint
+ endif
EOF
default
@@ -139,7 +145,7 @@ src_compile() {
# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
[[ ${PV} != * ]] && export COMMIT_NO="" GIT_COMMIT=""
- tc-export AS LD
+ tc-export AS LD STRIP
export GOMD2MAN="$(command -v go-md2man)"
default
}
diff --git a/app-containers/buildah/buildah-1.34.3.ebuild
b/app-containers/buildah/buildah-1.34.3.ebuild
index 4b82e782d4f3..cc06bf2ff42d 100644
--- a/app-containers/buildah/buildah-1.34.3.ebuild
+++ b/app-containers/buildah/buildah-1.34.3.ebuild
@@ -60,15 +60,16 @@ src_prepare() {
cat <<'EOF' > "${T}/dont-call-as-directly-upstream-pr-5436.patch"
--- a/Makefile
+++ b/Makefile
-@@ -10,6 +10,7 @@
+@@ -14,6 +14,8 @@
BASHINSTALLDIR = $(PREFIX)/share/bash-completion/completions
BUILDFLAGS := -tags "$(BUILDTAGS)"
BUILDAH := buildah
+AS ?= as
++STRIP ?= strip
GO := go
GO_LDFLAGS := $(shell if $(GO) version|grep -q gccgo; then echo
"-gccgoflags"; else echo "-ldflags"; fi)
-@@ -77,7 +77,7 @@
+@@ -76,14 +78,14 @@
bin/buildah: $(SOURCES) cmd/buildah/*.go
internal/mkcw/embed/entrypoint_amd64.gz
$(GO_BUILD) $(BUILDAH_LDFLAGS) $(GO_GCFLAGS) "$(GOGCFLAGS)" -o $@
$(BUILDFLAGS) ./cmd/buildah
@@ -76,6 +77,13 @@ src_prepare() {
+ifneq ($(shell $(AS) --version | grep x86_64),)
internal/mkcw/embed/entrypoint_amd64.gz: internal/mkcw/embed/entrypoint_amd64
gzip -k9nf $^
+
+ internal/mkcw/embed/entrypoint_amd64: internal/mkcw/embed/entrypoint_amd64.s
+ $(AS) -o $(patsubst %.s,%.o,$^) $^
+ $(LD) -o $@ $(patsubst %.s,%.o,$^)
+- strip $@
++ $(STRIP) $@
+ endif
EOF
default
@@ -138,7 +146,7 @@ src_compile() {
# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
[[ ${PV} != * ]] && export COMMIT_NO="" GIT_COMMIT=""
- tc-export AS LD
+ tc-export AS LD STRIP
export GOMD2MAN="$(command -v go-md2man)"
default
}
diff --git a/app-containers/buildah/buildah-1.35.3.ebuild
b/app-containers/buildah/buildah-1.35.3.ebuild
index b0b39faf03cb..e1c7e23390e5 100644
--- a/app-containers/buildah/buildah-1.35.3.ebuild
+++ b/app-containers/buildah/buildah-1.35.3.ebuild
@@ -46,6 +46,7 @@ BDEPEND="dev-go/go-md2man"
PATCHES=(
"${FILESDIR}"/dont-call-as-directly-upstream-pr-5436.patch
+ "${FILESDIR}"/softcode-strip-upstream-pr-5446.patch
)
pkg_pretend() {
@@ -117,7 +118,7 @@ src_compile() {
# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
[[ ${PV} != * ]] && export COMMIT_NO="" GIT_COMMIT="&qu
[gentoo-commits] repo/gentoo:master commit in: app-containers/podman/files/
commit: b665394890be93ab9cc52d77d36c9191e98ee078
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Mon Apr 1 03:25:14 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Apr 1 05:57:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6653948
app-containers/podman: cleanup unused files
Signed-off-by: Rahil Bhimjiani rahil.rocks>
From: https://github.com/gentoo/gentoo/pull/36031
Signed-off-by: Zac Medico gentoo.org>
app-containers/podman/files/podman.confd | 11 ---
app-containers/podman/files/podman.initd | 20
2 files changed, 31 deletions(-)
diff --git a/app-containers/podman/files/podman.confd
b/app-containers/podman/files/podman.confd
deleted file mode 100644
index e997d3b4000e..
--- a/app-containers/podman/files/podman.confd
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for /etc/init.d/podman
-
-# Sets the API service daemon log level
-# valid levels: debug, info, warn, error, fatal or panic
-#LOG_LEVEL="error"
-
-# Sets the API service daemon socket
-#SOCKET="unix:/run/${RC_SVCNAME}/podman.sock"
-
-# Configure the user[:group] the API service daemon will run as
-#RUN_AS_USER="root:root"
diff --git a/app-containers/podman/files/podman.initd
b/app-containers/podman/files/podman.initd
deleted file mode 100644
index 7adcdab40ea3..
--- a/app-containers/podman/files/podman.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2015-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-description="Podman Remote API Service"
-LOG_PATH="/var/log/${RC_SVCNAME}"
-RUN_PATH="/run/${RC_SVCNAME}"
-: ${LOG_LEVEL:=error}
-: ${RUN_AS_USER:=root:root}
-: ${SOCKET:=unix:/run/${RC_SVCNAME}/podman.sock}
-pidfile="${RUN_PATH}/${RC_SVCNAME}.pid"
-command="/usr/bin/podman"
-command_args="--log-level ${LOG_LEVEL} system service -t 0 ${SOCKET}"
-command_background="true"
-start_stop_daemon_args="--stdout ${LOG_PATH}/${RC_SVCNAME}.log --stderr
${LOG_PATH}/${RC_SVCNAME}.log --user ${RUN_AS_USER}"
-
-start() {
- checkpath -o "${RUN_AS_USER}" -d "${RUN_PATH}" "${LOG_PATH}"
- default_start
-}
[gentoo-commits] repo/gentoo:master commit in: net-misc/passt/
commit: 47be2b31bae315b9c5b8c56733e08b632cc643b0
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Tue Mar 26 13:11:37 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Apr 1 00:55:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47be2b31
net-misc/passt: add 2024.03.26
Signed-off-by: Rahil Bhimjiani rahil.rocks>
Closes: https://github.com/gentoo/gentoo/pull/35930
Signed-off-by: Zac Medico gentoo.org>
net-misc/passt/Manifest | 1 +
net-misc/passt/{passt-.ebuild => passt-2024.03.26.ebuild} | 4 ++--
net-misc/passt/passt-.ebuild | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/net-misc/passt/Manifest b/net-misc/passt/Manifest
index 2a3c232940c4..4ed5efa8b832 100644
--- a/net-misc/passt/Manifest
+++ b/net-misc/passt/Manifest
@@ -1,3 +1,4 @@
DIST passt-2023.12.04.tar.xz 188136 BLAKE2B
f1d72fbb4bbb25f6a11e9ff87a91cf9bac06e047b8cb9a8b40402ced1422c23b105fa7e64646698d38ad747efa449c34cfdaecf492a3e4984114cbcf60656cdc
SHA512
febd9fa22363438b52b2688481183d81c22966e1775139fc559dbfa50437c9b00ba09800db867738d25fcea8ac05d4589b75dcd2d0c88eeffefc0598d4236001
DIST passt-2023.12.30.tar.xz 188596 BLAKE2B
75712a7cb7a00fea20427979153090d938b8c7b0e3da61c83cabb3751786034df35ebbe8afbd991d582a680f55b12792547b68efa931a5576dc181040b31e5fd
SHA512
4b19d191e2526bacc61bb8ab2964f5da4e0535656b094a7592f91d6b437c855a586fc772e2abd89138ff4f89aae12ade494c6e0fe7bee1502fe319215200d8f0
DIST passt-2024.03.20.tar.xz 195332 BLAKE2B
1bed740ddd235f300a4233fb2024f155758809589f1fdd2174ab99a8a93dd16044ab41814b215d12eb1e557966a73a3754bbff2b9acd752b45b385edd88ba3c7
SHA512
3701820e539545771d0f867fe0b8977cb5967e7501413f717fed08d2d2c141f17d86ed7238177b4fb4cf4cfc01c6c9d07e3c218c34b48e0a5a1f2b2ce8a5b903
+DIST passt-2024.03.26.tar.xz 195348 BLAKE2B
d91e6ac1d50aae04ceb53a34341b545ff644ceccdfcfab461907050612d9d871f61591aac02ebddef9a607a9b39ce5017a2fc47c9189f85b9b9a70a30d010e4c
SHA512
da771f8f334862f81702b22688c9d3552aefc2883b5a44c39156ff7a69f301cabf52fa0fb13f8695240db5411c498806d28d847fca8caff2bedb69d1a4b4e5a7
diff --git a/net-misc/passt/passt-.ebuild
b/net-misc/passt/passt-2024.03.26.ebuild
similarity index 93%
copy from net-misc/passt/passt-.ebuild
copy to net-misc/passt/passt-2024.03.26.ebuild
index 267622576406..90df839f93d9 100644
--- a/net-misc/passt/passt-.ebuild
+++ b/net-misc/passt/passt-2024.03.26.ebuild
@@ -8,7 +8,7 @@ inherit toolchain-funcs
DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement
for Slirp"
HOMEPAGE="https://passt.top/;
-RELEASE_COMMIT="71dd405"
+RELEASE_COMMIT="4988e2b"
if [[ ${PV} == * ]]; then
inherit git-r3
@@ -16,7 +16,7 @@ if [[ ${PV} == * ]]; then
else
SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz ->
${P}.tar.xz"
S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
- KEYWORDS="~amd64 ~riscv"
+ KEYWORDS="~amd64 ~arm64 ~riscv"
fi
LICENSE="BSD GPL-2+"
diff --git a/net-misc/passt/passt-.ebuild b/net-misc/passt/passt-.ebuild
index 267622576406..90df839f93d9 100644
--- a/net-misc/passt/passt-.ebuild
+++ b/net-misc/passt/passt-.ebuild
@@ -8,7 +8,7 @@ inherit toolchain-funcs
DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement
for Slirp"
HOMEPAGE="https://passt.top/;
-RELEASE_COMMIT="71dd405"
+RELEASE_COMMIT="4988e2b"
if [[ ${PV} == * ]]; then
inherit git-r3
@@ -16,7 +16,7 @@ if [[ ${PV} == * ]]; then
else
SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz ->
${P}.tar.xz"
S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
- KEYWORDS="~amd64 ~riscv"
+ KEYWORDS="~amd64 ~arm64 ~riscv"
fi
LICENSE="BSD GPL-2+"
[gentoo-commits] repo/gentoo:master commit in: app-containers/buildah/
commit: 2548753d633ea5a15c023e8584418a96fd1823a6
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Sun Mar 31 07:23:24 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Apr 1 00:35:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2548753d
app-containers/buildah: cleanup vulnerable versions
1.33.5, 1.33.6
1.34.0
1.35.1
Signed-off-by: Rahil Bhimjiani rahil.rocks>
Bug: https://bugs.gentoo.org/927499
Bug: https://bugs.gentoo.org/927502
Closes: https://github.com/gentoo/gentoo/pull/36011
Signed-off-by: Zac Medico gentoo.org>
app-containers/buildah/Manifest | 4 -
app-containers/buildah/buildah-1.33.5.ebuild | 125 -
app-containers/buildah/buildah-1.33.6.ebuild | 125 -
app-containers/buildah/buildah-1.34.0.ebuild | 125 -
app-containers/buildah/buildah-1.35.1.ebuild | 132 ---
5 files changed, 511 deletions(-)
diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest
index 0609e39a594c..7c70929c83d1 100644
--- a/app-containers/buildah/Manifest
+++ b/app-containers/buildah/Manifest
@@ -1,7 +1,3 @@
-DIST buildah-1.33.5.tar.gz 18579521 BLAKE2B
a59bfda3dea1f588a2f77a26b942da6ae02a00f1169008f776a2d7699b6b14f38ab29b46b7d0651e9fff3f007e5f95caed99952cc7585c25ea2a3153402958e9
SHA512
82ddfacd69918fb4ca8110d7d5279f4075385e5db5b64b58cf41a90c47e16093f1e65d8ef20136a4cd8f5c23ea8da7f35fb72581cec6472497b9c5b458023e9c
-DIST buildah-1.33.6.tar.gz 18585405 BLAKE2B
4a6f6ebfce7799a45b0984b6f9a319becfed87d5acf5f1f784249ff6e5397495ac72c00a22ff0bcc68fd94f1d0a591fa4ac5f0f88bcc9c0a6cdefe117166b4ec
SHA512
86eab18af459b0b92361d6e9f56ebe9dab65527d829e7771c13b6c574ef45746a7f53520783ff52978b14aac0d6ee8de32cdabf807666a96dcf46e07e36157e2
DIST buildah-1.33.7.tar.gz 18604354 BLAKE2B
d2788096d8d6fd6cc528e8f33edc58a2775a561ea3c4a983eb4a6fa1d5b570f6d8dc0f77e464d0c242add5d641e20afce83c9f5157021fbc82a009ea47c9
SHA512
1248ad1dcf0d10608674543caf4d78f5052db7932102226e23b73add5e129bd8c614672f3d06aa8052675dd83fa83ef2742ef08fe1a883037b41df8fde893ea1
-DIST buildah-1.34.0.tar.gz 18751419 BLAKE2B
6584c5234e849f9b8cde5e4188791024c8ac5c0ba85859e289f3eb2ec32f97f722ebf25f1291f29e14edf4adc14e19d6a6a76630c820085e9f345736aeb3d4eb
SHA512
a3836ce540058f418131969e157d548864727398535e4e99a693d883419b8d764da7166f9b9376c2b9686d8beac101687843c2e93198b16328ef333ad96d55db
DIST buildah-1.34.3.tar.gz 18856476 BLAKE2B
c91c995a2ff4be8b4e84a70c581a817cb2f1333b08ca297163d218f80d538905c41718cfc267c03173330234c3476344be44df799eaaac891395a22bc7a020b3
SHA512
26d5c48cb5b056a274c1a9c6820a6076337f625fc6dd6683000db871f3de9d37907bd962ced3400334bfc230718219cda2108e2e984be5f8c76ecfa4a2f1e1ac
-DIST buildah-1.35.1.tar.gz 19349661 BLAKE2B
31b633f35f937364816dac65e7a801676043630bc3c00ac445ad67afea04142748f76c4aed16690aa990e2c15ed220bdb42b96c6dd9bb0dac9c9d16fc2a27ddc
SHA512
3e5af28b3d45e51674d08bef9a92cd64589026d9c6ebee51156738151681395860e372bba2667815e0f90e37984eb9dfdc9b8ad0675b62c8751582b29485d159
DIST buildah-1.35.3.tar.gz 19372597 BLAKE2B
014bea80b3a8c4482bbe098a0c5293892cf9f4f0d4d74ecaba8f155e49fab326689b95b690b413d64f6b576c7269bdb9d0f446244b832afe311e909b3f96856d
SHA512
ca325ce1a878eb9e9a6caedf236add16702d8dcd83f15a1995b8215998821218104ea8cb7a5d11fc354ee01d9805c339578975d35db859f1d53b08e0a2139fe3
diff --git a/app-containers/buildah/buildah-1.33.5.ebuild
b/app-containers/buildah/buildah-1.33.5.ebuild
deleted file mode 100644
index d258b206eb6a..
--- a/app-containers/buildah/buildah-1.33.5.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module linux-info
-
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah;
-
-# main pkg
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-
-SLOT="0"
-IUSE="apparmor btrfs +seccomp systemd doc test"
-RESTRICT="test"
-EXTRA_DOCS=(
- "CHANGELOG.md"
- "CONTRIBUTING.md"
- "install.md"
- "troubleshooting.md"
- "docs/tutorials"
-)
-
-if [[ ${PV} == * ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/containers/buildah.git;
-else
- SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~arm64"
-fi
-
-RDEPEND="
- systemd? ( sys-apps/systemd )
- btrfs? ( sys-fs/btrfs-progs )
- seccomp? ( sys-libs/libseccomp:= )
- apparmor? ( sys-libs/libapparmor:= )
- app-containers/containers-common
- app-crypt/gpgme:=
- dev-libs/libgpg-error:=
- dev-libs/libassuan:=
- sys-apps/shadow:=
-"
-DEPEND="${RDEPEND}&q
[gentoo-commits] repo/gentoo:master commit in: net-vpn/frp/files/, net-vpn/frp/
commit: 96027ab3666197c477280b21d80bb095869b7cd7 Author: Puqns67 puqns67 icu> AuthorDate: Sun Mar 31 18:43:32 2024 + Commit: Zac Medico gentoo org> CommitDate: Mon Apr 1 00:16:02 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96027ab3 net-vpn/frp: add 0.53.2-r1, 0.56.0, drop 0.53.2 * Update service files * Fix file names of configuration files in '/etc/frp' Signed-off-by: Puqns67 puqns67.icu> Closes: https://github.com/gentoo/gentoo/pull/36025 Signed-off-by: Zac Medico gentoo.org> net-vpn/frp/Manifest | 2 ++ net-vpn/frp/files/frpc.service | 5 ++- net-vpn/frp/files/frpc_at_.service | 5 ++- net-vpn/frp/files/frps.service | 4 +-- net-vpn/frp/files/frps_at_.service | 4 +-- net-vpn/frp/frp-0.53.2-r1.ebuild | 64 + net-vpn/frp/frp-0.53.2.ebuild | 65 -- net-vpn/frp/frp-0.56.0.ebuild | 65 ++ 8 files changed, 139 insertions(+), 75 deletions(-) diff --git a/net-vpn/frp/Manifest b/net-vpn/frp/Manifest index 67de7b6e5d5a..d3746f023af7 100644 --- a/net-vpn/frp/Manifest +++ b/net-vpn/frp/Manifest @@ -1,2 +1,4 @@ DIST frp-0.53.2-deps.tar.xz 55621188 BLAKE2B 35e14b82bbc3a3386f2901a274969e7650cf6ce529ae17dd7ab0a7f759f355da7b7d64d0945e22d3a741d75ff3e21bd17ccf708d2184605c9303b35dc63f1b88 SHA512 c173d1d1918afc5549d99ac575eadd2b408220625c773ec5f5cce4e00a648c19d9a3cfbfce51a86e0e8425edb7a1a72a9d798a37f4bf37b38c0d4d031bc27dae DIST frp-0.53.2.tar.gz 1023383 BLAKE2B bad6aee65d5386ba14a0c4679514e17e1643b703292a4bb0811ff1f9a76b95833358993fdfb13b1e4224d7cf8c0035c2aabfdcd74a14003dff90c3e569fa5d12 SHA512 c1f0acff002dbdef001d04c3dcd5ca138c33a36b8e5ad119a555f0dd05f4e6200c915e1481eab58c02e650a058f0b3f75310b9a50ad4756087f69f9fe74377b4 +DIST frp-0.56.0-deps.tar.xz 47560372 BLAKE2B b40fb99c8ed769c287db2f866198b1d9e6f41f25ae1caa1ba8aa1270e14b2ddc6e3771664407bde12aecb29e3a93d76865db3c18bcda7df78f6a557bb7d77727 SHA512 110717775f40f27665c656a37d157455bb81487959fa8826464ff0f5da03d7dcb64a2f1ab190fa3dcb6331be178515ca48ce3d18a6fb81f7ac1c3f93652de7b8 +DIST frp-0.56.0.tar.gz 1080201 BLAKE2B 493e8b21aab6d5fae2d762eafba7d94de59394e9c4cb3c3dfce2bd8b5a0d0fcca6ef471917e8257022e079bececf34e910fe3b6bc845753862da59a1d00ca20c SHA512 883dce220aa78296f2b7eb9d64b3d1598bc2df436c52a48bc813d725a6f8fa43028359b0507bf4a586a29f4739310474047abfefd46249c0c9942990ceac0e2d diff --git a/net-vpn/frp/files/frpc.service b/net-vpn/frp/files/frpc.service index 37a6a9bccbac..5679ae7d1229 100644 --- a/net-vpn/frp/files/frpc.service +++ b/net-vpn/frp/files/frpc.service @@ -4,11 +4,10 @@ After=network.target [Service] Type=simple -User=nobody +DynamicUser=yes Restart=on-failure RestartSec=5s -ExecStart=/usr/bin/frpc -c /etc/frp/frpc.ini -ExecReload=/usr/bin/frpc reload -c /etc/frp/frpc.ini +ExecStart=/usr/bin/frpc -c /etc/frp/frpc.toml LimitNOFILE=1048576 [Install] diff --git a/net-vpn/frp/files/frpc_at_.service b/net-vpn/frp/files/frpc_at_.service index 5914ff6ae97e..79331b417003 100644 --- a/net-vpn/frp/files/frpc_at_.service +++ b/net-vpn/frp/files/frpc_at_.service @@ -4,11 +4,10 @@ After=network.target [Service] Type=simple -User=nobody +DynamicUser=yes Restart=on-failure RestartSec=5s -ExecStart=/usr/bin/frpc -c /etc/frp/%i.ini -ExecReload=/usr/bin/frpc reload -c /etc/frp/%i.ini +ExecStart=/usr/bin/frpc -c /etc/frp/%i.toml LimitNOFILE=1048576 [Install] diff --git a/net-vpn/frp/files/frps.service b/net-vpn/frp/files/frps.service index c00f2dc53c64..69b1cd887029 100644 --- a/net-vpn/frp/files/frps.service +++ b/net-vpn/frp/files/frps.service @@ -4,10 +4,10 @@ After=network.target [Service] Type=simple -User=nobody +DynamicUser=yes Restart=on-failure RestartSec=5s -ExecStart=/usr/bin/frps -c /etc/frp/frps.ini +ExecStart=/usr/bin/frps -c /etc/frp/frps.toml LimitNOFILE=1048576 [Install] diff --git a/net-vpn/frp/files/frps_at_.service b/net-vpn/frp/files/frps_at_.service index 2942e0ba7a69..3f337590fcd0 100644 --- a/net-vpn/frp/files/frps_at_.service +++ b/net-vpn/frp/files/frps_at_.service @@ -4,10 +4,10 @@ After=network.target [Service] Type=simple -User=nobody +DynamicUser=yes Restart=on-failure RestartSec=5s -ExecStart=/usr/bin/frps -c /etc/frp/%i.ini +ExecStart=/usr/bin/frps -c /etc/frp/%i.toml LimitNOFILE=1048576 [Install] diff --git a/net-vpn/frp/frp-0.53.2-r1.ebuild b/net-vpn/frp/frp-0.53.2-r1.ebuild new file mode 100644 index ..d8e7afbf47de --- /dev/null +++ b/net-vpn/frp/frp-0.53.2-r1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module systemd shell-completion + +DESCRIPTION="A reverse proxy that exposes a server behind a NAT or firewall to the internet" +HOMEPAGE="https://github.com/fatedier/frp; +SRC_URI="https://github.com/fatedier/frp/archive/refs/ta
[gentoo-commits] repo/gentoo:master commit in: net-vpn/frp/
commit: 36ffd01c33d24951f02bd4e79f260cffcfec0eda
Author: Zac Medico gentoo org>
AuthorDate: Mon Apr 1 00:13:09 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Apr 1 00:16:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36ffd01c
net-vpn/frp: Use smaller vendor deps tarball
Signed-off-by: Zac Medico gentoo.org>
net-vpn/frp/Manifest | 2 +-
net-vpn/frp/frp-0.56.0.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-vpn/frp/Manifest b/net-vpn/frp/Manifest
index d3746f023af7..88d4b6b6b30a 100644
--- a/net-vpn/frp/Manifest
+++ b/net-vpn/frp/Manifest
@@ -1,4 +1,4 @@
DIST frp-0.53.2-deps.tar.xz 55621188 BLAKE2B
35e14b82bbc3a3386f2901a274969e7650cf6ce529ae17dd7ab0a7f759f355da7b7d64d0945e22d3a741d75ff3e21bd17ccf708d2184605c9303b35dc63f1b88
SHA512
c173d1d1918afc5549d99ac575eadd2b408220625c773ec5f5cce4e00a648c19d9a3cfbfce51a86e0e8425edb7a1a72a9d798a37f4bf37b38c0d4d031bc27dae
DIST frp-0.53.2.tar.gz 1023383 BLAKE2B
bad6aee65d5386ba14a0c4679514e17e1643b703292a4bb0811ff1f9a76b95833358993fdfb13b1e4224d7cf8c0035c2aabfdcd74a14003dff90c3e569fa5d12
SHA512
c1f0acff002dbdef001d04c3dcd5ca138c33a36b8e5ad119a555f0dd05f4e6200c915e1481eab58c02e650a058f0b3f75310b9a50ad4756087f69f9fe74377b4
-DIST frp-0.56.0-deps.tar.xz 47560372 BLAKE2B
b40fb99c8ed769c287db2f866198b1d9e6f41f25ae1caa1ba8aa1270e14b2ddc6e3771664407bde12aecb29e3a93d76865db3c18bcda7df78f6a557bb7d77727
SHA512
110717775f40f27665c656a37d157455bb81487959fa8826464ff0f5da03d7dcb64a2f1ab190fa3dcb6331be178515ca48ce3d18a6fb81f7ac1c3f93652de7b8
+DIST frp-0.56.0-deps.tar.xz 2890568 BLAKE2B
cabeeba66d4fa94ff95637020178310c984b7e3254c756e75f0facc5bee0803c6ba485fa83e7c0f7c92474ce9d60621cd6a1608c3b631f2a9c27f6b6c9638ebe
SHA512
0687db5001542780ac6e5c57d0da356f4c36bd31c96c2657a9e15988950436abedcd490d85cc272ff80f4868989d173a71dcf2cf28ed26f93b877d1650f04206
DIST frp-0.56.0.tar.gz 1080201 BLAKE2B
493e8b21aab6d5fae2d762eafba7d94de59394e9c4cb3c3dfce2bd8b5a0d0fcca6ef471917e8257022e079bececf34e910fe3b6bc845753862da59a1d00ca20c
SHA512
883dce220aa78296f2b7eb9d64b3d1598bc2df436c52a48bc813d725a6f8fa43028359b0507bf4a586a29f4739310474047abfefd46249c0c9942990ceac0e2d
diff --git a/net-vpn/frp/frp-0.56.0.ebuild b/net-vpn/frp/frp-0.56.0.ebuild
index b7ac11f4e26f..83d79cd6446d 100644
--- a/net-vpn/frp/frp-0.56.0.ebuild
+++ b/net-vpn/frp/frp-0.56.0.ebuild
@@ -8,7 +8,7 @@ inherit go-module systemd shell-completion
DESCRIPTION="A reverse proxy that exposes a server behind a NAT or firewall to
the internet"
HOMEPAGE="https://github.com/fatedier/frp;
SRC_URI="https://github.com/fatedier/frp/archive/refs/tags/v${PV}.tar.gz ->
${P}.tar.gz
-
https://github.com/Puqns67/gentoo-deps/releases/download/${P}/${P}-deps.tar.xz;
+ https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz;
LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/frp/
commit: adfb82067644087877ba3d97d9d7390ad6058e3e
Author: Puqns67 puqns67 icu>
AuthorDate: Sun Mar 31 18:28:23 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Apr 1 00:16:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adfb8206
net-vpn/frp: drop 0.45.0
The new version needs to update the systemd service file,
maintain multiple versions of service files is not necessary, drop it.
Signed-off-by: Puqns67 puqns67.icu>
From: https://github.com/gentoo/gentoo/pull/36025
Signed-off-by: Zac Medico gentoo.org>
net-vpn/frp/Manifest | 1 -
net-vpn/frp/frp-0.45.0.ebuild | 37 -
2 files changed, 38 deletions(-)
diff --git a/net-vpn/frp/Manifest b/net-vpn/frp/Manifest
index 9e2aff55f99f..67de7b6e5d5a 100644
--- a/net-vpn/frp/Manifest
+++ b/net-vpn/frp/Manifest
@@ -1,3 +1,2 @@
-DIST frp-0.45.0-vendor.tar.gz 5301832 BLAKE2B
23198a326678f3ec5357ce1bd6c7abff26a27dce6810653ef0262fb3f5c68165481ec75218ded64c90a357fafefba11b0a9c0afc4dc7e3a229ad8cc245a76fc3
SHA512
b94dd5adec82ae940044d448ec4551ca24ec3c8f1a9d870327a76a9a7d3b39e7dc567199a999b85879637dca3d46df65f8f46d11c3dbe10653a20f2eb7521f9a
DIST frp-0.53.2-deps.tar.xz 55621188 BLAKE2B
35e14b82bbc3a3386f2901a274969e7650cf6ce529ae17dd7ab0a7f759f355da7b7d64d0945e22d3a741d75ff3e21bd17ccf708d2184605c9303b35dc63f1b88
SHA512
c173d1d1918afc5549d99ac575eadd2b408220625c773ec5f5cce4e00a648c19d9a3cfbfce51a86e0e8425edb7a1a72a9d798a37f4bf37b38c0d4d031bc27dae
DIST frp-0.53.2.tar.gz 1023383 BLAKE2B
bad6aee65d5386ba14a0c4679514e17e1643b703292a4bb0811ff1f9a76b95833358993fdfb13b1e4224d7cf8c0035c2aabfdcd74a14003dff90c3e569fa5d12
SHA512
c1f0acff002dbdef001d04c3dcd5ca138c33a36b8e5ad119a555f0dd05f4e6200c915e1481eab58c02e650a058f0b3f75310b9a50ad4756087f69f9fe74377b4
diff --git a/net-vpn/frp/frp-0.45.0.ebuild b/net-vpn/frp/frp-0.45.0.ebuild
deleted file mode 100644
index fa2801c4d23b..
--- a/net-vpn/frp/frp-0.45.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="A reverse proxy that exposes a server behind a NAT or firewall to
the internet"
-HOMEPAGE="https://github.com/fatedier/frp;
-SRC_URI="https://github.com/zmedico/frp/archive/v${PV}-vendor.tar.gz ->
${P}-vendor.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~loong ~riscv"
-IUSE=""
-S=${WORKDIR}/${P}-vendor
-
-src_prepare() {
- # patch LDFLAGS to preserve symbol table #792408
- sed -e "s|^\\(LDFLAGS :=\\) -s \\(.*\\)|\1 \2|" -i Makefile || die
- default
-}
-
-src_compile() {
- emake all
-}
-
-src_install() {
- local x
- dobin bin/{frpc,frps}
- dodoc README*.md
- systemd_dounit "${FILESDIR}"/frp{c,s}.service
- systemd_newunit "${FILESDIR}"/frpc_at_.service frpc@.service
- systemd_newunit "${FILESDIR}"/frps_at_.service frps@.service
- insinto /etc/frp
- for x in conf/*.ini; do mv "${x}"{,.example}; done
- doins conf/*.example
-}
[gentoo-commits] repo/gentoo:master commit in: app-containers/podman/
commit: 712b89c49c2a45e3b70d7b977344b367b9ad6d2c
Author: Zac Medico gentoo org>
AuthorDate: Sun Mar 31 23:50:14 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Mar 31 23:50:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=712b89c4
app-containers/podman: drop 4.9.3
Bug: https://bugs.gentoo.org/927500
Bug: https://bugs.gentoo.org/927501
Signed-off-by: Zac Medico gentoo.org>
app-containers/podman/Manifest| 1 -
app-containers/podman/podman-4.9.3.ebuild | 141 --
2 files changed, 142 deletions(-)
diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index 2e96132cac7e..2603fa68fbb5 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -1,3 +1,2 @@
-DIST podman-4.9.3.tar.gz 21727849 BLAKE2B
9a67ba4266a8a0e20d165ba2bae00dcf146724ee976838d5e3310b094155ffa89bff526e8ae72864dc100d1e6878d5519d53581dc7e034982a4f2b364e4c8feb
SHA512
395014bbe70923f1444d2f33440013a16e9c339b70be5e6a9c7026617a40795a1c0e410c08a52fba46b9f5e853d853ce4133db36167a3c5ace7d325f8b3a3327
DIST podman-4.9.4.tar.gz 21733620 BLAKE2B
17d099c0a13fbbb77556742313c39995127fc97b4086ef3c2d74a92cc0a4f825a6c729dd099c6d4f4cd3d2ebfd470494babdeaa85a5653b327ea1a16fb5ea993
SHA512
7b52555789a1c214fcf26b0826bdda6cf0ccca588f87c0f15ac5e8358ddac625e17cafbe6a43de07cad964e1418b5ee0d2e38a5cb5dc6f6d4e638399749a7f7b
DIST podman-5.0.0.tar.gz 21861935 BLAKE2B
1ec7006f272f5da7f93929bc543cd8988d6f9596cb868e9561578ebef85d51cbd6baa4b66571872fc9748c639ca636ce27f6d90303707f04caa321c7b71db81a
SHA512
8800d96d668cbc7a7ff85a09c71b3307a280c124513fd02fe478f415cf8db43ee47dc7e9c3b75046c6bda9f916937a2cc59887c2c4b26766c2f770abb87fd7ce
diff --git a/app-containers/podman/podman-4.9.3.ebuild
b/app-containers/podman/podman-4.9.3.ebuild
deleted file mode 100644
index 3d8520e95600..
--- a/app-containers/podman/podman-4.9.3.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module tmpfiles linux-info
-
-DESCRIPTION="A tool for managing OCI containers and pods with
Docker-compatible CLI"
-HOMEPAGE="https://github.com/containers/podman/ https://podman.io/;
-
-if [[ ${PV} == * ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/containers/podman.git;
-else
-
SRC_URI="https://github.com/containers/podman/archive/v${PV/_rc/-rc}.tar.gz ->
${P}.tar.gz"
- S="${WORKDIR}/${P/_rc/-rc}"
- if [[ ${PV} != *rc* ]] ; then
- KEYWORDS="amd64 arm64 ~riscv"
- fi
-fi
-
-# main pkg
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-IUSE="apparmor btrfs cgroup-hybrid wrapper +fuse +init +rootless +seccomp
selinux systemd"
-RESTRICT="test"
-
-RDEPEND="
- app-crypt/gpgme:=
- >=app-containers/conmon-2.0.0
- >=app-containers/containers-common-0.56.0
- dev-libs/libassuan:=
- dev-libs/libgpg-error:=
- sys-apps/shadow:=
-
- apparmor? ( sys-libs/libapparmor )
- btrfs? ( sys-fs/btrfs-progs )
- cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6 )
- !cgroup-hybrid? ( app-containers/crun )
- wrapper? ( !app-containers/docker-cli )
- fuse? ( sys-fs/fuse-overlayfs )
- init? ( app-containers/catatonit )
- rootless? ( app-containers/slirp4netns )
- seccomp? ( sys-libs/libseccomp:= )
- selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= )
- systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-go/go-md2man
-"
-
-PATCHES=(
- "${FILESDIR}/seccomp-toggle-4.7.0.patch"
-)
-
-CONFIG_CHECK="
- ~USER_NS
-"
-
-pkg_setup() {
- use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
- linux-info_pkg_setup
-}
-
-src_prepare() {
- default
-
- # assure necessary files are present
- local file
- for file in apparmor_tag btrfs_installed_tag btrfs_tag systemd_tag; do
- [[ -f hack/"${file}".sh ]] || die
- done
-
- local feature
- for feature in apparmor systemd; do
- cat <<-EOF > hack/"${feature}"_tag.sh || die
- #!/usr/bin/env bash
- $(usex ${feature} "echo ${feature}" echo)
- EOF
- done
-
- echo -e "#!/usr/bin/env bash\n echo" > hack/btrfs_installed_tag.sh ||
die
- cat <<-EOF > hack/btrfs_tag.sh || die
- #!/usr/bin/env bash
- $(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
- EOF
-}
-
-src_compile() {
- export PREFIX="${EPREFIX}/usr"
-
- # bug 906073
- use elibc_musl &a
[gentoo-commits] repo/gentoo:master commit in: net-misc/passt/
commit: 13e3231bc712209706a8a761072f1ac79cb31a02 Author: Zac Medico gentoo org> AuthorDate: Sun Mar 31 00:17:38 2024 + Commit: Zac Medico gentoo org> CommitDate: Sun Mar 31 23:46:38 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13e3231b net-misc/passt: add myself as a maintainer Closes: https://github.com/gentoo/gentoo/pull/36008 Signed-off-by: Zac Medico gentoo.org> net-misc/passt/metadata.xml | 4 1 file changed, 4 insertions(+) diff --git a/net-misc/passt/metadata.xml b/net-misc/passt/metadata.xml index b254b4559db4..35350e9c2beb 100644 --- a/net-misc/passt/metadata.xml +++ b/net-misc/passt/metadata.xml @@ -5,6 +5,10 @@ me@rahil.rocks Rahil Bhimjiani + +zmed...@gentoo.org +Zac Medico + proxy-ma...@gentoo.org Proxy Maintainers
[gentoo-commits] repo/gentoo:master commit in: app-containers/buildah/, app-containers/buildah/files/
commit: 8144aa900b7850994c53b73dfa0b745d4ce02c5e
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Wed Mar 27 09:24:43 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Mar 31 00:06:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8144aa90
app-containers/buildah: dont call `as` directly
Closes: https://bugs.gentoo.org/927934
Signed-off-by: Rahil Bhimjiani rahil.rocks>
Closes: https://github.com/gentoo/gentoo/pull/35943
Signed-off-by: Zac Medico gentoo.org>
app-containers/buildah/buildah-1.33.7.ebuild | 26 ++
app-containers/buildah/buildah-1.34.3.ebuild | 25 +
app-containers/buildah/buildah-1.35.1.ebuild | 4 +++
app-containers/buildah/buildah-1.35.3.ebuild | 4 +++
app-containers/buildah/buildah-.ebuild | 4 +++
.../dont-call-as-directly-upstream-pr-5436.patch | 32 ++
6 files changed, 95 insertions(+)
diff --git a/app-containers/buildah/buildah-1.33.7.ebuild
b/app-containers/buildah/buildah-1.33.7.ebuild
index 6a223369f6ba..60b99c3a6057 100644
--- a/app-containers/buildah/buildah-1.33.7.ebuild
+++ b/app-containers/buildah/buildah-1.33.7.ebuild
@@ -44,6 +44,10 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="dev-go/go-md2man"
+PATCHES=(
+ "${T}"/dont-call-as-directly-upstream-pr-5436.patch
+)
+
pkg_pretend() {
local CONFIG_CHECK=""
use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
@@ -53,6 +57,28 @@ pkg_pretend() {
}
src_prepare() {
+ cat <<'EOF' > "${T}/dont-call-as-directly-upstream-pr-5436.patch"
+--- a/Makefile
b/Makefile
+@@ -10,6 +10,7 @@
+ BASHINSTALLDIR = $(PREFIX)/share/bash-completion/completions
+ BUILDFLAGS := -tags "$(BUILDTAGS)"
+ BUILDAH := buildah
++AS ?= as
+
+ GO := go
+ GO_LDFLAGS := $(shell if $(GO) version|grep -q gccgo; then echo
"-gccgoflags"; else echo "-ldflags"; fi)
+@@ -72,7 +73,7 @@
+ bin/buildah: $(SOURCES) cmd/buildah/*.go internal/mkcw/embed/entrypoint.gz
+ $(GO_BUILD) $(BUILDAH_LDFLAGS) $(GO_GCFLAGS) "$(GOGCFLAGS)" -o $@
$(BUILDFLAGS) ./cmd/buildah
+
+-ifneq ($(shell as --version | grep x86_64),)
++ifneq ($(shell $(AS) --version | grep x86_64),)
+ internal/mkcw/embed/entrypoint: internal/mkcw/embed/entrypoint.s
+ $(AS) -o $(patsubst %.s,%.o,$^) $^
+ $(LD) -o $@ $(patsubst %.s,%.o,$^)
+EOF
+
default
# ensure all necessary files are there
diff --git a/app-containers/buildah/buildah-1.34.3.ebuild
b/app-containers/buildah/buildah-1.34.3.ebuild
index 6a223369f6ba..4b82e782d4f3 100644
--- a/app-containers/buildah/buildah-1.34.3.ebuild
+++ b/app-containers/buildah/buildah-1.34.3.ebuild
@@ -44,6 +44,10 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="dev-go/go-md2man"
+PATCHES=(
+ "${T}"/dont-call-as-directly-upstream-pr-5436.patch
+)
+
pkg_pretend() {
local CONFIG_CHECK=""
use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
@@ -53,6 +57,27 @@ pkg_pretend() {
}
src_prepare() {
+ cat <<'EOF' > "${T}/dont-call-as-directly-upstream-pr-5436.patch"
+--- a/Makefile
b/Makefile
+@@ -10,6 +10,7 @@
+ BASHINSTALLDIR = $(PREFIX)/share/bash-completion/completions
+ BUILDFLAGS := -tags "$(BUILDTAGS)"
+ BUILDAH := buildah
++AS ?= as
+
+ GO := go
+ GO_LDFLAGS := $(shell if $(GO) version|grep -q gccgo; then echo
"-gccgoflags"; else echo "-ldflags"; fi)
+@@ -77,7 +77,7 @@
+ bin/buildah: $(SOURCES) cmd/buildah/*.go
internal/mkcw/embed/entrypoint_amd64.gz
+ $(GO_BUILD) $(BUILDAH_LDFLAGS) $(GO_GCFLAGS) "$(GOGCFLAGS)" -o $@
$(BUILDFLAGS) ./cmd/buildah
+
+-ifneq ($(shell as --version | grep x86_64),)
++ifneq ($(shell $(AS) --version | grep x86_64),)
+ internal/mkcw/embed/entrypoint_amd64.gz: internal/mkcw/embed/entrypoint_amd64
+ gzip -k9nf $^
+EOF
+
default
# ensure all necessary files are there
diff --git a/app-containers/buildah/buildah-1.35.1.ebuild
b/app-containers/buildah/buildah-1.35.1.ebuild
index ecf84e28950c..b0b39faf03cb 100644
--- a/app-containers/buildah/buildah-1.35.1.ebuild
+++ b/app-containers/buildah/buildah-1.35.1.ebuild
@@ -44,6 +44,10 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="dev-go/go-md2man"
+PATCHES=(
+ "${FILESDIR}"/dont-call-as-directly-upstream-pr-5436.patch
+)
+
pkg_pretend() {
local CONFIG_CHECK=""
use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
diff --git a/app-containers/buildah/buildah-1.35.3.ebuild
b/app-containers/buildah/buildah-1.35.3.ebuild
index ecf84e28950c..b0b39faf03cb 100644
--- a/app-containers/buildah/buildah-1.35.3.ebuild
+++ b/app-containers/buildah/buildah-1.35.3.ebuild
@@ -44,6 +44,10 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="d
[gentoo-commits] repo/gentoo:master commit in: app-containers/buildah/
commit: 43b007f04043855ca1604cc6499576b235703282
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Wed Mar 27 05:32:49 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Mar 31 00:05:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43b007f0
app-containers/buildah: add 1.35.3
Bug: https://bugs.gentoo.org/927499
Bug: https://bugs.gentoo.org/927502
Signed-off-by: Rahil Bhimjiani rahil.rocks>
From: https://github.com/gentoo/gentoo/pull/35943
Signed-off-by: Zac Medico gentoo.org>
app-containers/buildah/Manifest | 1 +
app-containers/buildah/buildah-1.35.3.ebuild | 128 +++
2 files changed, 129 insertions(+)
diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest
index 7e199a5ae97d..0609e39a594c 100644
--- a/app-containers/buildah/Manifest
+++ b/app-containers/buildah/Manifest
@@ -4,3 +4,4 @@ DIST buildah-1.33.7.tar.gz 18604354 BLAKE2B
d2788096d8d6fd6cc528e8f33edc58a2
DIST buildah-1.34.0.tar.gz 18751419 BLAKE2B
6584c5234e849f9b8cde5e4188791024c8ac5c0ba85859e289f3eb2ec32f97f722ebf25f1291f29e14edf4adc14e19d6a6a76630c820085e9f345736aeb3d4eb
SHA512
a3836ce540058f418131969e157d548864727398535e4e99a693d883419b8d764da7166f9b9376c2b9686d8beac101687843c2e93198b16328ef333ad96d55db
DIST buildah-1.34.3.tar.gz 18856476 BLAKE2B
c91c995a2ff4be8b4e84a70c581a817cb2f1333b08ca297163d218f80d538905c41718cfc267c03173330234c3476344be44df799eaaac891395a22bc7a020b3
SHA512
26d5c48cb5b056a274c1a9c6820a6076337f625fc6dd6683000db871f3de9d37907bd962ced3400334bfc230718219cda2108e2e984be5f8c76ecfa4a2f1e1ac
DIST buildah-1.35.1.tar.gz 19349661 BLAKE2B
31b633f35f937364816dac65e7a801676043630bc3c00ac445ad67afea04142748f76c4aed16690aa990e2c15ed220bdb42b96c6dd9bb0dac9c9d16fc2a27ddc
SHA512
3e5af28b3d45e51674d08bef9a92cd64589026d9c6ebee51156738151681395860e372bba2667815e0f90e37984eb9dfdc9b8ad0675b62c8751582b29485d159
+DIST buildah-1.35.3.tar.gz 19372597 BLAKE2B
014bea80b3a8c4482bbe098a0c5293892cf9f4f0d4d74ecaba8f155e49fab326689b95b690b413d64f6b576c7269bdb9d0f446244b832afe311e909b3f96856d
SHA512
ca325ce1a878eb9e9a6caedf236add16702d8dcd83f15a1995b8215998821218104ea8cb7a5d11fc354ee01d9805c339578975d35db859f1d53b08e0a2139fe3
diff --git a/app-containers/buildah/buildah-1.35.3.ebuild
b/app-containers/buildah/buildah-1.35.3.ebuild
new file mode 100644
index ..ecf84e28950c
--- /dev/null
+++ b/app-containers/buildah/buildah-1.35.3.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module linux-info toolchain-funcs
+
+DESCRIPTION="A tool that facilitates building OCI images"
+HOMEPAGE="https://github.com/containers/buildah;
+
+# main pkg
+LICENSE="Apache-2.0"
+# deps
+LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+
+SLOT="0"
+IUSE="apparmor btrfs +seccomp systemd test"
+RESTRICT="test"
+DOCS=(
+ "CHANGELOG.md"
+ "troubleshooting.md"
+ "docs/tutorials"
+)
+
+if [[ ${PV} == * ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/containers/buildah.git;
+else
+ SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64"
+fi
+
+RDEPEND="
+ systemd? ( sys-apps/systemd )
+ btrfs? ( sys-fs/btrfs-progs )
+ seccomp? ( sys-libs/libseccomp:= )
+ apparmor? ( sys-libs/libapparmor:= )
+ >=app-containers/containers-common-0.58.0-r1
+ app-crypt/gpgme:=
+ dev-libs/libgpg-error:=
+ dev-libs/libassuan:=
+ sys-apps/shadow:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-go/go-md2man"
+
+pkg_pretend() {
+ local CONFIG_CHECK=""
+ use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
+ check_extra_config
+
+ linux_config_exists || ewarn "Cannot determine configuration of your
kernel."
+}
+
+src_prepare() {
+ default
+
+ # ensure all necessary files are there
+ local file
+ for file in docs/Makefile hack/libsubid_tag.sh hack/apparmor_tag.sh \
+ hack/systemd_tag.sh btrfs_installed_tag.sh btrfs_tag.sh; do
+ [[ -f "${file}" ]] || die
+ done
+
+ sed -i -e "s|/usr/local|/usr|g" Makefile docs/Makefile || die
+ echo -e '#!/usr/bin/env bash\necho libsubid' > hack/libsubid_tag.sh ||
die
+
+ cat <<-EOF > hack/apparmor_tag.sh || die
+ #!/usr/bin/env bash
+ $(usex apparmor 'echo apparmor' echo)
+ EOF
+
+ use seccomp || {
+ cat <<-'EOF' > "${T}/disable_seccomp.patch"
+--- a/Makefile
++++ b/Makefile
+@@ -5 +5 @@
+-SECURITYTAGS ?= seccomp $(APPARMOR
[gentoo-commits] repo/gentoo:master commit in: sys-apps/yarn/
commit: 9a014f855f0ccde671f17c7d8881587b3efd5288
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Thu Mar 28 17:11:50 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sat Mar 30 23:45:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a014f85
sys-apps/yarn: add 1.22.22
Signed-off-by: Rahil Bhimjiani rahil.rocks>
Closes: https://github.com/gentoo/gentoo/pull/35968
Signed-off-by: Zac Medico gentoo.org>
sys-apps/yarn/Manifest| 1 +
sys-apps/yarn/yarn-1.22.22.ebuild | 40 +++
2 files changed, 41 insertions(+)
diff --git a/sys-apps/yarn/Manifest b/sys-apps/yarn/Manifest
index 2f20b6c40e22..b3e157667ab3 100644
--- a/sys-apps/yarn/Manifest
+++ b/sys-apps/yarn/Manifest
@@ -1,3 +1,4 @@
DIST yarn-v1.22.17.tar.gz 1246198 BLAKE2B
ae0b86cdb248a0f81d1a4a23d15ef9aab185fcda7ef7f8873959c3e54dfc305219afb2416264911098c4e3a6a65a33d248ff97c8e0ca043b118de64e003c3d9b
SHA512
1f4a76e35057687d1437d21e1fffd14fcdad9793df36b695a52a44a16f844fb966a29342eb5799f80f880ef53c14ce86a39bf1d7ad929dc0cbf09d598d106b89
DIST yarn-v1.22.19.tar.gz 1244259 BLAKE2B
f103d148bafa76bddcdf9e26356fbebba87f7c7c707f823a54404302571e1d09e25569406fc721d74f53cfdac8706dec6bd40da39b7d44000381b1f36d0d8de0
SHA512
ff4579ab459bb25aa7c0ff75b62acebe576f6084b36aa842971cf250a5d8c6cd3bc9420b22ce63c7f93a0857bc6ef29291db39c3e7a23aab5adfd5a4dd6c5d71
DIST yarn-v1.22.21.tar.gz 1243124 BLAKE2B
99a53db799f07c6aed1bb8d5d2997b6caef6d518118ef8bea4974fdaf3cc0b6a7a7fa17fb9244c8fb2915bffed77d5ed8dd701eecdcf4491d26b68f92750d8c7
SHA512
75fc33d00ee14733272c04090b3a646fb4021fce85103b2451f01f60f47be7dc9811c76b26465fe6a3735996ac55fd9e80f918cc45422af0888047f4c9ba8f9d
+DIST yarn-v1.22.22.tar.gz 1247457 BLAKE2B
a81ec778e774f85da6d5802d4abbc579f1c9194f6e2681ef239cc336e4ec2b502b412f303fa4a8c61dda08a00444e120487e04aa19e89113f844c0db4fd54098
SHA512
c8b361ca353e3ca15e32eadf7f1617449f485fe488860e49774ea35dac1544f39ab1104f82bf24528de6e553eef53c4604a560e522dfab8433425ee13ccfd6f9
diff --git a/sys-apps/yarn/yarn-1.22.22.ebuild
b/sys-apps/yarn/yarn-1.22.22.ebuild
new file mode 100644
index ..02435ca2eafe
--- /dev/null
+++ b/sys-apps/yarn/yarn-1.22.22.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN}-v${PV}"
+
+DESCRIPTION="Fast, reliable, and secure node dependency management"
+HOMEPAGE="https://yarnpkg.com;
+SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz;
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="!dev-util/cmdtest
+ net-libs/nodejs"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+ sed -i 's/"installationMethod": "tar"/"installationMethod":
"portage"/g' "${S}/package.json" || die
+}
+
+src_install() {
+ local install_dir="/usr/$(get_libdir)/node_modules/yarn" path shebang
+ insinto "${install_dir}"
+ doins -r .
+ dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
+ dosym "../$(get_libdir)/node_modules/yarn/bin/yarnpkg"
"/usr/bin/yarnpkg"
+
+ while read -r -d '' path; do
+ read -r shebang < "${ED}${path}" || die
+ [[ "${shebang}" == \#\!* ]] || continue
+ fperms +x "${path}"
+ done < <(find "${ED}" -type f -printf '/%P\0' || die)
+}
[gentoo-commits] repo/gentoo:master commit in: app-admin/vault/, app-admin/vault/files/
commit: 90acc6a830b4aad16e75e7395db7fd1b7e854390
Author: Zac Medico gentoo org>
AuthorDate: Fri Mar 29 21:15:09 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Fri Mar 29 21:21:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90acc6a8
app-admin/vault: add 1.15.6
Includes stubmaker patch from here:
https://github.com/hashicorp/vault/pull/24678
Signed-off-by: Zac Medico gentoo.org>
app-admin/vault/Manifest | 3 +
...t-1.15.6-stubmaker-outside-git-repo-24678.patch | 92 ++
app-admin/vault/vault-1.15.6.ebuild| 86
3 files changed, 181 insertions(+)
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index ed9fdd0f316c..e143138c3666 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -4,3 +4,6 @@ DIST vault-1.14.8-vendor.tar.gz 71869146 BLAKE2B
5875056d5ec53396ed53db7fd4891a6
DIST vault-1.14.8-webui.tar.xz 1680312 BLAKE2B
c698adc325633b1dc59dea3b09692da0476a5f3dbd1f69f1e68243fa903e4590b152846f2dabd4b7f5f492467fcdc52c0afd82bfe1a956b1b69f11da403fab9c
SHA512
a25faa74614b31688bb91c4ac2b6a105426be632cc417e94ef14c60a388f076eaec006e07a9784047422b70ce9d9c9fd33e6fb8ef3595b7f1a6468739da8e1c6
DIST vault-1.14.9-vendor.tar.gz 71845081 BLAKE2B
ea25a6ba8ac293971170688b4ce3845ba19a5af746c3d96860420d74f8c0af33ea118a47d17117dbd520675739c44ed76118ef126c5b53e4c4adb0924cda58d5
SHA512
00ff45f986889d17ebe59c27aeaf8132270e5f06883bf84ce10721c9e2943a25ad8b86be3271991c824369ad5545258b3c01600f1dda06487751ff806b1d76b9
DIST vault-1.14.9-webui.tar.xz 1677212 BLAKE2B
db4da051a8c0a62e99c1f2070f3c022fc934350b255d21b360b3b3b53555942f1ac6c4ef15ed7d8a2519f05752406add63837317615afb387b0fc407f5ab8410
SHA512
2f54dd24fb9a4e2e774dd4212a605126a9d4e4975a97a01c88c94bce8e6f10174fe07235d402dd43ae31aacf4371f77272e4446d972d2e7304745186b0e6dbb7
+DIST vault-1.15.6-deps.tar.xz 20736608 BLAKE2B
53e21d0664f9bbd8c851a486334e04d3b3151aaee709c8fe88ab4969a81ebd4562cf3a350e383647140bd4826a0aa75b34ef136c81920b868dff7ae6f0522e37
SHA512
c1c24c2c646a441c551849af2d3165fc15db2b61f261608f44b7371214cdef0e76263b5b2f295c19606057e80316b4864fff64bc5603b99901fc8a5d900c6550
+DIST vault-1.15.6-webui.tar.xz 1721320 BLAKE2B
3f2d31767c6086e7b17f7445f0cff34ce4ebd7a6a1daeaede96443758096a6b8b94b971af5a74e8bcfb2c95c07b496b1babf3f8ce82f9b360fafe5a4d5138cac
SHA512
6a532258a5c7734863967926d95699b2611959177b9dbf4e60cff115331237e65f3dbc41e842443ee5af9020c69280b27a511f887528dc914f9d9e642f9a3a63
+DIST vault-1.15.6.tar.gz 31923253 BLAKE2B
8a4e7b9d8d6753b6f717c6699b2d4822cecff299e3cebd8945d3c34232ff77611611d4e6259ab9c9c4ff91a2e52b7eef707df7da68960be36c314ceba18b124b
SHA512
52be0e47f3028f9c1f3ce5d2a72356c955f20fcaf6e8396a6d5938226d72cd8353bed398ba66a6821fc609aaed465e82c3449aeaa0dfaabe80ff0412a73779b3
diff --git
a/app-admin/vault/files/vault-1.15.6-stubmaker-outside-git-repo-24678.patch
b/app-admin/vault/files/vault-1.15.6-stubmaker-outside-git-repo-24678.patch
new file mode 100644
index ..5b47f39cb81b
--- /dev/null
+++ b/app-admin/vault/files/vault-1.15.6-stubmaker-outside-git-repo-24678.patch
@@ -0,0 +1,92 @@
+From cd6d0e1c593e158b8641529410d95e4b1722d5b2 Mon Sep 17 00:00:00 2001
+From: Dave Dykstra <2129743+drda...@users.noreply.github.com>
+Date: Thu, 4 Jan 2024 17:03:09 -0600
+Subject: [PATCH] Allow stubmaker to work outside of a git repository
+
+https://github.com/hashicorp/vault/pull/24678
+
+Fixes: https://github.com/hashicorp/vault/issues/24677
+---
+ tools/stubmaker/main.go | 58 +++--
+ 1 file changed, 33 insertions(+), 25 deletions(-)
+
+diff --git a/tools/stubmaker/main.go b/tools/stubmaker/main.go
+index 53676e08b8c84..15e95b6a45f60 100644
+--- a/tools/stubmaker/main.go
b/tools/stubmaker/main.go
+@@ -43,15 +43,21 @@ func main() {
+ DetectDotGit: true,
+ })
+ if err != nil {
+- fatal(err)
++ if err.Error() != "repository does not exist" {
++ fatal(err)
++ }
++ repo = nil
+ }
+
+- wt, err := repo.Worktree()
+- if err != nil {
+- fatal(err)
+- }
+- if !isEnterprise(wt) {
+- return
++ var wt *git.Worktree
++ if repo != nil {
++ wt, err = repo.Worktree()
++ if err != nil {
++ fatal(err)
++ }
++ if !isEnterprise(wt) {
++ return
++ }
+ }
+
+ // Read the file and figure out if we need to do anything.
+@@ -80,26 +86,28 @@ func main() {
+
+ // We'd like to write the file, but first make sure that we're not going
+ // to blow away anyone's work or overwrite a file already in git.
+- head, err := repo.Head()
+- if err != nil {
+- fatal(err)
+- }
+- obj, err := repo.Object(plumbing.AnyObject, head.Hash
[gentoo-commits] proj/portage:master commit in: lib/_emerge/
commit: 08a2bc3800ea2e997716903244ec041339b45b06
Author: Zac Medico gentoo org>
AuthorDate: Sun Mar 24 22:11:54 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Thu Mar 28 14:47:49 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=08a2bc38
BinpkgPrefetcher: Emit eerror message for binarytree inject failure
Since it is confusing when emerge exits due to an error that only shows
in the fetch log, emit an eerror message when binarytree inject fails:
>>> Running pre-merge checks for sys-libs/glibc-2.38-r10
* Fetching in the background:
* /var/cache/binpkgs/sys-libs/glibc/glibc-2.38-r10-5.gpkg.tar.partial
* To view fetch progress, run in another terminal:
* tail -f /var/log/emerge-fetch.log
>>> Failed to emerge sys-libs/glibc-2.38-r10
* Messages for package sys-libs/glibc-2.38-r10:
* Binary package is not usable:
* !!!
* gpg: keyblock resource '/etc/portage/gnupg/pubring.kbx': No such file
or directory
* [GNUPG:] ERROR add_keyblock_resource 33587281
* [GNUPG:] PLAINTEXT 74 0
* [GNUPG:] NEWSIG
* gpg: Signature made Wed 20 Mar 2024 10:34:45 PM CET
* gpg:using RSA key
534E4209AB49EEE1C19D96162C44695DB9F6043D
* [GNUPG:] ERROR keydb_search 33554445
* [GNUPG:] ERROR keydb_search 33554445
* [GNUPG:] ERRSIG 2C44695DB9F6043D 1 10 01 1710970485 9
534E4209AB49EEE1C19D96162C44695DB9F6043D
* [GNUPG:] NO_PUBKEY 2C44695DB9F6043D
* !!! Invalid binary package:
'/var/cache/binpkgs/sys-devel/binutils/binutils-2.41-r5-4.gpkg.tar.partial',
GPG verify failed
Fixes: 0ff49114cec7 ("binarytree: Handle inject failures")
Bug: https://bugs.gentoo.org/927632
Signed-off-by: Zac Medico gentoo.org>
lib/_emerge/BinpkgPrefetcher.py | 35 ++-
1 file changed, 30 insertions(+), 5 deletions(-)
diff --git a/lib/_emerge/BinpkgPrefetcher.py b/lib/_emerge/BinpkgPrefetcher.py
index ed68d2852c..a8af30ca80 100644
--- a/lib/_emerge/BinpkgPrefetcher.py
+++ b/lib/_emerge/BinpkgPrefetcher.py
@@ -7,7 +7,10 @@ import sys
from _emerge.BinpkgFetcher import BinpkgFetcher
from _emerge.CompositeTask import CompositeTask
from _emerge.BinpkgVerifier import BinpkgVerifier
+import portage
from portage import os
+from portage.elog import messages as elog_messages
+from portage.util import no_color
class BinpkgPrefetcher(CompositeTask):
@@ -48,6 +51,7 @@ class BinpkgPrefetcher(CompositeTask):
self.wait()
return
+injected_pkg = None
stdout_orig = sys.stdout
stderr_orig = sys.stderr
out = io.StringIO()
@@ -67,12 +71,33 @@ class BinpkgPrefetcher(CompositeTask):
output_value = out.getvalue()
if output_value:
-self.scheduler.output(
-output_value,
-log_path=self.scheduler.fetch.log_file,
-background=self.background,
-)
+if injected_pkg is None:
+msg = ["Binary package is not usable:"]
+msg.extend("\t" + line for line in
output_value.splitlines())
+self._elog("eerror", msg)
+else:
+self.scheduler.output(
+output_value,
+log_path=self.scheduler.fetch.log_file,
+background=self.background,
+)
self._current_task = None
self.returncode = 1 if injected_pkg is None else os.EX_OK
self.wait()
+
+def _elog(self, elog_funcname, lines, phase="other"):
+out = io.StringIO()
+elog_func = getattr(elog_messages, elog_funcname)
+global_havecolor = portage.output.havecolor
+try:
+portage.output.havecolor = not no_color(self._bintree.settings)
+for line in lines:
+elog_func(line, phase=phase, key=self.pkg.cpv, out=out)
+finally:
+portage.output.havecolor = global_havecolor
+msg = out.getvalue()
+if msg:
+self.scheduler.output(
+msg, background=self.background,
log_path=self.scheduler.fetch.log_file
+)
[gentoo-commits] repo/gentoo:master commit in: profiles/arch/powerpc/ppc64/64le/
commit: 90efc92240abee01a7845943a9ab17b440c59d76 Author: Rahil Bhimjiani rahil rocks> AuthorDate: Tue Mar 26 12:55:52 2024 + Commit: Zac Medico gentoo org> CommitDate: Wed Mar 27 03:02:02 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90efc922 app-containers/podman: unmask in ppc64 LE Bug: https://bugs.gentoo.org/925111 Signed-off-by: Rahil Bhimjiani rahil.rocks> Closes: https://github.com/gentoo/gentoo/pull/35929 Signed-off-by: Zac Medico gentoo.org> profiles/arch/powerpc/ppc64/64le/package.mask | 4 1 file changed, 4 insertions(+) diff --git a/profiles/arch/powerpc/ppc64/64le/package.mask b/profiles/arch/powerpc/ppc64/64le/package.mask index a41a43f71212..aba0acfd0862 100644 --- a/profiles/arch/powerpc/ppc64/64le/package.mask +++ b/profiles/arch/powerpc/ppc64/64le/package.mask @@ -1,6 +1,10 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Rahil Bhimjiani (2024-03-20) +# https://bugs.gentoo.org/925111 +-app-containers/podman + # Jimi Huotari (2023-01-11) # Requires media-libs/libva since 29.0.0, which is unmasked here. ->=media-video/obs-studio-29.0.0
