public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/filezilla] rawhide: Drop nettle patch
@ 2026-09-22 15:43 Gwyn Ciesla
0 siblings, 0 replies; only message in thread
From: Gwyn Ciesla @ 2026-09-22 15:43 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/filezilla
Branch : rawhide
Commit : 15e25d296e94a414edc8d7bf4bbbbfc3d658d9df
Author : Gwyn Ciesla <gwync@protonmail.com>
Date : 2026-09-22T10:43:05-05:00
Stats : +0/-37 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/filezilla/c/15e25d296e94a414edc8d7bf4bbbbfc3d658d9df?branch=rawhide
Log:
Drop nettle patch
---
diff --git a/filezilla-3.69.6-support-nettle4.patch b/filezilla-3.69.6-support-nettle4.patch
deleted file mode 100644
index e880e8b..0000000
--- a/filezilla-3.69.6-support-nettle4.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- filezilla-3.69.6/src/putty/sshaes.c.nettle 2021-06-29 17:59:07.000000000 +0900
-+++ filezilla-3.69.6/src/putty/sshaes.c 2026-08-13 22:30:31.054052818 +0900
-@@ -11,6 +11,7 @@
- #include <nettle/aes.h>
- #include <nettle/gcm.h>
- #include <nettle/memxor.h>
-+#include <nettle/version.h>
-
- /*
- * Start by deciding whether we can support hardware AES at all.
-@@ -313,7 +314,11 @@ static void aes128_gcm_mac_genresult(ssh
- {
- struct AES128GCMContext *ctx = container_of(mac, struct AES128GCMContext, mac_if);
-
-+#if defined(NETTLE_VERSION_MAJOR) && (NETTLE_VERSION_MAJOR >= 4)
-+ nettle_gcm_aes128_digest(&ctx->ctx, blk);
-+#else
- nettle_gcm_aes128_digest(&ctx->ctx, 16, blk);
-+#endif
- increment_iv_step32(ctx->iv + 4, 2);
- }
-
-@@ -455,7 +460,11 @@ static void aes256_gcm_mac_genresult(ssh
- {
- struct AES256GCMContext *ctx = container_of(mac, struct AES256GCMContext, mac_if);
-
-+#if defined(NETTLE_VERSION_MAJOR) && (NETTLE_VERSION_MAJOR >= 4)
-+ nettle_gcm_aes256_digest(&ctx->ctx, blk);
-+#else
- nettle_gcm_aes256_digest(&ctx->ctx, 16, blk);
-+#endif
- increment_iv_step32(ctx->iv + 4, 2);
- }
-
diff --git a/filezilla.spec b/filezilla.spec
index 12df102..9392c00 100644
--- a/filezilla.spec
+++ b/filezilla.spec
@@ -12,9 +12,6 @@ License: GPL-2.0-or-later
URL: https://filezilla-project.org/
Source0: https://download.filezilla-project.org/FileZilla_%{version}_src.tar.xz
-# ref:
-# https://github.com/gnutls/nettle/commit/d4cac403adc243ae29b66b36d078030e3b1721d8
-Patch0: filezilla-3.69.6-support-nettle4.patch
%if 0%{?rhel} == 8
# libuv-devel not present on s390x on EL-8
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-22 15:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-22 15:43 [rpms/filezilla] rawhide: Drop nettle patch Gwyn Ciesla
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox