Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/files/
Date: Fri, 24 Dec 2021 13:29:31
Message-Id: 1640352547.d7606e5ba83aa4850811f60aeb449e62a2b6a2f1.conikost@gentoo
1 commit: d7606e5ba83aa4850811f60aeb449e62a2b6a2f1
2 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 24 13:27:01 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 24 13:29:07 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7606e5b
7
8 net-misc/openssh: re-add openssh-8.5_p1-hpn-15.2-sctp-glue.patch
9
10 In commit cb24554516cbb10be9b7c75328b46a620b83be75, the still used patch
11 openssh-8.5_p1-hpn-15.2-sctp-glue.patch got accidentally removed.
12 Restoring again.
13
14 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
15
16 .../files/openssh-8.5_p1-hpn-15.2-sctp-glue.patch | 18 ++++++++++++++++++
17 1 file changed, 18 insertions(+)
18
19 diff --git a/net-misc/openssh/files/openssh-8.5_p1-hpn-15.2-sctp-glue.patch b/net-misc/openssh/files/openssh-8.5_p1-hpn-15.2-sctp-glue.patch
20 new file mode 100644
21 index 000000000000..7199227589c6
22 --- /dev/null
23 +++ b/net-misc/openssh/files/openssh-8.5_p1-hpn-15.2-sctp-glue.patch
24 @@ -0,0 +1,18 @@
25 +diff -u a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff
26 +--- a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2021-03-16 10:06:45.020527770 -0700
27 ++++ b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2021-03-16 10:07:01.294423665 -0700
28 +@@ -1414,14 +1414,3 @@
29 + # Example of overriding settings on a per-user basis
30 + #Match User anoncvs
31 + # X11Forwarding no
32 +-diff --git a/version.h b/version.h
33 +-index 6b4fa372..332fb486 100644
34 +---- a/version.h
35 +-+++ b/version.h
36 +-@@ -3,4 +3,5 @@
37 +- #define SSH_VERSION "OpenSSH_8.5"
38 +-
39 +- #define SSH_PORTABLE "p1"
40 +--#define SSH_RELEASE SSH_VERSION SSH_PORTABLE
41 +-+#define SSH_HPN "-hpn15v2"
42 +-+#define SSH_RELEASE SSH_VERSION SSH_PORTABLE SSH_HPN