Accepting request 1179619 from home:alarrosa:branches:network:openssh

- Add #include <stdlib.h> 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
This commit is contained in:
Dirk Mueller 2024-06-10 07:34:57 +00:00 committed by Git OBS Bridge
parent e11bee9499
commit b4dab4a6f7
2 changed files with 11 additions and 2 deletions

View File

@ -335,7 +335,7 @@ Index: openssh-8.9p1/ldap-helper.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ openssh-8.9p1/ldap-helper.c +++ 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 $ */ +/* $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. + * Copyright (c) 2009 Jan F. Chadima. All rights reserved.
@ -369,6 +369,7 @@ Index: openssh-8.9p1/ldap-helper.c
+#include "ldapbody.h" +#include "ldapbody.h"
+#include <string.h> +#include <string.h>
+#include <unistd.h> +#include <unistd.h>
+#include <stdlib.h>
+ +
+static int config_debug = 0; +static int config_debug = 0;
+int config_exclusive_config_file = 0; +int config_exclusive_config_file = 0;
@ -1175,7 +1176,7 @@ Index: openssh-8.9p1/ldapconf.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ openssh-8.9p1/ldapconf.c +++ 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 $ */ +/* $OpenBSD: ldapconf.c,v 1.1 2009/12/03 03:34:42 jfch Exp $ */
+/* +/*
+ * Copyright (c) 2009 Jan F. Chadima. All rights reserved. + * Copyright (c) 2009 Jan F. Chadima. All rights reserved.
@ -1209,6 +1210,7 @@ Index: openssh-8.9p1/ldapconf.c
+#include "ldapconf.h" +#include "ldapconf.h"
+#include <unistd.h> +#include <unistd.h>
+#include <string.h> +#include <string.h>
+#include <stdlib.h>
+ +
+/* Keyword tokens. */ +/* Keyword tokens. */
+ +

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Jun 10 07:10:48 UTC 2024 - Antonio Larrosa <alarrosa@suse.com>
- Add #include <stdlib.h> 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 <alarrosa@suse.com> Fri May 17 07:45:38 UTC 2024 - Antonio Larrosa <alarrosa@suse.com>