aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Shelton <stuart@shelton.me>2016-01-17 20:09:38 +0000
committerStuart Shelton <stuart@shelton.me>2016-01-17 20:09:38 +0000
commit8b8011135c03d10f0d0e861255e6408649353060 (patch)
tree7bff270bd12056de2d21e9ffbf34f191ad33e28b /net-misc/openssh
parentUpdate net-misc/dhcpcd-6.10.0 (diff)
downloadsrcshelton-8b8011135c03d10f0d0e861255e6408649353060.tar.gz
srcshelton-8b8011135c03d10f0d0e861255e6408649353060.tar.bz2
srcshelton-8b8011135c03d10f0d0e861255e6408649353060.zip
Update net-misc/openssh-7.1_p1-r2
Diffstat (limited to 'net-misc/openssh')
-rw-r--r--net-misc/openssh/Manifest2
-rw-r--r--net-misc/openssh/openssh-7.1_p1-r2.ebuild10
2 files changed, 7 insertions, 5 deletions
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 6f9414de..139ab112 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -31,4 +31,4 @@ DIST openssh-7.1p1.tar.gz 1493170 SHA256 fc0a6d2d1d063d5c66dffd952493d0cda256cad
DIST openssh-lpk-6.8p1-0.3.14.patch.xz 16940 SHA256 d5f048dc7e9d3fca085c152fc31306f1d8fa793e524c538295915b075ec085b0 SHA512 2470b6b46f8c7ac985f82d14b788a3eb81a468a1d5013cb7f89257d9dd78b6037e24bf54ac57b757db8ed1df24332d659cf918c11ea73592fd24a69c25a54081 WHIRLPOOL b041ee9e0efdf370686f11df4131ab5e5ffb2f11cc66c386a8223bf563c5b78ab9443f06e4adc2e506e440cdec9dc5b20f5972cd8d691d786d2f903bb49b947b
EBUILD openssh-6.6_p1-r1.ebuild 9904 SHA256 7cf5ad6aa05c239df6d18dafb3a2f8467190c7f592f458d0afd6c884f5eff24d SHA512 7f9028a2ee883c571c0b1b8aad7e869888bf0adcc690ff922204bdb1dee25c19b78b2ae61e0ca07ab3b8e91093fa9a6c03338293ee04647768574c39d0dde621 WHIRLPOOL 77d18b1602963b7044b7f504bb498b6c38c7d8bb6dbb65d04d025f079ffc9c61a41706d01d2902e1c4151aa70cc3d47091fbb4f7204ef42ff73192c3508c5790
EBUILD openssh-6.9_p1-r2.ebuild 10513 SHA256 4e9ca0a1ea7dbed3185450ee4ab15318b03a6b12e7bce1c152e5413c37a780c1 SHA512 3f611a10e7853dcc3a3a0e2d922f6be8f693a6823f457fecf031e7f5c16e74ce3e3a5ce8ae1cd3d02acb338376830123505dc1b9bc5d12ed4bee4faa456983fd WHIRLPOOL ed9335e67ecd188b082c86ea5c6438a4d2038ace2f423d46ab7b82161deab4f1c05b45d8c960e01ec3b42b8fbf1ce3ce3487f83a96f0a9297a1779bf23cd9fc4
-EBUILD openssh-7.1_p1-r2.ebuild 11349 SHA256 4c2dc298af4c44d4631de39f9c5ca4b3fef7125ee0d44b40b7e7eeb0b658ff25 SHA512 c5d4bd70bbbfda437f98e83b9c4b3ef014d11e0d73910a5f0673bb629ffc61719dc4f3a982df0e46466abab6b99d2d64dfc5d5c863e0894ac7393ce686798f24 WHIRLPOOL 2f52e00da7c312f03f1978c14252eb4ec5fbf684bde99bbffa24953836676b4e32cd8921a5df21b553507ee6f2ae03345f0913adc402ae6b7ed1f1a7be9e9f9d
+EBUILD openssh-7.1_p1-r2.ebuild 11377 SHA256 a87cfdb70f33bcc82167fdda5204378f949c935b01473d2889011e5422c3ce28 SHA512 ff43a853ea10b096240e6c70dd6a95e865ca0f7e7131f14b19accbb794b56c7b807df80ffbdf4e2f36e259c34994322f9393390473f5b1ee96782eb2d01059df WHIRLPOOL 132bb75d8d845936b4dbbd0c34ec3317ab4fec72dd0c0ed896a01bae93505ea8b069dfe9b557774ca105c1958df27b9bd4f6fcf616937790d9596f05490ec2bb
diff --git a/net-misc/openssh/openssh-7.1_p1-r2.ebuild b/net-misc/openssh/openssh-7.1_p1-r2.ebuild
index 47d8355c..02e4d1c4 100644
--- a/net-misc/openssh/openssh-7.1_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-7.1_p1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id: 584f3848d12d45e24bc4960aa7e977138e330ba4 $
+# $Id: 40ee3c8aa5efdc3d0ce3f58700f84b1fecc5c016 $
EAPI="4"
inherit eutils user flag-o-matic multilib autotools pam systemd versionator
@@ -120,9 +120,11 @@ src_prepare() {
fi
if use X509 ; then
pushd .. >/dev/null
- pushd ${HPN_PATCH%.*.*} >/dev/null
- epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch
- popd >/dev/null
+ if use hpn ; then
+ pushd ${HPN_PATCH%.*.*} >/dev/null
+ epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch
+ popd >/dev/null
+ fi
epatch "${FILESDIR}"/${PN}-7.0_p1-sctp-x509-glue.patch
popd >/dev/null
epatch "${WORKDIR}"/${X509_PATCH%.*}