diff options
| author |   Patrick McLean <chutzpah@gentoo.org> | 2015-08-24 14:26:32 -0700 |
|---|---|---|
| committer | Patrick McLean <chutzpah@gentoo.org> | 2015-08-24 14:26:32 -0700 |
| commit | 86968deefadc66ea0572e6c0e346384f4e1e639e (patch) | |
| tree | cd28460044aabfa7d6fa199ef5d7d73f9b707b04 /net-misc | |
| parent | dev-vcs/blogc-git-receiver: version bump (diff) | |
| download | gentoo-86968deefadc66ea0572e6c0e346384f4e1e639e.tar.gz gentoo-86968deefadc66ea0572e6c0e346384f4e1e639e.tar.bz2 gentoo-86968deefadc66ea0572e6c0e346384f4e1e639e.zip | |
net-misc/openssh: Re-enable the X509 USE flag for version 7.1p1
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/openssh/Manifest | 1 | ||||
| -rw-r--r-- | net-misc/openssh/files/openssh-7.1_p1-hpn-x509-glue.patch | 11 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-7.1_p1.ebuild | 4 |
3 files changed, 14 insertions, 2 deletions
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index 09457f685a7f..461d5c1b4763 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -14,6 +14,7 @@ DIST openssh-6.9p1.tar.gz 1487617 SHA256 6e074df538f357d440be6cf93dc581a21f22d39 DIST openssh-7.0p1+x509-8.5.diff.gz 411960 SHA256 6000557f1ddae06aff8837d440d93342a923fada571fec59fc5dedf388fb5f9e SHA512 1241419ea32a21b0ef15fb3845344c9b1126ecee94265b074e60af794eacdb39a98983040a61b9f169e0a6d5a0a248e1bbf9d9b3e56df50cb382441a26dddafd WHIRLPOOL 117e8c9bb05ded7fdf261e9aca709540e0a3817bc5b3e70472e8c802063e37ee24feae4c1b3a909177ab163e53c2d614b4f0fc75aad1ca44c0e0584eeff55a81 DIST openssh-7.0p1-hpnssh14v5.tar.xz 21428 SHA256 6032c4547c9f83a6f648ac7c39cdad2bd6fd725e5f3ab2411c5b30298aae1451 SHA512 d4cf4a628c11515bfe8c3a91b4b7039fca28c2f89ad1dde062c4cb433b984b10dec2d37b1f338f18aa7813e60d8608b65ca95b930edc33086710b82780875942 WHIRLPOOL 7b686f243c98017453b3da3e98b7524650b4a0a75fda6add80c7c233d468194d1d1333ffa4445c20856d807548aaa356c87a03ca87d8995a4b7ba350c7714d1e DIST openssh-7.0p1.tar.gz 1493376 SHA256 fd5932493a19f4c81153d812ee4e042b49bbd3b759ab3d9344abecc2bc1485e5 SHA512 d82aa8e85630c3e2102e69da477185e0d30d84211d7d4ee0a1d9822bd234d649fe369bf91ce3d2b5ef0caee687d383cb761b682d3bf24bccbd2ce9a1fe9d9f50 WHIRLPOOL bb8007450ffee580df5a73e3d6ab9b54b7151c46c3b996516e5cb776034be21cbef1281a520279655137e218a757d8092cba3f66e216c6b4c6828876540cb5df +DIST openssh-7.1p1+x509-8.6.diff.gz 413931 SHA256 cbf661a1fec080dc9ed335a290414154326c2a13f124985db050b86a91073d52 SHA512 c91d0f1b69b6d34984e94b391ad022271e73d0634cef2df355ba555366bc38d30649b478f245b6c51ce79d71adf1b693bc97826e6c6013a78e7ccfb7023b4bcc WHIRLPOOL 4ed4427e80026996c43a188d7d45f2c53fa6a7fd842a248b1225b27f3e9037e761f0ed172d79b53ada81c24d958a2193e94d918f6ca1320e45d5e68379845981 DIST openssh-7.1p1.tar.gz 1493170 SHA256 fc0a6d2d1d063d5c66dffd952493d0cda256cad204f681de0f84ef85b2ad8428 SHA512 f1491ca5a0a733eb27ede966590642a412cb7be7178dcb7b9e5844bbdc8383032f4b00435192b95fc0365b6fe74d6c5ac8d6facbe9d51e1532d049e2f784e8f7 WHIRLPOOL a650a93657f930d20dc3fa24ab720857f63f7cd0a82d1906cf1e58145e866129207851d5e587d678655e5731fa73221ab9b6ea0754533100c25fe2acaa442e05 DIST openssh-lpk-6.7p1-0.3.14.patch.xz 16920 SHA256 0203e6e44e41d58ec46d1611d7efc985134e662bbee51632c29f43ae809003f0 SHA512 344ccde4a04aeb1500400f779e64b2d8a5ad2970de3c4c343ca9605758e22d3812ef5453cd3221b18ad74a9762583c62417879107e4e1dda1398a6a65bcd04b2 WHIRLPOOL 5b6beeb743d04deea70c8b471a328b5f056fd4651e1370c7882e5d12f54fa2170486dcd6f97aa8c58e80af9a2d4012e2dfbcf53185317976d309783ca8d6cf73 DIST openssh-lpk-6.8p1-0.3.14.patch.xz 16940 SHA256 d5f048dc7e9d3fca085c152fc31306f1d8fa793e524c538295915b075ec085b0 SHA512 2470b6b46f8c7ac985f82d14b788a3eb81a468a1d5013cb7f89257d9dd78b6037e24bf54ac57b757db8ed1df24332d659cf918c11ea73592fd24a69c25a54081 WHIRLPOOL b041ee9e0efdf370686f11df4131ab5e5ffb2f11cc66c386a8223bf563c5b78ab9443f06e4adc2e506e440cdec9dc5b20f5972cd8d691d786d2f903bb49b947b diff --git a/net-misc/openssh/files/openssh-7.1_p1-hpn-x509-glue.patch b/net-misc/openssh/files/openssh-7.1_p1-hpn-x509-glue.patch new file mode 100644 index 000000000000..393ea998cabf --- /dev/null +++ b/net-misc/openssh/files/openssh-7.1_p1-hpn-x509-glue.patch @@ -0,0 +1,11 @@ +--- openssh-7.0p1-hpnssh14v5/0002-add-support-for-the-NONE-cipher.patch.orig 2015-08-24 11:17:05.379280954 -0700 ++++ openssh-7.0p1-hpnssh14v5/0002-add-support-for-the-NONE-cipher.patch 2015-08-24 11:19:30.788424050 -0700 +@@ -80,7 +80,7 @@ + + else + + fatal("Pre-authentication none cipher requests are not allowed."); + + } +- debug("kex: %s %s %s %s", ++ debug("kex: %s cipher: %s MAC: %s compression: %s", + ctos ? "client->server" : "server->client", + newkeys->enc.name, + diff --git a/myproposal.h b/myproposal.h diff --git a/net-misc/openssh/openssh-7.1_p1.ebuild b/net-misc/openssh/openssh-7.1_p1.ebuild index 820541a741f9..709e6f97c8ae 100644 --- a/net-misc/openssh/openssh-7.1_p1.ebuild +++ b/net-misc/openssh/openssh-7.1_p1.ebuild @@ -11,7 +11,7 @@ PARCH=${P/_} HPN_PATCH="${PN}-7.0p1-hpnssh14v5.tar.xz" LDAP_PATCH="${PN}-lpk-6.8p1-0.3.14.patch.xz" -#X509_VER="8.5" X509_PATCH="${PN}-${PV//_/}+x509-${X509_VER}.diff.gz" +X509_VER="8.6" X509_PATCH="${PN}-${PV//_/}+x509-${X509_VER}.diff.gz" DESCRIPTION="Port of OpenBSD's free SSH release" HOMEPAGE="http://www.openssh.org/" @@ -113,7 +113,7 @@ src_prepare() { if use X509 ; then pushd .. >/dev/null - #epatch "${WORKDIR}"/${PN}-6.8_p1-x509-${X509_VER}-glue.patch + epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch epatch "${FILESDIR}"/${PN}-7.0_p1-sctp-x509-glue.patch popd >/dev/null epatch "${WORKDIR}"/${X509_PATCH%.*} |