From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D6799139694 for ; Thu, 25 May 2017 03:28:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B751E21C039; Thu, 25 May 2017 03:28:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7A9EA21C039 for ; Thu, 25 May 2017 03:28:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ECC7B3416C2 for ; Thu, 25 May 2017 03:28:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 622457441 for ; Thu, 25 May 2017 03:28:45 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1495682913.ec46f339c2e155ba04c9ba574f9d488535d5294d.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/, net-misc/openssh/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/openssh/files/openssh-7.5_p1-cross-cache.patch net-misc/openssh/openssh-7.5_p1-r1.ebuild X-VCS-Directories: net-misc/openssh/ net-misc/openssh/files/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: ec46f339c2e155ba04c9ba574f9d488535d5294d X-VCS-Branch: master Date: Thu, 25 May 2017 03:28:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f4788cd8-424d-4818-8f78-b7b88d27b5ca X-Archives-Hash: 0b88b371f831e7f63e31ee2e5c9844b2 commit: ec46f339c2e155ba04c9ba574f9d488535d5294d Author: Mike Frysinger gentoo org> AuthorDate: Thu May 25 03:26:28 2017 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Thu May 25 03:28:33 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec46f339 net-misc/openssh: fix some cross-compiling configure tests .../openssh/files/openssh-7.5_p1-cross-cache.patch | 39 ++++++++++++++++++++++ net-misc/openssh/openssh-7.5_p1-r1.ebuild | 1 + 2 files changed, 40 insertions(+) diff --git a/net-misc/openssh/files/openssh-7.5_p1-cross-cache.patch b/net-misc/openssh/files/openssh-7.5_p1-cross-cache.patch new file mode 100644 index 00000000000..1c2b7b8a091 --- /dev/null +++ b/net-misc/openssh/files/openssh-7.5_p1-cross-cache.patch @@ -0,0 +1,39 @@ +From d588d6f83e9a3d48286929b4a705b43e74414241 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Wed, 24 May 2017 23:18:41 -0400 +Subject: [PATCH] configure: actually set cache vars when cross-compiling + +The cross-compiling fallback message says it's assuming the test +passed, but it didn't actually set the cache var which causes +later tests to fail. +--- + configure.ac | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5cfea38c0a6c..895c5211ea93 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3162,7 +3162,8 @@ AC_RUN_IFELSE( + select_works_with_rlimit=yes], + [AC_MSG_RESULT([no]) + select_works_with_rlimit=no], +- [AC_MSG_WARN([cross compiling: assuming yes])] ++ [AC_MSG_WARN([cross compiling: assuming yes]) ++ select_works_with_rlimit=yes] + ) + + AC_MSG_CHECKING([if setrlimit(RLIMIT_NOFILE,{0,0}) works]) +@@ -3188,7 +3189,8 @@ AC_RUN_IFELSE( + rlimit_nofile_zero_works=yes], + [AC_MSG_RESULT([no]) + rlimit_nofile_zero_works=no], +- [AC_MSG_WARN([cross compiling: assuming yes])] ++ [AC_MSG_WARN([cross compiling: assuming yes]) ++ rlimit_nofile_zero_works=yes] + ) + + AC_MSG_CHECKING([if setrlimit RLIMIT_FSIZE works]) +-- +2.12.0 + diff --git a/net-misc/openssh/openssh-7.5_p1-r1.ebuild b/net-misc/openssh/openssh-7.5_p1-r1.ebuild index 9652d9263d6..d4bbc148686 100644 --- a/net-misc/openssh/openssh-7.5_p1-r1.ebuild +++ b/net-misc/openssh/openssh-7.5_p1-r1.ebuild @@ -131,6 +131,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-7.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch + epatch "${FILESDIR}"/${PN}-7.5_p1-cross-cache.patch use X509 || epatch "${WORKDIR}"/${SCTP_PATCH%.*} use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-x32-typo.patch use abi_mips_n32 && epatch "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch