From cc1ce58c65e1da806411635362e922cdb9be7070 Mon Sep 17 00:00:00 2001 From: zhangyaqi Date: Tue, 18 Nov 2025 09:47:09 +0800 Subject: [PATCH] Delete the last submitted patch --- backport-Udppktinfo-fix-bug-in-a-macro.patch | 60 -------------------- krb5.spec | 6 +- 2 files changed, 4 insertions(+), 62 deletions(-) delete mode 100644 backport-Udppktinfo-fix-bug-in-a-macro.patch diff --git a/backport-Udppktinfo-fix-bug-in-a-macro.patch b/backport-Udppktinfo-fix-bug-in-a-macro.patch deleted file mode 100644 index 6a9f684..0000000 --- a/backport-Udppktinfo-fix-bug-in-a-macro.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 67abc25fa9deadd3638bb1b78373d2f08de0d54d Mon Sep 17 00:00:00 2001 -From: Sergey Fedorov -Date: Fri, 10 Oct 2025 13:54:40 +0800 -Subject: [PATCH] Fix fallback macros in udppktinfo.c - -Commit 87b7d86676bff0b64a9eea39849abc97fdbe2972 changed the signatures -of several udppktinfo.c functions, but did not update the fallback -macro signatures to match. Update the fallback macros. Fixes a build -error observed on macOS 10.6.8. - -[ghudson@mit.edu: fixed additional fallback macros; edited commit -message] - ---- - src/lib/apputils/udppktinfo.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/lib/apputils/udppktinfo.c b/src/lib/apputils/udppktinfo.c -index 9a06ae8..fa964d5 100644 ---- a/src/lib/apputils/udppktinfo.c -+++ b/src/lib/apputils/udppktinfo.c -@@ -215,7 +215,7 @@ check_cmsg_ip_recvdstaddr(struct cmsghdr *cmsgptr, struct sockaddr *to, - } - - #else /* HAVE_IP_PKTINFO || IP_RECVDSTADDR */ --#define check_cmsg_v4_pktinfo(c, t, l, a) 0 -+#define check_cmsg_v4_pktinfo(c, t, a) 0 - #endif /* HAVE_IP_PKTINFO || IP_RECVDSTADDR */ - - #ifdef HAVE_IPV6_PKTINFO -@@ -248,7 +248,7 @@ check_cmsg_ipv6_pktinfo(struct cmsghdr *cmsgptr, struct sockaddr *to, - return 0; - } - #else /* HAVE_IPV6_PKTINFO */ --#define check_cmsg_v6_pktinfo(c, t, l, a) 0 -+#define check_cmsg_v6_pktinfo(c, t, a) 0 - #endif /* HAVE_IPV6_PKTINFO */ - - static int -@@ -379,7 +379,7 @@ set_msg_from_ip_sendsrcaddr(struct msghdr *msg, struct cmsghdr *cmsgptr, - } - - #else /* HAVE_IP_PKTINFO || IP_SENDSRCADDR */ --#define set_msg_from_ipv4(m, c, f, l, a) EINVAL -+#define set_msg_from_ipv4(m, c, f, a) EINVAL - #endif /* HAVE_IP_PKTINFO || IP_SENDSRCADDR */ - - #ifdef HAVE_IPV6_PKTINFO -@@ -417,7 +417,7 @@ set_msg_from_ipv6_pktinfo(struct msghdr *msg, struct cmsghdr *cmsgptr, - } - - #else /* HAVE_IPV6_PKTINFO */ --#define set_msg_from_ipv6(m, c, f, l, a) EINVAL -+#define set_msg_from_ipv6(m, c, f, a) EINVAL - #endif /* HAVE_IPV6_PKTINFO */ - - static krb5_error_code --- -2.43.0 - diff --git a/krb5.spec b/krb5.spec index 9b7c9de..245bcdd 100644 --- a/krb5.spec +++ b/krb5.spec @@ -3,7 +3,7 @@ Name: krb5 Version: 1.18.2 -Release: 20 +Release: 21 Summary: The Kerberos network authentication protocol License: MIT URL: http://web.mit.edu/kerberos/www/ @@ -63,7 +63,6 @@ Patch40: backport-Fix-typo-in-AS-REQ-client-code.patch Patch41: backport-0001-fix-CVE-2025-3576.patch Patch42: backport-0002-fix-CVE-2025-3576.patch Patch43: backport-Fix-error-handling-in-pkinit_server_verify_padata.patch -Patch44: backport-Udppktinfo-fix-bug-in-a-macro.patch BuildRequires: gettext BuildRequires: gcc make automake autoconf pkgconfig pam-devel libselinux-devel byacc @@ -355,6 +354,9 @@ make -C src check || : %{_mandir}/man8/* %changelog +* Tue Nov 18 2025 zhangyaqi - 1.18.2-21 +- Delete the last submitted patch + * Fri Oct 31 2025 zhangyaqi - 1.18.2-20 - backport upstream patches -- Gitee