From 75a3a3aa8ce8b775d14ad894bd2c014b0a9dac06 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 6 Dec 2016 18:02:21 -0800 Subject: [PATCH] net-misc/openssh: fix krb5-config detection --- .../openssh-7.2_p1-fix-krb5-config.patch | 25 +++++++++++++++++++ ...7.2_p2.ebuild => openssh-7.2_p2-r1.ebuild} | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-7.2_p1-fix-krb5-config.patch rename sdk_container/src/third_party/coreos-overlay/net-misc/openssh/{openssh-7.2_p2.ebuild => openssh-7.2_p2-r1.ebuild} (99%) diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-7.2_p1-fix-krb5-config.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-7.2_p1-fix-krb5-config.patch new file mode 100644 index 0000000000..2b99ac8bfe --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-7.2_p1-fix-krb5-config.patch @@ -0,0 +1,25 @@ +From 56d0bb7810042e3967a377cda4e321685e173969 Mon Sep 17 00:00:00 2001 +From: David Michael +Date: Tue, 6 Dec 2016 17:52:31 -0800 +Subject: [PATCH] Find a host-prefixed krb5-config when cross-compiling + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 88c4633..4d9382c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4151,7 +4151,7 @@ AC_ARG_WITH([kerberos5], + AC_DEFINE([KRB5], [1], [Define if you want Kerberos 5 support]) + KRB5_MSG="yes" + +- AC_PATH_PROG([KRB5CONF], [krb5-config], ++ AC_PATH_TOOL([KRB5CONF], [krb5-config], + [$KRB5ROOT/bin/krb5-config], + [$KRB5ROOT/bin:$PATH]) + if test -x $KRB5CONF ; then +-- +2.7.4 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-7.2_p2.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-7.2_p2-r1.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-7.2_p2.ebuild rename to sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-7.2_p2-r1.ebuild index 6f83d74a44..cd9453a011 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-7.2_p2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-7.2_p2-r1.ebuild @@ -152,6 +152,8 @@ src_prepare() { ) sed -i "${sed_args[@]}" configure{.ac,} || die + epatch "${FILESDIR}"/${PN}-7.2_p1-fix-krb5-config.patch + epatch_user #473004 # Now we can build a sane merged version.h