1 |
commit: 8de9de744087af9ec0f7582225d39526831302b8 |
2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
3 |
AuthorDate: Tue Feb 18 22:33:26 2020 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 18 22:33:26 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8de9de74 |
7 |
|
8 |
net-misc/openssh-8.2_p1-r2: revbump, update X509 patch to 12.4.1 |
9 |
|
10 |
Copyright: Sony Interactive Entertainment Inc. |
11 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
12 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
13 |
|
14 |
net-misc/openssh/Manifest | 2 +- |
15 |
...atch => openssh-8.2_p1-X509-12.4.1-tests.patch} | 0 |
16 |
...patch => openssh-8.2_p1-X509-glue-12.4.1.patch} | 41 ++++++---------------- |
17 |
...h-8.2_p1-r1.ebuild => openssh-8.2_p1-r2.ebuild} | 4 +-- |
18 |
4 files changed, 13 insertions(+), 34 deletions(-) |
19 |
|
20 |
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest |
21 |
index 3dae8b09853..13c4511b28e 100644 |
22 |
--- a/net-misc/openssh/Manifest |
23 |
+++ b/net-misc/openssh/Manifest |
24 |
@@ -20,7 +20,7 @@ DIST openssh-8.1_p1-glibc-2.31-patches.tar.xz 1752 BLAKE2B ccab53069c0058be7ba78 |
25 |
DIST openssh-8.1p1+x509-12.3.diff.gz 689934 BLAKE2B 57a302a25bec1d630b9c36f74ab490e11c97f9bcbaf8f527e46ae7fd5bade19feb3d8853079870b5c08b70a55e289cf4bf7981c11983973fa588841aeb21e650 SHA512 8d7c321423940f5a78a51a25ad5373f5db17a4a8ca7e85041e503998e0823ad22068bc652e907e9f5787858d45ce438a4bba18240fa72e088eb10b903e96b192 |
26 |
DIST openssh-8.1p1-sctp-1.2.patch.xz 7672 BLAKE2B f1aa0713fcb114d8774bd8d524d106401a9d7c2c73a05fbde200ccbdd2562b3636ddd2d0bc3eae9f04b4d7c729c3dafd814ae8c530a76c4a0190fae71d1edcd2 SHA512 2bffab0bbae5a4c1875e0cc229bfd83d8565bd831309158cd489d8b877556c69b936243888a181bd9ff302e19f2c174156781574294d260b6384c464d003d566 |
27 |
DIST openssh-8.1p1.tar.gz 1625894 BLAKE2B d525be921a6f49420a58df5ac434d43a0c85e0f6bf8428ecebf04117c50f473185933e6e4485e506ac614f71887a513b9962d7b47969ba785da8e3a38f767322 SHA512 b987ea4ffd4ab0c94110723860273b06ed8ffb4d21cbd99ca144a4722dc55f4bf86f6253d500386b6bee7af50f066e2aa2dd095d50746509a10e11221d39d925 |
28 |
-DIST openssh-8.2p1+x509-12.4.diff.gz 802630 BLAKE2B 1d4c30aa6fb2b90c3213a04adef8fc99b28796e72b067d308d5947a6f697ca2abead2a4658356e01347efaf9eb5100aeb054b56b04d55dd716d3793fad69010e SHA512 0314496ed7466efb90f18143b70d676fbb7990fd9ec6685992f36a031b47c638597ed3773ec3c121d416cbbf8ba2d3d2e8cb9c703bfc77a82ba5aa5c3bdde0de |
29 |
+DIST openssh-8.2p1+x509-12.4.1.diff.gz 802693 BLAKE2B f4c6b4f0922dda02b726c43c530adb36f884aef03d52c49e7e16d01bc2adae53c1d233c5bb4ae4e434ee982508e256bee826242c0b79a368502e4988155eccb9 SHA512 cf0062dd34a034febb7a0e7863527b09b85e94df58bc1370421dbf338a727867810284b85bdcdaf5863a3eadac33fd9927f8e32e70e013ef1c23ca5653e39837 |
30 |
DIST openssh-8.2p1-sctp-1.2.patch.xz 7668 BLAKE2B 717487cffd235a5dfa2d9d3f2c1983f410d400b0d23f71a9b74406ac3d2f448d76381a3b7a3244942bff4e6bdc3bc78d148b9949c78dc297d99c7330179f8176 SHA512 a5fbd827e62e91b762062a29c7bc3bf569a202bdc8c91da7d77566ff8bb958b5b9fb6f8d45df586e0d7ac07a83de6e82996e9c5cdd6b3bf43336c420d3099305 |
31 |
DIST openssh-8.2p1.tar.gz 1701197 BLAKE2B 8b95cdebc87e8d14f655ed13c12b91b122adf47161071aa81d0763f81b12fe4bc3d409c260783d995307d4e4ed2d16080fd74b15e4dc6dcc5648d7e66720c3ed SHA512 c4db64e52a3a4c410de9de49f9cb104dd493b10250af3599b92457dd986277b3fd99a6f51cec94892fd1be5bd0369c5757262ea7805f0de464b245c3d34c120a |
32 |
DIST openssh-8_1_P1-hpn-AES-CTR-14.20.diff 29935 BLAKE2B 79101c43601e41306c957481c0680a63357d93bededdf12a32229d50acd9c1f46a386cbb91282e9e7d7bb26a9f276f5a675fd2de7662b7cbd073322b172d3bca SHA512 94f011b7e654630e968a378375aa54fa1fde087b4426d0f2225813262e6667a1073814d6a83e9005f97b371c536e462e614bfe726b092ffed8229791592ca221 |
33 |
|
34 |
diff --git a/net-misc/openssh/files/openssh-8.2_p1-X509-12.4-tests.patch b/net-misc/openssh/files/openssh-8.2_p1-X509-12.4.1-tests.patch |
35 |
similarity index 100% |
36 |
rename from net-misc/openssh/files/openssh-8.2_p1-X509-12.4-tests.patch |
37 |
rename to net-misc/openssh/files/openssh-8.2_p1-X509-12.4.1-tests.patch |
38 |
|
39 |
diff --git a/net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.patch b/net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.1.patch |
40 |
similarity index 77% |
41 |
rename from net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.patch |
42 |
rename to net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.1.patch |
43 |
index 6c9d80de9bc..4e948524167 100644 |
44 |
--- a/net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.patch |
45 |
+++ b/net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.1.patch |
46 |
@@ -1,6 +1,6 @@ |
47 |
-diff -ur --exclude '*.un~' a/openssh-8.2p1+x509-12.4.diff b/openssh-8.2p1+x509-12.4.diff |
48 |
---- a/openssh-8.2p1+x509-12.4.diff 2020-02-15 10:50:06.441041447 -0800 |
49 |
-+++ b/openssh-8.2p1+x509-12.4.diff 2020-02-15 10:52:52.241790237 -0800 |
50 |
+diff --exclude '*.un~' -ubr a/openssh-8.2p1+x509-12.4.1.diff b/openssh-8.2p1+x509-12.4.1.diff |
51 |
+--- a/openssh-8.2p1+x509-12.4.1.diff 2020-02-18 13:58:50.824902609 -0800 |
52 |
++++ b/openssh-8.2p1+x509-12.4.1.diff 2020-02-18 13:59:57.917485338 -0800 |
53 |
@@ -39197,16 +39197,15 @@ |
54 |
|
55 |
install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config |
56 |
@@ -65,24 +65,6 @@ diff -ur --exclude '*.un~' a/openssh-8.2p1+x509-12.4.diff b/openssh-8.2p1+x509-1 |
57 |
regress/unittests/sshkey/tests.o \ |
58 |
regress/unittests/sshkey/common.o \ |
59 |
regress/unittests/sshkey/test_file.o \ |
60 |
-@@ -39285,7 +39284,7 @@ |
61 |
- |
62 |
- regress/unittests/sshkey/test_sshkey$(EXEEXT): ${UNITTESTS_TEST_SSHKEY_OBJS} \ |
63 |
- regress/unittests/test_helper/libtest_helper.a libssh.a |
64 |
--@@ -576,8 +579,7 @@ |
65 |
-+@@ -576,8 +578,7 @@ |
66 |
- |
67 |
- UNITTESTS_TEST_KEX_OBJS=\ |
68 |
- regress/unittests/kex/tests.o \ |
69 |
-@@ -39295,7 +39294,7 @@ |
70 |
- |
71 |
- regress/unittests/kex/test_kex$(EXEEXT): ${UNITTESTS_TEST_KEX_OBJS} \ |
72 |
- regress/unittests/test_helper/libtest_helper.a libssh.a |
73 |
--@@ -587,8 +589,7 @@ |
74 |
-+@@ -587,8 +588,7 @@ |
75 |
- |
76 |
- UNITTESTS_TEST_HOSTKEYS_OBJS=\ |
77 |
- regress/unittests/hostkeys/tests.o \ |
78 |
@@ -39305,7 +39304,7 @@ |
79 |
|
80 |
regress/unittests/hostkeys/test_hostkeys$(EXEEXT): \ |
81 |
@@ -128,23 +110,20 @@ diff -ur --exclude '*.un~' a/openssh-8.2p1+x509-12.4.diff b/openssh-8.2p1+x509-1 |
82 |
sh buildpkg.sh; \ |
83 |
fi |
84 |
|
85 |
-@@ -97723,19 +97722,6 @@ |
86 |
+@@ -97729,16 +97728,6 @@ |
87 |
+ return mbtowc(NULL, s, n); |
88 |
+} |
89 |
+#endif |
90 |
--diff -ruN openssh-8.2p1/version.h openssh-8.2p1+x509-12.4/version.h |
91 |
+-diff -ruN openssh-8.2p1/version.h openssh-8.2p1+x509-12.4.1/version.h |
92 |
---- openssh-8.2p1/version.h 2020-02-14 02:40:54.000000000 +0200 |
93 |
--+++ openssh-8.2p1+x509-12.4/version.h 2020-02-15 09:07:00.000000000 +0200 |
94 |
--@@ -1,6 +1,5 @@ |
95 |
---/* $OpenBSD: version.h,v 1.86 2020/02/14 00:39:20 djm Exp $ */ |
96 |
--+/* $OpenBSD: version.h,v 1.85 2019/10/09 00:04:57 djm Exp $ */ |
97 |
+-+++ openssh-8.2p1+x509-12.4.1/version.h 2020-02-17 19:07:00.000000000 +0200 |
98 |
+-@@ -2,5 +2,4 @@ |
99 |
- |
100 |
---#define SSH_VERSION "OpenSSH_8.2" |
101 |
--+#define SSH_VERSION "OpenSSH_8.1" |
102 |
+- #define SSH_VERSION "OpenSSH_8.2" |
103 |
- |
104 |
--#define SSH_PORTABLE "p1" |
105 |
--#define SSH_RELEASE SSH_VERSION SSH_PORTABLE |
106 |
-+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" |
107 |
- diff -ruN openssh-8.2p1/version.m4 openssh-8.2p1+x509-12.4/version.m4 |
108 |
+ diff -ruN openssh-8.2p1/version.m4 openssh-8.2p1+x509-12.4.1/version.m4 |
109 |
--- openssh-8.2p1/version.m4 1970-01-01 02:00:00.000000000 +0200 |
110 |
- +++ openssh-8.2p1+x509-12.4/version.m4 2020-02-15 09:07:00.000000000 +0200 |
111 |
+ +++ openssh-8.2p1+x509-12.4.1/version.m4 2020-02-17 19:07:00.000000000 +0200 |
112 |
|
113 |
diff --git a/net-misc/openssh/openssh-8.2_p1-r1.ebuild b/net-misc/openssh/openssh-8.2_p1-r2.ebuild |
114 |
similarity index 99% |
115 |
rename from net-misc/openssh/openssh-8.2_p1-r1.ebuild |
116 |
rename to net-misc/openssh/openssh-8.2_p1-r2.ebuild |
117 |
index 23a61c4f6d0..4bacf472252 100644 |
118 |
--- a/net-misc/openssh/openssh-8.2_p1-r1.ebuild |
119 |
+++ b/net-misc/openssh/openssh-8.2_p1-r2.ebuild |
120 |
@@ -18,7 +18,7 @@ HPN_PATCHES=( |
121 |
) |
122 |
|
123 |
SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz" |
124 |
-X509_VER="12.4" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" |
125 |
+X509_VER="12.4.1" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" |
126 |
|
127 |
DESCRIPTION="Port of OpenBSD's free SSH release" |
128 |
HOMEPAGE="https://www.openssh.com/" |
129 |
@@ -143,7 +143,7 @@ src_prepare() { |
130 |
popd &>/dev/null || die |
131 |
|
132 |
eapply "${WORKDIR}"/${X509_PATCH%.*} |
133 |
- eapply "${FILESDIR}"/${P}-X509-$(ver_cut 1-2 ${X509_VER})-tests.patch |
134 |
+ eapply "${FILESDIR}"/${P}-X509-${X509_VER}-tests.patch |
135 |
|
136 |
# We need to patch package version or any X.509 sshd will reject our ssh client |
137 |
# with "userauth_pubkey: could not parse key: string is too large [preauth]" |