From b4dab4a6f76a450271cfbd41359cfe85215dde6ab888062eaab6f9fc2de3206f Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 10 Jun 2024 07:34:57 +0000 Subject: [PATCH] Accepting request 1179619 from home:alarrosa:branches:network:openssh - Add #include in some files added by the ldap patch to fix build with gcc14 (boo#1225904). * openssh-7.7p1-ldap.patch OBS-URL: https://build.opensuse.org/request/show/1179619 OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=268 --- openssh-7.7p1-ldap.patch | 6 ++++-- openssh.changes | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/openssh-7.7p1-ldap.patch b/openssh-7.7p1-ldap.patch index 9f11f91..cfa9249 100644 --- a/openssh-7.7p1-ldap.patch +++ b/openssh-7.7p1-ldap.patch @@ -335,7 +335,7 @@ Index: openssh-8.9p1/ldap-helper.c =================================================================== --- /dev/null +++ openssh-8.9p1/ldap-helper.c -@@ -0,0 +1,155 @@ +@@ -0,0 +1,156 @@ +/* $OpenBSD: ssh-pka-ldap.c,v 1.1 2009/12/03 03:34:42 jfch Exp $ */ +/* + * Copyright (c) 2009 Jan F. Chadima. All rights reserved. @@ -369,6 +369,7 @@ Index: openssh-8.9p1/ldap-helper.c +#include "ldapbody.h" +#include +#include ++#include + +static int config_debug = 0; +int config_exclusive_config_file = 0; @@ -1175,7 +1176,7 @@ Index: openssh-8.9p1/ldapconf.c =================================================================== --- /dev/null +++ openssh-8.9p1/ldapconf.c -@@ -0,0 +1,711 @@ +@@ -0,0 +1,712 @@ +/* $OpenBSD: ldapconf.c,v 1.1 2009/12/03 03:34:42 jfch Exp $ */ +/* + * Copyright (c) 2009 Jan F. Chadima. All rights reserved. @@ -1209,6 +1210,7 @@ Index: openssh-8.9p1/ldapconf.c +#include "ldapconf.h" +#include +#include ++#include + +/* Keyword tokens. */ + diff --git a/openssh.changes b/openssh.changes index 1e5f3f8..ee72e3a 100644 --- a/openssh.changes +++ b/openssh.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jun 10 07:10:48 UTC 2024 - Antonio Larrosa + +- Add #include in some files added by the ldap patch to + fix build with gcc14 (boo#1225904). + * openssh-7.7p1-ldap.patch + ------------------------------------------------------------------- Fri May 17 07:45:38 UTC 2024 - Antonio Larrosa