[gentoo-commits] proj/qa-scripts:master commit in: /

2024-05-20 Thread Robin H. Johnson
commit: ea651959e3713ed09ebdec3c7ef274ca0e8350a3
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon May 20 18:47:16 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon May 20 18:47:16 2024 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=ea651959

keyrings.inc.bash: avoid the SHA1 warning

Signed-off-by: Robin H. Johnson  gentoo.org>

 keyrings.inc.bash | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/keyrings.inc.bash b/keyrings.inc.bash
index 7c63e0d..6fe0dca 100644
--- a/keyrings.inc.bash
+++ b/keyrings.inc.bash
@@ -103,7 +103,8 @@ export_keys() {
# 'gpg --export' returns zero if there was no error with the command 
itself
# If there are no keys in the export set, then it ALSO does not write 
the destination file
# and prints 'gpg: WARNING: nothing exported' to stderr
-   if ! gpg "${GPG_EXPORT_OPTS[@]}" --output "$TMP" --export "${@}"; then
+   # --quiet is needed to avoid "Note: third-party key signatures using 
the SHA1 algorithm are rejected" "(use option "--allow-weak-key-signatures" to 
override)"
+   if ! gpg --quiet "${GPG_EXPORT_OPTS[@]}" --output "$TMP" --export 
"${@}"; then
echo "Unable to export keys to $DST: GPG returned non-zero"
exit 1
fi



[gentoo-commits] proj/qa-scripts:master commit in: /

2024-05-19 Thread Robin H. Johnson
commit: 38197eb2a9592c4de4d490fe1c6d164845773ca5
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun May 19 17:28:21 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun May 19 17:28:21 2024 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=38197eb2

keyrings.inc.bash: support export options

Signed-off-by: Robin H. Johnson  gentoo.org>

 keyrings.inc.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyrings.inc.bash b/keyrings.inc.bash
index d2668e0..7c63e0d 100644
--- a/keyrings.inc.bash
+++ b/keyrings.inc.bash
@@ -103,7 +103,7 @@ export_keys() {
# 'gpg --export' returns zero if there was no error with the command 
itself
# If there are no keys in the export set, then it ALSO does not write 
the destination file
# and prints 'gpg: WARNING: nothing exported' to stderr
-   if ! gpg --output "$TMP" --export "${@}"; then
+   if ! gpg "${GPG_EXPORT_OPTS[@]}" --output "$TMP" --export "${@}"; then
echo "Unable to export keys to $DST: GPG returned non-zero"
exit 1
fi



[gentoo-commits] proj/qa-scripts:master commit in: /

2024-05-19 Thread Robin H. Johnson
commit: 3a1755377cb4beaa68914844e61b9a2566a6ee12
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun May 19 17:28:40 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun May 19 17:28:40 2024 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=3a175537

keyrings-export.bash: test export-clean variants in new files

Signed-off-by: Robin H. Johnson  gentoo.org>

 keyrings-export.bash | 42 ++
 1 file changed, 42 insertions(+)

diff --git a/keyrings-export.bash b/keyrings-export.bash
index 56e4e51..42f0b08 100755
--- a/keyrings-export.bash
+++ b/keyrings-export.bash
@@ -56,6 +56,48 @@ export_keys "${OUTPUT_DIR}"/keys/all-devs.gpg \
"${RETIRED_DEVS[@]}" \
 && KEYRINGS+=( all-devs )
 
+# TEMPORARY:
+# Verify export-clean vs stock export options.
+export GPG_EXPORT_OPTS=( --export-options export-clean )
+
+export_keys "${OUTPUT_DIR}"/keys/service-keys.export-clean.gpg \
+   "${SYSTEM_KEYS[@]}" \
+&& KEYRINGS+=( service-keys.export-clean )
+
+export_keys "${OUTPUT_DIR}"/keys/infra-service-keys.export-clean.gpg \
+"${INFRA_SYSTEM_KEYS[@]}" \
+&& KEYRINGS+=( infra-service-keys.export-clean )
+
+export_keys "${OUTPUT_DIR}"/keys/committing-devs.export-clean.gpg \
+   "${COMMITTING_DEVS[@]}" \
+&& KEYRINGS+=( committing-devs.export-clean )
+
+export_keys "${OUTPUT_DIR}"/keys/active-devs.export-clean.gpg \
+   "${COMMITTING_DEVS[@]}" \
+   "${NONCOMMITTING_DEVS[@]}" \
+&& KEYRINGS+=( active-devs.export-clean )
+
+export_keys "${OUTPUT_DIR}"/keys/infra-devs.export-clean.gpg \
+   "${INFRA_DEVS[@]}" \
+&& KEYRINGS+=( infra-devs.export-clean )
+
+export_keys "${OUTPUT_DIR}"/keys/retired-devs.export-clean.gpg \
+   "${RETIRED_DEVS[@]}" \
+&& KEYRINGS+=( retired-devs.export-clean )
+
+# Everybody together now
+export_keys "${OUTPUT_DIR}"/keys/all-devs.export-clean.gpg \
+   "${SYSTEM_KEYS[@]}" \
+   "${INFRA_SYSTEM_KEYS[@]}" \
+   "${COMMITTING_DEVS[@]}" \
+   "${NONCOMMITTING_DEVS[@]}" \
+   "${INFRA_DEVS[@]}" \
+   "${RETIRED_DEVS[@]}" \
+&& KEYRINGS+=( all-devs.export-clean )
+
+unset GPG_EXPORT_OPTS
+# END TEMPORARY
+
 for key in "${KEYRINGS[@]}" ; do
if [[ ! -L "${OUTPUT_DIR}"/${key}.gpg ]] ; then
# Compatibility symlink



[gentoo-commits] proj/qa-scripts:master commit in: /

2024-05-19 Thread Robin H. Johnson
commit: 4eb498510530c9717576144ce80800310f070e35
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun May 19 17:25:34 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun May 19 17:25:34 2024 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=4eb49851

create-dev-keyrings.bash: this was split into other scripts and not used since 
2019

>From infra crontabs in 2019 (public SKS was since removed):
```
-# regen dev keyrings every hour (we want to catch revocations early on)
-0 * * * * gqa /usr/bin/nice /usr/local/bin/pidlock 
${REPO}/create-dev-keyrings.bash ${OUTPUTDIR}
+# regen keyrings
+# Fetch from SKS, push to keys.g.o
+0 * * * * gqa /usr/bin/nice /usr/local/bin/pidlock 
${REPO}/keyrings-recv-sks.bash ; /usr/local/bin/pidlock 
${REPO}/keyrings-send-keys.gentoo.org.bash
+# Fetch from keys.g.o & export to keyring files
+*/10 * * * * gqa /usr/bin/nice /usr/local/bin/pidlock 
${REPO}/keyrings-recv-keys.gentoo.org.bash ; /usr/bin/nice 
/usr/local/bin/pidlock ${REPO}/keyrings-export.bash ${OUTPUTDIR}
```

Signed-off-by: Robin H. Johnson  gentoo.org>

 create-dev-keyrings.bash | 60 
 1 file changed, 60 deletions(-)

diff --git a/create-dev-keyrings.bash b/create-dev-keyrings.bash
deleted file mode 100755
index 3ab1b58..000
--- a/create-dev-keyrings.bash
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-# Import key updates from Keyservers
-#
-# TODO:
-# - Turn off export in this script
-
-OUTPUT_DIR=${1:-.}
-BASEDIR="$(dirname "$0")"
-source "${BASEDIR}"/keyrings.inc.bash
-
-set -e
-export_ldap_data_to_env
-
-export KEYSERVERS=( "${KS_SKS}" "${KS_OPENPGP}" "${KS_GENTOO}" )
-export KEYSERVER_TIMEOUT=20m
-
-grab_keys "${SYSTEM_KEYS[@]}"
-export_keys "${OUTPUT_DIR}"/service-keys.gpg \
-   "${SYSTEM_KEYS[@]}"
-
-grab_keys "${INFRA_SYSTEM_KEYS[@]}"
-export_keys "${OUTPUT_DIR}"/infra-service-keys.gpg \
-   "${INFRA_SYSTEM_KEYS[@]}"
-
-grab_keys "${COMMITTING_DEVS[@]}"
-export_keys "${OUTPUT_DIR}"/committing-devs.gpg \
-   "${COMMITTING_DEVS[@]}"
-
-grab_keys "${NONCOMMITTING_DEVS[@]}"
-export_keys "${OUTPUT_DIR}"/active-devs.gpg \
-   "${COMMITTING_DEVS[@]}" \
-   "${NONCOMMITTING_DEVS[@]}"
-
-grab_keys "${INFRA_DEVS[@]}"
-export_keys "${OUTPUT_DIR}"/infra-devs.gpg \
-   "${INFRA_DEVS[@]}"
-
-# -- not all are on keyservers
-# -- and are unlikely to turn up now
-# -- this needs to fetch from some archive instead
-#grab_keys "${RETIRED_DEVS[@]}"
-export_keys "${OUTPUT_DIR}"/retired-devs.gpg \
-   "${RETIRED_DEVS[@]}"
-
-# Everybody together now
-export_keys "${OUTPUT_DIR}"/all-devs.gpg \
-   "${SYSTEM_KEYS[@]}" \
-   "${COMMITTING_DEVS[@]}" \
-   "${NONCOMMITTING_DEVS[@]}" \
-   "${INFRA_DEVS[@]}" \
-   "${RETIRED_DEVS[@]}"
-
-# Populate keys.gentoo.org with the keys we have, since they might have come 
from SKS
-export KEYSERVERS=( "${KS_GENTOO}" )
-export KEYSERVER_TIMEOUT=20m
-push_keys "${SYSTEM_KEYS[@]}"
-push_keys "${COMMITTING_DEVS[@]}"
-push_keys "${NONCOMMITTING_DEVS[@]}"
-push_keys "${INFRA_DEVS[@]}"
-push_keys "${RETIRED_DEVS[@]}"



[gentoo-commits] repo/gentoo:master commit in: dev-util/kup/

2024-05-13 Thread Robin H. Johnson
commit: cfc0ffd447137608965f49cf6c5f2a7a975a7e63
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon May 13 12:15:36 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon May 13 12:16:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfc0ffd4

dev-util/kup: add server config & manpage

Signed-off-by: Robin H. Johnson  gentoo.org>

 dev-util/kup/{kup-0.3.6-r1.ebuild => kup-0.3.6-r2.ebuild} | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-util/kup/kup-0.3.6-r1.ebuild b/dev-util/kup/kup-0.3.6-r2.ebuild
similarity index 86%
rename from dev-util/kup/kup-0.3.6-r1.ebuild
rename to dev-util/kup/kup-0.3.6-r2.ebuild
index 2dbef2793236..1e560c98a94d 100644
--- a/dev-util/kup/kup-0.3.6-r1.ebuild
+++ b/dev-util/kup/kup-0.3.6-r2.ebuild
@@ -28,8 +28,10 @@ src_prepare() {
 }
 
 src_install() {
-   dobin "${PN}" "${PN}-server" gpg-sign-all
-   doman "${PN}.1"
+   dobin "${PN}" "${PN}-server" gpg-sign-all genrings
+   doman "${PN}.1" "${PN}-server.1"
+   insinto /etc/kup
+   doins kup-server.cfg
einstalldocs
if use gitolite; then
exeinto /usr/libexec/gitolite/commands/



[gentoo-commits] repo/gentoo:master commit in: www-apps/cgit/

2024-05-07 Thread Robin H. Johnson
commit: 328c2af92299ca33e642543ca64884402f8bcc56
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Wed May  8 03:11:46 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Wed May  8 03:15:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=328c2af9

www-apps/cgit: re-add  series to support much newer Git

Upstream has not made an official release since 2020, but master is more
up to date, and trusted contributers have a branch with the latest Git
support.

This is important because Git v2.45.0 adds support for Bloom Filters in
commit graphs, providing 10x performance in web displays.

Reference: https://lore.kernel.org/git/robbat2-20240507T053331-859497691Z  
orbis-terrarum.net/T/#t
Signed-off-by: Robin H. Johnson  gentoo.org>

 www-apps/cgit/cgit-1.2.3-r203.ebuild   |  6 --
 ...{cgit-1.2.3-r203.ebuild => cgit--r1.ebuild} | 25 +++---
 .../{cgit-1.2.3-r203.ebuild => cgit-.ebuild}   | 22 ---
 3 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/www-apps/cgit/cgit-1.2.3-r203.ebuild 
b/www-apps/cgit/cgit-1.2.3-r203.ebuild
index 8499426633d8..805171058e89 100644
--- a/www-apps/cgit/cgit-1.2.3-r203.ebuild
+++ b/www-apps/cgit/cgit-1.2.3-r203.ebuild
@@ -56,8 +56,10 @@ pkg_setup() {
 }
 
 src_configure() {
-   rmdir git || die
-   mv "${WORKDIR}"/git-"${GIT_V}" git || die
+   if ! [[ ${PV} =~ * ]]; then
+   rmdir git || die
+   mv "${WORKDIR}"/git-"${GIT_V}" git || die
+   fi
 
echo "prefix = ${EPREFIX}/usr" >> cgit.conf || die "echo prefix failed"
echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf || die "echo 
libdir failed"

diff --git a/www-apps/cgit/cgit-1.2.3-r203.ebuild 
b/www-apps/cgit/cgit--r1.ebuild
similarity index 85%
copy from www-apps/cgit/cgit-1.2.3-r203.ebuild
copy to www-apps/cgit/cgit--r1.ebuild
index 8499426633d8..8b6fded5c051 100644
--- a/www-apps/cgit/cgit-1.2.3-r203.ebuild
+++ b/www-apps/cgit/cgit--r1.ebuild
@@ -9,20 +9,28 @@ PYTHON_COMPAT=( python3_{10..12} )
 
 WEBAPP_MANUAL_SLOT="yes"
 
-inherit lua-single python-single-r1 tmpfiles toolchain-funcs webapp
+inherit lua-single python-single-r1 tmpfiles toolchain-funcs webapp git-r3
 
 [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
 
-GIT_V="2.25.1"
+GIT_V="2.45.0"
 
 DESCRIPTION="a fast web-interface for git repositories"
 HOMEPAGE="https://git.zx2c4.com/cgit/about;
-SRC_URI="https://www.kernel.org/pub/software/scm/git/git-${GIT_V}.tar.xz
-   https://git.zx2c4.com/cgit/snapshot/${P}.tar.xz;
+if [[ ${PV} =~ * ]]; then
+   SRC_URI=""
+   EGIT_REPO_URI="https://git.zx2c4.com/cgit;
+   # v2.45.0 updates in this branch series
+   EGIT_COMMIT=dbadd856ba0537110338cfe58256b152d01388c0
+   EGIT_BRANCH=ch/for-jason
+else
+   SRC_URI="https://www.kernel.org/pub/software/scm/git/git-${GIT_V}.tar.xz
+   https://git.zx2c4.com/cgit/snapshot/${P}.tar.xz;
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
+KEYWORDS=""
 IUSE="doc +highlight +lua test"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) ${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
@@ -56,9 +64,10 @@ pkg_setup() {
 }
 
 src_configure() {
-   rmdir git || die
-   mv "${WORKDIR}"/git-"${GIT_V}" git || die
-
+   if ! [[ ${PV} =~ * ]]; then
+   rmdir git || die
+   mv "${WORKDIR}"/git-"${GIT_V}" git || die
+   fi
echo "prefix = ${EPREFIX}/usr" >> cgit.conf || die "echo prefix failed"
echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf || die "echo 
libdir failed"
echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf || die "echo 
CGIT_SCRIPT_PATH failed"

diff --git a/www-apps/cgit/cgit-1.2.3-r203.ebuild 
b/www-apps/cgit/cgit-.ebuild
similarity index 88%
copy from www-apps/cgit/cgit-1.2.3-r203.ebuild
copy to www-apps/cgit/cgit-.ebuild
index 8499426633d8..1fab1a1e34a9 100644
--- a/www-apps/cgit/cgit-1.2.3-r203.ebuild
+++ b/www-apps/cgit/cgit-.ebuild
@@ -9,20 +9,25 @@ PYTHON_COMPAT=( python3_{10..12} )
 
 WEBAPP_MANUAL_SLOT="yes"
 
-inherit lua-single python-single-r1 tmpfiles toolchain-funcs webapp
+inherit lua-single python-single-r1 tmpfiles toolchain-funcs webapp git-r3
 
 [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
 
-GIT_V="2.25.1"
+GIT_V="2.39.0"
 
 DESCRIPTION="a fast web-interface for git repositories"
 HOMEPAGE="https://git.zx2c4.com/cgit/about;
-SRC_

[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/

2024-05-05 Thread Robin H. Johnson
commit: f2a6be91995797d43c877b3e10cac14e839668eb
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun May  5 23:26:34 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun May  5 23:28:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2a6be91

net-misc/openvswitch: py312 support, fix dev-python/ovs dep, fix accidental 
direct to stable

Signed-off-by: Robin H. Johnson  gentoo.org>

 .../{openvswitch-2.17.9.ebuild => openvswitch-2.17.9-r1.ebuild} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-misc/openvswitch/openvswitch-2.17.9.ebuild 
b/net-misc/openvswitch/openvswitch-2.17.9-r1.ebuild
similarity index 97%
rename from net-misc/openvswitch/openvswitch-2.17.9.ebuild
rename to net-misc/openvswitch/openvswitch-2.17.9-r1.ebuild
index 5443b1d05e16..1053a8bdd80b 100644
--- a/net-misc/openvswitch/openvswitch-2.17.9.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.17.9-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MODULES_OPTIONAL_USE="modules"
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit autotools linux-mod-r1 python-single-r1 systemd tmpfiles
 
@@ -14,14 +14,14 @@ SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz;
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="debug modules monitor +ssl unwind valgrind"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # Check python/ovs/version.py in tarball for dev-python/ovs dep
 RDEPEND="${PYTHON_DEPS}
$(python_gen_cond_dep '
-   ~dev-python/ovs-2.17.1_p1[${PYTHON_USEDEP}]
+   ~dev-python/ovs-2.17.9[${PYTHON_USEDEP}]
dev-python/twisted[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]
')



[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/

2024-05-05 Thread Robin H. Johnson
commit: 3836faf8cc556b42ed987cc8e4b44cfb638a540d
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun May  5 23:27:52 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun May  5 23:28:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3836faf8

net-misc/openvswitch: cleanup v2.17.6

Signed-off-by: Robin H. Johnson  gentoo.org>

 net-misc/openvswitch/Manifest  |   1 -
 net-misc/openvswitch/openvswitch-2.17.6.ebuild | 174 -
 2 files changed, 175 deletions(-)

diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index ac6553668f58..19823fb47223 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -1,3 +1,2 @@
-DIST openvswitch-2.17.6.tar.gz 8092331 BLAKE2B 
0564a332e8c876552a9a3a068f4e54d3f5d56428e277e32f188aba9626035818c900be45171964ddcb782166a5e5b3b8f3a2fb80d5ed9723b94c9e1ed7410544
 SHA512 
ff9d19a9101c9a18117a859150d391eecbd6a331e35da3f20a62acaac1febbfbad716874734f9bd0d304d635212884f9f617b944e79bb7e554ddd9e5c53645c8
 DIST openvswitch-2.17.8.tar.gz 8097747 BLAKE2B 
d37ae60481255476d41aa94086f6a597107b23176f7ff47eeff9d85a5904da3685886663451317e0b9e512fb049b4024e291f320752aa90fe798ff08f49772c5
 SHA512 
c94685b67f9f25c81a590696d36c431fadf09c2504b06565011c2945ef242c5039508b312992597822f8ee274ce615ca58bc6bb2aa0a9cf1346bc2dcada70fa1
 DIST openvswitch-2.17.9.tar.gz 8136490 BLAKE2B 
cdb5ec81fb9ac04786fc1230d60c6c9bbf7ec2929cf5ab40bb1e0e7442480383d0ad8f24f14df4901cab8f39a6532445cf1810c9b9e3a779d7d15bfe35101a37
 SHA512 
b91212f9c10a208bca9d15cd5a219ae24b7e9bf8b5c8fdebc21cd9fa8229bc655f9f3591d79dd30c1a8212daed15d5a26bf9532b3496e3660bc8b62012f45636

diff --git a/net-misc/openvswitch/openvswitch-2.17.6.ebuild 
b/net-misc/openvswitch/openvswitch-2.17.6.ebuild
deleted file mode 100644
index ff783ad71bfb..
--- a/net-misc/openvswitch/openvswitch-2.17.6.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MODULES_OPTIONAL_USE="modules"
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit autotools linux-mod python-single-r1 systemd tmpfiles
-
-DESCRIPTION="Production quality, multilayer virtual switch"
-HOMEPAGE="https://www.openvswitch.org;
-SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz;
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE="debug modules monitor +ssl unwind valgrind"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Check python/ovs/version.py in tarball for dev-python/ovs dep
-RDEPEND="${PYTHON_DEPS}
-   $(python_gen_cond_dep '
-   ~dev-python/ovs-2.17.1_p1[${PYTHON_USEDEP}]
-   dev-python/twisted[${PYTHON_USEDEP}]
-   dev-python/zope-interface[${PYTHON_USEDEP}]
-   ')
-   debug? ( dev-lang/perl )
-   unwind? ( sys-libs/libunwind:= )
-   ssl? ( dev-libs/openssl:= )"
-DEPEND="${RDEPEND}
-   sys-apps/util-linux[caps]
-   valgrind? ( dev-debug/valgrind )"
-BDEPEND="virtual/pkgconfig
-   ${PYTHON_DEPS}
-   $(python_gen_cond_dep '
-   dev-python/sphinx[${PYTHON_USEDEP}]
-   ')"
-
-PATCHES=(
-   "${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
-   "${FILESDIR}/openvswitch-2.17.6-groff-1.23.0.patch"
-)
-
-CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 
~TUN"
-MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
-BUILD_TARGETS="all"
-
-pkg_setup() {
-   if use modules ; then
-   CONFIG_CHECK+=" ~!OPENVSWITCH"
-   kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 5.8 required 
for userspace modules"
-   kernel_is le 5 8 999 || die "Linux >= 3.10.0 and <= 5.8 
required for userspace modules"
-   linux-mod_pkg_setup
-   else
-   CONFIG_CHECK+=" ~OPENVSWITCH"
-   linux-info_pkg_setup
-   fi
-}
-
-src_prepare() {
-   default
-
-   # Never build kernelmodules, doing this manually
-   sed -i \
-   -e '/^SUBDIRS/d' \
-   datapath/Makefile.in || die "sed failed"
-
-   eautoreconf
-}
-
-src_configure() {
-   set_arch_to_kernel
-   python_setup
-
-   # monitor is statically enabled for bug #596206
-   # use monitor || export ovs_cv_python="no"
-   # pyside is staticly disabled
-   export ovs_cv_pyuic4="no"
-
-   # flake8 is primarily a style guide tool, running it as part of the 
tests
-   # in Gentoo does not make much sense, only breaks them: bug #607280
-   export ovs_cv_flake8="no"
-
-   # Only adds a diagram to the man page, just skip it as we don't
-   # want

[gentoo-commits] proj/elections:master commit in: completed/trustees-202306/

2024-05-05 Thread Robin H. Johnson
commit: cf701655e2f563af48f896a7eaf3f6f2c82fb756
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun May  5 18:27:29 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun May  5 18:27:29 2024 +
URL:https://gitweb.gentoo.org/proj/elections.git/commit/?id=cf701655

trustees-202306: capture casting-voters-trustees-202306

Signed-off-by: Robin H. Johnson  gentoo.org>

 .../trustees-202306/casting-voters-trustees-202306 | 32 ++
 1 file changed, 32 insertions(+)

diff --git a/completed/trustees-202306/casting-voters-trustees-202306 
b/completed/trustees-202306/casting-voters-trustees-202306
new file mode 100644
index 000..ca23b13
--- /dev/null
+++ b/completed/trustees-202306/casting-voters-trustees-202306
@@ -0,0 +1,32 @@
+ajak
+amynka
+andrewammerlaan
+arthurzam
+bircoph
+dabbott
+dilfridge
+eras
+graaff
+grobian
+hattya
+jmbsvicetto
+klondike
+kumba
+lu_zero
+marecki
+mattst88
+mgorny
+mpagano
+neddyseagoon
+perfinion
+pinkbyte
+rich0
+robbat2
+sam
+soap
+swift
+tamiko
+tomjbe
+tupone
+ulm
+voyageur



[gentoo-commits] proj/elections:master commit in: council-202306/, completed/trustees-202306/, completed/council-202306/, ...

2024-05-05 Thread Robin H. Johnson
commit: 04b69f95e1ec217ce1a98451e61c9850d88a82ea
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Aug 27 22:16:09 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Aug 27 22:16:09 2023 +
URL:https://gitweb.gentoo.org/proj/elections.git/commit/?id=04b69f95

archive council-202306 & trustees-202306

Signed-off-by: Robin H. Johnson  gentoo.org>

 {council-202306 => completed/council-202306}/Votify.pm   | 0
 {council-202306 => completed/council-202306}/ballot-council-202306   | 0
 {council-202306 => completed/council-202306}/election-details| 0
 {council-202306 => completed/council-202306}/officials-council-202306| 0
 {council-202306 => completed/council-202306}/start-council-202306| 0
 {council-202306 => completed/council-202306}/stop-council-202306 | 0
 {council-202306 => completed/council-202306}/voters-council-202306   | 0
 {trustees-202306 => completed/trustees-202306}/Votify.pm | 0
 {trustees-202306 => completed/trustees-202306}/ballot-trustees-202306| 0
 {trustees-202306 => completed/trustees-202306}/election-details  | 0
 {trustees-202306 => completed/trustees-202306}/officials-trustees-202306 | 0
 {trustees-202306 => completed/trustees-202306}/start-trustees-202306 | 0
 {trustees-202306 => completed/trustees-202306}/stop-trustees-202306  | 0
 {trustees-202306 => completed/trustees-202306}/voters-trustees-202306| 0
 14 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/council-202306/Votify.pm b/completed/council-202306/Votify.pm
similarity index 100%
rename from council-202306/Votify.pm
rename to completed/council-202306/Votify.pm

diff --git a/council-202306/ballot-council-202306 
b/completed/council-202306/ballot-council-202306
similarity index 100%
rename from council-202306/ballot-council-202306
rename to completed/council-202306/ballot-council-202306

diff --git a/council-202306/election-details 
b/completed/council-202306/election-details
similarity index 100%
rename from council-202306/election-details
rename to completed/council-202306/election-details

diff --git a/council-202306/officials-council-202306 
b/completed/council-202306/officials-council-202306
similarity index 100%
rename from council-202306/officials-council-202306
rename to completed/council-202306/officials-council-202306

diff --git a/council-202306/start-council-202306 
b/completed/council-202306/start-council-202306
similarity index 100%
rename from council-202306/start-council-202306
rename to completed/council-202306/start-council-202306

diff --git a/council-202306/stop-council-202306 
b/completed/council-202306/stop-council-202306
similarity index 100%
rename from council-202306/stop-council-202306
rename to completed/council-202306/stop-council-202306

diff --git a/council-202306/voters-council-202306 
b/completed/council-202306/voters-council-202306
similarity index 100%
rename from council-202306/voters-council-202306
rename to completed/council-202306/voters-council-202306

diff --git a/trustees-202306/Votify.pm b/completed/trustees-202306/Votify.pm
similarity index 100%
rename from trustees-202306/Votify.pm
rename to completed/trustees-202306/Votify.pm

diff --git a/trustees-202306/ballot-trustees-202306 
b/completed/trustees-202306/ballot-trustees-202306
similarity index 100%
rename from trustees-202306/ballot-trustees-202306
rename to completed/trustees-202306/ballot-trustees-202306

diff --git a/trustees-202306/election-details 
b/completed/trustees-202306/election-details
similarity index 100%
rename from trustees-202306/election-details
rename to completed/trustees-202306/election-details

diff --git a/trustees-202306/officials-trustees-202306 
b/completed/trustees-202306/officials-trustees-202306
similarity index 100%
rename from trustees-202306/officials-trustees-202306
rename to completed/trustees-202306/officials-trustees-202306

diff --git a/trustees-202306/start-trustees-202306 
b/completed/trustees-202306/start-trustees-202306
similarity index 100%
rename from trustees-202306/start-trustees-202306
rename to completed/trustees-202306/start-trustees-202306

diff --git a/trustees-202306/stop-trustees-202306 
b/completed/trustees-202306/stop-trustees-202306
similarity index 100%
rename from trustees-202306/stop-trustees-202306
rename to completed/trustees-202306/stop-trustees-202306

diff --git a/trustees-202306/voters-trustees-202306 
b/completed/trustees-202306/voters-trustees-202306
similarity index 100%
rename from trustees-202306/voters-trustees-202306
rename to completed/trustees-202306/voters-trustees-202306



[gentoo-commits] repo/gentoo:master commit in: sys-block/blktrace/

2024-04-21 Thread Robin H. Johnson
commit: a8638768e9f8db85d28d34727c768bd3d5cb7249
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Apr 21 15:08:42 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Apr 21 15:09:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8638768

sys-block/blktrace: missing doc dep

Signed-off-by: Robin H. Johnson  gentoo.org>
Closes: https://bugs.gentoo.org/874858

 sys-block/blktrace/blktrace-1.3.0-r1.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys-block/blktrace/blktrace-1.3.0-r1.ebuild 
b/sys-block/blktrace/blktrace-1.3.0-r1.ebuild
index 9f6d161916e2..cfd56e795983 100644
--- a/sys-block/blktrace/blktrace-1.3.0-r1.ebuild
+++ b/sys-block/blktrace/blktrace-1.3.0-r1.ebuild
@@ -16,11 +16,13 @@ IUSE="doc"
 
 RDEPEND="dev-libs/libaio"
 # This is a Linux specific app!
+# dev-texlive/texlive-latexextra for placeins.sty
 DEPEND="${RDEPEND}
sys-kernel/linux-headers
doc? (
virtual/latex-base
>=app-text/texlive-core-2014
+   dev-texlive/texlive-latexextra
)
 "
 



[gentoo-commits] repo/gentoo:master commit in: sys-block/blktrace/

2024-04-21 Thread Robin H. Johnson
commit: f2d465249bb54366d84f6c4c9689dbc6cc5cc80f
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Apr 21 15:05:40 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Apr 21 15:09:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2d46524

sys-block/blktrace: QA direct cc call

Signed-off-by: Robin H. Johnson  gentoo.org>
Closes: https://bugs.gentoo.org/930357

 sys-block/blktrace/blktrace-1.3.0-r1.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys-block/blktrace/blktrace-1.3.0-r1.ebuild 
b/sys-block/blktrace/blktrace-1.3.0-r1.ebuild
index f894d58430b3..9f6d161916e2 100644
--- a/sys-block/blktrace/blktrace-1.3.0-r1.ebuild
+++ b/sys-block/blktrace/blktrace-1.3.0-r1.ebuild
@@ -32,12 +32,13 @@ src_compile() {
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${CPPFLAGS}"
if use doc; then
export VARTEXFONTS="${T}/fonts"
-   emake docs
+   emake docs CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${CPPFLAGS}"
fi
 }
 
 src_install() {
-   emake install DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man"
+   # Do not remove the CC/FLAGS here; bug 930357
+   emake install DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man" 
CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${CPPFLAGS}"
einstalldocs
use doc && dodoc doc/blktrace.pdf btt/doc/btt.pdf
 }



[gentoo-commits] repo/gentoo:master commit in: sys-apps/clrngd/files/, sys-apps/clrngd/

2024-04-15 Thread Robin H. Johnson
commit: 92d715d96d8618e6f5538e1ca6739ef584bd5a2d
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Apr 14 16:35:02 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Apr 15 15:02:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92d715d9

sys-apps/clrngd: cleanup init

Signed-off-by: Robin H. Johnson  gentoo.org>
Closes: https://bugs.gentoo.org/484696

 sys-apps/clrngd/clrngd-1.0.3-r2.ebuild | 35 ++
 sys-apps/clrngd/files/clrngd-init.d-r2 | 14 ++
 2 files changed, 49 insertions(+)

diff --git a/sys-apps/clrngd/clrngd-1.0.3-r2.ebuild 
b/sys-apps/clrngd/clrngd-1.0.3-r2.ebuild
new file mode 100644
index ..8f8098302781
--- /dev/null
+++ b/sys-apps/clrngd/clrngd-1.0.3-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Clock randomness gathering daemon"
+HOMEPAGE="http://echelon.pl/pubs/;
+SRC_URI="http://echelon.pl/pubs/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.0.3-implicit-func-declaration.patch
+)
+
+src_prepare() {
+   default
+
+   eautoreconf
+}
+
+src_configure() {
+   econf --bindir="${EPREFIX}"/usr/sbin
+}
+
+src_install() {
+   default
+
+   newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
+   newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
+}

diff --git a/sys-apps/clrngd/files/clrngd-init.d-r2 
b/sys-apps/clrngd/files/clrngd-init.d-r2
new file mode 100644
index ..5a7bc5be924d
--- /dev/null
+++ b/sys-apps/clrngd/files/clrngd-init.d-r2
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name='clrngd'
+command='/usr/sbin/clrngd'
+command_args="${clrngd_opts:-${DELAYTIME}}"
+description="Clock entropy for RNG"
+
+depend() {
+   after random
+   before net
+   provide entropy
+}



[gentoo-commits] repo/gentoo:master commit in: app-misc/ddcutil/files/

2024-03-31 Thread Robin H. Johnson
commit: b7e21df46f74f27f04c332e2ae01864b3390d1d0
Author: Matthew White  inventati  org>
AuthorDate: Sun Mar 31 08:29:53 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Mar 31 16:27:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7e21df4

app-misc/ddcutil: fix command not found error

Fixes:

 * QA Notice: command not found:
 *
 *  ./configure: line 2975: 0: command not found

Closes: https://bugs.gentoo.org/922205
Package-Manager: portage-3.0.63
Signed-off-by: Matthew White  inventati.org>
X-cherry-picked: 0eb622b9779318b160ed865c095d3bdd4508d96c)
Signed-off-by: Robin H. Johnson  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/36012

 app-misc/ddcutil/files/ddcutil-1.4.1-no-werror.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/ddcutil/files/ddcutil-1.4.1-no-werror.patch 
b/app-misc/ddcutil/files/ddcutil-1.4.1-no-werror.patch
index 07897eb74e80..deabd2bfedbc 100644
--- a/app-misc/ddcutil/files/ddcutil-1.4.1-no-werror.patch
+++ b/app-misc/ddcutil/files/ddcutil-1.4.1-no-werror.patch
@@ -19,7 +19,7 @@ index c12f15c..27d2124 100644
  dnl AC_MSG_NOTICE([DBG = |$DBG|])
 
 -AM_CONDITIONAL(WARNINGS_ARE_ERRORS_COND, [test "x$ddcutil_version_suffix" != 
"x"] )
-+AM_CONDITIONAL(WARNINGS_ARE_ERRORS_COND, 0)
++AM_CONDITIONAL(WARNINGS_ARE_ERRORS_COND, [test 0])
 
  AS_IF( [test 0$DBG -ne 0],
 AC_MSG_NOTICE([debug messages enabled]),



[gentoo-commits] repo/gentoo:master commit in: net-misc/sks/files/, net-misc/sks/

2024-03-24 Thread Robin H. Johnson
commit: 10e3fa8b58a6d0224cba3d2b2e2df958891879f0
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Mar 25 05:52:58 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Mar 25 05:55:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10e3fa8b

net-misc/sks: match init.d behavior

- support args to systemd service
- ensure paths are correctly owned (/var/lib/sks/{PTree,KDB} must exist)
- sks-recon must start after sks-db

Signed-off-by: Robin H. Johnson  gentoo.org>

 net-misc/sks/files/sks-db.service  | 7 ++-
 net-misc/sks/files/sks-recon.service   | 7 +--
 ...sks-1.1.6_p20200624-r1.ebuild => sks-1.1.6_p20200624-r2.ebuild} | 0
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/net-misc/sks/files/sks-db.service 
b/net-misc/sks/files/sks-db.service
index bbc3ba7e2b2d..b48db1add6ff 100644
--- a/net-misc/sks/files/sks-db.service
+++ b/net-misc/sks/files/sks-db.service
@@ -3,8 +3,13 @@ Description=SKS database thread
 After=network.target
 
 [Service]
-ExecStart=/usr/bin/sks db
+Environment=SKS_DIR=/var/lib/sks
+EnvironmentFile=-/etc/sysconfig/sks
+ExecStartPre=/usr/lib/rc/bin/checkpath --owner sks:sks --directory ${SKS_DIR} 
${SKS_DIR}/SKS ${SKS_DIR}/PTree
+ExecStartPre=/usr/lib/rc/bin/checkpath --owner sks:sks --file ${SKS_DIR}/*.log 
${SKS_DIR}/KDB/* ${SKS_DIR}/PTree/*
+ExecStart=/usr/bin/sks db ${SKS_OPTIONS} ${SKS_DB_OPTIONS}
 User=sks
+# WorkingDirectory cannot use a variable
 WorkingDirectory=/var/lib/sks
 
 [Install]

diff --git a/net-misc/sks/files/sks-recon.service 
b/net-misc/sks/files/sks-recon.service
index 97ee52ffc0ed..d56731d1c961 100644
--- a/net-misc/sks/files/sks-recon.service
+++ b/net-misc/sks/files/sks-recon.service
@@ -1,10 +1,13 @@
 [Unit]
 Description=SKS key reconnaissance thread
-After=network.target
+After=network.target sks-db.service
 
 [Service]
-ExecStart=/usr/bin/sks recon
+Environment=SKS_DIR=/var/lib/sks
+EnvironmentFile=-/etc/sysconfig/sks
+ExecStart=/usr/bin/sks recon ${SKS_OPTIONS} ${SKS_RECON_OPTIONS}
 User=sks
+# WorkingDirectory cannot use a variable
 WorkingDirectory=/var/lib/sks
 
 [Install]

diff --git a/net-misc/sks/sks-1.1.6_p20200624-r1.ebuild 
b/net-misc/sks/sks-1.1.6_p20200624-r2.ebuild
similarity index 100%
rename from net-misc/sks/sks-1.1.6_p20200624-r1.ebuild
rename to net-misc/sks/sks-1.1.6_p20200624-r2.ebuild



[gentoo-commits] repo/gentoo:master commit in: app-admin/fifo-cronolog/

2024-03-24 Thread Robin H. Johnson
commit: 244c1a8fbec377a129414d299666e087b01e50f3
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Mar 25 05:32:14 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Mar 25 05:32:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=244c1a8f

app-admin/fifo-cronolog: fix systemd unit

Signed-off-by: Robin H. Johnson  gentoo.org>

 app-admin/fifo-cronolog/Manifest   |  1 -
 .../fifo-cronolog/fifo-cronolog-1.1.1-r2.ebuild| 29 --
 ...-1.2.3.ebuild => fifo-cronolog-1.2.3-r1.ebuild} |  2 +-
 3 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/app-admin/fifo-cronolog/Manifest b/app-admin/fifo-cronolog/Manifest
index a35f7f1febc4..959d598d56fb 100644
--- a/app-admin/fifo-cronolog/Manifest
+++ b/app-admin/fifo-cronolog/Manifest
@@ -1,2 +1 @@
-DIST fifo-cronolog-1.1.1.tar.bz2 3124 BLAKE2B 
6e9cb35e0ed1b54c3baed4451742840dc1144294fc675822c1260d4d7d885a52f8835e60dcbed57c714e40e94e6d51b3ba78af9b9892883f5f520a7c57d30df8
 SHA512 
3ac809d5cfc951764aaf31d50ee394b0dde9ced16f53daa91c81bdb218af2bab410ff945ebfdeb8307a55bda3292c0a55eb500c3cb73595e17228ef739455d90
 DIST fifo-cronolog-1.2.3.tar.gz 4518 BLAKE2B 
c227304d98b2467a1ed7352399b1e53aba4dc005fa30a1be73b8cc96d61ee49d5f6a3703ccddd1ffef652c4090e9b5dfed9cce3f1254b959a1ccc07aac78b3f6
 SHA512 
557be1a663c5754a293092078b8a3710474bb1939c1ee65e4c560056238ca646e941e4ad82c0a90c02834fc90ddb2aae9047a4e73d42cf8c2c013f2a5d2c839c

diff --git a/app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r2.ebuild 
b/app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r2.ebuild
deleted file mode 100644
index 06b9ddeebf9e..
--- a/app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r2.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="cronolog wrapper for use with dumb daemons like squid, varnish 
and so on"
-HOMEPAGE="https://cgit.gentoo.org/proj/fifo-cronolog.git;
-SRC_URI="http://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2;
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="app-admin/cronolog"
-
-src_install() {
-   dosbin fifo-cronolog
-
-   newinitd fifo-cronolog.initd fifo-cronolog
-   newconfd fifo-cronolog.confd fifo-cronolog
-
-   dosym fifo-cronolog /usr/sbin/squid-cronolog
-}
-
-pkg_postinst() {
-   elog "Warning: app-admin/squid-cronolog has been renamed to 
app-admin/fifo-cronolog."
-   elog "This also applies to the binary 'squid-cronolog' but there is a 
symlink for now"
-   elog "Please fix your scripts/configs."
-}

diff --git a/app-admin/fifo-cronolog/fifo-cronolog-1.2.3.ebuild 
b/app-admin/fifo-cronolog/fifo-cronolog-1.2.3-r1.ebuild
similarity index 95%
rename from app-admin/fifo-cronolog/fifo-cronolog-1.2.3.ebuild
rename to app-admin/fifo-cronolog/fifo-cronolog-1.2.3-r1.ebuild
index 06e5d7dd386b..27cfe32f20a1 100644
--- a/app-admin/fifo-cronolog/fifo-cronolog-1.2.3.ebuild
+++ b/app-admin/fifo-cronolog/fifo-cronolog-1.2.3-r1.ebuild
@@ -27,7 +27,7 @@ src_install() {
newinitd openrc/fifo-cronolog.initd fifo-cronolog
newconfd openrc/fifo-cronolog.confd fifo-cronolog
 
-   systemd_douserunit systemd/fifo-cronolog@.service
+   systemd_dounit systemd/fifo-cronolog@.service
dodoc README.md systemd/fifo-crono...@example.service.env
 }
 



[gentoo-commits] repo/gentoo:master commit in: app-metrics/bind_exporter/

2024-03-24 Thread Robin H. Johnson
commit: a31db516d1fef6769c875871c751886a7b5a7a87
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Mar 25 05:18:32 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Mar 25 05:20:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a31db516

app-metrics/bind_exporter: QA: fix RedundantVersion

Signed-off-by: Robin H. Johnson  gentoo.org>

 app-metrics/bind_exporter/Manifest |  1 -
 .../bind_exporter/bind_exporter-0.3.0.ebuild   | 55 
 .../bind_exporter/bind_exporter-0.6.1.ebuild   | 58 --
 3 files changed, 114 deletions(-)

diff --git a/app-metrics/bind_exporter/Manifest 
b/app-metrics/bind_exporter/Manifest
index 9c17ec11501a..262a8c84766b 100644
--- a/app-metrics/bind_exporter/Manifest
+++ b/app-metrics/bind_exporter/Manifest
@@ -1,3 +1,2 @@
-DIST bind_exporter-0.3.0.tar.gz 1796507 BLAKE2B 
a79b9e0d159d3deb83f1a040325ad34bc0d4ae50b6af205dce4ebf8d7152ccbd4b7d46fda40bf76db953996ddf4237ca13058250478b08cca51b8bea08ccc31b
 SHA512 
762901a63a9493f852e5514429f55b10400931f0a77d2e11c7565e93e1ff759eb30d3bbc9278451bb9df358a983aa099bd55cf57241cf36187d2789c89a3852d
 DIST bind_exporter-0.6.1-vendor.tar.xz 1300068 BLAKE2B 
058f4f61ff9c403a5672390dd3944dec9a6b4b1dcf8ac7bcb6943494d43c116236e23f4b0437d5b2e91cb0d936377ba896740594d90b50ce99a61963713ab70c
 SHA512 
9fd880655ac9657d49c0d250b22e46c53a63c0a2d4097763ca8856da36f75527d515a4e4cde7dd68c2c5cbf4ea784c07d9bd5e38a01eeb2d308a585c31d5c19b
 DIST bind_exporter-0.6.1.tar.gz 48904 BLAKE2B 
ad2def162e0fac5e857328bb142bc20655d0d1ea4a9d90a3bd8d305a3d86f9247671ca92f90d5ccdcb1a8bd147ed56858a9782feeac019b87666b4b18b7219c1
 SHA512 
d710b7228587e12a101a1d626ec5e0290b0740074f3976eee02463165030b361d3b6df556ab949d632488582ef6d4a3197270afc197d6d756a99c16e55c5448c

diff --git a/app-metrics/bind_exporter/bind_exporter-0.3.0.ebuild 
b/app-metrics/bind_exporter/bind_exporter-0.3.0.ebuild
deleted file mode 100644
index 1f984c920f02..
--- a/app-metrics/bind_exporter/bind_exporter-0.3.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-GIT_COMMIT=c34ff3d6b4817f42e74b2b05b3797cf99683b4a9
-
-DESCRIPTION="Prometheus exporter for BIND"
-HOMEPAGE="https://github.com/digitalocean/bind_exporter;
-SRC_URI="https://github.com/digitalocean/bind_exporter/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-COMMON_DEPEND="acct-group/bind_exporter
-   acct-user/bind_exporter"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="dev-util/promu"
-
-src_prepare() {
-   default
-   sed -i -e "/-s$/d" -e "s/{{.Revision}}/${GIT_COMMIT}/" .promu.yml || die
-}
-
-src_compile() {
-   mkdir -p bin || die
-   promu build -v --prefix bin || die
-}
-
-src_test() {
-   emake test-flags= test
-}
-
-src_install() {
-   dobin bin/${PN}
-   dodoc {README,CHANGELOG}.md
-   newinitd "${FILESDIR}"/${PN}.initd ${PN}
-   newconfd "${FILESDIR}"/${PN}.confd ${PN}
-   keepdir /var/log/${PN}
-   fowners ${PN}:${PN} /var/log/${PN}
-}
-
-pkg_postinst() {
-   elog "Make sure BIND was built with libxml2 support. You can check with 
the"
-   elog "following command: named -V | grep libxml2."
-   elog "Configure BIND to open a statistics channel. It's recommended to 
run"
-   elog "the bind_exporter next to BIND, so it's only necessary to open a 
port"
-   elog "locally."
-   elog ""
-   elog "statistics-channels {"
-   elog "inet 127.0.0.1 port 8053 allow { 127.0.0.1; };"
-   elog "};"
-}

diff --git a/app-metrics/bind_exporter/bind_exporter-0.6.1.ebuild 
b/app-metrics/bind_exporter/bind_exporter-0.6.1.ebuild
deleted file mode 100644
index 85c7fb1fd672..
--- a/app-metrics/bind_exporter/bind_exporter-0.6.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-GIT_COMMIT=c34ff3d6b4817f42e74b2b05b3797cf99683b4a9
-
-DESCRIPTION="Prometheus exporter for BIND"
-HOMEPAGE="https://github.com/prometheus-community/bind_exporter;
-SRC_URI="
-   
https://github.com/prometheus-community/bind_exporter/archive/refs/tags/v${PV}.tar.gz
 -> ${P}.tar.gz
-   
https://dev.gentoo.org/~robbat2/distfiles/bind_exporter-${PV}-vendor.tar.xz
-   "
-
-LICENSE="Apache-2.0 BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-COMMON_DEPEND="acct-group/bind_exporter
-   acct-user/bind_exporter"
-DEPEND="${COMMON_DEPEND}&quo

[gentoo-commits] repo/gentoo:master commit in: app-metrics/bind_exporter/files/, app-metrics/bind_exporter/

2024-03-24 Thread Robin H. Johnson
commit: 1351ede7b9e4a9e6d004d2f3d019e8d9ba907b78
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Mar 25 05:16:53 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Mar 25 05:20:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1351ede7

app-metrics/bind_exporter: systemd, match other distros for config

Signed-off-by: Robin H. Johnson  gentoo.org>

 .../bind_exporter/bind_exporter-0.6.1-r1.ebuild| 60 ++
 .../bind_exporter/files/bind_exporter.service  | 11 
 2 files changed, 71 insertions(+)

diff --git a/app-metrics/bind_exporter/bind_exporter-0.6.1-r1.ebuild 
b/app-metrics/bind_exporter/bind_exporter-0.6.1-r1.ebuild
new file mode 100644
index ..333599e97b8f
--- /dev/null
+++ b/app-metrics/bind_exporter/bind_exporter-0.6.1-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+GIT_COMMIT=c34ff3d6b4817f42e74b2b05b3797cf99683b4a9
+
+DESCRIPTION="Prometheus exporter for BIND"
+HOMEPAGE="https://github.com/prometheus-community/bind_exporter;
+SRC_URI="
+   
https://github.com/prometheus-community/bind_exporter/archive/refs/tags/v${PV}.tar.gz
 -> ${P}.tar.gz
+   
https://dev.gentoo.org/~robbat2/distfiles/bind_exporter-${PV}-vendor.tar.xz
+   "
+
+LICENSE="Apache-2.0 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND="acct-group/bind_exporter
+   acct-user/bind_exporter"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="dev-util/promu"
+
+src_prepare() {
+   default
+   sed -i -e "/-s$/d" -e "s/{{.Revision}}/${GIT_COMMIT}/" .promu.yml || die
+}
+
+src_compile() {
+   mkdir -p bin || die
+   promu build -v --prefix bin || die
+}
+
+src_test() {
+   emake test-flags= test
+}
+
+src_install() {
+   dobin bin/${PN}
+   dodoc {README,CHANGELOG}.md
+   newinitd "${FILESDIR}"/${PN}.initd ${PN}
+   newconfd "${FILESDIR}"/${PN}.confd ${PN}
+   systemd_dounit "${FILESDIR}"/${PN}.service
+   keepdir /var/log/${PN}
+   fowners ${PN}:${PN} /var/log/${PN}
+}
+
+pkg_postinst() {
+   elog "Make sure BIND was built with libxml2 support. You can check with 
the"
+   elog "following command: named -V | grep libxml2."
+   elog "Configure BIND to open a statistics channel. It's recommended to 
run"
+   elog "the bind_exporter next to BIND, so it's only necessary to open a 
port"
+   elog "locally."
+   elog ""
+   elog "statistics-channels {"
+   elog "inet 127.0.0.1 port 8053 allow { 127.0.0.1; };"
+   elog "};"
+}

diff --git a/app-metrics/bind_exporter/files/bind_exporter.service 
b/app-metrics/bind_exporter/files/bind_exporter.service
new file mode 100644
index ..ad2a237a061a
--- /dev/null
+++ b/app-metrics/bind_exporter/files/bind_exporter.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Bind Exporter
+Documentation="https://github.com/prometheus-community/bind_exporter;
+
+[Service]
+User=bind_exporter
+EnvironmentFile=/etc/sysconfig/bind_exporter
+ExecStart=/usr/sbin/bind_exporter $OPTIONS
+
+[Install]
+WantedBy=multi-user.target



[gentoo-commits] repo/gentoo:master commit in: app-metrics/bind_exporter/

2024-03-24 Thread Robin H. Johnson
commit: 3569befa2b4ea88a83cdfb0a5dc4114934ff867e
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Mar 25 05:18:05 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Mar 25 05:20:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3569befa

app-metrics/bind_exporter: QA: fix EmptyGlobalAssignment

Signed-off-by: Robin H. Johnson  gentoo.org>

 app-metrics/bind_exporter/bind_exporter-0.3.0.ebuild| 1 -
 app-metrics/bind_exporter/bind_exporter-0.6.1-r1.ebuild | 1 -
 app-metrics/bind_exporter/bind_exporter-0.6.1.ebuild| 1 -
 3 files changed, 3 deletions(-)

diff --git a/app-metrics/bind_exporter/bind_exporter-0.3.0.ebuild 
b/app-metrics/bind_exporter/bind_exporter-0.3.0.ebuild
index 683d0803b1fa..1f984c920f02 100644
--- a/app-metrics/bind_exporter/bind_exporter-0.3.0.ebuild
+++ b/app-metrics/bind_exporter/bind_exporter-0.3.0.ebuild
@@ -12,7 +12,6 @@ 
SRC_URI="https://github.com/digitalocean/bind_exporter/archive/v${PV}.tar.gz ->
 LICENSE="Apache-2.0 BSD MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
 COMMON_DEPEND="acct-group/bind_exporter
acct-user/bind_exporter"

diff --git a/app-metrics/bind_exporter/bind_exporter-0.6.1-r1.ebuild 
b/app-metrics/bind_exporter/bind_exporter-0.6.1-r1.ebuild
index 333599e97b8f..5d586670b4e6 100644
--- a/app-metrics/bind_exporter/bind_exporter-0.6.1-r1.ebuild
+++ b/app-metrics/bind_exporter/bind_exporter-0.6.1-r1.ebuild
@@ -15,7 +15,6 @@ SRC_URI="
 LICENSE="Apache-2.0 BSD MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
 COMMON_DEPEND="acct-group/bind_exporter
acct-user/bind_exporter"

diff --git a/app-metrics/bind_exporter/bind_exporter-0.6.1.ebuild 
b/app-metrics/bind_exporter/bind_exporter-0.6.1.ebuild
index 6f9020afafd7..85c7fb1fd672 100644
--- a/app-metrics/bind_exporter/bind_exporter-0.6.1.ebuild
+++ b/app-metrics/bind_exporter/bind_exporter-0.6.1.ebuild
@@ -15,7 +15,6 @@ SRC_URI="
 LICENSE="Apache-2.0 BSD MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
 COMMON_DEPEND="acct-group/bind_exporter
acct-user/bind_exporter"



[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

2024-03-14 Thread Robin H. Johnson
commit: a2573c506caae02d4cdd45c7480e8ada4f463069
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Thu Mar 14 18:26:10 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Thu Mar 14 18:33:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2573c50

app-admin/testdisk: bump

Signed-off-by: Robin H. Johnson  gentoo.org>
Closes: https://bugs.gentoo.org/900116
Closes: https://bugs.gentoo.org/892904

 app-admin/testdisk/Manifest|   1 +
 app-admin/testdisk/metadata.xml|   1 +
 app-admin/testdisk/testdisk-7.2.ebuild | 104 +
 3 files changed, 106 insertions(+)

diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index eb6decb01775..99ef2a164156 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1 +1,2 @@
 DIST testdisk-7.1.tar.bz2 742006 BLAKE2B 
ad67cbef73e502df39cd04537bae9226d043a0f5ed824ed24d5a5ac7c3262060d0c78bfcf38159890ee0c270e1cd7690cbf276eb919e1b4721357fffc8679c61
 SHA512 
ad6531eec45c1ed8d4a0ce6132692bb609c4c269fbca57f788ce808214e0b00b5fb1187745a859c5da8a3cb8de18b29904792d3246b15cedfa24bf24cbfe3df5
+DIST testdisk-7.2.tar.bz2 855781 BLAKE2B 
224fae052fa9264ee83fdf6804159c77257b9db4c96ff36c7cb1dc184ec4a9f0955f0d817de24ef1e5fe69e7ef1a20c140e73fc130fb092e6df3b02df2845239
 SHA512 
f99dd1c8f547c3d06e5459ba072438192a49d76c569de7915994beb269645092522d8136a212999382f88ca1d29c50f6482306d47197dc0994d168bcd4141f26

diff --git a/app-admin/testdisk/metadata.xml b/app-admin/testdisk/metadata.xml
index adbd9697dcd6..0cde64481bdc 100644
--- a/app-admin/testdisk/metadata.xml
+++ b/app-admin/testdisk/metadata.xml
@@ -13,6 +13,7 @@
Include the ability to read NTFS 
filesystems
Include reiserfs reading ability
Include ewf library
+   Enable sudo helper integration


cgsecurity/testdisk

diff --git a/app-admin/testdisk/testdisk-7.2.ebuild 
b/app-admin/testdisk/testdisk-7.2.ebuild
new file mode 100644
index ..e30e7c0a8b9f
--- /dev/null
+++ b/app-admin/testdisk/testdisk-7.2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic qmake-utils xdg-utils
+
+DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based 
recovery tool"
+HOMEPAGE="https://www.cgsecurity.org/wiki/TestDisk;
+SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="ewf jpeg ntfs gui reiserfs static +sudo zlib"
+
+REQUIRED_USE="static? ( !gui )"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+   'ntfs_mbstoucs' # configure script checking NTFS, has fallbacks
+)
+
+# WARNING: reiserfs support does NOT work with reiserfsprogs
+# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
+# sudo is detected during configure for extra functionality, see bug #892904
+DEPEND="
+   sudo? ( app-admin/sudo )
+   static? (
+   sys-apps/util-linux[static-libs]
+   sys-fs/e2fsprogs[static-libs]
+   sys-libs/ncurses:0[static-libs]
+   jpeg? ( media-libs/libjpeg-turbo:=[static-libs] )
+   ntfs? ( sys-fs/ntfs3g[static-libs] )
+   reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] )
+   zlib? ( sys-libs/zlib[static-libs] )
+   !arm? ( ewf? ( app-forensics/libewf[static-libs] ) )
+   )
+   !static? (
+   sys-apps/util-linux
+   sys-fs/e2fsprogs
+   sys-libs/ncurses:0=
+   jpeg? ( media-libs/libjpeg-turbo:= )
+   ntfs? ( sys-fs/ntfs3g:= )
+   gui? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
+   zlib? ( sys-libs/zlib )
+   !arm? ( ewf? ( app-forensics/libewf:= ) )
+   )
+"
+RDEPEND="
+   sudo? ( app-admin/sudo )
+   !static? ( ${DEPEND} )
+"
+BDEPEND="gui? ( dev-qt/linguist-tools:5 )"
+
+DOCS=()
+
+PATCHES=(
+)
+
+src_configure() {
+   export MOC="$(qt5_get_bindir)/moc"
+   export PATH="$(qt5_get_bindir):${PATH}"
+
+   local myconf=(
+   --without-ntfs # old NTFS implementation, use ntfs-3g instead.
+   $(use_with ewf)
+   $(use_with jpeg)
+   $(use_with ntfs ntfs3g)
+   $(use_enable gui qt)
+   $(use_enable sudo)
+   $(use_with reiserfs)
+   $(use_with zlib)
+   )
+
+   # this static method is the same used by upstream for their 'static' 
make
+   # target, but better, as it doesn't 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/mdadm/files/, sys-fs/mdadm/

2024-03-13 Thread Robin H. Johnson
commit: 16001ee3172451f6574dbe8c5b7f71ac0d43d3e2
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Thu Mar 14 03:39:47 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Thu Mar 14 03:42:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16001ee3

sys-fs/mdadm: bump

Signed-off-by: Robin H. Johnson  gentoo.org>
Closes: https://bugs.gentoo.org/833000

 sys-fs/mdadm/Manifest  |   2 +
 .../files/mdadm-4.3-in_initrd-collision.patch  |  45 
 sys-fs/mdadm/files/mdadm-4.3-ldflags.patch |  11 ++
 sys-fs/mdadm/mdadm-4.3.ebuild  | 124 +
 sys-fs/mdadm/metadata.xml  |   3 +
 5 files changed, 185 insertions(+)

diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index 961f422d5fb6..51cfc9e15326 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -1,2 +1,4 @@
 DIST mdadm-4.2.tar.xz 453624 BLAKE2B 
de7c4318dc5479de41378233869ab84ca2cd0e8a42310157b1acb969e7152af61556fbbe6f17bf6af4dfaf5543e49b1c982d2baeedf1c39b32f4db7f5502
 SHA512 
57897a2b7fb8b0b88bece50501099872bb45ddb076cfc323d563588096d2b66b1ecba3724534943f651ace2bfe591482570700616500dc3398552e4f9ff0c37d
+DIST mdadm-4.3.tar.xz 465820 BLAKE2B 
3b6955339adb6c254a69d698e3b807838f8840e37f7f94280f4a1fbffb082ee694309f4b6f9adc8edfa2071fde324bf00ae0493d5b2e6c8d87796783dfa3ee1c
 SHA512 
e44977f2f80d2471cb313803a60c92dafe8282ac06bbbfd41ae90ca493c64a3da94db924538788d045fd7f0667333912dabedb0b070f9abf5c0540b32e0fa08f
 DIST mdadm_4.2~rc2-7.debian.tar.xz 89904 BLAKE2B 
dd04f2dd044d0bca85920eaf5c79a288d69c47a7ad7e36509a126c01ef63bd045d7e0530450650028de39d74ad852995ca080c3a73dbcb1cf1b3783118109f35
 SHA512 
3d36533d2713b663606919b2bfec18b15e18a6a0194e333e38e4a58f175da96af7b1fe16f0c36ee148e14492a4e0710b9fad6ac7856495b63c0176ebb7333be6
+DIST mdadm_4.3-1.debian.tar.xz 86972 BLAKE2B 
52af9ddacc402d8c3318bac31b4cd5ac3045e564832546146ba0a18d6a43866ae2c21270ac15f48df98c4f76af0eeae41679ea9e0e265dad44914bd58f27d689
 SHA512 
1c5203523f0c7fe271d850ab4ad376a449e870f8f1549dc4460adede1f59a1a364e741562954297e7848bae19d1cfe273a31f1bfaf739dd37559a0666abd8517

diff --git a/sys-fs/mdadm/files/mdadm-4.3-in_initrd-collision.patch 
b/sys-fs/mdadm/files/mdadm-4.3-in_initrd-collision.patch
new file mode 100644
index ..54e4aadacb58
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-4.3-in_initrd-collision.patch
@@ -0,0 +1,45 @@
+Fix collision with libudev symbols when statically linking.
+
+https://bugs.gentoo.org/830485
+--- a/mdadm.h
 b/mdadm.h
+@@ -1665,7 +1665,7 @@
+ extern void udev_block(char *devnm);
+ extern void udev_unblock(void);
+ 
+-extern int in_initrd(void);
++extern int mdadm_in_initrd(void);
+ 
+ struct cmap_hooks {
+   void *cmap_handle;  /* corosync lib related */
+--- a/mdmon.c
 b/mdmon.c
+@@ -309,7 +309,7 @@
+   {NULL, 0, NULL, 0}
+   };
+ 
+-  if (in_initrd()) {
++  if (mdadm_in_initrd()) {
+   /*
+* set first char of argv[0] to @. This is used by
+* systemd to signal that the task was launched from
+--- a/util.c
 b/util.c
+@@ -1960,7 +1960,7 @@
+   int len;
+   pid_t pid;
+   int status;
+-  char *prefix = in_initrd() ? "initrd-" : "";
++  char *prefix = mdadm_in_initrd() ? "initrd-" : "";
+   char pathbuf[1024];
+   char *paths[4] = {
+   pathbuf,
+@@ -2219,7 +2219,7 @@
+   return 0;
+ }
+ 
+-int in_initrd(void)
++int mdadm_in_initrd(void)
+ {
+   /* This is based on similar function in systemd. */
+   struct statfs s;

diff --git a/sys-fs/mdadm/files/mdadm-4.3-ldflags.patch 
b/sys-fs/mdadm/files/mdadm-4.3-ldflags.patch
new file mode 100644
index ..e8e93d424592
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-4.3-ldflags.patch
@@ -0,0 +1,11 @@
+--- mdadm-4.3/Makefile.orig2024-03-13 20:11:48.949678469 -0700
 mdadm-4.3/Makefile 2024-03-13 20:11:52.773671814 -0700
+@@ -132,7 +132,7 @@
+ MON_LDFLAGS += -pthread
+ endif
+ 
+-LDFLAGS = -Wl,-z,now,-z,noexecstack
++LDFLAGS += -Wl,-z,now,-z,noexecstack
+ 
+ # If you want a static binary, you might uncomment these
+ # LDFLAGS += -static

diff --git a/sys-fs/mdadm/mdadm-4.3.ebuild b/sys-fs/mdadm/mdadm-4.3.ebuild
new file mode 100644
index ..c78553aa7558
--- /dev/null
+++ b/sys-fs/mdadm/mdadm-4.3.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd toolchain-funcs udev
+
+DESCRIPTION="Tool for running RAID systems - replacement for the raidtools"
+HOMEPAGE="https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/;
+DEB_PF="4.3-1"
+SRC_URI="https://www.kernel.org/pub/linux/utils/raid/mdadm/${P/_/-}.tar.xz
+   mirror://debian/pool/main/m/mdadm/${PN}_${DEB_PF}.debian.tar.xz"
+
+LICENS

[gentoo-commits] repo/gentoo:master commit in: profiles/arch/ia64/, profiles/arch/riscv/, profiles/arch/loong/

2024-03-13 Thread Robin H. Johnson
commit: 0cc6106b2176e61bec384012fa9350b29e64c307
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Thu Mar 14 03:41:21 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Thu Mar 14 03:42:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cc6106b

profiles: mask sys-fs/mdadm[corosync]

Signed-off-by: Robin H. Johnson  gentoo.org>

 profiles/arch/ia64/package.use.mask  | 4 
 profiles/arch/loong/package.use.mask | 4 
 profiles/arch/riscv/package.use.mask | 4 
 3 files changed, 12 insertions(+)

diff --git a/profiles/arch/ia64/package.use.mask 
b/profiles/arch/ia64/package.use.mask
index 881702046ca8..17bf844ce195 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Robin H. Johnson  (2024-03-08)
 # mongodb dependencies are not keyworded
 mail-mta/postfix mongodb

diff --git a/profiles/arch/loong/package.use.mask 
b/profiles/arch/loong/package.use.mask
index c4cc43e2ff78..5a384dacc36e 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Robin H. Johnson  (2024-02-16)
 # Test dependencies not keyworded on this arch.
 www-servers/nginx test

diff --git a/profiles/arch/riscv/package.use.mask 
b/profiles/arch/riscv/package.use.mask
index 5f0957463d47..524b442bf6fd 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Robin H. Johnson  (2024-02-18)
 # alembic not stable yet
 media-gfx/openvdb alembic



[gentoo-commits] repo/gentoo:master commit in: app-admin/fifo-cronolog/

2024-03-13 Thread Robin H. Johnson
commit: 3dc3292d11e8e576338d48f03266c5594983daa8
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Wed Mar 13 16:23:57 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Wed Mar 13 16:24:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dc3292d

app-admin/fifo-cronolog: replace mirror://gentoo/

Signed-off-by: Robin H. Johnson  gentoo.org>

 app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r2.ebuild | 2 +-
 app-admin/fifo-cronolog/fifo-cronolog-1.2.3.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r2.ebuild 
b/app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r2.ebuild
index 1a34cb0f1110..06b9ddeebf9e 100644
--- a/app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r2.ebuild
+++ b/app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="cronolog wrapper for use with dumb daemons like squid, varnish 
and so on"
 HOMEPAGE="https://cgit.gentoo.org/proj/fifo-cronolog.git;
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+SRC_URI="http://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2;
 
 LICENSE="BSD-2 GPL-2"
 SLOT="0"

diff --git a/app-admin/fifo-cronolog/fifo-cronolog-1.2.3.ebuild 
b/app-admin/fifo-cronolog/fifo-cronolog-1.2.3.ebuild
index 940b4376a493..06e5d7dd386b 100644
--- a/app-admin/fifo-cronolog/fifo-cronolog-1.2.3.ebuild
+++ b/app-admin/fifo-cronolog/fifo-cronolog-1.2.3.ebuild
@@ -7,7 +7,7 @@ inherit systemd
 
 DESCRIPTION="cronolog wrapper for use with dumb daemons like squid, varnish 
and so on"
 HOMEPAGE="https://gitweb.gentoo.org/proj/fifo-cronolog.git;
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+SRC_URI="http://dev.gentoo.org/~robbat2/distfiles/${P}.tar.gz;
 
 LICENSE="BSD-2 GPL-2"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: app-admin/fifo-cronolog/

2024-03-12 Thread Robin H. Johnson
commit: 0dd86ed01ecd13b32a282d228937be391ceebb6b
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Wed Mar 13 05:23:50 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Wed Mar 13 05:24:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dd86ed0

app-admin/fifo-cronolog: bump, systemd support

Signed-off-by: Robin H. Johnson  gentoo.org>

 app-admin/fifo-cronolog/Manifest   |  1 +
 app-admin/fifo-cronolog/fifo-cronolog-1.2.3.ebuild | 38 ++
 2 files changed, 39 insertions(+)

diff --git a/app-admin/fifo-cronolog/Manifest b/app-admin/fifo-cronolog/Manifest
index ba3b49b49b23..a35f7f1febc4 100644
--- a/app-admin/fifo-cronolog/Manifest
+++ b/app-admin/fifo-cronolog/Manifest
@@ -1 +1,2 @@
 DIST fifo-cronolog-1.1.1.tar.bz2 3124 BLAKE2B 
6e9cb35e0ed1b54c3baed4451742840dc1144294fc675822c1260d4d7d885a52f8835e60dcbed57c714e40e94e6d51b3ba78af9b9892883f5f520a7c57d30df8
 SHA512 
3ac809d5cfc951764aaf31d50ee394b0dde9ced16f53daa91c81bdb218af2bab410ff945ebfdeb8307a55bda3292c0a55eb500c3cb73595e17228ef739455d90
+DIST fifo-cronolog-1.2.3.tar.gz 4518 BLAKE2B 
c227304d98b2467a1ed7352399b1e53aba4dc005fa30a1be73b8cc96d61ee49d5f6a3703ccddd1ffef652c4090e9b5dfed9cce3f1254b959a1ccc07aac78b3f6
 SHA512 
557be1a663c5754a293092078b8a3710474bb1939c1ee65e4c560056238ca646e941e4ad82c0a90c02834fc90ddb2aae9047a4e73d42cf8c2c013f2a5d2c839c

diff --git a/app-admin/fifo-cronolog/fifo-cronolog-1.2.3.ebuild 
b/app-admin/fifo-cronolog/fifo-cronolog-1.2.3.ebuild
new file mode 100644
index ..940b4376a493
--- /dev/null
+++ b/app-admin/fifo-cronolog/fifo-cronolog-1.2.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="cronolog wrapper for use with dumb daemons like squid, varnish 
and so on"
+HOMEPAGE="https://gitweb.gentoo.org/proj/fifo-cronolog.git;
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="BSD-2 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-admin/cronolog"
+
+src_compile() {
+   emake all
+}
+
+src_install() {
+   dosbin fifo-cronolog
+   dosym fifo-cronolog /usr/sbin/squid-cronolog
+   dosbin fifo-cronolog-setup
+
+   newinitd openrc/fifo-cronolog.initd fifo-cronolog
+   newconfd openrc/fifo-cronolog.confd fifo-cronolog
+
+   systemd_douserunit systemd/fifo-cronolog@.service
+   dodoc README.md systemd/fifo-crono...@example.service.env
+}
+
+pkg_postinst() {
+   elog "Warning: app-admin/squid-cronolog has been renamed to 
app-admin/fifo-cronolog."
+   elog "This also applies to the binary 'squid-cronolog' but there is a 
symlink for now"
+   elog "Please fix your scripts/configs."
+}



[gentoo-commits] proj/fifo-cronolog:master commit in: /

2024-03-12 Thread Robin H. Johnson
commit: 80ac76208eade31ad0df6b347481049c20608a39
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Wed Mar 13 04:51:37 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Wed Mar 13 04:51:37 2024 +
URL:https://gitweb.gentoo.org/proj/fifo-cronolog.git/commit/?id=80ac7620

build: add hacky dist rule

Signed-off-by: Robin H. Johnson  gentoo.org>

 .gitignore | 4 +++-
 Makefile   | 8 
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 29b8ac9..718dc26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
-
 *.o
 fifo-cronolog
+*.tgz
+*.tar.gz
+*.tar

diff --git a/Makefile b/Makefile
index 7894e74..74c132a 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,14 @@ BINDIR = /usr/sbin/
 SYSTEMD_TARGET = /usr/lib/systemd/system/
 SYSTEMD_UNIT = systemd/fifo-cronolog@.service
 
+VERSION = $(shell awk -F'"' '/#define VERSION/{print $$2}' $(SRC) )
+DISTFILE_EXT = tar.gz
+DISTFILE = $(BIN)-$(VERSION).$(DISTFILE_EXT)
+
+dist:
+   if test -e $(DISTFILE) ; then echo "$(DISTFILE) already exists" ; exit 
1 ; fi
+   git archive --format $(DISTFILE_EXT) --prefix $(BIN)-$(VERSION)/ 
v$(VERSION) >$(DISTFILE).tmp && mv $(DISTFILE).tmp $(DISTFILE)
+
 all: $(BIN)
 
 $(BIN): $(OBJ)



[gentoo-commits] proj/fifo-cronolog: New tag: v1.2.1

2024-03-12 Thread Robin H. Johnson
commit: 
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Tue Mar 12 18:14:59 2024 +

New tag: v1.2.1




[gentoo-commits] proj/fifo-cronolog:master commit in: /

2024-03-12 Thread Robin H. Johnson
commit: 81713dc3efcbec5ae3006580a97aef519bfc7c2b
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Tue Mar 12 18:06:26 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Tue Mar 12 18:06:26 2024 +
URL:https://gitweb.gentoo.org/proj/fifo-cronolog.git/commit/?id=81713dc3

fix: bump version to ship docs

Signed-off-by: Robin H. Johnson  gentoo.org>

 fifo-cronolog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fifo-cronolog.c b/fifo-cronolog.c
index f7ff19f..c2875d6 100644
--- a/fifo-cronolog.c
+++ b/fifo-cronolog.c
@@ -14,7 +14,7 @@ SPDX-License-Identifier: BSD-2-Clause
 #include 
 #include 
 
-#define VERSION "1.2.0"
+#define VERSION "1.2.1"
 
 char *pidfile;
 



[gentoo-commits] proj/fifo-cronolog:master commit in: /

2024-03-12 Thread Robin H. Johnson
commit: 33db6ad55a866b9944d8038e036c7dce65e26eea
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Tue Mar 12 18:05:47 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Tue Mar 12 18:05:47 2024 +
URL:https://gitweb.gentoo.org/proj/fifo-cronolog.git/commit/?id=33db6ad5

doc: add README & AUTHORS

Signed-off-by: Robin H. Johnson  gentoo.org>

 AUTHORS   |  2 ++
 README.md | 22 ++
 2 files changed, 24 insertions(+)

diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 000..2ca8fed
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,2 @@
+Christian Ruppert 
+Robin H. Johnson 

diff --git a/README.md b/README.md
new file mode 100644
index 000..7ec95e7
--- /dev/null
+++ b/README.md
@@ -0,0 +1,22 @@
+fifo-cronolog
+-
+This is a little tool that connects a named pipe/FIFO into the stdin of 
`cronolog`.
+
+This is useful for cases where the logging destination cannot be specified as a
+program. It was originally written to do logging from Squid, but later re-used
+for Nginx & other tools.
+
+Cronolog's canonical example, in an Apache configuration
+```
+TransferLog "|/www/sbin/cronolog /www/logs/%Y/%m/%d/access.log"
+```
+
+Is converted into:
+1. Fifo-cronolog as (via your init system, so it gets restarted):
+```
+fifo-cronolog /run/apache-access.pid /run/apache-access.fifo 
/www/logs/%Y/%m/%d/access.log
+```
+2. Apache configuration:
+```
+TransferLog "/run/apache-access.fifo"
+```



[gentoo-commits] proj/fifo-cronolog:master commit in: /

2024-03-12 Thread Robin H. Johnson
commit: a88407d7924b0f45947807981cc8d3327d2c56d4
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Tue Mar 12 18:14:15 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Tue Mar 12 18:14:15 2024 +
URL:https://gitweb.gentoo.org/proj/fifo-cronolog.git/commit/?id=a88407d7

build: add simple install target

Signed-off-by: Robin H. Johnson  gentoo.org>

 Makefile | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/Makefile b/Makefile
index 3baecf8..7894e74 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,13 @@
 CFLAGS += -Wall
 BIN = fifo-cronolog
+HELPER = fifo-cronolog-setup
 SRC = $(BIN).c
 OBJ = $(patsubst %.c,%.o,$(SRC))
 
+BINDIR = /usr/sbin/
+SYSTEMD_TARGET = /usr/lib/systemd/system/
+SYSTEMD_UNIT = systemd/fifo-cronolog@.service
+
 all: $(BIN)
 
 $(BIN): $(OBJ)
@@ -14,4 +19,9 @@ $(BIN): $(OBJ)
 clean:
$(RM) $(BIN) $(OBJ)
 
+install:
+   mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(SYSTEMD_TARGET)
+   install -m0755 -D $(BIN) $(HELPER) $(DESTDIR)$(BINDIR)
+   install -m0644 -D $(SYSTEMD_UNIT) $(DESTDIR)$(SYSTEMD_TARGET)
+
 #  vim: set ts=4 sw=4 tw=80:



[gentoo-commits] proj/fifo-cronolog:master commit in: /

2024-03-12 Thread Robin H. Johnson
commit: 09b3b06ecff704b6b001d6398f506dce9456301f
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Tue Mar 12 18:05:24 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Tue Mar 12 18:05:24 2024 +
URL:https://gitweb.gentoo.org/proj/fifo-cronolog.git/commit/?id=09b3b06e

build: cleanup Makefile

Signed-off-by: Robin H. Johnson  gentoo.org>

 Makefile | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index cca4e8b..3baecf8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,17 @@
 CFLAGS += -Wall
+BIN = fifo-cronolog
+SRC = $(BIN).c
+OBJ = $(patsubst %.c,%.o,$(SRC))
 
-all: fifo-cronolog
+all: $(BIN)
 
-fifo-cronolog: fifo-cronolog.o
+$(BIN): $(OBJ)
$(CC) $(LDFLAGS) -o $@ $<
 
-fifo-cronolog.o: fifo-cronolog.c
+.c.o:
$(CC) $(CFLAGS) -c -o $@ $<
 
 clean:
-   $(RM) fifo-cronolog{,.o}
+   $(RM) $(BIN) $(OBJ)
 
 #  vim: set ts=4 sw=4 tw=80:



[gentoo-commits] proj/fifo-cronolog: New tag: v1.2.0

2024-03-12 Thread Robin H. Johnson
commit: 
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Tue Mar 12 13:09:31 2024 +

New tag: v1.2.0




[gentoo-commits] proj/fifo-cronolog:master commit in: /, systemd/, openrc/

2024-03-12 Thread Robin H. Johnson
commit: dd64f64db665840b35cd980291f1c14711ac42d2
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Tue Mar 12 13:07:07 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Tue Mar 12 13:08:54 2024 +
URL:https://gitweb.gentoo.org/proj/fifo-cronolog.git/commit/?id=dd64f64d

feat: systemd support

Signed-off-by: Robin H. Johnson  gentoo.org>

 .gitignore|  3 +++
 fifo-cronolog-setup   | 17 ++
 fifo-cronolog.c   | 27 +++
 fifo-cronolog.confd => openrc/fifo-cronolog.confd |  0
 fifo-cronolog.initd => openrc/fifo-cronolog.initd |  0
 systemd/README.md |  4 
 systemd/fifo-cronolog@.service| 10 +
 systemd/fifo-crono...@example.service.env |  4 
 8 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..29b8ac9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+
+*.o
+fifo-cronolog

diff --git a/fifo-cronolog-setup b/fifo-cronolog-setup
new file mode 100755
index 000..55f46f0
--- /dev/null
+++ b/fifo-cronolog-setup
@@ -0,0 +1,17 @@
+#!/bin/bash
+# Copyright 2024-2024, Gentoo Foundation
+# SPDX-License-Identifier: BSD-2-Clause
+FIFO=$1
+FIFO_OWNER=$2
+FIFO_PERMS=$3
+if [ ! -e "${FIFO}" ]; then
+   mkfifo "$FIFO" || exit 1
+fi
+if [ -p "${FIFO}" ]; then
+   chown "$FIFO_OWNER" "$FIFO" || exit 1
+   chmod "$FIFO_PERMS" "$FIFO" || exit 1
+else
+   echo "${FIFO} is not a valid FIFO!" 1>&2
+   exit 1
+fi
+exit 0

diff --git a/fifo-cronolog.c b/fifo-cronolog.c
index de87827..f7ff19f 100644
--- a/fifo-cronolog.c
+++ b/fifo-cronolog.c
@@ -1,27 +1,6 @@
 /*
-Copyright (c) 2007-2010, Gentoo Foundation
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+Copyright 2010-2024, Gentoo Foundation
+SPDX-License-Identifier: BSD-2-Clause
 */
 
 #include 
@@ -35,7 +14,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include 
 #include 
 
-#define VERSION "1.1.1"
+#define VERSION "1.2.0"
 
 char *pidfile;
 

diff --git a/fifo-cronolog.confd b/openrc/fifo-cronolog.confd
similarity index 100%
rename from fifo-cronolog.confd
rename to openrc/fifo-cronolog.confd

diff --git a/fifo-cronolog.initd b/openrc/fifo-cronolog.initd
similarity index 100%
rename from fifo-cronolog.initd
rename to openrc/fifo-cronolog.initd

diff --git a/systemd/README.md b/systemd/README.md
new file mode 100644
index 000..1d88021
--- /dev/null
+++ b/systemd/README.md
@@ -0,0 +1,4 @@
+1. Put env into `/etc/systemd-env/`, using the entire name of the unit, with 
instance suffix, and an extra `.env`,
+   e.g. `/etc/systemd-env/fifo-crono...@example.service.env`
+2. `systemctl enable fifo-cronolog@example`
+3. Use systemd overrides if you need to add dependencies.

diff --git a/systemd/fifo-cronolog@.service b/systemd/fifo-cronolog@.service
new file mode 100644
index 000..0ab0962
--- /dev/null
+++ b/systemd/fifo-cronolog@.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=fifo-cronolog.%i
+[Service]
+Type=forking
+EnvironmentFile=/etc/systemd-env/%n.env
+PIDFile=/run/%N.pid
+ExecStartPre=/usr/sbin/fifo-cronolog-setup $FIFO $FIFO_OWNER $FIFO_PERMS
+ExecStart=/usr/sbin/fifo-cronolog /run/%N.pid $FIFO $LOGS
+[Install]
+WantedBy=multi-user.target

diff --git a/systemd/fifo-crono...@example.service.env 
b/systemd/fifo-crono...@example.service.env
new file mode 100644
index 000..370d157
--- /dev/null
+++ b/systemd/fifo-crono...@example.service.env
@@ -0,0 +1,4 @@
+FIFO="/tmp/example.fifo"
+FIFO_OWNER="somebody:somegroup"
+FIFO_PERMS="0600"
+LOGS="/var/log/example/%Y%m%d.log"



[gentoo-commits] repo/gentoo:master commit in: sys-block/fio/

2024-03-07 Thread Robin H. Johnson
commit: af6ddf9d58876f7ae3a4a8eb632635092c3ba229
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Thu Mar  7 13:57:19 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Thu Mar  7 14:07:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af6ddf9d

sys-block/fio: bump to 3.36

Also make pandas dependency optional due to size (used for only one
processing script).

Signed-off-by: Robin H. Johnson  gentoo.org>

 sys-block/fio/Manifest|   1 +
 sys-block/fio/fio-3.36.ebuild | 169 ++
 sys-block/fio/metadata.xml|   1 +
 3 files changed, 171 insertions(+)

diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index 9a507fbd2a6d..661b1471fba9 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -1,3 +1,4 @@
 DIST fio-3.27.tar.bz2 960330 BLAKE2B 
7e7e01a5c1d6af13a6f87139e7738646cbc8f45ebc370d0c45b9efe1f93778613d374daafc6df459f988f27f2be54ff636235e1e5a92a4a6ecf9a60ed573d170
 SHA512 
9c5f2ab0c9ac24ab78dbc74fb6c5acd60f8189fdc618f4280992141b6c0abe1c235c373fee18ad0c803e7fb25d480f45aec56dc3be2e0d26d181b3418b179f99
 DIST fio-3.30.tar.bz2 6001772 BLAKE2B 
a4941cd415e6444bb9871274580efdf82281a1e52dc3caaa235f63176e3564fb1dc08e1e4586c555f9c25975d7e6220fe53209ed7218da713b9cb9135de0fc05
 SHA512 
1fb2ae9c28028147edabceff734fc41bf07ce504af98afdb0951920b724b15d647f2b0852262c177279ad6b4dbbf24be458db7f939d1c80069e0f8e7bc8aa10d
 DIST fio-3.34.tar.bz2 7049859 BLAKE2B 
297fef62098bc3bc5476ebc7794566172c182059ce35d57a84bf87f6cedf08f234371d363fd08570e675eef9fbc7eae8d79755826d4312d543a16a144b4afc3f
 SHA512 
912da2d7c7c4e0ad6c64a2e8c5254d23e5b6286c54d3ebf23d6bd2e0b5a9e4d2a53a75da3c807467b0fbe637b4ff23d64f1166fc45d6cce1d13d239f233548d0
+DIST fio-3.36.tar.bz2 7229204 BLAKE2B 
a9265ae8817486ddda1b63c35c79814b7854ec29106a188110b22ba82fc41a015b076626daa577a43189804a768f5465395b8daa74ceb31c949e03eca091a23b
 SHA512 
925cab44619991052085216253c9c5637f7319f52d92f4cc946df60ab1a964dbfa0bbb0ecd171d6dc21ae1402375a6cf1e7b8ac94df0c03889f849aeb2da8890

diff --git a/sys-block/fio/fio-3.36.ebuild b/sys-block/fio/fio-3.36.ebuild
new file mode 100644
index ..5c3e73c4de29
--- /dev/null
+++ b/sys-block/fio/fio-3.36.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit python-r1 toolchain-funcs
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Jens Axboe's Flexible IO tester"
+HOMEPAGE="https://brick.kernel.dk/snaps/;
+SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="aio curl glusterfs gnuplot gtk io-uring nfs numa pandas python rbd rdma 
static tcmalloc test valgrind zbc zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+   gnuplot? ( python )
+   io-uring? ( aio )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+# GTK+:2 does not offer static libaries.
+# xnvme
+# libblkio
+# pmem2
+LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
+   curl? (
+   net-misc/curl:=[static-libs(+)]
+   dev-libs/openssl:0=[static-libs(+)]
+   )
+   nfs? ( net-fs/libnfs:=[static-libs(+)] )
+   glusterfs? ( sys-cluster/glusterfs[static-libs(+)] )
+   gtk? ( dev-libs/glib:2[static-libs(+)] )
+   io-uring? ( sys-libs/liburing:=[static-libs(+)] )
+   numa? ( sys-process/numactl[static-libs(+)] )
+   rbd? ( sys-cluster/ceph[static-libs(+)] )
+   rdma? ( sys-cluster/rdma-core[static-libs(+)] )
+   tcmalloc? ( dev-util/google-perftools:=[static-libs(+)] )
+   zbc? ( >=sys-block/libzbc-5 )
+   zlib? ( sys-libs/zlib[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+   gtk? ( x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+   static? ( ${LIB_DEPEND} )
+   test? ( dev-util/cunit )
+   valgrind? ( dev-debug/valgrind )"
+RDEPEND+="
+   python? (
+   ${PYTHON_DEPS}
+   pandas? ( dev-python/pandas[${PYTHON_USEDEP}] )
+   )
+   gnuplot? ( sci-visualization/gnuplot )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}"/fio-2.2.13-libmtd.patch
+)
+
+src_prepare() {
+   default
+
+   sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
+
+   # Many checks don't have configure flags.
+   sed -i \
+   -e "s:\:$(tc-getPKG_CONFIG):" \
+   -e '/if compile_prog "" "-lzbc" "libzbc" *; *then/  '"s::if 
$(usex zbc true false) ; then:" \
+   -e '/if compile_prog "" "-lz" "zlib" *; *then/  '"s::if $(usex 

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/

2024-02-24 Thread Robin H. Johnson
commit: 581399753bb491755cff0ff177496db2fdaaec32
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Feb 24 22:29:51 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Feb 24 22:29:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58139975

sys-kernel/genkernel: fix DEPEND

Signed-off-by: Robin H. Johnson  gentoo.org>

 sys-kernel/genkernel/genkernel-4.3.10.ebuild   | 1 -
 sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild | 1 -
 sys-kernel/genkernel/genkernel-4.3.3.ebuild| 1 -
 sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild | 1 -
 sys-kernel/genkernel/genkernel-4.3.5.ebuild| 1 -
 sys-kernel/genkernel/genkernel-4.3.6.ebuild| 1 -
 sys-kernel/genkernel/genkernel-4.3.7.ebuild| 1 -
 sys-kernel/genkernel/genkernel-4.3.8.ebuild| 1 -
 8 files changed, 8 deletions(-)

diff --git a/sys-kernel/genkernel/genkernel-4.3.10.ebuild 
b/sys-kernel/genkernel/genkernel-4.3.10.ebuild
index c18ee7e3f88f..c9fabf38f930 100644
--- a/sys-kernel/genkernel/genkernel-4.3.10.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.10.ebuild
@@ -110,7 +110,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # because genkernel will usually build things like LVM2, cryptsetup,
 # mdadm... during initramfs generation which will require these
 # things.
-DEPEND=""
 RDEPEND="${PYTHON_DEPS}
app-alternatives/cpio
>=app-misc/pax-utils-1.2.2

diff --git a/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild 
b/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild
index 770af1eccda7..3971e796aaec 100644
--- a/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild
@@ -108,7 +108,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # because genkernel will usually build things like LVM2, cryptsetup,
 # mdadm... during initramfs generation which will require these
 # things.
-DEPEND=""
 RDEPEND="${PYTHON_DEPS}
app-alternatives/cpio
>=app-misc/pax-utils-1.2.2

diff --git a/sys-kernel/genkernel/genkernel-4.3.3.ebuild 
b/sys-kernel/genkernel/genkernel-4.3.3.ebuild
index 8155ec397784..8618d193cec9 100644
--- a/sys-kernel/genkernel/genkernel-4.3.3.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.3.ebuild
@@ -108,7 +108,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # because genkernel will usually build things like LVM2, cryptsetup,
 # mdadm... during initramfs generation which will require these
 # things.
-DEPEND=""
 RDEPEND="${PYTHON_DEPS}
app-alternatives/cpio
>=app-misc/pax-utils-1.2.2

diff --git a/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild 
b/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild
index 68809b365657..8070ca6813a0 100644
--- a/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild
@@ -108,7 +108,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # because genkernel will usually build things like LVM2, cryptsetup,
 # mdadm... during initramfs generation which will require these
 # things.
-DEPEND=""
 RDEPEND="${PYTHON_DEPS}
app-alternatives/cpio
>=app-misc/pax-utils-1.2.2

diff --git a/sys-kernel/genkernel/genkernel-4.3.5.ebuild 
b/sys-kernel/genkernel/genkernel-4.3.5.ebuild
index f210468636c1..ffe2daf3137c 100644
--- a/sys-kernel/genkernel/genkernel-4.3.5.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.5.ebuild
@@ -108,7 +108,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # because genkernel will usually build things like LVM2, cryptsetup,
 # mdadm... during initramfs generation which will require these
 # things.
-DEPEND=""
 RDEPEND="${PYTHON_DEPS}
app-alternatives/cpio
>=app-misc/pax-utils-1.2.2

diff --git a/sys-kernel/genkernel/genkernel-4.3.6.ebuild 
b/sys-kernel/genkernel/genkernel-4.3.6.ebuild
index 7b5171fc41c2..92efe7ddce6c 100644
--- a/sys-kernel/genkernel/genkernel-4.3.6.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.6.ebuild
@@ -110,7 +110,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # because genkernel will usually build things like LVM2, cryptsetup,
 # mdadm... during initramfs generation which will require these
 # things.
-DEPEND=""
 RDEPEND="${PYTHON_DEPS}
app-alternatives/cpio
>=app-misc/pax-utils-1.2.2

diff --git a/sys-kernel/genkernel/genkernel-4.3.7.ebuild 
b/sys-kernel/genkernel/genkernel-4.3.7.ebuild
index 9d8206aa81a2..b7e8a4a01a2f 100644
--- a/sys-kernel/genkernel/genkernel-4.3.7.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.7.ebuild
@@ -110,7 +110,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # because genkernel will usually build things like LVM2, cryptsetup,
 # mdadm... during initramfs generation which will require these
 # things.
-DEPEND=""
 RDEPEND="${PYTHON_DEPS}
app-alternatives/cpio
>=app-misc/pax-utils-1.2.2

diff --git a/sys-kernel/genkernel/genkernel-4.3.8.ebuil

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/

2024-02-24 Thread Robin H. Johnson
commit: e0a5cdb8d740ce21fbda02dff51e3742d6095594
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Feb 24 22:32:45 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Feb 24 22:32:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0a5cdb8

sys-kernel/genkernel: fix PYTHON_COMPAT

Signed-off-by: Robin H. Johnson  gentoo.org>

 sys-kernel/genkernel/genkernel-4.3.10.ebuild   | 2 +-
 sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild | 2 +-
 sys-kernel/genkernel/genkernel-4.3.3.ebuild| 2 +-
 sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild | 2 +-
 sys-kernel/genkernel/genkernel-4.3.5.ebuild| 2 +-
 sys-kernel/genkernel/genkernel-4.3.6.ebuild| 2 +-
 sys-kernel/genkernel/genkernel-4.3.7.ebuild| 2 +-
 sys-kernel/genkernel/genkernel-4.3.8.ebuild| 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys-kernel/genkernel/genkernel-4.3.10.ebuild 
b/sys-kernel/genkernel/genkernel-4.3.10.ebuild
index c9fabf38f930..231d78668417 100644
--- a/sys-kernel/genkernel/genkernel-4.3.10.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.10.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit bash-completion-r1 python-single-r1
 

diff --git a/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild 
b/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild
index 3971e796aaec..e1b47412c7c8 100644
--- a/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild
@@ -6,7 +6,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit bash-completion-r1 python-single-r1
 

diff --git a/sys-kernel/genkernel/genkernel-4.3.3.ebuild 
b/sys-kernel/genkernel/genkernel-4.3.3.ebuild
index 8618d193cec9..7b750e86b11a 100644
--- a/sys-kernel/genkernel/genkernel-4.3.3.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.3.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit bash-completion-r1 python-single-r1
 

diff --git a/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild 
b/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild
index 8070ca6813a0..2801dccffcc4 100644
--- a/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit bash-completion-r1 python-single-r1
 

diff --git a/sys-kernel/genkernel/genkernel-4.3.5.ebuild 
b/sys-kernel/genkernel/genkernel-4.3.5.ebuild
index ffe2daf3137c..d37e61489cda 100644
--- a/sys-kernel/genkernel/genkernel-4.3.5.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.5.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit bash-completion-r1 python-single-r1
 

diff --git a/sys-kernel/genkernel/genkernel-4.3.6.ebuild 
b/sys-kernel/genkernel/genkernel-4.3.6.ebuild
index 92efe7ddce6c..07190a27fbea 100644
--- a/sys-kernel/genkernel/genkernel-4.3.6.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.6.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit bash-completion-r1 python-single-r1
 

diff --git a/sys-kernel/genkernel/genkernel-4.3.7.ebuild 
b/sys-kernel/genkernel/genkernel-4.3.7.ebuild
index b7e8a4a01a2f..03810b3f08bc 100644
--- a/sys-kernel/genkernel/genkernel-4.3.7.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.7.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit bash-completion-r1 python-single-r1
 

diff --git a/sys-kernel/genkernel/genkernel-4.3.8.ebuild 
b/sys-kernel/genkernel/genkernel-4.3.8.ebuild
index b7e8a4a01a2f..03810b3f08bc 100644
--- a/sys-kernel/genkernel/genkernel-4.3.8.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.8.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit bash-completion-r1 python-single-r1
 



[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/

2024-02-24 Thread Robin H. Johnson
commit: 4a32b6fd118760218704b844122d506ff7388a22
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Feb 24 22:29:20 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Feb 24 22:29:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a32b6fd

sys-kernel/genkernel: fix RESTRICT

Signed-off-by: Robin H. Johnson  gentoo.org>

 sys-kernel/genkernel/genkernel-4.3.10.ebuild   | 1 -
 sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild | 1 -
 sys-kernel/genkernel/genkernel-4.3.3.ebuild| 1 -
 sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild | 1 -
 sys-kernel/genkernel/genkernel-4.3.5.ebuild| 1 -
 sys-kernel/genkernel/genkernel-4.3.6.ebuild| 1 -
 sys-kernel/genkernel/genkernel-4.3.7.ebuild| 1 -
 sys-kernel/genkernel/genkernel-4.3.8.ebuild| 1 -
 sys-kernel/genkernel/genkernel-.ebuild | 1 -
 9 files changed, 9 deletions(-)

diff --git a/sys-kernel/genkernel/genkernel-4.3.10.ebuild 
b/sys-kernel/genkernel/genkernel-4.3.10.ebuild
index 505fe3f356e7..c18ee7e3f88f 100644
--- a/sys-kernel/genkernel/genkernel-4.3.10.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.10.ebuild
@@ -102,7 +102,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel 
https://gitweb.gentoo.org/proj/
 
 LICENSE="GPL-2"
 SLOT="0"
-RESTRICT=""
 IUSE="ibm +firmware"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 

diff --git a/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild 
b/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild
index 571e5a35cd86..770af1eccda7 100644
--- a/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild
@@ -100,7 +100,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel 
https://gitweb.gentoo.org/proj/
 
 LICENSE="GPL-2"
 SLOT="0"
-RESTRICT=""
 IUSE="ibm +firmware"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 

diff --git a/sys-kernel/genkernel/genkernel-4.3.3.ebuild 
b/sys-kernel/genkernel/genkernel-4.3.3.ebuild
index 5cc642be67ca..8155ec397784 100644
--- a/sys-kernel/genkernel/genkernel-4.3.3.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.3.ebuild
@@ -100,7 +100,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel 
https://gitweb.gentoo.org/proj/
 
 LICENSE="GPL-2"
 SLOT="0"
-RESTRICT=""
 IUSE="ibm +firmware"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 

diff --git a/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild 
b/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild
index 49d4b62d53d8..68809b365657 100644
--- a/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild
@@ -100,7 +100,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel 
https://gitweb.gentoo.org/proj/
 
 LICENSE="GPL-2"
 SLOT="0"
-RESTRICT=""
 IUSE="ibm +firmware"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 

diff --git a/sys-kernel/genkernel/genkernel-4.3.5.ebuild 
b/sys-kernel/genkernel/genkernel-4.3.5.ebuild
index 860214201405..f210468636c1 100644
--- a/sys-kernel/genkernel/genkernel-4.3.5.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.5.ebuild
@@ -100,7 +100,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel 
https://gitweb.gentoo.org/proj/
 
 LICENSE="GPL-2"
 SLOT="0"
-RESTRICT=""
 IUSE="ibm +firmware"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 

diff --git a/sys-kernel/genkernel/genkernel-4.3.6.ebuild 
b/sys-kernel/genkernel/genkernel-4.3.6.ebuild
index 8b6f12a6146d..7b5171fc41c2 100644
--- a/sys-kernel/genkernel/genkernel-4.3.6.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.6.ebuild
@@ -102,7 +102,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel 
https://gitweb.gentoo.org/proj/
 
 LICENSE="GPL-2"
 SLOT="0"
-RESTRICT=""
 IUSE="ibm +firmware"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 

diff --git a/sys-kernel/genkernel/genkernel-4.3.7.ebuild 
b/sys-kernel/genkernel/genkernel-4.3.7.ebuild
index 6de5f5963238..9d8206aa81a2 100644
--- a/sys-kernel/genkernel/genkernel-4.3.7.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.7.ebuild
@@ -102,7 +102,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel 
https://gitweb.gentoo.org/proj/
 
 LICENSE="GPL-2"
 SLOT="0"
-RESTRICT=""
 IUSE="ibm +firmware"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 

diff --git a/sys-kernel/genkernel/genkernel-4.3.8.ebuild 
b/sys-kernel/genkernel/genkernel-4.3.8.ebuild
index 6de5f5963238..9d8206aa81a2 100644
--- a/sys-kernel/genkernel/genkernel-4.3.8.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.8.ebuild
@@ -102,7 +102,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel 
https://gitweb.gentoo.org/proj/
 
 LICENSE="GPL-2"
 SLOT="0"
-RESTRICT=""
 IUSE="ibm +firmware"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 

diff --git a/sys-kernel/genkernel/genkernel-.ebuild 
b/sys-kernel/genkernel/genkernel-.ebuild
index b7d26415b641..46254b9348ab 100644
--- a/sys-kernel/genkernel/genkernel-.ebuild
+++ b/sys-kernel/genkernel/genkernel-.ebuild
@@ -102,7 +102,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel 
https://gitweb.gentoo.org/proj/
 
 LICENSE="GPL-2"
 SLOT="0"
-RESTRICT=""
 IUSE="ibm +firmware"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/

2024-02-24 Thread Robin H. Johnson
commit: 722edc45751c56ef50fc1cbf0c2a4e76d7f009e4
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Feb 24 22:28:51 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Feb 24 22:28:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=722edc45

sys-kernel/genkernel: fix whitespace

Signed-off-by: Robin H. Johnson  gentoo.org>

 sys-kernel/genkernel/genkernel-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sys-kernel/genkernel/genkernel-.ebuild 
b/sys-kernel/genkernel/genkernel-.ebuild
index 516580fbbd15..b7d26415b641 100644
--- a/sys-kernel/genkernel/genkernel-.ebuild
+++ b/sys-kernel/genkernel/genkernel-.ebuild
@@ -133,7 +133,6 @@ RDEPEND="${PYTHON_DEPS}
firmware? ( sys-kernel/linux-firmware )
 "
 
-
 PATCHES=(
 )
 



[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/

2024-02-24 Thread Robin H. Johnson
commit: c8d92c708aa800c05c5f29bf4d6c52c7fc10ec80
Author: Timothy Kenno Handojo  gmail  com>
AuthorDate: Thu Feb 22 08:13:42 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Feb 24 22:06:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8d92c70

sys-kernel/genkernel: Updated python version

Signed-off-by: Timothy Kenno Handojo  gmail.com>
Signed-off-by: Robin H. Johnson  gentoo.org>

 sys-kernel/genkernel/genkernel-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-kernel/genkernel/genkernel-.ebuild 
b/sys-kernel/genkernel/genkernel-.ebuild
index deb515ad14ff..516580fbbd15 100644
--- a/sys-kernel/genkernel/genkernel-.ebuild
+++ b/sys-kernel/genkernel/genkernel-.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit bash-completion-r1 python-single-r1
 



[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/

2024-02-24 Thread Robin H. Johnson
commit: 2c49d2ffed7cc4365cf8dc9e8df340ae0b1bfc14
Author: Timothy Kenno Handojo  gmail  com>
AuthorDate: Wed Feb 21 12:25:52 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Feb 24 22:06:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c49d2ff

sys-kernel/genkernel: modernize build script

Signed-off-by: Timothy Kenno Handojo  gmail.com>
Signed-off-by: Robin H. Johnson  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/35089

 sys-kernel/genkernel/genkernel-.ebuild | 76 +-
 1 file changed, 11 insertions(+), 65 deletions(-)

diff --git a/sys-kernel/genkernel/genkernel-.ebuild 
b/sys-kernel/genkernel/genkernel-.ebuild
index 6de5f5963238..deb515ad14ff 100644
--- a/sys-kernel/genkernel/genkernel-.ebuild
+++ b/sys-kernel/genkernel/genkernel-.ebuild
@@ -111,7 +111,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # because genkernel will usually build things like LVM2, cryptsetup,
 # mdadm... during initramfs generation which will require these
 # things.
-DEPEND=""
+DEPEND="
+   app-text/asciidoc
+"
 RDEPEND="${PYTHON_DEPS}
app-alternatives/cpio
>=app-misc/pax-utils-1.2.2
@@ -128,11 +130,9 @@ RDEPEND="${PYTHON_DEPS}
dev-build/libtool
virtual/pkgconfig
elibc_glibc? ( sys-libs/glibc[static-libs(+)] )
-   firmware? ( sys-kernel/linux-firmware )"
+   firmware? ( sys-kernel/linux-firmware )
+"
 
-if [[ ${PV} == * ]]; then
-   DEPEND="${DEPEND} app-text/asciidoc"
-fi
 
 PATCHES=(
 )
@@ -163,73 +163,19 @@ src_prepare() {
popd >/dev/null || die
fi
 
-   # Update software.sh
-   sed -i \
-   -e "s:VERSION_BCACHE_TOOLS:${VERSION_BCACHE_TOOLS}:"\
-   -e "s:VERSION_BOOST:${VERSION_BOOST}:"\
-   -e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
-   -e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
-   -e "s:VERSION_COREUTILS:${VERSION_COREUTILS}:"\
-   -e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
-   -e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
-   -e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
-   -e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
-   -e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\
-   -e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
-   -e "s:VERSION_FUSE:${VERSION_FUSE}:"\
-   -e "s:VERSION_GPG:${VERSION_GPG}:"\
-   -e "s:VERSION_HWIDS:${VERSION_HWIDS}:"\
-   -e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\
-   -e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\
-   -e "s:VERSION_KMOD:${VERSION_KMOD}:"\
-   -e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
-   -e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
-   -e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
-   -e "s:VERSION_LIBXCRYPT:${VERSION_LIBXCRYPT}:"\
-   -e "s:VERSION_LVM:${VERSION_LVM}:"\
-   -e "s:VERSION_LZO:${VERSION_LZO}:"\
-   -e "s:VERSION_MDADM:${VERSION_MDADM}:"\
-   -e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
-   -e "s:VERSION_POPT:${VERSION_POPT}:"\
-   -e "s:VERSION_STRACE:${VERSION_STRACE}:"\
-   -e 
"s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\
-   -e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
-   -e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
-   -e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
-   -e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\
-   -e "s:VERSION_XZ:${VERSION_XZ}:"\
-   -e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\
-   -e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\
-   "${S}"/defaults/software.sh \
-   || die "Could not adjust versions"
+   # Export all the versions that may be used by genkernel build.
+   for v in $(set |awk -F= '/^VERSION_/{print $1}') ; do
+   export ${v}
+   done
 }
 
 src_compile() {
-   if [[ ${PV} == * ]] ; then
-   emake
-   fi
+   emake PREFIX=/usr
 }
 
 src_install() {
-   insinto /etc
-   doins "${S}"/genkernel.conf
-
-   doman genkernel.8
+   emake DESTDIR="${D}" PREFIX=/usr install
dodoc AUTHORS ChangeLog README TODO
-   dobin genkernel
-   rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
-   if use ibm ; then
-   cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
-   else
-   cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
-   fi
-
-   insinto /usr/share/genkernel
-   doins -r "${S}"/*
-
-   fperms +x /usr/share/genkernel/gen_worker.sh
-   fperms +x /usr/share/genkernel/path_expander.py
 
python_fix_shebang "${ED}"/usr/share/genkernel/path_expander.py
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/mdadm/

2024-02-19 Thread Robin H. Johnson
commit: 472cbf6119a834698effe44ed3d00f1c6109aecf
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Feb 19 22:31:21 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Feb 19 22:31:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=472cbf61

sys-fs/mdadm: cleanup

Signed-off-by: Robin H. Johnson  gentoo.org>

 sys-fs/mdadm/Manifest |  2 -
 sys-fs/mdadm/mdadm-4.1.ebuild | 94 ---
 2 files changed, 96 deletions(-)

diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index d352735ae923..961f422d5fb6 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -1,4 +1,2 @@
-DIST mdadm-4.1.tar.xz 440756 BLAKE2B 
df0506d937c2aa309d7c68804f66f7dcd51783288594bf746832311c64b8cf82004af4af5f246c5f9753f1de324ff7d49b5ee752d6a00ec03864f7885389706e
 SHA512 
0859c5d3e786345d93ff2c3b291ca8866ba60f1375479e5b4d343124f6824140a8268d42b8ae603b069edba761aa30aaf20d49e9ec54dfcbad34bad3bea0e433
 DIST mdadm-4.2.tar.xz 453624 BLAKE2B 
de7c4318dc5479de41378233869ab84ca2cd0e8a42310157b1acb969e7152af61556fbbe6f17bf6af4dfaf5543e49b1c982d2baeedf1c39b32f4db7f5502
 SHA512 
57897a2b7fb8b0b88bece50501099872bb45ddb076cfc323d563588096d2b66b1ecba3724534943f651ace2bfe591482570700616500dc3398552e4f9ff0c37d
-DIST mdadm_4.1-3.debian.tar.xz 89640 BLAKE2B 
3cb5e42dcbd218a71e55127cecda6f2594a1b1691e17c05f52a8cd0ba05b556d2812772e53d78de025738d7c2de059df3f878b8290ba3906b3d75ef435bfb698
 SHA512 
e9b04abf195d7bda9fb0197eb926c01a69b879ef82c72af6497116cea9be8f0823408dddbe5c6c033f5fae554a8fec17299e361fa48045e033c87dcee1a0bb63
 DIST mdadm_4.2~rc2-7.debian.tar.xz 89904 BLAKE2B 
dd04f2dd044d0bca85920eaf5c79a288d69c47a7ad7e36509a126c01ef63bd045d7e0530450650028de39d74ad852995ca080c3a73dbcb1cf1b3783118109f35
 SHA512 
3d36533d2713b663606919b2bfec18b15e18a6a0194e333e38e4a58f175da96af7b1fe16f0c36ee148e14492a4e0710b9fad6ac7856495b63c0176ebb7333be6

diff --git a/sys-fs/mdadm/mdadm-4.1.ebuild b/sys-fs/mdadm/mdadm-4.1.ebuild
deleted file mode 100644
index 21649c23547f..
--- a/sys-fs/mdadm/mdadm-4.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic multilib systemd toolchain-funcs udev
-
-DESCRIPTION="Tool for running RAID systems - replacement for the raidtools"
-HOMEPAGE="https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/;
-DEB_PF="4.1-3"
-SRC_URI="https://www.kernel.org/pub/linux/utils/raid/mdadm/${P/_/-}.tar.xz
-   mirror://debian/pool/main/m/mdadm/${PN}_${DEB_PF}.debian.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="static"
-
-BDEPEND="virtual/pkgconfig
-   app-arch/xz-utils"
-RDEPEND=">=sys-apps/util-linux-2.16"
-DEPEND="${RDEPEND}"
-
-# The tests edit values in /proc and run tests on software raid devices.
-# Thus, they shouldn't be run on systems with active software RAID devices.
-RESTRICT="test"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.4-sysmacros.patch #580188
-)
-
-mdadm_emake() {
-   # We should probably make corosync & libdlm into USE flags. #573782
-   local args=(
-   PKG_CONFIG="$(tc-getPKG_CONFIG)"
-   CC="$(tc-getCC)"
-   CWFLAGS="-Wall"
-   CXFLAGS="${CFLAGS}"
-   UDEVDIR="$(get_udevdir)"
-   SYSTEMD_DIR="$(systemd_get_systemunitdir)"
-   COROSYNC="-DNO_COROSYNC"
-   DLM="-DNO_DLM"
-
-   # https://bugs.gentoo.org/732276
-   STRIP=
-
-   "$@"
-   )
-   emake "${args[@]}"
-}
-
-src_compile() {
-   use static && append-ldflags -static
-   mdadm_emake all
-}
-
-src_test() {
-   mdadm_emake test
-
-   sh ./test || die
-}
-
-src_install() {
-   mdadm_emake DESTDIR="${D}" install install-systemd
-   dodoc ChangeLog INSTALL TODO README* ANNOUNCE-*
-
-   insinto /etc
-   newins mdadm.conf-example mdadm.conf
-   newinitd "${FILESDIR}"/mdadm.rc mdadm
-   newconfd "${FILESDIR}"/mdadm.confd mdadm
-   newinitd "${FILESDIR}"/mdraid.rc mdraid
-   newconfd "${FILESDIR}"/mdraid.confd mdraid
-
-   # From the Debian patchset
-   into /usr
-   dodoc "${WORKDIR}"/debian/README.checkarray
-   dosbin "${WORKDIR}"/debian/checkarray
-   insinto /etc/default
-   newins "${FILESDIR}"/etc-default-mdadm mdadm
-
-   exeinto /etc/cron.weekly
-   newexe "${FILESDIR}"/mdadm.weekly mdadm
-}
-
-pkg_postinst() {
-   if ! systemd_is_booted; t

[gentoo-commits] repo/gentoo:master commit in: sys-fs/mdadm/files/, sys-fs/mdadm/

2024-02-19 Thread Robin H. Johnson
commit: b0152d3ed507c45608377046bc2f65a48b47ec10
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Feb 19 20:32:53 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Feb 19 21:00:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0152d3e

sys-fs/mdadm: improve mdmonitor on systemd

Signed-off-by: Robin H. Johnson  gentoo.org>
Closes: https://bugs.gentoo.org/628968

 sys-fs/mdadm/files/mdadm-4.2-mdadm_env.patch |  36 ++
 sys-fs/mdadm/mdadm-4.2-r3.ebuild | 104 +++
 2 files changed, 140 insertions(+)

diff --git a/sys-fs/mdadm/files/mdadm-4.2-mdadm_env.patch 
b/sys-fs/mdadm/files/mdadm-4.2-mdadm_env.patch
new file mode 100644
index ..bd09da553820
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-4.2-mdadm_env.patch
@@ -0,0 +1,36 @@
+--- mdadm-4.2/systemd/SUSE-mdadm_env.sh2021-12-30 11:43:35.0 
-0800
 mdadm-4.2/systemd/SUSE-mdadm_env.sh2024-02-19 12:20:56.509632098 
-0800
+@@ -6,6 +7,12 @@
+ 
+ MDADM_SCAN="yes"
+ 
++# Gentoo: source conf.d
++mdadmd_CONFIG=/etc/conf.d/mdadm
++if test -r $mdadmd_CONFIG; then
++   . $mdadmd_CONFIG
++fi
++
+ # Following adapted from /etc/init.d/mdadmd on openSUSE
+ 
+ mdadmd_CONFIG=/etc/sysconfig/mdadm
+@@ -42,7 +49,8 @@
+ fi
+ 
+ mkdir -p /run/sysconfig
+-echo "MDADM_MONITOR_ARGS=$MDADM_RAIDDEVICES $MDADM_DELAY $MDADM_MAIL 
$MDADM_PROGRAM $MDADM_SCAN $MDADM_SEND_MAIL $MDADM_CONFIG" > 
/run/sysconfig/mdadm
++# Gentoo: added $MDADM_OPTS to the end.
++echo "MDADM_MONITOR_ARGS=$MDADM_RAIDDEVICES $MDADM_DELAY $MDADM_MAIL 
$MDADM_PROGRAM $MDADM_SCAN $MDADM_SEND_MAIL $MDADM_CONFIG $MDADM_OPTS" > 
/run/sysconfig/mdadm
+ if [ -n "$MDADM_CHECK_DURATION" ]; then
+  echo "MDADM_CHECK_DURATION=$MDADM_CHECK_DURATION" >> /run/sysconfig/mdadm
+ fi
+--- mdadm-4.2.orig/Makefile2024-02-19 12:27:19.512400849 -0800
 mdadm-4.2/Makefile 2024-02-19 12:27:39.517338433 -0800
+@@ -298,7 +298,7 @@
+  $(INSTALL) -D -m 755  .install.tmp.3 
$(DESTDIR)$(SYSTEMD_DIR)-shutdown/$$file ; \
+  rm -f .install.tmp.3; \
+   done
+-  if [ -f /etc/SuSE-release -o -n "$(SUSE)" ] ;then $(INSTALL) -D -m 755 
systemd/SUSE-mdadm_env.sh $(DESTDIR)$(LIB_DIR)/mdadm_env.sh ;fi
++  $(INSTALL) -D -m 755 systemd/SUSE-mdadm_env.sh 
$(DESTDIR)$(LIB_DIR)/mdadm_env.sh
+ 
+ install-bin: mdadm mdmon
+   $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm

diff --git a/sys-fs/mdadm/mdadm-4.2-r3.ebuild b/sys-fs/mdadm/mdadm-4.2-r3.ebuild
new file mode 100644
index ..0b2549330957
--- /dev/null
+++ b/sys-fs/mdadm/mdadm-4.2-r3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd toolchain-funcs udev
+
+DESCRIPTION="Tool for running RAID systems - replacement for the raidtools"
+HOMEPAGE="https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/;
+DEB_PF="4.2~rc2-7"
+SRC_URI="https://www.kernel.org/pub/linux/utils/raid/mdadm/${P/_/-}.tar.xz
+   mirror://debian/pool/main/m/mdadm/${PN}_${DEB_PF}.debian.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86"
+IUSE="static systemd +udev"
+
+REQUIRED_USE="static? ( !udev )"
+
+BDEPEND="app-arch/xz-utils
+   virtual/pkgconfig"
+DEPEND="udev? ( virtual/libudev:= )"
+RDEPEND="${DEPEND}
+   >=sys-apps/util-linux-2.16"
+
+# The tests edit values in /proc and run tests on software raid devices.
+# Thus, they shouldn't be run on systems with active software RAID devices.
+RESTRICT="test"
+
+PATCHES=(
+   "${FILESDIR}/${PN}"-3.4-sysmacros.patch #580188
+   "${FILESDIR}/${PN}"-4.2-in_initrd-collision.patch #830461
+   "${FILESDIR}/${PN}"-4.2-mdadm_env.patch #628968
+)
+
+mdadm_emake() {
+   # We should probably make corosync & libdlm into USE flags. #573782
+   local args=(
+   PKG_CONFIG="$(tc-getPKG_CONFIG)"
+   CC="$(tc-getCC)"
+   CWFLAGS="-Wall"
+   CXFLAGS="${CFLAGS}"
+   UDEVDIR="$(get_udevdir)"
+   SYSTEMD_DIR="$(systemd_get_systemunitdir)"
+   COROSYNC="-DNO_COROSYNC"
+   DLM="-DNO_DLM"
+
+   # https://bugs.gentoo.org/732276
+   STRIP=
+
+   "$@"
+   )
+   emake "${args[@]}"
+}
+
+src_compile() {
+   use static && append-ldflags -static
+
+   # CPPFLAGS won't work for this
+   use udev || append-cflags -DNO_LIBUDEV
+
+   mdadm

[gentoo-commits] repo/gentoo:master commit in: sys-fs/mdadm/

2024-02-19 Thread Robin H. Johnson
commit: 8e652d5963af48b187620ca32b1798bbffca52a9
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Feb 19 20:34:11 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Feb 19 21:00:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e652d59

sys-fs/mdadm: QA fix missing udev_reload

Signed-off-by: Robin H. Johnson  gentoo.org>
Closes: https://bugs.gentoo.org/851894

 sys-fs/mdadm/mdadm-4.2-r3.ebuild | 5 +
 1 file changed, 5 insertions(+)

diff --git a/sys-fs/mdadm/mdadm-4.2-r3.ebuild b/sys-fs/mdadm/mdadm-4.2-r3.ebuild
index 0b2549330957..176f5e80c06c 100644
--- a/sys-fs/mdadm/mdadm-4.2-r3.ebuild
+++ b/sys-fs/mdadm/mdadm-4.2-r3.ebuild
@@ -93,6 +93,7 @@ src_install() {
 }
 
 pkg_postinst() {
+   udev_reload
if ! systemd_is_booted; then
if [[ -z ${REPLACING_VERSIONS} ]] ; then
# Only inform people the first time they install.
@@ -102,3 +103,7 @@ pkg_postinst() {
fi
fi
 }
+
+pkg_postrm() {
+   udev_reload
+}



[gentoo-commits] proj/genkernel:master commit in: /

2024-02-16 Thread Robin H. Johnson
commit: 8f90911e1e4b622ee4c716f118b7021e291e90f1
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Feb 17 05:53:39 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Feb 17 05:53:39 2024 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8f90911e

doc: point to gitweb for old ChangeLog

Signed-off-by: Robin H. Johnson  gentoo.org>

 HACKING | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/HACKING b/HACKING
index 62bbd37..19aa5f9 100644
--- a/HACKING
+++ b/HACKING
@@ -42,3 +42,9 @@ Rolling a release:
 git shortlog ${PREV_TAG}..v${PV} | xsel
 
   to generate the mail body.
+
+Changes:
+Changelogs prior to 2012 are available in Changelog.old [1], removed from
+regular distribution in commit 4ec9886457a58330843f5c46a38e73fda9957410.
+
+[1] 
https://gitweb.gentoo.org/proj/genkernel.git/tree/ChangeLog.old?id=71507545eec3031ade9b4f9a314c53216f2c97f2



[gentoo-commits] proj/genkernel:master commit in: /

2024-02-16 Thread Robin H. Johnson
commit: 96e15a9bc9c9462f7eb5986bb77e155ca92dd797
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Feb 17 05:55:17 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Feb 17 05:55:17 2024 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=96e15a9b

build: fix manpage install

Signed-off-by: Robin H. Johnson  gentoo.org>

 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5f8e031..1e20ef5 100644
--- a/Makefile
+++ b/Makefile
@@ -216,7 +216,7 @@ install: all
 
install $(BUILD_DIR)/software.sh 
$(DESTDIR)/$(PREFIX)/share/genkernel/defaults
 
-   install -d $(DESTDIR)/$(MANDIR)
+   install -d $(DESTDIR)/$(MANDIR)/man8
install $(BUILD_DIR)/genkernel.8 $(DESTDIR)/$(MANDIR)/man8
 
 # No trailing blank lines please.



[gentoo-commits] proj/genkernel:master commit in: /

2024-02-16 Thread Robin H. Johnson
commit: 5e5966d0b507fbb2cb96fe8ff5083101e72360e6
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Feb 17 05:14:32 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Feb 17 05:14:32 2024 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5e5966d0

build: merge Modernize Makefile

Closes: https://github.com/gentoo/genkernel/pull/56
Thanks: Timothy Kenno Handojo  gmail.com>
Signed-off-by: Robin H. Johnson  gentoo.org>

 Makefile | 136 ---
 defaults/software.sh |  68 +-
 2 files changed, 163 insertions(+), 41 deletions(-)



[gentoo-commits] proj/genkernel:master commit in: /

2024-02-16 Thread Robin H. Johnson
commit: 659f4d3e1f1f1299014999530f1b0840466d1fe8
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Feb 17 05:13:22 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Feb 17 05:13:22 2024 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=659f4d3e

build: fix whitespace

Signed-off-by: Robin H. Johnson  gentoo.org>

 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 44a09c1..5f8e031 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ FINAL_DEPS = genkernel.conf \
path_expander.py
 
 SOFTWARE = BCACHE_TOOLS \
-   BOOST \
+   BOOST \
BTRFS_PROGS \
BUSYBOX \
COREUTILS \
@@ -219,3 +219,5 @@ install: all
install -d $(DESTDIR)/$(MANDIR)
install $(BUILD_DIR)/genkernel.8 $(DESTDIR)/$(MANDIR)/man8
 
+# No trailing blank lines please.
+# vim:ft=make:



[gentoo-commits] proj/genkernel:master commit in: /

2024-02-16 Thread Robin H. Johnson
commit: 2be65fba58bd62ab62288bdffcd5029cdc2ecb2a
Author: Timothy Kenno Handojo  gmail  com>
AuthorDate: Thu Feb 15 12:01:50 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Feb 17 05:11:26 2024 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2be65fba

corrected variable issues in make install

Signed-off-by: Robin H. Johnson  gentoo.org>

 Makefile | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 4b13597..44a09c1 100644
--- a/Makefile
+++ b/Makefile
@@ -175,10 +175,10 @@ verify-shellscripts-initramfs:
 $(BUILD_DIR)/build-config:
 # $(addprefix $(BUILD_DIR)/temp/,$(TEMPFILES))
install -d $(BUILD_DIR)
-   echo ${PREFIX} > $(BUILD_DIR)/PREFIX
-   echo ${BINDIR} > $(BUILD_DIR)/BINDIR
-   echo ${SYSCONFDIR} > $(BUILD_DIR)/SYSCONFDIR
-   echo ${MANDIR} > $(BUILD_DIR)/MANDIR
+   echo $(PREFIX) > $(BUILD_DIR)/PREFIX
+   echo $(BINDIR) > $(BUILD_DIR)/BINDIR
+   echo $(SYSCONFDIR) > $(BUILD_DIR)/SYSCONFDIR
+   echo $(MANDIR) > $(BUILD_DIR)/MANDIR
touch $(BUILD_DIR)/build-config
 
 $(BUILD_DIR)/software.sh:
@@ -197,11 +197,11 @@ $(BUILD_DIR)/genkernel: $(addprefix 
$(BUILD_DIR)/,$(FINAL_DEPS)) $(BUILD_DIR)/so
 
 SHARE_DIRS = arch defaults gkbuilds modules netboot patches worker_modules
 
-install: PREFIX := $(file <$(BUILD_DIR)/PREFIX)
-install: BINDIR := $(file <$(BUILD_DIR)/BINDIR)
-install: SYSCONFDIR := $(file <$(BUILD_DIR)/SYSCONFDIR)
-install: MANDIR := $(file <$(BUILD_DIR)/MANDIR)
 install: all
+   $(eval PREFIX := $(file <$(BUILD_DIR)/PREFIX))
+   $(eval BINDIR := $(file <$(BUILD_DIR)/BINDIR))
+   $(eval SYSCONFDIR := $(file <$(BUILD_DIR)/SYSCONFDIR))
+   $(eval MANDIR := $(file <$(BUILD_DIR)/MANDIR))
install -d $(DESTDIR)/$(SYSCONFDIR)
install -m 644 $(BUILD_DIR)/genkernel.conf $(DESTDIR)/$(SYSCONFDIR)/
 



[gentoo-commits] proj/genkernel:master commit in: /

2024-02-16 Thread Robin H. Johnson
commit: f4bf289499f7d06a2a4a5f6d84ce7084075e2664
Author: Timothy Kenno Handojo  gmail  com>
AuthorDate: Thu Feb 15 10:00:47 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Feb 17 05:11:26 2024 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f4bf2894

ensure package version is on the manpage
- added package version on manpage generation
- added versioning on dist pkg generation
- remove manpage generation from dist

Signed-off-by: Robin H. Johnson  gentoo.org>

 Makefile | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 989edd3..4b13597 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,12 @@
 #PACKAGE_VERSION = $(shell /bin/grep -F -- GK_V= genkernel | sed 
"s/.*GK_V='\([^']\+\)'/\1/")
+PACKAGE_VERSION = $(file  $(distdir)/VERSION
git ls-files -z | xargs -0 cp --no-dereference --parents 
--target-directory="$(distdir)" \
$(EXTRA_DIST)
tar cf "$(distdir)".tar "$(distdir)"
@@ -124,7 +129,8 @@ distclean: clean
 
 $(BUILD_DIR)/%.8: doc/%.8.txt doc/asciidoc.conf Makefile 
$(BUILD_DIR)/doc/genkernel.8.txt
a2x --conf-file=doc/asciidoc.conf \
---format=manpage -D $(BUILD_DIR) "$(BUILD_DIR)/$<"
+   --format=manpage -D $(BUILD_DIR) 
--attribute="genkernelversion=$(PACKAGE_VERSION)" \
+   "$(BUILD_DIR)/$<"
 
 verify-doc: doc/genkernel.8.txt
@rm -f faildoc ; \



[gentoo-commits] proj/genkernel:master commit in: /

2024-02-16 Thread Robin H. Johnson
commit: 996770aa1c34b80929f9333fa9dc65cab58b9d85
Author: Timothy Kenno Handojo  gmail  com>
AuthorDate: Wed Feb 14 07:56:54 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Feb 17 05:11:26 2024 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=996770aa

address some feedback from robbat2

Signed-off-by: Robin H. Johnson  gentoo.org>

 Makefile | 32 
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index 7e90b60..3aa8215 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,8 @@ MANPAGE = genkernel.8
 # Add off-Git/generated files here that need to be shipped with releases
 EXTRA_DIST = $(MANPAGE) ChangeLog $(KCONF)
 
+default: all
+
 # First argument in the override file
 # Second argument is the base file
 BASE_KCONF = defaults/kernel-generic-config
@@ -15,24 +17,20 @@ KCONF = $(GENERATED_KCONF)
 BUILD_DIR = build
 
 FINAL_DEPS = genkernel.conf \
-   gen_cmdline.sh \
-   gen_initramfs.sh \
-   gen_determineargs.sh \
gen_arch.sh \
gen_bootloader.sh \
+   gen_cmdline.sh \
gen_compile.sh \
gen_configkernel.sh \
+   gen_determineargs.sh \
gen_funcs.sh \
+   gen_initramfs.sh \
gen_moddeps.sh \
gen_package.sh \
gen_worker.sh \
path_expander.py
 
-SOFTWARE = BCACHE_TOOLS BOOST BTRFS_PROGS BUSYBOX COREUTILS CRYPTSETUP \
-   DMRAID DROPBEAR EUDEV EXPAT E2FSPROGS FUSE GPG \
-   HWIDS ISCSI JSON_C KMOD LIBAIO LIBGCRYPT LIBGPGERROR LIBXCRYPT LVM \
-   LZO MDADM MULTIPATH_TOOLS POPT STRACE THIN_PROVISIONING_TOOLS 
UNIONFS_FUSE \
-   USERSPACE_RCU UTIL_LINUX XFSPROGS XZ ZLIB ZSTD
+SOFTWARE = BCACHE_TOOLS BOOST BTRFS_PROGS BUSYBOX COREUTILS CRYPTSETUP DMRAID 
DROPBEAR EUDEV EXPAT E2FSPROGS FUSE GPG HWIDS ISCSI JSON_C KMOD LIBAIO 
LIBGCRYPT LIBGPGERROR LIBXCRYPT LVM LZO MDADM MULTIPATH_TOOLS POPT STRACE 
THIN_PROVISIONING_TOOLS UNIONFS_FUSE USERSPACE_RCU UTIL_LINUX XFSPROGS XZ ZLIB 
ZSTD
 
 SOFTWARE_VERSION = $(foreach entry, $(SOFTWARE), 
"VERSION_$(entry)=${VERSION_$(entry)}\n")
 
@@ -149,15 +147,15 @@ $(BUILD_DIR)/software.sh:
cat $(BUILD_DIR)/temp/versions defaults/software.sh > 
$(BUILD_DIR)/software.sh
 
 $(BUILD_DIR)/doc/genkernel.8.txt:
-   install -d $(BUILD_DIR)/doc/
-   cp doc/genkernel.8.txt $(BUILD_DIR)/doc/genkernel.8.txt
+   install -D doc/genkernel.8.txt $(BUILD_DIR)/doc/genkernel.8.txt
 
 $(BUILD_DIR)/%: %
-   install -d $(BUILD_DIR)/
-   cp $< $@
+   install -D $< $@
 
 $(BUILD_DIR)/genkernel: $(addprefix $(BUILD_DIR)/,$(FINAL_DEPS)) 
$(BUILD_DIR)/software.sh
-   cp genkernel $(BUILD_DIR)/genkernel
+   install genkernel $(BUILD_DIR)/genkernel
+
+SHARE_DIRS = arch defaults gkbuilds modules netboot patches worker_modules
 
 install: PREFIX := $(file <$(BUILD_DIR)/PREFIX)
 install: BINDIR := $(file <$(BUILD_DIR)/BINDIR)
@@ -172,13 +170,7 @@ install: all
 
install -d $(DESTDIR)/$(PREFIX)/share/genkernel
 
-   cp -rp arch $(DESTDIR)/$(PREFIX)/share/genkernel/
-   cp -rp defaults $(DESTDIR)/$(PREFIX)/share/genkernel/
-   cp -rp gkbuilds $(DESTDIR)/$(PREFIX)/share/genkernel/
-   cp -rp modules $(DESTDIR)/$(PREFIX)/share/genkernel/
-   cp -rp netboot $(DESTDIR)/$(PREFIX)/share/genkernel/
-   cp -rp patches $(DESTDIR)/$(PREFIX)/share/genkernel/
-   cp -rp worker_modules $(DESTDIR)/$(PREFIX)/share/genkernel/
+   cp -ra $(SHARE_DIRS) $(DESTDIR)/$(PREFIX)/share/genkernel/
 
install -m 755 -t $(DESTDIR)/$(PREFIX)/share/genkernel $(addprefix 
$(BUILD_DIR)/,$(FINAL_DEPS))
 



[gentoo-commits] proj/genkernel:master commit in: /

2024-02-16 Thread Robin H. Johnson
commit: c67369899c1df965f4b08d738022e2f56ced416c
Author: Timothy Kenno Handojo  gmail  com>
AuthorDate: Thu Feb 15 07:34:45 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Feb 17 05:11:26 2024 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c6736989

updated the SOFTWARE list

Signed-off-by: Robin H. Johnson  gentoo.org>

 Makefile | 36 +++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3aa8215..989edd3 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,41 @@ FINAL_DEPS = genkernel.conf \
gen_worker.sh \
path_expander.py
 
-SOFTWARE = BCACHE_TOOLS BOOST BTRFS_PROGS BUSYBOX COREUTILS CRYPTSETUP DMRAID 
DROPBEAR EUDEV EXPAT E2FSPROGS FUSE GPG HWIDS ISCSI JSON_C KMOD LIBAIO 
LIBGCRYPT LIBGPGERROR LIBXCRYPT LVM LZO MDADM MULTIPATH_TOOLS POPT STRACE 
THIN_PROVISIONING_TOOLS UNIONFS_FUSE USERSPACE_RCU UTIL_LINUX XFSPROGS XZ ZLIB 
ZSTD
+SOFTWARE = BCACHE_TOOLS \
+   BOOST \
+   BTRFS_PROGS \
+   BUSYBOX \
+   COREUTILS \
+   CRYPTSETUP \
+   DMRAID \
+   DROPBEAR \
+   EUDEV \
+   EXPAT \
+   E2FSPROGS \
+   FUSE \
+   GPG \
+   HWIDS \
+   ISCSI \
+   JSON_C \
+   KMOD \
+   LIBAIO \
+   LIBGCRYPT \
+   LIBGPGERROR \
+   LIBXCRYPT \
+   LVM \
+   LZO \
+   MDADM \
+   MULTIPATH_TOOLS \
+   POPT \
+   STRACE \
+   THIN_PROVISIONING_TOOLS \
+   UNIONFS_FUSE \
+   USERSPACE_RCU \
+   UTIL_LINUX \
+   XFSPROGS \
+   XZ \
+   ZLIB \
+   ZSTD
 
 SOFTWARE_VERSION = $(foreach entry, $(SOFTWARE), 
"VERSION_$(entry)=${VERSION_$(entry)}\n")
 



[gentoo-commits] proj/genkernel:master commit in: defaults/

2024-02-16 Thread Robin H. Johnson
commit: 5efa00417c425043c393542011ab256f88488cbc
Author: Timothy Kenno Handojo  gmail  com>
AuthorDate: Tue Jan 30 06:45:19 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Feb 17 05:11:26 2024 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5efa0041

updated software.sh

Signed-off-by: Robin H. Johnson  gentoo.org>

 defaults/software.sh | 68 ++--
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/defaults/software.sh b/defaults/software.sh
index b893f06..01c504b 100644
--- a/defaults/software.sh
+++ b/defaults/software.sh
@@ -10,14 +10,14 @@
 #   originate from user changes to /etc/genkernel.conf .
 
 GKPKG_BCACHE_TOOLS_PN="bcache-tools"
-GKPKG_BCACHE_TOOLS_PV="${GKPKG_BCACHE_TOOLS_PV:-VERSION_BCACHE_TOOLS}"
+GKPKG_BCACHE_TOOLS_PV="${GKPKG_BCACHE_TOOLS_PV:-${VERSION_BCACHE_TOOLS}}"
 GKPKG_BCACHE_TOOLS_DEPS="util-linux eudev"
 
GKPKG_BCACHE_TOOLS_SRCTAR="${GKPKG_BCACHE_TOOLS_SRCTAR:-${DISTDIR}/bcache-tools-${GKPKG_BCACHE_TOOLS_PV}.tar.gz}"
 
GKPKG_BCACHE_TOOLS_SRCDIR="${GKPKG_BCACHE_TOOLS_SRCDIR:-bcache-tools-399021549984ad27bf4a13ae85e458833fe003d7}"
 
GKPKG_BCACHE_TOOLS_BINPKG="${GKPKG_BCACHE_TOOLS_BINPKG:-%%CACHE%%/bcache-tools-${GKPKG_BCACHE_TOOLS_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_BOOST_PN="boost"
-GKPKG_BOOST_PV="${GKPKG_BOOST_PV:-VERSION_BOOST}"
+GKPKG_BOOST_PV="${GKPKG_BOOST_PV:-${VERSION_BOOST}}"
 GKPKG_BOOST_DEPS="boost-build"
 
GKPKG_BOOST_SRCTAR="${GKPKG_BOOST_SRCTAR:-${DISTDIR}/boost_${GKPKG_BOOST_PV//./_}.tar.bz2}"
 GKPKG_BOOST_SRCDIR="${GKPKG_BOOST_SRCDIR:-boost_${GKPKG_BOOST_PV//./_}}"
@@ -31,98 +31,98 @@ GKPKG_BOOST_BUILD_SRCDIR="${GKPKG_BOOST_SRCDIR}"
 
GKPKG_BOOST_BUILD_BINPKG="${GKPKG_BOOST_BUILD_BINPKG:-%%CACHE%%/boost-build-${GKPKG_BOOST_BUILD_PV}.tar.xz}"
 
 GKPKG_BTRFS_PROGS_PN="btrfs-progs"
-GKPKG_BTRFS_PROGS_PV="${GKPKG_BTRFS_PROGS_PV:-VERSION_BTRFS_PROGS}"
+GKPKG_BTRFS_PROGS_PV="${GKPKG_BTRFS_PROGS_PV:-${VERSION_BTRFS_PROGS}}"
 GKPKG_BTRFS_PROGS_DEPS="util-linux zlib zstd lzo eudev"
 
GKPKG_BTRFS_PROGS_SRCTAR="${GKPKG_BTRFS_PROGS_SRCTAR:-${DISTDIR}/btrfs-progs-v${GKPKG_BTRFS_PROGS_PV}.tar.xz}"
 
GKPKG_BTRFS_PROGS_SRCDIR="${GKPKG_BTRFS_PROGS_SRCDIR:-btrfs-progs-v${GKPKG_BTRFS_PROGS_PV}}"
 
GKPKG_BTRFS_PROGS_BINPKG="${GKPKG_BTRFS_PROGS_BINPKG:-%%CACHE%%/btrfs-progs-${GKPKG_BTRFS_PROGS_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_BUSYBOX_PN="busybox"
-GKPKG_BUSYBOX_PV="${GKPKG_BUSYBOX_PV:-VERSION_BUSYBOX}"
+GKPKG_BUSYBOX_PV="${GKPKG_BUSYBOX_PV:-${VERSION_BUSYBOX}}"
 GKPKG_BUSYBOX_DEPS="libxcrypt"
 
GKPKG_BUSYBOX_SRCTAR="${GKPKG_BUSYBOX_SRCTAR:-${DISTDIR}/busybox-${GKPKG_BUSYBOX_PV}.tar.bz2}"
 GKPKG_BUSYBOX_SRCDIR="${GKPKG_BUSYBOX_SRCDIR:-busybox-${GKPKG_BUSYBOX_PV}}"
 
GKPKG_BUSYBOX_BINPKG="${GKPKG_BUSYBOX_BINPKG:-%%CACHE%%/busybox-${GKPKG_BUSYBOX_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_COREUTILS_PN="coreutils"
-GKPKG_COREUTILS_PV="${GKPKG_COREUTILS_PV:-VERSION_COREUTILS}"
+GKPKG_COREUTILS_PV="${GKPKG_COREUTILS_PV:-${VERSION_COREUTILS}}"
 GKPKG_COREUTILS_DEPS=""
 
GKPKG_COREUTILS_SRCTAR="${GKPKG_COREUTILS_SRCTAR:-${DISTDIR}/coreutils-${GKPKG_COREUTILS_PV}.tar.xz}"
 
GKPKG_COREUTILS_SRCDIR="${GKPKG_COREUTILS_SRCDIR:-coreutils-${GKPKG_COREUTILS_PV}}"
 
GKPKG_COREUTILS_BINPKG="${GKPKG_COREUTILS_BINPKG:-%%CACHE%%/coreutils-${GKPKG_COREUTILS_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_CRYPTSETUP_PN="cryptsetup"
-GKPKG_CRYPTSETUP_PV="${GKPKG_CRYPTSETUP_PV:-VERSION_CRYPTSETUP}"
+GKPKG_CRYPTSETUP_PV="${GKPKG_CRYPTSETUP_PV:-${VERSION_CRYPTSETUP}}"
 GKPKG_CRYPTSETUP_DEPS="util-linux eudev json-c popt libgpg-error libgcrypt lvm"
 
GKPKG_CRYPTSETUP_SRCTAR="${GKPKG_CRYPTSETUP_SRCTAR:-${DISTDIR}/cryptsetup-${GKPKG_CRYPTSETUP_PV}.tar.xz}"
 
GKPKG_CRYPTSETUP_SRCDIR="${GKPKG_CRYPTSETUP_SRCDIR:-cryptsetup-${GKPKG_CRYPTSETUP_PV}}"
 
GKPKG_CRYPTSETUP_BINPKG="${GKPKG_CRYPTSETUP_BINPKG:-%%CACHE%%/cryptsetup-${GKPKG_CRYPTSETUP_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_DMRAID_PN="dmraid"
-GKPKG_DMRAID_PV="${GKPKG_DMRAID_PV:-VERSION_DMRAID}"
+GKPKG_DMRAID_PV="${GKPKG_DMRAID_PV:-${VERSION_DMRAID}}"
 GKPKG_DMRAID_DEPS="eudev lvm"
 
GKPKG_DMRAID_SRCTAR="${GKPKG_DMRAID_SRCTAR:-${DISTDIR}/dmraid-${GKPKG_DMRAID_PV}.tar.bz2}"
 GKPKG_DMRAID_SRCDIR="${GKPKG_DMRAID_SRCDIR:-dmraid/${GKPKG_DMRAID_PV}/dmraid}"
 
GKPKG_DMRAID_BINPKG="${GKPKG_DMRAID_BINPKG:-%%CACHE%%/dmraid-${GKPKG_DMRAID_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_DROPBEAR_PN="dropbear"
-GKPKG_DROPBEAR_PV="${GKPKG_DROPBEAR_PV:-VERSION_DROPBEAR}"
+GKPKG_DROPBEAR_PV="${GKPKG_DR

[gentoo-commits] proj/genkernel:master commit in: /

2024-02-16 Thread Robin H. Johnson
commit: c235b05a93283ee47b56887cc7ca72790e1ff8bd
Author: Timothy Kenno Handojo  gmail  com>
AuthorDate: Tue Jan 30 06:31:02 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Feb 17 05:11:25 2024 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c235b05a

modernize makefile

Signed-off-by: Robin H. Johnson  gentoo.org>

 Makefile | 102 ++-
 1 file changed, 95 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 92d1278..7e90b60 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,6 @@ MANPAGE = genkernel.8
 # Add off-Git/generated files here that need to be shipped with releases
 EXTRA_DIST = $(MANPAGE) ChangeLog $(KCONF)
 
-default: kconfig man
-
 # First argument in the override file
 # Second argument is the base file
 BASE_KCONF = defaults/kernel-generic-config
@@ -14,18 +12,54 @@ ARCH_KCONF = $(wildcard arch/*/arch-config)
 GENERATED_KCONF = $(subst arch-,generated-,$(ARCH_KCONF))
 KCONF = $(GENERATED_KCONF)
 
+BUILD_DIR = build
+
+FINAL_DEPS = genkernel.conf \
+   gen_cmdline.sh \
+   gen_initramfs.sh \
+   gen_determineargs.sh \
+   gen_arch.sh \
+   gen_bootloader.sh \
+   gen_compile.sh \
+   gen_configkernel.sh \
+   gen_funcs.sh \
+   gen_moddeps.sh \
+   gen_package.sh \
+   gen_worker.sh \
+   path_expander.py
+
+SOFTWARE = BCACHE_TOOLS BOOST BTRFS_PROGS BUSYBOX COREUTILS CRYPTSETUP \
+   DMRAID DROPBEAR EUDEV EXPAT E2FSPROGS FUSE GPG \
+   HWIDS ISCSI JSON_C KMOD LIBAIO LIBGCRYPT LIBGPGERROR LIBXCRYPT LVM \
+   LZO MDADM MULTIPATH_TOOLS POPT STRACE THIN_PROVISIONING_TOOLS 
UNIONFS_FUSE \
+   USERSPACE_RCU UTIL_LINUX XFSPROGS XZ ZLIB ZSTD
+
+SOFTWARE_VERSION = $(foreach entry, $(SOFTWARE), 
"VERSION_$(entry)=${VERSION_$(entry)}\n")
+
+PREFIX = /usr/local
+BINDIR = $(PREFIX)/bin
+ifeq ($(PREFIX), /usr)
+   SYSCONFDIR = /etc
+else
+   SYSCONFDIR = $(PREFIX)/etc
+endif
+MANDIR = $(PREFIX)/share/man
+
+all: $(BUILD_DIR)/genkernel $(BUILD_DIR)/build-config man kconfig
+
 debug:
@echo "ARCH_KCONF=$(ARCH_KCONF)"
@echo "GENERATED_KCONF=$(GENERATED_KCONF)"
 
 kconfig: $(GENERATED_KCONF)
-man: $(MANPAGE)
+man: $(addprefix $(BUILD_DIR)/,$(MANPAGE))
 
 ChangeLog:
git log >$@
 
 clean:
rm -f $(EXTRA_DIST)
+   rm -rf $(BUILD_DIR)
 
 check-git-repository:
 ifneq ($(UNCLEAN),1)
@@ -46,7 +80,7 @@ dist: verify-shellscripts-initramfs verify-doc 
check-git-repository distclean $(
 distclean: clean
rm -Rf "$(distdir)" "$(distdir)".tar "$(distdir)".tar.xz
 
-.PHONY: clean check-git-repository dist distclean kconfig verify-doc
+.PHONY: clean check-git-repository dist distclean kconfig verify-doc install
 
 # Generic rules
 %/generated-config: %/arch-config $(BASE_KCONF) merge.pl Makefile
@@ -56,9 +90,9 @@ distclean: clean
perl merge.pl $< $(BASE_KCONF) | sort > $@ ; \
fi ;
 
-%.8: doc/%.8.txt doc/asciidoc.conf Makefile genkernel
-   a2x --conf-file=doc/asciidoc.conf 
--attribute="genkernelversion=$(PACKAGE_VERSION)" \
---format=manpage -D . "$<"
+$(BUILD_DIR)/%.8: doc/%.8.txt doc/asciidoc.conf Makefile 
$(BUILD_DIR)/doc/genkernel.8.txt
+   a2x --conf-file=doc/asciidoc.conf \
+--format=manpage -D $(BUILD_DIR) "$(BUILD_DIR)/$<"
 
 verify-doc: doc/genkernel.8.txt
@rm -f faildoc ; \
@@ -99,3 +133,57 @@ verify-shellscripts-initramfs:
--severity error \
defaults/linuxrc \
defaults/initrd.scripts
+
+$(BUILD_DIR)/build-config:
+# $(addprefix $(BUILD_DIR)/temp/,$(TEMPFILES))
+   install -d $(BUILD_DIR)
+   echo ${PREFIX} > $(BUILD_DIR)/PREFIX
+   echo ${BINDIR} > $(BUILD_DIR)/BINDIR
+   echo ${SYSCONFDIR} > $(BUILD_DIR)/SYSCONFDIR
+   echo ${MANDIR} > $(BUILD_DIR)/MANDIR
+   touch $(BUILD_DIR)/build-config
+
+$(BUILD_DIR)/software.sh:
+   install -d $(BUILD_DIR)/temp/
+   echo -e $(SOFTWARE_VERSION) > $(BUILD_DIR)/temp/versions
+   cat $(BUILD_DIR)/temp/versions defaults/software.sh > 
$(BUILD_DIR)/software.sh
+
+$(BUILD_DIR)/doc/genkernel.8.txt:
+   install -d $(BUILD_DIR)/doc/
+   cp doc/genkernel.8.txt $(BUILD_DIR)/doc/genkernel.8.txt
+
+$(BUILD_DIR)/%: %
+   install -d $(BUILD_DIR)/
+   cp $< $@
+
+$(BUILD_DIR)/genkernel: $(addprefix $(BUILD_DIR)/,$(FINAL_DEPS)) 
$(BUILD_DIR)/software.sh
+   cp genkernel $(BUILD_DIR)/genkernel
+
+install: PREFIX := $(file <$(BUILD_DIR)/PREFIX)
+install: BINDIR := $(file <$(BUILD_DIR)/BINDIR)
+install: SYSCONFDIR := $(file <$(BUILD_DIR)/SYSCONFDIR)
+install: MANDIR := $(file <$(BUILD_DIR)/MANDIR)
+install: all
+   install -d $(DESTDIR)/$(SYSCONFDIR)
+   install -m 644 $(BUILD_DIR)/genkernel.conf $(DESTDIR)/$(SYSCONFDIR)/
+
+

[gentoo-commits] proj/rbot-bugzilla:master commit in: /

2024-02-10 Thread Robin H. Johnson
commit: 242113aa6a719477ddf8246ed9a6104f2b7b9d63
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Feb 10 19:22:07 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Feb 10 19:22:07 2024 +
URL:https://gitweb.gentoo.org/proj/rbot-bugzilla.git/commit/?id=242113aa

fix: missing field

Signed-off-by: Robin H. Johnson  gentoo.org>

 bugzilla.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bugzilla.rb b/bugzilla.rb
index a4d88f5..8af205a 100644
--- a/bugzilla.rb
+++ b/bugzilla.rb
@@ -566,7 +566,7 @@ class BugzillaPlugin < Plugin
 # bug aliases can contain
 # 0-9, a-z, A-Z
 # and then every punctuation except ","
-m.scan(MESSAGE_RE).each do |bug_comment|
+m.message.scan(MESSAGE_RE).each do |bug_comment|
   bugno = bug_comment[0]
   comment = bug_comment[1] || ""
   bugno.gsub!(/^#/,'')



[gentoo-commits] proj/rbot-bugzilla:master commit in: /

2024-02-10 Thread Robin H. Johnson
commit: 0b0ca1a283eb592a08974ae7bb00d33a600a5ceb
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Feb 10 19:13:03 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Feb 10 19:13:03 2024 +
URL:https://gitweb.gentoo.org/proj/rbot-bugzilla.git/commit/?id=0b0ca1a2

fix: variable naming error

Signed-off-by: Robin H. Johnson  gentoo.org>

 bugzilla.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bugzilla.rb b/bugzilla.rb
index 5000e4a..a4d88f5 100644
--- a/bugzilla.rb
+++ b/bugzilla.rb
@@ -546,6 +546,7 @@ class BugzillaPlugin < Plugin
   # This function is used to check if an user requested bug
   # information inline in the text of a message rather than directly
   # to the bot.
+  MESSAGE_RE = 
/\bbug(?:[[:space:]]*)(?:#?([0-9]+|#[-[:alnum:]~`!@#$%^&*()_+={}\]\[\\\/|:;\'"<>.?]{3,40}))(?:(?:#c|
 comment #?)([0-9]+))?/i
   def listen(m)
 return if m.address?
 return unless lurk?(m)
@@ -565,8 +566,7 @@ class BugzillaPlugin < Plugin
 # bug aliases can contain
 # 0-9, a-z, A-Z
 # and then every punctuation except ","
-message_re = 
/\bbug(?:[[:space:]]*)(?:#?([0-9]+|#[-[:alnum:]~`!@#$%^&*()_+={}\]\[\\\/|:;\'"<>.?]{3,40}))(?:(?:#c|
 comment #?)([0-9]+))?/i
-message.scan(message_re).each do |bug_comment|
+m.scan(MESSAGE_RE).each do |bug_comment|
   bugno = bug_comment[0]
   comment = bug_comment[1] || ""
   bugno.gsub!(/^#/,'')



[gentoo-commits] proj/rbot-bugzilla:master commit in: /

2024-02-09 Thread Robin H. Johnson
commit: 18a4ab9ac73695a7e55bc4b17b428967629f5104
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Feb 10 05:30:18 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Feb 10 05:30:18 2024 +
URL:https://gitweb.gentoo.org/proj/rbot-bugzilla.git/commit/?id=18a4ab9a

fix: cannot compare string and int

Signed-off-by: Robin H. Johnson  gentoo.org>

 bugzilla.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bugzilla.rb b/bugzilla.rb
index ed23915..5000e4a 100644
--- a/bugzilla.rb
+++ b/bugzilla.rb
@@ -214,7 +214,7 @@ class BugzillaPlugin < Plugin
 end
 
 def max_announce
-  @registry["zilla.#{name}.max_announce"] || 5
+  @registry["zilla.#{name}.max_announce"]&.to_i || 5
 end
 
 def max_announce=(val)
@@ -429,7 +429,7 @@ class BugzillaPlugin < Plugin
 
   buglist = search(recent_url)
   buglist.delete_at(0)
-  upper_bound = [buglist.size, max_announce].min
+  upper_bound = [buglist.size, max_announce&.to_i].min
 
   if (buglist.size > upper_bound)
 first_skip = buglist[0][0].to_i



[gentoo-commits] proj/rbot-bugzilla:master commit in: /

2024-02-09 Thread Robin H. Johnson
commit: 68f157e15941877f5a16d233c2815421c5493653
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Fri Feb  9 19:43:59 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Fri Feb  9 19:44:39 2024 +
URL:https://gitweb.gentoo.org/proj/rbot-bugzilla.git/commit/?id=68f157e1

feat: report how many bugs get skipped and make it configurable

Signed-off-by: Robin H. Johnson  gentoo.org>

 bugzilla.rb | 32 
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/bugzilla.rb b/bugzilla.rb
index a1f0e6a..ed23915 100644
--- a/bugzilla.rb
+++ b/bugzilla.rb
@@ -34,7 +34,7 @@ VALID_RESO  = ['FIXED', 'INVALID', 'WONTFIX', 'LATER', 
'REMIND', 'DUPLICATE', 'W
 
 # Each zilla instance may have these parameters
 # TODO: Add 'nicename' that is used for output to IRC. Defaults to 
name.capitialize
-OPTIONS = [ 'name', 'baseurl', 'dataurl', 'showbugurl', 'reporturl', 
'buglisturl', 'template' ]
+OPTIONS = [ 'name', 'baseurl', 'dataurl', 'showbugurl', 'reporturl', 
'buglisturl', 'template', 'max_announce' ]
 
 # Now life gets fun, these are regular expresses to check the above arrays
 _STATUS_INPUT = (DONE_STATUS+OPEN_STATUS+['ALL']).uniq.join('|')
@@ -100,7 +100,7 @@ class BugzillaPlugin < Plugin
   "Bug ##{@bugno} not found in #{@zilla}"
 end
   end
-  
+
   # Exception class for bugs that are security-locked
   # It is thrown when the XML document does not contain either a 
   # or  element that is recognised.
@@ -213,6 +213,14 @@ class BugzillaPlugin < Plugin
   @template = @registry["zilla.#{name}.template"] = val
 end
 
+def max_announce
+  @registry["zilla.#{name}.max_announce"] || 5
+end
+
+def max_announce=(val)
+  @registry["zilla.#{name}.max_announce"] = val
+end
+
 def lastseenid
   return @registry["zilla.#{name}.lastseenid"]
 end
@@ -314,7 +322,7 @@ class BugzillaPlugin < Plugin
 
   @client = nil
 end
-  
+
 # TODO: Promote EMAIL_REPLACEMENTS to a config hash instead, with a nice
 # large set of defaults.
 EMAIL_REPLACEMENTS = { 'gentoo.org' => 'g.o', 'gentooexperimental.org' => 
'ge.o' }
@@ -421,16 +429,24 @@ class BugzillaPlugin < Plugin
 
   buglist = search(recent_url)
   buglist.delete_at(0)
-  upper_bound = [buglist.size, 5].min
+  upper_bound = [buglist.size, max_announce].min
+
+  if (buglist.size > upper_bound)
+first_skip = buglist[0][0].to_i
+last_skip = buglist[-(upper_bound+1)][0].to_i
+@registry["zilla.#{@name}.announcements"].each do |chan|
+  @bot.say chan, "(too many new bugs, skipping Bug IDs 
#{first_skip}..#{last_skip})"
+end
+self.lastseenid = last_skip
+  end
+
   buglist[-upper_bound..-1].each do |bug|
 bugsummary = summary(bug[0])
-
 @registry["zilla.#{@name}.announcements"].each do |chan|
   @bot.say chan, "New bug: #{bugsummary}"
 end
+self.lastseenid = bug[0].to_i
   end
-
-  self.lastseenid = buglist[-1][0].to_i if buglist.size > 0
 end
 
 def search(urlparams, params = nil)
@@ -549,7 +565,7 @@ class BugzillaPlugin < Plugin
 # bug aliases can contain
 # 0-9, a-z, A-Z
 # and then every punctuation except ","
-message_re = 
/\bbug(?:[[:space:]]*)(?:#?([0-9]+|#[-[:alnum:]~`!@#$%^&*()_+={}\]\[\\/|:;\'"<>.?]{3,40}))(?:(?:#c|
 comment #?)([0-9]+))?/i
+message_re = 
/\bbug(?:[[:space:]]*)(?:#?([0-9]+|#[-[:alnum:]~`!@#$%^&*()_+={}\]\[\\\/|:;\'"<>.?]{3,40}))(?:(?:#c|
 comment #?)([0-9]+))?/i
 message.scan(message_re).each do |bug_comment|
   bugno = bug_comment[0]
   comment = bug_comment[1] || ""



[gentoo-commits] repo/gentoo:master commit in: net-nds/nsscache/

2024-01-31 Thread Robin H. Johnson
commit: 61869d38dc6718e9ab3a79c8ff5f08600551f2f9
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Thu Feb  1 06:38:33 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Thu Feb  1 07:54:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61869d38

net-nds/nsscache: QA fixes

Bug: https://bugs.gentoo.org/923061
Signed-off-by: Robin H. Johnson  gentoo.org>

 net-nds/nsscache/nsscache-0.49.ebuild | 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/net-nds/nsscache/nsscache-0.49.ebuild 
b/net-nds/nsscache/nsscache-0.49.ebuild
index 2674e1db5d26..7c9dfe0b027a 100644
--- a/net-nds/nsscache/nsscache-0.49.ebuild
+++ b/net-nds/nsscache/nsscache-0.49.ebuild
@@ -58,8 +58,7 @@ python_prepare_all() {
 }
 
 python_compile() {
-   # Yes, tell setup.py to be verbose
-   distutils-r1_python_compile --verbose
+   distutils-r1_python_compile
 }
 
 python_install() {
@@ -69,13 +68,15 @@ python_install() {
python_doexe examples/authorized-keys-command.py
 
# Do not install the tests as functional source.
-   find "${D}" \
-   -path '*/site-packages/nss_cache/*' \( \
-   -iname '*_test.py*' \
-   -o -iname '*_test.*.py*' \
-   \) \
-   -delete \
-   || die "find failed"
+   # Subject to some debate, see bug 923061
+   # To be raised on gentoo-dev 2024/02/01
+   #find "${D}" \
+   #   -path '*/site-packages/nss_cache/*' \( \
+   #   -iname '*_test.py*' \
+   #   -o -iname '*_test.*.py*' \
+   #   \) \
+   #   -delete \
+   #|| die "find failed"
 }
 
 python_install_all() {



[gentoo-commits] repo/gentoo:master commit in: net-nds/nsscache/

2024-01-30 Thread Robin H. Johnson
commit: 2a1b5b12cae92e28d456ede0ff394e98b3ac3b48
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Tue Jan 30 08:22:51 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Tue Jan 30 08:23:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a1b5b12

net-nds/nsscache: QA fixes

Signed-off-by: Robin H. Johnson  gentoo.org>
Reference: https://bugs.gentoo.org/923061

 net-nds/nsscache/nsscache-0.49.ebuild | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/net-nds/nsscache/nsscache-0.49.ebuild 
b/net-nds/nsscache/nsscache-0.49.ebuild
index 90f77100fc73..2674e1db5d26 100644
--- a/net-nds/nsscache/nsscache-0.49.ebuild
+++ b/net-nds/nsscache/nsscache-0.49.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
@@ -12,21 +12,22 @@ DESCRIPTION="commandline tool to sync directory services to 
local cache"
 HOMEPAGE="https://github.com/google/nsscache;
 SRC_URI="https://github.com/google/nsscache/archive/version/${PV}.tar.gz -> 
${P}.tar.gz"
 
-LICENSE="GPL-2"
+# upstream *sources* say "or later", but upstream metadata does not include the
+# 'or later' clause.
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nsscache s3 test"
 
-# testing requires local network (e.g. spin up slapd, httpd)
-#PROPERTIES="test_network"
-#RESTRICT="test"
-
 # Optional extras:
 # TODO: gcs? ( https://pypi.org/project/google-cloud-storage/ )
 #
 # Testing:
 # *unit* tests do not require networking.
 # *integration* tests require openldap's slapd and networking
+#
+# The ebuild runs the unit testing explicitly, as upstream uses Docker to run
+# the integration tests.
 RDEPEND="
nsscache? ( >=sys-auth/libnss-cache-0.10 )
>=dev-python/python-ldap-3.4[${PYTHON_USEDEP}]
@@ -35,11 +36,13 @@ RDEPEND="
 DEPEND="${RDEPEND}
dev-python/packaging[${PYTHON_USEDEP}]
test? (
-   dev-python/pytest-cov[${PYTHON_USEDEP}]
+   dev-python/pytest[${PYTHON_USEDEP}]
)"
 
 S="${WORKDIR}/${PN}-version-${PV}"
 
+distutils_enable_tests pytest
+
 python_prepare_all() {
# nsscache.conf is example only, and should be installed in docs.
# Default config tries $PREFIX/config/nsscache.conf
@@ -55,6 +58,7 @@ python_prepare_all() {
 }
 
 python_compile() {
+   # Yes, tell setup.py to be verbose
distutils-r1_python_compile --verbose
 }
 
@@ -70,10 +74,8 @@ python_install() {
-iname '*_test.py*' \
-o -iname '*_test.*.py*' \
\) \
-   -delete
-
-   # Ignore any exit code from find.
-   return 0
+   -delete \
+   || die "find failed"
 }
 
 python_install_all() {
@@ -84,5 +86,3 @@ python_install_all() {
 
keepdir /var/lib/nsscache
 }
-
-distutils_enable_tests pytest



[gentoo-commits] repo/gentoo:master commit in: app-crypt/gnupg/

2024-01-28 Thread Robin H. Johnson
commit: 3169869c36db352a79b60deebe0dc67c68b408ae
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Jan 28 23:26:51 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Jan 28 23:28:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3169869c

app-crypt/gnupg: bump

Signed-off-by: Robin H. Johnson  gentoo.org>

 app-crypt/gnupg/Manifest   |   2 +
 app-crypt/gnupg/gnupg-2.4.4.ebuild | 198 +
 2 files changed, 200 insertions(+)

diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 2a6a68880c4d..9af56207f15c 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -6,3 +6,5 @@ DIST gnupg-2.4.2.tar.bz2 7346587 BLAKE2B 
7a5aecca25d87f5f531576c8db1629908d97381
 DIST gnupg-2.4.2.tar.bz2.sig 119 BLAKE2B 
da10bc6d93e5bd96572d6e03b99595eb3f3a5e2e53767a235f9e28878a294e6f444c5cee3a44579f6593582e5c4d85e99e963f2eb7ad2d64aa3a54136c39ffef
 SHA512 
d08cb718a8656efb922f2591ec295e678687fe5f3a26459498952d28f4eea4f8368ea896c2908f58e3d3d8ea49faf865a1c146dda1b24f15bf8d37dce3eac868
 DIST gnupg-2.4.3.tar.bz2 7351327 BLAKE2B 
b7f4f5e548ec6dfc89cf8792f507ee8642e8500692998cf8d2edc9f5d8002904d24a714b9caffabee6094707c4595e0f54197535135622a7a32aa772f5818f28
 SHA512 
193a9398445272ec3eb5b79e802efb7414f74bcfffc3db0bf72c0056e04228120c419ed91db168e5733a16a33e548bab5368dd9cf11ecd483825bce189341a1e
 DIST gnupg-2.4.3.tar.bz2.sig 119 BLAKE2B 
763c0569e5378e132de39e1583c19bae8912455bf7cd5a65bcfc88fa43be99fb6bbf8397192b3086db2f6f0f63fc25789f5e6ce98b2fe63cda3bf673b1c60a20
 SHA512 
7a694d194c3befdfc865a7872c0883304ea704e3691eac328d802f12f4f82c2a93eaa1257d3e09b38494b38185f5b8cf35c964f0c3846bbb29b93727ffee
+DIST gnupg-2.4.4.tar.bz2 7886036 BLAKE2B 
02661e89f0358be09fa3e71e7235b764a7dbda62a48a0c8c7a4e6c9919c3b37d54ead50b930af58f8f2fdb87861b849d3f3751e95cbedf46bdfd76caa90c4db4
 SHA512 
3d1a3b08d1ce2319d238d8be96591e418ede1dc0b4ede33a4cc2fe40e9c56d5bbc27b1984736d8a786e7f292ddbc836846a8bdb4bf89f064e953c37cb54b94ef
+DIST gnupg-2.4.4.tar.bz2.sig 237 BLAKE2B 
6ee5878c36fbec747a6d84a268903749d862aab50dd7f9a389aabbf7b94dec1c424615f520b5f4a6d44e02093e8d9ad0b08d0c6cf6fd8886d8c174ce9faac99c
 SHA512 
3ae7b6833576df851901a7619459b514bb82faeed350c864a57a782719d21f694d9ced5a3445c81dfa584a0302f87fedc660b08ea97bb8b861e76d7c5b46d07f

diff --git a/app-crypt/gnupg/gnupg-2.4.4.ebuild 
b/app-crypt/gnupg/gnupg-2.4.4.ebuild
new file mode 100644
index ..f01cb0b88152
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.4.4.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainers should:
+# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/
+# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159
+# (find the one for the current release then subscribe to it +
+# any subsequent ones linked within so you're covered for a while.)
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc
+# in-source builds are not supported: https://dev.gnupg.org/T6313#166339
+inherit flag-o-matic out-of-source multiprocessing systemd toolchain-funcs 
verify-sig
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="https://gnupg.org/;
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools 
usb user-socket wks-server"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( tofu )"
+
+# Existence of executables is checked during configuration.
+# Note: On each bump, update dep bounds on each version from configure.ac!
+DEPEND="
+   >=dev-libs/libassuan-2.5.0
+   >=dev-libs/libgcrypt-1.9.1:=
+   >=dev-libs/libgpg-error-1.46
+   >=dev-libs/libksba-1.6.3
+   >=dev-libs/npth-1.2
+   >=net-misc/curl-7.10
+   sys-libs/zlib
+   bzip2? ( app-arch/bzip2 )
+   ldap? ( net-nds/openldap:= )
+   readline? ( sys-libs/readline:0= )
+   smartcard? ( usb? ( virtual/libusb:1 ) )
+   tofu? ( >=dev-db/sqlite-3.27 )
+   tpm? ( >=app-crypt/tpm2-tss-2.4.0:= )
+   ssl? ( >=net-libs/gnutls-3.2:0= )
+"
+RDEPEND="
+   ${DEPEND}
+   nls? ( virtual/libintl )
+   selinux? ( sec-policy/selinux-gpg )
+   wks-server? ( virtual/mta )
+"
+PDEPEND="
+   app-crypt/pinentry
+"
+BDEPEND="
+   virtual/pkgconfig
+   doc? ( sys-apps/texinfo )
+   nls? ( sys-devel/gettext )
+   veri

[gentoo-commits] repo/gentoo:master commit in: net-nds/nsscache/

2024-01-27 Thread Robin H. Johnson
commit: 854aa3695b55ac48d199e269e0029d0c68363e86
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Jan 27 19:27:56 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Jan 27 19:31:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=854aa369

net-nds/nsscache: bump, passes tests on py3.10..12

Signed-off-by: Robin H. Johnson  gentoo.org>

 net-nds/nsscache/Manifest|  4 +-
 net-nds/nsscache/nsscache-0.39-r1.ebuild | 66 
 net-nds/nsscache/nsscache-0.47.ebuild| 72 --
 net-nds/nsscache/nsscache-0.49.ebuild| 88 
 4 files changed, 89 insertions(+), 141 deletions(-)

diff --git a/net-nds/nsscache/Manifest b/net-nds/nsscache/Manifest
index e7b222c0c8a1..f86151e1c237 100644
--- a/net-nds/nsscache/Manifest
+++ b/net-nds/nsscache/Manifest
@@ -1,3 +1 @@
-DIST nsscache-0.30-r3-gentoo-authorized-keys-command.py 11974 BLAKE2B 
4272bab8d85ef0f39c8b26fd035009d3c77dd629fd7853e0072232393d329af1885ce44c4877d7718a37154661d9c85bb1f5276463875f9dfbbd023106d9d15a
 SHA512 
b660a6ae19e6e42efbb07d0a368704706b0a0bd1bf0b2c84855f0d1c00d4cda80872432f5a25384d0c27e99bf60072beb12975bcfa0201b52fa040d0e6bc2da2
-DIST nsscache-0.39.tar.gz 127896 BLAKE2B 
8383ca53ee5cf2f84e4485722d35598b624005bb32073696a23daa1061c0b057d26333cdee9c97cedcb99daa8c61362719d80b01b216c163a327cd4edeabeefd
 SHA512 
f93cec949302f21bc5989ab3192302a32349ee4ae98e2f05f169cca8a16a821f39857cb0fff52c7b54552828684b4723d22e44f97525a01577ab89bd159e0376
-DIST nsscache-0.47.tar.gz 126225 BLAKE2B 
f238d4a6565038420dee7359edadf348a0e5fb581b8238b23d3835cc10ad9676917bfa6573c6a1d462d7afee36398954744ff2d498b4c1ed3459666b3aa6ad5c
 SHA512 
94cd9a62169146f1e10f78476a950dfc708b6c2063cffed3617bbfa9c43aaf134b1f038a94079df408e168877d32f07b64b61f048d34fed283828cc75e7dd2cf
+DIST nsscache-0.49.tar.gz 128598 BLAKE2B 
2d0c9c2818f7dbab44bd4fd17b7e1dceb3f1a236c18c96be4cc5dcf8329c748c0b1f8dc0f462e186458b3ede380ebc408fe56bfe21bc5aa8720a15122f90cec6
 SHA512 
941f6fcb8f52294f910dcf8e1aaf7f07bf83e7812d9325a709248c49013b46a959c6abdbaafd161ddcef96525d02aa939c68c9548841a6b66b94417f86b67527

diff --git a/net-nds/nsscache/nsscache-0.39-r1.ebuild 
b/net-nds/nsscache/nsscache-0.39-r1.ebuild
deleted file mode 100644
index f486563ad771..
--- a/net-nds/nsscache/nsscache-0.39-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_10 )
-
-inherit distutils-r1
-
-DESCRIPTION="commandline tool to sync directory services to local cache"
-HOMEPAGE="https://github.com/google/nsscache;
-SCRIPT_A='nsscache-0.30-r3-gentoo-authorized-keys-command.py'
-SRC_URI="
-   https://github.com/google/nsscache/archive/version/${PV}.tar.gz -> 
${P}.tar.gz
-   https://dev.gentoo.org/~robbat2/${SCRIPT_A};
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="berkdb nsscache s3"
-RESTRICT="test" # requires network
-
-DEPEND="
-   dev-python/ldap3[${PYTHON_USEDEP}]
-   dev-python/pycurl[${PYTHON_USEDEP}]
-   berkdb? ( dev-python/bsddb3[${PYTHON_USEDEP}] )
-   s3? ( dev-python/boto3[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}
-   nsscache? ( >=sys-auth/libnss-cache-0.10 )"
-
-S="${WORKDIR}/${PN}-version-${PV}"
-
-python_prepare_all() {
-   sed -i \
-   -e "/setup_requires/s,'pytest-runner',,g" \
-   -e '/tests_require/s,\[.*\],[],g' \
-   setup.py || die
-   sed -i \
-   -e '/test=pytest/d' \
-   setup.cfg || die
-   sed -i \
-   -e '/pytest/d' \
-   requirements.txt || die
-
-   distutils-r1_python_prepare_all
-}
-
-python_compile() {
-   distutils-r1_python_compile --verbose
-}
-
-python_install() {
-   distutils-r1_python_install
-
-   python_scriptinto /usr/libexec/nsscache
-   python_newexe "${DISTDIR}"/"${SCRIPT_A}" authorized-keys-command.py
-}
-
-python_install_all() {
-   distutils-r1_python_install_all
-
-   doman nsscache.1 nsscache.conf.5
-   dodoc THANKS nsscache.cron CONTRIBUTING.md README.md
-
-   keepdir /var/lib/nsscache
-}

diff --git a/net-nds/nsscache/nsscache-0.47.ebuild 
b/net-nds/nsscache/nsscache-0.47.ebuild
deleted file mode 100644
index e399b4dd7a00..
--- a/net-nds/nsscache/nsscache-0.47.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_10 )
-
-inherit distutils-r1
-
-DESCRIPTION="commandline tool to sync directory services to local cache"
-HOMEPAGE="https://github.com/google/nsscache;
-SCRIPT_A='nsscache-0.30-r3-gentoo-authorized-keys-command.py'
-SRC_URI="

[gentoo-commits] repo/gentoo:master commit in: profiles/

2024-01-27 Thread Robin H. Johnson
commit: bcad624bb9f381fae9bceb6dc17a89656b0beae8
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Jan 27 19:30:52 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Jan 27 19:31:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcad624b

profiles/package.mask: unmask net-nds/nsscache, fixed

Signed-off-by: Robin H. Johnson  gentoo.org>
Closes: https://bugs.gentoo.org/897136
Closes: https://bugs.gentoo.org/910013

 profiles/package.mask | 8 
 1 file changed, 8 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 27a07985071f..396069539a02 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -55,14 +55,6 @@ mail-filter/libsrs_alt
 # Removal on 2024-02-24
 sys-kernel/installkernel-systemd
 
-# Michał Górny  (2024-01-24)
-# No support for Python 3.11+.  No PEP517.  Tests are not enabled.
-# The current keyworded version is from 2019.  It was bumped in 2022
-# but it has not been keyworded since (pending "testing").
-# Depends on unmaintained dev-python/bsddb3.
-# Removal on 2024-02-23.  Bug #897136.
-net-nds/nsscache
-
 # Michał Górny  (2024-01-24)
 # Unmaintained, tests fail, requires discontinued dev-python/bsddb3.
 # No commits since 2022.  No reverse dependencies.



[gentoo-commits] repo/gentoo:master commit in: dev-vcs/gitolite-gentoo/

2024-01-21 Thread Robin H. Johnson
commit: ec0f6839bb4b2b67dfbedf7b22b32be511cd5d60
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Jan 21 20:43:28 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Jan 21 20:44:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec0f6839

dev-vcs/gitolite-gentoo: bump, refresh contrib, docs

Signed-off-by: Robin H. Johnson  gentoo.org>

 dev-vcs/gitolite-gentoo/Manifest   |  2 +-
 ...6.13.ebuild => gitolite-gentoo-3.6.13.1.ebuild} | 22 --
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/dev-vcs/gitolite-gentoo/Manifest b/dev-vcs/gitolite-gentoo/Manifest
index 4dbab14ebce8..727b582f51ab 100644
--- a/dev-vcs/gitolite-gentoo/Manifest
+++ b/dev-vcs/gitolite-gentoo/Manifest
@@ -1,3 +1,3 @@
 DIST 5df2b817255ee919991da6c310239e08c8fcc1ae.patch 4115 BLAKE2B 
8f364eba7a1f3788ae6aacb76946d9cf963609ac3e6f093eedf4d5e17467eba0ceb88b5b4bbf3acc72ec17e6626f52836805ac07f6044d7712efcb499d0237ff
 SHA512 
5098a82c860370edeec7c41cb71d0f10e6c03b3d1996f163e882d84ea64903d64e866bb67af45380f658870e2715cc805155380c96994854847b06a6db3e111d
-DIST gitolite-gentoo-3.6.13.tar.bz2 169403 BLAKE2B 
9eb628b92845a4ea5f36dce6b092568a70ceca8f6623854173f7d855502316aa77d458fb85e170f4c91d24167a3bc4ae9fd366a6c3925af3d42f1f597912f830
 SHA512 
6cf000750b652337ec728b23e1801fe8acc01cb8da9929cf797c3bbacc0246104a39ce204c2558e76ce1d3eda37fe4b15ef665827a8330745fc54bc193367bbc
+DIST gitolite-gentoo-3.6.13.1.tar.bz2 168862 BLAKE2B 
39619ca8d02e91320f19aa33e32cfcaf9d64519fe63b8389cec459adbe07aa816685a19ebe4d138ae251438f085c6f5e2ee97cc8e984ce716d12269e18ad9240
 SHA512 
8e250e8d71a3494564cda062a9ef3618b90f2643f0d868989ae3930ddd076a776d78ad058fadd1373d0efc281d5608512df6ebe49de30c59c4c661961f436610
 DIST gitolite-gentoo-3.6.6.1.tar.bz2 155262 BLAKE2B 
3dfa89223824ea04be6c0598abad3c6fb982c0031507aa2ab4ad8ecb9cfc5b64846e48f1710cf4436b4947d2f7288398b2603ac8f9a732902cf17a9a168e6b3d
 SHA512 
76765972b06e985879bd3384be62e4b57676d0d67e6d55b56a63a2d802fe3ee76576e0da20896f11764a311dfcde0bfaf4309105ddc8c55c0c09bb098ed6a1bb

diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.13.ebuild 
b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.13.1.ebuild
similarity index 85%
rename from dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.13.ebuild
rename to dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.13.1.ebuild
index 17962475c774..3b9c695dafa0 100644
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.13.ebuild
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.13.1.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="selinux tools vim-syntax"
+IUSE="selinux vim-syntax"
 
 DEPEND="
dev-lang/perl
@@ -31,7 +31,7 @@ RDEPEND="
${DEPEND}
acct-group/git
acct-user/git[gitolite]
-   >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
+   >=dev-perl/Net-SSH-AuthorizedKeysFile-0.180.0-r3
dev-perl/JSON
!dev-vcs/gitolite
vim-syntax? ( app-vim/gitolite-syntax )
@@ -53,10 +53,13 @@ src_install() {
insinto $VENDOR_LIB
doins -r src/lib/Gitolite
 
-   dodoc README.markdown CHANGELOG
+   dodoc README.Gentoo README.markdown CHANGELOG
# These are meant by upstream as examples, you are strongly recommended 
to
# customize them for your needs.
-   dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+   docinto utils
+   dodoc -r contrib/utils/*
+   docinto lib
+   dodoc -r contrib/lib/*
 
insopts -m0755
insinto $uexec
@@ -74,12 +77,11 @@ src_install() {
dosym ../libexec/${PN}/${bin} /usr/bin/${bin}
done
 
-   if use tools; then
-   dobin check-g2-compat convert-gitosis-conf
-   dobin contrib/utils/rc-format-v3.4
-   fi
-
-   fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+   # This is meant as an example only, contains code comment "THIS IS DEMO
+   # CODE"; but upstream has it outside of contrib.
+   docinto VREF
+   dodoc src/VREF/MERGE-CHECK
+   rm -f "${D}"/"${uexec}"/VREF/MERGE-CHECK
 }
 
 pkg_postinst() {



[gentoo-commits] repo/gentoo:master commit in: dev-vcs/gitolite-gentoo/

2024-01-20 Thread Robin H. Johnson
commit: 165a79c55b9ee9292882d73567f20b2b98e542c7
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Jan 21 05:11:05 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Jan 21 05:11:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=165a79c5

dev-vcs/gitolite-gentoo: bump

Signed-off-by: Robin H. Johnson  gentoo.org>

 dev-vcs/gitolite-gentoo/Manifest   |  1 +
 ...-gentoo-3.6.6.1-r3.ebuild => gitolite-gentoo-3.6.13.ebuild} | 10 +++---
 dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r3.ebuild  |  4 +---
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/dev-vcs/gitolite-gentoo/Manifest b/dev-vcs/gitolite-gentoo/Manifest
index 4ad47a5f51f8..4dbab14ebce8 100644
--- a/dev-vcs/gitolite-gentoo/Manifest
+++ b/dev-vcs/gitolite-gentoo/Manifest
@@ -1,2 +1,3 @@
 DIST 5df2b817255ee919991da6c310239e08c8fcc1ae.patch 4115 BLAKE2B 
8f364eba7a1f3788ae6aacb76946d9cf963609ac3e6f093eedf4d5e17467eba0ceb88b5b4bbf3acc72ec17e6626f52836805ac07f6044d7712efcb499d0237ff
 SHA512 
5098a82c860370edeec7c41cb71d0f10e6c03b3d1996f163e882d84ea64903d64e866bb67af45380f658870e2715cc805155380c96994854847b06a6db3e111d
+DIST gitolite-gentoo-3.6.13.tar.bz2 169403 BLAKE2B 
9eb628b92845a4ea5f36dce6b092568a70ceca8f6623854173f7d855502316aa77d458fb85e170f4c91d24167a3bc4ae9fd366a6c3925af3d42f1f597912f830
 SHA512 
6cf000750b652337ec728b23e1801fe8acc01cb8da9929cf797c3bbacc0246104a39ce204c2558e76ce1d3eda37fe4b15ef665827a8330745fc54bc193367bbc
 DIST gitolite-gentoo-3.6.6.1.tar.bz2 155262 BLAKE2B 
3dfa89223824ea04be6c0598abad3c6fb982c0031507aa2ab4ad8ecb9cfc5b64846e48f1710cf4436b4947d2f7288398b2603ac8f9a732902cf17a9a168e6b3d
 SHA512 
76765972b06e985879bd3384be62e4b57676d0d67e6d55b56a63a2d802fe3ee76576e0da20896f11764a311dfcde0bfaf4309105ddc8c55c0c09bb098ed6a1bb

diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r3.ebuild 
b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.13.ebuild
similarity index 90%
copy from dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r3.ebuild
copy to dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.13.ebuild
index 9904c1756019..17962475c774 100644
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r3.ebuild
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.13.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=7
@@ -13,11 +13,8 @@ DESCRIPTION="Highly flexible server for git directory 
version tracker, Gentoo fo
 HOMEPAGE="https://cgit.gentoo.org/fork/gitolite-gentoo.git/;
 
 if [[ ${PV} != * ]]; then
-   SRC_URI="mirror://gentoo/${P}.tar.bz2"
-   SRC_URI+=" 
https://github.com/sitaramc/gitolite/commit/5df2b817255ee919991da6c310239e08c8fcc1ae.patch;
-   KEYWORDS="amd64 x86"
-else
-   SRC_URI=""
+   SRC_URI="http://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2;
+   KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2"
@@ -42,7 +39,6 @@ RDEPEND="
 "
 
 PATCHES=(
-   "${DISTDIR}"/5df2b817255ee919991da6c310239e08c8fcc1ae.patch
 )
 
 src_prepare() {

diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r3.ebuild 
b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r3.ebuild
index 9904c1756019..6df3b7931720 100644
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r3.ebuild
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r3.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=7
@@ -16,8 +16,6 @@ if [[ ${PV} != * ]]; then
SRC_URI="mirror://gentoo/${P}.tar.bz2"
SRC_URI+=" 
https://github.com/sitaramc/gitolite/commit/5df2b817255ee919991da6c310239e08c8fcc1ae.patch;
KEYWORDS="amd64 x86"
-else
-   SRC_URI=""
 fi
 
 LICENSE="GPL-2"



[gentoo-commits] repo/gentoo:master commit in: dev-libs/cjose/

2024-01-15 Thread Robin H. Johnson
commit: 30ff00b8615478e9a2ca01cf11cb7aa147a99019
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Jan 15 18:04:03 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Jan 15 18:04:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30ff00b8

dev-libs/cjose: update {app-doc → app-text}/doxygen

Signed-off-by: Robin H. Johnson  gentoo.org>

 dev-libs/cjose/cjose-0.6.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/cjose/cjose-0.6.2.2.ebuild 
b/dev-libs/cjose/cjose-0.6.2.2.ebuild
index 8e203e264c0f..f211079aa3ad 100644
--- a/dev-libs/cjose/cjose-0.6.2.2.ebuild
+++ b/dev-libs/cjose/cjose-0.6.2.2.ebuild
@@ -22,7 +22,7 @@ RDEPEND=">=dev-libs/jansson-2.11:=
 DEPEND="${RDEPEND}"
 BDEPEND="
virtual/pkgconfig
-   doc? ( >=app-doc/doxygen-1.8 )
+   doc? ( >=app-text/doxygen-1.8 )
test? ( >=dev-libs/check-0.9.4 )"
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: app-admin/puppet-lint/

2024-01-15 Thread Robin H. Johnson
commit: a402166b048669a0f3e574248b0298b5d0ccd158
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Jan  8 20:07:33 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Jan 15 17:41:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a402166b

app-admin/puppet-lint: bump, with patch to fix warnings that fire during every 
run

Signed-off-by: Robin H. Johnson  gentoo.org>

 app-admin/puppet-lint/Manifest |  2 ++
 app-admin/puppet-lint/puppet-lint-4.2.3.ebuild | 39 ++
 2 files changed, 41 insertions(+)

diff --git a/app-admin/puppet-lint/Manifest b/app-admin/puppet-lint/Manifest
index 35b4c1fc57c0..9b60d332f792 100644
--- a/app-admin/puppet-lint/Manifest
+++ b/app-admin/puppet-lint/Manifest
@@ -2,3 +2,5 @@ DIST puppet-lint-3.4.0.gem 83456 BLAKE2B 
fa6b274b3e6e84095fdaff6f024864dc301f0af
 DIST puppet-lint-4.0.0.gem 80896 BLAKE2B 
6e674deaec43c3b45e2c162ef3d09648bd3cdd589a3ae6ce92e21617633529705fef4c6c361c3c1f041a3d25d1a03079f2f97705c01199253661bc9355dc
 SHA512 
a23d316f60cb7d34c394bdaee0ad08070098d732210a92294a3d330cff7330aefe2be6bd9a60219d7538173c2f187c1ed427c6671a345f868286986164ea3a33
 DIST puppet-lint-4.2.1.gem 81920 BLAKE2B 
5e291e4c1743092be9935231280f04ce3affdc1d530180f26a6ace0535a15e11bc9b33dd89d8eeafb44ebc7cae16f2656e293a6e8e8fbc4fd2cfde896996d59a
 SHA512 
d39a287d3ae0ecbf27254c289e73918b62b50bbf8f44f51248e5e8042b194c32facd1215d7b24ab768714aeb9ae58647964bdc8b8b4650d1cebe6e2e749d782c
 DIST puppet-lint-4.2.2.gem 81920 BLAKE2B 
cad796866f323113a8c2aa5cf86b6187423f27186032ea76ebd1f158937c34f315d93de3d92b01acc0b160947b720bd987550c52aaa53a51f165396de776ec88
 SHA512 
e8a591e615db87dc2edc22fc4d53c03004e0227748896005d2252fab8b77193ecd30f9167702c6c4fd6551daaa0894789f3d9d50fb705eecaed4a22573a94afc
+DIST puppet-lint-4.2.3-pr181-fix-warnings.patch 5601 BLAKE2B 
a04fdf9d8627cc888924b4282a09e076d7e029eda008fc8da138a121a21e227cff45a54ddbe770a286a2a15e43d4402526a6201c805f6e574755a11a1d13d7d7
 SHA512 
15638f2d4a81c969aa77b51f2f147a1fba5544dd7e52f3127dc9949afaabbd161f815a22dc5091f19d3d16bc2be97bb50f455a3a67c503aff58e737288f80e49
+DIST puppet-lint-4.2.3.gem 81920 BLAKE2B 
ee98aaed336a4302c4d67d94c83f30f6fdfc92b483f39a2c096f00daff2f7caf54bfa11c4b8217648a0ca68c6c8da5a4a6f2d0cab8efb6e2d7e814155780
 SHA512 
2f2192a48ed460371092ce99755b8cde55526ed96ee72d2a5b7989f7df7afb6abce5d3e8e7a0dca577b199bb380935e8734a92a53248697bb7195091da4cb9f6

diff --git a/app-admin/puppet-lint/puppet-lint-4.2.3.ebuild 
b/app-admin/puppet-lint/puppet-lint-4.2.3.ebuild
new file mode 100644
index ..b57aa7a47bc0
--- /dev/null
+++ b/app-admin/puppet-lint/puppet-lint-4.2.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP="puppet-lint"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A linter for puppet DSL"
+HOMEPAGE="https://github.com/puppetlabs/puppet-lint;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCH_NAME="${PN}-4.2.3-pr181-fix-warnings.patch"
+SRC_URI+=" https://github.com/puppetlabs/puppet-lint/pull/181.patch -> 
${PATCH_NAME} "
+
+PATCHES=(
+   "${DISTDIR}/${PATCH_NAME}"
+)
+
+ruby_add_bdepend "test? (
+   dev-ruby/rspec-its:1
+   dev-ruby/rspec-collection_matchers:1
+   dev-ruby/rspec-json_expectations )"
+
+all_ruby_prepare() {
+   # Skip acceptance tests due to unpackages puppet_litmus which in turn
+   # has a number of unpackaged dependencies.
+   rm -rf spec/acceptance || die
+   rm -f spec/spec_helper_acceptance.rb || die
+}



[gentoo-commits] repo/gentoo:master commit in: app-admin/puppet-lint/

2024-01-15 Thread Robin H. Johnson
commit: 427ca40a4c43e6f3ec6b2e22ed6384add32b5056
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Jan  8 20:06:42 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Jan 15 17:41:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=427ca40a

app-admin/puppet-lint: upstream removed 5.0.0 release

Signed-off-by: Robin H. Johnson  gentoo.org>

 app-admin/puppet-lint/Manifest |  1 -
 app-admin/puppet-lint/puppet-lint-5.0.0.ebuild | 34 --
 2 files changed, 35 deletions(-)

diff --git a/app-admin/puppet-lint/Manifest b/app-admin/puppet-lint/Manifest
index d9af69a4fc54..35b4c1fc57c0 100644
--- a/app-admin/puppet-lint/Manifest
+++ b/app-admin/puppet-lint/Manifest
@@ -2,4 +2,3 @@ DIST puppet-lint-3.4.0.gem 83456 BLAKE2B 
fa6b274b3e6e84095fdaff6f024864dc301f0af
 DIST puppet-lint-4.0.0.gem 80896 BLAKE2B 
6e674deaec43c3b45e2c162ef3d09648bd3cdd589a3ae6ce92e21617633529705fef4c6c361c3c1f041a3d25d1a03079f2f97705c01199253661bc9355dc
 SHA512 
a23d316f60cb7d34c394bdaee0ad08070098d732210a92294a3d330cff7330aefe2be6bd9a60219d7538173c2f187c1ed427c6671a345f868286986164ea3a33
 DIST puppet-lint-4.2.1.gem 81920 BLAKE2B 
5e291e4c1743092be9935231280f04ce3affdc1d530180f26a6ace0535a15e11bc9b33dd89d8eeafb44ebc7cae16f2656e293a6e8e8fbc4fd2cfde896996d59a
 SHA512 
d39a287d3ae0ecbf27254c289e73918b62b50bbf8f44f51248e5e8042b194c32facd1215d7b24ab768714aeb9ae58647964bdc8b8b4650d1cebe6e2e749d782c
 DIST puppet-lint-4.2.2.gem 81920 BLAKE2B 
cad796866f323113a8c2aa5cf86b6187423f27186032ea76ebd1f158937c34f315d93de3d92b01acc0b160947b720bd987550c52aaa53a51f165396de776ec88
 SHA512 
e8a591e615db87dc2edc22fc4d53c03004e0227748896005d2252fab8b77193ecd30f9167702c6c4fd6551daaa0894789f3d9d50fb705eecaed4a22573a94afc
-DIST puppetlabs-puppet-lint-5.0.0.gem 81920 BLAKE2B 
6cef112f8ae507f0a0930d9cd65f1a2782209dc4cf0865e1ce79f6510bfb39395401eaa009f07ee16ec8c9c7a82f080aefbc6f260769ca488b775cdeb8ef3caf
 SHA512 
b4a2db67db1cc79437d03e99391c928089cb73ec60d719861b7ac3e7949d9bcee9b04c884b448539f07d5b9b845e14824cd0ac3299ecb46241cfbb09a954ad5a

diff --git a/app-admin/puppet-lint/puppet-lint-5.0.0.ebuild 
b/app-admin/puppet-lint/puppet-lint-5.0.0.ebuild
deleted file mode 100644
index 4ebc4a1c70fa..
--- a/app-admin/puppet-lint/puppet-lint-5.0.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP="puppet-lint"
-RUBY_FAKEGEM_NAME="puppetlabs-puppet-lint"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A linter for puppet DSL"
-HOMEPAGE="https://github.com/puppetlabs/puppet-lint;
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-ruby_add_bdepend "test? (
-   dev-ruby/rspec-its:1
-   dev-ruby/rspec-collection_matchers:1
-   dev-ruby/rspec-json_expectations )"
-
-all_ruby_prepare() {
-   # Skip acceptance tests due to unpackages puppet_litmus which in turn
-   # has a number of unpackaged dependencies.
-   rm -rf spec/acceptance || die
-   rm -f spec/spec_helper_acceptance.rb || die
-}



[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_auth_openidc/, www-apache/mod_auth_openidc/files/

2024-01-15 Thread Robin H. Johnson
commit: 67d5cfe247f9e13d41db5eb443796eb3ca65d06f
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Jan 15 17:37:51 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Jan 15 17:41:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67d5cfe2

www-apache/mod_auth_openidc: new package, move from infra overlay

Signed-off-by: Robin H. Johnson  gentoo.org>

 www-apache/mod_auth_openidc/Manifest   |  1 +
 .../files/10_mod_auth_openidc.conf |  4 ++
 www-apache/mod_auth_openidc/metadata.xml   | 18 ++
 .../mod_auth_openidc-2.4.14.4-r1.ebuild| 67 ++
 4 files changed, 90 insertions(+)

diff --git a/www-apache/mod_auth_openidc/Manifest 
b/www-apache/mod_auth_openidc/Manifest
new file mode 100644
index ..996d5dfef207
--- /dev/null
+++ b/www-apache/mod_auth_openidc/Manifest
@@ -0,0 +1 @@
+DIST mod_auth_openidc-2.4.14.4.tar.gz 632757 BLAKE2B 
e01df9c431df848c1773f8152d87b5efc183b016516718bbf5eff3de66d12c87396b649a06548b5f0e42a52d08baef9ced8cd4b79acfc1657b7427dab0c9c14d
 SHA512 
b7d61f15d48292f2a567653632f7d9df8b6cb54303d4de0c333c8122a32df8749e508a0abd5259ac7ca15da5b244eec1e1d21f62140720ddb1705ec289551984

diff --git a/www-apache/mod_auth_openidc/files/10_mod_auth_openidc.conf 
b/www-apache/mod_auth_openidc/files/10_mod_auth_openidc.conf
new file mode 100644
index ..0290c4cfc162
--- /dev/null
+++ b/www-apache/mod_auth_openidc/files/10_mod_auth_openidc.conf
@@ -0,0 +1,4 @@
+
+LoadModule auth_openidc_module modules/mod_auth_openidc.so
+# See /usr/share/doc/mod_auth_openidc-*/auth_openidc.conf for configuration 
options.
+

diff --git a/www-apache/mod_auth_openidc/metadata.xml 
b/www-apache/mod_auth_openidc/metadata.xml
new file mode 100644
index ..13dbd324eab0
--- /dev/null
+++ b/www-apache/mod_auth_openidc/metadata.xml
@@ -0,0 +1,18 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   robb...@gentoo.org
+   
+   
+   in...@gentoo.org
+   Gentoo Infrastructure Team
+   
+   
+   OpenIDC/mod_auth_openidc
+   
+   
+   Add support for the Redis caching via 
dev-libs/hiredis
+   Add support for brotli compressed data 
using app-arch/brotli
+   
+

diff --git a/www-apache/mod_auth_openidc/mod_auth_openidc-2.4.14.4-r1.ebuild 
b/www-apache/mod_auth_openidc/mod_auth_openidc-2.4.14.4-r1.ebuild
new file mode 100644
index ..4ab411903ee7
--- /dev/null
+++ b/www-apache/mod_auth_openidc/mod_auth_openidc-2.4.14.4-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+#
+
+EAPI=8
+
+inherit depend.apache apache-module autotools
+
+DESCRIPTION="OpenID Connect Relying Party implementation for Apache HTTP 
Server 2.x"
+HOMEPAGE="https://github.com/OpenIDC/mod_auth_openidc;
+SRC_URI="https://github.com/OpenIDC/mod_auth_openidc/releases/download/v${PV}/${P}.tar.gz;
+KEYWORDS="~amd64"
+IUSE="redis brotli"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+
+RDEPEND="net-misc/curl
+   brotli? ( app-arch/brotli:= )
+   sys-libs/zlib:=
+   dev-libs/openssl:=
+   dev-libs/apr
+   dev-libs/jansson:=
+   dev-libs/cjose
+   dev-libs/libpcre
+   redis? ( dev-libs/hiredis:= )
+   app-misc/jq"
+DEPEND="
+   ${RDEPEND}
+   virtual/pkgconfig"
+
+APACHE2_MOD_CONF="10_mod_auth_openidc"
+APACHE2_MOD_DEFINE="AUTH_OPENIDC"
+DOCFILES="README.md ChangeLog AUTHORS INSTALL auth_openidc.conf"
+
+need_apache2_4
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   ECONF_ARGS=(
+   $(use_with brotli)
+   $(use_with redis hiredis)
+   )
+   econf "${ECONF_ARGS[@]}"
+}
+
+src_compile() {
+   # Do not use apache-module_src_compile ; it does not compile properly
+   default
+}
+
+src_install() {
+   # Do not use apache-module_src_install ; it does not link properly
+   default
+
+   insinto "${APACHE_MODULES_CONFDIR}"
+   doins "${FILESDIR}/${APACHE2_MOD_CONF}.conf"
+   dodoc ${DOCFILES}
+}
+
+pkg_postinst() {
+   apache-module_pkg_postinst
+}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/cjose/

2024-01-15 Thread Robin H. Johnson
commit: 8b0ab7baa902af199cb17b6daecea314ae74679f
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Jan 15 17:34:42 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Jan 15 17:41:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b0ab7ba

dev-libs/cjose: new package, dep for www-apache/mod_auth_openidc

Signed-off-by: Robin H. Johnson  gentoo.org>

 dev-libs/cjose/Manifest |  1 +
 dev-libs/cjose/cjose-0.6.2.2.ebuild | 36 
 dev-libs/cjose/metadata.xml | 14 ++
 3 files changed, 51 insertions(+)

diff --git a/dev-libs/cjose/Manifest b/dev-libs/cjose/Manifest
new file mode 100644
index ..4fa7b26db7a8
--- /dev/null
+++ b/dev-libs/cjose/Manifest
@@ -0,0 +1 @@
+DIST cjose-0.6.2.2.tar.gz 498461 BLAKE2B 
4914019652f47ac12745cb3b8914f66cb41cb8da33f83735d866cac816dd8f6475d12fde4a6e3f58456c463cb7c6c6fdfeb4928c232f94e3fa6b1b4c8e5ef132
 SHA512 
71a087709816f0aac060a7c5f037068e981366b1809f6ee32e39eaded02ad8be061b0e2fa5093515a8acec10c7f4aca232281004426221b4b7e5edbd203eb49c

diff --git a/dev-libs/cjose/cjose-0.6.2.2.ebuild 
b/dev-libs/cjose/cjose-0.6.2.2.ebuild
new file mode 100644
index ..8e203e264c0f
--- /dev/null
+++ b/dev-libs/cjose/cjose-0.6.2.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="C library implementing the Javascript Object Signing and 
Encryption (JOSE)"
+HOMEPAGE="https://github.com/OpenIDC/cjose;
+
+SRC_URI="https://github.com/OpenIDC/${PN}/archive/refs/tags/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-libs/jansson-2.11:=
+   >=dev-libs/openssl-1.0.2u:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+   virtual/pkgconfig
+   doc? ( >=app-doc/doxygen-1.8 )
+   test? ( >=dev-libs/check-0.9.4 )"
+
+src_prepare() {
+   default
+   eautoreconf --force --install
+}
+
+src_install() {
+   default
+   find "${ED}" -type f -name '*.la' -delete || die
+}

diff --git a/dev-libs/cjose/metadata.xml b/dev-libs/cjose/metadata.xml
new file mode 100644
index ..307a3af57a82
--- /dev/null
+++ b/dev-libs/cjose/metadata.xml
@@ -0,0 +1,14 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   robb...@gentoo.org
+   
+   
+   in...@gentoo.org
+   Gentoo Infrastructure Team
+   
+   
+   OpenIDC/cjose
+   
+



[gentoo-commits] repo/gentoo:master commit in: app-admin/puppet-lint/

2024-01-15 Thread Robin H. Johnson
commit: ed09b5d62c765bfc394f85679a676c65b6892b59
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Jan  8 20:09:59 2024 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Jan 15 17:41:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed09b5d6

app-admin/puppet-lint: fix EmptyGlobalAssignment

Signed-off-by: Robin H. Johnson  gentoo.org>

 app-admin/puppet-lint/puppet-lint-3.4.0.ebuild | 1 -
 app-admin/puppet-lint/puppet-lint-4.0.0.ebuild | 1 -
 app-admin/puppet-lint/puppet-lint-4.2.1.ebuild | 1 -
 app-admin/puppet-lint/puppet-lint-4.2.2.ebuild | 1 -
 4 files changed, 4 deletions(-)

diff --git a/app-admin/puppet-lint/puppet-lint-3.4.0.ebuild 
b/app-admin/puppet-lint/puppet-lint-3.4.0.ebuild
index eaf594a6a0b4..a45d6de2d480 100644
--- a/app-admin/puppet-lint/puppet-lint-3.4.0.ebuild
+++ b/app-admin/puppet-lint/puppet-lint-3.4.0.ebuild
@@ -17,7 +17,6 @@ HOMEPAGE="https://github.com/puppetlabs/puppet-lint;
 
 LICENSE="MIT"
 SLOT="0"
-IUSE=""
 KEYWORDS="amd64 ~x86"
 
 ruby_add_bdepend "test? (

diff --git a/app-admin/puppet-lint/puppet-lint-4.0.0.ebuild 
b/app-admin/puppet-lint/puppet-lint-4.0.0.ebuild
index eaf594a6a0b4..a45d6de2d480 100644
--- a/app-admin/puppet-lint/puppet-lint-4.0.0.ebuild
+++ b/app-admin/puppet-lint/puppet-lint-4.0.0.ebuild
@@ -17,7 +17,6 @@ HOMEPAGE="https://github.com/puppetlabs/puppet-lint;
 
 LICENSE="MIT"
 SLOT="0"
-IUSE=""
 KEYWORDS="amd64 ~x86"
 
 ruby_add_bdepend "test? (

diff --git a/app-admin/puppet-lint/puppet-lint-4.2.1.ebuild 
b/app-admin/puppet-lint/puppet-lint-4.2.1.ebuild
index a0db90b8b2cf..64f15156527c 100644
--- a/app-admin/puppet-lint/puppet-lint-4.2.1.ebuild
+++ b/app-admin/puppet-lint/puppet-lint-4.2.1.ebuild
@@ -17,7 +17,6 @@ HOMEPAGE="https://github.com/puppetlabs/puppet-lint;
 
 LICENSE="MIT"
 SLOT="0"
-IUSE=""
 KEYWORDS="amd64 ~x86"
 
 ruby_add_bdepend "test? (

diff --git a/app-admin/puppet-lint/puppet-lint-4.2.2.ebuild 
b/app-admin/puppet-lint/puppet-lint-4.2.2.ebuild
index dc6f57808758..14e7e001cb52 100644
--- a/app-admin/puppet-lint/puppet-lint-4.2.2.ebuild
+++ b/app-admin/puppet-lint/puppet-lint-4.2.2.ebuild
@@ -17,7 +17,6 @@ HOMEPAGE="https://github.com/puppetlabs/puppet-lint;
 
 LICENSE="MIT"
 SLOT="0"
-IUSE=""
 KEYWORDS="~amd64 ~x86"
 
 ruby_add_bdepend "test? (



[gentoo-commits] proj/mirrorselect: New branch: robbat2/netselect-tags

2024-01-14 Thread Robin H. Johnson
commit: 
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Mon Jan 15 06:12:41 2024 +

New branch: robbat2/netselect-tags




[gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/

2023-12-17 Thread Robin H. Johnson
commit: 83330bda3481cf5cd15c321dcc9e921a9529438c
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Dec 17 17:44:59 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Dec 17 17:45:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83330bda

app-admin/puppet: already includes concurrent-ruby-1.2 fix

Signed-off-by: Robin H. Johnson  gentoo.org>
Reference: 
https://www.puppet.com/docs/puppet/8/release_notes_puppet.html#resolved_issues_puppet_x-8-1-0-PUP-11723
Bug: https://bugs.gentoo.org/900206

 app-admin/puppet/puppet-8.2.0.ebuild | 5 +
 app-admin/puppet/puppet-8.3.1.ebuild | 5 +
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/app-admin/puppet/puppet-8.2.0.ebuild 
b/app-admin/puppet/puppet-8.2.0.ebuild
index 941bb6094717..740979b2b82c 100644
--- a/app-admin/puppet/puppet-8.2.0.ebuild
+++ b/app-admin/puppet/puppet-8.2.0.ebuild
@@ -20,16 +20,13 @@ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
 IUSE="augeas diff doc emacs hiera ldap rrdtool selinux shadow sqlite 
vim-syntax"
 RESTRICT="test"
 
-# https://tickets.puppetlabs.com/browse/PUP-11722 (workaround, pinning)
-# - https://tickets.puppetlabs.com/browse/PUP-11723 (bug for fixing the 
pinning)
 ruby_add_rdepend "
hiera? ( dev-ruby/hiera )
dev-ruby/json:=
dev-ruby/semantic_puppet
>=dev-ruby/facter-3.0.0
dev-ruby/deep_merge
-   https://tickets.puppetlabs.com/browse/PUP-11722 (workaround, pinning)
-# - https://tickets.puppetlabs.com/browse/PUP-11723 (bug for fixing the 
pinning)
 ruby_add_rdepend "
hiera? ( dev-ruby/hiera )
dev-ruby/json:=
dev-ruby/semantic_puppet
>=dev-ruby/facter-3.0.0
dev-ruby/deep_merge
-   

[gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/

2023-12-17 Thread Robin H. Johnson
commit: 2450e25fec405284c5adeed8d4364c323f82f56f
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Dec 17 17:43:02 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Dec 17 17:45:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2450e25f

app-admin/puppet: add 7.27 for upgrade steps, includes concurrent-ruby-1.2 fix

Signed-off-by: Robin H. Johnson  gentoo.org>
Reference: 
https://www.puppet.com/docs/puppet/7/release_notes_puppet.html#resolved_issues_puppet_x-7-25-0-PUP-11723
Bug: https://bugs.gentoo.org/900206

 app-admin/puppet/Manifest |   1 +
 app-admin/puppet/puppet-7.27.0.ebuild | 128 ++
 2 files changed, 129 insertions(+)

diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 10f01dacc6d9..f65072d8a094 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,3 +1,4 @@
 DIST puppet-7.24.0.tar.gz 2823083 BLAKE2B 
f4a3862153a01b1d5ce1cc9d72a2446d91346c5e8ed762f8aeae260a67bd583c277cd4ea0f207021057d40c69078add06af88978522706dea59796bdd6071070
 SHA512 
bb881e7523fce72ca8941d363ebc12f0172aff61a28d49465b7977fdf0d004575f5677fad3f0858db109b1cf85e4d870becdaa7c6687db32eb6eecf849ed25e9
+DIST puppet-7.27.0.tar.gz 2825666 BLAKE2B 
dffc2329c28588a5b4a08996f5fbff95c092961aa68af6287c4216ffb3e5b6ab811df876b8efb0f6724d9990b21ad1c56d65bd9fd8d502008ba385f4460f0591
 SHA512 
a864357f5079c9fad53c2cff35f73f0bc25900359e25b5fb1130e3a3e6f77f63bc38ef59c0ce1b37913eb0acb1e42f39891ed7de0fe39ab138faa426ab2a9392
 DIST puppet-8.2.0.tar.gz 2882267 BLAKE2B 
b109e5cc9fddfa96ebc3be6b892d46a4616a5c1cec677937d02e16d0de6e39c147a9b117514e37ce29b39203f167a33dfe3a6c849fc7ebabecd48925b0d2595b
 SHA512 
40e46350aadd19e187cc2a3c46cfa9f85bb2ffb944b0dcb18d084b10a8baca4c3c830e1361c840490c4f6257930a3ccb556d76b1a933e579ef37103556991b0e
 DIST puppet-8.3.1.tar.gz 2879699 BLAKE2B 
6710d345714e6400ef04aeac8dedb933f39443688bda0b24316a3456a6c6bf2719286472a0ce764ddafd40754f8cd95767a4c311c5b5e2bd72b8bc92ec4d0e85
 SHA512 
0aff032caf7a3966f7e369d6f1785f0ada16e419f96f34dafee61457d2e97979b7934195eb356e44ef323401fa40be5eef608a175b3c2907f25ca92901ec81d2

diff --git a/app-admin/puppet/puppet-7.27.0.ebuild 
b/app-admin/puppet/puppet-7.27.0.ebuild
new file mode 100644
index ..92afd365eb3f
--- /dev/null
+++ b/app-admin/puppet/puppet-7.27.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+USE_RUBY="ruby27 ruby30 ruby31"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit ruby-fakegem systemd tmpfiles
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="https://puppet.com/;
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz;
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+   dev-ruby/hiera
+   dev-ruby/json:=
+   dev-ruby/semantic_puppet
+   >=dev-ruby/facter-3.0.0
+   dev-ruby/concurrent-ruby
+   augeas? ( dev-ruby/ruby-augeas )
+   diff? ( dev-ruby/diff-lcs )
+   doc? ( dev-ruby/rdoc )
+   ldap? ( dev-ruby/ruby-ldap )
+   shadow? ( dev-ruby/ruby-shadow )
+   sqlite? ( dev-ruby/sqlite3 )
+   virtual/ruby-ssl
+   dev-ruby/hocon"
+
+ruby_add_bdepend "
+   doc? ( dev-ruby/yard )
+   test? (
+   dev-ruby/mocha
+   dev-ruby/rack
+   dev-ruby/rspec-its
+   )"
+# this should go in the above lists, but isn't because of test deps not being 
keyworded
+#   dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+   rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+   selinux? (
+   sys-libs/libselinux[ruby]
+   sec-policy/selinux-puppet
+   )
+   vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+   >=app-portage/eix-0.18.0
+   acct-user/puppet
+   acct-group/puppet"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+all_ruby_prepare() {
+   # Avoid spec that require unpackaged json-schema.
+   rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+   # fix systemd path
+   eapply -p0 "${FILESDIR}/puppet-systemd.patch"
+
+   # Avoid specs that can only run in the puppet.git repository. This
+   # should be narrowed down to the specific specs.
+   rm spec/integration/parser/compiler_spec.rb || die
+
+   # Avoid failing spec that need further investigation.
+   rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+   

[gentoo-commits] repo/gentoo:master commit in: www-servers/apache/

2023-12-09 Thread Robin H. Johnson
commit: c98474c0eabe2f0ccc7407d0499d89fa323c311d
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Dec  9 16:48:56 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Dec  9 16:50:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c98474c0

www-servers/apache: fix IfDefine PROXY for proxy_uwsgi due to typo

proxy_uwsgi was mis-spelt in MODULE_DEFINES, causing it to not be
wrapped with .

Signed-off-by: Robin H. Johnson  gentoo.org>
Closes: https://bugs.gentoo.org/819552

 www-servers/apache/apache-2.4.57-r4.ebuild  | 2 +-
 www-servers/apache/apache-2.4.57-r5.ebuild  | 2 +-
 .../apache/{apache-2.4.57-r4.ebuild => apache-2.4.58-r1.ebuild} | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/www-servers/apache/apache-2.4.57-r4.ebuild 
b/www-servers/apache/apache-2.4.57-r4.ebuild
index fc874c565bd1..95756998cd15 100644
--- a/www-servers/apache/apache-2.4.57-r4.ebuild
+++ b/www-servers/apache/apache-2.4.57-r4.ebuild
@@ -118,7 +118,7 @@ MODULE_DEFINES="
proxy_http:PROXY
proxy_http2:PROXY
proxy_scgi:PROXY
-   proxy_uswgi:PROXY
+   proxy_uwsgi:PROXY
proxy_wstunnel:PROXY
socache_shmcb:SSL
socache_memcache:CACHE

diff --git a/www-servers/apache/apache-2.4.57-r5.ebuild 
b/www-servers/apache/apache-2.4.57-r5.ebuild
index eed9c9add8b2..649085501170 100644
--- a/www-servers/apache/apache-2.4.57-r5.ebuild
+++ b/www-servers/apache/apache-2.4.57-r5.ebuild
@@ -118,7 +118,7 @@ MODULE_DEFINES="
proxy_http:PROXY
proxy_http2:PROXY
proxy_scgi:PROXY
-   proxy_uswgi:PROXY
+   proxy_uwsgi:PROXY
proxy_wstunnel:PROXY
socache_shmcb:SSL
socache_memcache:CACHE

diff --git a/www-servers/apache/apache-2.4.57-r4.ebuild 
b/www-servers/apache/apache-2.4.58-r1.ebuild
similarity index 98%
copy from www-servers/apache/apache-2.4.57-r4.ebuild
copy to www-servers/apache/apache-2.4.58-r1.ebuild
index fc874c565bd1..9ca9e8c742c0 100644
--- a/www-servers/apache/apache-2.4.57-r4.ebuild
+++ b/www-servers/apache/apache-2.4.58-r1.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 # latest gentoo apache files
-GENTOO_PATCHSTAMP="20230903"
+GENTOO_PATCHSTAMP="20231019"
 GENTOO_DEVELOPER="graaff"
-GENTOO_PATCHNAME="gentoo-apache-2.4.57-r3"
+GENTOO_PATCHNAME="gentoo-apache-2.4.58"
 
 # IUSE/USE_EXPAND magic
 IUSE_MPMS_FORK="prefork"
@@ -118,7 +118,7 @@ MODULE_DEFINES="
proxy_http:PROXY
proxy_http2:PROXY
proxy_scgi:PROXY
-   proxy_uswgi:PROXY
+   proxy_uwsgi:PROXY
proxy_wstunnel:PROXY
socache_shmcb:SSL
socache_memcache:CACHE



[gentoo-commits] repo/gentoo:master commit in: app-metrics/node_exporter/

2023-11-26 Thread Robin H. Johnson
commit: 9bd2a2d610a131178d15bc55f1c5ef2c7bd63f5f
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Nov 26 21:47:01 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Nov 26 21:47:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bd2a2d6

app-metrics/node_exporter: workaround bug #917577 for x86 builds

Signed-off-by: Robin H. Johnson  gentoo.org>
Bug: https://bugs.gentoo.org/917577

 app-metrics/node_exporter/node_exporter-1.7.0.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/app-metrics/node_exporter/node_exporter-1.7.0.ebuild 
b/app-metrics/node_exporter/node_exporter-1.7.0.ebuild
index e02032dc5f61..8e9236baea4d 100644
--- a/app-metrics/node_exporter/node_exporter-1.7.0.ebuild
+++ b/app-metrics/node_exporter/node_exporter-1.7.0.ebuild
@@ -51,6 +51,10 @@ src_unpack() {
 }
 
 src_compile() {
+   if use x86; then
+   #917577 pie breaks build on x86
+   GOFLAGS=${GOFLAGS//-buildmode=pie}
+   fi
promu build -v || die
./"${PN}" --help-man > "${PN}".1 || die
 }



[gentoo-commits] proj/netifrc:master commit in: net/, doc/

2023-11-24 Thread Robin H. Johnson
commit: a0b69349707b4aaaefc01fd37f1b386935d75c90
Author: Alon Bar-Lev  gmail  com>
AuthorDate: Sun May 14 21:38:28 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Nov 25 04:54:01 2023 +
URL:https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=a0b69349

net: add qmi interface support

qmi is useful for cellular modem connection, the management interface is
implemented using libqmi's qmicli utility.

Signed-off-by: Alon Bar-Lev  gmail.com>
Signed-off-by: Robin H. Johnson  gentoo.org>
Closes: https://github.com/gentoo/netifrc/pull/44

 doc/net.example.Linux.in |  13 +
 net/Makefile |   2 +-
 net/qmi.sh   | 133 +++
 3 files changed, 147 insertions(+), 1 deletion(-)

diff --git a/doc/net.example.Linux.in b/doc/net.example.Linux.in
index 42b8071..cbd81e7 100644
--- a/doc/net.example.Linux.in
+++ b/doc/net.example.Linux.in
@@ -1132,6 +1132,19 @@
 #l2tpsession_l2tpeth2="tunnel_id 2 session_id 1 peer_session_id 1"
 #config_l2tpeth2="10.100.2.1/24"
 
+#-
+# QMI
+# For QMI support, emerge net-libs/libqmi
+# QMI is used for some cellular modems.
+#
+# Each QMI interface may have the following configuration:
+#qmi_apn_wwan0=# The name of the APN
+#qmi_auth_wwan0=   # none, pop, chap, both, Default: none
+#qmi_username_wwan0=   # Default: dummy
+#qmi_password_wwan0=   # Default dummy
+#qmi_cdc_wwan0=# Default: /dev/cdc-wmiX where 
X is taken from IFACE
+#-
+
 #-
 # Advanced Routing
 # WARNING: For advanced routing you MUST be using sys-apps/iproute2

diff --git a/net/Makefile b/net/Makefile
index 58483cd..f562d15 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -14,7 +14,7 @@ INC-Linux=adsl.sh apipa.sh arping.sh bonding.sh 
br2684ctl.sh bridge.sh \
ccwgroup.sh clip.sh ethtool.sh iproute2.sh ifplugd.sh ip6to4.sh 
\
ipppd.sh iwconfig.sh netplugd.sh pppd.sh pump.sh tuntap.sh 
udhcpc.sh \
vlan.sh macvlan.sh ip6rd.sh firewalld.sh dummy.sh hsr.sh 
l2tp.sh \
-   iw.sh iwd.sh wireguard.sh veth.sh dhclientv6.sh
+   iw.sh iwd.sh wireguard.sh veth.sh dhclientv6.sh qmi.sh
 
 SRCS-NetBSD= ifwatchd.sh.in
 INC-NetBSD=ifwatchd.sh

diff --git a/net/qmi.sh b/net/qmi.sh
new file mode 100644
index 000..ac1b2dd
--- /dev/null
+++ b/net/qmi.sh
@@ -0,0 +1,133 @@
+# Copyright (c) 2011 by Gentoo Foundation
+# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
+
+_is_qmi() {
+   [ -d "/sys/class/net/${IFACE}/qmi" ]
+}
+
+_get_state() {
+   echo "/run/net.${IFACE}.qmi.state"
+}
+
+_get_device() {
+   echo "/dev/cdc-$(echo "${IFACE}" | sed 's/wwan/wdm/')"
+}
+
+qmi_depend()
+{
+   program qmicli
+   program ip
+   before interface
+}
+
+qmi_pre_start() {
+
+   _is_qmi || return 0
+
+   local device
+   local apn
+   local auth
+   local username
+   local password
+   local out
+   local rc
+
+   eval device=\$qmi_cdc_${IFVAR}
+   eval apn=\$qmi_apn_${IFVAR}
+   eval auth=\$qmi_auth_${IFVAR}
+   eval username=\$qmi_username_${IFVAR}
+   eval password=\$qmi_password_${IFVAR}
+
+   [ -n "${apn}" ] || return 0
+
+   [ -n "${device}" ] || device="$(_get_device)"
+   [ -n "${auth}" ] || auth="none"
+   [ -n "${username}" ] || username="dummy"
+   [ -n "${password}" ] || password="dummy"
+
+   if ! [ -c "${device}" ]; then
+   ewarn "Cannot open device ${device} for ${IFACE}, aborting 
configuration"
+   return 1
+   fi
+
+   if ! cat "/sys/class/net/${IFACE}/qmi/raw_ip" | grep -q Y; then
+   ebegin "Configuring QMI raw IP"
+
+   ip link set "${IFACE}" down
+   if ! echo Y > "/sys/class/net/${IFACE}/qmi/raw_ip"; then
+   eend 1 "Cannot set raw IP mode for ${IFACE}, aborting 
configuration"
+   return 1
+   else
+   eend 0
+   fi
+   fi
+
+   local 
wwan_connection="apn='${apn}',auth='${auth}',username='${username}',password='${password}',autoconnect=yes,ip-type=4"
+   local n
+   for n in 1 2 3; do
+   ebegin "Connecting QMI APN '${apn}' using '${username}'"
+
+   if out="$( \
+   qmicli \
+   --dev

[gentoo-commits] proj/netifrc:master commit in: net/

2023-11-24 Thread Robin H. Johnson
commit: acf5e9c1d505e14524dcc78a1433872ae273c491
Author: Violet Purcell  inventati  org>
AuthorDate: Wed Nov 22 23:35:01 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Nov 25 04:52:47 2023 +
URL:https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=acf5e9c1

iwd: depend on "program /usr/libexec/iwd" instead of "program iwd"

In iwd.sh, the iwd executable used is /usr/libexec/iwd, however in the
dependency block it depends on just "program iwd." Since iwd is not in
PATH, this will fail and cause iwd to not be started when it should be.
Correct this to /usr/libexec/iwd.

Signed-off-by: Violet Purcell  inventati.org>
Signed-off-by: Robin H. Johnson  gentoo.org>
Closes: https://github.com/gentoo/netifrc/pull/49

 net/iwd.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/iwd.sh b/net/iwd.sh
index d8be2d5..75edb8c 100644
--- a/net/iwd.sh
+++ b/net/iwd.sh
@@ -7,7 +7,7 @@ iwd_depend()
before interface
provide wireless
after iwconfig
-   program iwd
+   program /usr/libexec/iwd
 }
 
 _config_vars="$_config_vars iwd"



[gentoo-commits] repo/gentoo:master commit in: app-misc/ca-certificates/

2023-11-20 Thread Robin H. Johnson
commit: c2ab69874330db97a86bcbf07c1fde07e3d06e05
Author: Brian Norris  chromium  org>
AuthorDate: Sat Nov 18 00:24:06 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Nov 20 17:06:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2ab6987

app-misc/ca-certificates: Drop date from /etc/ca-certificates.conf

This only serves to make this package non-reproducible.

Signed-off-by: Brian Norris  chromium.org>
Signed-off-by: Robin H. Johnson  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/33879

 app-misc/ca-certificates/ca-certificates-20211016.3.88.1.ebuild | 1 -
 app-misc/ca-certificates/ca-certificates-20230311.3.89.1.ebuild | 1 -
 app-misc/ca-certificates/ca-certificates-20230311.3.89.ebuild   | 1 -
 app-misc/ca-certificates/ca-certificates-20230311.3.90.ebuild   | 1 -
 app-misc/ca-certificates/ca-certificates-20230311.3.93.ebuild   | 1 -
 5 files changed, 5 deletions(-)

diff --git a/app-misc/ca-certificates/ca-certificates-20211016.3.88.1.ebuild 
b/app-misc/ca-certificates/ca-certificates-20211016.3.88.1.ebuild
index 6608eea43fa5..e90265a6db66 100644
--- a/app-misc/ca-certificates/ca-certificates-20211016.3.88.1.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20211016.3.88.1.ebuild
@@ -165,7 +165,6 @@ src_compile() {
 
(
echo "# Automatically generated by ${CATEGORY}/${PF}"
-   echo "# $(date -u)"
echo "# Do not edit."
cd "${c}" || die
find * -name '*.crt' | LC_ALL=C sort

diff --git a/app-misc/ca-certificates/ca-certificates-20230311.3.89.1.ebuild 
b/app-misc/ca-certificates/ca-certificates-20230311.3.89.1.ebuild
index 981bfa66576f..beb4469cc4a4 100644
--- a/app-misc/ca-certificates/ca-certificates-20230311.3.89.1.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20230311.3.89.1.ebuild
@@ -169,7 +169,6 @@ src_compile() {
 
(
echo "# Automatically generated by ${CATEGORY}/${PF}"
-   echo "# $(date -u)"
echo "# Do not edit."
cd "${c}" || die
find * -name '*.crt' | LC_ALL=C sort

diff --git a/app-misc/ca-certificates/ca-certificates-20230311.3.89.ebuild 
b/app-misc/ca-certificates/ca-certificates-20230311.3.89.ebuild
index 070ceebeb42f..69f8eb0e076b 100644
--- a/app-misc/ca-certificates/ca-certificates-20230311.3.89.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20230311.3.89.ebuild
@@ -169,7 +169,6 @@ src_compile() {
 
(
echo "# Automatically generated by ${CATEGORY}/${PF}"
-   echo "# $(date -u)"
echo "# Do not edit."
cd "${c}" || die
find * -name '*.crt' | LC_ALL=C sort

diff --git a/app-misc/ca-certificates/ca-certificates-20230311.3.90.ebuild 
b/app-misc/ca-certificates/ca-certificates-20230311.3.90.ebuild
index 83c66b14c12c..20894fd6dbae 100644
--- a/app-misc/ca-certificates/ca-certificates-20230311.3.90.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20230311.3.90.ebuild
@@ -169,7 +169,6 @@ src_compile() {
 
(
echo "# Automatically generated by ${CATEGORY}/${PF}"
-   echo "# $(date -u)"
echo "# Do not edit."
cd "${c}" || die
find * -name '*.crt' | LC_ALL=C sort

diff --git a/app-misc/ca-certificates/ca-certificates-20230311.3.93.ebuild 
b/app-misc/ca-certificates/ca-certificates-20230311.3.93.ebuild
index cd5ede09c08f..a5a1ffb07bb8 100644
--- a/app-misc/ca-certificates/ca-certificates-20230311.3.93.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20230311.3.93.ebuild
@@ -169,7 +169,6 @@ src_compile() {
 
(
echo "# Automatically generated by ${CATEGORY}/${PF}"
-   echo "# $(date -u)"
echo "# Do not edit."
cd "${c}" || die
find * -name '*.crt' | LC_ALL=C sort



[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/

2023-11-01 Thread Robin H. Johnson
commit: e772875e51b9a7085f89783bfbd7452272c95550
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Wed Nov  1 21:05:17 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Wed Nov  1 21:05:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e772875e

dev-vcs/git: cleanup git-2.39.2-r1

Signed-off-by: Robin H. Johnson  gentoo.org>
Bug: https://bugs.gentoo.org/show_bug.cgi?id=905088

 dev-vcs/git/Manifest |   3 -
 dev-vcs/git/git-2.39.2-r1.ebuild | 645 ---
 2 files changed, 648 deletions(-)

diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index b2bdf601e7f2..98024de51643 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -1,14 +1,11 @@
-DIST git-2.39.2.tar.xz 7163224 BLAKE2B 
bcd9abdaf8ce626de7aec2da666395f80212772aa17516f903459d683597184efeeb1d6aad536e0bf722a9bf63df98549fdeaab5b0a48e5500faf83ebf5d7516
 SHA512 
fdca70bee19401c5c7a6d2f3d70bd80b6ba99f6a9f97947de31d4366ee3a78a18d5298abb25727ec8ef67131bca673e48dff2a5a050b6e032884ab04066b20cb
 DIST git-2.39.3.tar.xz 7166100 BLAKE2B 
862a5636df681e46797034bf22ca7712d70ead94ac0a911b81e4eeb3c83e67fdc56b839055b3b54bdab0ffceabe9fa2efb9e2870b1c0f40590ddb33e7427cd2a
 SHA512 
ddd9f41df9d59aedaddb3a3cd551c105903b5f8c86455d4d05a8342920d67754b358b6ab0d6c10cca743b8e0e621baea16f71a9d6290f4d37297a9c45e8b3763
 DIST git-2.40.1.tar.xz 7185260 BLAKE2B 
50957227a572db54b931976d4c22edeaf0d5678d05d37f9478e736487d3e0755c1d70775cea9e3ce82e07f228fa809f3b461fb5b7f267117cc5ae915c096
 SHA512 
9ab41c64c6e666c314683bc4925535e037d43f947b8d327ff7d0379ac12899f4effcc2fe4e47b1ce652ad7140aa4f01f3b99f9cc0cf854cfeface1a5d3e1893e
 DIST git-2.41.0.tar.xz 7273624 BLAKE2B 
9119e1d1ff0ff332559a6609707846c2af7c61bea6ea728e834e4bd7f1ff6dd636a081c227b32a88fc5de1ea8987951cc56d0e94c90bbaa211ff415c5020d070
 SHA512 
a215bc6d89afbddd56adac901c24ea2b7f98a37bf6a6a2756893947012ffaa850e76247a3445a5ab13ab5a462f39986fec33eed086148aba5eb554dc1799fee0
 DIST git-2.42.0.tar.xz 7346760 BLAKE2B 
efe8abd42955a7aee32a12067466d1d8dfc3946f40750254ad431bab7debe3398a9fd4833817a93f6496229184e7890034581300d8c94a98f0c0a209f3021bf4
 SHA512 
afe5bca3c084d4ddd66f20afa820ba10f61007f66846108929e0d4ee7b7eaa896fcf00917dead16881d840f674dec6dd0e353a05e62a31016694af3d7d22a51d
-DIST git-htmldocs-2.39.2.tar.xz 1505352 BLAKE2B 
8b60f9bae9585aab8782f38ff64391a9c8fddeed47d84a989b4f65db87c14e927d1d975fa5239435e921dbc74a75c600d6f0485defa1a235a66355c0f8d9060d
 SHA512 
fe0982e653784285bce7f158956892900ae9c88aa986261de4184e3349e34ee54f92d7280e143031b107872fc1729814489f6e355aa12dc415d724da65ec3716
 DIST git-htmldocs-2.39.3.tar.xz 1506828 BLAKE2B 
732e86ee004a44230d8f10eac16a14fbfb348d4278001011a0d22ba91240fbe65cad341b0547b649db3ce7fc67fc6fb544c896e7ba4bd7f1fa3c9b42371febf9
 SHA512 
7616c9c6600759f06973d36d5233b3909da72f39318410f5522b890d282a74e7585433c7195fed4792d5b7955292a466abcc2185ffdc23d0e8928ad58d7db1bf
 DIST git-htmldocs-2.40.1.tar.xz 1517900 BLAKE2B 
864edd5b2389362dcf5d0c9f08cbf3bac6303cf6505b2d5446e73aeb591ac9212948b6f68434671e3bfba6f64d6aff02d315848d08647d22177292775411e5b3
 SHA512 
770c9765bab1f0773615d67f4eb817c42e1a946da205381ac0c208c4b2d4185c351aebbd7294afe66ef794b65cc9123b255a585a3df2990b5dfe779aaacb0800
 DIST git-htmldocs-2.41.0.tar.xz 1525692 BLAKE2B 
4ea74130e21fed3ebbe09b849eddc48654fa7563299d8c2173856741d3c490a1672ac6b2005f716d6ae2d7759f92caafc56ccbf2408ba8ec87266b9c10530d73
 SHA512 
8a28f330f21e1da901ef8575509b56cede1a8f1d03e49fca802e561095c137c9ef23f3d6bd33d0e8a537bc1f93131ce7aafc92d4a9b0a80ade67249f22ff69d5
 DIST git-htmldocs-2.42.0.tar.xz 1536088 BLAKE2B 
e40235fa9a75ca29179600a63d2573d8f458d75f1d475c1b689237280e7b8a5a67d020a6c125864695bdbb1c0f9c2930dc995dc9b27e59849103fb83524bf7d0
 SHA512 
d7b578b3bcde2f8f4aecd3c56ca314bbd862638fe3e629681f0f8535edc0302cafe882126b68c8aa6d651ac5e58b4ed2531268ef450ad393c61baf40a063cedf
-DIST git-manpages-2.39.2.tar.xz 557080 BLAKE2B 
6b2dbb33f1041ba802582f529638b8b4574309efbf5af94add5c676efed7314743d5b326ec18a95ba85a4fe818e95913069717034a9863879e1d03ee32b839ba
 SHA512 
6326ff43564fc42ca0a424edd17896434e11c09ce21f4bfd4d4975aaaf7f2c0d823da0e89b267557b0b7799c342db88d84685d24f589f53edfe486208c1f15b1
 DIST git-manpages-2.39.3.tar.xz 557428 BLAKE2B 
4eb85035f7056a12c3f1276d26f99b3337b97721f8f4b0b3c74d2a484171bfdf74f566a03e175ba32b389c940ed7be66ce2933442ec77089d5db3aaeb2ed2557
 SHA512 
06414741667b990ff3a28f7cb29b502df3d4cc757d525438994af005c71d429ca969563a74d1d2b44185e5c40107ac8838b390835a8a947e542ce3636b43f98b
 DIST git-manpages-2.40.1.tar.xz 562772 BLAKE2B 
091c907195b37ed4152698515528d7da27f8dbf2516915ae66ba6f81a64bbd9f2042544889fe655ea7447bd6f32adaf8daec9c02743587a84b090554ad58796b
 SHA512 
4e75f5ae3786658d284ce8eae3133c01115e357cc0bd2c4c5bf4261196411da632f51c87ff6e4c1f4bc7adf7b7b4a33c4debe52bcd9b5d735aa70dd9614ad5bd
 DIST git-manpages-2.41.0.tar.xz 56506

[gentoo-commits] repo/gentoo:master commit in: app-metrics/smartctl_exporter/

2023-10-16 Thread Robin H. Johnson
commit: c18ea60fb127bfed07ee062ff74c419dedb80e54
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Oct 16 20:57:19 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Oct 16 20:57:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c18ea60f

app-metrics/smartctl_exporter: new package

Signed-off-by: Robin H. Johnson  gentoo.org>

 app-metrics/smartctl_exporter/Manifest |  2 +
 app-metrics/smartctl_exporter/metadata.xml | 10 +
 .../smartctl_exporter-0.11.0.ebuild| 51 ++
 3 files changed, 63 insertions(+)

diff --git a/app-metrics/smartctl_exporter/Manifest 
b/app-metrics/smartctl_exporter/Manifest
new file mode 100644
index ..5e8be5f843f2
--- /dev/null
+++ b/app-metrics/smartctl_exporter/Manifest
@@ -0,0 +1,2 @@
+DIST smartctl_exporter-0.11.0-vendor.tar.xz 1348836 BLAKE2B 
06999c2df7891d6579a227dc5eab44240f923f3466ce1da8443bc40afcb7d9c493f94d50a083ea26e03969b89c9cff4e977f9cffc8529dac5c323212c139dd9e
 SHA512 
c54bf342e56db7086a3844d96f910a18b9d0e19a434b554421e9c70b02fdf3b2307da6662a0e02de93adedf948bbbcb7225659b26273e6106cbf73aa3dbd
+DIST smartctl_exporter-0.11.0.tar.gz 29097 BLAKE2B 
7e3d85588a83380f8d579a918677d9910ba1922212af65b1918a379315e9f2321f617c5d884fd72086019ddac353817da5d1ec71a8a8b0ecb3edb24f66dd75fa
 SHA512 
2c86d051d17c55e3122130ad4733c5911310698a89d8782a61f3b5541cb7aa689994338125eaa5ee41fdcddbdd8316a6736c734ff5dee6fe0d6c0a2b131fff66

diff --git a/app-metrics/smartctl_exporter/metadata.xml 
b/app-metrics/smartctl_exporter/metadata.xml
new file mode 100644
index ..ec7f20a9016f
--- /dev/null
+++ b/app-metrics/smartctl_exporter/metadata.xml
@@ -0,0 +1,10 @@
+
+https://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   robb...@gentoo.org
+   
+   
+   prometheus-community/smartctl_exporter
+   
+

diff --git a/app-metrics/smartctl_exporter/smartctl_exporter-0.11.0.ebuild 
b/app-metrics/smartctl_exporter/smartctl_exporter-0.11.0.ebuild
new file mode 100644
index ..93fd041d43a9
--- /dev/null
+++ b/app-metrics/smartctl_exporter/smartctl_exporter-0.11.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Export smartctl statistics to prometheus"
+HOMEPAGE="https://github.com/prometheus-community/smartctl_exporter;
+# Upstream LICENSE file is wrong see 
https://github.com/prometheus-community/smartctl_exporter/pull/113
+LICENSE="Apache-2.0"
+SLOT="0"
+BDEPEND="dev-util/promu"
+DEPEND="dev-lang/go"
+RDEPEND="sys-apps/smartmontools"
+KEYWORDS="~amd64 ~x86"
+
+# uncomment the first setting of MY_PV for a normal release
+# MY_PV="v${PV/_rc/-rc.}"
+# set MY_PV to the full commit hash for a snapshot release
+MY_PV_HASH=
+: ${MY_PV_HASH_FOR_VENDOR:=${MY_PV_HASH}}
+if [[ -n "${MY_PV_HASH}" ]]; then
+   MY_PV=${MY_PV_HASH}
+   SMARTCTL_EXPORTER_COMMIT=${MY_PV_HASH:0:8}
+   SRC_URI_UPSTREAM="${HOMEPAGE}/archive/${MY_PV}.tar.gz"
+else
+   MY_PV=$PV
+   SMARTCTL_EXPORTER_COMMIT=
+   SRC_URI_UPSTREAM="${HOMEPAGE}/archive/refs/tags/v${PV}.tar.gz"
+fi
+MY_P=${PN}-${MY_PV}
+SRC_URI_VENDOR="https://dev.gentoo.org/~robbat2/distfiles/${MY_P}-vendor.tar.xz;
+SRC_URI="
+   ${SRC_URI_UPSTREAM} -> ${P}.tar.gz
+   ${SRC_URI_VENDOR}
+   "
+
+src_prepare() {
+   default
+   if [[ -n $SMARTCTL_EXPORTER_COMMIT ]]; then
+   sed -i -e "s/{{.Revision}}/${SMARTCTL_EXPORTER_COMMIT}/" 
.promu.yml || die
+   fi
+}
+
+src_compile() {
+   emake build PROMU='/usr/bin/promu'
+}
+
+src_install() {
+   dodoc *.md
+   dobin ${PN}
+}



[gentoo-commits] proj/releng:master commit in: scripts/

2023-10-08 Thread Robin H. Johnson
commit: c5b7bfb6ecb63958ae99ed64144f0a508010b645
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Oct  9 00:08:03 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Oct  9 00:08:03 2023 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=c5b7bfb6

copy_buildsync: refactor check for link create

Signed-off-by: Robin H. Johnson  gentoo.org>

 scripts/copy_buildsync.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/copy_buildsync.sh b/scripts/copy_buildsync.sh
index 95e3215a..df971e0a 100755
--- a/scripts/copy_buildsync.sh
+++ b/scripts/copy_buildsync.sh
@@ -232,15 +232,15 @@ process_arch() {
cd "current-$v"
for variant_file in "../${variant_path}"* ; do
  doit=0
+   vfb=$(basename "$variant_file")
# If it doesn't exist, add it.
-   if [[ ! -e "$variant_file" ]]; then
+   if [[ ! -e "$vfb" ]]; then
doit=1
else
# If it does exist, check 
carefully to see if anything is different
# Does it point to somewhere 
else?
# Is the target newer?
# If those are true, also bump 
the symlink.
- vfb=$(basename "$variant_file")
  vft=$(readlink -f "$vfb")
[[ "$vft" != "$(readlink -f 
"$variant_file")" ]] && doit=1
[[ "$vfb" -nt "$vft" ]] && 
doit=1



[gentoo-commits] proj/releng:master commit in: scripts/

2023-10-08 Thread Robin H. Johnson
commit: 477b9842eab60e258902238b648bc96462b68465
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Oct  9 00:05:44 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Oct  9 00:05:44 2023 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=477b9842

copy_buildsync: fix double ln

Signed-off-by: Robin H. Johnson  gentoo.org>

 scripts/copy_buildsync.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/copy_buildsync.sh b/scripts/copy_buildsync.sh
index 68aac55c..95e3215a 100755
--- a/scripts/copy_buildsync.sh
+++ b/scripts/copy_buildsync.sh
@@ -235,7 +235,6 @@ process_arch() {
# If it doesn't exist, add it.
if [[ ! -e "$variant_file" ]]; then
doit=1
-   ln -s -t . "${variant_file}"
else
# If it does exist, check 
carefully to see if anything is different
# Does it point to somewhere 
else?
@@ -246,7 +245,7 @@ process_arch() {
[[ "$vft" != "$(readlink -f 
"$variant_file")" ]] && doit=1
[[ "$vfb" -nt "$vft" ]] && 
doit=1
fi
-   [[ $doit -eq 1 ]] && ln -sf -t . 
"../${variant_file}"
+   [[ $doit -eq 1 ]] && ln -sf -t . 
"${variant_file}"
done
)
 



[gentoo-commits] proj/releng:master commit in: scripts/

2023-10-08 Thread Robin H. Johnson
commit: 5dedadf325136f0b6d575b50fd95dc01c0de
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Oct  9 00:04:24 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Oct  9 00:04:24 2023 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=5ded

copy_buildsync: fix double ../..

Signed-off-by: Robin H. Johnson  gentoo.org>

 scripts/copy_buildsync.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/copy_buildsync.sh b/scripts/copy_buildsync.sh
index 7016fa26..68aac55c 100755
--- a/scripts/copy_buildsync.sh
+++ b/scripts/copy_buildsync.sh
@@ -235,7 +235,7 @@ process_arch() {
# If it doesn't exist, add it.
if [[ ! -e "$variant_file" ]]; then
doit=1
-   ln -s -t . "../${variant_path}"
+   ln -s -t . "${variant_file}"
else
# If it does exist, check 
carefully to see if anything is different
# Does it point to somewhere 
else?



[gentoo-commits] proj/releng:master commit in: scripts/

2023-10-08 Thread Robin H. Johnson
commit: 9a3f920c9554173481d79acccedfed74357776ea
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Oct  8 23:35:51 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Oct  8 23:35:51 2023 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=9a3f920c

copy_buildsync: ensure cleanup of old symlinks fires

Signed-off-by: Robin H. Johnson  gentoo.org>

 scripts/copy_buildsync.sh | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/copy_buildsync.sh b/scripts/copy_buildsync.sh
index 71e890d9..7016fa26 100755
--- a/scripts/copy_buildsync.sh
+++ b/scripts/copy_buildsync.sh
@@ -217,7 +217,11 @@ process_arch() {
fi
 
# Remove old links in the directory.
-   find "current-$v" -type l ! -name "$f" ! -name 
"${variant_date}*"
+   find "current-$v" \
+   -type l \
+   ! -name "$f" \
+   ! -name "*${variant_date}*" \
+   -delete
 
# install new links
# do NOT unconditionally use -f here, we do not want to 
override the



[gentoo-commits] proj/releng:master commit in: scripts/

2023-10-08 Thread Robin H. Johnson
commit: 04bc16e0867d0a19ba803570852610b63743c3f6
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Oct  8 23:32:15 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Oct  8 23:32:15 2023 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=04bc16e0

copy_buildsync: fix corner cases for targets changing

Signed-off-by: Robin H. Johnson  gentoo.org>

 scripts/copy_buildsync.sh | 35 +++
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/scripts/copy_buildsync.sh b/scripts/copy_buildsync.sh
index 9da5893d..71e890d9 100755
--- a/scripts/copy_buildsync.sh
+++ b/scripts/copy_buildsync.sh
@@ -209,15 +209,42 @@ process_arch() {
# Link the files for a given variant into a current-${v}/ 
directory.
# If it's an old link, remove to convert to directory.
if test -L "current-$v" ; then rm "current-$v" ; fi
-   mkdir -p "current-$v"
+
+   # If there is a file here, something went wrong.
+   if ! mkdir -p "current-$v" ; then
+   echo "$ARCH: could not mkdir current-${v}" 1>&2
+   continue
+   fi
 
# Remove old links in the directory.
find "current-$v" -type l ! -name "$f" ! -name 
"${variant_date}*"
 
# install new links
-   # do NOT use -f here, we do not want to override the existing 
files.
-   # this will ensure the mtime of the links does not change in 
most cases.
-   ( cd "current-$v" && ln -s --target-directory=. 
"../${variant_path}"* )
+   # do NOT unconditionally use -f here, we do not want to 
override the
+   # existing files.  this will ensure the mtime of the links does 
not change
+   # in most cases.
+   (
+   # shellcheck disable=SC2164 # error-checked 
above
+   cd "current-$v"
+   for variant_file in "../${variant_path}"* ; do
+ doit=0
+   # If it doesn't exist, add it.
+   if [[ ! -e "$variant_file" ]]; then
+   doit=1
+   ln -s -t . "../${variant_path}"
+   else
+   # If it does exist, check 
carefully to see if anything is different
+   # Does it point to somewhere 
else?
+   # Is the target newer?
+   # If those are true, also bump 
the symlink.
+ vfb=$(basename "$variant_file")
+ vft=$(readlink -f "$vfb")
+   [[ "$vft" != "$(readlink -f 
"$variant_file")" ]] && doit=1
+   [[ "$vfb" -nt "$vft" ]] && 
doit=1
+   fi
+   [[ $doit -eq 1 ]] && ln -sf -t . 
"../${variant_file}"
+   done
+   )
 
# Update keepfile
echo "${variant_path}" | sed -e 's,/.*,,g' -e 's,^,/,g' -e 
's,$,$,g' >>"${keepfile_tmp}"



[gentoo-commits] proj/releng:master commit in: scripts/

2023-10-08 Thread Robin H. Johnson
commit: 8b0e4c14c1a508a864ca47cb47b5c76c39cee858
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Oct  8 23:20:17 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Oct  8 23:20:26 2023 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=8b0e4c14

Revert "copy_buildsync: disable sync for everything except alpha to test new 
symlink code"

This reverts commit 5ef7b638f16c10b1e2b8831dbc16f79dbc90abc0.

Signed-off-by: Robin H. Johnson  gentoo.org>

 scripts/copy_buildsync.sh | 29 ++---
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/scripts/copy_buildsync.sh b/scripts/copy_buildsync.sh
index 0f0779ce..9da5893d 100755
--- a/scripts/copy_buildsync.sh
+++ b/scripts/copy_buildsync.sh
@@ -11,21 +11,20 @@ LOGDIR_BASE="/release/distfiles/tmp/buildsync/logs"
 
 ARCHES=(
alpha
-   # Temporarily disable to reduce flap.
-   #amd64
-   #arm
-   #arm64
-   #hppa
-   #ia64
-   #loong
-   #mips
-   #m68k
-   #ppc
-   #riscv
-   #s390
-   #sh
-   #sparc
-   #x86
+   amd64
+   arm
+   arm64
+   hppa
+   ia64
+   loong
+   mips
+   m68k
+   ppc
+   riscv
+   s390
+   sh
+   sparc
+   x86
 )
 RSYNC_OPTS=(
-aO



[gentoo-commits] proj/releng:master commit in: scripts/

2023-10-08 Thread Robin H. Johnson
commit: 2fd21d11ea1a3f30a6ac5805e80e09489935a88a
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Oct  8 23:17:54 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Oct  8 23:17:54 2023 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=2fd21d11

copy_buildsync: fix relative globbing again

Signed-off-by: Robin H. Johnson  gentoo.org>

 scripts/copy_buildsync.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/copy_buildsync.sh b/scripts/copy_buildsync.sh
index 3d164504..0f0779ce 100755
--- a/scripts/copy_buildsync.sh
+++ b/scripts/copy_buildsync.sh
@@ -218,7 +218,7 @@ process_arch() {
# install new links
# do NOT use -f here, we do not want to override the existing 
files.
# this will ensure the mtime of the links does not change in 
most cases.
-   ( cd "$current_v" && ln -s --target-directory=. 
"../${variant_path}"* )
+   ( cd "current-$v" && ln -s --target-directory=. 
"../${variant_path}"* )
 
# Update keepfile
echo "${variant_path}" | sed -e 's,/.*,,g' -e 's,^,/,g' -e 
's,$,$,g' >>"${keepfile_tmp}"



[gentoo-commits] proj/releng:master commit in: scripts/

2023-10-08 Thread Robin H. Johnson
commit: a4fdfd2a582485fcbb2f5deb9b3331e7175c8e8e
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Oct  8 23:17:02 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Oct  8 23:17:02 2023 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=a4fdfd2a

copy_buildsync: fix relative globbing

Signed-off-by: Robin H. Johnson  gentoo.org>

 scripts/copy_buildsync.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/copy_buildsync.sh b/scripts/copy_buildsync.sh
index 59f08f0a..3d164504 100755
--- a/scripts/copy_buildsync.sh
+++ b/scripts/copy_buildsync.sh
@@ -218,7 +218,7 @@ process_arch() {
# install new links
# do NOT use -f here, we do not want to override the existing 
files.
# this will ensure the mtime of the links does not change in 
most cases.
-   ln -s --target-directory="current-$v"/ "../${variant_path}"*
+   ( cd "$current_v" && ln -s --target-directory=. 
"../${variant_path}"* )
 
# Update keepfile
echo "${variant_path}" | sed -e 's,/.*,,g' -e 's,^,/,g' -e 
's,$,$,g' >>"${keepfile_tmp}"



[gentoo-commits] proj/releng:master commit in: scripts/

2023-10-08 Thread Robin H. Johnson
commit: ddd18bfa902e89b820b3fef1365984dcb641e5cb
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Oct  8 23:10:42 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Oct  8 23:10:42 2023 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=ddd18bfa

copy_buildsync: fix check typo

Signed-off-by: Robin H. Johnson  gentoo.org>

 scripts/copy_buildsync.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/copy_buildsync.sh b/scripts/copy_buildsync.sh
index c313af72..59f08f0a 100755
--- a/scripts/copy_buildsync.sh
+++ b/scripts/copy_buildsync.sh
@@ -209,7 +209,7 @@ process_arch() {
#
# Link the files for a given variant into a current-${v}/ 
directory.
# If it's an old link, remove to convert to directory.
-   if test -l "current-$v" ; then rm "current-$v" ; fi
+   if test -L "current-$v" ; then rm "current-$v" ; fi
mkdir -p "current-$v"
 
# Remove old links in the directory.



[gentoo-commits] proj/releng:master commit in: scripts/

2023-10-08 Thread Robin H. Johnson
commit: 5ef7b638f16c10b1e2b8831dbc16f79dbc90abc0
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Oct  8 23:09:23 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Oct  8 23:09:23 2023 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=5ef7b638

copy_buildsync: disable sync for everything except alpha to test new symlink 
code

Signed-off-by: Robin H. Johnson  gentoo.org>

 scripts/copy_buildsync.sh | 29 +++--
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/scripts/copy_buildsync.sh b/scripts/copy_buildsync.sh
index 9a13872a..c313af72 100755
--- a/scripts/copy_buildsync.sh
+++ b/scripts/copy_buildsync.sh
@@ -11,20 +11,21 @@ LOGDIR_BASE="/release/distfiles/tmp/buildsync/logs"
 
 ARCHES=(
alpha
-   amd64
-   arm
-   arm64
-   hppa
-   ia64
-   loong
-   mips
-   m68k
-   ppc
-   riscv
-   s390
-   sh
-   sparc
-   x86
+   # Temporarily disable to reduce flap.
+   #amd64
+   #arm
+   #arm64
+   #hppa
+   #ia64
+   #loong
+   #mips
+   #m68k
+   #ppc
+   #riscv
+   #s390
+   #sh
+   #sparc
+   #x86
 )
 RSYNC_OPTS=(
-aO



[gentoo-commits] proj/releng:master commit in: scripts/

2023-10-08 Thread Robin H. Johnson
commit: 6c75b00db7184b652ff12086a036d5081617d470
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Oct  8 23:06:13 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Oct  8 23:06:13 2023 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=6c75b00d

copy_buildsync: fix tempfile for OUT_ISO & OUT_STAGE, plus comments

Signed-off-by: Robin H. Johnson  gentoo.org>

 scripts/copy_buildsync.sh | 27 +++
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/scripts/copy_buildsync.sh b/scripts/copy_buildsync.sh
index ac56f7f7..851ccb57 100755
--- a/scripts/copy_buildsync.sh
+++ b/scripts/copy_buildsync.sh
@@ -154,14 +154,21 @@ process_arch() {
[ -z "${latest_iso_date}" ] && latest_iso_date="NONE-FOUND"
[ -z "${latest_stage3_date}" ] && latest_stage3_date="NONE-FOUND"
 
+
+   OUT_ISO_tmp=""
+   OUT_STAGE3_tmp=""
if [ -n "${iso_list}" ]; then
-   echo -e "${header}" >"${OUT_ISO}"
+   OUT_ISO_tmp=$(mktemp -p . -t ".${OUT_ISO}.XX")
+   chmod 644 "${OUT_ISO_tmp}"
+   echo -e "${header}" >"${OUT_ISO_tmp}"
# Some arches produce more than one type of iso.
# So let's not advertise a current one via a symlink in general.
rm -f current-iso
fi
if [ -n "${stage3_list}" ]; then
-   echo -e "${header}" >"${OUT_STAGE3}"
+   OUT_STAGE3_tmp=$(mktemp -p . -t ".${OUT_STAGE3}.XX")
+   chmod 644 "${OUT_STAGE3_tmp}"
+   echo -e "${header}" >"${OUT_STAGE3_tmp}"
# Ditto for stage3
rm -f current-stage3
fi
@@ -177,25 +184,37 @@ process_arch() {
 
for v in $variants ; do
# FIXME: trace the $a variable in this!
+   # example output 
20230907T160230Z/install-alpha-minimal-20230907T160230Z.iso
variant_path=$(find 20* -iname "${v}-20*" "${find_variants[@]}" 
-print 2>/dev/null | sed -e "s,.*/$a/autobuilds/,,g" | sort -k1,1 -t/ | tail 
-n1 )
if [ -z "${variant_path}" ] || [ ! -e "${variant_path}" ]; then
echo "$ARCH: Variant ${v} is missing" 1>&2
continue
fi
+   variant_date="${variant_path%/*}"
+   variant_base="${variant_path#*/}"
size=$(stat --format='%s' "${variant_path}")
f="latest-${v}.txt"
f_tmp=$(mktemp -p . -t ".${f}.XX")
chmod 644 "${f_tmp}"
echo -e "${header}" >"${f_tmp}"
echo -e "${variant_path} ${size}" >>"${f_tmp}"
-   [[ ${variant_path} =~ tar.*$ ]] && echo -e "${variant_path} 
${size}" >>"${OUT_STAGE3}" # FIXME: tempfile
-   [[ ${variant_path} =~ iso$ ]] && echo -e "${variant_path} 
${size}" >>"${OUT_ISO}" # FIXME: tempfile
+   [[ ${variant_path} =~ tar.*$ ]] && echo -e "${variant_path} 
${size}" >>"${OUT_STAGE3_tmp}"
+   [[ ${variant_path} =~ iso$ ]] && echo -e "${variant_path} 
${size}" >>"${OUT_ISO_tmp}"
rm -f "current-$v"
ln -sf "${variant_path%/*}" "current-$v"
+
+   # Update keepfile
echo "${variant_path}" | sed -e 's,/.*,,g' -e 's,^,/,g' -e 
's,$,$,g' >>"${keepfile_tmp}"
+
+   # Place latest-*txt into place in the base arch dir.
mv -f "${f_tmp}" "${f}"
+
done
 
+   # Atomic move these files if created.
+   [[ -n "${OUT_ISO_tmp}" ]] && [[ -f "${OUT_ISO_tmp}" ]] && mv 
"${OUT_ISO_tmp}" "${OUT_ISO}"
+   [[ -n "${OUT_STAGE3_tmp}" ]] && [[ -f "${OUT_STAGE3_tmp}" ]] && mv 
"${OUT_STAGE3_tmp}" "${OUT_STAGE3}"
+
# Refresh keepfile
mv -f "${keepfile_tmp}" "${keepfile}"
 



[gentoo-commits] proj/releng:master commit in: scripts/

2023-10-08 Thread Robin H. Johnson
commit: 9c04ea27acdff25c41efd343713268b8dbf6b091
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Oct  8 23:07:20 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Oct  8 23:07:20 2023 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=9c04ea27

copy_buildsync: convert current-* to directory instead of symlink

Signed-off-by: Robin H. Johnson  gentoo.org>

 scripts/copy_buildsync.sh | 25 +++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/scripts/copy_buildsync.sh b/scripts/copy_buildsync.sh
index 851ccb57..9a13872a 100755
--- a/scripts/copy_buildsync.sh
+++ b/scripts/copy_buildsync.sh
@@ -200,8 +200,24 @@ process_arch() {
echo -e "${variant_path} ${size}" >>"${f_tmp}"
[[ ${variant_path} =~ tar.*$ ]] && echo -e "${variant_path} 
${size}" >>"${OUT_STAGE3_tmp}"
[[ ${variant_path} =~ iso$ ]] && echo -e "${variant_path} 
${size}" >>"${OUT_ISO_tmp}"
-   rm -f "current-$v"
-   ln -sf "${variant_path%/*}" "current-$v"
+
+   # Previously, current-${v}/ was a symlink to the timestamp 
directory.
+   # This was apparently confusing to some users because it had 
way too many files.
+   # So instead make current-${v}/ a directory, containing just 
symlinks to
+   # the selected build.
+   #
+   # Link the files for a given variant into a current-${v}/ 
directory.
+   # If it's an old link, remove to convert to directory.
+   if test -l "current-$v" ; then rm "current-$v" ; fi
+   mkdir -p "current-$v"
+
+   # Remove old links in the directory.
+   find "current-$v" -type l ! -name "$f" ! -name 
"${variant_date}*"
+
+   # install new links
+   # do NOT use -f here, we do not want to override the existing 
files.
+   # this will ensure the mtime of the links does not change in 
most cases.
+   ln -s --target-directory="current-$v"/ "../${variant_path}"*
 
# Update keepfile
echo "${variant_path}" | sed -e 's,/.*,,g' -e 's,^,/,g' -e 
's,$,$,g' >>"${keepfile_tmp}"
@@ -209,6 +225,11 @@ process_arch() {
# Place latest-*txt into place in the base arch dir.
mv -f "${f_tmp}" "${f}"
 
+   # current-${variant}/latest-${variant}.txt contains the 
RELATIVE filename
+   # So we have to strip the leading directory on the path.
+   # reuse the tmpfile from $f
+   sed "s,^${variant_date}/,,g" <"${f}" >"${f_tmp}" && mv -f 
"${f_tmp}" "current-$v"/"${f}"
+
done
 
# Atomic move these files if created.



[gentoo-commits] repo/gentoo:master commit in: sys-apps/dmidecode/

2023-10-02 Thread Robin H. Johnson
commit: 5ef41dc17c3b7fba6354d8229e682b839f0b7ff1
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Oct  2 23:00:21 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Oct  2 23:00:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ef41dc1

sys-apps/dmidecode: cleanup whitespace

Signed-off-by: Robin H. Johnson  gentoo.org>

 sys-apps/dmidecode/dmidecode-3.5-r3.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sys-apps/dmidecode/dmidecode-3.5-r3.ebuild 
b/sys-apps/dmidecode/dmidecode-3.5-r3.ebuild
index 67960f7676a5..250442ecf4bc 100644
--- a/sys-apps/dmidecode/dmidecode-3.5-r3.ebuild
+++ b/sys-apps/dmidecode/dmidecode-3.5-r3.ebuild
@@ -7,7 +7,6 @@ EAPI=8
 # Check regularly after releases!
 inherit flag-o-matic toolchain-funcs
 
-
 DESCRIPTION="DMI (Desktop Management Interface) table related utilities"
 HOMEPAGE="https://www.nongnu.org/dmidecode/;
 SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz;



[gentoo-commits] repo/gentoo:master commit in: sys-apps/dmidecode/

2023-10-02 Thread Robin H. Johnson
commit: b2c692dc609957da262098c2f99e84f689dc766a
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Oct  2 21:36:38 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Oct  2 21:40:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2c692dc

sys-apps/dmidecode: revbump with recommended patch from upstream

Signed-off-by: Robin H. Johnson  gentoo.org>

 sys-apps/dmidecode/Manifest|  2 ++
 sys-apps/dmidecode/dmidecode-3.5-r3.ebuild | 58 ++
 2 files changed, 60 insertions(+)

diff --git a/sys-apps/dmidecode/Manifest b/sys-apps/dmidecode/Manifest
index 7a7bd062f49f..a7f27051e149 100644
--- a/sys-apps/dmidecode/Manifest
+++ b/sys-apps/dmidecode/Manifest
@@ -1,2 +1,4 @@
 DIST dmidecode-3.4.tar.xz 61420 BLAKE2B 
f9f0429c5128692c2d1d560580552285ea900c1c9ef6f68f0e2133ae1ef05b85a943e882f915d3ef969b7a7e3f3f6bbc4ec391e7bd3d98092976ddbf02421c49
 SHA512 
62990b6159e5a7c8688d37e44957e7948391d2c6afeabaa4514ba9dad2d08b020297676e2dbbfcb6471efc6fb6f3682750422931a953f78f358bb3dd3745e95b
+DIST dmidecode-3.5-80de376231e903d2cbea95e51ffea31860502159.patch 1762 BLAKE2B 
b3b1d4232ab8089cfd405f5bf88a9e5eab7be244b70c3af663b33836c0e2d7c7bc01affa41e826ff0129b66afd6a066f51a722d8a0ab64c42990a1d1440285c4
 SHA512 
cb7cc66e608bfd67d1db6ba96e887b06c11526956819ea48c378edbb93af139600b41501330ae936bfbe333de461265b51d680170fb044b29d70fedfeb47f52a
+DIST dmidecode-3.5-c76ddda0ba0aa99a55945e3290095c2ec493c892.patch 1933 BLAKE2B 
e3aff73dc780d3d6b92a9d0de05906a620657664c3b30d40bc10a57e29522e883f671ce7658c0fdea6ee6c2b891639c1639a695f4f2f25dbe091cc93c6951cee
 SHA512 
7caee6762b6676f4e133025cd0e68e7fbd93ae2dea773b2f6180505fda3384f60e0de40ae32322ff50a470b7986dbf6071a86dd770d7bca9df3cc601dbc0e18b
 DIST dmidecode-3.5.tar.xz 65068 BLAKE2B 
07cc4c069dc1cba36160de158c4d0390df9b77b4192f5847df0756f9e097a7fbc751cd7b5b073df7661267ab78ea0d9be2831d70ddda8d1981c628f3cfee8802
 SHA512 
690c9bea391f6bbfc8cd48e8db408a61d5b551a07a2823c29d03a09607fc2043cc1bea44ee9fd27fd0e7bc0b287bf9de9f22a1a66053f5b1e63d77c03d93e1ae

diff --git a/sys-apps/dmidecode/dmidecode-3.5-r3.ebuild 
b/sys-apps/dmidecode/dmidecode-3.5-r3.ebuild
new file mode 100644
index ..67960f7676a5
--- /dev/null
+++ b/sys-apps/dmidecode/dmidecode-3.5-r3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Upstream often give "recommended patches" at 
https://www.nongnu.org/dmidecode/
+# Check regularly after releases!
+inherit flag-o-matic toolchain-funcs
+
+
+DESCRIPTION="DMI (Desktop Management Interface) table related utilities"
+HOMEPAGE="https://www.nongnu.org/dmidecode/;
+SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz;
+PATCHES=()
+UPSTREAM_PATCHES=(
+   c76ddda0ba0aa99a55945e3290095c2ec493c892
+   80de376231e903d2cbea95e51ffea31860502159
+)
+
+for c in "${UPSTREAM_PATCHES[@]}" ; do
+   SRC_URI+=" 
https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=${c} -> 
${P}-${c}.patch "
+   PATCHES+=( "${DISTDIR}"/${P}-${c}.patch )
+done
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
+
+src_prepare() {
+   default
+
+   sed -i \
+   -e "/^prefix/s:/usr/local:${EPREFIX}/usr:" \
+   -e "/^docdir/s:dmidecode:${PF}:" \
+   -e '/^PROGRAMS !=/d' \
+   Makefile || die
+}
+
+src_compile() {
+   append-lfs-flags
+
+   emake \
+   CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+   LDFLAGS="${LDFLAGS}" \
+   CC="$(tc-getCC)"
+}
+
+pkg_postinst() {
+   if [[ ${CHOST} == *-solaris* ]] ; then
+   einfo "dmidecode needs root privileges to read /dev/xsvc"
+   einfo "To make dmidecode useful, either run as root, or chown 
and setuid the binary."
+   einfo "Note that /usr/sbin/ptrconf and /usr/sbin/ptrdiag give 
similar"
+   einfo "information without requiring root privileges."
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/dmidecode/

2023-10-02 Thread Robin H. Johnson
commit: 7f5f3e60e178525ce96d7a7ae964f9164ab03c18
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Oct  2 21:41:27 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Mon Oct  2 21:41:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f5f3e60

sys-apps/dmidecode: ebuild cleanup

Bug: https://bugs.gentoo.org/905093
Signed-off-by: Robin H. Johnson  gentoo.org>

 sys-apps/dmidecode/Manifest|  1 -
 sys-apps/dmidecode/dmidecode-3.4-r1.ebuild | 47 --
 sys-apps/dmidecode/dmidecode-3.5-r1.ebuild | 47 --
 3 files changed, 95 deletions(-)

diff --git a/sys-apps/dmidecode/Manifest b/sys-apps/dmidecode/Manifest
index a7f27051e149..3cbad40a4371 100644
--- a/sys-apps/dmidecode/Manifest
+++ b/sys-apps/dmidecode/Manifest
@@ -1,4 +1,3 @@
-DIST dmidecode-3.4.tar.xz 61420 BLAKE2B 
f9f0429c5128692c2d1d560580552285ea900c1c9ef6f68f0e2133ae1ef05b85a943e882f915d3ef969b7a7e3f3f6bbc4ec391e7bd3d98092976ddbf02421c49
 SHA512 
62990b6159e5a7c8688d37e44957e7948391d2c6afeabaa4514ba9dad2d08b020297676e2dbbfcb6471efc6fb6f3682750422931a953f78f358bb3dd3745e95b
 DIST dmidecode-3.5-80de376231e903d2cbea95e51ffea31860502159.patch 1762 BLAKE2B 
b3b1d4232ab8089cfd405f5bf88a9e5eab7be244b70c3af663b33836c0e2d7c7bc01affa41e826ff0129b66afd6a066f51a722d8a0ab64c42990a1d1440285c4
 SHA512 
cb7cc66e608bfd67d1db6ba96e887b06c11526956819ea48c378edbb93af139600b41501330ae936bfbe333de461265b51d680170fb044b29d70fedfeb47f52a
 DIST dmidecode-3.5-c76ddda0ba0aa99a55945e3290095c2ec493c892.patch 1933 BLAKE2B 
e3aff73dc780d3d6b92a9d0de05906a620657664c3b30d40bc10a57e29522e883f671ce7658c0fdea6ee6c2b891639c1639a695f4f2f25dbe091cc93c6951cee
 SHA512 
7caee6762b6676f4e133025cd0e68e7fbd93ae2dea773b2f6180505fda3384f60e0de40ae32322ff50a470b7986dbf6071a86dd770d7bca9df3cc601dbc0e18b
 DIST dmidecode-3.5.tar.xz 65068 BLAKE2B 
07cc4c069dc1cba36160de158c4d0390df9b77b4192f5847df0756f9e097a7fbc751cd7b5b073df7661267ab78ea0d9be2831d70ddda8d1981c628f3cfee8802
 SHA512 
690c9bea391f6bbfc8cd48e8db408a61d5b551a07a2823c29d03a09607fc2043cc1bea44ee9fd27fd0e7bc0b287bf9de9f22a1a66053f5b1e63d77c03d93e1ae

diff --git a/sys-apps/dmidecode/dmidecode-3.4-r1.ebuild 
b/sys-apps/dmidecode/dmidecode-3.4-r1.ebuild
deleted file mode 100644
index 3f52315eea2e..
--- a/sys-apps/dmidecode/dmidecode-3.4-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Upstream often give "recommended patches" at 
https://www.nongnu.org/dmidecode/
-# Check regularly after releases!
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="DMI (Desktop Management Interface) table related utilities"
-HOMEPAGE="https://www.nongnu.org/dmidecode/;
-SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
-
-src_prepare() {
-   default
-
-   sed -i \
-   -e "/^prefix/s:/usr/local:${EPREFIX}/usr:" \
-   -e "/^docdir/s:dmidecode:${PF}:" \
-   -e '/^PROGRAMS !=/d' \
-   Makefile || die
-}
-
-src_compile() {
-   append-lfs-flags
-
-   emake \
-   CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-   LDFLAGS="${LDFLAGS}" \
-   CC="$(tc-getCC)"
-}
-
-pkg_postinst() {
-   if [[ ${CHOST} == *-solaris* ]] ; then
-   einfo "dmidecode needs root privileges to read /dev/xsvc"
-   einfo "To make dmidecode useful, either run as root, or chown 
and setuid the binary."
-   einfo "Note that /usr/sbin/ptrconf and /usr/sbin/ptrdiag give 
similar"
-   einfo "information without requiring root privileges."
-   fi
-}

diff --git a/sys-apps/dmidecode/dmidecode-3.5-r1.ebuild 
b/sys-apps/dmidecode/dmidecode-3.5-r1.ebuild
deleted file mode 100644
index 3f52315eea2e..
--- a/sys-apps/dmidecode/dmidecode-3.5-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Upstream often give "recommended patches" at 
https://www.nongnu.org/dmidecode/
-# Check regularly after releases!
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="DMI (Desktop Management Interface) table related utilities"
-HOMEPAGE="https://www.nongnu.org/dmidecode/;
-SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv x86"
-IUSE="selinux"
-
-RDEP

[gentoo-commits] repo/gentoo:master commit in: app-text/xapian-omega/

2023-09-23 Thread Robin H. Johnson
commit: 6bd906fe17543def3ee9190fe1552dc54f0379fc
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Sep 23 22:51:09 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Sep 23 22:55:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bd906fe

app-text/xapian-omega: bump

Signed-off-by: Robin H. Johnson  gentoo.org>

 app-text/xapian-omega/Manifest   |  1 +
 app-text/xapian-omega/xapian-omega-1.4.23.ebuild | 43 
 2 files changed, 44 insertions(+)

diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 68dfdea871c6..fa62e5c7d98b 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -1 +1,2 @@
 DIST xapian-omega-1.4.22.tar.xz 570476 BLAKE2B 
05bd5c8135870b3a2058bcd032da9609cac7d0b1a07b31cb84f8fdf175bb87d22acd9beb392f93ebf1f23e4ebf4d23fbe12b70063628d318012b71246d14f26b
 SHA512 
460120fa2c76ad99f818f4183c4ded92eaa7f01a9dd782af1e93faf11caf2479053f45a9e9f0a602bf31631dba8be2d2c18bba28340c578126e8658ad4937c19
+DIST xapian-omega-1.4.23.tar.xz 571596 BLAKE2B 
fee64cf73a7bc8e6951c3555f1139bec8c94102b00ccf3a0a69c5037002f122f0d1688a798967f997f85d6c21bd69d72758168408d95159a7442bc46050fe915
 SHA512 
2137972cebb10315f35024c8a5e179ce082eab777e4fd795ba6700eeab0d77ec49b6e06d104222e77824898c25c1717d346564d59e5f349360fec89476e3ee4f

diff --git a/app-text/xapian-omega/xapian-omega-1.4.23.ebuild 
b/app-text/xapian-omega/xapian-omega-1.4.23.ebuild
new file mode 100644
index ..a9a75d694991
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.4.23.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+HOMEPAGE="https://xapian.org/;
+DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI 
search frontend"
+SRC_URI="https://oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+   dev-lang/perl
+   dev-libs/libpcre2:=
+   ~dev-libs/xapian-${PV}:0/30
+   sys-apps/file
+   sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+   emake DESTDIR="${D}" PREFIX="${EPREFIX}" install
+
+   # Protect /etc/omega.conf
+   echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega || die
+   doenvd "${T}"/20xapian-omega
+   dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+
+   # Directory containing Xapian databases:
+   keepdir /var/lib/omega/data
+
+   # Directory containing OmegaScript templates:
+   keepdir /var/lib/omega/templates
+   mv "${S}"/templates/* "${ED}"/var/lib/omega/templates || die
+
+   # Directory to write Omega logs to:
+   keepdir /var/log/omega
+
+   # Directory containing any cdb files for the $lookup OmegaScript 
command:
+   keepdir /var/lib/omega/cdb
+}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/xapian-bindings/

2023-09-23 Thread Robin H. Johnson
commit: 7e46f17f731ee1f92eab3e4f339d650c6ca888c8
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Sep 23 22:55:36 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Sep 23 22:55:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e46f17f

dev-libs/xapian-bindings: bump

Signed-off-by: Robin H. Johnson  gentoo.org>

 dev-libs/xapian-bindings/Manifest  |   1 +
 .../xapian-bindings/xapian-bindings-1.4.23.ebuild  | 346 +
 2 files changed, 347 insertions(+)

diff --git a/dev-libs/xapian-bindings/Manifest 
b/dev-libs/xapian-bindings/Manifest
index d839b6dab20c..122ddf823365 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1 +1,2 @@
 DIST xapian-bindings-1.4.22.tar.xz 1074840 BLAKE2B 
49c71ece1a159a21b95ff8b6d30c5786e6fd2d1744f0a2e27427b83a85ebced6106ab57655715f6e2089bc3e56da32d6f2ad3d71303a1b75316c7d1a61f84cd0
 SHA512 
0d1b615646d1bdf383e4e32ae152c1493a23ad173232929c8153bb311b3f5b6c6728f29f46f703854c9249ffb35cb620eda1d68cf742c2150f628c19ed55c10f
+DIST xapian-bindings-1.4.23.tar.xz 1076480 BLAKE2B 
521563f86d3be88458cee220065cbdbf27633f87535b1702c8c3484860533dc9395060c72582420e32b854601c1ee1eb424e03a9251965215de834f2b130b154
 SHA512 
25ac17baf1f288dedce70b983cba294d4ce100f6f5b607c76f5b697c04f6b08c276a55ccd5b9cc9c429664e1bb86f0fc31d88c72481a9cc951942efdfa9726a2

diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.23.ebuild 
b/dev-libs/xapian-bindings/xapian-bindings-1.4.23.ebuild
new file mode 100644
index ..b59be4df131d
--- /dev/null
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.23.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1,3,4} luajit )
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="threads(+)"
+
+USE_PHP="php8-0 php8-1 php8-2"
+
+PHP_EXT_NAME="xapian"
+PHP_EXT_INI="yes"
+PHP_EXT_OPTIONAL_USE="php"
+
+USE_RUBY="ruby30 ruby31 ruby32"
+RUBY_OPTIONAL="yes"
+
+# mono-env does not support EAPI 8
+inherit autotools java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 
python-r1 ruby-ng
+
+DESCRIPTION="SWIG and JNI bindings for Xapian"
+HOMEPAGE="https://xapian.org/;
+SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz;
+S="${WORKDIR}/${P}"# need this here, some inherited eclasses change it
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="java lua mono perl php python ruby tcl"
+REQUIRED_USE="
+   || ( java lua mono perl php python ruby tcl )
+   lua? ( ${LUA_REQUIRED_USE} )
+   python? ( ${PYTHON_REQUIRED_USE} )
+   ruby? ( || ( $(ruby_get_use_targets) ) )
+"
+
+COMMONDEPEND="
+   >=dev-libs/xapian-1.4.23
+   lua? ( ${LUA_DEPS} )
+   mono? ( dev-lang/mono )
+   perl? ( dev-lang/perl:= )
+   php? ( dev-lang/php:=[-threads] )
+   python? (
+   dev-python/sphinx[${PYTHON_USEDEP}]
+   ${PYTHON_DEPS}
+   )
+   ruby? ( $(ruby_implementations_depend) )
+   tcl? ( dev-lang/tcl:= )
+"
+DEPEND="
+   ${COMMONDEPEND}
+   virtual/pkgconfig
+   java? ( >=virtual/jdk-1.8:* )
+"
+RDEPEND="
+   ${COMMONDEPEND}
+   java? ( >=virtual/jre-1.8:* )
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.4.22-remove-precompiled-python.patch
+   "${FILESDIR}"/${PN}-1.4.22-fix-java-installation.patch
+)
+
+has_basic_bindings() {
+   # Update this list if new bindings are added that are not built
+   # multiple times for multiple versions like lua, php, python and ruby 
are
+   return $(use mono || use java || use perl || use tcl)
+}
+
+php_copy_sources() {
+   local MULTIBUILD_VARIANTS=($(php_get_slots))
+   multibuild_copy_sources
+}
+
+php_foreach_impl() {
+   local MULTIBUILD_VARIANTS=($(php_get_slots))
+   multibuild_foreach_variant "$@"
+}
+
+ruby_copy_sources() {
+   local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
+   multibuild_copy_sources
+}
+
+ruby_foreach_impl() {
+   local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
+   multibuild_foreach_variant "$@"
+}
+
+pkg_setup() {
+   use mono && mono-env_pkg_setup
+   use java && java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+   default
+
+   if use php; then
+   local php_slot
+   for php_slot in $(php_get_slots); do
+   # Unfortunately required for 
php-ext-source-r3_createinifiles().
+   mkdir "${WORKDIR}/${php_slot}"
+   done
+   fi
+}
+
+src_prepare() {
+   eapply "${PATCHES[@]}"
+   eautoreconf
+
+   

[gentoo-commits] repo/gentoo:master commit in: net-misc/s4cmd/

2023-09-23 Thread Robin H. Johnson
commit: 9719ac2fea815ef91d49c36e51d39262bbb69e8c
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Sep 23 22:13:15 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Sep 23 22:55:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9719ac2f

net-misc/s4cmd: fix py3.10 issue per upstream PR

Signed-off-by: Robin H. Johnson  gentoo.org>

 net-misc/s4cmd/Manifest|  1 +
 net-misc/s4cmd/metadata.xml|  3 +++
 ...s4cmd-2.1.0-r1.ebuild => s4cmd-2.1.0-r2.ebuild} | 10 +---
 net-misc/s4cmd/s4cmd-2.1.0.ebuild  | 29 --
 4 files changed, 11 insertions(+), 32 deletions(-)

diff --git a/net-misc/s4cmd/Manifest b/net-misc/s4cmd/Manifest
index 2f1d3e2af092..83de44f6b719 100644
--- a/net-misc/s4cmd/Manifest
+++ b/net-misc/s4cmd/Manifest
@@ -1,2 +1,3 @@
 DIST s4cmd-2.1.0-botocore-fix.patch 2449 BLAKE2B 
5158ded38f8e3417c090d274063a4eaa4f25cd5005c4bb8793cc639d3d87875f31d87464a8dbb44b5c1690570865cb01a0681f2e92edc46fa549828b91f30a0a
 SHA512 
ea889d069a86a1d1f7f5cf5b1f19a9d0b35527c3db5eecf9202cca742ad4442655169d8688fc4b290a1362a0a794ba8ac44abf697ea7830acf8e48b6c7998ef6
+DIST s4cmd-2.1.0-py3-iter.patch 768 BLAKE2B 
3e6bf42d40b87048521e1e3672bbb5c75a2d923696c85cfe9cd7140a388b483d830002354562ccc6017a8c8225799c0cb9ead2e136a37fec7ed0722e6ee99c39
 SHA512 
8070a987bf48c5832a80f39213125b4209141d1c35e612b26dce307fa621772741401f1da355b2a56e7869a3c76f4b91301d4aeae56f3810ce9a6ce6f9fd917b
 DIST s4cmd-2.1.0.tar.gz 39312 BLAKE2B 
9d2d533273543153f2bad69362933315f65c5e70bd45c102e42b1b733989815239ae4d027ac08d658f03263bd9dd75f1f6db802b5f38ed3256da5e7c9f48558c
 SHA512 
05e930e2789ce8ab280dcdb2f08e4162930d946d2ed2e4f1c754c8b875375774779b73729151bd23d9bf3736bc48f7626fe53df66aff71dd11b32e90e9355470

diff --git a/net-misc/s4cmd/metadata.xml b/net-misc/s4cmd/metadata.xml
index aaab041e8885..2b826ec06b69 100644
--- a/net-misc/s4cmd/metadata.xml
+++ b/net-misc/s4cmd/metadata.xml
@@ -4,4 +4,7 @@
 
   robb...@gentoo.org
 
+
+  bloomreach/s4cmd
+
 

diff --git a/net-misc/s4cmd/s4cmd-2.1.0-r1.ebuild 
b/net-misc/s4cmd/s4cmd-2.1.0-r2.ebuild
similarity index 63%
rename from net-misc/s4cmd/s4cmd-2.1.0-r1.ebuild
rename to net-misc/s4cmd/s4cmd-2.1.0-r2.ebuild
index 6be09aed0ddd..d80445061cdb 100644
--- a/net-misc/s4cmd/s4cmd-2.1.0-r1.ebuild
+++ b/net-misc/s4cmd/s4cmd-2.1.0-r2.ebuild
@@ -3,17 +3,21 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_10 )
+PYTHON_COMPAT=( python3_10 python3_11 python3_12 )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1 bash-completion-r1
 
 DESCRIPTION="Super S3 command line tool"
 HOMEPAGE="https://github.com/bloomreach/s4cmd;
-SRC_URI="https://github.com/bloomreach/s4cmd/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
-SRC_URI+=" https://github.com/bloomreach/s4cmd/pull/310.patch -> 
${P}-botocore-fix.patch "
+SRC_URI="
+   https://github.com/bloomreach/s4cmd/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz
+   https://github.com/bloomreach/s4cmd/pull/162.patch -> 
${P}-py3-iter.patch
+   https://github.com/bloomreach/s4cmd/pull/310.patch -> 
${P}-botocore-fix.patch
+"
 PATCHES=(
"${DISTDIR}/${P}-botocore-fix.patch"
+   "${DISTDIR}/${P}-py3-iter.patch"
 )
 
 LICENSE="GPL-2"

diff --git a/net-misc/s4cmd/s4cmd-2.1.0.ebuild 
b/net-misc/s4cmd/s4cmd-2.1.0.ebuild
deleted file mode 100644
index ad0c96c26eb5..
--- a/net-misc/s4cmd/s4cmd-2.1.0.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
-
-PYTHON_COMPAT=( python3_10 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 bash-completion-r1
-
-DESCRIPTION="Super S3 command line tool"
-HOMEPAGE="https://github.com/bloomreach/s4cmd;
-SRC_URI="https://github.com/bloomreach/s4cmd/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-   dev-python/pytz[${PYTHON_USEDEP}]
-   dev-python/boto3[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_install() {
-   distutils-r1_src_install
-   dobashcomp data/bash-completion/s4cmd
-   rm -f "${D}"/usr/bin/s4cmd.py
-}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/xapian/

2023-09-23 Thread Robin H. Johnson
commit: b1f3fc559fd26489d5e9658065f8a2fffd33a636
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Sep 23 22:46:08 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sat Sep 23 22:55:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1f3fc55

dev-libs/xapian: bump

Signed-off-by: Robin H. Johnson  gentoo.org>

 dev-libs/xapian/Manifest |  1 +
 dev-libs/xapian/xapian-1.4.23.ebuild | 67 
 2 files changed, 68 insertions(+)

diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index e2eaea148e9b..84d8efdcab8f 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -1 +1,2 @@
 DIST xapian-core-1.4.22.tar.xz 3019608 BLAKE2B 
f4aec86cd5f63f6f1825a4f8f427ea23be2092ffb4ca11a2fdf20bdf652e7b9f768b1155bcf7ee5e5c5313206c92e1725d1b4d562e3074539a2e8f9901c44f8e
 SHA512 
60d66adbacbd59622d25e392060984bd1dc6c870f9031765f54cb335fb29f72f6d006d27af82a50c8da2cfbebd08dac4503a8afa8ad51bc4e6fa9cb367a59d29
+DIST xapian-core-1.4.23.tar.xz 3024644 BLAKE2B 
e26a9fd5e79daf553b474e3c794178df2cdcd83ce7d7a45ae112dde624d6e7add157c76fda3a333afce6103b2edaf7e3c928e78c47aa1fd19821c3c73926442f
 SHA512 
52dffc93301f99aa150dda8ecd5fb7cc7d0f2ce30e60f393b1058055ade24281af16cf5b5c0e6b08e4754e3d18c39bb5bc068b19330a294ad460ef8a6bc56380

diff --git a/dev-libs/xapian/xapian-1.4.23.ebuild 
b/dev-libs/xapian/xapian-1.4.23.ebuild
new file mode 100644
index ..40a621af6000
--- /dev/null
+++ b/dev-libs/xapian/xapian-1.4.23.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN}-core-${PV}"
+
+DESCRIPTION="Xapian Probabilistic Information Retrieval library"
+HOMEPAGE="https://xapian.org/;
+SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz;
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0/30" # ABI version of libxapian.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
+IUSE="doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote"
+
+DEPEND="
+   sys-apps/util-linux
+   sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+
+DOCS="AUTHORS HACKING PLATFORMS README NEWS"
+
+src_configure() {
+   local -a myconf
+
+   if use cpu_flags_x86_sse2; then
+   myconf+=( --enable-sse=sse2 )
+   else
+   if use cpu_flags_x86_sse; then
+   myconf+=( --enable-sse=sse )
+   else
+   myconf+=( --disable-sse )
+   fi
+   fi
+
+   myconf+=( $(use_enable static-libs static) )
+
+   use inmemory || myconf+=( --disable-backend-inmemory )
+   use remote || myconf+=( --disable-backend-remote )
+
+   myconf+=(
+   --enable-backend-glass
+   --enable-backend-chert
+   --program-suffix=
+   )
+
+   econf "${myconf[@]}"
+}
+
+src_test() {
+   emake check VALGRIND=
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+
+   if ! use doc; then
+   rm -r "${ED}/usr/share/doc/${PF}" || die
+   fi
+
+   einstalldocs
+
+   find "${ED}" -name "*.la" -type f -delete || die
+}



[gentoo-commits] repo/gentoo:master commit in: dev-ruby/simplecov_json_formatter/

2023-09-09 Thread Robin H. Johnson
commit: 1c7c3a67fd2b589d81d091592947b76ad5535f42
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Sep 10 04:40:37 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Sep 10 04:42:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c7c3a67

dev-ruby/simplecov_json_formatter: builds on x86

Signed-off-by: Robin H. Johnson  gentoo.org>

 dev-ruby/simplecov_json_formatter/simplecov_json_formatter-0.1.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/dev-ruby/simplecov_json_formatter/simplecov_json_formatter-0.1.4.ebuild 
b/dev-ruby/simplecov_json_formatter/simplecov_json_formatter-0.1.4.ebuild
index 7adae99a8881..ed945ab79881 100644
--- a/dev-ruby/simplecov_json_formatter/simplecov_json_formatter-0.1.4.ebuild
+++ b/dev-ruby/simplecov_json_formatter/simplecov_json_formatter-0.1.4.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="JSON formatter for SimpleCov"
 HOMEPAGE="https://github.com/codeclimate-community/simplecov_json_formatter;
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~riscv ~x86"
 SLOT="$(ver_cut 1)"
 IUSE="doc"
 



[gentoo-commits] repo/gentoo:master commit in: dev-ruby/docile/

2023-09-09 Thread Robin H. Johnson
commit: 1e882a799f06baca911d0226a603291be54d5472
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Sep 10 04:39:05 2023 +
Commit:     Robin H. Johnson  gentoo  org>
CommitDate: Sun Sep 10 04:42:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e882a79

dev-ruby/docile: works on x86

Signed-off-by: Robin H. Johnson  gentoo.org>

 dev-ruby/docile/docile-1.4.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-ruby/docile/docile-1.4.0-r1.ebuild 
b/dev-ruby/docile/docile-1.4.0-r1.ebuild
index 994b53ba6f46..769a2e7393c0 100644
--- a/dev-ruby/docile/docile-1.4.0-r1.ebuild
+++ b/dev-ruby/docile/docile-1.4.0-r1.ebuild
@@ -19,7 +19,7 @@ 
SRC_URI="https://github.com/ms-ati/docile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE=""
 
 all_ruby_prepare() {



  1   2   3   4   5   6   7   8   9   10   >