| 1 |
commit: a3ddee3a0c95e932481d494930a05f6f34938c1e |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 17 14:29:28 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 17 14:32:33 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3ddee3a |
| 7 |
|
| 8 |
net-misc/openssh: depend on >=sys-kernel/linux-headers-5.1 |
| 9 |
|
| 10 |
In >=sys-libs/glibc-2.31 we are already forcing an upgrade of net-misc/openssh. |
| 11 |
However, sandbox code in OpenSSH [Link 1] is guarded by "#ifdef" so an upgrade |
| 12 |
of OpenSSH before glibc upgrade won't fix the problem if system is using old |
| 13 |
linux-headers without __NR_clock_nanosleep{,_time64}. |
| 14 |
|
| 15 |
Forcing >=linux-headers-5.1 will ensure that OpenSSH's sandbox supports |
| 16 |
__NR_clock_nanosleep{,_time64} and will therefore work with >=glibc-2.31. |
| 17 |
|
| 18 |
Link 1: https://github.com/openssh/openssh-portable/blob/V_8_3/sandbox-seccomp-filter.c#L252-L257 |
| 19 |
Bug: https://bugs.gentoo.org/708224 |
| 20 |
Closes: https://bugs.gentoo.org/737604 |
| 21 |
Package-Manager: Portage-3.0.2, Repoman-2.3.23 |
| 22 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 23 |
|
| 24 |
.../openssh/{openssh-8.1_p1-r3.ebuild => openssh-8.1_p1-r4.ebuild} | 3 ++- |
| 25 |
.../openssh/{openssh-8.2_p1-r6.ebuild => openssh-8.2_p1-r7.ebuild} | 3 ++- |
| 26 |
.../openssh/{openssh-8.3_p1-r4.ebuild => openssh-8.3_p1-r5.ebuild} | 3 ++- |
| 27 |
3 files changed, 6 insertions(+), 3 deletions(-) |
| 28 |
|
| 29 |
diff --git a/net-misc/openssh/openssh-8.1_p1-r3.ebuild b/net-misc/openssh/openssh-8.1_p1-r4.ebuild |
| 30 |
similarity index 99% |
| 31 |
rename from net-misc/openssh/openssh-8.1_p1-r3.ebuild |
| 32 |
rename to net-misc/openssh/openssh-8.1_p1-r4.ebuild |
| 33 |
index 75b805da4dd..53ccdd567a2 100644 |
| 34 |
--- a/net-misc/openssh/openssh-8.1_p1-r3.ebuild |
| 35 |
+++ b/net-misc/openssh/openssh-8.1_p1-r4.ebuild |
| 36 |
@@ -82,8 +82,9 @@ RDEPEND=" |
| 37 |
kerberos? ( virtual/krb5 ) |
| 38 |
" |
| 39 |
DEPEND="${RDEPEND} |
| 40 |
- static? ( ${LIB_DEPEND} ) |
| 41 |
virtual/os-headers |
| 42 |
+ kernel_linux? ( >=sys-kernel/linux-headers-5.1 ) |
| 43 |
+ static? ( ${LIB_DEPEND} ) |
| 44 |
" |
| 45 |
RDEPEND="${RDEPEND} |
| 46 |
pam? ( >=sys-auth/pambase-20081028 ) |
| 47 |
|
| 48 |
diff --git a/net-misc/openssh/openssh-8.2_p1-r6.ebuild b/net-misc/openssh/openssh-8.2_p1-r7.ebuild |
| 49 |
similarity index 99% |
| 50 |
rename from net-misc/openssh/openssh-8.2_p1-r6.ebuild |
| 51 |
rename to net-misc/openssh/openssh-8.2_p1-r7.ebuild |
| 52 |
index c0ed8f5dec4..c8fff3ba950 100644 |
| 53 |
--- a/net-misc/openssh/openssh-8.2_p1-r6.ebuild |
| 54 |
+++ b/net-misc/openssh/openssh-8.2_p1-r7.ebuild |
| 55 |
@@ -81,8 +81,9 @@ RDEPEND=" |
| 56 |
kerberos? ( virtual/krb5 ) |
| 57 |
" |
| 58 |
DEPEND="${RDEPEND} |
| 59 |
- static? ( ${LIB_DEPEND} ) |
| 60 |
virtual/os-headers |
| 61 |
+ kernel_linux? ( >=sys-kernel/linux-headers-5.1 ) |
| 62 |
+ static? ( ${LIB_DEPEND} ) |
| 63 |
" |
| 64 |
RDEPEND="${RDEPEND} |
| 65 |
pam? ( >=sys-auth/pambase-20081028 ) |
| 66 |
|
| 67 |
diff --git a/net-misc/openssh/openssh-8.3_p1-r4.ebuild b/net-misc/openssh/openssh-8.3_p1-r5.ebuild |
| 68 |
similarity index 99% |
| 69 |
rename from net-misc/openssh/openssh-8.3_p1-r4.ebuild |
| 70 |
rename to net-misc/openssh/openssh-8.3_p1-r5.ebuild |
| 71 |
index 6e93d57cf89..86300b9d810 100644 |
| 72 |
--- a/net-misc/openssh/openssh-8.3_p1-r4.ebuild |
| 73 |
+++ b/net-misc/openssh/openssh-8.3_p1-r5.ebuild |
| 74 |
@@ -84,8 +84,9 @@ RDEPEND=" |
| 75 |
kerberos? ( virtual/krb5 ) |
| 76 |
" |
| 77 |
DEPEND="${RDEPEND} |
| 78 |
- static? ( ${LIB_DEPEND} ) |
| 79 |
virtual/os-headers |
| 80 |
+ kernel_linux? ( >=sys-kernel/linux-headers-5.1 ) |
| 81 |
+ static? ( ${LIB_DEPEND} ) |
| 82 |
" |
| 83 |
RDEPEND="${RDEPEND} |
| 84 |
pam? ( >=sys-auth/pambase-20081028 ) |
Archives