summaryrefslogtreecommitdiff
path: root/net-misc/openssh
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-07-07 11:42:03 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-07-07 11:42:03 +0100
commitf70601e0934acd62f6c5d06c5ede4cc607179514 (patch)
tree0b337390375de04b950fc4b45edc0f895a4701a4 /net-misc/openssh
parentb2be182d49eea46686b5cf2680d457df61e89dc4 (diff)
gentoo resync : 07.07.2018
Diffstat (limited to 'net-misc/openssh')
-rw-r--r--net-misc/openssh/Manifest4
-rw-r--r--net-misc/openssh/openssh-7.7_p1-r103.ebuild (renamed from net-misc/openssh/openssh-7.7_p1-r102.ebuild)5
-rw-r--r--net-misc/openssh/openssh-7.7_p1-r5.ebuild2
3 files changed, 8 insertions, 3 deletions
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index d2282411472d..3b60452efe8c 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -38,7 +38,7 @@ DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5
DIST openssh-lpk-7.6p1-0.3.14.patch.xz 17044 BLAKE2B a31dcb15848d3a22306108a4e181b1d52b195e6adcd2a78d5c7bf57f33c8ed62c3affa434c8d31c07eae84b59f1a3968a3f2a92e702f9225b121127616cb9d61 SHA512 e9a2b18fd6a58354198b6e48199059d055451a5f09c99bf7293d0d54137a59c581a9cb3bd906f31589e03d8450fb017b9015e18c67b7b6ae840e336039436974
EBUILD openssh-7.5_p1-r4.ebuild 11184 BLAKE2B c6725a371359485803c89cb73b9efad9a69ed6255ff8f411574e218af71880c507567010a749c22bea5f1a12043acb01cbfe452e9aba50e0b508b737f7fb7576 SHA512 414033d873ea94e0a3f087a8739d4266bdb96b6e02702a0385f09911ee2c279666baa837048e825489478b7774126b1dafa48e1f354f50d0d6cfc73b446da286
EBUILD openssh-7.6_p1-r5.ebuild 11360 BLAKE2B ca0a8157c9c4fbd9219f8e73f6009c18b467e3a1b234bfa346ddb20c8e21438d16230ce0f1062ed947da67435f7e3a50a57675a7e285c37c8b515a9d17430f29 SHA512 fb6ee3771fb67700e596835267c8f26d0c1afe5c3c3366963951c07266a7ab58224d78062256c176e13a00238d9c21ba0ad66965ce6ffd41eb74e28eab81970c
-EBUILD openssh-7.7_p1-r102.ebuild 16759 BLAKE2B defbd5491d4f8d81bb2bcccd0420122bcf05569a002ddd163ae2e3b6e1472a3cf5306791d7d20aa913411c6eacf6e89d7d79a6e1572acd722af52aebc7dc4845 SHA512 57c131ae036ceba8cafed62a5378b25798611cfdff1cb3cd0a24e96aaf3c2fa67badc413eac3a55d3667e02cc899df9733815dc32a81a12057bda655047f6681
-EBUILD openssh-7.7_p1-r5.ebuild 15730 BLAKE2B 14b85d4c72e743de1548bc89d0074f980eb69b656d799c76b45dfa76ba644c21d7ede2be69ce6b265a83e6e3f6f970df142d0418dba1857ce17ce05d5f26b10b SHA512 d1bd7dafc481aa3e34587f9de019d9843cddab6b965b33591552c12a13775c265458282b49d09d4c99d1072ce65bd7c8f0553c65a98ec2f7b6c6afc5e75429e9
+EBUILD openssh-7.7_p1-r103.ebuild 16934 BLAKE2B d1108c86af72036ea9e64e7ae173c9cc8ae280b133963c1960244a4eb5d6539b5b164dc470f528db4e69b401b78a9fad72977a2865c7cc8b0facf29204418773 SHA512 28146aaf128a80222a0b821f75143b6f58ae31afcf033c54522188ea849cca5ef796b03f5cae31ffe01067949efb07ee2762746ec5810fe52e643f8bc63506fa
+EBUILD openssh-7.7_p1-r5.ebuild 15729 BLAKE2B 96f8fc8f63f16fcb10c023e19126bae10bfe33b528727638024a7fcddd558f99200cb11241410293034500c31426290cdbcee6ec7e44968583b25c5c53c7427a SHA512 a36d94286a23b8d890293c64020869b15e783f9577908ac030f61fc02f936462f57e217eebf4d868035e9779edd792cdec2f7ad3edfe24a958acfbb6d49894b5
EBUILD openssh-7.7_p1-r6.ebuild 16444 BLAKE2B 4fdaa4029cefb40da2865653c508ea951dfc8becf4c79b8e37e2c8848859dade97523d3c3845a67df0ef206ee1e1d82beea6f3fa7af0e0c381333704b087a209 SHA512 c7decf934c521481962f05498b3c0807322bf097b5d423ea03cb380c7be3ebb10586a700df7403d4e96656f4c03853366cf56f0e77f068f1c6e7b81141d1f139
MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5
diff --git a/net-misc/openssh/openssh-7.7_p1-r102.ebuild b/net-misc/openssh/openssh-7.7_p1-r103.ebuild
index 83b9dd347119..3a2abed912ea 100644
--- a/net-misc/openssh/openssh-7.7_p1-r102.ebuild
+++ b/net-misc/openssh/openssh-7.7_p1-r103.ebuild
@@ -393,6 +393,11 @@ src_install() {
if use ldap && [[ -n ${LDAP_PATCH} ]] ; then
insinto /etc/openldap/schema/
doins openssh-lpk-{sun,openldap}.schema
+
+ # Set the same libexec directory as in src_configure
+ sed -i \
+ -e "s:libexec/openssh:$(get_libdir)/misc:" \
+ "${ED%/}/usr/$(get_libdir)/misc/ssh-ldap-wrapper" || die
fi
doman contrib/ssh-copy-id.1
diff --git a/net-misc/openssh/openssh-7.7_p1-r5.ebuild b/net-misc/openssh/openssh-7.7_p1-r5.ebuild
index 3fd5fceb7372..bed23d9a6036 100644
--- a/net-misc/openssh/openssh-7.7_p1-r5.ebuild
+++ b/net-misc/openssh/openssh-7.7_p1-r5.ebuild
@@ -31,7 +31,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Probably want to drop ssl defaulting to on in a future version.
IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509"
REQUIRED_USE="ldns? ( ssl )