Attachment 3255 Details for Bug 2985 – changes needed to build openssh-7.9p1 with heimdel kerberos on openbsd 6.4

[patch] changes needed to build openssh-7.9p1 with heimdel kerberos on openbsd 6.4

ssh-krb5-p1.diff (text/plain), 2.19 KB, created by Markus on 2019-03-22 22:15:14 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Markus

Created: 2019-03-22 22:15:14 AEDT

Size: 2.19 KB

patch

obsolete

>diff -ur openssh-7.9p1-orig/Makefile openssh-7.9p1-bsd/Makefile
>--- openssh-7.9p1-orig/Makefile	Fri Mar 22 11:58:54 2019
>+++ openssh-7.9p1-bsd/Makefile	Thu Mar 21 12:48:15 2019
>@@ -44,7 +44,7 @@
> CPPFLAGS=-I. -I$(srcdir)  -I/usr/local/heimdal/include -I/usr/local/include -I/usr/local/heimdal/include -I/usr/local/include $(PATHS) -DHAVE_CONFIG_H
> LIBS=-lcrypto -lutil -lz 
> K5LIBS=-Wl,--enable-new-dtags -Wl,-rpath -Wl,/usr/local/heimdal/lib -L/usr/local/heimdal/lib -lkrb5
>-GSSLIBS=-Wl,--enable-new-dtags -Wl,-rpath -Wl,/usr/local/heimdal/lib -L/usr/local/heimdal/lib -lgssapi
>+GSSLIBS=-Wl,--enable-new-dtags -Wl,-rpath -Wl,/usr/local/heimdal/lib -L/usr/local/lib -L/usr/local/heimdal/lib -lgssapi
> SSHLIBS=
> SSHDLIBS=
> LIBEDIT=
>diff -ur openssh-7.9p1-orig/config.h openssh-7.9p1-bsd/config.h
>--- openssh-7.9p1-orig/config.h	Fri Mar 22 11:49:45 2019
>+++ openssh-7.9p1-bsd/config.h	Fri Mar 22 10:39:12 2019
>@@ -764,7 +764,7 @@
> /* #undef HAVE_KRB5_CC_NEW_UNIQUE */
> 
> /* Define to 1 if you have the `krb5_free_error_message' function. */
>-/* #undef HAVE_KRB5_FREE_ERROR_MESSAGE */
>+#define HAVE_KRB5_FREE_ERROR_MESSAGE 1
> 
> /* Define to 1 if you have the `krb5_get_error_message' function. */
> /* #undef HAVE_KRB5_GET_ERROR_MESSAGE */
>diff -ur openssh-7.9p1-orig/config.status openssh-7.9p1-bsd/config.status
>--- openssh-7.9p1-orig/config.status	Fri Mar 22 11:58:53 2019
>+++ openssh-7.9p1-bsd/config.status	Thu Mar 21 12:36:43 2019
>@@ -433,7 +433,7 @@
> This config.status script is free software; the Free Software Foundation
> gives unlimited permission to copy, distribute and modify it."
> 
>-ac_pwd='/usr/src/usr.bin/openssh-7.9p1-orig'
>+ac_pwd='/usr/src/usr.bin/openssh-7.9p1'
> srcdir='.'
> INSTALL='/usr/bin/install -c'
> MKDIR_P='./install-sh -c -d'
>diff -ur openssh-7.9p1-orig/openbsd-compat/port-aix.c openssh-7.9p1-bsd/openbsd-compat/port-aix.c
>--- openssh-7.9p1-orig/openbsd-compat/port-aix.c	Wed Oct 17 02:01:20 2018
>+++ openssh-7.9p1-bsd/openbsd-compat/port-aix.c	Fri Mar 22 10:28:35 2019
>@@ -26,6 +26,7 @@
>  */
> #include "includes.h"
> 
>+#ifdef _AIX
> #include "xmalloc.h"
> #include "sshbuf.h"
> #include "ssherr.h"
>@@ -36,7 +37,6 @@
> #include "ssh_api.h"
> #include "log.h"
> 
>-#ifdef _AIX
> 
> #include <errno.h>
> #if defined(HAVE_NETDB_H)

Actions: View | Diff

Attachments on bug 2985: 3255 | 3257 | 3258 | 3259