[packages/openssh] add missing includes to ldap patch to fix build with gcc 14

atler atler at pld-linux.org
Tue Jun 4 21:47:45 CEST 2024


commit 05e2835edbd3822319482efdc6d3748a3a19f365
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Jun 4 21:35:31 2024 +0200

    add missing includes to ldap patch to fix build with gcc 14

 ldap-helper-sigpipe.patch | 2 +-
 openssh-ldap.patch        | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/ldap-helper-sigpipe.patch b/ldap-helper-sigpipe.patch
index cfa2018..7808407 100644
--- a/ldap-helper-sigpipe.patch
+++ b/ldap-helper-sigpipe.patch
@@ -84,7 +84,7 @@ exit 0
 --- openssh-6.6p1/ldap-helper.c~	2014-05-13 17:04:22.258162978 +0300
 +++ openssh-6.6p1/ldap-helper.c	2014-05-13 17:14:08.398824417 +0300
 @@ -31,6 +31,7 @@
- #include "ldapbody.h"
+ #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
 +#include <signal.h>
diff --git a/openssh-ldap.patch b/openssh-ldap.patch
index cfc7615..79f4dff 100644
--- a/openssh-ldap.patch
+++ b/openssh-ldap.patch
@@ -322,7 +322,7 @@ diff -urNp -x '*.orig' openssh-8.4p1.org/configure.ac openssh-8.4p1/configure.ac
 diff -urNp -x '*.orig' openssh-8.4p1.org/ldap-helper.c openssh-8.4p1/ldap-helper.c
 --- openssh-8.4p1.org/ldap-helper.c	1970-01-01 01:00:00.000000000 +0100
 +++ openssh-8.4p1/ldap-helper.c	2021-03-01 11:29:31.280956671 +0100
-@@ -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.
@@ -354,6 +354,7 @@ diff -urNp -x '*.orig' openssh-8.4p1.org/ldap-helper.c openssh-8.4p1/ldap-helper
 +#include "xmalloc.h"
 +#include "ldapconf.h"
 +#include "ldapbody.h"
++#include <stdlib.h>
 +#include <string.h>
 +#include <unistd.h>
 +
@@ -609,7 +610,7 @@ diff -urNp -x '*.orig' openssh-8.4p1.org/ldap.conf openssh-8.4p1/ldap.conf
 diff -urNp -x '*.orig' openssh-8.4p1.org/ldapbody.c openssh-8.4p1/ldapbody.c
 --- openssh-8.4p1.org/ldapbody.c	1970-01-01 01:00:00.000000000 +0100
 +++ openssh-8.4p1/ldapbody.c	2021-03-01 11:29:31.280956671 +0100
-@@ -0,0 +1,494 @@
+@@ -0,0 +1,495 @@
 +/* $OpenBSD: ldapbody.c,v 1.1 2009/12/03 03:34:42 jfch Exp $ */
 +/*
 + * Copyright (c) 2009 Jan F. Chadima.  All rights reserved.
@@ -642,6 +643,7 @@ diff -urNp -x '*.orig' openssh-8.4p1.org/ldapbody.c openssh-8.4p1/ldapbody.c
 +#include "ldapmisc.h"
 +#include "ldapbody.h"
 +#include <stdio.h>
++#include <stdlib.h>
 +#include <unistd.h>
 +
 +#define LDAPSEARCH_FORMAT "(&(objectclass=%s)(objectclass=ldapPublicKey)(uid=%s)%s)"
@@ -1148,7 +1150,7 @@ diff -urNp -x '*.orig' openssh-8.4p1.org/ldapbody.h openssh-8.4p1/ldapbody.h
 diff -urNp -x '*.orig' openssh-8.4p1.org/ldapconf.c openssh-8.4p1/ldapconf.c
 --- openssh-8.4p1.org/ldapconf.c	1970-01-01 01:00:00.000000000 +0100
 +++ openssh-8.4p1/ldapconf.c	2021-03-01 11:29:31.280956671 +0100
-@@ -0,0 +1,691 @@
+@@ -0,0 +1,692 @@
 +/* $OpenBSD: ldapconf.c,v 1.1 2009/12/03 03:34:42 jfch Exp $ */
 +/*
 + * Copyright (c) 2009 Jan F. Chadima.  All rights reserved.
@@ -1181,6 +1183,7 @@ diff -urNp -x '*.orig' openssh-8.4p1.org/ldapconf.c openssh-8.4p1/ldapconf.c
 +#include "xmalloc.h"
 +#include "ldapconf.h"
 +#include <unistd.h>
++#include <stdlib.h>
 +#include <string.h>
 +
 +/* Keyword tokens. */
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openssh.git/commitdiff/05e2835edbd3822319482efdc6d3748a3a19f365



More information about the pld-cvs-commit mailing list