[rpms/rdesktop] rawhide: Fix build with nettle 4.0

[rpms/rdesktop] rawhide: Fix build with nettle 4.0

[Yaakov Selkowitz]

A new commit has been pushed.

Repo   : rpms/rdesktop
Branch : rawhide
Commit : 1b1eead4a31d17fde8bb903e987ad5ac412ee522
Author : Yaakov Selkowitz <yselkowi@redhat.com>
Date   : 2026-09-01T18:54:33-04:00
Stats  : +83/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/rdesktop/c/1b1eead4a31d17fde8bb903e987ad5ac412ee522?branch=rawhide

Log:
Fix build with nettle 4.0

---
diff --git a/1aac0717f1ed4c1fb07ed966189e4d17b7508616.patch b/1aac0717f1ed4c1fb07ed966189e4d17b7508616.patch
new file mode 100644
index 0000000..b04c897
--- /dev/null
+++ b/1aac0717f1ed4c1fb07ed966189e4d17b7508616.patch
@@ -0,0 +1,76 @@
+From 1aac0717f1ed4c1fb07ed966189e4d17b7508616 Mon Sep 17 00:00:00 2001
+From: Marco Fortina <marco_fortina@hotmail.it>
+Date: Mon, 25 May 2026 13:00:00 +0200
+Subject: [PATCH] ssl: support Nettle 4 digest API
+
+---
+ ssl.c | 13 +++++++++++++
+ ssl.h |  2 ++
+ 2 files changed, 15 insertions(+)
+
+diff --git a/ssl.c b/ssl.c
+index 0681a890d..0294bc3ee 100644
+--- a/ssl.c
++++ b/ssl.c
+@@ -5,6 +5,7 @@
+    Copyright (C) Jay Sorg <j@american-data.com> 2006-2008
+    Copyright 2016-2017 Henrik Andersson <hean01@cendio.se> for Cendio AB
+    Copyright 2017 Alexander Zakharov <uglym8@gmail.com>
++   Copyright 2026 Marco Fortina <marco_fortina@hotmail.it>
+ 
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+@@ -41,7 +42,11 @@ rdssl_sha1_update(RDSSL_SHA1 * sha1, uint8 * data, uint32 len)
+ void
+ rdssl_sha1_final(RDSSL_SHA1 * sha1, uint8 * out_data)
+ {
++#if NETTLE_VERSION_MAJOR >= 4
++	sha1_digest(sha1, out_data);
++#else
+ 	sha1_digest(sha1, SHA1_DIGEST_SIZE, out_data);
++#endif
+ }
+ 
+ void
+@@ -59,7 +64,11 @@ rdssl_md5_update(RDSSL_MD5 * md5, uint8 * data, uint32 len)
+ void
+ rdssl_md5_final(RDSSL_MD5 * md5, uint8 * out_data)
+ {
++#if NETTLE_VERSION_MAJOR >= 4
++	md5_digest(md5, out_data);
++#else
+ 	md5_digest(md5, MD5_DIGEST_SIZE, out_data);
++#endif
+ }
+ 
+ void
+@@ -360,5 +369,9 @@ rdssl_hmac_md5(const void *key, int key_len, const unsigned char *msg, int msg_l
+ 
+ 	hmac_md5_set_key(&ctx, key_len, key);
+ 	hmac_md5_update(&ctx, msg_len, msg);
++#if NETTLE_VERSION_MAJOR >= 4
++	hmac_md5_digest(&ctx, md);
++#else
+ 	hmac_md5_digest(&ctx, MD5_DIGEST_SIZE, md);
++#endif
+ }
+diff --git a/ssl.h b/ssl.h
+index c10f09b19..5c91aa337 100644
+--- a/ssl.h
++++ b/ssl.h
+@@ -5,6 +5,7 @@
+    Copyright (C) Jay Sorg 2006-2008
+    Copyright 2017 Henrik Andersson <hean01@cendio.se> for Cendio AB
+    Copyright 2017 Alexander Zakharov <uglym8@gmail.com>
++   Copyright 2026 Marco Fortina <marco_fortina@hotmail.it>
+ 
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+@@ -23,6 +24,7 @@
+ #ifndef _RDSSL_H
+ #define _RDSSL_H
+ 
++#include <nettle/version.h>
+ #include <nettle/md5.h>
+ #include <nettle/sha1.h>
+ #include <nettle/arcfour.h>

diff --git a/rdesktop.spec b/rdesktop.spec
index fdf090e..5e5838f 100644
--- a/rdesktop.spec
+++ b/rdesktop.spec
@@ -4,7 +4,7 @@
 
 Name:		rdesktop
 Version:	1.9.0
-Release:	20%{?dist}
+Release:	21%{?dist}
 Summary:	X client for remote desktop into Windows Terminal Server
 
 License:	GPL-3.0-or-later
@@ -20,6 +20,9 @@ Patch1:         rdesktop-crypto.patch
 Patch2: rdesktop-configure-c99.patch
 # Upstream fix: use correct modulus and exponent in rdssl_rkey_get_exp_mod
 Patch3:         https://github.com/rdesktop/rdesktop/commit/53ba87dc174175e98332e22355ad8662c02880d6.patch
+# from https://github.com/rdesktop/rdesktop/pull/435
+# ssl: support Nettle 4 digest API
+Patch4:         https://github.com/rdesktop/rdesktop/commit/1aac0717f1ed4c1fb07ed966189e4d17b7508616.patch
 BuildRequires: make
 BuildRequires:	gnutls-devel
 BuildRequires:	krb5-devel
@@ -57,6 +60,9 @@ autoreconf -vif
 %{_mandir}/man1/*
 
 %changelog
+* Tue Sep 01 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 1.9.0-21
+- Fix build with nettle 4.0
+
 * Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild