Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/pam_ssh/, sys-auth/pam_ssh/files/
Date: Wed, 22 Apr 2020 12:26:33
Message-Id: 1587558381.cd27db05936853b3a8f0fd4560f564eef9c18daa.zlogene@gentoo
1 commit: cd27db05936853b3a8f0fd4560f564eef9c18daa
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 22 12:24:21 2020 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 22 12:26:21 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd27db05
7
8 sys-auth/pam_ssh: fix build with gcc-10
9
10 Closes: https://bugs.gentoo.org/709312
11
12 Thanks-to: Jeroen Roovers <jer <AT> gentoo.org>
13
14 Package-Manager: Portage-2.3.89, Repoman-2.3.20
15 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
16
17 sys-auth/pam_ssh/files/pam_ssh-gcc10-fix.patch | 11 +++++++++++
18 sys-auth/pam_ssh/pam_ssh-2.3.ebuild | 3 ++-
19 2 files changed, 13 insertions(+), 1 deletion(-)
20
21 diff --git a/sys-auth/pam_ssh/files/pam_ssh-gcc10-fix.patch b/sys-auth/pam_ssh/files/pam_ssh-gcc10-fix.patch
22 new file mode 100644
23 index 00000000000..9871b4297c7
24 --- /dev/null
25 +++ b/sys-auth/pam_ssh/files/pam_ssh-gcc10-fix.patch
26 @@ -0,0 +1,11 @@
27 +--- a/ge25519.h
28 ++++ b/ge25519.h
29 +@@ -28,7 +28,7 @@
30 + fe25519 t;
31 + } ge25519;
32 +
33 +-const ge25519 ge25519_base;
34 ++extern const ge25519 ge25519_base;
35 +
36 + int ge25519_unpackneg_vartime(ge25519 *r, const unsigned char p[32]);
37 +
38
39 diff --git a/sys-auth/pam_ssh/pam_ssh-2.3.ebuild b/sys-auth/pam_ssh/pam_ssh-2.3.ebuild
40 index aa31b08e2c8..23e4dd08095 100644
41 --- a/sys-auth/pam_ssh/pam_ssh-2.3.ebuild
42 +++ b/sys-auth/pam_ssh/pam_ssh-2.3.ebuild
43 @@ -12,17 +12,18 @@ SRC_URI="mirror://sourceforge/pam-ssh/${P}.tar.xz"
44 LICENSE="BSD-2 BSD ISC"
45 SLOT="0"
46 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
47 -IUSE=""
48
49 # Only supports OpenSSH via `ssh-agent` #282993
50 DEPEND="sys-libs/pam
51 dev-libs/openssl:0="
52 +
53 RDEPEND="${DEPEND}
54 net-misc/openssh"
55
56 PATCHES=(
57 # 503424#c5
58 "${FILESDIR}"/${PN}-2.1-dot-ssh-check.patch
59 + "${FILESDIR}"/${PN}-gcc10-fix.patch
60 )
61
62 src_configure() {