[rpms/filezilla] rawhide: Support nettle 4

[rpms/filezilla] rawhide: Support nettle 4

[Mamoru TASAKA]

A new commit has been pushed.

Repo   : rpms/filezilla
Branch : rawhide
Commit : f02fd19d21c7ce219e0a642ddd063a61098eb002
Author : Mamoru TASAKA <mtasaka@fedoraproject.org>
Date   : 2026-08-13T23:36:36+09:00
Stats  : +42/-2 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/filezilla/c/f02fd19d21c7ce219e0a642ddd063a61098eb002?branch=rawhide

Log:
Support nettle 4

---
diff --git a/filezilla-3.69.6-support-nettle4.patch b/filezilla-3.69.6-support-nettle4.patch
new file mode 100644
index 0000000..e880e8b
--- /dev/null
+++ b/filezilla-3.69.6-support-nettle4.patch
@@ -0,0 +1,34 @@
+--- 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 2f21cde..ec2585a 100644
--- a/filezilla.spec
+++ b/filezilla.spec
@@ -6,12 +6,15 @@
 
 Name: filezilla
 Version: 3.69.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: FTP, FTPS and SFTP client
 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
@@ -61,7 +64,7 @@ FileZilla is a FTP, FTPS and SFTP client for Linux with a lot of features.
 - Network configuration wizard 
 
 %prep
-%autosetup -p0 -n %{name}-%{version}
+%autosetup -p1 -n %{name}-%{version}
 %if 0%{?run_autogen}
 autoreconf -if
 %endif
@@ -149,6 +152,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/docs
 %{_libdir}/libfzclient-commonui*
 
 %changelog
+* Thu Aug 13 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.69.6-3
+- Support nettle 4
+
 * Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.69.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild