summaryrefslogtreecommitdiff
path: root/net-misc/openssh
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-01-13 06:19:51 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-01-13 06:19:51 +0000
commit8be70107efbb417f839292165ee39d07a062046f (patch)
tree013918887ec4a00f0cefdb4b4d1313cbc3054305 /net-misc/openssh
parent343a7272d559a21a0e0ed13cb743fabb2bfcc479 (diff)
gentoo resync : 13.01.2018
Diffstat (limited to 'net-misc/openssh')
-rw-r--r--net-misc/openssh/Manifest2
-rw-r--r--net-misc/openssh/openssh-7.5_p1-r3.ebuild4
2 files changed, 3 insertions, 3 deletions
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index b4a02f11b122..3868fb040023 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -25,7 +25,7 @@ DIST openssh-7.6p1-hpnssh14v12.tar.xz 15392 BLAKE2B 6888ea4054a470116b2ab3d115f5
DIST openssh-7.6p1.tar.gz 1489788 BLAKE2B 938bfeeff0a0aaa2fc7e4c345f04561c6c071c526e354a7d344a08742cb70ab1f4a41d325b31720f2fba5c4afa4db11f3fc87055c8c9c8bea37b29cc11dc8f39 SHA512 de17fdcb8239401f76740c8d689a8761802f6df94e68d953f3c70b9f4f8bdb403617c48c1d01cc8c368d88e9d50aee540bf03d5a36687dfb39dfd28d73029d72
DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5bc3a194e2cc4b64964a2d3df68bbe54c53588f15fc5176dbc3811e929573fa3e41cf91f412aa2513bb9a4b6ed02c2523c1e24 SHA512 9ce5d7e5d831c972f0f866b686bf93a048a03979ab38627973f5491eeeaa45f9faab0520b3a7ed90a13a67213fdc9cd4cf11e423acad441ea91b71037c8b435b
DIST openssh-lpk-7.6p1-0.3.14.patch.xz 17044 BLAKE2B a31dcb15848d3a22306108a4e181b1d52b195e6adcd2a78d5c7bf57f33c8ed62c3affa434c8d31c07eae84b59f1a3968a3f2a92e702f9225b121127616cb9d61 SHA512 e9a2b18fd6a58354198b6e48199059d055451a5f09c99bf7293d0d54137a59c581a9cb3bd906f31589e03d8450fb017b9015e18c67b7b6ae840e336039436974
-EBUILD openssh-7.5_p1-r3.ebuild 11069 BLAKE2B 0efa1ef57d36fa9f0065f47e6fb5eecf1a15d860123232df4e6c6d5ac2a9539e3698b31b055219f35cd1104485db9befe120395db87fdfd31f9fa8d715b4243e SHA512 9ff09f013015a94c2c47ac8e4206b3039eea861b4c5597fdc4fe4766081057e337ca121a7b32456f4ac842a5ffcbb3a8246c2710aaa68c195a8fe4b39c4f4a1d
+EBUILD openssh-7.5_p1-r3.ebuild 11127 BLAKE2B aed57a04ffa504758827af9269c747617598677fc3ec2a2c587b559f7874b9f1d0a0269a32ff7fe4fb454271f62cc7931a68bf537db9bee4e4cdf7925d040046 SHA512 2fb7096c8b6a44d9abd89c8312d506a5ce711a7be049d1fc227d155fc80e138b1118110c9f5491d92a1ebda310207d75eaf80069d122ea4d4dde4002fa96b66c
EBUILD openssh-7.6_p1-r1.ebuild 11184 BLAKE2B c864783cdb2798c4b51986f08ab959117e57965f60a6d718caf508928a154344b5e2934db619dab7fc698b7c1411b8b79db01bb4076246662db5b1d034ffab58 SHA512 5ee9beacb3acf9d9b195e02ab10b390432ada244fb4c9e97a0cb1f04a8fe902c6816e0e1a6807bce8401c9827bc220a508fcdfd6650d43885a4e699c08e30884
EBUILD openssh-7.6_p1.ebuild 11183 BLAKE2B 1d83808228655f59f0c44f65c6b61901f1b650b59447e15382c72e5477238d0fda4a669f8982afb295604e4a72e71fb7eed98d373e4ea6403c1cc585024ef9b5 SHA512 3b779a728ab8f1b0f8d2973be0c2534c0572b33b17f4e51e407c92502d33c23eece1e35ea118aa374422f8a8c5aea27adf86f863f19c01f199981b639146046d
MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5
diff --git a/net-misc/openssh/openssh-7.5_p1-r3.ebuild b/net-misc/openssh/openssh-7.5_p1-r3.ebuild
index 1f173bc6211f..a3c62aa567f5 100644
--- a/net-misc/openssh/openssh-7.5_p1-r3.ebuild
+++ b/net-misc/openssh/openssh-7.5_p1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -132,7 +132,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
epatch "${FILESDIR}"/${PN}-7.5_p1-cross-cache.patch
epatch "${FILESDIR}"/${PN}-7.5_p1-CVE-2017-15906.patch
- epatch "${FILESDIR}"/${PN}-7.5_p1-s390-seccomp.patch
+ use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-s390-seccomp.patch # already included in X509 patch set, #644252
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