public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: nmontero <nmontero@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/epiphany] f45: Update to 51~beta
Date: Wed, 12 Aug 2026 09:30:22 GMT [thread overview]
Message-ID: <178652702211.1.15354569829916062538.rpms-epiphany-f8461d0d2c6c@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/epiphany
Branch : f45
Commit : f8461d0d2c6c5061e14f91ae263c2100b1c4eb49
Author : nmontero <nmontero@redhat.com>
Date : 2026-08-12T11:27:48+02:00
Stats : +2/-76 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/epiphany/c/f8461d0d2c6c5061e14f91ae263c2100b1c4eb49?branch=f45
Log:
Update to 51~beta
---
diff --git a/epiphany-sync-crypto-support-building-against-nettle-4-0.patch b/epiphany-sync-crypto-support-building-against-nettle-4-0.patch
deleted file mode 100644
index ddc5627..0000000
--- a/epiphany-sync-crypto-support-building-against-nettle-4-0.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From a8c7c95efc7d6bd259dea55a8caf75d7cdbc675e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fernando=20Mu=C3=B1oz?= <fernando@null-life.com>
-Date: Thu, 9 Jul 2026 21:44:11 -0500
-Subject: [PATCH] sync-crypto: Support building against nettle 4.0
-
-nettle 4.0 removed the explicit digest length argument from
-sha256_digest(), gcm_aes256_digest() and hkdf_extract(); the digest
-functions now always write the full digest size. Guard that argument
-with NETTLE_VERSION_MAJOR checks so the code keeps building against
-the nettle 3.x series, which our meson requirement (>= 3.4) still
-allows, as well as against 4.0.
-
-Fixes #2892
----
- lib/sync/ephy-sync-crypto.c | 19 ++++++++++++++++---
- 1 file changed, 16 insertions(+), 3 deletions(-)
-
-diff --git a/lib/sync/ephy-sync-crypto.c b/lib/sync/ephy-sync-crypto.c
-index 4da2a7a2c..8329c1cd4 100644
---- a/lib/sync/ephy-sync-crypto.c
-+++ b/lib/sync/ephy-sync-crypto.c
-@@ -37,6 +37,7 @@
- #include <nettle/hmac.h>
- #include <nettle/bignum.h>
- #include <nettle/sha2.h>
-+#include <nettle/version.h>
- #include <string.h>
-
- #if !NETTLE_USE_MINI_GMP
-@@ -1186,7 +1187,11 @@ ephy_sync_crypto_pkce_challenge_new (void)
- sha256_init (&ctx);
- sha256_update (&ctx, strlen (challenge->code_verifier),
- (const uint8_t *)challenge->code_verifier);
-- sha256_digest (&ctx, SHA256_DIGEST_SIZE, digest);
-+ sha256_digest (&ctx,
-+#if NETTLE_VERSION_MAJOR < 4
-+ SHA256_DIGEST_SIZE,
-+#endif
-+ digest);
- challenge->code_challenge = ephy_sync_utils_base64_urlsafe_encode (digest, SHA256_DIGEST_SIZE, TRUE);
-
- return challenge;
-@@ -1345,7 +1350,11 @@ concat_kdf_sha256 (const guint8 *shared_secret,
- sha256_update (&ctx, apv_bytes_len, apv_bytes);
- /* SuppPubInfo: key length in bits as 4-byte big-endian. */
- sha256_update (&ctx, 4, (const uint8_t *)&key_len_be);
-- sha256_digest (&ctx, SHA256_DIGEST_SIZE, digest);
-+ sha256_digest (&ctx,
-+#if NETTLE_VERSION_MAJOR < 4
-+ SHA256_DIGEST_SIZE,
-+#endif
-+ digest);
-
- /* For A256GCM (256 bits), one round of SHA-256 is sufficient. */
- result = g_malloc (key_len_bits / 8);
-@@ -1543,7 +1552,11 @@ ephy_sync_crypto_decrypt_jwe (const char *jwe,
-
- decrypted = g_malloc (ciphertext_len);
- gcm_aes256_decrypt (&ctx, ciphertext_len, decrypted, ciphertext);
-- gcm_aes256_digest (&ctx, GCM_DIGEST_SIZE, computed_tag);
-+ gcm_aes256_digest (&ctx,
-+#if NETTLE_VERSION_MAJOR < 4
-+ GCM_DIGEST_SIZE,
-+#endif
-+ computed_tag);
-
- /* Verify the authentication tag. */
- if (memcmp (computed_tag, tag, GCM_DIGEST_SIZE) != 0) {
---
-GitLab
-
diff --git a/epiphany.spec b/epiphany.spec
index 0cd10f5..a31e380 100644
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -6,7 +6,7 @@
Name: epiphany
Epoch: 1
-Version: 51~alpha
+Version: 51~beta
Release: %autorelease
Summary: Web browser for GNOME
@@ -19,9 +19,6 @@ Source0: https://download.gnome.org/sources/epiphany/%{gnome_major_versio
# Fedora bookmarks
Patch0: epiphany-default-bookmarks.patch
-# Upstream patches
-Patch10: epiphany-sync-crypto-support-building-against-nettle-4-0.patch
-
BuildRequires: /usr/bin/rst2man
BuildRequires: blueprint-compiler
BuildRequires: desktop-file-utils
diff --git a/sources b/sources
index 1523c30..0235dbe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (epiphany-51.alpha.tar.xz) = 8091eefee6b9e289ef448f6558600aa09bd3c54095e49ab07a00e43756a750b12b00f006c95e8939fd0ce143dba9fda749813d028232ac018e27763032cd4f72
+SHA512 (epiphany-51.beta.tar.xz) = 2eaa083c4bd3c19d7f83ddf7802f70de5bbcb5d7620a5fdafddc58c4ff6a2b8f430caed82e6a05a90858d0e86ec0819b8db1da141a40690a954332b4c25d37a3
reply other threads:[~2026-08-12 9:30 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178652702211.1.15354569829916062538.rpms-epiphany-f8461d0d2c6c@fedoraproject.org \
--to=nmontero@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox