diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-01-23 00:54:01 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-01-23 00:54:01 +0000 |
| commit | defbebad0d311b0ce0694b17989a9f26cf000250 (patch) | |
| tree | f0f63116625e249bfa619945d1ec6460a4ccfe29 /net-misc/openssh | |
| parent | b1f98aa670604171034e19240220430da70a7282 (diff) | |
gentoo auto-resync : 23:01:2023 - 00:54:01
Diffstat (limited to 'net-misc/openssh')
| -rw-r--r-- | net-misc/openssh/Manifest | 2 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-9.1_p1-r3.ebuild | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index 5226a45ed7ec..1b065aac66bc 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -32,6 +32,6 @@ DIST openssh-9.1p1-sctp-1.2.patch.xz 6772 BLAKE2B 8393c1ca5f0df7e4d490cef5c38d50 DIST openssh-9.1p1.tar.gz 1838747 BLAKE2B 287b6b1cc4858b27af88f4a4674670afff1fb5b99461892083393c53ef3747c5a0fcd90cba95d2c27465a919e00f7f42732c93af4f306665ba0393bbb7a534f5 SHA512 a1f02c407f6b621b1d0817d1a0c9a6839b67e416c84f3b76c63003b119035b24c19a1564b22691d1152e1d2d55f4dc7eb1af2d2318751e431a99c4efa77edc70 DIST openssh-9.1p1.tar.gz.asc 833 BLAKE2B 83efe3c705f6a02c25a9fc9bac2a4efd77470598d9e0fcb86dff2d265c58cffec1afecad3621769b2bd78ac25884f0ee20ae9b311e895db93e3bb552dffd6e74 SHA512 47dc7295f9694250bcbb86d7ca0830a47da4f3df7795bb05ebaf1590284ccce5317022c536bea1b09bd2fa4d8013295cc0de287ebe3f9dc605582077e9f11ddd EBUILD openssh-9.1_p1-r2.ebuild 17832 BLAKE2B 6d37ea764a10d477ecffacbaa263c032024433e11db68474db8613299072e9e4c3d511dbc49becd33a505f8ccee47d08cd01933cd6387f26cd529cecfa148988 SHA512 b82326fd6527132601e401c294d85dc9f728025867ed329c2b7b2a2ddbce9e7935caca29e5e8b1e3c45fe6bc65287e166d2af209f63bf58cee33187a5e2a787e -EBUILD openssh-9.1_p1-r3.ebuild 18290 BLAKE2B 518b7adb0a2077640ff83ff44c61ef709bd071d3f74ebd423e91abf427784badc6c5c73a0426d9406b94b9b8fd55f6fe13110a808145b1e3b49eb2c892bcb267 SHA512 0250e5d7ffb55a90f1909bc060ac9b3d0928d3c2ae3a155f3fc44819ec078928170d2de1460940506834938ad5fd6ad02bddd9e2db6832d4a59cd3c6599912aa +EBUILD openssh-9.1_p1-r3.ebuild 18564 BLAKE2B 3283cb5bbd255c608b400fa3cffd10d7c5fe763def180e0d3e070f71ddb6842aa61317efa7673349a68aa2edf567d26d231e2c474668f0e6998b62a01b52eaa2 SHA512 6ab43000b6b89e7e06f7919104aa0965afbeb04cfc84071192141883d181e875ab0d951614f5e14e3baf6e8798338847aab10c421cd671eabd3618355eb779bd EBUILD openssh-9.1_p1.ebuild 17810 BLAKE2B 302fca36aa0f354186744a3220f430e61c3f2ca1f3dda7de7c98f47e6a476715aee1a023451f27cfb1bb07ee50ec1bbc28a05e8f70c2937d391519b9a8423725 SHA512 871fc233d0532c5b84a171a46e3a9ccd5888833145413547e5d8c7bfc0a761280446c61440103dd132e2bd2f73cb6f35c0f90ae41a4975e3d9c2fd506ba0de29 MISC metadata.xml 1957 BLAKE2B f5921abe3735fc6b8f8c6e88f3c3c11201c32ac91f7426150a51619b430f8c15c2afb0a9dcb9b3b5099fe7e5f193a05514064029392df6d0815a7fb67c2b96cf SHA512 6189845b640943147020d4a0fe04be66f58433809edded6fe98824b51c704faef9c3fc4c0d7a604391afcfcee62c0a47e25d36024b9145c4f1e332fe27db7f0a diff --git a/net-misc/openssh/openssh-9.1_p1-r3.ebuild b/net-misc/openssh/openssh-9.1_p1-r3.ebuild index dbbb727af2ea..a11418a8dea0 100644 --- a/net-misc/openssh/openssh-9.1_p1-r3.ebuild +++ b/net-misc/openssh/openssh-9.1_p1-r3.ebuild @@ -126,7 +126,7 @@ PATCHES=( "${FILESDIR}/${PN}-8.9_p1-allow-ppoll_time64.patch" #834019 "${FILESDIR}/${PN}-8.9_p1-gss-use-HOST_NAME_MAX.patch" #834044 "${FILESDIR}/${PN}-9.1_p1-build-tests.patch" - "${DISTDIR}"/${PN}-9.1_p1-getentropy.patch # https://bugzilla.mindrot.org/show_bug.cgi?id=3487 + #"${DISTDIR}"/${PN}-9.1_p1-getentropy.patch # https://bugzilla.mindrot.org/show_bug.cgi?id=3487 # Conditionally applied below "${DISTDIR}"/${PN}-9.1_p1-sandbox-writev.patch # https://bugzilla.mindrot.org/show_bug.cgi?id=3512 ) @@ -168,6 +168,11 @@ src_prepare() { # don't break .ssh/authorized_keys2 for fun sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die + # openssh-9.1_p1: X509 patch includes a different fix for the getentropy bug + # will need removal in 9.2, because x509 will have to normalize onto + # upstream openssh fix. + use X509 || PATCHES+=( "${DISTDIR}/${PN}-9.1_p1-getentropy.patch" ) + eapply "${PATCHES[@]}" [[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches |