Re: [gentoo-dev] Last rites: various more revdep-less Haskell packages
On Sun, Aug 21, 2022 at 03:23:46AM +0100, Sam James wrote: > # hololeap (2022-08-21) > # Monolithic mask for dev-haskell/* packages which have no reverse > dependencies, > # are broken, or severely out of date. The aim is to have the Haskell overlay > # (::haskell) be the place for development packages and only have packages > # needed for end-user applications in ::gentoo, as the status quo has > # proven to be unsustainable. More up-to-date versions of these packages > # are available in ::haskell. This subset are needed for Ganeti, which I'd really like to get back into the main tree (I'm talking w/ upstream about newer Py3 versions). Normal usage: ganeti-3.0.2-r2.ebuild: >=dev-haskell/hslogger-1.1.4:0= =dev-haskell/regex-pcre-0.94.2:0= =dev-haskell/snap-core-1.0.0:0= ganeti-3.0.2-r2.ebuild: >=dev-haskell/snap-server-1.0.0:0= USE=test: ganeti-3.0.2-r2.ebuild: dev-haskell/haddock:0= ganeti-3.0.2-r2.ebuild: dev-util/shelltestrunner -- Robin Hugh Johnson Gentoo Linux: Dev, Infra Lead, Foundation Treasurer E-Mail : robb...@gentoo.org GnuPG FP : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85 GnuPG FP : 7D0B3CEB E9B85B1F 825BCECF EE05E6F6 A48F6136
[gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
commit: 503b08b33fa2c0d9bbab96fb7704c6348c6bad57
Author: Robin H. Johnson gentoo org>
AuthorDate: Sat Jul 23 17:11:25 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sat Jul 23 17:11:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=503b08b3
app-emulation/ganeti: add live ebuilds
Signed-off-by: Robin H. Johnson gentoo.org>
app-emulation/ganeti/ganeti-3.0.2-r2.ebuild | 10 +++---
.../{ganeti-3.0.2-r2.ebuild => ganeti-3.0..ebuild} | 10 +++---
.../{ganeti-3.0.2-r2.ebuild => ganeti-3.1..ebuild} | 12
3 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
b/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
index e6ac4895670c..ea66aef7fbf0 100644
--- a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
+++ b/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
@@ -14,8 +14,9 @@ MY_P="${PN}-${MY_PV}"
SERIES="3.0"
if [[ ${PV} =~ [9]{4,} ]] ; then
- EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
- inherit git-2
+ EGIT_REPO_URI="https://github.com/ganeti/ganeti";
+ EGIT_BRANCH="stable-$SERIES"
+ inherit git-r3
PATCHES=()
else
DEBIAN_PV="${PV}"
@@ -233,8 +234,11 @@ src_prepare() {
PATCHES+=(
)
fi
+
# Some debian patches have trailing whitespace, which trips upstream
testing
- sed -r -i -e 's,[[:space:]]+$,,g' "${WORKDIR}"/debian/patches/* || die
"sed failed"
+ if test -d "${WORKDIR}"/debian/patches ; then
+ sed -r -i -e 's,[[:space:]]+$,,g' "${WORKDIR}"/debian/patches/*
|| die "sed failed"
+ fi
eapply "${PATCHES[@]}"
# Upstream commits:
diff --git a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
b/app-emulation/ganeti/ganeti-3.0..ebuild
similarity index 98%
copy from app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
copy to app-emulation/ganeti/ganeti-3.0..ebuild
index e6ac4895670c..ea66aef7fbf0 100644
--- a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
+++ b/app-emulation/ganeti/ganeti-3.0..ebuild
@@ -14,8 +14,9 @@ MY_P="${PN}-${MY_PV}"
SERIES="3.0"
if [[ ${PV} =~ [9]{4,} ]] ; then
- EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
- inherit git-2
+ EGIT_REPO_URI="https://github.com/ganeti/ganeti";
+ EGIT_BRANCH="stable-$SERIES"
+ inherit git-r3
PATCHES=()
else
DEBIAN_PV="${PV}"
@@ -233,8 +234,11 @@ src_prepare() {
PATCHES+=(
)
fi
+
# Some debian patches have trailing whitespace, which trips upstream
testing
- sed -r -i -e 's,[[:space:]]+$,,g' "${WORKDIR}"/debian/patches/* || die
"sed failed"
+ if test -d "${WORKDIR}"/debian/patches ; then
+ sed -r -i -e 's,[[:space:]]+$,,g' "${WORKDIR}"/debian/patches/*
|| die "sed failed"
+ fi
eapply "${PATCHES[@]}"
# Upstream commits:
diff --git a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
b/app-emulation/ganeti/ganeti-3.1..ebuild
similarity index 97%
copy from app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
copy to app-emulation/ganeti/ganeti-3.1..ebuild
index e6ac4895670c..10ff7a522300 100644
--- a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
+++ b/app-emulation/ganeti/ganeti-3.1..ebuild
@@ -11,11 +11,12 @@ inherit autotools bash-completion-r1 python-single-r1
tmpfiles
MY_PV="${PV/_rc/~rc}"
MY_PV="${MY_PV/_beta/~beta}"
MY_P="${PN}-${MY_PV}"
-SERIES="3.0"
+SERIES="3.1"
if [[ ${PV} =~ [9]{4,} ]] ; then
- EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
- inherit git-2
+ EGIT_REPO_URI="https://github.com/ganeti/ganeti";
+ EGIT_BRANCH="master" # not branched yet
+ inherit git-r3
PATCHES=()
else
DEBIAN_PV="${PV}"
@@ -233,8 +234,11 @@ src_prepare() {
PATCHES+=(
)
fi
+
# Some debian patches have trailing whitespace, which trips upstream
testing
- sed -r -i -e 's,[[:space:]]+$,,g' "${WORKDIR}"/debian/patches/* || die
"sed failed"
+ if test -d "${WORKDIR}"/debian/patches ; then
+ sed -r -i -e 's,[[:space:]]+$,,g' "${WORKDIR}"/debian/patches/*
|| die "sed failed"
+ fi
eapply "${PATCHES[@]}"
# Upstream commits:
[gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
commit: fda210935dfcccb1177c3f638b20a9277e06a083
Author: Robin H. Johnson gentoo org>
AuthorDate: Sat Jul 23 17:02:48 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sat Jul 23 17:11:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fda21093
app-emulation/ganeti: drop KEYWORDS for live build
Signed-off-by: Robin H. Johnson gentoo.org>
app-emulation/ganeti/ganeti-3.0.2-r2.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
b/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
index 63cf7b305b44..e6ac4895670c 100644
--- a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
+++ b/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
@@ -16,7 +16,6 @@ SERIES="3.0"
if [[ ${PV} =~ [9]{4,} ]] ; then
EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
inherit git-2
- KEYWORDS=""
PATCHES=()
else
DEBIAN_PV="${PV}"
[gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
commit: 95f319609f352948f30b552ea453811c14255900
Author: Robin H. Johnson gentoo org>
AuthorDate: Sat Jul 23 16:26:40 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sat Jul 23 16:39:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95f31960
app-emulation/ganeti: remove unused multiple-users support
The metadata description said running VMs as different users, but that
was never correct. It was running the daemons as different users, but
QEMU still ran as root and dropped (some) privileges.
Signed-off-by: Robin H. Johnson gentoo.org>
app-emulation/ganeti/ganeti-3.0.2-r2.ebuild | 24 +---
app-emulation/ganeti/metadata.xml | 1 -
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
b/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
index 9487945d0a93..bf35bdba6614 100644
--- a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
+++ b/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
@@ -35,7 +35,7 @@ HOMEPAGE="http://www.ganeti.org/";
LICENSE="GPL-2"
SLOT="0"
-IUSE="drbd experimental ipv6 kvm lxc monitoring multiple-users rbd syslog test
xen restricted-commands"
+IUSE="drbd experimental ipv6 kvm lxc monitoring rbd syslog test xen
restricted-commands"
RESTRICT="!test? ( test )"
REQUIRED_USE="|| ( kvm xen lxc )
@@ -208,12 +208,14 @@ pkg_setup() {
local user
python-single-r1_pkg_setup
- if use multiple-users; then
- for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
- enewgroup ${user}
- enewuser ${user} -1 -1 -1 ${user}
- done
- fi
+ # Unknown if this functionality was ever used. Maybe re-introduce if
issues
+ # reported.
+ #if use multiple-users; then
+ # for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
+ # enewgroup ${user}
+ # enewuser ${user} -1 -1 -1 ${user}
+ # done
+ #fi
}
# These flags get applied in src_prepare and src_configure
@@ -300,10 +302,10 @@ src_configure() {
--enable-metadata
$(use_enable restricted-commands)
$(use_enable test haskell-tests)
- $(usex multiple-users "--with-default-user=" "" "gnt-daemons"
"")
- $(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}"
"")
- $(usex multiple-users "--with-default-group=" "" "gnt-daemons"
"")
- $(usex multiple-users "--with-group-prefix=" ""
"${GROUP_PREFIX}" "")
+ #$(usex multiple-users "--with-default-user=" "" "gnt-daemons"
"")
+ #$(usex multiple-users "--with-user-prefix=" ""
"${USER_PREFIX}" "")
+ #$(usex multiple-users "--with-default-group=" "" "gnt-daemons"
"")
+ #$(usex multiple-users "--with-group-prefix=" ""
"${GROUP_PREFIX}" "")
$(use_enable syslog)
$(use_enable monitoring)
$(usex kvm '--with-kvm-path=' ''
"/usr/bin/qemu-system-${kvm_arch}" '')
diff --git a/app-emulation/ganeti/metadata.xml
b/app-emulation/ganeti/metadata.xml
index 302c0dece0ae..d37ba927d87a 100644
--- a/app-emulation/ganeti/metadata.xml
+++ b/app-emulation/ganeti/metadata.xml
@@ -23,7 +23,6 @@
Enable DRBD support
Enable KVM support
Enable Linux Containers support
- Enable support for running VMs as
different users
Enable the ganeti monitoring
daemon
Enable restricted commands in
the node daemon
Enable rados block device support via
sys-cluster/ceph
[gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
commit: 89f3b64d528e199d4813bba5c34cf0e2bf775b9d
Author: Robin H. Johnson gentoo org>
AuthorDate: Sat Jul 23 16:28:29 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sat Jul 23 16:39:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89f3b64d
app-emulation/ganeti: cleanup old ebuilds
Signed-off-by: Robin H. Johnson gentoo.org>
app-emulation/ganeti/Manifest | 2 -
app-emulation/ganeti/ganeti-3.0.1.ebuild| 408
app-emulation/ganeti/ganeti-3.0.2-r1.ebuild | 407 ---
app-emulation/ganeti/ganeti-3.0.2.ebuild| 406 ---
4 files changed, 1223 deletions(-)
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index 3fd7ba80686f..3fa0d08d946d 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -1,4 +1,2 @@
-DIST ganeti-3.0.1.tar.gz 4924135 BLAKE2B
8d1ffce082d8fa907ef298f2fb08183ac1691d87431d3c521c3ffcebe415496119edfcfe4679a45eb9f0c75b7faa01a6824f67272ea5b5feef7435cf5f5a1789
SHA512
26dc600356a65815d03c2ca88c33e41a211fd7aec9efea8be57d9871d4b288ad563dbf142267b933c8d1950d2449a21a63e341a2679dfa49e14aba78c2da5944
DIST ganeti-3.0.2.tar.gz 4941978 BLAKE2B
d2d11554e202895e93531254ffe68f1ac69943870c9bb91cccbda17bf1f43dba27dcb869aff9f35aca23b4b3f7100597f71ebe3a46e464ec5b24d2f34606935d
SHA512
8724888251ba952eb2861f9322adf7d022bbe92fcee0c92c033d07397907737e7f54a5a8751c24beb6343392e7b6ddba4b61981ef5879e47d821ffeae34fa1c1
-DIST ganeti_3.0.1-2.debian.tar.xz 46932 BLAKE2B
34b81c9a73d79b86d5d8fbfda6f680f73dd5fcdb53078d4885922065c7ba1d9552bb0d1718d90b647513a85efb00840f8a6df37dbfb2a2b79d252e98d3a61427
SHA512
c3886b0090602c03322347853ec4e188386d23a896371782545589fb5c182f42afed450dd3851806d4ff6ebd567a96a4cfc3891ea60beae5bbcca9fd61eca81e
DIST ganeti_3.0.2-1.debian.tar.xz 45700 BLAKE2B
5b2c2285102f46b8e4bceaf040880fe38f999c4abe483b415065fc9408eb713643b69c16d2a468d9e159dcf6fd9388732db03db53955fa603e902a13faa2979e
SHA512
49e4698998b87a3c204558b60be59d2b9810783d9c8d94b64eeb72302b3ed62c41decb4d24b54cf9c45f13ad3549362e4b837addc7de4a0e5efc646fb6f6c52f
diff --git a/app-emulation/ganeti/ganeti-3.0.1.ebuild
b/app-emulation/ganeti/ganeti-3.0.1.ebuild
deleted file mode 100644
index 2ae107281bf9..
--- a/app-emulation/ganeti/ganeti-3.0.1.ebuild
+++ /dev/null
@@ -1,408 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python3_{7..8})
-PYTHON_REQ_USE="ipv6(+)?"
-
-inherit user autotools bash-completion-r1 python-single-r1 tmpfiles versionator
-
-MY_PV="${PV/_rc/~rc}"
-MY_PV="${MY_PV/_beta/~beta}"
-MY_P="${PN}-${MY_PV}"
-SERIES="$(get_version_component_range 1-2)"
-
-if [[ ${PV} =~ [9]{4,} ]] ; then
- EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
- inherit git-2
- KEYWORDS=""
- PATCHES=()
-else
- DEBIAN_PV="${PV}"
-
#http://deb.debian.org/debian/pool/main/g/ganeti/ganeti_3.0.1-2.debian.tar.xz
- DEBIAN_PATCH=2
-
SRC_URI="https://github.com/ganeti/ganeti/releases/download/v${PV}/${P}.tar.gz";
- [[ -n "${DEBIAN_PATCH}" ]] && SRC_URI+="
mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${DEBIAN_PV}-${DEBIAN_PATCH}.debian.tar.xz"
- KEYWORDS="~amd64 ~x86"
- PATCHES=(
-
"${WORKDIR}"/debian/patches/0001-verify-warn-about-weak-certs.patch
-
"${WORKDIR}"/debian/patches/0002-remove-hardcoded-libc-linux-constants.patch
-
"${WORKDIR}"/debian/patches/0003-Fix-lvcreate-for-newer-lvm-versions-1586.patch
-
"${WORKDIR}"/debian/patches/0004-Fix-live-migration-of-xen-instances-1582.patch
- )
-fi
-
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="http://www.ganeti.org/";
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="drbd experimental ipv6 kvm lxc monitoring multiple-users rbd syslog test
xen restricted-commands"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="|| ( kvm xen lxc )
- test? ( ipv6 )
- kvm? ( || ( amd64 x86 ) )
- ${PYTHON_REQUIRED_USE}"
-
-USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
-GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
-
-DEPEND="
- dev-libs/openssl:0
- $(python_gen_cond_dep '
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- dev-python/simplejson[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/pyinotify[${PYTHON_USEDEP}]
- dev-python/pycurl[${PYTHON_USEDEP}]
- dev-python/ipaddr[${PYTHON_USEDEP}]
[gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/, app-emulation/ganeti/files/
commit: 12c9e0894d3cba531421ad82fe0f78ce70b246db Author: Robin H. Johnson gentoo org> AuthorDate: Sat Jul 23 16:19:04 2022 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat Jul 23 16:39:36 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12c9e089 app-emulation/ganeti: import from infra overlay before cleanup Signed-off-by: Robin H. Johnson gentoo.org> app-emulation/ganeti/Manifest | 4 + ...st_agent-QEMU-Guest-Agent-sup.stable-2.15.patch | 122 ++ ...st_agent-QEMU-Guest-Agent-sup.stable-2.16.patch | 122 ++ .../ganeti/files/fix_ftbfs_with_sphinx_1.4 | 47 +++ .../ganeti/files/ganeti-2.10-rundir.patch | 35 ++ .../ganeti/files/ganeti-2.11-add-pgrep.patch | 25 ++ .../files/ganeti-2.11-daemon-util-tests.patch | 38 ++ .../files/ganeti-2.11-dont-nest-libdir.patch | 49 +++ .../files/ganeti-2.11-dont-print-man-help.patch| 13 + app-emulation/ganeti/files/ganeti-2.11-tests.patch | 13 + .../ganeti/files/ganeti-2.12-qemu-enable-kvm.patch | 12 + .../files/ganeti-2.12-start-stop-daemon-args.patch | 39 ++ .../files/ganeti-2.13-process_unittest.patch | 21 ++ .../ganeti/files/ganeti-2.15-daemon-util.patch | 53 +++ .../ganeti/files/ganeti-2.15-disable-docs.patch| 44 +++ ...ont-invert-return-values-for-man-warnings.patch | 10 + .../ganeti-2.15-kvmd-run-as-daemon-user.patch | 33 ++ .../files/ganeti-2.15-noded-must-run-as-root.patch | 50 +++ .../ganeti/files/ganeti-2.15-python-mock.patch | 26 ++ .../ganeti/files/ganeti-2.15-respect-HFLAGS.patch | 12 + .../files/ganeti-2.15-use-balloon-device.patch | 13 + .../ganeti/files/ganeti-2.15.2-bdev_py.patch | 16 + .../files/ganeti-2.15.2-check-man-warnings.patch | 13 + .../files/ganeti-2.15.2-ftbfs-sphinx-warning.patch | 41 +++ .../ganeti/files/ganeti-2.15.2-pyopenssl.patch | 33 ++ ...aneti-2.15.2-remove-sandbox-failing-tests.patch | 58 +++ .../ganeti-2.16-kvmd-run-as-daemon-user.patch | 30 ++ .../files/ganeti-2.16-noded-must-run-as-root.patch | 26 ++ .../ganeti/files/ganeti-2.17-relax-deps.patch | 21 ++ .../files/ganeti-2.9-disable-root-tests.patch | 18 + .../ganeti/files/ganeti-2.9-skip-cli-test.patch| 18 + .../ganeti/files/ganeti-3.0.1-buildfix.patch | 79 .../ganeti/files/ganeti-3.0.1-docfixes.patch | 10 + .../files/ganeti-3.0.1-gentoo-infra-hacks.patch| 195 ++ .../ganeti/files/ganeti-3.0.1-sphinx.patch | 9 + .../files/ganeti-3.0.1-template_haskell.patch | 24 ++ .../ganeti/files/ganeti-3.0.2-docfixes.patch | 11 + .../ganeti-3.0.2-gentoo-daemon-util-part2.patch| 64 .../ganeti/files/ganeti-3.0.2-less-sleep.patch | 20 + .../ganeti/files/ganeti-kvm-poweroff.confd | 4 + .../ganeti/files/ganeti-kvm-poweroff.initd | 57 +++ app-emulation/ganeti/files/ganeti-lockdir.patch| 15 + app-emulation/ganeti/files/ganeti-tmpfilesd| 41 +++ app-emulation/ganeti/files/ganeti.confd-r2 | 19 + app-emulation/ganeti/files/ganeti.confd-r5 | 30 ++ app-emulation/ganeti/files/ganeti.initd-r3 | 96 + app-emulation/ganeti/files/ganeti.initd-r4 | 96 + app-emulation/ganeti/files/ganeti.initd-r5 | 103 ++ app-emulation/ganeti/files/ganeti.initd-r6 | 108 ++ app-emulation/ganeti/ganeti-3.0.1.ebuild | 408 + app-emulation/ganeti/ganeti-3.0.2-r1.ebuild| 407 app-emulation/ganeti/ganeti-3.0.2-r2.ebuild| 408 + app-emulation/ganeti/ganeti-3.0.2.ebuild | 406 app-emulation/ganeti/metadata.xml | 33 ++ 54 files changed, 3698 insertions(+) diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest new file mode 100644 index ..3fd7ba80686f --- /dev/null +++ b/app-emulation/ganeti/Manifest @@ -0,0 +1,4 @@ +DIST ganeti-3.0.1.tar.gz 4924135 BLAKE2B 8d1ffce082d8fa907ef298f2fb08183ac1691d87431d3c521c3ffcebe415496119edfcfe4679a45eb9f0c75b7faa01a6824f67272ea5b5feef7435cf5f5a1789 SHA512 26dc600356a65815d03c2ca88c33e41a211fd7aec9efea8be57d9871d4b288ad563dbf142267b933c8d1950d2449a21a63e341a2679dfa49e14aba78c2da5944 +DIST ganeti-3.0.2.tar.gz 4941978 BLAKE2B d2d11554e202895e93531254ffe68f1ac69943870c9bb91cccbda17bf1f43dba27dcb869aff9f35aca23b4b3f7100597f71ebe3a46e464ec5b24d2f34606935d SHA512 8724888251ba952eb2861f9322adf7d022bbe92fcee0c92c033d07397907737e7f54a5a8751c24beb6343392e7b6ddba4b61981ef5879e47d821ffeae34fa1c1 +DIST ganeti_3.0.1-2.debian.tar.xz 46932 BLAKE2B 34b81c9a73d79b86d5d8fbfda6f680f73dd5fcdb53078d4885922065c7ba1d9552bb0d1718d90b647513a85efb00840f8a6df37dbfb2a2b79d252e98d3a61427 SHA512 c3886b0090602c03322347853ec4e188386d23a896371782545589fb5c182f42afed450dd3851806d4ff6ebd567a96a4cfc3891ea60beae5bbcca9fd61eca81e +DIST ganet
[gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
commit: 168aed309a8a063132b5c7afa20fbc5371b23410
Author: Robin H. Johnson gentoo org>
AuthorDate: Sat Jul 23 16:39:19 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sat Jul 23 16:39:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=168aed30
app-emulation/ganeti: cleanup & update to EAPI8
Signed-off-by: Robin H. Johnson gentoo.org>
app-emulation/ganeti/ganeti-3.0.2-r2.ebuild | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
b/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
index bf35bdba6614..63cf7b305b44 100644
--- a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
+++ b/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
@@ -1,16 +1,17 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
+# As of 3.0.2, Upstream does NOT yet support newer than python3.8
PYTHON_COMPAT=(python3_{7..8})
PYTHON_REQ_USE="ipv6(+)?"
-inherit user autotools bash-completion-r1 python-single-r1 tmpfiles versionator
+inherit autotools bash-completion-r1 python-single-r1 tmpfiles
MY_PV="${PV/_rc/~rc}"
MY_PV="${MY_PV/_beta/~beta}"
MY_P="${PN}-${MY_PV}"
-SERIES="$(get_version_component_range 1-2)"
+SERIES="3.0"
if [[ ${PV} =~ [9]{4,} ]] ; then
EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
@@ -136,8 +137,7 @@ DEPEND="
rbd? ( sys-cluster/ceph )
ipv6? ( net-misc/ndisc6 )
${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
- !app-emulation/ganeti-htools"
+RDEPEND="${DEPEND}"
DEPEND+="
sys-devel/m4
app-text/pandoc
[gentoo-commits] repo/gentoo:master commit in: profiles/
commit: 108ff6abc2c03f580198689e26768f04516f76af Author: Robin H. Johnson gentoo org> AuthorDate: Sat Jul 23 16:38:45 2022 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat Jul 23 16:39:36 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=108ff6ab profiles: mask app-emulation/ganeti for gradual re-introduction Signed-off-by: Robin H. Johnson gentoo.org> profiles/package.mask | 4 1 file changed, 4 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index f0960a0a140e..c0fe09f756fa 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,6 +33,10 @@ #--- END OF EXAMPLES --- +# Robin H. Johnson (2022-07-23) +# Prepare to re-introduce into the tree +app-emulation/ganeti + # Sam James (2022-07-22) # Monolithic mask for dev-haskell/* packages which have no reverse dependencies, # are broken, or severely out of date. The aim is to have the Haskell overlay
[gentoo-commits] repo/gentoo:master commit in: dev-python/fdsend/files/, dev-python/fdsend/
commit: 6ec3baaf3f7e733462a0a453863710884df472a2
Author: Robin H. Johnson gentoo org>
AuthorDate: Sat Jul 23 15:55:44 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sat Jul 23 15:57:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ec3baaf
dev-python/fdsend: re-add newer upstream version, needed for ganeti
Signed-off-by: Robin H. Johnson gentoo.org>
dev-python/fdsend/Manifest | 1 +
dev-python/fdsend/fdsend-0.3.0.ebuild | 30 +
dev-python/fdsend/files/fdsend-0.3.0-2to3.patch | 12 ++
dev-python/fdsend/metadata.xml | 13 +++
4 files changed, 56 insertions(+)
diff --git a/dev-python/fdsend/Manifest b/dev-python/fdsend/Manifest
new file mode 100644
index ..80c8c0ec7b23
--- /dev/null
+++ b/dev-python/fdsend/Manifest
@@ -0,0 +1 @@
+DIST fdsend-0.3.0.tar.gz 14988 BLAKE2B
dc80885a4f69bc00bf02ba64377b3638354685d3f5290376bc808916f4bd912293d39babe7dbd27b04d0580823734403ac01033ca89423d7803c79bab827864e
SHA512
f3b9ad3f74439f10e6938672a6d391ac33298f49cc32e14bbaf1c1efc7ebfae09b2ac5d73296dae3085c2da5debeb7ad50d9591c50c42dd5f584b138f3bb4bb6
diff --git a/dev-python/fdsend/fdsend-0.3.0.ebuild
b/dev-python/fdsend/fdsend-0.3.0.ebuild
new file mode 100644
index ..5b2f60ab4cf6
--- /dev/null
+++ b/dev-python/fdsend/fdsend-0.3.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="flexible file descriptor passing"
+HOMEPAGE="https://github.com/fknittel/python-fdsend/";
+SRC_URI="https://github.com/fknittel/python-fdsend/archive/refs/tags/${PV}.tar.gz
-> ${P}.tar.gz"
+DEPEND+=" test? ( dev-python/unittest-or-fail )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}/python-${P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.3.0-2to3.patch
+)
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+ 2to3 . || die
+
+ distutils-r1_python_prepare_all
+}
diff --git a/dev-python/fdsend/files/fdsend-0.3.0-2to3.patch
b/dev-python/fdsend/files/fdsend-0.3.0-2to3.patch
new file mode 100644
index ..5645a31da001
--- /dev/null
+++ b/dev-python/fdsend/files/fdsend-0.3.0-2to3.patch
@@ -0,0 +1,12 @@
+Newer setuptools dropped 2to3 support, so let's call it in the ebuild instead.
+--- a/setup.py
b/setup.py
+@@ -7,8 +7,6 @@ try:
+ setupopts = {
+ 'test_suite':"fdsend.tests",
+ }
+-if sys.version_info >= (3,):
+-setupopts['use_2to3'] = True
+ except ImportError:
+ from distutils.core import setup
+ setupopts = {}
diff --git a/dev-python/fdsend/metadata.xml b/dev-python/fdsend/metadata.xml
new file mode 100644
index ..54f73721b65e
--- /dev/null
+++ b/dev-python/fdsend/metadata.xml
@@ -0,0 +1,13 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+
+ robb...@gentoo.org
+ Robin H. Johnson
+
+
+ in...@gentoo.org
+ Gentoo Infrastructure Team
+
+
+
[gentoo-dev] Re: [gentoo-project] RFC: "Trusted contributor model"
On Fri, Jul 22, 2022 at 02:56:33PM +0300, Joonas Niilola wrote: > Cross-posting to gentoo-dev and -project lists due to technical and > non-technical nature. Reply-to is set to -project. ... > 1st RFC: "Trusted contributor model" > > I'm proposing us to giving special commit access to our well-reputable > contributors (mostly proxied maintainers). They'd have access _only_ to > their maintained package in git-tree. To understand what I mean, check > git shortlog -s -n net-im/telegram-desktop-bin/ > git shortlog -s -n net-im/signal-desktop-bin/ Conceptually, yes, I think this is a good improvement. I'd like upstream to be included as well in this set, for upstreams that know their own package much better than us. > On the technical side I'm not sure how to achieve this, but I know it > can be done. For example the sync-repos are compiled like this all the > time. If this proposal gains support, I'm willing to start figuring it > out more in-depth. Technically, I've got some implementation problems. We *can* write a simple gitolite ACL that limits scope to a directory or file, e.g. CAT/PN/ BUT, we can't write a simple gitolite ACL that limits the content within profiles/package.mask or other files in profiles/ (we can write hooks that might be able to do this, but that still requires the challenge of validation inside the file). I'd EXPECT a contributor to WANT to package.mask a cutting edge version so it has time to bake and get well-tested, but if they can't do both parts of the commit themselves, this process is likely problematic. > 2nd RFC: Recruiting proven contributors without a mentor > > I'm aware recruiters don't really need to ask a permission here, but I > believe it's great to gauge the general feelings about this beforehand. > What would you say if recruiters started more actively approaching > potential developers? ... > But seeing the general lack of interest towards mentoring, maybe this is > something we _need_ to do in near future. Yes, let's make it possible to join by the quiz, and the recruiting only, mentors can be optional. But in parallel: It's been ~7 years since I last mentored somebody, mostly for reasons of time with having young kids. How do we make the mentorship process more lightweight? (and possibly the quiz process, I haven't seen how the quiz has changed since I last mentored) Let's start with a potential intersection of your two ideas: (these numbers are arbitrary, but try to reflect what I see some of the trusted contributors doing) - 9 good submissions (patches or PRs) over a 3 month period [must be at least 3/month] - will get you an invite from recruiters to join - either without a mentor, or a lightweight mentor -- Robin Hugh Johnson Gentoo Linux: Dev, Infra Lead, Foundation Treasurer E-Mail : robb...@gentoo.org GnuPG FP : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85 GnuPG FP : 7D0B3CEB E9B85B1F 825BCECF EE05E6F6 A48F6136 signature.asc Description: PGP signature
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/gitolite-gentoo/
commit: d14bd80c3852dde9660e749f37210befe81fe02d
Author: Robin H. Johnson gentoo org>
AuthorDate: Sun Jul 17 00:00:40 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sun Jul 17 00:00:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d14bd80c
dev-vcs/gitolite-gentoo: cleanup old stable
Signed-off-by: Robin H. Johnson gentoo.org>
.../gitolite-gentoo-2.3.1-r2.ebuild| 71 --
.../gitolite-gentoo-3.6.6.1-r2.ebuild | 106 -
2 files changed, 177 deletions(-)
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r2.ebuild
b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r2.ebuild
deleted file mode 100644
index 05571da3b29d..
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit perl-module
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo
fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git";
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="contrib vim-syntax"
-
-DEPEND="
- dev-lang/perl
- >=dev-vcs/git-1.6.6
- virtual/perl-File-Path
- virtual/perl-File-Temp
-"
-RDEPEND="
- ${DEPEND}
- acct-group/git
- acct-user/git[gitolite]
- !dev-vcs/gitolite
- dev-perl/Net-SSH-AuthorizedKeysFile
- vim-syntax? ( app-vim/gitolite-syntax )"
-
-src_prepare() {
- default
-
- rm Makefile doc/COPYING || die
- rm -rf contrib/{gitweb,vim} || die
-
- echo "${PF}-gentoo" > conf/VERSION
-}
-
-src_install() {
- local gl_bin="${D}/usr/bin"
- gl_bin=${gl_bin/\/\//\/}
-
- dodir /usr/share/gitolite/{conf,hooks} /usr/bin
-
- export PATH="${gl_bin}:${PATH}"
- ./src/gl-system-install ${gl_bin} \
- "${D}"/usr/share/gitolite/conf "${D}"/usr/share/gitolite/hooks
|| die
- sed -e "s:${D}::g" "${D}/usr/bin/gl-setup" \
- -i "${D}/usr/share/gitolite/conf/example.gitolite.rc" || die
-
- rm "${D}"/usr/bin/*.pm
- insinto "${VENDOR_LIB}"
- doins src/*.pm
-
- dodoc README.mkd doc/*
-
- use contrib && dodoc -r contrib
-}
-
-pkg_postinst() {
- # bug 352291
- ewarn
- elog "Please make sure that your 'git' user has the correct homedir
(/var/lib/gitolite)."
- elog "Especially if you're migrating from gitosis."
- ewarn
- ewarn
- elog "If you use the umask feature and upgrade from
<=gitolite-gentoo-1.5.9.1"
- elog "then please check the permissions of all repositories using the
umask feature"
- ewarn
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r2.ebuild
b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r2.ebuild
deleted file mode 100644
index 0f02b78dc441..
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-[[ ${PV} == * ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
-EGIT_MASTER=master
-
-inherit perl-module ${SCM}
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo
fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git";
-if [[ ${PV} != * ]]; then
- SRC_URI="mirror://gentoo/${P}.tar.bz2"
- KEYWORDS="amd64 x86"
-else
- SRC_URI=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux tools vim-syntax"
-
-DEPEND="
- dev-lang/perl
- >=dev-vcs/git-1.6.6
- virtual/perl-File-Path
- virtual/perl-File-Temp
-"
-RDEPEND="
- ${DEPEND}
- acct-group/git
- acct-user/git[gitolite]
- >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
- dev-perl/JSON
- !dev-vcs/gitolite
- vim-syntax? ( app-vim/gitolite-syntax )
- selinux? ( sec-policy/selinux-gitosis )
-"
-
-src_prepare() {
- default
- echo "${PF}-gentoo" > src/VERSION || die
-}
-
-src_install() {
- local uexec=/usr/libexec/${PN}
-
- rm -rf src/lib/Gitolite/Test{,.pm}
- insinto $VENDOR_LIB
- doins -r src/lib/Gitolite
-
- dodoc README.markdown CHANGELOG
- # These are meant by upstream as examples, you are strongly recommended
to
- # customize them for your needs.
- dodoc contrib/utils/ip
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/gitolite-gentoo/
commit: 0a586ba2938241f100eebe58bb8b102bb9044081
Author: Robin H. Johnson gentoo org>
AuthorDate: Sat Jul 16 23:44:15 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sat Jul 16 23:44:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a586ba2
dev-vcs/gitolite-gentoo: backport v3.6.11 security fix
Signed-off-by: Robin H. Johnson gentoo.org>
Closes: https://bugs.gentoo.org/show_bug.cgi?id=858470
dev-vcs/gitolite-gentoo/Manifest | 1 +
.../gitolite-gentoo-3.6.6.1-r3.ebuild | 111 +
2 files changed, 112 insertions(+)
diff --git a/dev-vcs/gitolite-gentoo/Manifest b/dev-vcs/gitolite-gentoo/Manifest
index dbbccee93775..6f00ea070c65 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-2.3.1.tar.bz2 198849 BLAKE2B
88268e4588003cb1b8b4e340fd858a2be65b8156f3ff5033cf7f8c988d8373c4dc7c41b0d589126e143e8eaa19071fda87532f9052c06f7952f5f3ef549e486a
SHA512
994ee759d87659eb4f4bfbe6618d1bd74e83df2e6c8d710ca1c929d86e05b1152639bf5c99b906f7d20f9585163f872f04d9710e29b1d73ada998595553d294e
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.6.1-r3.ebuild
new file mode 100644
index ..55176f69e41d
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r3.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+[[ ${PV} == * ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
+EGIT_MASTER=master
+
+inherit perl-module ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo
fork"
+HOMEPAGE="https://cgit.gentoo.org/proj/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=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux tools vim-syntax"
+
+DEPEND="
+ dev-lang/perl
+ >=dev-vcs/git-1.6.6
+ virtual/perl-File-Path
+ virtual/perl-File-Temp
+"
+RDEPEND="
+ ${DEPEND}
+ acct-group/git
+ acct-user/git[gitolite]
+ >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
+ dev-perl/JSON
+ !dev-vcs/gitolite
+ vim-syntax? ( app-vim/gitolite-syntax )
+ selinux? ( sec-policy/selinux-gitosis )
+"
+
+PATCHES=(
+ "${DISTDIR}"/5df2b817255ee919991da6c310239e08c8fcc1ae.patch
+)
+
+src_prepare() {
+ default
+ echo "${PF}-gentoo" > src/VERSION || die
+}
+
+src_install() {
+ local uexec=/usr/libexec/${PN}
+
+ rm -rf src/lib/Gitolite/Test{,.pm}
+ insinto $VENDOR_LIB
+ doins -r src/lib/Gitolite
+
+ dodoc 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
+
+ insopts -m0755
+ insinto $uexec
+ doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+ doins -r contrib/{commands,triggers,hooks}
+
+ insopts -m0644
+ doins src/VERSION
+
+ exeinto $uexec
+ doexe src/gitolite{,-shell}
+
+ dodir /usr/bin
+ for bin in gitolite{,-shell}; do
+ 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
+}
+
+pkg_postinst() {
+ local old_ver
+ for old_ver in ${REPLACING_VERSIONS}; do
+ if ver_test ${old_ver} -lt "3" ; then
+ ewarn
+ elog "***NOTE*** This is a major upgrade and will
likely break your existing gitolite-2.x setup!"
+
Re: [gentoo-dev] Proposal to undeprecate EGO_SUM
On Sat, Jul 16, 2022 at 09:31:35PM +0300, Arthur Zamarin wrote: > I want to give another option. Both ways are allowed by eclass, but by > QA policy (or some other decision), it is prohibited to use EGO_SUM in > main ::gentoo tree. > > As a result, overlays and ::guru can use the EGO_SUM or dist distfile > (remember, they don't have access to hosting on dev.g.o). Yes; this is the option I was trying to propose as an intermediate step until we have indirect Manifests that provide the best of both worlds (not bloating the tree, and not requiring creation of dep tarballs). -- Robin Hugh Johnson Gentoo Linux: Dev, Infra Lead, Foundation Treasurer E-Mail : robb...@gentoo.org GnuPG FP : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85 GnuPG FP : 7D0B3CEB E9B85B1F 825BCECF EE05E6F6 A48F6136 signature.asc Description: PGP signature
Re: [gentoo-dev] [PATCH] glep-0076: Require real name instead of legal name
On Wed, Jul 13, 2022 at 02:26:43AM +0200, Ulrich Mueller wrote: > The "natural person" part was lost in this change. It also doesn't > reappear in the added section below. I think we don't want any corporate > entities there (or at least that's what I had taken from the previous > "Sony" discussion). Will re-add to the name section. For this section, I had a further thought and feel this is cleaner: to the commit message as a separate line. The sign-off must contain -the committer's legal name as a natural person, i.e., the name that -would appear in a government issued document. +the contributor's name as discussed in the next section. > > +Contributor Name > > + > I just notice that it says "contributor" here while it is "committer" > above. Not sure which is better, but maybe we should use the same word > everywhere? I think this might warrant a larger discussion. The Kernel DCO is required for all patches, not just commits. The GCO rev 1 text borrowed the same word: contribution. Specifically the author of the contribution can easily be different from the person committing it into a VCS. Contributors are a superset of committers. At the same time, I've already seen developers ask contributors for a sign-off, even when it's only the developer doing the commit; which isn't required by the Gentoo policy as it's written today. Maybe this specific commit that changes "legal name" should stick to "committer", which the explicit plan to make the text > > +Contributors must sign off on contributions with a name that can be made > > +public and would pass copyright due diligence. > Suggestion: "with their name as a natural person" Agreed & queued. Will incorporate after other discussion above is concluded. > > +For revision 1.2, further thanks are extended to kuzetsa CatSwarm, > > +Richard Freeman, John Helmert III, Ulrich Müller and Alec Warner. > The authors thanking themselves would be very unusual in an > acknowledgement. :) I suggest to just add John Helmert III to the > existing list (keeping alphabetical order). All others are either > authors or are already mentioned. If I do that, the specific contributions of multiple parties already in the author list are not acknowledged for this revision: rich0, antarus, ulm. The new text was substantially written by myself, with the great suggestion from kuzetsa, and then everybody else contributed good edits to it. If you're happy to not take extra acknowledgement that this was for Rev 1.2, I'll just tweak it to add kuzetsa to authors and ajak to thanks list. -- Robin Hugh Johnson Gentoo Linux: Dev, Infra Lead, Foundation Treasurer E-Mail : robb...@gentoo.org GnuPG FP : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85 GnuPG FP : 7D0B3CEB E9B85B1F 825BCECF EE05E6F6 A48F6136 signature.asc Description: PGP signature
Re: [gentoo-dev] [PATCH] glep-0076: Require real name instead of legal name
(CC to gentoo-project as required by the GLEP itself). On Tue, Jul 12, 2022 at 05:28:36AM +0500, Anna Vyalkova wrote: > This patch uses more friendly language towards potential transgender > and plural contributors. > > No other projects require to use a legal name, e.g. Linux says to use > your real name[0]. > > Government issued documents are really a bad example since in some > countries it's really hard to get your name changed there. Hi Anna, There was a very long discussion in #gentoo-council IRC about this today, with many sides represented. I apologize I didn't follow who suggested some of the ideas first, so if something was mis-credited, the fault lies with me. The need is for GLEP76's name requirement to balance copyright protection with complexities of jurisdictional naming complexities [4][5]. The kernel DCO says: "using your real name (sorry, no pseudonyms or anonymous contributions.)" Copyright law itself, at various levels (including US law and WIPO treaty [CR001EN]) treaty does permit copyright held by pseudonyms in many cases. But Copyright law also makes assumptions that some body, be it publisher or government office, holds the "real" identity (which can be discovered by legal or other actions), and the publisher holds some liability in this process. Thus Copyright law tries to impose the need to associate a person with a a copyrightable work. Thus it raises two questions: - Is the open source organization that receives a contribution a publisher in this case? - If the organization is a publisher, does this mean they are required to implement some level of Know-Your-Customer (KYC) system? This is all so messy :-(. Maybe we can approach it from a different angle. The older version of the GLEP did use the term "real name", and it was changed to "legal name" because the advice at the time is that "real name" wasn't well-defined. https://bugs.gentoo.org/653118 https://gitweb.gentoo.org/data/glep.git/commit/glep-0076.rst?id=5713e7e0fbeb37a74743f11c80da2d8bdd87acf2 I previously proposed amending it further: https://archives.gentoo.org/gentoo-project/message/26d68349541e4db54a93edf57d6e7404 But in further discussion, even my proposal didn't go far enough. Neither "real name" or "legal name" correctly convey the underlying intent here, and both of them have additional unwanted baggage [1][2][3], and disproportionately impact some population groups. Tying this back together: The Foundation has *zero* desire to implement a KYC system, or to be the holders of any non-public personal information. Esp. The Foundation does not want to even have to look at ID documents. So it's not acceptable to just have: "send your linkage between pseudonym and name-on-ID to trustees". What's really needed? GLEP76 must show that Gentoo (as a legal entity: the current Foundation, or future umbrella), has undertaken due diligence in accepting the contribution. The discussion in #gentoo-council ended up producing a potential text that I'll attached as a patch. I'd like to thank the following for their contributions to the text. kuzetsa CatSwarm ** significant wording Richard Freeman John Helmert III Ulrich Müller Alec Warner [1] https://en.wikipedia.org/wiki/Battle.net#Privacy_and_Real_ID [2] https://en.wikipedia.org/wiki/Facebook_real-name_policy_controversy [3] https://en.wikipedia.org/wiki/Nymwars [4] Depending where you are, it can range from very easy to almost-impossible to change your name. [5] In https://archives.gentoo.org/gentoo-project/message/26d68349541e4db54a93edf57d6e7404, I linked many other examples [CR001EN] https://wipolex-res.wipo.int/edocs/lexdocs/laws/en/cr/cr001en.html -- Robin Hugh Johnson Gentoo Linux: Dev, Infra Lead, Foundation Treasurer E-Mail : robb...@gentoo.org GnuPG FP : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85 GnuPG FP : 7D0B3CEB E9B85B1F 825BCECF EE05E6F6 A48F6136 From 77a948ffecf97035a42359be0a0b40ad5059fe2f Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Tue, 12 Jul 2022 14:52:23 -0700 Subject: [PATCH] glep-0076: clarify name policy Signed-off-by: Robin H. Johnson --- glep-0076.rst | 29 +++-- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git glep-0076.rst glep-0076.rst index 2216483..ce98ac8 100644 --- glep-0076.rst +++ glep-0076.rst @@ -5,12 +5,13 @@ Author: Richard Freeman , Alice Ferrazzi , Ulrich Müller , Robin H. Johnson , -Michał Górny +Michał Górny , +kuzetsa CatSwarm Type: Informational Status: Active -Version: 1.1 +Version: 1.2 Created: 2013-04-23 -Last-Modified: 2022-07-02 +Last-Modified: 2022-07-12 Post-History: 2018-06-10, 2018-06-19, 2018-08-31, 2018-09-26 Content-Type: text/x-rst --- @@ -136,9 +137,8 @@ the Certificate of Origin by adding :: Signed-off-by: N
[Fedora-legal-list] Re: Is ECDSA secp256k1 elliptic curve permitted to be packaged in Fedora?
On Tue, Jul 05, 2022 at 12:46:10PM +0200, Miro Hrončok wrote: > Hello legal. > > I see that ECDSA is already included in Fedora in various packages, so I > assume > that is OK. > > This software here: > https://github.com/starkbank/ecdsa-python > > Says: > > We currently support secp256k1 [curve]. > Is that OK to package in Fedora or not? IANAL or anybody from Fedora, but a similar thread is still waiting for a larger proclaimation about Elliptic Curves in general: https://lists.fedoraproject.org/archives/list/legal@lists.fedoraproject.org/message/FSOAICNZF5VSXX6XBWKKRAQ34HFUY4A5/ The package you linked includes secp256k1 and prime256v1. -- Robin Hugh Johnson Gentoo Linux: Dev, Infra Lead, Foundation Treasurer E-Mail : robb...@gentoo.org GnuPG FP : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85 GnuPG FP : 7D0B3CEB E9B85B1F 825BCECF EE05E6F6 A48F6136 signature.asc Description: PGP signature ___ legal mailing list -- legal@lists.fedoraproject.org To unsubscribe send an email to legal-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/legal@lists.fedoraproject.org Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure
Re: [gentoo-dev] proposal
On Mon, Jul 04, 2022 at 05:27:03PM +0200, David Seifert wrote: > On Mon, 2022-07-04 at 16:19 +0200, Florian Schmaus wrote: > > I'd like to propose a new metadata XML element for packages: > > > > ... > Ultimately, all these things really matter when only the defaults > change. Turn-right-on-red in the US is such a thing, because unless > otherwise stated, it's the norm. Knowing our devbase, with roughly 75% > mostly AWOL and barely reading the MLs, I don't think this idea will > bring about the desired change. Instead, we should really just go for > the tag, because my feeling is that > the default will be that most maintainers don't mind non-maintainer > commits, except a select few territorial ones. I had a rough draft similar proposal to this before that was never completed into GLEP. It had 3 states however: a) go ahead and touch it, no additional approvals needed b) please get a maintainer to approve it c) do not touch it With b) being the proposed default as status-quo at the time. That however was years ago, and I'll entirely agree that the devbase isn't as watchful anymore. With that said, I stand behind the intent of making the default a), with a migration period. Something like this for the migration period: July 1 to Sep 30: default is still b), to allow developers time to update their metadata. Oct 1 onwards: default becomes a) -- Robin Hugh Johnson Gentoo Linux: Dev, Infra Lead, Foundation Treasurer E-Mail : robb...@gentoo.org GnuPG FP : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85 GnuPG FP : 7D0B3CEB E9B85B1F 825BCECF EE05E6F6 A48F6136 signature.asc Description: PGP signature
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/files/
commit: a2b6e0fc6c044df63edd22693da4e3d62a4930f3
Author: Robin H. Johnson gentoo org>
AuthorDate: Mon Jul 4 16:39:36 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Mon Jul 4 16:39:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2b6e0fc
sys-kernel/genkernel: refresh patch
Signed-off-by: Robin H. Johnson gentoo.org>
Closes: https://bugs.gentoo.org/856346
.../files/genkernel-4.2.6-boost-optim.patch| 23 --
.../files/genkernel-4.2.6-gcc-12-boost-1.79.patch | 28 ++
2 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/sys-kernel/genkernel/files/genkernel-4.2.6-boost-optim.patch
b/sys-kernel/genkernel/files/genkernel-4.2.6-boost-optim.patch
deleted file mode 100644
index 356202ddc095..
--- a/sys-kernel/genkernel/files/genkernel-4.2.6-boost-optim.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 8b7422293dcf9cc62518dcbc49239b6e637b6b74
-Author: Robin H. Johnson
-Date: Sun Jul 3 21:46:21 2022 -0700
-
-gkbuilds/boost-build.gkbuild: upstream boost flags changed
-
-Upstream boost changed the flags to use 'off' instead of 'none'.
-
-Signed-off-by: Robin H. Johnson
-Closes: https://bugs.gentoo.org/854480
-
-diff --git gkbuilds/boost-build.gkbuild gkbuilds/boost-build.gkbuild
-index 03d1f88..0e06ba7 100644
gkbuilds/boost-build.gkbuild
-+++ gkbuilds/boost-build.gkbuild
-@@ -53,6 +53,6 @@ src_install() {
- find "${D}/usr/share/boost-build" -iname "*.py" -delete \
- || die "Failed to remove python files"
-
-- echo 'variant gentoorelease : release : none
none shared ;' >
"${D}/usr/share/boost-build/site-config.jam" \
-+ echo 'variant gentoorelease : release : off
off shared ;' >
"${D}/usr/share/boost-build/site-config.jam" \
- || die "Failed to create
'${D}/usr/share/boost-build/site-config.jam'!"
- }
diff --git a/sys-kernel/genkernel/files/genkernel-4.2.6-gcc-12-boost-1.79.patch
b/sys-kernel/genkernel/files/genkernel-4.2.6-gcc-12-boost-1.79.patch
new file mode 100644
index ..f65a272b953f
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-4.2.6-gcc-12-boost-1.79.patch
@@ -0,0 +1,28 @@
+From 8b7422293dcf9cc62518dcbc49239b6e637b6b74 Mon Sep 17 00:00:00 2001
+From: "Robin H. Johnson"
+Date: Sun, 3 Jul 2022 21:46:21 -0700
+Subject: [PATCH] gkbuilds/boost-build.gkbuild: upstream boost flags changed
+
+Upstream boost changed the flags to use 'off' instead of 'none'.
+
+Signed-off-by: Robin H. Johnson
+Closes: https://bugs.gentoo.org/854480
+---
+ gkbuilds/boost-build.gkbuild | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gkbuilds/boost-build.gkbuild b/gkbuilds/boost-build.gkbuild
+index 03d1f88..0e06ba7 100644
+--- a/gkbuilds/boost-build.gkbuild
b/gkbuilds/boost-build.gkbuild
+@@ -53,6 +53,6 @@ src_install() {
+ find "${D}/usr/share/boost-build" -iname "*.py" -delete \
+ || die "Failed to remove python files"
+
+- echo 'variant gentoorelease : release : none
none shared ;' >
"${D}/usr/share/boost-build/site-config.jam" \
++ echo 'variant gentoorelease : release : off
off shared ;' >
"${D}/usr/share/boost-build/site-config.jam" \
+ || die "Failed to create
'${D}/usr/share/boost-build/site-config.jam'!"
+ }
+--
+2.35.1
+
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/, sys-kernel/genkernel/files/
commit: 8d950bb026385484a5aba5726ce0a93ec5c24339
Author: Robin H. Johnson gentoo org>
AuthorDate: Mon Jul 4 04:50:36 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Mon Jul 4 04:50:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d950bb0
sys-kernel/genkernel: update for newer boost
Signed-off-by: Robin H. Johnson gentoo.org>
Closes: https://bugs.gentoo.org/854480
sys-kernel/genkernel/Manifest | 1 +
.../files/genkernel-4.2.6-boost-optim.patch| 23 ++
...ernel-.ebuild => genkernel-4.2.6-r4.ebuild} | 13
sys-kernel/genkernel/genkernel-.ebuild | 5 -
4 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 3a4f34d67577..788ef1989104 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -3,6 +3,7 @@ DIST LVM2.2.02.188.tgz 2421550 BLAKE2B
bed90c8454cd4b20fdeec6dcbf5a9f97c9310671a
DIST bcache-tools-1.0.8_p20141204.tar.gz 22158 BLAKE2B
dd36102c5668cab3072ea635a5a30128df6cd75b75e7f8bba17ad0a830746ff2f75a46b56d4211aeb4657453d3bbeb98b8b794c53ff724b3fbf0874068d70dc9
SHA512
53d6e764d6d42c4367b0bd98199cae3c18054d5707a7880af3a422f9db332b44941015eaed7e1cd170b3546307ed54a2f99558a68d98c76b7bb6234d29206b54
DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B
5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8
SHA512
86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668
DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B
45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533
SHA512
5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429
+DIST boost_1_79_0.tar.bz2 113456811 BLAKE2B
61f47ca022e60745868e6bdd3b5c75603dd68d878e126dcbb73de5b40fc03c0eec8eede3ec304ece58050435ef2fc1ed7eb763773c20673f85e32bbf4d5f978a
SHA512
70909e0561c213d10a1fdd692f9ae7b293d3cdc63e925bdc207da9e9bba6e86474341100e7ee5de6d94f9561196b1a3a1597055a7b7382babf8931131170a312
DIST btrfs-progs-v5.12.1.tar.xz 2220424 BLAKE2B
1e6120609feb37dd2ced04b27d8cba9a28c3b962add6f037927dcb05bdcd46a229f981f7f68231ee58e7e36a65fae4e6041e92c0db11dba56fe63b09bca30cc7
SHA512
a4044ad7e40e232442601f102ea1c64a65aa4d9765be303813d2547a5b730c5f2f84c9b9c652a4218ab16821fdd049dd8573a1f7f6cc27974c2c4389243e20f5
DIST btrfs-progs-v5.15.tar.xz 2275480 BLAKE2B
45fa1e20d14bdd92b1a7761771c7b6c2795d885f91fb44c9c5cf9c735c0c6c0f319e701ca2f6bf19191c50552459287042b56d4308fcc2da5bd566e63c755941
SHA512
5fc182c490733cbe7f2cdb8e131e0c79e5cc374ae32427d5f9ee2251e00e6e1d8ba0fdbbe31d50230f2bded08a9b9c652a4288998a427643a2d738f57ce72f90
DIST btrfs-progs-v5.6.1.tar.xz 2117064 BLAKE2B
9183300e7c086cb8f03ac14139d3d2a424461f4c5afc0e7b9bb588f4c0ddd2c41d7cefe91787b1cabe6397f8abeb6e958900e7742a80d3519382e98c3b197c9d
SHA512
8f523249a5c2bfe1c0d52b0dc5d31d52b330b1c616d3ec423fa1fb4a845441bfeaa32abbe42a444a4fc84016a482c8102a3eb451ac423b542e332e9c26e76dc6
diff --git a/sys-kernel/genkernel/files/genkernel-4.2.6-boost-optim.patch
b/sys-kernel/genkernel/files/genkernel-4.2.6-boost-optim.patch
new file mode 100644
index ..356202ddc095
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-4.2.6-boost-optim.patch
@@ -0,0 +1,23 @@
+commit 8b7422293dcf9cc62518dcbc49239b6e637b6b74
+Author: Robin H. Johnson
+Date: Sun Jul 3 21:46:21 2022 -0700
+
+gkbuilds/boost-build.gkbuild: upstream boost flags changed
+
+Upstream boost changed the flags to use 'off' instead of 'none'.
+
+ Signed-off-by: Robin H. Johnson
+Closes: https://bugs.gentoo.org/854480
+
+diff --git gkbuilds/boost-build.gkbuild gkbuilds/boost-build.gkbuild
+index 03d1f88..0e06ba7 100644
+--- gkbuilds/boost-build.gkbuild
gkbuilds/boost-build.gkbuild
+@@ -53,6 +53,6 @@ src_install() {
+ find "${D}/usr/share/boost-build" -iname "*.py" -delete \
+ || die "Failed to remove python files"
+
+- echo 'variant gentoorelease : release : none
none shared ;' >
"${D}/usr/share/boost-build/site-config.jam" \
++ echo 'variant gentoorelease : release : off
off shared ;' >
"${D}/usr/share/boost-build/site-config.jam" \
+ || die "Failed to create
'${D}/usr/share/boost-build/site-config.jam'!"
+ }
diff --git a/sys-kernel/genkernel/genkernel-.ebuild
b/sys-kernel/genkernel/genkernel-4.2.6-r4.ebuild
similarity index 97%
copy from sys-kernel/genkernel/genkernel-.ebuild
copy to sys-kernel/genkernel/genkernel-4.2.6-r4.ebuild
index b9c6dd2c0ebd..6ad1250b75b1 100644
--- a/sys-kernel/genkernel/genkernel-.ebu
[gentoo-commits] proj/genkernel:master commit in: gkbuilds/
commit: 8b7422293dcf9cc62518dcbc49239b6e637b6b74
Author: Robin H. Johnson gentoo org>
AuthorDate: Mon Jul 4 04:46:21 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Mon Jul 4 04:46:55 2022 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8b742229
gkbuilds/boost-build.gkbuild: upstream boost flags changed
Upstream boost changed the flags to use 'off' instead of 'none'.
Signed-off-by: Robin H. Johnson gentoo.org>
Closes: https://bugs.gentoo.org/854480
gkbuilds/boost-build.gkbuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gkbuilds/boost-build.gkbuild b/gkbuilds/boost-build.gkbuild
index 03d1f88..0e06ba7 100644
--- a/gkbuilds/boost-build.gkbuild
+++ b/gkbuilds/boost-build.gkbuild
@@ -53,6 +53,6 @@ src_install() {
find "${D}/usr/share/boost-build" -iname "*.py" -delete \
|| die "Failed to remove python files"
- echo 'variant gentoorelease : release : none
none shared ;' >
"${D}/usr/share/boost-build/site-config.jam" \
+ echo 'variant gentoorelease : release : off
off shared ;' >
"${D}/usr/share/boost-build/site-config.jam" \
|| die "Failed to create
'${D}/usr/share/boost-build/site-config.jam'!"
}
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/
commit: 22abd188ec79ea9a66ae6bd3ae54c820a1b9e06d
Author: Robin H. Johnson gentoo org>
AuthorDate: Mon Jul 4 03:52:39 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Mon Jul 4 03:57:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22abd188
sys-kernel/genkernel: re-add keywords for 4.2.6-r3
Signed-off-by: Robin H. Johnson gentoo.org>
sys-kernel/genkernel/genkernel-4.2.6-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-kernel/genkernel/genkernel-4.2.6-r3.ebuild
b/sys-kernel/genkernel/genkernel-4.2.6-r3.ebuild
index 1c4c56cc5a82..2259c81ff64a 100644
--- a/sys-kernel/genkernel/genkernel-4.2.6-r3.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.2.6-r3.ebuild
@@ -90,7 +90,7 @@ if [[ ${PV} == * ]] ; then
else
SRC_URI="https://dev.gentoo.org/~whissi/dist/genkernel/${P}.tar.xz
${COMMON_URI}"
- KEYWORDS="~ia64"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86"
fi
DESCRIPTION="Gentoo automatic kernel building scripts"
[gentoo-commits] proj/elections:master commit in: /
commit: 6fb33c7d84a6e9fefe03ec6b0af77a01eaf1d421
Author: Robin H. Johnson gentoo org>
AuthorDate: Fri Jul 1 19:12:46 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Fri Jul 1 19:12:46 2022 +
URL:https://gitweb.gentoo.org/proj/elections.git/commit/?id=6fb33c7d
infra-schedule-countify-collect: new tool to schedule countify --collect
Signed-off-by: Robin H. Johnson gentoo.org>
README.md | 20 +--
infra-schedule-countify-collect | 44 +
2 files changed, 62 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index a59ed18..1afdba0 100644
--- a/README.md
+++ b/README.md
@@ -85,8 +85,24 @@ Trustees.
Just wait. `election-stats-count` runs every 30 minutes by cronjob, and prints
status files into the home directories of election officials:
`voter-turnout-${election_name}`.
-4. Close of election:
--
+4.a. Automated "Close of election"
+--
+Before the end of the election, run the script to schedule automated
+`countify --collect`:
+```
+$ sudo su
+# cd /etc/elections
+# ./infra-schedule-countify-collect ${election_name}
+
+
+The job can be verified with:
+```
+# atq
+# at -c $JOB_ID
+```
+
+4.b. Manual "Close of election"
+---
This is the only step where the infra contact is absolutely required.
The infra contact must run `countify --collect ${election_name}` as root,
which will write the master ballot & confirmation stub file to all officials:
diff --git a/infra-schedule-countify-collect b/infra-schedule-countify-collect
new file mode 100755
index 000..f44f343
--- /dev/null
+++ b/infra-schedule-countify-collect
@@ -0,0 +1,44 @@
+#!/bin/bash
+# This will schedule an at(1) job to run for countify --collect
+# Any special ballots must be in place before the end of the election.
+# Infra needs to run this script, and it will schedule the rest, so infra does
+# NOT need to be on hand at the end closing time.
+election_name=$1
+
+UID=$(id -u)
+if test $UID -ne 0; then
+ echo "You must be root to run this" 1>&2
+ exit 1
+fi
+
+# Find the dir, validate
+for d in /etc/elections/$election_name ./$election_name ; do
+ files=( start stop voters ballot officials )
+ good=1
+ for f in ${files[@]}; do
+ test -e $d/${f}-$election_name || good=0
+ done
+ if test $good -eq 1 ; then
+ export election_dir=$d
+ break
+ fi
+ unset good
+done
+
+if test -z "$election_dir" ; then
+ echo "Could not find election $election_name in /etc/elections" 1>&2
+ exit 1
+fi
+
+stopfile=$election_dir/stop-$election_name
+t=$(date -u +%Y%m%d%H%M.%S -d @$(<$stopfile) )
+
+cd /etc/elections
+unset MAIL PWD SSH_CLIENT SSH_CONNECTION SSH_TTY
+
+at -t $t <<-EOF
+#!/bin/sh
+# This was scheduled by $SUDO_USER at $(date -uR)
+cd /etc/elections
+./countify --collect ${election_name}
+EOF
[gentoo-commits] proj/elections:master commit in: /
commit: 3b7342b8b037c9d7e240a06f68943456fcda1491
Author: Robin H. Johnson gentoo org>
AuthorDate: Fri Jul 1 15:50:47 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Fri Jul 1 15:50:47 2022 +
URL:https://gitweb.gentoo.org/proj/elections.git/commit/?id=3b7342b8
Votify: editor fail
Signed-off-by: Robin H. Johnson gentoo.org>
Votify.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Votify.pm b/Votify.pm
index db311ea..6f73954 100644
--- a/Votify.pm
+++ b/Votify.pm
@@ -320,7 +320,7 @@ sub collect {
}
my $submitted_filename = "$home/.ballot-$self->{election}-submitted";
-if (-d $submitted_filename) {}
+if (-d $submitted_filename) {
print STDERR "Warning: $v has a directory instead of a ballot\n";
}
elsif (-e $submitted_filename && -r $submitted_filename) {
[gentoo-commits] proj/elections:master commit in: /
commit: 9629cf285e461313b68438ecc4f6a25532c0c137
Author: Robin H. Johnson gentoo org>
AuthorDate: Thu Jun 30 22:36:10 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Thu Jun 30 22:36:10 2022 +
URL:https://gitweb.gentoo.org/proj/elections.git/commit/?id=9629cf28
Votify: accept symlinks as well as files
Signed-off-by: Robin H. Johnson gentoo.org>
Votify.pm | 20
statify | 4 ++--
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/Votify.pm b/Votify.pm
index 35a717f..db311ea 100644
--- a/Votify.pm
+++ b/Votify.pm
@@ -56,9 +56,9 @@ sub validate_election_dir {
my %REQUIRED_FILES_valid = map {
my $file_valid = 0;
# Legacy naming:
-$file_valid = 1 if -f sprintf("%s/%s-%s", $election_dir, $_,
$election_name);
+$file_valid = 1 if -r sprintf("%s/%s-%s", $election_dir, $_,
$election_name);
# New naming:
-$file_valid = 1 if -f sprintf("%s/%s", $election_dir, $_);
+$file_valid = 1 if -r sprintf("%s/%s", $election_dir, $_);
#printf "File %s valid=%d\n", $_, $file_valid;
($_, $file_valid);
} @REQUIRED_FILES;
@@ -132,7 +132,7 @@ sub get_single_election_hashref {
#print STDERR "Scan $fn\n";
my @filenames = (sprintf("%s/%s", "$basedir/$election_name", $fn),
sprintf("%s/%s-%s", "$basedir/$election_name", $fn, $election_name));
#print STDERR Dumper(@filenames);
-my $filename = abs_path(List::Util::first { $_ && -f $_ } @filenames);
+my $filename = abs_path(List::Util::first { $_ && -r $_ && -s $_ && !
-d $_ } @filenames);
$election{"${fn}file"} = $filename;
};
#print Dumper(%election);
@@ -258,7 +258,7 @@ sub write_confs {
$filename ||= $self->{'default_filename'};
$self->{'filename'} = $filename;
-if (-f $filename) {
+if (-e $filename) {
die "$filename already exists; please remove it first";
}
@@ -319,7 +319,11 @@ sub collect {
next;
}
-if (-f "$home/.ballot-$self->{election}-submitted") {
+my $submitted_filename = "$home/.ballot-$self->{election}-submitted";
+if (-d $submitted_filename) {}
+print STDERR "Warning: $v has a directory instead of a ballot\n";
+}
+elsif (-e $submitted_filename && -r $submitted_filename) {
my ($b) = Ballot->new($self->{'election'});
$b->read("$home/.ballot-$self->{election}-submitted");
if ($b->verify) {
@@ -329,7 +333,7 @@ sub collect {
$self->{'ballots'}{$c} = $b;
$self->{'casting_voters'}{$v} = 1;
}
-elsif (-f "$home/.ballot-$self->{election}") {
+elsif (-e "$home/.ballot-$self->{election}") {
print STDERR "Warning: $v did not submit their ballot\n";
}
}
@@ -341,7 +345,7 @@ sub write_master {
$filename ||= $self->{'default_filename'};
$self->{'filename'} = $filename;
-if (-f $filename) {
+if (-e $filename) {
die "$filename already exists; please remove it first";
}
@@ -380,7 +384,7 @@ sub write_casting_voters {
$filename ||= $self->{'default_filename'};
$self->{'filename'} = $filename;
-if (-f $filename) {
+if (-e $filename) {
die "$filename already exists; please remove it first";
}
diff --git a/statify b/statify
index b7c9396..0cccff1 100755
--- a/statify
+++ b/statify
@@ -86,9 +86,9 @@ for my $election_name (keys %open_elections) {
my ($count_voters, $count_submit, $count_pending) = (0, 0,0);
for my $votername (@voters) {
$count_voters++;
- if(-f catfile('/home', $votername,
".ballot-${election_name}-submitted")) {
+ if(-e catfile('/home', $votername,
".ballot-${election_name}-submitted")) {
$count_submit++;
- } elsif (-f catfile('/home', $votername,
".ballot-${election_name}")) {
+ } elsif (-e catfile('/home', $votername,
".ballot-${election_name}")) {
$count_pending++;
}
}
[gentoo-commits] repo/gentoo:master commit in: dev-util/rats/
commit: d2980713ca041d2da87cc65197e07c2c72534a4b
Author: Robin H. Johnson gentoo org>
AuthorDate: Tue Jun 28 16:35:15 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Tue Jun 28 16:36:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2980713
dev-util/rats: update EAPI & HOMEPAGE
Signed-off-by: Robin H. Johnson gentoo.org>
Closes: https://bugs.gentoo.org/show_bug.cgi?id=683916
dev-util/rats/{rats-2.4.ebuild => rats-2.4-r1.ebuild} | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dev-util/rats/rats-2.4.ebuild b/dev-util/rats/rats-2.4-r1.ebuild
similarity index 89%
rename from dev-util/rats/rats-2.4.ebuild
rename to dev-util/rats/rats-2.4-r1.ebuild
index 7f63c3779f30..0adcbf0ae280 100644
--- a/dev-util/rats/rats-2.4.ebuild
+++ b/dev-util/rats/rats-2.4-r1.ebuild
@@ -1,12 +1,13 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit edos2unix
DESCRIPTION="RATS - Rough Auditing Tool for Security"
-HOMEPAGE="https://code.google.com/p/rough-auditing-tool-for-security/";
+HOMEPAGE="https://github.com/andrew-d/rough-auditing-tool-for-security";
+# No tags available in the GitHub port
SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/rough-auditing-tool-for-security/${P}.tgz";
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: dev-util/rats/
commit: bf2e143a569b787f97a396494424b35768a52a2b Author: Robin H. Johnson gentoo org> AuthorDate: Tue Jun 28 16:35:43 2022 + Commit: Robin H. Johnson gentoo org> CommitDate: Tue Jun 28 16:36:12 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf2e143a dev-util/rats: stable x86 and amd64 I've been using this for a decade, it should probably be in stable. Signed-off-by: Robin H. Johnson gentoo.org> dev-util/rats/rats-2.4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/rats/rats-2.4-r1.ebuild b/dev-util/rats/rats-2.4-r1.ebuild index 0adcbf0ae280..d252d30fb296 100644 --- a/dev-util/rats/rats-2.4-r1.ebuild +++ b/dev-util/rats/rats-2.4-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.go LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="" RDEPEND="dev-libs/expat:="
[gentoo-commits] proj/elections:master commit in: /
commit: fe4e279fb5adbb90e780dc13d1c7db9e94737d20
Author: Robin H. Johnson gentoo org>
AuthorDate: Sat Jun 25 16:29:10 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sat Jun 25 16:31:03 2022 +
URL:https://gitweb.gentoo.org/proj/elections.git/commit/?id=fe4e279f
statify: fix chown
Signed-off-by: Robin H. Johnson gentoo.org>
statify | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/statify b/statify
index 752c78d..b7c9396 100755
--- a/statify
+++ b/statify
@@ -108,14 +108,15 @@ for my $election_name (keys %open_elections) {
.sprintf("Pending Turnout: %02.3f%%\n",
($count_submit+$count_pending)*100.0/$count_voters);
print "$results_buffer\n";
- umask 057;
+ umask 077;
for my $officialname (@officials) {
my $fn = catfile('/home', $officialname,
'voter-turnout-'.$election_name);
open(F, '>', $fn) or
die("failed to open voter turnout file ($fn): $!");
print F $results_buffer;
close F;
- chown ((getpwnam($officialname))[2]), 0, ($fn) or
+ my $uid = (getpwnam($officialname))[2];
+ chown($uid, -1, $fn) or
die("failed to chown voter turnout file ($fn): $!");
}
}
[gentoo-commits] proj/genkernel:master commit in: /
commit: 248bd41e5d20cf42652295148c7856a39d94591c Author: Robin H. Johnson gentoo org> AuthorDate: Tue Jun 21 02:53:29 2022 + Commit: Robin H. Johnson gentoo org> CommitDate: Tue Jun 21 02:53:29 2022 + URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=248bd41e Merge Enable threaded XZ compression by default Merges: https://github.com/gentoo/genkernel/pull/41 Closes: https://github.com/gentoo/genkernel/pull/41 Signed-off-by: Robin H. Johnson gentoo.org> defaults/compression_methods.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[gentoo-commits] proj/genkernel:master commit in: defaults/
commit: db1df8ea5a42ce058f12473ea79de3ac1f8afb4f Author: Maciej S. Szmigiero maciej szmigiero name> AuthorDate: Fri Jun 10 22:23:32 2022 + Commit: Robin H. Johnson gentoo org> CommitDate: Fri Jun 10 22:23:53 2022 + URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=db1df8ea Enable threaded XZ compression by default With the current proliferation of multi-core CPUs enabling threaded XZ compression brings very significant runtime improvement: on my 4-core system the total genkernel runtime drops from 356 seconds to 166 seconds (a reduction of more than 50%) - so let's enable this mode by default. Signed-off-by: Maciej S. Szmigiero maciej.szmigiero.name> defaults/compression_methods.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/compression_methods.sh b/defaults/compression_methods.sh index b65f057..37abf46 100644 --- a/defaults/compression_methods.sh +++ b/defaults/compression_methods.sh @@ -32,7 +32,7 @@ GKICM_LZMA_EXT=".lzma" GKICM_LZMA_PKG="app-arch/xz-utils" GKICM_XZ_KOPTNAME="XZ" -GKICM_XZ_CMD="xz -e --check=none -z -f -9" +GKICM_XZ_CMD="xz -e --check=none -z -f -9 -T 0" GKICM_XZ_EXT=".xz" GKICM_XZ_PKG="app-arch/xz-utils"
Re: [gentoo-dev] Packages up for grabs: e.g. www-servers/nginx, www-apps/nikola, app-admin/rsyslog, ...
Infra need/wants a few of these packages, so please consider us fallback maintainers: On Sun, Jun 05, 2022 at 11:28:30AM +0300, Joonas Niilola wrote: > app-metrics/mysqld_exporter > net-libs/zeromq > net-misc/httpstat > sys-apps/hponcfg > sys-block/hpacucli > sys-block/hpssacli > sys-block/storcli > sys-process/incron -- Robin Hugh Johnson Gentoo Linux: Dev, Infra Lead, Foundation Treasurer E-Mail : robb...@gentoo.org GnuPG FP : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85 GnuPG FP : 7D0B3CEB E9B85B1F 825BCECF EE05E6F6 A48F6136 signature.asc Description: PGP signature
Re: [gentoo-dev] Interest in a yarn / NPM eclass
On Wed, Jun 08, 2022 at 07:23:15PM +0200, Alessandro Barbieri wrote: > I'm interested in an eclass that doesn't bundle everything together. Also > I'm interested in anyone that can share the package maintainership (in guru > first). > > I've already tried 3 approaches: ... Since you know this yarn/NPM ecosystem well, could you evaluate two other ideas? 4) Solutions like EGO_SUM 5) EGO_SUM successor of 2nd-level-Metadata-Manifest that I described in the recent EGO_SUM thread. -- Robin Hugh Johnson Gentoo Linux: Dev, Infra Lead, Foundation Treasurer E-Mail : robb...@gentoo.org GnuPG FP : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85 GnuPG FP : 7D0B3CEB E9B85B1F 825BCECF EE05E6F6 A48F6136 signature.asc Description: PGP signature
Re: [gentoo-dev] About EGO_SUM
On Fri, Jun 03, 2022 at 01:18:08PM +0200, Florian Schmaus wrote: > EGO_SUM is marked as 'deprecated' in go-module.eclass [1, 2]. I > acknowledge that there are packages where the usage of EGO_SUM is very > problematic. However, I wonder if there are packages where using > dependency tarballs is problematic while using EGO_SUM would be not. ... [snip all the great points] > Even more problematic are that dependency tarballs require additional > steps that would not be required when EGO_SUM is used. While those steps > appear simple, behavioral theory shows that even the tiniest additional > steps have a huge impact (e.g., online shops loose a relative large > share of customers if for each an additional checkout step). If we force > dependency tarballs for Go software, then packaging Go software just > become a little bit harder. Your above is entirely correct, and I was against the plan to introduce dependency tarballs. > This leads me to the question why are we actually deprecating EGO_SUM? > It seems like a nice alternative for Go packaging that we may want to > keep. But maybe I am missing something? EGO_SUM vs dependency tarballs: - bloats ebuilds - bloats Manifests - bloats metadata/md5-cache/ (SRC_URI etc) - doesn't bloat mirrors with gentoo-unique distfiles - EGO_SUM is verifiable/reproducible from Upstream Go systems - less downloads on upgrades (only changed Go deps, not entire dep tarballs) EGO_SUM data right now adds, to every user's system: - 2.6MB of text to ebuilds (340k after de-dupe) - 7MB of text to Manifests (2M after de-dupe) - 6.4MB+ of text to metadata/md5-cache (I don't have a easy way to calc deduped amount here) On the server side: - The sum total of Go distfiles mirrored on Gentoo mirrors right now is only 3.4GB. - less downloads Dependency tarballs: - Right now ~15GiB on each mirror, plus storage of the primary copy somewhere (dev.g.o right now, but not great) - Conservatively if the remaining EGO_SUM packages converted to Dep tarballs, it would need another 8GB each of primary location and mirrors. - larger downloads for users who DO want to upgrade a Go package (all new deps tarball even if only one or two deps changed) - must be preserved much longer, unless we can introduce a guaranteed way to regenerate them for any prior ebuild. I was trying to introduce a third option, but I haven't had the time to write an entire GLEP. The TL;DR is introducing a 2nd-level Manifest+metadata file, that tries to move just the metadata out of the tree, in a way that can be regenerated (specifically, a 1:1 reproducible creation from a given go.sum). It DOES need to contain slightly more data than the present Manifest, specifically a full SRC_URI entry for each file (upstream URI plus what to rename it to on Gentoo side) The 2nd-level Manifest would be listed as SRC_URI, and be handled in src_fetch/src_unpack. Download & verify the extra distfiles, against the Manifest checksum data (and for Golang against go.sum checksums). The Portage mirrordist code needs the most work in this case, as it would need to fetch the 2nd-level Manifests so it can populate Gentoo mastermirror with the distfiles mirrored from upstream. The storage costs for the proposed idea: - same 1:1 base distfile storage as EGO_SUM (e.g. upstream distfiles are mirrored 1:1 content, just different naming) - Probably 1 Metadata-Manifest file per ebuild $PVR (conceptually it could be split more or shared between some ebuilds/packages) - Main tree Manifests: 1 DIST entry per Metadata-Manifest in a given package - Main tree ebuilds: 1 line for the Metadata-Manifest in the ebuild. - metadata/md5-cache: 1 src_uri line! - mirrors: add the Metadata-Manifest -- Robin Hugh Johnson Gentoo Linux: Dev, Infra Lead, Foundation Treasurer E-Mail : robb...@gentoo.org GnuPG FP : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85 GnuPG FP : 7D0B3CEB E9B85B1F 825BCECF EE05E6F6 A48F6136 signature.asc Description: PGP signature
[gentoo-user] Re: mailing list problem: changing subscription type
(Replying as listowner, but I'm also on the nomail version of gentoo-user, please CC to gentoo-user+ow...@lists.gentoo.org or to me directly for most mail) On Mon, May 30, 2022 at 07:35:20AM +0530, Madhu wrote: > I had subscribed to gentoo-user on 2022-05-25, and posted a message on > that date. > > I then wished to change my subscription to no-mail delivery. The > instructions I received after sending a message to > gentoo-user+h...@lists.gentoo.org indicated I could do this by sending > a message to gentoo-user+subscribe-nom...@lists.gentoo.org, which I > did. and I got a response saying > > "Thank you for confirming your subscription. You have now been added to the > no-mail version of the list." > > However the email address is still receiving messages from the > list. Apparently my email is subscribed on two lists - the mail > version and the non-mail version, and there doesn't seem to be any way > to unsubscribe only from the mail-version while remaining on the > latter. ... > Could I request the list owner to make sure I remain subscribed to the > the list while not receiving copies in the mail? I don't see any requests to unsubscribe from the regular version of the list. The regular/digest/nomail subscriptions are entirely independent. Just subscribing to the nomail version of the list does not impact your other subscriptions at all. Did some part of the documentation make you think it would impact the subscription? Regardless, how do you feel the documentation could improve to make it clear that they are separate. -- Robin Hugh Johnson Gentoo Linux: Dev, Infra Lead, Foundation Treasurer E-Mail : robb...@gentoo.org GnuPG FP : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85 GnuPG FP : 7D0B3CEB E9B85B1F 825BCECF EE05E6F6 A48F6136 signature.asc Description: PGP signature
[gentoo-commits] proj/genkernel:master commit in: /
commit: aef014f88bd2ef8a125ca082bb654e7a64f8b77c Author: Robin H. Johnson gentoo org> AuthorDate: Sun May 29 16:52:12 2022 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun May 29 16:52:12 2022 + URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=aef014f8 Fixes a mistake with quotation usage when testing for LVM flag Closes: https://github.com/gentoo/genkernel/pull/39 Merges: https://github.com/gentoo/genkernel/pull/39 Signed-off-by: Robin H. Johnson gentoo.org> defaults/linuxrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[gentoo-commits] proj/genkernel:master commit in: defaults/
commit: 2f5a7fc596bdf919f41ddc5df063abf109af6758
Author: FlyingWaffle pm me>
AuthorDate: Sat May 28 21:24:41 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sat May 28 21:24:41 2022 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2f5a7fc5
Fixes a mistake with quotation usage when testing for LVM flag.
Signed-off-by: FlyingWaffle pm.me>
defaults/linuxrc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/defaults/linuxrc b/defaults/linuxrc
index 9daad4a..2f94eb4 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -672,7 +672,7 @@ if [ "${CDROOT}" != '1' ]
then
if ( [ -n "${CRYPT_SWAP_KEY}" ] && [ -z "${CRYPT_SWAP_KEYDEV}" ] ) || \
( [ -n "${CRYPT_SWAP_HEADER}" ] && [ -z "${CRYPT_SWAP_HEADERDEV}" ]
) || \
- ( [ "${REAL_ROOT}" = "${REAL_RESUME}" ] || [ ${USE_LVM_NORMAL} -eq 1
] )
+ ( [ "${REAL_ROOT}" = "${REAL_RESUME}" ] || [ "${USE_LVM_NORMAL}" =
'1' ] )
then
# the swap key or header might be on the root fs so start it
first in this case
start_LUKS_root
[gentoo-commits] proj/genkernel:master commit in: defaults/
commit: eba3381a9d7039cf0a1d066299b1d40e91d23226
Author: FlyingWaffle pm me>
AuthorDate: Sat May 28 20:32:49 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sat May 28 20:32:49 2022 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=eba3381a
Additional test to allow for hibernation resume...
...on a broader range of system configurations, including LVM and swapfiles.
Signed-off-by: FlyingWaffle pm.me>
defaults/linuxrc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/defaults/linuxrc b/defaults/linuxrc
index 5ee7804..9daad4a 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -671,7 +671,8 @@ keyctl_keyadd
if [ "${CDROOT}" != '1' ]
then
if ( [ -n "${CRYPT_SWAP_KEY}" ] && [ -z "${CRYPT_SWAP_KEYDEV}" ] ) || \
- ( [ -n "${CRYPT_SWAP_HEADER}" ] && [ -z "${CRYPT_SWAP_HEADERDEV}" ] )
+ ( [ -n "${CRYPT_SWAP_HEADER}" ] && [ -z "${CRYPT_SWAP_HEADERDEV}" ]
) || \
+ ( [ "${REAL_ROOT}" = "${REAL_RESUME}" ] || [ ${USE_LVM_NORMAL} -eq 1
] )
then
# the swap key or header might be on the root fs so start it
first in this case
start_LUKS_root
[gentoo-commits] proj/genkernel:master commit in: /
commit: d244a241a7565b920ba0a30274fddc5c88ea0e8a Author: Robin H. Johnson gentoo org> AuthorDate: Sat May 28 20:53:41 2022 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat May 28 20:53:41 2022 + URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d244a241 Additional test to allow for hibernation resume Merges: https://github.com/gentoo/genkernel/pull/38 Closes: https://github.com/gentoo/genkernel/pull/38 Signed-off-by: Robin H. Johnson gentoo.org> defaults/linuxrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[gentoo-commits] proj/genkernel:master commit in: defaults/
commit: 08c60969a77ae7ce836691b3419429296810b6e8
Author: Dmitry Baranov gmail com>
AuthorDate: Tue May 24 23:42:30 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Tue May 24 23:51:47 2022 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=08c60969
defaults/initrd.scripts: openLUKS(): remove extra bracket in conditional block
Signed-off-by: Dmitry Baranov gmail.com>
defaults/initrd.scripts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index eb556d6..7012356 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1848,7 +1848,7 @@ openLUKS() {
good_msg "The LUKS device ${LUKS_DEVICE} meanwhile was
opened by someone else."
break
# if crypt_silent=1 and some error occurs, enter shell quietly
- elif [ \( ${CRYPT_SILENT} -eq 1 \) -a \( \( \( ${DEV_ERROR} -eq
1 \) \) ]
+ elif [ \( ${CRYPT_SILENT} -eq 1 \) -a \( \( ${DEV_ERROR} -eq 1
\) \) ]
then
run_emergency_shell
elif [ \( ${CRYPT_SILENT} -eq 1 \) -a \( \( \( ${HEADER_ERROR}
-eq 1 \) \) -o \( ${HEADERDEV_ERROR} -eq 1 \) \) ]
[gentoo-commits] proj/genkernel:master commit in: defaults/
commit: c3249d243fcf6dc56f46e2442df6751db91a4606
Author: Dmitry Baranov gmail com>
AuthorDate: Tue May 24 23:38:22 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Wed May 25 06:02:41 2022 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c3249d24
defaults/initrd.scripts: start_LUKS_*(): fix bootstrap calls and sleeps
Signed-off-by: Dmitry Baranov gmail.com>
defaults/initrd.scripts | 41 ++---
1 file changed, 26 insertions(+), 15 deletions(-)
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 7012356..f8cc861 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -2486,18 +2486,23 @@ ipv6_tentative() {
}
start_LUKS_root() {
- # if key is set but neither ssh enabled or key device is given, find
- # the key device
+ # if key/header is set but neither ssh enabled or key device is given,
find
+ # the key/header device
- if [ -n "${CRYPT_ROOT_KEY}" ]
+ if (
+ [ -n "${CRYPT_ROOT_KEY}" -a -z "${CRYPT_ROOT_KEYDEV}" ] ||
+ [ -n "${CRYPT_ROOT_HEADER}" -a -z "${CRYPT_ROOT_HEADERDEV}" ]
+ )
then
- ( [ -z "${CRYPT_ROOT_KEYDEV}" ] || [ -z
"${CRYPT_ROOT_HEADERDEV}" ] ) \
- && sleep 6
-
- [ -z "${CRYPT_ROOT_KEYDEV}" ] && bootstrapKey "ROOT"
- [ -z "${CRYPT_ROOT_HEADERDEV}" ] && bootstrapHeader "ROOT"
+ sleep 6
fi
+ [ -n "${CRYPT_ROOT_KEY}" -a -z "${CRYPT_ROOT_KEYDEV}" ] \
+ && bootstrapKey "ROOT"
+
+ [ -n "${CRYPT_ROOT_HEADER}" -a -z "${CRYPT_ROOT_HEADERDEV}" ] \
+ && bootstrapHeader "ROOT"
+
if [ -n "${CRYPT_ROOT}" ]
then
openLUKS "root"
@@ -2512,16 +2517,22 @@ start_LUKS_root() {
}
start_LUKS_swap() {
- if [ -n "${CRYPT_SWAP_KEY}" ]
- then
- # same for swap, but no need to sleep if root was unencrypted
- ( [ -z "${CRYPT_ROOT_KEYDEV}" ] || [ -z
"${CRYPT_ROOT_HEADERDEV}" ] ) \
- && [ -z "${CRYPT_ROOT}" ] && sleep 6
+ # same for swap, but no need to sleep if root was unencrypted
- [ -z "${CRYPT_SWAP_KEYDEV}" ] && bootstrapKey "SWAP"
- [ -z "${CRYPT_SWAP_HEADERDEV}" ] && bootstrapHeader "SWAP"
+ if (
+ [ -n "${CRYPT_SWAP_KEY}" -a -z "${CRYPT_SWAP_KEYDEV}" ] ||
+ [ -n "${CRYPT_SWAP_HEADER}" -a -z "${CRYPT_SWAP_HEADERDEV}" ]
+ )
+ then
+ [ -z "${CRYPT_ROOT}" ] && sleep 6
fi
+ [ -n "${CRYPT_SWAP_KEY}" -a -z "${CRYPT_SWAP_KEYDEV}" ] \
+ && bootstrapKey "SWAP"
+
+ [ -n "${CRYPT_SWAP_HEADER}" -a -z "${CRYPT_SWAP_HEADERDEV}" ] \
+ && bootstrapHeader "SWAP"
+
if [ -n "${CRYPT_SWAP}" ]
then
openLUKS "swap"
[gentoo-commits] proj/genkernel:master commit in: /
commit: 144ba9a735ff65d65fc1d3dbd8902f5ecd5b7ba8 Author: Robin H. Johnson gentoo org> AuthorDate: Sat May 28 20:51:31 2022 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat May 28 20:51:31 2022 + URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=144ba9a7 Detached header: fix bootstrap calls and sleeps, remove extra bracket Merges: https://github.com/gentoo/genkernel/pull/37 Closes: https://github.com/gentoo/genkernel/pull/37 Signed-off-by: Robin H. Johnson gentoo.org> defaults/initrd.scripts | 43 +++ 1 file changed, 27 insertions(+), 16 deletions(-)
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/
commit: 5d23cb00ce364b6cfc54f67bc4e4cf0c6eb8cb47
Author: Robin H. Johnson gentoo org>
AuthorDate: Wed May 25 04:29:24 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Wed May 25 04:29:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d23cb00
sys-kernel/genkernel: now with keyutils
Signed-off-by: Robin H. Johnson gentoo.org>
sys-kernel/genkernel/Manifest | 1 +
sys-kernel/genkernel/genkernel-.ebuild | 2 ++
2 files changed, 3 insertions(+)
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index ff7c9516133f..3a4f34d67577 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -29,6 +29,7 @@ DIST genkernel-4.2.6.tar.xz 488892 BLAKE2B
4dc54c878e25165799ac40e45f28843c05734
DIST gnupg-1.4.23.tar.bz2 3749353 BLAKE2B
ec5e6bef0c7bb2a65813d7852cebeaa24c4855f9d9d9e802070da50b89fff56b747682933aa766dd130f849efcfe28f7aa74f3153405429bcf3845ef29c6dd6e
SHA512
78dc52a2010202a4afc8814b29fda657a6c9fe230d5e7db11ae040edd2b0ca819e1baa4dbd6c0d04d36cd353df484e83f52d17759d2891c2cf7025c0b5d36612
DIST hwids-20210613.tar.gz 3867741 BLAKE2B
64c4b0a83058a2052f7b132241008a3cc75452e93a9a57a9159c357c23fd09ee256abc2b94e700b5d8e8bd4e231ae12932d2c2f32fb03853207739cb3387047d
SHA512
4568f6b8c0ca80ec772bd2785d4dc169d1d13a721472a15399158d9a7f31abbe414c5c8cfdf1a3b81cce4e33742a4b6e005e97e3e907643d0afdc8e953624fea
DIST json-c-0.13.1.tar.gz 639425 BLAKE2B
1da310309f9ce03306a9fd4a161670e460cf0b348df7c006902390f74a4cf100aab1ce6ac8a361a278dd917c114a278de5b3445817f3a40ae287478add46
SHA512
e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb8dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1
+DIST keyutils-1.6.3.tar.gz 137022 BLAKE2B
b5620b1b6109415fec1268963c2c65d774f3ef7a69eb1ce8d5d8e78b4b807e4fdfda861662a1b5556975ef867add8f985362a31b6608ac2dc198c8d0395d516b
SHA512
f65965b8566037078b8eeffa66c6fdbe121c8c2bea7fa5bce04cf7ba5ccc50d5b48e51f4a67ca91e4d5d9a12469e7e3eb3036c920ab25e3feba6e93b4c149cf9
DIST kmod-27.tar.xz 548924 BLAKE2B
9f12bf5792d4c867e28e0776c279369c063e84269212e3f699ae6e5e69b8b2b466b5033e43e17ac64d6101592edcf3c34881916afb6ae676b49dc8838dfe1396
SHA512
e0513094935333fca1fb4c3e3493b232507a579ab00a6457cc9ed3e928363d05aad80634fb65a8287a336bf9895194c7be8ddc41bb088a6c2cca44fc1bfbdb6c
DIST kmod-29.tar.xz 560160 BLAKE2B
1362b6e7c07f66594074f07239d0f7a64e6efeb928483ed027b22a4ac77b916c631d1c03780b0515714a87847a716c35341edb1ced04a1795b4c7f8942d3207a
SHA512
557cdcaec75e5a1ceea2d10862c944e9a65ef54f6ee9da6dc98ce4582418fdc9958aab2e14a84807db61daf36ec4fcdc23a36376c39d5dc31d1823ca7cd47998
DIST libaio-0.3.112.tar.gz 46977 BLAKE2B
088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba
SHA512
5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa
diff --git a/sys-kernel/genkernel/genkernel-.ebuild
b/sys-kernel/genkernel/genkernel-.ebuild
index 4b18348406d6..b9c6dd2c0ebd 100644
--- a/sys-kernel/genkernel/genkernel-.ebuild
+++ b/sys-kernel/genkernel/genkernel-.ebuild
@@ -45,6 +45,7 @@ VERSION_XFSPROGS="5.13.0"
VERSION_XZ="5.2.5"
VERSION_ZLIB="1.2.11"
VERSION_ZSTD="1.5.0"
+VERSION_KEYUTILS="1.6.3"
COMMON_URI="
https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz
-> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz
@@ -80,6 +81,7 @@ COMMON_URI="
https://tukaani.org/xz/xz-${VERSION_XZ}.tar.gz
https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz ->
zstd-${VERSION_ZSTD}.tar.gz
+
https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-${VERSION_KEYUTILS}.tar.gz
"
if [[ ${PV} == * ]] ; then
[gentoo-commits] proj/genkernel:master commit in: /
commit: edefa80c72b0dffdc5c9cf9d880156e6e0db Author: Robin H. Johnson gentoo org> AuthorDate: Tue May 24 20:34:54 2022 + Commit: Robin H. Johnson gentoo org> CommitDate: Tue May 24 20:34:54 2022 + URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=edefa80c add keyctl support for loading LUKS passphrase into a keyring Merges: https://github.com/gentoo/genkernel/pull/10 Closes: https://github.com/gentoo/genkernel/pull/10 Signed-off-by: Robin H. Johnson gentoo.org> defaults/initrd.scripts | 52 ++- defaults/linuxrc | 34 +-- defaults/software.sh | 7 +++ doc/genkernel.8.txt | 24 ++ gen_cmdline.sh| 6 ++ gen_determineargs.sh | 2 ++ gen_initramfs.sh | 29 ++ genkernel.conf| 3 +++ gkbuilds/keyutils.gkbuild | 27 9 files changed, 181 insertions(+), 3 deletions(-)
[gentoo-commits] proj/genkernel:master commit in: doc/, gkbuilds/, /, defaults/
commit: 72839de16243fb410d587e18d76d3b637fa3f389
Author: Maciej S. Szmigiero maciej szmigiero name>
AuthorDate: Sun Nov 22 01:06:47 2020 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sun May 22 18:45:16 2022 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=72839de1
genkernel: add keyctl support for loading LUKS passphrase into a keyring
cryptsetup LUKS2 format comes with an ability to automatically unlock
multiple devices (root, swap, etc.) sharing the same passphrase, without
retyping it for each of them, by loading it into the user keyring.
This commit adds such (optional) genkernel support for loading LUKS
passphrase into the user keyring on boot.
In the default mode of operation the newly added key is (possibly) used
only to unlock root and swap devices and is removed soon after that.
By providing appropriate kernel command line parameter the key can be left
in the keyring instead (with an optional timeout) for unlocking other LUKS
devices post-initramfs time.
Because one of the most common use cases of this functionality will be
having an encrypted swap for doing suspend to disk (hibernation) let's also
make sure that we don't unlock the root device when doing so is unnecessary
(when we are resuming the system from hibernation).
Since the security of a FDE passphrase is of paramount importance in this
solution significant care has been taken not to leak it accidentally:
* The passphrase is read directly by keyctl to avoid storing it in the
shell,
* If the passphrase is used only to unlock root and swap devices (which is
the default mode of operation) the init script will check whether its
removal from keyring has actually succeeded and, if not, reboot the system
rather than continue while leaving it exposed,
* keyutils includes a patch (already upstreamed) to wipe the passphrase
from memory when no longer needed.
Signed-off-by: Maciej S. Szmigiero maciej.szmigiero.name>
defaults/initrd.scripts | 52 ++-
defaults/linuxrc | 34 +--
defaults/software.sh | 7 +++
doc/genkernel.8.txt | 24 ++
gen_cmdline.sh| 6 ++
gen_determineargs.sh | 2 ++
gen_initramfs.sh | 29 ++
genkernel.conf| 3 +++
gkbuilds/keyutils.gkbuild | 27
9 files changed, 181 insertions(+), 3 deletions(-)
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 4932783..eb556d6 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -2108,6 +2108,54 @@ openLUKS() {
[ -d "${mntkey}" ] && run rmdir -p "${mntkey}" >/dev/null 2>&1
}
+keyctl_keyadd() {
+ if [ -n "${KEYCTL_KEYDESC}" ]
+ then
+ if [ ! -x /bin/keyctl ]
+ then
+ bad_msg "keyctl program is missing. Was initramfs built
without --keyctl parameter?"
+ exit 1
+ fi
+
+ # not using read to avoid secrets being left in memory
+ stty -echo
+ echo -n "Please type the key '${KEYCTL_KEYDESC}' for the user
keyring then press Ctrl-D twice: "
+ KEYCTL_KEYID=`keyctl padd user "${KEYCTL_KEYDESC}" @u`
+ echo
+ stty echo
+
+ if [ -n "${KEYCTL_KEYID}" -a -n "${KEYCTL_KEYTIMEOUT}" ]
+ then
+ keyctl timeout "${KEYCTL_KEYID}" "${KEYCTL_KEYTIMEOUT}"
+ fi
+ fi
+}
+
+keyctl_keyremove() {
+ if [ -n "${KEYCTL_KEYID}" -a -z "${KEYCTL_KEYKEEP}" ]
+ then
+ if [ ! -x /bin/keyctl ]
+ then
+ bad_msg "keyctl program is missing. Was initramfs built
without --keyctl parameter?"
+ exit 1
+ fi
+
+ keyctl revoke "${KEYCTL_KEYID}"
+ keyctl unlink "${KEYCTL_KEYID}" >/dev/null
+
+ # trust but verify
+ if keyctl show "${KEYCTL_KEYID}" >/dev/null 2>&1
+ then
+ # better reboot than leave the user passphrase
accidentally exposed
+ bad_msg "unable to remove the newly added key from
keyring, rebooting in 5 seconds for security"
+ sleep 5
+ reboot -f
+ fi
+
+ KEYCTL_KEYID=
+ fi
+}
+
iface_name() {
local ifname="${1}"
@@ -2437,7 +2485,7 @@ ipv6_tentative() {
fi
}
-start_LUKS() {
+start_LUKS_root() {
# if key is set but neither ssh enabled or key device is given, find
# the key device
@@ -2461,7 +2509,9 @@
[gentoo-commits] repo/gentoo:master commit in: app-admin/gopass/
commit: 567e00af7eaa1935fa13b37038ef1ae848047b93 Author: Robin H. Johnson gentoo org> AuthorDate: Tue May 17 05:08:03 2022 + Commit: Robin H. Johnson gentoo org> CommitDate: Tue May 17 05:08:13 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=567e00af app-admin/gopass: bump Signed-off-by: Robin H. Johnson gentoo.org> app-admin/gopass/Manifest | 68 app-admin/gopass/gopass-1.14.1.ebuild | 583 ++ 2 files changed, 651 insertions(+) diff --git a/app-admin/gopass/Manifest b/app-admin/gopass/Manifest index 90fd67e44541..1e28193f462c 100644 --- a/app-admin/gopass/Manifest +++ b/app-admin/gopass/Manifest @@ -1,3 +1,5 @@ +DIST bitbucket.org%2Fcreachadair%2Fstringset%2F@v%2Fv0.0.10.mod 95 BLAKE2B f1b561f9a00d82da2b38e6df5320d512dfc63a5b9ddc1830996d196f8c31126eeaec0f7052d1492be160e8b9b0414d57d9c7168709ed97d371b6e2d0044e3b23 SHA512 84dd7a56ac2312c4cdec85605591fd626983af181f63d85568d4906ebabdc7aedc8649030be2b667804cb2eb07e8aa9ea827a6f6c672917150733a494ed2c4c3 +DIST bitbucket.org%2Fcreachadair%2Fstringset%2F@v%2Fv0.0.10.zip 23450 BLAKE2B daf844c39e56389e9feed78885364ec3fde9e3dce59fdd03062235c4c38db69d21891c748e0b251f4159bef1bf689ca0fdafa7a5855d24fc1570cd76815a6c91 SHA512 23d22670b8fc0b7601788db2e07824b6325b06476f5726af0b631798ba6b1c735e87464bc75d420c1dbf390e4d23ea0db2aa50a294c1bbb2e1f49775b42ed7b1 DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273 DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273 DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959 @@ -42,7 +44,10 @@ DIST filippo.io%2Fedwards25519%2F@v%2Fv1.0.0-beta.3.zip 84404 BLAKE2B 8e04457aa6 DIST filippo.io%2Fedwards25519%2F@v%2Fv1.0.0-rc.1.mod 40 BLAKE2B 895e3b61e3e272387257e288b70e2a7d461c0de2ed2284e1909ac2bf2eedf841246e175ed848174ec510c53ae207d801cff7a39c560fd2b0c0b4dc08c67f4856 SHA512 2a56ce66f7ba29cd8f975014291690c2f929738a4a8b93529c2c367c0236b767f92e4f6dfda9fe1fdf981926302d7ab26665f7d64b022a22e5305aea693ad2dc DIST filippo.io%2Fedwards25519%2F@v%2Fv1.0.0-rc.1.zip 47154 BLAKE2B 7cbd8e554ff4d2e93b60a81fe77d051b60255f24339fda1be3e644c737b44a1db665e9076193b6c914b6561b29f7d377680a96c15de1970859714abfa08e2dee SHA512 1f008db632f373f72d0be54c2b5669668e8bbfd124f2a56fc6b8368eb89bcd55d2e5669bed6362fe6bfb055016c80002394a7b3a92f33d0fb9d9c11d42be4c61 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146 +DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.4.1.mod 43 BLAKE2B e00572fff0f57c166be62ec93eacb189f004073581077cded1cb443b17c3e03cd1b2db37f0b7a504deb287b6515dd32648678d2ae763d6b6fbd7206a9bdcf30b SHA512 0e8cdda81300811f629bce3a9307de05450036f750f8c3c0cd5b70854f8f95bd962ce99bfe1325c8d1bf562a5b7b94afb9e9fd2dbe4dcc45325fac6e27471102 DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d +DIST github.com%2F!proton!mail%2Fgo-crypto%2F@v%2Fv0.0.0-20220407094043-a94812496cf5.mod 112 BLAKE2B ef3083d3a65268fbd1db1c571a909b250b2b13dea588358f6b958e7ad1fdf1b4e4e9fb3f2494d4f6ba75d347b113a626f07b59dd1cfc72e0a9e37916dfb39a0f SHA512 67d2f173895329e13a7a17d91e95557b55b199c6d7df7466ca8395d4fcc4f6ad123cb798e01bc136b2b3bd2dd9229d3db43f01021b4d38695554fc8b01dbe545 +DIST github.com%2F!proton!mail%2Fgo-crypto%2F@v%2Fv0.0.0-20220407094043-a94812496cf5.zip 356580 BLAKE2B 40ef221cb49438cd438fb9bb74156aab4ddbc76fbd384912a99274ae45702719ec5ec3ef2b629bd43861b251a692f0f0c6547765048d1771ba83ed1650029690 SHA512 dfeb27b4cc303fce05650fcf25b6d91f1535e5c1417e1940a200ec509ad69ab999a0952c050cffebe301229c7ed31b1ec89d1a9989a1c3a9ca5a39f6b7d67376 DIST github.com%2Fatotto%2Fclipb
Re: [gentoo-portage-dev] Normaliser function for distfiles
On Mon, May 16, 2022 at 07:37:40PM +0200, Markus Walter wrote: > Hello all, > > is it possible to do the following: after fetching a distfile portage runs > an external normaliser program specified in an ebuild before checking the > hash? > > My use case is the following: I would like to improve the gs-elpa program > and provide a precomputed overlay for melpa. However the melpa distfiles are > rebuilt everyday and cause checksum failures. However the only thing > changing are the timestamps. Hence if a normaliser program could simply set > all timestamps to some predefined value (say 1.1.1970) then this problem > should vanish. I don't know what 'gs-elpa' & 'Melpa' are, but maybe talking to upstream would be good here, and improving that behavior. If the file contents or non-timestamp metadata change, absolutely the timestamps should change. But otherwise, the timestamp should NOT change. -- Robin Hugh Johnson Gentoo Linux: Dev, Infra Lead, Foundation Treasurer E-Mail : robb...@gentoo.org GnuPG FP : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85 GnuPG FP : 7D0B3CEB E9B85B1F 825BCECF EE05E6F6 A48F6136 signature.asc Description: PGP signature
[gentoo-commits] proj/genkernel:master commit in: /
commit: 4e7f2d85b4b754acd54b9fc6353b2f96ef545057 Author: Robin H. Johnson gentoo org> AuthorDate: Mon May 16 16:45:49 2022 + Commit: Robin H. Johnson gentoo org> CommitDate: Mon May 16 16:45:49 2022 + URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4e7f2d85 Updating open-iscsi to 2.1.4 Closes: https://github.com/gentoo/genkernel/pull/34 Signed-off-by: Robin H. Johnson gentoo.org> .../2.0.878/open-iscsi-2.0.878-gcc-10.patch| 107 - .../open-iscsi-2.0.878-static-iscsistart.patch | 11 --- .../open-iscsi-2.1.4-Makefiles.patch} | 8 +- .../2.1.4/open-iscsi-2.1.4-static-iscsistart.patch | 11 +++ 4 files changed, 15 insertions(+), 122 deletions(-)
[gentoo-commits] proj/genkernel:master commit in: patches/open-iscsi/2.0.878/, patches/open-iscsi/2.1.4/
commit: f0f544fbeb5cf2fabe9c11a743c1507da46ad3b4
Author: Dan F <44616e46 gmail com>
AuthorDate: Mon May 16 12:20:11 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Mon May 16 12:20:39 2022 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f0f544fb
Updating open-iscsi to 2.1.4
Signed-off-by: DanF <44616e46 gmail.com>
.../2.0.878/open-iscsi-2.0.878-gcc-10.patch| 107 -
.../open-iscsi-2.0.878-static-iscsistart.patch | 11 ---
.../open-iscsi-2.1.4-Makefiles.patch} | 8 +-
.../2.1.4/open-iscsi-2.1.4-static-iscsistart.patch | 11 +++
4 files changed, 15 insertions(+), 122 deletions(-)
diff --git a/patches/open-iscsi/2.0.878/open-iscsi-2.0.878-gcc-10.patch
b/patches/open-iscsi/2.0.878/open-iscsi-2.0.878-gcc-10.patch
deleted file mode 100644
index b614765..000
--- a/patches/open-iscsi/2.0.878/open-iscsi-2.0.878-gcc-10.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 499a006a7d6bb154f9e1ab430e4c9e231ba6096a Mon Sep 17 00:00:00 2001
-From: Lee Duncan
-Date: Tue, 28 Jan 2020 16:36:56 -0800
-Subject: [PATCH] Updates to support gcc -fno-common option.
-
-This meant cleaning up the definition of some
-global variables, so that they were only defined
-in one place and refered to as external elsewhere.
- include/iscsi_err.h| 6 --
- iscsiuio/configure.ac | 2 +-
- iscsiuio/src/uip/uip.h | 4 ++--
- usr/iscsi_err.c| 2 ++
- usr/log.c | 1 +
- usr/log.h | 2 +-
- 6 files changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/include/iscsi_err.h b/include/iscsi_err.h
-index ed000dd0..04a8723e 100644
a/include/iscsi_err.h
-+++ b/include/iscsi_err.h
-@@ -4,7 +4,7 @@
- #ifndef _ISCSI_ERR_
- #define _ISCSI_ERR_
-
--enum {
-+enum iscsi_error_list {
- ISCSI_SUCCESS = 0,
- /* Generic error */
- ISCSI_ERR = 1,
-@@ -73,7 +73,9 @@ enum {
-
- /* Always last. Indicates end of error code space */
- ISCSI_MAX_ERR_VAL,
--} iscsi_err;
-+};
-+
-+extern enum iscsi_error_list iscsi_err;
-
- extern void iscsi_err_print_msg(int err);
- extern char *iscsi_err_to_str(int err);
-diff --git a/iscsiuio/configure.ac b/iscsiuio/configure.ac
-index b41df0ec..8099f09c 100644
a/iscsiuio/configure.ac
-+++ b/iscsiuio/configure.ac
-@@ -78,7 +78,7 @@ AC_CONFIG_COMMANDS([default],[[
- else
- echo 'char *build_date = "'`date`'";' > src/unix/build_date.c
- fi
--echo 'char *build_date;'> src/unix/build_date.h
-+echo 'extern char *build_date;'> src/unix/build_date.h
- ]],[[]])
-
- AC_PREFIX_DEFAULT()
-diff --git a/iscsiuio/src/uip/uip.h b/iscsiuio/src/uip/uip.h
-index 1180ab50..9d9428a2 100644
a/iscsiuio/src/uip/uip.h
-+++ b/iscsiuio/src/uip/uip.h
-@@ -70,8 +70,8 @@ struct uip_stack;
- typedef u16_t uip_ip4addr_t[2];
- typedef u16_t uip_ip6addr_t[8];
-
--const uip_ip6addr_t all_zeroes_addr6;
--const uip_ip4addr_t all_zeroes_addr4;
-+extern const uip_ip6addr_t all_zeroes_addr6;
-+extern const uip_ip4addr_t all_zeroes_addr4;
-
- #define ETH_BUF(buf) ((struct uip_eth_hdr *)buf)
- #define VLAN_ETH_BUF(buf) ((struct uip_vlan_eth_hdr *)buf)
-diff --git a/usr/iscsi_err.c b/usr/iscsi_err.c
-index 23c61fc3..4a057d57 100644
a/usr/iscsi_err.c
-+++ b/usr/iscsi_err.c
-@@ -21,6 +21,8 @@
- #include "iscsi_err.h"
- #include "log.h"
-
-+enum iscsi_error_list iscsi_err;
-+
- static char *iscsi_err_msgs[] = {
- /* 0 */ "",
- /* 1 */ "unknown error",
-diff --git a/usr/log.c b/usr/log.c
-index f29b54b3..6e16e7ce 100644
a/usr/log.c
-+++ b/usr/log.c
-@@ -33,6 +33,7 @@
-
- char *log_name;
- int log_level = 0;
-+struct logarea *la = NULL;
-
- static int log_stop_daemon = 0;
- static void (*log_func)(int prio, void *priv, const char *fmt, va_list ap);
-diff --git a/usr/log.h b/usr/log.h
-index 486a08ea..c548791e 100644
a/usr/log.h
-+++ b/usr/log.h
-@@ -64,7 +64,7 @@ struct logarea {
- union semun semarg;
- };
-
--struct logarea *la;
-+extern struct logarea *la;
-
- extern int log_init(char *program_name, int size,
- void (*func)(int prio, void *priv, const char *fmt, va_list ap),
diff --git
a/patches/open-iscsi/2.0.878/open-iscsi-2.0.878-static-iscsistart.patch
b/patches/open-iscsi/2.0.878/open-iscsi-2.0.878-static-iscsistart.patch
deleted file mode 100644
index 2b06109..000
--- a/patches/open-iscsi/2.0.878/open-iscsi-2.0.878-static-iscsistart.patch
+++ /dev/null
@@ -1,11 +0,0 @@
a/usr/Makefile
-+++ b/usr/Makefile
-@@ -74,7 +74,7 @@ iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o
session_mgmt.o mntcheck
-
- iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
- iscsistart.o statics.o
-- $(CC) $(CFLAGS) $^ -o $@ -lrt $(LDFLAGS) $(ISCSI_LIB)
-+ $(CC) $(CFLAGS) $^ -o $@ -static -lrt $(LDFLAGS) $(ISCSI_LIB)
- cle
[gentoo-commits] proj/genkernel:master commit in: defaults/
commit: 63da86622d47e919ebb08c894b1552d71151473a Author: Robin H. Johnson gentoo org> AuthorDate: Mon May 16 05:42:04 2022 + Commit: Robin H. Johnson gentoo org> CommitDate: Mon May 16 05:43:22 2022 + URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=63da8662 defaults/modules_load: more crypto modules Needed more cryptsetup in weirder cases. Maybe better in future to provide easier way to detect these and/or match dracut's code for module selection. Based on old https://github.com/robbat2/genkernel/pull/29 submission Closes: https://github.com/robbat2/genkernel/pull/29 Suggested-by: David Guglielmi gmail.com> Signed-off-by: Robin H. Johnson gentoo.org> defaults/modules_load | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/modules_load b/defaults/modules_load index 1c78415..2ca2046 100644 --- a/defaults/modules_load +++ b/defaults/modules_load @@ -30,7 +30,7 @@ MODULES_USB="ehci-pci ehci-hcd xhci-hcd xhci-pci xhci-plat xhci-plat-hcd uhci us MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse virtiofs loop squashfs aufs overlay cramfs configfs fscrypto msdos" # Crypto -MODULES_CRYPTO="sha256_generic cbc crc32 crc32c crc32c_generic crc32_generic aes_generic xts af_alg algif_skcipher algif_hash algif_aead algif_rng serpent_generic" +MODULES_CRYPTO="sha256_generic cbc crc32 crc32c crc32c_generic crc32_generic aes_generic xts af_alg algif_skcipher algif_hash algif_aead algif_rng serpent_generic ecb blake2b_generic blake2s_generic ccm cfb cmac chacha20poly1305 chacha_generic curve25519-generic ofb pcbc sha3_generic vmac xcbc" # Hyper-V MODULES_HYPERV="hv_sock hv_utils hv_vmbus hv_balloon hyperv-keyboard hid_hyperv hv_utils hyperv_fb hv_storvsc"
[gentoo-commits] proj/genkernel:master commit in: /
commit: 33edf44c8f25e510625ea5f155629848dc1144dd Author: Robin H. Johnson gentoo org> AuthorDate: Mon May 16 05:02:01 2022 + Commit: Robin H. Johnson gentoo org> CommitDate: Mon May 16 05:02:17 2022 + URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=33edf44c defaults/initrd.scripts: Get rid of extra padding Note: commit efdf4d0affb587655d703140db86d45ffd2a1ede is significantly easier to review by ignoring whitespace changes. Closes: https://github.com/gentoo/genkernel/pull/30 Signed-off-by: Robin H. Johnson gentoo.org> defaults/initrd.scripts | 184 1 file changed, 92 insertions(+), 92 deletions(-)
[gentoo-commits] proj/genkernel:master commit in: gkbuilds/
commit: cfc9ff455e2473e4322bd18c5fa21370d9c0702e
Author: orbea riseup net>
AuthorDate: Thu Mar 24 18:43:40 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sun May 15 23:14:01 2022 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=cfc9ff45
gkbuild/util-linux: Install the correct binaries with slibtool
Signed-off-by: orbea riseup.net>
gkbuilds/util-linux.gkbuild | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/gkbuilds/util-linux.gkbuild b/gkbuilds/util-linux.gkbuild
index 40ea1fb..5addbb1 100644
--- a/gkbuilds/util-linux.gkbuild
+++ b/gkbuilds/util-linux.gkbuild
@@ -47,11 +47,8 @@ src_install() {
mkdir "${D}"/sbin || die "Failed to create '${D}/sbin'!"
- cp -a blkid.static "${D}"/sbin/blkid \
- || die "Failed to copy '${S}/blkid.static' to
'${D}/sbin/blkid'!"
-
- cp -a switch_root "${D}"/sbin/switch_root \
- || die "Failed to copy '${S}/switch_root' to
'${D}/sbin/switch_root'!"
+ install_exe 'blkid.static' "${D}"/sbin/blkid
+ install_exe 'switch_root' "${D}"/sbin/switch_root
local sbin
for sbin in \
[gentoo-commits] proj/genkernel:master commit in: /
commit: 78968ce2101c68eabe38956495ba9d7b7f095875 Author: Robin H. Johnson gentoo org> AuthorDate: Mon May 16 04:57:54 2022 + Commit: Robin H. Johnson gentoo org> CommitDate: Mon May 16 04:57:54 2022 + URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=78968ce2 gkbuild: Install the correct binaries with slibtool Closes: https://github.com/gentoo/genkernel/pull/33 Signed-off-by: Robin H. Johnson gentoo.org> gen_funcs.sh| 23 +++ gkbuilds/cryptsetup.gkbuild | 3 +-- gkbuilds/util-linux.gkbuild | 7 ++- 3 files changed, 26 insertions(+), 7 deletions(-)
[gentoo-commits] proj/genkernel:master commit in: /
commit: 4efdb878a0d4ef361c3f39c62410e2afb51efb54 Author: Robin H. Johnson gentoo org> AuthorDate: Mon May 16 04:53:37 2022 + Commit: Robin H. Johnson gentoo org> CommitDate: Mon May 16 04:53:37 2022 + URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4efdb878 gen_initramfs.sh: append devicemanager only for dmraid, luks, or lvm Closes: https://github.com/gentoo/genkernel/pull/35 Signed-off-by: Robin H. Johnson gentoo.org> gen_funcs.sh | 9 + gen_initramfs.sh | 11 +++ 2 files changed, 16 insertions(+), 4 deletions(-)
[gentoo-commits] proj/genkernel:master commit in: /
commit: ad62b864867c2d97dd71cd38f000fb8c7550c6a9 Author: Robin H. Johnson gentoo org> AuthorDate: Mon May 16 05:15:49 2022 + Commit: Robin H. Johnson gentoo org> CommitDate: Mon May 16 05:16:38 2022 + URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ad62b864 Add support for LUKS detached header (another attempt) Note: commit 73a05632d61171685ac4960c6b684cefa6d82afd is significantly easier to review by ignoring whitespace changes. Closes: https://github.com/gentoo/genkernel/pull/28 Signed-off-by: Robin H. Johnson gentoo.org> defaults/initrd.scripts | 162 +++- defaults/linuxrc| 18 ++ doc/genkernel.8.txt | 22 +++ 3 files changed, 186 insertions(+), 16 deletions(-)
[gentoo-commits] proj/genkernel:master commit in: /
commit: 1bb3cc10d51026ad500bc9cec883f1f2f0c445ec
Author: orbea riseup net>
AuthorDate: Sun May 15 22:49:21 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sun May 15 23:13:55 2022 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1bb3cc10
gen_funcs: Add an install_exe function
This helps when the build uses slibtool where the compiled binary output
path differs from GNU libtool.
Signed-off-by: orbea riseup.net>
gen_funcs.sh | 23 +++
1 file changed, 23 insertions(+)
diff --git a/gen_funcs.sh b/gen_funcs.sh
index 500caf2..a4dc0e4 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1974,6 +1974,29 @@ check_distfiles() {
fi
}
+# @FUNCTION: install_exe
+# @USAGE:
+# @DESCRIPTION:
+# Finds an executable binary file and installs it in cases where there may be
+# similarly named shell wrapper scripts. This happens when GNU libtool creates
+# an executable named 'foo' while slibtool creates '.libs/foo' and 'foo' is a
+# shell script that should not be installed.
+install_exe() {
+ local file="${1##*/}"
+ local dest="${2}"
+
+ local dir
+ [[ "${1%/*}" == "${file}" ]] || dir="${1%/*}/"
+
+ [[ -f "${dir}${file}" ]] || gen_die "File '${dir}${file}' does not
exist!"
+
+ # Ensure only the binaries are installed and not a similarly named
wrapper script
+ find "${S}/${dir}" -type f -name "${file}" -print0 |
+ xargs -0 file | grep executable | grep ELF | cut -f 1 -d : |
+ xargs -I '{}' cp -a '{}' "${dest}" ||
+ gen_die "Failed to copy '${S}/${dir}${file}' to '${dest}'!"
+}
+
# @FUNCTION: expand_file
# @USAGE:
# @DESCRIPTION:
[gentoo-commits] proj/genkernel:master commit in: gkbuilds/
commit: 2d2e91f288679e272f731917feb58f3768ea586d
Author: orbea riseup net>
AuthorDate: Thu Mar 24 20:17:07 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sun May 15 23:14:01 2022 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2d2e91f2
gkbuild/cryptsetup: Install the correct binaries with slibtool
Signed-off-by: orbea riseup.net>
gkbuilds/cryptsetup.gkbuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gkbuilds/cryptsetup.gkbuild b/gkbuilds/cryptsetup.gkbuild
index 007874d..816df60 100644
--- a/gkbuilds/cryptsetup.gkbuild
+++ b/gkbuilds/cryptsetup.gkbuild
@@ -34,8 +34,7 @@ src_install() {
"${D}"/sbin/* \
"${D}"/usr/share/
- cp -a cryptsetup.static "${D}"/sbin/cryptsetup \
- || die "Failed to copy '${S}/cryptsetup.static' to
'${D}/sbin/cryptsetup'!"
+ install_exe 'cryptsetup.static' "${D}"/sbin/cryptsetup
"${STRIP}" --strip-all "${D}"/sbin/cryptsetup \
|| die "Failed to strip '${D}/sbin/cryptsetup'!"
[gentoo-commits] proj/genkernel:master commit in: /
commit: 110cffbf0a10a6dabe902eecb9c139663ad737af
Author: Mike Gilbert gentoo org>
AuthorDate: Sun May 15 16:37:51 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sun May 15 22:10:07 2022 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=110cffbf
gen_initramfs.sh: append devicemanager only for specific modules
dmraid
luks
lvm
multipath
Bug: https://bugs.gentoo.org/749957
Signed-off-by: Mike Gilbert gentoo.org>
gen_funcs.sh | 9 +
gen_initramfs.sh | 11 +++
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/gen_funcs.sh b/gen_funcs.sh
index 500caf2..db396e3 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -22,6 +22,15 @@ isTrue() {
return 1
}
+anyTrue() {
+ local x
+ for x
+ do
+ isTrue "${x}" && return 0
+ done
+ return 1
+}
+
set_color_vars() {
if ! isTrue "${NOCOLOR}"
then
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 4ec296e..0b74f4c 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -2007,11 +2007,14 @@ append_auxiliary() {
}
append_data() {
- local name=$1 var=$2
+ [ $# -eq 0 ] && gen_die "append_data() called with zero arguments"
+
+ local name=$1
local func="append_${name}"
- [ $# -eq 0 ] && gen_die "append_data() called with zero arguments"
- if [ $# -eq 1 ] || isTrue "${var}"
+ shift
+
+ if [ $# -eq 0 ] || anyTrue "$@"
then
print_info 1 "$(get_indent 1)>> Appending ${name} cpio data ..."
${func} || gen_die "${func}() failed!"
@@ -2037,7 +2040,7 @@ create_initramfs() {
append_data 'base_layout'
append_data 'util-linux'
append_data 'eudev'
- append_data 'devicemanager'
+ append_data 'devicemanager' "${DMRAID}" "${LVM}" "${LUKS}"
"${MULTIPATH}"
append_data 'auxiliary' "${BUSYBOX}"
append_data 'busybox' "${BUSYBOX}"
append_data 'b2sum' "${B2SUM}"
[gentoo-commits] proj/genkernel:master commit in: defaults/, doc/
commit: 73a05632d61171685ac4960c6b684cefa6d82afd
Author: Dmitry Baranov gmail com>
AuthorDate: Wed Oct 14 19:03:01 2020 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sat Aug 7 17:20:10 2021 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=73a05632
Add support for LUKS detached header
Signed-off-by: Dmitry Baranov gmail.com>
defaults/initrd.scripts | 162 +++-
defaults/linuxrc| 18 ++
doc/genkernel.8.txt | 22 +++
3 files changed, 186 insertions(+), 16 deletions(-)
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 33a48b3..5a83d93 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -306,7 +306,7 @@ bootstrapFS() {
fi
# Setup the filesystem nodes and directories
- for i in ${CDROOT_PATH} /mnt/livecd /mnt/key /mnt/gentoo /tmp
/tmp/.initrd /dev /proc /run /sys; do
+ for i in ${CDROOT_PATH} /mnt/header /mnt/livecd /mnt/key /mnt/gentoo
/tmp /tmp/.initrd /dev /proc /run /sys; do
run mkdir -p "${NEW_ROOT}${i}"
run chmod 755 "${NEW_ROOT}${i}"
done
@@ -391,6 +391,14 @@ bootstrapCD() {
fi
}
+bootstrapHeader() {
+ # $1 = ROOT/SWAP
+ local HEADERDEVS=$(devicelist)
+ eval local headerloc='"${CRYPT_'${1}'_HEADER}"'
+
+ findmediamount "header" "${headerloc}" "CRYPT_${1}_HEADERDEV"
"/mnt/header" ${HEADERDEVS}
+}
+
bootstrapKey() {
# $1 = ROOT/SWAP
local KEYDEVS=$(devicelist)
@@ -1828,12 +1836,17 @@ openLUKS() {
local LUKS_NAME="${1}"
eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"'
+ eval local LUKS_HEADER='"${CRYPT_'${TYPE}'_HEADER}"'
+ eval local LUKS_HEADERDEV='"${CRYPT_'${TYPE}'_HEADERDEV}"'
+ eval local LUKS_HEADERDEV_FSTYPE='"${CRYPT_'${TYPE}'_HEADERDEV_FSTYPE}"'
eval local LUKS_KEY='"${CRYPT_'${TYPE}'_KEY}"'
eval local LUKS_KEYDEV='"${CRYPT_'${TYPE}'_KEYDEV}"'
eval local LUKS_KEYDEV_FSTYPE='"${CRYPT_'${TYPE}'_KEYDEV_FSTYPE}"'
eval local OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}"'
- local DEV_ERROR=0 KEY_ERROR=0 KEYDEV_ERROR=0
- local mntkey="/mnt/key/" crypt_filter_ret=
+ local DEV_ERROR=0
+ local HEADER_ERROR=0 HEADERDEV_ERROR=0
+ local KEY_ERROR=0 KEYDEV_ERROR=0
+ local mntheader="/mnt/header/" mntkey="/mnt/key/" crypt_filter_ret=
if [ -z "${LUKS_DEVICE}" ]
then
@@ -1853,13 +1866,27 @@ openLUKS() {
good_msg "The LUKS device ${LUKS_DEVICE} meanwhile was
opened by someone else."
break
# if crypt_silent=1 and some error occurs, enter shell quietly
- elif [ \( ${CRYPT_SILENT} -eq 1 \) -a \( \( \( ${DEV_ERROR} -eq
1 \) -o \( ${KEY_ERROR} -eq 1 \) \) -o \( ${KEYDEV_ERROR} -eq 1 \) \) ]
+ elif [ \( ${CRYPT_SILENT} -eq 1 \) -a \( \( \( ${DEV_ERROR} -eq
1 \) \) ]
+ then
+ run_emergency_shell
+ elif [ \( ${CRYPT_SILENT} -eq 1 \) -a \( \( \( ${HEADER_ERROR}
-eq 1 \) \) -o \( ${HEADERDEV_ERROR} -eq 1 \) \) ]
+ then
+ run_emergency_shell
+ elif [ \( ${CRYPT_SILENT} -eq 1 \) -a \( \( \( ${KEY_ERROR} -eq
1 \) \) -o \( ${KEYDEV_ERROR} -eq 1 \) \) ]
then
run_emergency_shell
elif [ ${DEV_ERROR} -eq 1 ]
then
prompt_user "LUKS_DEVICE" "${LUKS_NAME}"
DEV_ERROR=0
+ elif [ ${HEADER_ERROR} -eq 1 ]
+ then
+ prompt_user "LUKS_HEADER" "${LUKS_NAME} header"
+ HEADER_ERROR=0
+ elif [ ${HEADERDEV_ERROR} -eq 1 ]
+ then
+ prompt_user "LUKS_HEADERDEV" "${LUKS_NAME} header
device"
+ HEADERDEV_ERROR=0
elif [ ${KEY_ERROR} -eq 1 ]
then
prompt_user "LUKS_KEY" "${LUKS_NAME} key"
@@ -1877,18 +1904,93 @@ openLUKS() {
continue
fi
- if ! run cryptsetup isLuks ${LUKS_DEVICE}
+ # Handle headers
+ if [ -n "${LUKS_HEADER}" ]
+ then
+ local REAL_LUKS_HEADERDEV="${LUKS_HEADERDEV}&qu
[gentoo-commits] proj/genkernel:master commit in: defaults/
commit: efdf4d0affb587655d703140db86d45ffd2a1ede
Author: Dmitry Baranov gmail com>
AuthorDate: Tue Dec 29 20:10:50 2020 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sat Aug 7 17:20:10 2021 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=efdf4d0a
defaults/initrd.scripts: Get rid of extra padding
Simplify conditional blocks where 'continue' is present.
Signed-off-by: Dmitry Baranov gmail.com>
defaults/initrd.scripts | 184
1 file changed, 92 insertions(+), 92 deletions(-)
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index cdee2a4..33a48b3 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1882,119 +1882,119 @@ openLUKS() {
bad_msg "The LUKS device ${LUKS_DEVICE} does
not contain a LUKS header" ${CRYPT_SILENT}
DEV_ERROR=1
continue
- else
- if [ -n "${cryptsetup_options}" ]
- then
- good_msg "Using the following
cryptsetup options for ${LUKS_NAME}: ${cryptsetup_options}" ${CRYPT_SILENT}
- fi
+ fi
- # Handle keys
- if [ -n "${LUKS_KEY}" ]
+ if [ -n "${cryptsetup_options}" ]
+ then
+ good_msg "Using the following cryptsetup
options for ${LUKS_NAME}: ${cryptsetup_options}" ${CRYPT_SILENT}
+ fi
+
+ # Handle keys
+ if [ -n "${LUKS_KEY}" ]
+ then
+ local REAL_LUKS_KEYDEV="${LUKS_KEYDEV}"
+ if [ ! -e "${mntkey}${LUKS_KEY}" ]
then
- local REAL_LUKS_KEYDEV="${LUKS_KEYDEV}"
- if [ ! -e "${mntkey}${LUKS_KEY}" ]
+ REAL_LUKS_KEYDEV=$(find_real_device
"${LUKS_KEYDEV}")
+ if [ -b "${REAL_LUKS_KEYDEV}" ]
then
-
REAL_LUKS_KEYDEV=$(find_real_device "${LUKS_KEYDEV}")
- if [ -b "${REAL_LUKS_KEYDEV}" ]
+ good_msg "Using key device
${REAL_LUKS_KEYDEV}." ${CRYPT_SILENT}
+ else
+ good_msg "Please insert
removable device ${LUKS_KEYDEV} for ${LUKS_NAME}" ${CRYPT_SILENT}
+ # abort after 10 secs
+ local count=10
+ while [ ${count} -gt 0 ]
+ do
+ count=$((count-1))
+ sleep 1
+
REAL_LUKS_KEYDEV=$(find_real_device "${LUKS_KEYDEV}")
+ if [ -b
"${REAL_LUKS_KEYDEV}" ]
+ then
+ good_msg
"Removable device ${REAL_LUKS_KEYDEV} detected." ${CRYPT_SILENT}
+ break
+ fi
+ done
+ if [ ! -b "${REAL_LUKS_KEYDEV}"
]
then
- good_msg "Using key
device ${REAL_LUKS_KEYDEV}." ${CRYPT_SILENT}
- else
- good_msg "Please insert
removable device ${LUKS_KEYDEV} for ${LUKS_NAME}" ${CRYPT_SILENT}
- # abort after 10 secs
- local count=10
- while [ ${count} -gt 0 ]
- do
-
count=$((count-1))
- sleep 1
-
[gentoo-commits] repo/gentoo:master commit in: net-misc/netifrc/
commit: 96fa623d6c5297f48e16a2bc855c2507449e
Author: Robin H. Johnson gentoo org>
AuthorDate: Fri May 13 22:10:52 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Fri May 13 22:11:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96fa
net-misc/netifrc: pkg_postinst needs udev_reload
Signed-off-by: Robin H. Johnson gentoo.org>
Closes: https://bugs.gentoo.org/843908
net-misc/netifrc/netifrc-0.7.3.ebuild | 1 +
net-misc/netifrc/netifrc-.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/net-misc/netifrc/netifrc-0.7.3.ebuild
b/net-misc/netifrc/netifrc-0.7.3.ebuild
index ac56715aca1e..d06417b6031a 100644
--- a/net-misc/netifrc/netifrc-0.7.3.ebuild
+++ b/net-misc/netifrc/netifrc-0.7.3.ebuild
@@ -61,6 +61,7 @@ src_install() {
}
pkg_postinst() {
+ udev_reload
if [[ ! -e "${EROOT}"/etc/conf.d/net && -z ${REPLACING_VERSIONS} ]];
then
elog "The network configuration scripts will use dhcp by"
elog "default to set up your interfaces."
diff --git a/net-misc/netifrc/netifrc-.ebuild
b/net-misc/netifrc/netifrc-.ebuild
index 4503bec9c25e..31f53c53facc 100644
--- a/net-misc/netifrc/netifrc-.ebuild
+++ b/net-misc/netifrc/netifrc-.ebuild
@@ -61,6 +61,7 @@ src_install() {
}
pkg_postinst() {
+ udev_reload
if [[ ! -e "${EROOT}"/etc/conf.d/net && -z ${REPLACING_VERSIONS} ]];
then
elog "The network configuration scripts will use dhcp by"
elog "default to set up your interfaces."
[gentoo-commits] repo/gentoo:master commit in: sys-apps/ipmiutil/, sys-apps/ipmiutil/files/
commit: ba9f1c5883a21c5ad332abdf2e23bc89ce79e397
Author: Robin H. Johnson gentoo org>
AuthorDate: Fri May 6 04:11:46 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Fri May 6 04:11:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba9f1c58
sys-apps/ipmiutil: bump for openssl-3.0
Signed-off-by: Robin H. Johnson gentoo.org>
sys-apps/ipmiutil/Manifest | 1 +
.../files/ipmiutil-3.1.8-fix-configure.patch | 170 +
sys-apps/ipmiutil/ipmiutil-3.1.8.ebuild| 81 ++
3 files changed, 252 insertions(+)
diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index bc3c07233bb9..5fdc81507f2a 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -2,3 +2,4 @@ DIST ipmiutil-3.0.6.tar.gz 1692679 BLAKE2B
dcc02dbb5467b824005dbc95c8f5231b2e275
DIST ipmiutil-3.0.9.tar.gz 1697688 BLAKE2B
93ed8865cae1cea0ea4f7de4683f4698e3f75e9190cc7e0af1832ca44a08f52aa149393761f1ede3994827db78841061d54058bbe4178b5930accd3a4c225ba7
SHA512
c2c0a516216a46a52621159e665a77d96cf81f385fc9cf19877e72283be3e1a4dad5a4826454727b71576c22cc4de3c73ff428d26f35bf496c7dc1511305cda3
DIST ipmiutil-3.1.6.tar.gz 1693461 BLAKE2B
efc2b283d7655b8afb9d3d8da2e5458deea1c1b939f3ccdf2be0cdf3792ea60229099cce1b8e32f087972385feb01d604f1c63bddbfd031210d5acf8a6b1b9d7
SHA512
9bccfa2e0bba7f30e422d67f93ee6cff50c08cc8bceab5ba5bfd1b0a91e1af8a4a98a2eaa81364e8a1f38e0bd1ce6b99717d86957c6f689aa7329e7013f5b0ef
DIST ipmiutil-3.1.7.tar.gz 1726396 BLAKE2B
7fa31f8aca61462fc08dd4fe420e27eecce2ee9fa5fb2676eb944e2ae6c09598aec5f06d59e4ed02faab077003b14085f944b6cf0b63f90b10f2660f363e997b
SHA512
7522808e4a94c8627de0a95dde0e3eb463ba05948159b5181129b573ce8f9feba3543ef603c14e7cdcafcbd58ca5319536cc5534ea8191cce0ef9d33cc548274
+DIST ipmiutil-3.1.8.tar.gz 1841037 BLAKE2B
69139fc2b82a701657c5fec6aa928a0ee2d7874a8ebc26631eca438f298e8bddd3afb578462979eb24cd51bd816263f13e9f38fec8b5d6fa4fcefb2519a652c9
SHA512
77a01be420d8362ddce2b2b2bd44ee53a70812b29b3dd7bc5add6429f0e43a48905ca0401e1855f2cca5e69086605eb7b84e2f4bf9cf33251934acc0fe51346f
diff --git a/sys-apps/ipmiutil/files/ipmiutil-3.1.8-fix-configure.patch
b/sys-apps/ipmiutil/files/ipmiutil-3.1.8-fix-configure.patch
new file mode 100644
index ..f59701079828
--- /dev/null
+++ b/sys-apps/ipmiutil/files/ipmiutil-3.1.8-fix-configure.patch
@@ -0,0 +1,170 @@
+Fix automagic configure options.
+
+--- ipmiutil-3.1.8.orig/configure.ac 2022-05-05 20:48:27.180318912 -0700
ipmiutil-3.1.8/configure.ac2022-05-05 20:53:10.070503250 -0700
+@@ -80,22 +80,30 @@
+ # fi]
+
+ drv_landesk=0
++LANDESK_CFLAGS=""
++LANDESK_LDADD=""
+ dnl configure for LANDESK libipmiapi or not
+ AC_ARG_ENABLE([landesk],
+-[ --enable-landesk adds landesk library support [[default=no]]],
+-[if test "x$enableval" = "xyes"; then
++ AS_HELP_STRING([--enable-landesk], [enable landesk support
(default=no)]),
++ [],
++ [enable_landesk=no]
++)
++AS_IF([test "x$enable_landesk" = "xyes"], [
+ drv_landesk=1
+ LANDESK_CFLAGS="-DLINK_LANDESK"
+ LANDESK_LDADD="-lipmiapi -L../lib"
+ AC_SUBST(LANDESK_CFLAGS)
+ AC_SUBST(LANDESK_LDADD)
+-fi]
+-)
++echo "landesk enabled"
++])
+
+ dnl Configure ipmiutil for lanplus (libipmi_lanplus.a) or not (default yes)
+ AC_ARG_ENABLE([lanplus],
+-[ --disable-lanplus disable lanplus support [[default=enabled]]],)
+-if test "x$enable_lanplus" = "xno"; then
++ AS_HELP_STRING([--disable-lanplus], [enable lanplus support
(default=yes)]),
++ [],
++ [enable_lanplus=yes]
++)
++
+ drv_lanplus=""
+ LANPLUS_CFLAGS=""
+ LANPLUS_LDADD=""
+@@ -103,8 +111,7 @@
+ LANPLUS_CRYPTO=""
+ LANPLUS_SAM="no"
+ LD_SAMX=""
+- echo "lanplus disabled"
+-else
++AS_IF([test "x$enable_lanplus" = "xyes"], [
+ drv_lanplus="lanplus"
+ LANPLUS_CFLAGS="-DHAVE_LANPLUS"
+ # LANPLUS_CFLAGS="-DHAVE_LANPLUS -I${projdir}/lib/lanplus/inc"
+@@ -115,7 +122,7 @@
+ LANPLUS_SAM="yes"
+ LD_SAMX="../lib/libipmi_lanplus.a -lcrypto"
+ echo "lanplus enabled"
+-fi
++])
+
+ dnl Configure libipmiutil.a for lanplus or not
+ dnl Only SOL requires lanplus, so usually build libipmiutil.a without lanplus
+@@ -130,21 +137,28 @@
+ #fi
+
+ # strings /lib/libssl.so* |grep EVP_sha256
+-dnl configure for SHA256, build lanplus with SHA256 support, uses later
openssl.
++dnl configure for SHA256, build lanplus with SHA256 support
++dnl requires openssl-1.0.1 which was released in 2012/03
+ AC_ARG_ENABLE([sha256],
+-[ --enable-sha256build wi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/plocate/
commit: 7f4f2cef47764e386c089241315676b71dd08b77
Author: Robin H. Johnson gentoo org>
AuthorDate: Sat Apr 23 14:33:31 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sat Apr 23 14:33:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f4f2cef
sys-apps/plocate: works fine on x86
Signed-off-by: Robin H. Johnson gentoo.org>
sys-apps/plocate/plocate-1.1.15.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/plocate/plocate-1.1.15.ebuild
b/sys-apps/plocate/plocate-1.1.15.ebuild
index 632c45be5000..3fb8c7c34d07 100644
--- a/sys-apps/plocate/plocate-1.1.15.ebuild
+++ b/sys-apps/plocate/plocate-1.1.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://plocate.sesse.net/download/${P}.tar.gz";
# GPL-2+ for plocate itself
LICENSE="GPL-2 GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
IUSE="+io-uring"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-util/kup/, dev-util/kup/files/
commit: 192b57063e09431f7d1b39c58ab0c137eac680ec
Author: Robin H. Johnson gentoo org>
AuthorDate: Thu Apr 21 23:43:32 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Thu Apr 21 23:43:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=192b5706
dev-util/kup: add gitolite support from upstream kup & gitolite
Signed-off-by: Robin H. Johnson gentoo.org>
.../kup/files/kup-server-gitolite-subcmd.patch | 242 +
dev-util/kup/kup-0.3.6-r1.ebuild | 38
dev-util/kup/metadata.xml | 6 +
3 files changed, 286 insertions(+)
diff --git a/dev-util/kup/files/kup-server-gitolite-subcmd.patch
b/dev-util/kup/files/kup-server-gitolite-subcmd.patch
new file mode 100644
index ..89ea3ff02bf3
--- /dev/null
+++ b/dev-util/kup/files/kup-server-gitolite-subcmd.patch
@@ -0,0 +1,242 @@
+Upstream kup provided this patch, that was apparently written by the Gitolite
+author.
+
+--- standard/kup-server2017-03-28 13:01:24.0 -0400
gitolite/kup-server2018-03-26 15:01:20.0 -0400
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -T
++#!/usr/bin/perl
+ ## ---
+ ##
+ ## Copyright 2011 Intel Corporation; author: H. Peter Anvin
+@@ -68,12 +68,20 @@
+
+ use Digest::SHA;
+
+-my $VERSION = '0.3.6';
+-
+-# Scrub the environment completely
+-%ENV = ('PATH' => '/bin:/usr/bin',
+- 'LANG' => 'C',
+- 'SHELL' => '/bin/false'); # Nothing in this program should
shell out
++use lib $ENV{GL_LIBDIR};
++use Gitolite::Easy;
++use Gitolite::Conf::Load;
++
++my $VERSION = '0.3.6 (gitolite integrated)';
++
++# Scrub the environment completely, except gitolite variables and HOME
++{
++ my %env = %ENV;
++ %ENV = ('PATH' => '/bin:/usr/bin',
++ 'LANG' => 'C',
++ 'SHELL' => '/bin/false'); # Nothing in this program
should shell out
++ $ENV{$_} = $env{$_} for ('HOME', grep(/^GL_/, keys %env));
++}
+
+ # The standard function to call on bail
+ sub fatal($) {
+@@ -88,16 +96,7 @@
+ }
+
+ sub my_username() {
+- my $whoami = getuid();
+- my ($name,$passwd,$uid,$gid,$quota,$comment,$gcos,$dir,$shell,$expire)
= getpwuid($whoami);
+-
+- if (!defined($name) || $whoami != $uid) {
+- # We haven't called openlog() yet so we need to do it here
+- openlog("kup-server($whoami)", 'ndelay,pid', LOG_LOCAL5);
+- fatal("You don't exist, go away!");
+- }
+-
+- return (defined($name) && $whoami == $uid) ? $name : $whoami;
++ return $ENV{GL_USER};
+ }
+
+ my $user_name = my_username();
+@@ -106,7 +105,7 @@
+
+
+ # Get config values from kup-server.cfg
+-my $cfg_file = '/etc/kup/kup-server.cfg';
++my $cfg_file =
'/var/lib/gitolite3/.gitolite/local-code/configs/kup-server.cfg';
+
+ my $cfg = new Config::Simple($cfg_file);
+
+@@ -371,6 +370,51 @@
+ return 1;
+ }
+
++# kup-server may "read" files from the kup data_path, or repos. If a repo is
++# supplied, we assume it's a gitolite repo and check access accordingly (while
++# remembering that kup seems to add a leading slash). If a repo is *not*
++# supplied, we assume we're talking about the kup data_path, which means we
++# make gitolite access rules from the "fake" repo called "@kup-server"
++sub read_allowed
++{
++ Gitolite::Common::trace( 1, 'read_allowed', @_ );
++ my $repo = shift || '@kup-server';
++
++ # gitolite expects a "normalised" repo name; no leading slash, no
trailing ".git"
++ $repo =~ s(^/)(); $repo =~ s/\.git$//;
++
++ return can_read($repo);
++}
++
++# kup-server does not write to normal repos, it only writes to files in the
++# kup data_path. So we don't have to worry about any repo other than
++# "@kup-server", which is therefore hardcoded in here.
++sub write_allowed
++{
++ Gitolite::Common::trace( 1, 'write_allowed', @_ );
++ my($path, $perm) = @_;
++
++ # other values for perm are + (rm) and C (mkdir), analogous to
gitolite's
++ # "+ means delete or rewind branch, C means create branch"
++ $perm ||= 'W';
++
++ my $repo = '@kup-server';
++
++ # the paths that gitolite expects start with "refs/heads/", since we are
++ # simply re-using the existing ACL for this. (But remember $path, in
++ # kup-land, already starts with a "/".)
++ $path = "refs/heads" . $path;
++
++ return can_write($repo, $perm, $path) ||
++ c
Re: [gentoo-dev] proposal: use only one hash function in manifest files
On Wed, Apr 06, 2022 at 05:23:25PM +, Robin H. Johnson wrote: > On Wed, Apr 06, 2022 at 02:15:02AM +0200, Jason A. Donenfeld wrote: > > 2) Comparability: other distros use SHA2-512, as well as various > > upstreams, which means we can compare our hashes to theirs easily. > Can we expand on this specific thread for a moment? > > I was the author of GLEP59 about changing the Manifest hashes, and I > noted at the time, with references, that the effective strength of a set > of hashes is only that of the strongest hash. Bump for my parent message, that I'm very surprised at the lack of responses to two messages in this thread. https://archives.gentoo.org/gentoo-dev/message/18216da0128ee79733fa68bb77fa8b69 https://archives.gentoo.org/gentoo-dev/message/a9974ec34dfb25810dab47e3fa322a52 -- Robin Hugh Johnson Gentoo Linux: Dev, Infra Lead, Foundation Treasurer E-Mail : robb...@gentoo.org GnuPG FP : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85 GnuPG FP : 7D0B3CEB E9B85B1F 825BCECF EE05E6F6 A48F6136
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/
commit: 39935b585f184238be648a193fb8a68f479196b1
Author: Robin H. Johnson gentoo org>
AuthorDate: Tue Apr 19 23:16:45 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Tue Apr 19 23:17:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39935b58
sys-kernel/genkernel: fix shellcheck error
Signed-off-by: Robin H. Johnson gentoo.org>
Fixes: https://bugs.gentoo.org/839195
sys-kernel/genkernel/genkernel-4.2.5.ebuild| 2 +-
sys-kernel/genkernel/genkernel-4.2.6-r2.ebuild | 2 +-
sys-kernel/genkernel/genkernel-.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-kernel/genkernel/genkernel-4.2.5.ebuild
b/sys-kernel/genkernel/genkernel-4.2.5.ebuild
index 0aa34f0f69da..b5ae43f5eda6 100644
--- a/sys-kernel/genkernel/genkernel-4.2.5.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.2.5.ebuild
@@ -287,7 +287,7 @@ pkg_postinst() {
fi
local n_root_args=$(grep -o -- '\/dev/null | wc
-l)
- if [[ ${n_root_args} > 1 ]] ; then
+ if [[ ${n_root_args} -gt 1 ]] ; then
ewarn "WARNING: Multiple root arguments (root=) on kernel
command-line detected!"
ewarn "If you are appending non-persistent device names to
kernel command-line,"
ewarn "next reboot could fail in case running system and
initramfs do not agree"
diff --git a/sys-kernel/genkernel/genkernel-4.2.6-r2.ebuild
b/sys-kernel/genkernel/genkernel-4.2.6-r2.ebuild
index 8095046ac8a1..c84a9987b7c4 100644
--- a/sys-kernel/genkernel/genkernel-4.2.6-r2.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.2.6-r2.ebuild
@@ -293,7 +293,7 @@ pkg_postinst() {
fi
local n_root_args=$(grep -o -- '\/dev/null | wc
-l)
- if [[ ${n_root_args} > 1 ]] ; then
+ if [[ ${n_root_args} -gt 1 ]] ; then
ewarn "WARNING: Multiple root arguments (root=) on kernel
command-line detected!"
ewarn "If you are appending non-persistent device names to
kernel command-line,"
ewarn "next reboot could fail in case running system and
initramfs do not agree"
diff --git a/sys-kernel/genkernel/genkernel-.ebuild
b/sys-kernel/genkernel/genkernel-.ebuild
index acee15e17415..4b18348406d6 100644
--- a/sys-kernel/genkernel/genkernel-.ebuild
+++ b/sys-kernel/genkernel/genkernel-.ebuild
@@ -288,7 +288,7 @@ pkg_postinst() {
fi
local n_root_args=$(grep -o -- '\/dev/null | wc
-l)
- if [[ ${n_root_args} > 1 ]] ; then
+ if [[ ${n_root_args} -gt 1 ]] ; then
ewarn "WARNING: Multiple root arguments (root=) on kernel
command-line detected!"
ewarn "If you are appending non-persistent device names to
kernel command-line,"
ewarn "next reboot could fail in case running system and
initramfs do not agree"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/thrulay/
commit: 6082674e9ec32026b62641060bac2d559640d979
Author: Robin H. Johnson gentoo org>
AuthorDate: Sat Apr 16 05:00:50 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sat Apr 16 05:01:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6082674e
net-analyzer/thrulay: fix LICENSE
Signed-off-by: Robin H. Johnson gentoo.org>
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=426004
net-analyzer/thrulay/thrulay-0.9-r1.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net-analyzer/thrulay/thrulay-0.9-r1.ebuild
b/net-analyzer/thrulay/thrulay-0.9-r1.ebuild
index 388b9ba4e265..97d1f5c8c503 100644
--- a/net-analyzer/thrulay/thrulay-0.9-r1.ebuild
+++ b/net-analyzer/thrulay/thrulay-0.9-r1.ebuild
@@ -11,7 +11,8 @@ SRC_URI="
http://www.internet2.edu/~shalunov/thrulay/${P}.tar.gz
mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="BSD"
+# init.d is GPL-2
+LICENSE="BSD GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86"
[gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/
commit: eac600cf87417f9312fae99b7f73536b5ff399d1 Author: Robin H. Johnson gentoo org> AuthorDate: Fri Apr 15 19:34:21 2022 + Commit: Robin H. Johnson gentoo org> CommitDate: Fri Apr 15 19:35:04 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eac600cf net-nds/openldap: fix multilib inherit Fixes: IndirectInherits: version 2.6.1-r1: multilib: indirect inherit usage: 'get_libname 0', line 752 Signed-off-by: Robin H. Johnson gentoo.org> net-nds/openldap/openldap-2.6.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-nds/openldap/openldap-2.6.1-r1.ebuild b/net-nds/openldap/openldap-2.6.1-r1.ebuild index 7091232465cf..f90979e12030 100644 --- a/net-nds/openldap/openldap-2.6.1-r1.ebuild +++ b/net-nds/openldap/openldap-2.6.1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools flag-o-matic multilib-minimal preserve-libs ssl-cert toolchain-funcs systemd tmpfiles +inherit autotools flag-o-matic multilib multilib-minimal preserve-libs ssl-cert toolchain-funcs systemd tmpfiles MY_PV="$(ver_rs 1-2 _)"
[gentoo-commits] repo/gentoo:master commit in: sys-block/fio/
commit: ea1f73960cae51410a7a2fbcb1d0789dcffbcb83
Author: Robin H. Johnson gentoo org>
AuthorDate: Fri Apr 15 19:28:20 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Fri Apr 15 19:35:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea1f7396
sys-block/fio: clean stale ebuild
Signed-off-by: Robin H. Johnson gentoo.org>
sys-block/fio/fio-3.27-r2.ebuild | 150 ---
1 file changed, 150 deletions(-)
diff --git a/sys-block/fio/fio-3.27-r2.ebuild b/sys-block/fio/fio-3.27-r2.ebuild
deleted file mode 100644
index 95b48167827b..
--- a/sys-block/fio/fio-3.27-r2.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-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 ~ppc ppc64 x86"
-IUSE="aio curl glusterfs gnuplot gtk io-uring numa python rbd rdma static
tcmalloc test 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.
-LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
- curl? (
- net-misc/curl:=[static-libs(+)]
- dev-libs/openssl:0=[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 )"
-RDEPEND+="
- python? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/pandas[${PYTHON_USEDEP}]')
- )
- gnuplot? ( sci-visualization/gnuplot )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/fio-2.2.13-libmtd.patch
-)
-
-python_check_deps() {
- has_version "dev-python/pandas[${PYTHON_USEDEP}]"
-}
-
-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
zlib true false) ; then:" \
- -e '/if compile_prog "" "-laio" "libaio" *; *then/'"s::if
$(usex aio true false) ; then:" \
- -e '/if compile_prog "" "-lcunit" "CUnit" *; *then/'"s::if
$(usex test true false) ; then:" \
- configure || die
-}
-
-src_configure() {
- chmod g-w "${T}"
- # not a real configure script
- # TODO: cuda
- # TODO: libnbd - not packaged in Gentoo
- # TODO: pmem - not packaged in Gentoo
- set -- \
- ./configure \
- --disable-optimizations \
- --extra-cflags="${CFLAGS} ${CPPFLAGS}" \
- --cc="$(tc-getCC)" \
- --disable-pmem \
- $(usex curl '' '--disable-http') \
- $(usex glusterfs '' '--disable-gfapi') \
- $(usex gtk '--enable-gfio' '') \
- $(usex numa '' '--disable-numa') \
- $(usex rbd '' '--disable-rbd') \
- $(usex rdma '' '--disable-rdma') \
- $(usex static '--build-static' '') \
- $(usex tcmalloc '' '--disable-tcmalloc')
- echo "$@"
- "$@" || die 'configure failed'
-}
-
-src_compile() {
- emake V=1
[gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/
commit: 093cd54d45df6d840c33b0d2c367d7a5c70acdc7 Author: Robin H. Johnson gentoo org> AuthorDate: Fri Apr 15 19:33:19 2022 + Commit: Robin H. Johnson gentoo org> CommitDate: Fri Apr 15 19:35:04 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=093cd54d net-nds/openldap: document USE=autoca Signed-off-by: Robin H. Johnson gentoo.org> net-nds/openldap/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/net-nds/openldap/metadata.xml b/net-nds/openldap/metadata.xml index 62176631c249..d19853eda044 100644 --- a/net-nds/openldap/metadata.xml +++ b/net-nds/openldap/metadata.xml @@ -10,6 +10,7 @@ Enable password hashing algorithm from app-crypt/argon2 + Automatic Certificate Authority overlay Enable use of cleartext passwords Enable experimental backend options Enable support for kerberos init
[gentoo-commits] repo/gentoo:master commit in: sys-block/fio/
commit: 7d1472027c037812dafb3ef8c6d706d2a691e406 Author: Robin H. Johnson gentoo org> AuthorDate: Fri Apr 15 19:27:58 2022 + Commit: Robin H. Johnson gentoo org> CommitDate: Fri Apr 15 19:35:04 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d147202 sys-block/fio: fix USE=nfs Signed-off-by: Robin H. Johnson gentoo.org> sys-block/fio/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/sys-block/fio/metadata.xml b/sys-block/fio/metadata.xml index 83445573eea0..35aae97a4d18 100644 --- a/sys-block/fio/metadata.xml +++ b/sys-block/fio/metadata.xml @@ -13,6 +13,7 @@ Enable GlusterFS gfapi support via sys-cluster/glusterfs Install tools for generating gnuplots Enable efficient I/O via sys-libs/liburing. + Enable NFS support Enable numa support Enable Rados block device support via sys-cluster/ceph Enable infiniband support via sys-cluster/rdma-core
[gentoo-commits] repo/gentoo:master commit in: app-misc/ddcutil/
commit: 76f55948553c4a00bebea7334608cd16a686398e
Author: Robin H. Johnson gentoo org>
AuthorDate: Fri Apr 15 04:59:39 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Fri Apr 15 04:59:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76f55948
app-misc/ddcutil: cleanup
Signed-off-by: Robin H. Johnson gentoo.org>
Closes: https://bugs.gentoo.org/787020
app-misc/ddcutil/Manifest| 1 -
app-misc/ddcutil/ddcutil-0.9.9-r3.ebuild | 117 ---
2 files changed, 118 deletions(-)
diff --git a/app-misc/ddcutil/Manifest b/app-misc/ddcutil/Manifest
index 36814e6355bf..6237ee274ea6 100644
--- a/app-misc/ddcutil/Manifest
+++ b/app-misc/ddcutil/Manifest
@@ -1,2 +1 @@
-DIST ddcutil-0.9.9.tar.gz 725207 BLAKE2B
ad7b0b35ad4c2dae21da066e4194209579d774ded10f2dc0d8d7d3d94e70d5893c3d1f772b86ea01be510cfb8d51a657178228d028ca34ab20d344e86e0581d2
SHA512
f7b2b961c6b76ef59f336290b494cdd331556848de881d57e5240075d50733030df4c47131070f1276907d712a45f60dad6bebaa052a66621b8b5517ff293c21
DIST ddcutil-1.2.2.tar.gz 803943 BLAKE2B
65cc5dc0d1ee85d1e2b6670f7c24508ab817c6eebdb596b5f6f70c7ff7b9257f12f70abfea2d735e23755e508d4829d4be6574ac16564d4d828e0b1153cf8afe
SHA512
0329711e536cbcaee2efe6cf981a17181ab318846e9c6a82f2ceacc42691ba49c06df44a52d1f079568e9ccec588cc85d4de4adf19b6db83bebe4bb90ae29207
diff --git a/app-misc/ddcutil/ddcutil-0.9.9-r3.ebuild
b/app-misc/ddcutil/ddcutil-0.9.9-r3.ebuild
deleted file mode 100644
index 53bf5448e893..
--- a/app-misc/ddcutil/ddcutil-0.9.9-r3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic linux-info udev
-
-DESCRIPTION="Program for querying and changing monitor settings"
-HOMEPAGE="http://www.ddcutil.com/";
-SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz ->
${P}.tar.gz"
-
-SLOT="0/3"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="drm introspection usb-monitor user-permissions video_cards_nvidia X"
-REQUIRED_USE="drm? ( X )"
-
-RDEPEND="
- dev-libs/glib:2
- sys-apps/i2c-tools
- virtual/udev
- drm? ( x11-libs/libdrm )
- introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
- usb-monitor? (
- dev-libs/hidapi
- virtual/libusb:1
- sys-apps/usbutils
- )
- user-permissions? (
- acct-group/i2c
- usb-monitor? ( acct-group/video )
- )
- X? (
- x11-libs/libXrandr
- x11-libs/libX11
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-pkg_pretend() {
- # This program needs /dev/ic2-* devices to communicate with the monitor.
- CONFIG_CHECK="~I2C_CHARDEV"
- ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to
continue"
- if use usb-monitor; then
- CONFIG_CHECK+=" ~HIDRAW ~USB_HIDDEV"
- ERROR_HIDRAW="HIDRAW is needed to support USB monitors"
- ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB monitors"
- fi
-
- # Now do the actual checks setup above
- check_extra_config
-}
-
-src_prepare() {
- default
- eautoreconf
- sed -e "s#usr/local/bin#usr/bin#" -i
data/etc/udev/rules.d/45-ddcutil-usb.rules || die
-}
-
-src_configure() {
- # Bug 607818.
- replace-flags -O3 -O2
-
- local myeconfargs=(
- $(use_enable drm)
- $(use_enable usb-monitor usb)
- $(use_enable X x11)
- --enable-lib
- # Please read upstream's note about the original purpose of
these flags before re-enabling them:
- # https://github.com/rockowitz/ddcutil/issues/128
- # As of 0.9.9 the following no longer compile:
- # Python3 & CFFI is already broken as of Python 3.7, with
future removal;
- # SWIG : Python3.7 breakage as well PyFileObject vs PyCodeObject
- --disable-cffi
- --disable-cython
- --disable-swig
- $(use_enable introspection)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- if use user-permissions; then
- udev_dorules data/etc/udev/rules.d/45-ddcutil-i2c.rules
- if use usb-monitor; then
- udev_dorules data/etc/udev/rules.d/45-ddcutil-usb.rules
- fi
- fi
-}
-
-pkg_postinst() {
- if use user-permissions; then
- einfo "To allow non-root users access to the /dev/i2c-*
devices, add those"
- einfo "users
[gentoo-commits] repo/gentoo:master commit in: sys-block/fio/
commit: 1b75cdfa9800fd14a18c64c1bb7770d6dfcc87f0
Author: Robin H. Johnson gentoo org>
AuthorDate: Fri Apr 15 04:56:28 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Fri Apr 15 04:57:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b75cdfa
sys-block/fio: bump
Signed-off-by: Robin H. Johnson gentoo.org>
Closes: https://bugs.gentoo.org/837236
sys-block/fio/Manifest| 1 +
sys-block/fio/fio-3.30.ebuild | 154 ++
2 files changed, 155 insertions(+)
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index 1cf9275b8809..a942bd342da5 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -1 +1,2 @@
DIST fio-3.27.tar.bz2 960330 BLAKE2B
7e7e01a5c1d6af13a6f87139e7738646cbc8f45ebc370d0c45b9efe1f93778613d374daafc6df459f988f27f2be54ff636235e1e5a92a4a6ecf9a60ed573d170
SHA512
9c5f2ab0c9ac24ab78dbc74fb6c5acd60f8189fdc618f4280992141b6c0abe1c235c373fee18ad0c803e7fb25d480f45aec56dc3be2e0d26d181b3418b179f99
+DIST fio-3.30.tar.bz2 6001772 BLAKE2B
a4941cd415e6444bb9871274580efdf82281a1e52dc3caaa235f63176e3564fb1dc08e1e4586c555f9c25975d7e6220fe53209ed7218da713b9cb9135de0fc05
SHA512
1fb2ae9c28028147edabceff734fc41bf07ce504af98afdb0951920b724b15d647f2b0852262c177279ad6b4dbbf24be458db7f939d1c80069e0f8e7bc8aa10d
diff --git a/sys-block/fio/fio-3.30.ebuild b/sys-block/fio/fio-3.30.ebuild
new file mode 100644
index ..16e488400b63
--- /dev/null
+++ b/sys-block/fio/fio-3.30.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+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 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="aio curl glusterfs gnuplot gtk io-uring nfs numa python rbd rdma static
tcmalloc test 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.
+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 )"
+RDEPEND+="
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/pandas[${PYTHON_USEDEP}]')
+ )
+ gnuplot? ( sci-visualization/gnuplot )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/fio-2.2.13-libmtd.patch
+)
+
+python_check_deps() {
+ has_version "dev-python/pandas[${PYTHON_USEDEP}]"
+}
+
+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
zlib true false) ; then:" \
+ -e '/if compile_prog "" "-laio" "libaio" *; *then/'"s::if
$(usex aio true false) ; then:" \
+ -e '/if compile_prog "" "-lcunit" "CUnit" *; *then/'"s::if
$(usex test true false) ; then:" \
+ configure || die
+}
+
+src_configure() {
+ chmod g-w "${T}"
+ # not a real configure script
+ # TODO: cuda
+ # TODO: libnbd - not packaged in Gentoo
+ # TODO: pmem - not packaged in Gentoo
+ # libnfs option does not work as expected:
[gentoo-commits] data/glep:master commit in: /
commit: 8e672d599f941ccb56afbd06f011b2142d0a01c7 Author: Robin H. Johnson gentoo org> AuthorDate: Fri Apr 15 04:27:18 2022 + Commit: Robin H. Johnson gentoo org> CommitDate: Fri Apr 15 04:27:18 2022 + URL:https://gitweb.gentoo.org/data/glep.git/commit/?id=8e672d59 glep-0057: update bibiographic data Signed-off-by: Robin H. Johnson gentoo.org> Closes: https://bugs.gentoo.org/699934 glep-0057.rst | 41 + 1 file changed, 41 insertions(+) diff --git a/glep-0057.rst b/glep-0057.rst index c4114e2..793d2d0 100644 --- a/glep-0057.rst +++ b/glep-0057.rst @@ -213,26 +213,51 @@ https://archives.gentoo.org/gentoo-dev/message/7062d6765b35406b4b8ed6b7c6e8fc28 2003-04, gentoo-security mailing list, "The state of ebuild signing in portage" - Joshua Brindle (method), the first suggestion of signed Manifests, but also an unusual key-trust model: +Message-ID unknown https://marc.info/?l=gentoo-security&m=105073449619892&w=2 2003-04, gentoo-core mailing list, "New Digests and Signing -- Attempted Explanation" +:: +Date: Wed, 2 Apr 2003 23:39:05 -0600 +From: Nick Jones +Message-ID: <20030402233905.a18...@twobit.net> 2003-06, gentoo-core mailing list, "A quick guide to GPG and key signing." - This overview was one of the first to help developers see how to use their devs, and was mainly intended for keysigning meetups. +:: +Date: Mon, 30 Jun 2003 14:32:09 +1000 (EST) +From: Troy Dack +Message-ID: <33220.203.10.231.229.1056947529.squir...@tkdack.bpa.nu> 2003-08-09, gentoo-core mailing list, "Ebuild signing" - status query, with an not very positive response, delayed by Nick Jones (carpaski) getting rooted and a safe cleanup taking a long time to affect. +:: +Date: 06 Aug 2003 15:36:34 -0500 +From: Chris PeBenito +Message-Id: <1060202193.1532.42.ca...@chris.pebenito.net> 2003-12-02, gentoo-core mailing list, "Report: rsync1.it.gentoo.org compromised" +:: +Date: Tue, 2 Dec 2003 20:25:57 +0100 +From: Andrea Barisani +Message-ID: <20031202192557.ga11...@sole.infis.univ.trieste.it> 2003-12-03, gentoo-core mailing list, "Signing of ebuilds" +:: +Date: Wed, 3 Dec 2003 11:15:09 +0100 +From: Hanno Böck +Message-Id: <20031203111509.6b2e414b.ha...@gentoo.org> 2003-12-07, gentoo-core mailing list, "gpg signing of Manifests", thread includes the first GnuPG signing prototype code, by Robin H. Johnson (robbat2). Andrew Cowie (rac) also produces a proof-of-concept around this time. +:: +Date: Sun, 7 Dec 2003 21:01:03 + +From: Douglas Russell +Message-Id: <200312072101.08245.pu...@gentoo.org> 2004-03-23, gentoo-dev mailing list, "2004.1 will not include a secure portage" - Kurt Lieber (klieber). Signing is nowhere near ready for @@ -260,6 +285,10 @@ portage signing". Thierry Carrez (koon) suggests that more go into tree-signing work. Problems at the time later in the thread show that the upstream gpg-agent is not ready, amongst other minor implementation issues. +:: +Date: Mon, 17 Jan 2005 11:04:50 +0100 +From: Thierry Carrez +Message-ID: <41eb8dc2.6050...@gentoo.org> 2005-02-20, gentoo-dev mailing list, "post-LWE 2005" - Brian Harring (ferringb). A discussion on the ongoing lack of signing, and that @@ -272,12 +301,20 @@ https://marc.info/?l=gentoo-dev&m=110893886214157&w=2 Informal statistics show that 26% of packages in the tree include a signed Manifest. Questions are raised regarding key types, and key policies. +:: +Date: Tue, 8 Mar 2005 12:21:55 +0100 +From: Torsten Veller +Message-ID: <20050308113947.ga4dd7c...@veller.net> 2005-11-16, gentoo-core mailing list, "Gentoo key signing practices and official Gentoo keyring". A discussion of key handling and other outstanding issues, also mentioning partial Manifests, as well as a comparision between the signing procedures used in Slackware, Debian and RPM-based distros. +:: +Date: Wed, 16 Nov 2005 12:29:46 -0800 +From: "Robin H. Johnson" +Message-ID: <20051116202946.ga9...@curie-int.vc.shawcable.net> 2005-11-19, gentoo-portage-dev mailing list, "Manifest signing" - Robin H. Johnson (robbat2) follows up the previous -core posting, discussion @@ -313,6 +350,10 @@ https://archives.gentoo.org/gentoo-dev/message/b25efdb57f973e1f53b38eadc55de1ee 2007-11-30, portage-dev alias, "Manifest2 and Tree-signing" - Robin H. Johnson (robbat2). First review thread for these GLEPs, many suggestions from Marius Mauch (genone). +:: +Date: Fri, 30 Nov 2007 22:13:43 -0800 +From: "Robin H. Johnson" +Message-ID: <20071201061343.gg14...@curie-int.orbis-terrarum.net> 2008-04-03, gentoo-dev mailing list, "Re: Monthly Gentoo Council Reminder for April" - Ciaran McCreesh (ciaranm). A thread in which
[gentoo-commits] proj/qa-scripts:master commit in: /
commit: 4332d6e6b5ac544c231e09a316e0ff1679d9cff5
Author: Robin H. Johnson gentoo org>
AuthorDate: Sun Apr 10 15:44:31 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sun Apr 10 15:46:17 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=4332d6e6
keyrings-recv-keys.gentoo.org.bash: cleanup gpg agent
Signed-off-by: Robin H. Johnson gentoo.org>
keyrings.inc.bash | 2 ++
1 file changed, 2 insertions(+)
diff --git a/keyrings.inc.bash b/keyrings.inc.bash
index b6ea0be..661dd36 100644
--- a/keyrings.inc.bash
+++ b/keyrings.inc.bash
@@ -79,6 +79,8 @@ push_keys() {
export GPG_TMPDIR=''
clean_tmp() {
+ # Ensure any agent is closed down
+ gpgconf --kill gpg-agent
[ -n "$GPG_TMPDIR" ] && [ -d "$GPG_TMPDIR" ] && rm -rf "$GPG_TMPDIR"
}
setup_tmp() {
[gentoo-commits] proj/qa-scripts:master commit in: /
commit: 0db8cdfb85d8449cf38e3172c235e743bbc0614a
Author: Robin H. Johnson gentoo org>
AuthorDate: Sun Apr 10 15:44:16 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sun Apr 10 15:46:17 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=0db8cdfb
keyrings-recv-keys.gentoo.org.bash: drop duplicate export_ldap_data_to_env
content
Signed-off-by: Robin H. Johnson gentoo.org>
keyrings-recv-keys.gentoo.org.bash | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/keyrings-recv-keys.gentoo.org.bash
b/keyrings-recv-keys.gentoo.org.bash
index 640063e..7cc1b62 100755
--- a/keyrings-recv-keys.gentoo.org.bash
+++ b/keyrings-recv-keys.gentoo.org.bash
@@ -7,7 +7,9 @@ DEBUG=${DEBUG:=0}
source "${BASEDIR}"/keyrings.inc.bash
set -e
-export_ldap_data_to_env
+
+# export_ldap_data_to_env
+# TODO: for unclear reason this does not populate correctly inside a function
export -a COMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}"
"${COMMIT_RULE}") )
export -a INFRA_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}"
"${INFRA_RULE}") )
export -a NONCOMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}"
"${NONCOMMIT_RULE}") )
Re: [gentoo-dev] proposal: use only one hash function in manifest files
On Wed, Apr 06, 2022 at 07:06:30PM +0200, Jason A. Donenfeld wrote: > No, you're still missing the point. > > If SHA-512 breaks, the security of the system fails, regardless of > what change we make. This is because GnuPG uses SHA-512 for its > signatures. Question directly for you Jason, because you make a professional study of this: does the type of breakage/successful attack against against SHA-512 matter? e.g. is it possible that some type of attack would only work against the Manifest entry, but NOT against the GPG signature's embedded SHA-512 (or the opposite). The best hypothetical idea I had was that there exists some large special input that lets an attacker reset the output to an arbitrary hash after their malicious payload: but it wouldn't fit in the GPG signature space. > > So I'll spell out the different possibilities: > 1) GPG uses SHA-512. Manifest uses SHA-512 and BLAKE2b. score -1 + 0 = -1 > 2) GPG uses SHA-512. Manifest uses SHA-512. score -1 + 0 = -1 > 3) GPG uses SHA-512. Manifest uses BLAKE2b. score -1 + -1 = -2 > See how from a security perspective, (2) is not worse than (1), but > (3) is worse than both (1) and (2)? Yes, (2) is not worse than (1) for the overall security perspective. That leaves the discussion does (1) have other benefits / value propositions that make it worth less than (2). (see my other thread) -- Robin Hugh Johnson Gentoo Linux: Dev, Infra Lead, Foundation Treasurer E-Mail : robb...@gentoo.org GnuPG FP : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85 GnuPG FP : 7D0B3CEB E9B85B1F 825BCECF EE05E6F6 A48F6136 signature.asc Description: PGP signature
Re: [gentoo-dev] proposal: use only one hash function in manifest files
On Wed, Apr 06, 2022 at 02:15:02AM +0200, Jason A. Donenfeld wrote: > 2) Comparability: other distros use SHA2-512, as well as various > upstreams, which means we can compare our hashes to theirs easily. Can we expand on this specific thread for a moment? I was the author of GLEP59 about changing the Manifest hashes, and I noted at the time, with references, that the effective strength of a set of hashes is only that of the strongest hash. One of my regrets from GLEP59 is that it's made it harder for use cases outside of the normal user distfile workflow. The use case that impacted me the most was being able to compare our distfiles were over time vs external sources, esp. if the file goes missing or was fetch-restricted and we can't produce a new hash of it. Maybe upstream only ever published SHA1/SHA256, and we only ever calculated SHA512/BLAKE2b on the file. Since we never had hashes from both sides at the same time, we cannot prove it was the same file. We need to be able to ship one or more hashes to users, for the specific use case of validating the distfiles they download. As a developer, I'd like to be able to track the other hashes for a file, without forcing ourselves to retain the file. This might be to compare with upstream published hashes, or to compare with other distros. In fact it would be really nice to have a semi-automated pipeline to plug in signed upstream hashes to our Manifests, and make it possibly to prove our new SHA512/BLAKE2B hash was taken over the correct input in the first place, and there wasn't any subtle supply-chain attack early in the packaging process. Where would those hashes go? They don't need to be in the Manifest, or at the very least they don't need to be distributed via rsync to users (it only costs a small amount of bytes to do so). Where else could they go? - Commit messages could work. - Git notes to a lesser degree. - alternate repos? > A reason why some people might prefer BLAKE2b over SHA2-512 is a > performance improvement. However, seeing as right now we're opening > the file, reading it, computing BLAKE2b, closing the file, opening the > file again, reading it again, computing SHA2-512, closing the file, I > don't think performance is actually something people care about. Seen > differently, removing either one of them will already give us a > performance "boost" or sorts. Or just only verifying the "strongest" hash gives you that boost. I do want to check into the code that you pointed out, because I'm really sure much older versions of Portage did the CORRECT thing of only reading the file in a single pass. -- Robin Hugh Johnson Gentoo Linux: Dev, Infra Lead, Foundation Treasurer E-Mail : robb...@gentoo.org GnuPG FP : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85 GnuPG FP : 7D0B3CEB E9B85B1F 825BCECF EE05E6F6 A48F6136 signature.asc Description: PGP signature
[gentoo-commits] repo/gentoo:master commit in: sys-block/fio/
commit: e5153513eee90c6cffb5218a0bbf9da06f1682f8
Author: Denis Pronin yandex ru>
AuthorDate: Sat Mar 19 17:17:40 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Mon Mar 28 17:46:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5153513
sys-block/fio: support python-3.10
enabled opportunity for a user to use python-3.10 for
sys-block/fio
Signed-off-by: Denis Pronin yandex.ru>
(cherry picked from commit 495b5b93572b32ebafab7fb7ef4f1fbeddc00f08)
Signed-off-by: Robin H. Johnson gentoo.org> (subject edited)
sys-block/fio/fio-3.27-r2.ebuild | 2 +-
sys-block/fio/fio-3.27-r3.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-block/fio/fio-3.27-r2.ebuild b/sys-block/fio/fio-3.27-r2.ebuild
index afa61e798464..95b48167827b 100644
--- a/sys-block/fio/fio-3.27-r2.ebuild
+++ b/sys-block/fio/fio-3.27-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
inherit python-r1 toolchain-funcs
diff --git a/sys-block/fio/fio-3.27-r3.ebuild b/sys-block/fio/fio-3.27-r3.ebuild
index ee7e62db9305..55eb95c00e10 100644
--- a/sys-block/fio/fio-3.27-r3.ebuild
+++ b/sys-block/fio/fio-3.27-r3.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
inherit python-r1 toolchain-funcs
[gentoo-commits] repo/gentoo:master commit in: app-misc/solaar/
commit: bda79c5027aaa5deb552d57a75155e633b0e3298
Author: Robin H. Johnson gentoo org>
AuthorDate: Mon Mar 21 16:53:28 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Mon Mar 21 16:59:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bda79c50
app-misc/solaar: bump
Signed-off-by: Robin H. Johnson gentoo.org>
app-misc/solaar/Manifest| 1 +
app-misc/solaar/solaar-1.1.2_rc2.ebuild | 69 +
2 files changed, 70 insertions(+)
diff --git a/app-misc/solaar/Manifest b/app-misc/solaar/Manifest
index c5d227d962a9..f26480b8aa50 100644
--- a/app-misc/solaar/Manifest
+++ b/app-misc/solaar/Manifest
@@ -1,3 +1,4 @@
DIST solaar-1.0.5.tar.gz 920452 BLAKE2B
44aa0f9abd63629a5a4e737c14e468922c4aa501341717d595f045c5f40369ade6ff296120931557f1e8f04b99aa4f690454aa8f6bceaa526f370f93b312f6d6
SHA512
28603c30f0e9f2f0fe2549722062548031c69a0d9c98f732fdd8fbb51ed1d55ef033262113b2f88044a68f8b26c8c51fb0b45d4f4689fb3619e143d159618c47
DIST solaar-1.0.7.tar.gz 1265664 BLAKE2B
6bb221d603dc74bf21ac44ca6611d817889285c8711c565b7393b875a934bf9125fc366569c1f677d657463484f2ec5fa077703f311ef2aec74e9f6813a5f1d7
SHA512
24b6b861f90d5747f150afb38b32041885b61cbf7df7794d780b311aef50d334347d5c5c722a0a7d5de3f91b96228e90e2a61dc108054452f46750a04340df83
DIST solaar-1.1.1.tar.gz 1418025 BLAKE2B
c6fd053002727a372bf9672fc22c0acc123f814003c14172f7d13e59b82ab42ecee9b71a09289b2d234874850e0921debaa069506a07d8957f52a2e9953a47f4
SHA512
c4da0c5521724c00afbc54ee9d10a4709246bb6f57635637b77e5944293b285a055b7df623e7e2a810a0764021813929e0f4fa7f21d4afc39abd516416a2bf25
+DIST solaar-1.1.2rc2.tar.gz 1462081 BLAKE2B
b5bcf37f75631d39ac726b564bfd7f329f80e9931461fceb5ce7442113df50db82679dabfd08150a87ebe9a9de68aeb38a005e450c3e025c57e5f1219312
SHA512
65320d7193124d1444ecddf5a162e925f373c7c06d0e582af29b1c9d82ea16a32a69accd53f53568b228474691eacd5c0f16bce1bccef1e9a1846151e86dc203
diff --git a/app-misc/solaar/solaar-1.1.2_rc2.ebuild
b/app-misc/solaar/solaar-1.1.2_rc2.ebuild
new file mode 100644
index ..ed9a688180e5
--- /dev/null
+++ b/app-misc/solaar/solaar-1.1.2_rc2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit linux-info udev xdg distutils-r1
+
+DESCRIPTION="Linux Device Manager for Logitech Unifying Receivers and Paired
Devices"
+HOMEPAGE="https://pwr-solaar.github.io/Solaar/";
+if [[ ${PV} =~ * ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/pwr-Solaar/Solaar";
+else
+
SRC_URI="https://github.com/pwr-Solaar/Solaar/archive/${PV/_rc/rc}.tar.gz ->
${P/_rc/rc}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~x86"
+ S="${WORKDIR}"/Solaar-${PV/_rc/rc}
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc appindicator libnotify"
+
+RDEPEND="
+ acct-group/plugdev
+ $(python_gen_cond_dep '
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/python-xlib[${PYTHON_USEDEP}]
+ >=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+
+ ')
+ x11-libs/gtk+:3[introspection]
+ appindicator? ( dev-libs/libappindicator:3[introspection] )
+ libnotify? ( x11-libs/libnotify[introspection] )"
+# libappindicator & libnotify are entirely optional and detected at runtime
+
+CONFIG_CHECK="~HID_LOGITECH_DJ ~HIDRAW"
+
+python_prepare_all() {
+ # don't autostart (bug #494608)
+ sed -i \
+ -e '/yield autostart_path/d' \
+ setup.py || die
+
+ sed -i -r \
+ -e '/yield.*udev.*rules.d/{s,/etc,/lib,g}' \
+ setup.py || die
+
+ # grant plugdev group rw access
+ sed -i 's/#MODE=/MODE=/' rules.d/42-logitech-unify-permissions.rules ||
die
+
+ distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ dodoc docs/devices.md ChangeLog.md
+ if use doc; then
+ dodoc -r docs/*
+ else
+ newdoc docs/index.md README.md
+ fi
+ udev_dorules "${S}"/rules.d/42-logitech-unify-permissions.rules
+}
[gentoo-commits] repo/gentoo:master commit in: app-misc/solaar/
commit: 3a11f3a90ba7c1a840d6967a31906f3b2219f297
Author: Robin H. Johnson gentoo org>
AuthorDate: Mon Mar 21 16:58:13 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Mon Mar 21 16:59:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a11f3a9
app-misc/solaar: stable on amd64
Signed-off-by: Robin H. Johnson gentoo.org>
app-misc/solaar/solaar-1.1.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-misc/solaar/solaar-1.1.1.ebuild
b/app-misc/solaar/solaar-1.1.1.ebuild
index ed9a688180e5..cbc2547de833 100644
--- a/app-misc/solaar/solaar-1.1.1.ebuild
+++ b/app-misc/solaar/solaar-1.1.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} =~ * ]]; then
EGIT_REPO_URI="https://github.com/pwr-Solaar/Solaar";
else
SRC_URI="https://github.com/pwr-Solaar/Solaar/archive/${PV/_rc/rc}.tar.gz ->
${P/_rc/rc}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="amd64 ~arm ~x86"
S="${WORKDIR}"/Solaar-${PV/_rc/rc}
fi
[gentoo-commits] repo/gentoo:master commit in: app-misc/solaar/
commit: 6a91b08aeb7c5a0d642e72eb512dd8086f08f049
Author: Robin H. Johnson gentoo org>
AuthorDate: Mon Mar 21 16:57:36 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Mon Mar 21 16:59:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a91b08a
app-misc/solaar: fix changelog symlink
Signed-off-by: Robin H. Johnson gentoo.org>
Closes: https://bugs.gentoo.org/830984
app-misc/solaar/solaar-1.1.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-misc/solaar/solaar-1.1.1.ebuild
b/app-misc/solaar/solaar-1.1.1.ebuild
index cad0500253bc..ed9a688180e5 100644
--- a/app-misc/solaar/solaar-1.1.1.ebuild
+++ b/app-misc/solaar/solaar-1.1.1.ebuild
@@ -59,7 +59,7 @@ python_prepare_all() {
python_install_all() {
distutils-r1_python_install_all
- dodoc docs/devices.md
+ dodoc docs/devices.md ChangeLog.md
if use doc; then
dodoc -r docs/*
else
[gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/
commit: 86964447d6b2e6798be6874ae677cebfae1ab069
Author: Robin H. Johnson gentoo org>
AuthorDate: Sun Mar 20 22:51:44 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sun Mar 20 23:08:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86964447
net-nds: avoid automagic autoca
Signed-off-by: Robin H. Johnson gentoo.org>
net-nds/openldap/openldap-2.6.1.ebuild | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/net-nds/openldap/openldap-2.6.1.ebuild
b/net-nds/openldap/openldap-2.6.1.ebuild
index 0edc6a14276a..62f91410a233 100644
--- a/net-nds/openldap/openldap-2.6.1.ebuild
+++ b/net-nds/openldap/openldap-2.6.1.ebuild
@@ -23,7 +23,7 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390
~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE_DAEMON="argon2 +cleartext crypt experimental minimal samba tcpd"
-IUSE_OVERLAY="overlays perl"
+IUSE_OVERLAY="overlays perl autoca"
IUSE_OPTIONAL="debug gnutls iodbc ipv6 odbc sasl ssl selinux static-libs
+syslog test"
IUSE_CONTRIB="kerberos kinit pbkdf2 sha2 smbkrb5passwd"
IUSE_CONTRIB="${IUSE_CONTRIB} cxx"
@@ -34,6 +34,7 @@ RESTRICT="!test? ( test )"
REQUIRED_USE="cxx? ( sasl )
pbkdf2? ( ssl )
test? ( cleartext sasl )
+ autoca? ( !gnutls )
?? ( test minimal )"
S=${WORKDIR}/${PN}-OPENLDAP_REL_ENG_${MY_PV}
@@ -416,6 +417,7 @@ multilib_src_configure() {
fi
use overlays && myconf+=( --enable-overlays=mod )
+ use autoca && myconf+=( --enable-autoca=mod ) || myconf+=(
--enable-autoca=no )
# compile-in the syncprov
myconf+=( --enable-syncprov=yes )
@@ -435,6 +437,7 @@ multilib_src_configure() {
--disable-slapd
--disable-mdb
--disable-overlays
+ --disable-autoca
--disable-syslog
--without-systemd
)
[gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/
commit: 4c4745b05a90742b564fef0714e66aec98e415f2
Author: Robin H. Johnson gentoo org>
AuthorDate: Sun Mar 20 23:07:56 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sun Mar 20 23:08:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c4745b0
net-nds/openldap: make src_test run parallel tests
Signed-off-by: Robin H. Johnson gentoo.org>
net-nds/openldap/openldap-2.6.1.ebuild | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/net-nds/openldap/openldap-2.6.1.ebuild
b/net-nds/openldap/openldap-2.6.1.ebuild
index 62f91410a233..7af43ba480d1 100644
--- a/net-nds/openldap/openldap-2.6.1.ebuild
+++ b/net-nds/openldap/openldap-2.6.1.ebuild
@@ -608,7 +608,15 @@ multilib_src_compile() {
multilib_src_test() {
if multilib_is_native_abi; then
- emake test
+ cd "tests"
+ pwd
+ # emake test => runs only lloadd & mdb, in serial; skips
ldif,sql,wt,regression
+ # emake partests => runs ALL of the tests in parallel
+ # wt/WiredTiger is not supported in Gentoo
+ TESTS=( plloadd pmdb )
+ #TESTS+=( pldif ) # not done by default, so also exclude here
+ #use odbc && TESTS+=( psql ) # not done by default, so also
exclude here
+ emake "${TESTS[@]}"
fi
}
[gentoo-commits] repo/gentoo:master commit in: profiles/
commit: 694532598329dcda97c6fd02f34f5964ce64a469 Author: Robin H. Johnson gentoo org> AuthorDate: Sat Mar 19 18:08:37 2022 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat Mar 19 18:08:37 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69453259 package.mask: unmask megarc Signed-off-by: Robin H. Johnson gentoo.org> profiles/package.mask | 6 -- 1 file changed, 6 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index fcb60b49527e..d74fe01aff32 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,12 +33,6 @@ #--- END OF EXAMPLES --- -# David Seifert (2022-03-19) -# Unmaintained, no revdeps in tree, EAPI 5, upstream tarball disappeared -# and ebuild is mirror-restricted. -# Bug #672324, #689770, #835360, removal on 2022-04-18. -sys-block/megarc - # David Seifert (2022-03-19) # Unmaintained, no revdeps in tree, not even on latest version, EAPI 5, # typical 'webapp' smell, last upstream release more than 9 years ago.
[gentoo-commits] repo/gentoo:master commit in: sys-block/megarc/
commit: 194ddc409b5b349e81d0d8f72d41f608910f57d5
Author: Robin H. Johnson gentoo org>
AuthorDate: Sat Mar 19 18:07:16 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sat Mar 19 18:07:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=194ddc40
sys-block/megarc: bump EAPI to show it works, avoid upstream URL redirect
Signed-off-by: Robin H. Johnson gentoo.org>
Closes: https://bugs.gentoo.org/689770
sys-block/megarc/{megarc-1.11-r2.ebuild => megarc-1.11-r3.ebuild} | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/sys-block/megarc/megarc-1.11-r2.ebuild
b/sys-block/megarc/megarc-1.11-r3.ebuild
similarity index 82%
rename from sys-block/megarc/megarc-1.11-r2.ebuild
rename to sys-block/megarc/megarc-1.11-r3.ebuild
index 86004d9903f9..096122d4a4f7 100644
--- a/sys-block/megarc/megarc-1.11-r2.ebuild
+++ b/sys-block/megarc/megarc-1.11-r3.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI="8"
inherit multilib
@@ -15,10 +15,11 @@ DESCRIPTION="LSI Logic MegaRAID Text User Interface
management tool"
# two or more download pages, and while one of the pages has a generic
# click-through download form, the file-specific download page only requires
# click-through on some items. See also sys-block/lsiutil, sys-block/megarc
+# 2022/03/19: robbat2 confirms the SRC_URI links work AND the files have not
changed upstream
HOMEPAGE="http://www.avagotech.com/cs/Satellite?q=megacli&pagename=AVG2%2FsearchLayout&locale=avg_en&within=megacli&Search=megarc&srch-radio=new&Submit=Search";
SRC_URI="
-
http://www.avagotech.com/docs-and-downloads/legacy-raid-controllers/legacy-raid-controllers-common-files/${MY_P}.zip
-
http://www.avagotech.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/README_FOR_${MY_P}-zip.txt";
+
https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/${MY_P}.zip
+
https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/README_FOR_${MY_P}-zip.txt";
LICENSE="LSI"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/, net-nds/openldap/files/
commit: d12a02243969b7c715e9b639345ec8aacd925a28 Author: Dennis Lamm gentoo org> AuthorDate: Sat Feb 5 23:24:54 2022 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat Mar 19 18:07:51 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d12a0224 net-nds/openldap 2.6.1 version bump Closes: https://bugs.gentoo.org/799092 Bug: https://bugs.gentoo.org/624178 Bug: https://bugs.gentoo.org/815844 Bug: https://bugs.gentoo.org/609486 Signed-off-by: Dennis Lamm gentoo.org> (cherry picked from commit c2e92fe1e144e8563f753a76d9d0cba923bb8878) Signed-off-by: Robin H. Johnson gentoo.org> net-nds/openldap/Manifest | 1 + net-nds/openldap/files/openldap-2.6.1-cloak.patch | 25 + .../files/openldap-2.6.1-fix-missing-mapping.patch | 21 + net-nds/openldap/files/openldap-2.6.1-flags.patch | 416 +++ .../openldap/files/openldap-2.6.1-system-mdb.patch | 148 net-nds/openldap/files/slapd-2.6.1.service | 12 + net-nds/openldap/files/slapd-confd-2.6.1 | 26 + net-nds/openldap/metadata.xml | 4 + net-nds/openldap/openldap-2.6.1.ebuild | 796 + 9 files changed, 1449 insertions(+) diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest index 94ca3b8be20f..c0b19b7c9812 100644 --- a/net-nds/openldap/Manifest +++ b/net-nds/openldap/Manifest @@ -2,4 +2,5 @@ DIST openldap-2.4.57.tgz 5883912 BLAKE2B 439605e1bebcf34968f0a552aaade1b72b7671a DIST openldap-2.4.58.tgz 5885225 BLAKE2B effb618dba03497796a497cd7f53ec52e389133769321dd242433bed5ec4b1f66cf7353f08a49d5f3465880f6bcfc9afc9c7d2a28e075b66f5fd926b02213541 SHA512 2fa2aa36117692eca44e9f162c8c796f78469e6c2aee91b06d46f2b755d416979c913a3d89bbf9db14cc84881ecffee69af75b48e1d16b7aa9d2e3873baa DIST openldap-2.4.59.tgz 5886272 BLAKE2B a2a8bed1d2af97fd41d651668152fd4740871bc5a8abf4b50390839228af82ac103346b3500ae0f8dd31b708acabb30435b90cd48dfafe510e648df5150d96b8 SHA512 233459ab446da6e107a7fc4ecd5668d6b08c11a11359ee76449550393e8f586a29b59d7ae09a050a1fca4fcf388ea61438ef60831b3ae802d92c048365ae3968 DIST openldap-2.5.4.tgz 6415235 BLAKE2B 16e466d01dc7642786bb88a101854513f1239f1e817fd05145e89deb54bc1b911a5dc5f42b132747f14bdd2a3355e7c398b8b14937e7093361f4a96bfb7e9197 SHA512 00b57c9179acf3b1bde738e91604f3b09b5f5309106362bb947154d131868f233713eaa75c9af9771bfad731902d67406e8fb429851bad227fc48054cace16a8 +DIST openldap-OPENLDAP_REL_ENG_2_6_1.tar.gz 6211863 BLAKE2B 81f4591db483a214351c2e02631fef2875e17e0890fc621182d2ed61d927c3c029a4f290ee6c0788952495d6f7a76ed15e62557b8d8f2e241d867e19fdf223b7 SHA512 ca61c1dccf3194d8d149ca0c45a4834d6fadf67a3676cf348f5f62ab92c94bc7501216d7da681c3a6f87f646a18d0f3d116c3d3a24d2e5cbebc6c695c986e517 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e diff --git a/net-nds/openldap/files/openldap-2.6.1-cloak.patch b/net-nds/openldap/files/openldap-2.6.1-cloak.patch new file mode 100644 index ..8fab052d4db1 --- /dev/null +++ b/net-nds/openldap/files/openldap-2.6.1-cloak.patch @@ -0,0 +1,25 @@ +diff --git a/contrib/slapd-modules/cloak/cloak.c b/contrib/slapd-modules/cloak/cloak.c +index ced7a8024..dffce3614 100644 +--- a/contrib/slapd-modules/cloak/cloak.c b/contrib/slapd-modules/cloak/cloak.c +@@ -29,6 +29,7 @@ + #include "ac/socket.h" + + #include "lutil.h" ++#include "attr.h" + #include "slap.h" + #include "slap-config.h" + +diff --git a/servers/slapd/attr.h b/servers/slapd/attr.h +index e69de29bb..73949f60c 100644 +--- a/servers/slapd/attr.h b/servers/slapd/attr.h +@@ -0,0 +1,8 @@ ++#ifndef OPENLDAP_SERVERS_SLAPD_ATTR_H_ ++#define OPENLDAP_SERVERS_SLAPD_ATTR_H_ ++ ++#endif //OPENLDAP_SERVERS_SLAPD_ATTR_H_ ++ ++#include "slap.h" ++ ++void attr_clean( Attribute *a ); diff --git a/net-nds/openldap/files/openldap-2.6.1-fix-missing-mapping.patch b/net-nds/openldap/files/openldap-2.6.1-fix-missing-mapping.patch new file mode 100644 index ..be7fbf3e528d --- /dev/null +++ b/net-nds/openldap/files/openldap-2.6.1-fix-missing-mapping.patch @@ -0,0 +1,21 @@ +From 59e013602d7b1aa0d7da79d65367c9ec391b96f8 Mon Sep 17 00:00:00 2001 +From: Simon Pichugin +Date: Wed, 3 Nov 2021 19:03:40 -0700 +Subject: [PATCH] Fix missing mapping + +--- + libraries/liblber/lber.map | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libraries/liblber/lber.map b/libraries/liblber/lber.map +index 9a4094b0f..083cd1f32 100644 +--- a/libraries/liblber/lber.map b/libraries/liblber/lber.map +@@ -121,6 +121,7 @@ OPENLDAP_2.200 + ber_sockbuf_io_fd; + ber_sockbuf_io_readahead; + ber_sockbuf_io_tcp; ++ber_sockbuf_io_udp; + ber_s
[ceph-users] Re: Local NTP servers on monitor node's.
On Wed, Mar 16, 2022 at 10:49:15AM +, Frank Schilder wrote: > Returning to this thread, I finally managed to capture the problem I'm > facing in a log. The time service to the outside world is blocked by > our organisation's firewall and I'm restricted to use internal time > servers. Unfortunately, these seem to be periodically unstable. I > caught a time-excursion in the log extracts shown below. My problem > now is that such a transient causes time-havoc on the cluster, because > the servers start to adjust in all directions. ... > Is there a config to tell the head node to take it easy with jumps in > the external clock source? This is the "step" config knobs. > Here the observation. It is annotated and filtered to contain only > lines where the offset changes and I reduced it to show the incident > with few lines, all as seen from the head node: ... > I know that the providers of the time service should get their act > together, but I doubt that will happen and I would like to harden my > time sync config to survive such events without chaos. If anyone can > point me to a suitable config, please do. I need a way to smoothen out > steep upstream oscillations, like a low-pass filter would do. If you did filter out the sudden jumps, you'd end up with your mons all (rightly) distrusting the bad time service, and then they could drift on their own. There are better timenuts than I on the list, but I think the following MIGHT be a reasonable course of action. 1. Disable time stepping: "tinker stepfwd 0 stepback 0" (the exact syntax might vary depending on NTP version) 2. Set up your mons all be NTP servers (possibly in addition to the existing head node). They should peer with each other explicitly. 3. Set up the rest of your cluster to consume from the mons ONLY. 4. Optional: if your time service providers are unreliable, investigate build/buying your own, and use it to feed time to the mons. If all the mons end up distrusting the time-service you have, they *should* retain consistent time between themselves, and thus the clients should also keep consistent time. -- Robin Hugh Johnson Gentoo Linux: Dev, Infra Lead, Foundation Treasurer E-Mail : robb...@gentoo.org GnuPG FP : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85 GnuPG FP : 7D0B3CEB E9B85B1F 825BCECF EE05E6F6 A48F6136 ___ ceph-users mailing list -- ceph-users@ceph.io To unsubscribe send an email to ceph-users-le...@ceph.io
[gentoo-commits] repo/gentoo:master commit in: dev-perl/Test-Mock-LWP/
commit: abaab5861bc9e2abef7c393192c64ed78a43c35e
Author: Robin H. Johnson gentoo org>
AuthorDate: Mon Mar 14 05:03:07 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Mon Mar 14 05:03:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abaab586
dev-perl/Test-Mock-LWP: fix version
Signed-off-by: Robin H. Johnson gentoo.org>
.../{Test-Mock-LWP-0.8.0.ebuild => Test-Mock-LWP-0.80.0.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/dev-perl/Test-Mock-LWP/Test-Mock-LWP-0.8.0.ebuild
b/dev-perl/Test-Mock-LWP/Test-Mock-LWP-0.80.0.ebuild
similarity index 100%
rename from dev-perl/Test-Mock-LWP/Test-Mock-LWP-0.8.0.ebuild
rename to dev-perl/Test-Mock-LWP/Test-Mock-LWP-0.80.0.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-perl/Search-Sitemap/
commit: bd5d18f5e1c42d279ed29fc1e56612c6d4e27f4d
Author: Robin H. Johnson gentoo org>
AuthorDate: Sun Mar 13 20:38:14 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sun Mar 13 20:38:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd5d18f5
dev-perl/Search-Sitemap: new package, for use with Bugzilla
Signed-off-by: Robin H. Johnson gentoo.org>
dev-perl/Search-Sitemap/Manifest | 1 +
.../Search-Sitemap/Search-Sitemap-2.130.0.ebuild | 32 ++
dev-perl/Search-Sitemap/metadata.xml | 15 ++
3 files changed, 48 insertions(+)
diff --git a/dev-perl/Search-Sitemap/Manifest b/dev-perl/Search-Sitemap/Manifest
new file mode 100644
index ..a3844b4b7add
--- /dev/null
+++ b/dev-perl/Search-Sitemap/Manifest
@@ -0,0 +1 @@
+DIST Search-Sitemap-2.13.tar.gz 34527 BLAKE2B
db04cce9fcaf39c75cb381b909e9767f52dbc33678ce9c3d4be6bc0ae9f0c06d75238b83bf8fe4eefec37d2b66a99674523a6eed4d5e8328902f1b38bafca5ac
SHA512
1698e2114abddba04c1c11e25f9fadaca835d35b09e1521f919a9cb7daa0478f4cac910f7becbb4bf9b0f80bf8dd666c909020fc9eb7ce20194e1eccf602
diff --git a/dev-perl/Search-Sitemap/Search-Sitemap-2.130.0.ebuild
b/dev-perl/Search-Sitemap/Search-Sitemap-2.130.0.ebuild
new file mode 100644
index ..104051cd7084
--- /dev/null
+++ b/dev-perl/Search-Sitemap/Search-Sitemap-2.130.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=JASONK
+DIST_VERSION=2.13
+inherit perl-module
+
+DESCRIPTION="Perl extension for managing Search Engine Sitemaps"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ virtual/perl-Carp
+ virtual/perl-IO-Zlib
+ dev-perl/Module-Find
+ dev-perl/Class-Trigger
+ dev-perl/MooseX-ClassAttribute
+ dev-perl/MooseX-Types
+ dev-perl/MooseX-Types-URI
+ dev-perl/Moose
+"
+BDEPEND="${RDEPEND}
+ dev-perl/Module-Install
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ dev-perl/Test-Most
+ dev-perl/Test-Mock-LWP
+ dev-perl/Test-Mock-LWP-Dispatch
+ )
+"
diff --git a/dev-perl/Search-Sitemap/metadata.xml
b/dev-perl/Search-Sitemap/metadata.xml
new file mode 100644
index ..96ba55d634fa
--- /dev/null
+++ b/dev-perl/Search-Sitemap/metadata.xml
@@ -0,0 +1,15 @@
+
+https://www.gentoo.org/dtd/metadata.dtd";>
+
+
+robb...@gentoo.org
+
+
+p...@gentoo.org
+Gentoo Perl Project
+
+
+Search-Sitemap
+Search::Sitemap
+
+
[gentoo-commits] repo/gentoo:master commit in: dev-perl/Test-Mock-LWP/
commit: e18f6ccdfc383a6e941c8969dc96a99dfc2595ee
Author: Robin H. Johnson gentoo org>
AuthorDate: Sun Mar 13 20:37:47 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sun Mar 13 20:38:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e18f6ccd
dev-perl/Test-Mock-LWP: new package, for testing Search-Sitemap
Signed-off-by: Robin H. Johnson gentoo.org>
dev-perl/Test-Mock-LWP/Manifest | 1 +
dev-perl/Test-Mock-LWP/Test-Mock-LWP-0.8.0.ebuild | 24 +++
dev-perl/Test-Mock-LWP/metadata.xml | 15 ++
3 files changed, 40 insertions(+)
diff --git a/dev-perl/Test-Mock-LWP/Manifest b/dev-perl/Test-Mock-LWP/Manifest
new file mode 100644
index ..07444d98339f
--- /dev/null
+++ b/dev-perl/Test-Mock-LWP/Manifest
@@ -0,0 +1 @@
+DIST Test-Mock-LWP-0.08.tar.gz 20176 BLAKE2B
c3c566a5f4c6c86afd53311994dde7603a78e7aea141c42a523d96b1d30eeeb3967bd6c2241c6ddcbadeb0c412a6465b473050b66c807660ee8182fe2427057e
SHA512
25849615a2c9890eb2c504abe9b63fd7c249f4a54ca0fdde62b99e28fd537e63f6331d9ef3871ebc20dbcbbebb7f3d210ff4053e49ebe32e349c5d561bd32772
diff --git a/dev-perl/Test-Mock-LWP/Test-Mock-LWP-0.8.0.ebuild
b/dev-perl/Test-Mock-LWP/Test-Mock-LWP-0.8.0.ebuild
new file mode 100644
index ..2f3608b34fc6
--- /dev/null
+++ b/dev-perl/Test-Mock-LWP/Test-Mock-LWP-0.8.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=LUKEC
+DIST_VERSION=0.08
+inherit perl-module
+
+DESCRIPTION="Mocks LWP::UserAgent"
+
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ virtual/perl-Carp
+ dev-perl/Test-MockObject
+ virtual/perl-Test
+"
+BDEPEND="${RDEPEND}
+ >=virtual/perl-CPAN-Meta-Requirements-2.120.620
+ virtual/perl-ExtUtils-MakeMaker
+ virtual/perl-Module-Metadata
+"
diff --git a/dev-perl/Test-Mock-LWP/metadata.xml
b/dev-perl/Test-Mock-LWP/metadata.xml
new file mode 100644
index ..21a18f4398d0
--- /dev/null
+++ b/dev-perl/Test-Mock-LWP/metadata.xml
@@ -0,0 +1,15 @@
+
+https://www.gentoo.org/dtd/metadata.dtd";>
+
+
+robb...@gentoo.org
+
+
+p...@gentoo.org
+Gentoo Perl Project
+
+
+Test-Mock-LWP
+Test::Mock::LWP
+
+
[gentoo-commits] proj/qa-scripts:master commit in: /
commit: 105bf2773bf6c22ab6867a9069dbfa5196d8bbe6
Author: Robin H. Johnson gentoo org>
AuthorDate: Sun Mar 6 17:30:29 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sun Mar 6 17:30:29 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=105bf277
keyrings-recv-keys.gentoo.org.bash: remove obsolete comment
Signed-off-by: Robin H. Johnson gentoo.org>
keyrings-recv-keys.gentoo.org.bash | 3 ---
1 file changed, 3 deletions(-)
diff --git a/keyrings-recv-keys.gentoo.org.bash
b/keyrings-recv-keys.gentoo.org.bash
index 5f35fcf..640063e 100755
--- a/keyrings-recv-keys.gentoo.org.bash
+++ b/keyrings-recv-keys.gentoo.org.bash
@@ -1,8 +1,5 @@
#!/bin/bash
# Import key updates from Keyservers: keys.gentoo.org
-#
-# TODO:
-# - Turn off export in this script
BASEDIR="$(dirname "$0")"
DEBUG=${DEBUG:=0}
[gentoo-commits] proj/qa-scripts:master commit in: /
commit: db9e494bc501a30e46cfeebe5e64f8f66372d620
Author: Robin H. Johnson gentoo org>
AuthorDate: Sun Mar 6 17:27:28 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sun Mar 6 17:27:28 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=db9e494b
keyrings: increase grab timeout
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 7989d79..b6ea0be 100644
--- a/keyrings.inc.bash
+++ b/keyrings.inc.bash
@@ -35,7 +35,7 @@ grab_keys() {
local missing=()
local remaining=( "${@}" )
- KEYSERVER_TIMEOUT=${KEYSERVER_TIMEOUT:=1m}
+ KEYSERVER_TIMEOUT=${KEYSERVER_TIMEOUT:=2m}
# quickly handle empty keyservers set
[ "${#KEYSERVERS[@]}" -eq 0 ] && return
while :; do
[gentoo-commits] proj/qa-scripts:master commit in: /
commit: d915befcd50907cad1f494e89674346f0f0319c8
Author: Robin H. Johnson gentoo org>
AuthorDate: Sun Mar 6 17:30:16 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sun Mar 6 17:30:16 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=d915befc
keyrings-recv-keys.gentoo.org.bash: add optional debug
Signed-off-by: Robin H. Johnson gentoo.org>
keyrings-recv-keys.gentoo.org.bash | 5 +
1 file changed, 5 insertions(+)
diff --git a/keyrings-recv-keys.gentoo.org.bash
b/keyrings-recv-keys.gentoo.org.bash
index a0ec2f9..5f35fcf 100755
--- a/keyrings-recv-keys.gentoo.org.bash
+++ b/keyrings-recv-keys.gentoo.org.bash
@@ -5,6 +5,7 @@
# - Turn off export in this script
BASEDIR="$(dirname "$0")"
+DEBUG=${DEBUG:=0}
# shellcheck source=./keyrings.inc.bash
source "${BASEDIR}"/keyrings.inc.bash
@@ -19,9 +20,13 @@ export -a SYSTEM_KEYS=( $(grab_ldap_fingerprints -b
"${SYSTEM_BASE}" "${NONCOMMI
export KEYSERVERS=( "${KS_GENTOO}" )
export KEYSERVER_TIMEOUT=5m
+[[ $DEBUG -ne 0 ]] && echo SYSTEM_KEYS
grab_keys "${SYSTEM_KEYS[@]}"
+[[ $DEBUG -ne 0 ]] && echo COMITTING_DEVS
grab_keys "${COMMITTING_DEVS[@]}"
+[[ $DEBUG -ne 0 ]] && echo NONCOMITTING_DEVS
grab_keys "${NONCOMMITTING_DEVS[@]}"
+[[ $DEBUG -ne 0 ]] && echo INFRA_DEVS
grab_keys "${INFRA_DEVS[@]}"
# -- not all are on keyservers
# -- and are unlikely to turn up now
[gentoo-commits] proj/qa-scripts:master commit in: /
commit: f6d85383d48fd3eb9211dfcc1cacde54206fcac9
Author: Robin H. Johnson gentoo org>
AuthorDate: Thu Mar 3 05:58:00 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Thu Mar 3 05:58:00 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=f6d85383
keyrings: more infra devs setup
Signed-off-by: Robin H. Johnson gentoo.org>
keyrings-recv-keys.gentoo.org.bash | 2 ++
keyrings-recv-sks.bash | 1 +
2 files changed, 3 insertions(+)
diff --git a/keyrings-recv-keys.gentoo.org.bash
b/keyrings-recv-keys.gentoo.org.bash
index 6f3ac0e..a0ec2f9 100755
--- a/keyrings-recv-keys.gentoo.org.bash
+++ b/keyrings-recv-keys.gentoo.org.bash
@@ -11,6 +11,7 @@ source "${BASEDIR}"/keyrings.inc.bash
set -e
export_ldap_data_to_env
export -a COMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}"
"${COMMIT_RULE}") )
+export -a INFRA_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}"
"${INFRA_RULE}") )
export -a NONCOMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}"
"${NONCOMMIT_RULE}") )
export -a RETIRED_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}"
"${RETIRED_RULE}") )
export -a SYSTEM_KEYS=( $(grab_ldap_fingerprints -b "${SYSTEM_BASE}"
"${NONCOMMIT_RULE}") )
@@ -21,6 +22,7 @@ export KEYSERVER_TIMEOUT=5m
grab_keys "${SYSTEM_KEYS[@]}"
grab_keys "${COMMITTING_DEVS[@]}"
grab_keys "${NONCOMMITTING_DEVS[@]}"
+grab_keys "${INFRA_DEVS[@]}"
# -- not all are on keyservers
# -- and are unlikely to turn up now
# -- this needs to fetch from some archive instead
diff --git a/keyrings-recv-sks.bash b/keyrings-recv-sks.bash
index 5ab91c3..81ba0a2 100755
--- a/keyrings-recv-sks.bash
+++ b/keyrings-recv-sks.bash
@@ -21,6 +21,7 @@ export KEYSERVER_TIMEOUT=20m
grab_keys "${SYSTEM_KEYS[@]}"
grab_keys "${COMMITTING_DEVS[@]}"
grab_keys "${NONCOMMITTING_DEVS[@]}"
+grab_keys "${INFRA_DEVS[@]}"
# -- not all are on keyservers
# -- and are unlikely to turn up now
# -- this needs to fetch from some archive instead
[gentoo-commits] proj/qa-scripts:master commit in: htdocs/
commit: 0fc0320d35bfef018cfb35762834e05c1368ac19 Author: Robin H. Johnson gentoo org> AuthorDate: Sun Feb 27 19:27:30 2022 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun Feb 27 19:27:30 2022 + URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=0fc0320d htdocs/index: add keyring artifact links Signed-off-by: Robin H. Johnson gentoo.org> htdocs/index.html | 9 + 1 file changed, 9 insertions(+) diff --git a/htdocs/index.html b/htdocs/index.html index ea4a50c..3652d33 100644 --- a/htdocs/index.html +++ b/htdocs/index.html @@ -130,6 +130,15 @@ + Generated artifacts + +GPG keyring: service keys +GPG keyring: all active devs +GPG keyring: active gentoo.git devs +GPG keyring: retired devs +GPG keyring: infra devs +GPG keyring: all devs + Tree-wide Scanning
[gentoo-commits] proj/qa-scripts:master commit in: /
commit: 74e7faa94ef8c3d1ca88902ae504efeb6997cff7
Author: Robin H. Johnson gentoo org>
AuthorDate: Sun Feb 27 19:21:45 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sun Feb 27 19:21:45 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=74e7faa9
keyrings-export: another spot for infra-devs
Signed-off-by: Robin H. Johnson gentoo.org>
keyrings-export.bash | 4
1 file changed, 4 insertions(+)
diff --git a/keyrings-export.bash b/keyrings-export.bash
index 5b6dc17..f07df83 100755
--- a/keyrings-export.bash
+++ b/keyrings-export.bash
@@ -27,6 +27,9 @@ export_keys "${OUTPUT_DIR}"/active-devs.gpg \
"${COMMITTING_DEVS[@]}" \
"${NONCOMMITTING_DEVS[@]}"
+export_keys "${OUTPUT_DIR}"/infra-devs.gpg \
+ "${INFRA_DEVS[@]}"
+
export_keys "${OUTPUT_DIR}"/retired-devs.gpg \
"${RETIRED_DEVS[@]}"
@@ -35,6 +38,7 @@ export_keys "${OUTPUT_DIR}"/all-devs.gpg \
"${SYSTEM_KEYS[@]}" \
"${COMMITTING_DEVS[@]}" \
"${NONCOMMITTING_DEVS[@]}" \
+ "${INFRA_DEVS[@]}" \
"${RETIRED_DEVS[@]}"
clean_tmp
[gentoo-commits] proj/qa-scripts:master commit in: /
commit: fbb6e9911b2cc8582f870acb23c2dacac8e2c077
Author: Robin H. Johnson gentoo org>
AuthorDate: Sun Feb 27 17:57:48 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sun Feb 27 17:57:48 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=fbb6e991
keyrings: add infra keyring
Signed-off-by: Robin H. Johnson gentoo.org>
create-dev-keyrings.bash | 6 ++
keyrings.inc.bash| 3 +++
2 files changed, 9 insertions(+)
diff --git a/create-dev-keyrings.bash b/create-dev-keyrings.bash
index 65b2b14..d0ea12a 100755
--- a/create-dev-keyrings.bash
+++ b/create-dev-keyrings.bash
@@ -27,6 +27,10 @@ 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
@@ -39,6 +43,7 @@ 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
@@ -47,4 +52,5 @@ export KEYSERVER_TIMEOUT=20m
push_keys "${SYSTEM_KEYS[@]}"
push_keys "${COMMITTING_DEVS[@]}"
push_keys "${NONCOMMITTING_DEVS[@]}"
+push_keys "${INFRA_DEVS[@]}"
push_keys "${RETIRED_DEVS[@]}"
diff --git a/keyrings.inc.bash b/keyrings.inc.bash
index bf45a86..7989d79 100644
--- a/keyrings.inc.bash
+++ b/keyrings.inc.bash
@@ -6,6 +6,7 @@ SYSTEM_BASE='ou=system,dc=gentoo,dc=org'
COMMIT_RULE='(&(gentooAccess=git.gentoo.org/repo/gentoo.git)(gentooStatus=active))'
NONCOMMIT_RULE='(&(!(gentooAccess=git.gentoo.org/repo/gentoo.git))(gentooStatus=active))'
RETIRED_RULE='(!(gentooStatus=active))'
+INFRA_RULE='(&(gentooAccess=infra.group)(gentooStatus=active))'
export KS_GENTOO=hkps://keys.gentoo.org/
# Use local keyserver for speedup
@@ -18,6 +19,7 @@ export KEYSERVERS=( ) # empty by default
export COMMITTING_DEVS=( )
export NONCOMMITTING_DEVS=( )
export RETIRED_DEVS=( )
+export INFRA_DEVS=( )
export SYSTEM_KEYS=( )
# grab_ldap_fingerprints
@@ -128,5 +130,6 @@ export_ldap_data_to_env() {
export -a COMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}"
"${COMMIT_RULE}") )
export -a NONCOMMITTING_DEVS=( $(grab_ldap_fingerprints -b
"${DEV_BASE}" "${NONCOMMIT_RULE}") )
export -a RETIRED_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}"
"${RETIRED_RULE}") )
+ export -a INFRA_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}"
"${INFRA_RULE}") )
export -a SYSTEM_KEYS=( $(grab_ldap_fingerprints -b "${SYSTEM_BASE}"
"${NONCOMMIT_RULE}") )
}
Re: [gentoo-dev] Gentoo LLVM project needs help!
On Fri, Feb 11, 2022 at 09:11:51PM +0100, Michał Górny wrote: > > GSOC-worthy project? > Not sure. To rephrase what was once said to me, this is summer of > *code*, not infra work. Are there similar programs where the infra work might fit? Outreachy? paid interns? -- Robin Hugh Johnson Gentoo Linux: Dev, Infra Lead, Foundation Treasurer E-Mail : robb...@gentoo.org GnuPG FP : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85 GnuPG FP : 7D0B3CEB E9B85B1F 825BCECF EE05E6F6 A48F6136 signature.asc Description: PGP signature
[gentoo-commits] proj/qa-scripts:master commit in: /
commit: 2b318470ffde8ffde7b105e1fce28c6ab3653715
Author: Robin H. Johnson gentoo org>
AuthorDate: Tue Feb 8 06:25:38 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Tue Feb 8 06:25:46 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=2b318470
keyrings.inc.bash: try to prefer local keyserver for speed
Signed-off-by: Robin H. Johnson gentoo.org>
keyrings.inc.bash | 4
1 file changed, 4 insertions(+)
diff --git a/keyrings.inc.bash b/keyrings.inc.bash
index d19f0ad..bf45a86 100644
--- a/keyrings.inc.bash
+++ b/keyrings.inc.bash
@@ -8,6 +8,10 @@
NONCOMMIT_RULE='(&(!(gentooAccess=git.gentoo.org/repo/gentoo.git))(gentooStatus=
RETIRED_RULE='(!(gentooStatus=active))'
export KS_GENTOO=hkps://keys.gentoo.org/
+# Use local keyserver for speedup
+KS_GENTOO_LOCAL=${HOSTNAME%.gentoo.org}.keys.gentoo.org
+dig $KS_GENTOO_LOCAL +short |grep -sq . && export
KS_GENTOO=hkps://${KS_GENTOO_LOCAL}
+
#export KS_SKS=hkps://hkps.pool.sks-keyservers.net/ # Disabled pending
security announcement
export KS_OPENPGP=hkps://keys.openpgp.org/ # runs Hagrid
export KEYSERVERS=( ) # empty by default
Re: [gentoo-dev] [PATCH 01/12] toolchain.eclass: remove EAPI 5 and 6
At a technical level, it looks fine. But I want to clarify interaction for old systems. Dilfridge had a proposal to ensure 3/6/12 month old systems could still upgrade, and I'm wondering if this could break those systems. There are 3 commits in the last year that finally removed the EAPI 5/6 toolchain consumers: 486b77ab8d28c5bfd5a4bdfc5f9a5f432ffde563 b0a39e54065f7eda2dfc719ec05e270fa7e23e38 26f684adecb5b9135f9eba9f1b63c83e3d5e5722 The latest of those was in September 2021. Do we need to wait X months after those removals, to be able to commit this change? -- Robin Hugh Johnson Gentoo Linux: Dev, Infra Lead, Foundation Treasurer E-Mail : robb...@gentoo.org GnuPG FP : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85 GnuPG FP : 7D0B3CEB E9B85B1F 825BCECF EE05E6F6 A48F6136 signature.asc Description: PGP signature
[gentoo-commits] repo/gentoo:master commit in: sys-apps/haveged/files/
commit: a60a60ee51bfe612f8bb18497cc84bbf01becaba Author: Michael Mair-Keimberger levelnine at> AuthorDate: Fri Jan 14 18:06:41 2022 + Commit: Robin H. Johnson gentoo org> CommitDate: Thu Jan 20 05:47:52 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a60a60ee sys-apps/haveged: remove unused patch Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> (cherry picked from commit cd5d796e8e30dffde7fb059e6cc5867a4139ef37) Signed-off-by: Robin H. Johnson gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/23797 .../files/haveged-1.9.8c-threads_build_fix.patch | 36 -- 1 file changed, 36 deletions(-) diff --git a/sys-apps/haveged/files/haveged-1.9.8c-threads_build_fix.patch b/sys-apps/haveged/files/haveged-1.9.8c-threads_build_fix.patch deleted file mode 100644 index fb88a8b51212.. --- a/sys-apps/haveged/files/haveged-1.9.8c-threads_build_fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -From cb1f0653c45d9c4a9a855119c85a1d4bfcc9b3b2 Mon Sep 17 00:00:00 2001 -From: Lars Wendler -Date: Thu, 14 Nov 2019 16:15:00 +0100 -Subject: [PATCH] build: Fix compilation with --enable-threads -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Previously failed with: - -havegetune.c:190:12: error: ‘BUILD_THREAD’ undeclared (first use in this function); did you mean ‘BUILD_THREADS’? - 190 |*bp++ = BUILD_THREAD; - |^~~~ - |BUILD_THREADS - -Signed-off-by: Lars Wendler - src/havegetune.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/havegetune.c b/src/havegetune.c -index de39c53..6f14476 100644 a/src/havegetune.c -+++ b/src/havegetune.c -@@ -187,7 +187,7 @@ void havege_tune( /* RETURN: none */ -*bp++ = BUILD_CPUID; - #endif - #if NUMBER_CORES>1 -- *bp++ = BUILD_THREAD; -+ *bp++ = BUILD_THREADS; - #endif - #ifdef ONLINE_TESTS_ENABLE -*bp++ = BUILD_OLT; --- -2.24.0 -
