rpms/openssh
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Fix FTBFS due to implicit declarations (rhbz#2241211)

Browse Source
This commit is contained in:
Mattias Ellert 2023-10-15 06:42:32 +02:00
parent d3cd3f2851
commit 4f07bfcfe1
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
openssh-9.3p1-merged-openssl-evp.patch
View File

@ -252,6 +252,16 @@ diff --color -ru -x regress -x autom4te.cache -x '*.o' -x '*.lo' -x Makefile -x
#include <string.h>
@@ -44,6 +44,9 @@
#include "digest.h"
#define SSHKEY_INTERNAL
#include "sshkey.h"
+#ifdef ENABLE_PKCS11
+#include "ssh-pkcs11.h"
+#endif
#include "openbsd-compat/openssl-compat.h"
@@ -126,19 +128,29 @@
static int
ssh_ecdsa_generate(struct sshkey *k, int bits)
@ -780,7 +790,13 @@ diff --color -ru -x regress -x autom4te.cache -x '*.o' -x '*.lo' -x Makefile -x
#include <stdarg.h>
#include <string.h>
@@ -36,7 +38,7 @@
@@ -36,10 +36,13 @@
#include "sshkey.h"
#include "digest.h"
#include "log.h"
+#ifdef ENABLE_PKCS11
+#include "ssh-pkcs11.h"
+#endif
#include "openbsd-compat/openssl-compat.h"

5
openssh.spec
View File

@ -47,7 +47,7 @@
# Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1
%global openssh_ver 9.3p1
%global openssh_rel 11
%global openssh_rel 12
%global pam_ssh_agent_ver 0.10.4
%global pam_ssh_agent_rel 9
@ -744,6 +744,9 @@ test -f %{sysconfig_anaconda} && \
%endif
%changelog
* Sun Oct 15 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 9.3p1-12
- Fix FTBFS due to implicit declarations (rhbz#2241211)
* Tue Sep 19 2023 Dmitry Belyavskiy <dbelyavs@redhat.com> - 9.3p1-11
- migrated to SPDX license