Re: [gentoo-dev] Last rites: media-gfx/frogr
On 25.2.2023 8.05, Michał Górny wrote: > # Michał Górny (2023-02-25) > # Unmaintained. The Gentoo version is from 2018 and needs bumping. > # It has a build failure reported. > # Removal on 2023-03-27. Bug #649234. > media-gfx/frogr > This got saved. -- juippis OpenPGP_signature Description: OpenPGP digital signature
Re: [gentoo-dev] [PATCH v2] verify-sig.eclass: Use gemato openpgp-verify-detached w/ 20.0+
On Wed, 2023-03-08 at 22:54 +, Sam James wrote:
> On Wed, 8 Mar 2023 17:33:24 +0100
> Michał Górny wrote:
>
> > Use openpgp-verify-detached when app-portage/gemato-20.0 is installed.
> > This lets us test the new code paths on ~arch with minimal risk
> > of breakage on stable.
> >
> > Signed-off-by: Michał Górny
> > ---
> > eclass/verify-sig.eclass | 13 ++---
> > 1 file changed, 10 insertions(+), 3 deletions(-)
> >
> > This is roughly the same patch that I've sent before, except that now
> > it features a has_version condition to restrict the changes to ~arch
> > gemato version.
> >
> > diff --git a/eclass/verify-sig.eclass b/eclass/verify-sig.eclass
> > index 91433bf53453..f67a3b10a0bf 100644
> > --- a/eclass/verify-sig.eclass
> > +++ b/eclass/verify-sig.eclass
> > @@ -144,9 +144,16 @@ verify-sig_verify_detached() {
> > # gpg can't handle very long TMPDIR
> > # https://bugs.gentoo.org/854492
> > local -x TMPDIR=/tmp
> > - gemato gpg-wrap -K "${key}"
> > "${extra_args[@]}" -- \
> > - gpg --verify "${sig}" "${file}" ||
> > - die "PGP signature verification
> > failed"
> > + if has_version -b ">=app-portage/gemato-20";
>
> Do we want to log when taking this path temporarily?
>
I don't think it's necessary, the output is clearly distinguishable.
--
Best regards,
Michał Górny
Re: [gentoo-dev] [PATCH v2] verify-sig.eclass: Use gemato openpgp-verify-detached w/ 20.0+
On Wed, 8 Mar 2023 17:33:24 +0100
Michał Górny wrote:
> Use openpgp-verify-detached when app-portage/gemato-20.0 is installed.
> This lets us test the new code paths on ~arch with minimal risk
> of breakage on stable.
>
> Signed-off-by: Michał Górny
> ---
> eclass/verify-sig.eclass | 13 ++---
> 1 file changed, 10 insertions(+), 3 deletions(-)
>
> This is roughly the same patch that I've sent before, except that now
> it features a has_version condition to restrict the changes to ~arch
> gemato version.
>
> diff --git a/eclass/verify-sig.eclass b/eclass/verify-sig.eclass
> index 91433bf53453..f67a3b10a0bf 100644
> --- a/eclass/verify-sig.eclass
> +++ b/eclass/verify-sig.eclass
> @@ -144,9 +144,16 @@ verify-sig_verify_detached() {
> # gpg can't handle very long TMPDIR
> # https://bugs.gentoo.org/854492
> local -x TMPDIR=/tmp
> - gemato gpg-wrap -K "${key}"
> "${extra_args[@]}" -- \
> - gpg --verify "${sig}" "${file}" ||
> - die "PGP signature verification
> failed"
> + if has_version -b ">=app-portage/gemato-20";
Do we want to log when taking this path temporarily?
pgp7RnQUzgfPj.pgp
Description: OpenPGP digital signature
[gentoo-dev] [PATCH] flag-o-matic.eclass: rename _test-compile-PROG, expose externally
From: Matoro Mahri
Rename _test-compile-PROG to test-compile and expose externally for
ebuilds to consume if desired.
Bug: https://bugs.gentoo.org/897976
Signed-off-by: Matoro Mahri
---
eclass/flag-o-matic.eclass | 15 +++
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index a4e8f19e0071..6bec3df30881 100644
--- a/eclass/flag-o-matic.eclass
+++ b/eclass/flag-o-matic.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: flag-o-matic.eclass
@@ -888,15 +888,14 @@ no-as-needed() {
esac
}
-# @FUNCTION: _test-compile-PROG
+# @FUNCTION: test-compile
# @USAGE:
-# @INTERNAL
# @DESCRIPTION:
# Attempts to compile (and possibly link) the given program. The first
# parameter corresponds to the standard -x compiler argument.
# If the program should additionally be attempted to be linked, the string
# "+ld" should be added to the parameter.
-_test-compile-PROG() {
+test-compile() {
local lang=$1
local code=$2
shift 2
@@ -982,7 +981,7 @@ append-atomic-flags() {
local code
# first, ensure we can compile a trivial program
- # this is because we can't distinguish if _test-compile-PROG
+ # this is because we can't distinguish if test-compile
# fails because -latomic is actually needed or if we have a
# broken toolchain (like due to bad FLAGS)
read -r -d '' code <<- EOF
@@ -996,7 +995,7 @@ append-atomic-flags() {
# let other pieces of the build fail later down the line than to
# make people think that something to do with atomic support is the
# cause of their problems.
- _test-compile-PROG "c+ld" "${code}" || return
+ test-compile "c+ld" "${code}" || return
local bytesizes
[[ "${#}" == "0" ]] && bytesizes=( "1" "2" "4" "8" ) || bytesizes="${@}"
@@ -1017,7 +1016,7 @@ append-atomic-flags() {
EOF
# do nothing if test program links fine
- _test-compile-PROG "c+ld" "${code}" && continue
+ test-compile "c+ld" "${code}" && continue
# ensure that the toolchain supports -latomic
test-flags-CCLD "-latomic" &>/dev/null || die "-latomic is
required but not supported by $(tc-getCC)"
@@ -1025,7 +1024,7 @@ append-atomic-flags() {
append-libs "-latomic"
# verify that this did indeed fix the problem
- _test-compile-PROG "c+ld" "${code}" || \
+ test-compile "c+ld" "${code}" || \
die "libatomic does not include an implementation of
${bytesize}-byte atomics for this toolchain"
# if any of the required bytesizes require -latomic, no need to
continue
--
2.39.2
[gentoo-dev] [PATCH v2] verify-sig.eclass: Use gemato openpgp-verify-detached w/ 20.0+
Use openpgp-verify-detached when app-portage/gemato-20.0 is installed.
This lets us test the new code paths on ~arch with minimal risk
of breakage on stable.
Signed-off-by: Michał Górny
---
eclass/verify-sig.eclass | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
This is roughly the same patch that I've sent before, except that now
it features a has_version condition to restrict the changes to ~arch
gemato version.
diff --git a/eclass/verify-sig.eclass b/eclass/verify-sig.eclass
index 91433bf53453..f67a3b10a0bf 100644
--- a/eclass/verify-sig.eclass
+++ b/eclass/verify-sig.eclass
@@ -144,9 +144,16 @@ verify-sig_verify_detached() {
# gpg can't handle very long TMPDIR
# https://bugs.gentoo.org/854492
local -x TMPDIR=/tmp
- gemato gpg-wrap -K "${key}" "${extra_args[@]}" -- \
- gpg --verify "${sig}" "${file}" ||
- die "PGP signature verification failed"
+ if has_version -b ">=app-portage/gemato-20"; then
+ gemato openpgp-verify-detached -K "${key}" \
+ "${extra_args[@]}" \
+ "${sig}" "${file}" ||
+ die "PGP signature verification failed"
+ else
+ gemato gpg-wrap -K "${key}" "${extra_args[@]}"
-- \
+ gpg --verify "${sig}" "${file}" ||
+ die "PGP signature verification failed"
+ fi
;;
signify)
signify -V -p "${key}" -m "${file}" -x "${sig}" ||
--
2.39.2
[gentoo-dev] Last rites: x11-plugins/purple-hangouts
# Matthew Smith (2023-03-08) # No longer works after Google shut down the Hangouts API. # Bug #900412, removal on 2023-04-08. x11-plugins/purple-hangouts
