1 |
commit: d5e9f384abfbd15bc04b80033274cecc9eb0b7f4 |
2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 9 00:02:10 2021 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 9 00:02:13 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5e9f384 |
7 |
|
8 |
net-misc/openssh-8.7_p1-r2: Revbump, bump the X509 patch |
9 |
|
10 |
Package-Manager: Portage-3.0.22, Repoman-3.0.3 |
11 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
12 |
|
13 |
net-misc/openssh/Manifest | 2 +- |
14 |
.../files/openssh-8.7_p1-X509-glue-13.2.1.patch | 45 +++++++++++++ |
15 |
.../files/openssh-8.7_p1-X509-glue-13.2.patch | 73 ---------------------- |
16 |
...h-8.7_p1-r1.ebuild => openssh-8.7_p1-r2.ebuild} | 2 +- |
17 |
4 files changed, 47 insertions(+), 75 deletions(-) |
18 |
|
19 |
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest |
20 |
index ba9efbc35e8..48110ee70d6 100644 |
21 |
--- a/net-misc/openssh/Manifest |
22 |
+++ b/net-misc/openssh/Manifest |
23 |
@@ -4,7 +4,7 @@ DIST openssh-8.5p1.tar.gz 1779733 BLAKE2B f4e4bd39e2dd275d4811e06ca994f2239ad27c |
24 |
DIST openssh-8.6p1+x509-13.1.diff.gz 1011666 BLAKE2B 0ac0cf2ff962b8ef677c49de0bb586f375f14d8964e077c10f6a88ec15734807940ab6c0277e44ebdfde0e50c2c80103cff614a6cde4d66e9986152032eeaa90 SHA512 ae4986dd079678c7b0cfd805136ff7ac940d1049fdddeb5a7c4ea2141bfcca70463b951485fb2b113bc930f519b1b41562900ced0269f5673dbdad867f464251 |
25 |
DIST openssh-8.6p1-sctp-1.2.patch.xz 7696 BLAKE2B 37f9e943a1881af05d9cf2234433711dc45ca30c60af4c0ea38a1d361df02abb491fa114f3698285f582b40b838414c1a048c4f09aa4f7ae9499adb09201d2ac SHA512 ba8c4d38a3d90854e79dc18918fffde246d7609a3f1c3a35e06c0fbe33d3688ed29b0ec33556ae37d1654e1dc2133d892613ad8d1ecbdce9aaa5b9eb10dcbb7a |
26 |
DIST openssh-8.6p1.tar.gz 1786328 BLAKE2B 261a0f1a6235275894d487cce37537755c86835e3a34871462fe29bfe72b49cd9a6b6a547aea4bd554f0957e110c84458cc75a5f2560717fb04804d62228562a SHA512 9854eda0b773c64c9f1f74844ce466b2b42ee8845f58ad062b73141d617af944fa4ebafdf72069f400106d2c2bd0a69c92fe805ec1fc26d4f0faadf06c3fbbe6 |
27 |
-DIST openssh-8.7p1+x509-13.2.diff.gz 1068695 BLAKE2B e542e5444f8360e0e28288d6a58d66995ff90e9f6bb1490b04a205162036e371a20d612655ca1bd479b8a04d5ccbfd9b7189b090d50ccbb019848e28571b036b SHA512 342e1ee050258c99f8f206664ef756e1be2c82e5faa5f966b80385aa2c6c601974681459ddba32c1ca5c33eda530af681e753471706c71902c1045a2913cd540 |
28 |
+DIST openssh-8.7p1+x509-13.2.1.diff.gz 1073420 BLAKE2B f9de9f797f1ec83cd56a983f5b9694b0297a60e586898a8c94b4aaa60e5f561bb3b7730590fc8f898c3de2340780d6a77d31bfcc50df0a55a0480051f37806fd SHA512 dd7afd351ddf33e8e74bceba56e5593a0546360efb34f3b954e1816751b5678da5d1bc3a9f2eaa4a745d86d96ae9b643bd549d39b59b22c8cf1a219b076c1db5 |
29 |
DIST openssh-8.7p1-sctp-1.2.patch.xz 6740 BLAKE2B 468a455018ffddf4fa64d63acb732ad3e1fb722ae8b24d06cf3a683167a4580626b477bbc286f296c83d39dd36c101ac58597a21daa63de83ad55af00aa3a6be SHA512 aa9067c9025b6e4edfad5e45ec92da43db14edb11aae02cbbc296e66b48377cbbf62cdafcdd5edfd1fd4bf69420ee017223ab52e50a42b1976002d767984777c |
30 |
DIST openssh-8.7p1.tar.gz 1814595 BLAKE2B 9fdb8898485053d08c9eca419c15d0d03b7a60152cf6a9d7f1beed3a21c9e6ac3bd9f854580e6e474fb0c871f3d4be9ef4b49bee8c355d9e5769a5505f4e6ea9 SHA512 08c81024d9e1248abfda6cc874886ff5ae916669b93cd6aff640e0614ee8cbcbc3fe87a9ce47136b6443ddbb1168b114367c74e117551905994e1a7e3fa2c0c2 |
31 |
DIST openssh-8_5_P1-hpn-AES-CTR-15.2.diff 30096 BLAKE2B f0c020dd2403806c79d4c37a019996d275655b04997301e247f5c4dd7fad35d12b3b7c25afb1b078d915ef2a4ae02f736f0aec9ba2a8c56a405d7ca303bcadf7 SHA512 4c2dbf99a9b5953fdb955f700272bbaeaa025f108a8860d2190197962b849f8385327af82c4d6a3a130a7fba35a74a8ec9437d642867601acb29817c49632a8f |
32 |
|
33 |
diff --git a/net-misc/openssh/files/openssh-8.7_p1-X509-glue-13.2.1.patch b/net-misc/openssh/files/openssh-8.7_p1-X509-glue-13.2.1.patch |
34 |
new file mode 100644 |
35 |
index 00000000000..be88d11ba80 |
36 |
--- /dev/null |
37 |
+++ b/net-misc/openssh/files/openssh-8.7_p1-X509-glue-13.2.1.patch |
38 |
@@ -0,0 +1,45 @@ |
39 |
+--- a/openssh-8.7p1+x509-13.2.1.diff 2021-09-08 14:20:40.750542472 -0700 |
40 |
++++ b/openssh-8.7p1+x509-13.2.1.diff 2021-09-08 14:21:23.354736098 -0700 |
41 |
+@@ -51194,12 +51194,11 @@ |
42 |
+ |
43 |
+ install-files: |
44 |
+ $(MKDIR_P) $(DESTDIR)$(bindir) |
45 |
+-@@ -391,6 +368,8 @@ |
46 |
++@@ -391,6 +368,7 @@ |
47 |
+ $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5 |
48 |
+ $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 |
49 |
+ $(MKDIR_P) $(DESTDIR)$(libexecdir) |
50 |
+ + $(MKDIR_P) $(DESTDIR)$(sshcadir) |
51 |
+-+ $(MKDIR_P) $(DESTDIR)$(piddir) |
52 |
+ $(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH) |
53 |
+ $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT) |
54 |
+ $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT) |
55 |
+@@ -70464,9 +70463,9 @@ |
56 |
+ |
57 |
+ +# cross-project configuration |
58 |
+ +if test "$sshd_type" = "pkix" ; then |
59 |
+-+ unset_arg='' |
60 |
+++ unset_arg= |
61 |
+ +else |
62 |
+-+ unset_arg=none |
63 |
+++ unset_arg= |
64 |
+ +fi |
65 |
+ + |
66 |
+ cat > $OBJ/sshd_config.i << _EOF |
67 |
+@@ -132131,16 +132130,6 @@ |
68 |
+ +int asnmprintf(char **, size_t, int *, const char *, ...) |
69 |
+ __attribute__((format(printf, 4, 5))); |
70 |
+ void msetlocale(void); |
71 |
+-diff -ruN openssh-8.7p1/version.h openssh-8.7p1+x509-13.2.1/version.h |
72 |
+---- openssh-8.7p1/version.h 2021-08-20 07:03:49.000000000 +0300 |
73 |
+-+++ openssh-8.7p1+x509-13.2.1/version.h 2021-09-08 21:07:00.000000000 +0300 |
74 |
+-@@ -2,5 +2,4 @@ |
75 |
+- |
76 |
+- #define SSH_VERSION "OpenSSH_8.7" |
77 |
+- |
78 |
+--#define SSH_PORTABLE "p1" |
79 |
+--#define SSH_RELEASE SSH_VERSION SSH_PORTABLE |
80 |
+-+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" |
81 |
+ diff -ruN openssh-8.7p1/version.m4 openssh-8.7p1+x509-13.2.1/version.m4 |
82 |
+ --- openssh-8.7p1/version.m4 1970-01-01 02:00:00.000000000 +0200 |
83 |
+ +++ openssh-8.7p1+x509-13.2.1/version.m4 2021-09-08 21:07:00.000000000 +0300 |
84 |
|
85 |
diff --git a/net-misc/openssh/files/openssh-8.7_p1-X509-glue-13.2.patch b/net-misc/openssh/files/openssh-8.7_p1-X509-glue-13.2.patch |
86 |
deleted file mode 100644 |
87 |
index d6f5e42027d..00000000000 |
88 |
--- a/net-misc/openssh/files/openssh-8.7_p1-X509-glue-13.2.patch |
89 |
+++ /dev/null |
90 |
@@ -1,73 +0,0 @@ |
91 |
-diff -ur '--exclude=.*.un~' a/openssh-8.7p1+x509-13.2.diff b/openssh-8.7p1+x509-13.2.diff |
92 |
---- a/openssh-8.7p1+x509-13.2.diff 2021-08-30 17:47:40.415668320 -0700 |
93 |
-+++ b/openssh-8.7p1+x509-13.2.diff 2021-08-30 17:49:14.916114987 -0700 |
94 |
-@@ -51082,12 +51082,11 @@ |
95 |
- |
96 |
- install-files: |
97 |
- $(MKDIR_P) $(DESTDIR)$(bindir) |
98 |
--@@ -391,6 +368,8 @@ |
99 |
-+@@ -391,6 +368,7 @@ |
100 |
- $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5 |
101 |
- $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 |
102 |
- $(MKDIR_P) $(DESTDIR)$(libexecdir) |
103 |
- + $(MKDIR_P) $(DESTDIR)$(sshcadir) |
104 |
--+ $(MKDIR_P) $(DESTDIR)$(piddir) |
105 |
- $(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH) |
106 |
- $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT) |
107 |
- $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT) |
108 |
-@@ -69793,7 +69792,7 @@ |
109 |
- - echo "putty interop tests not enabled" |
110 |
- - exit 0 |
111 |
- -fi |
112 |
--+$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1; exit 1; } |
113 |
-++$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1; exit 0; } |
114 |
- |
115 |
- for c in aes 3des aes128-ctr aes192-ctr aes256-ctr chacha20 ; do |
116 |
- verbose "$tid: cipher $c" |
117 |
-@@ -69808,7 +69807,7 @@ |
118 |
- - echo "putty interop tests not enabled" |
119 |
- - exit 0 |
120 |
- -fi |
121 |
--+$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1; exit 1; } |
122 |
-++$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1; exit 0; } |
123 |
- |
124 |
- for k in dh-gex-sha1 dh-group1-sha1 dh-group14-sha1 ecdh ; do |
125 |
- verbose "$tid: kex $k" |
126 |
-@@ -69823,7 +69822,7 @@ |
127 |
- - echo "putty interop tests not enabled" |
128 |
- - exit 0 |
129 |
- -fi |
130 |
--+$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1; exit 1; } |
131 |
-++$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1; exit 0; } |
132 |
- |
133 |
- if [ "`${SSH} -Q compression`" = "none" ]; then |
134 |
- comp="0" |
135 |
-@@ -70130,9 +70129,9 @@ |
136 |
- |
137 |
- +# cross-project configuration |
138 |
- +if test "$sshd_type" = "pkix" ; then |
139 |
--+ unset_arg='' |
140 |
-++ unset_arg= |
141 |
- +else |
142 |
--+ unset_arg=none |
143 |
-++ unset_arg= |
144 |
- +fi |
145 |
- + |
146 |
- cat > $OBJ/sshd_config.i << _EOF |
147 |
-@@ -131673,16 +131672,6 @@ |
148 |
- +int asnmprintf(char **, size_t, int *, const char *, ...) |
149 |
- __attribute__((format(printf, 4, 5))); |
150 |
- void msetlocale(void); |
151 |
--diff -ruN openssh-8.7p1/version.h openssh-8.7p1+x509-13.2/version.h |
152 |
----- openssh-8.7p1/version.h 2021-08-20 07:03:49.000000000 +0300 |
153 |
--+++ openssh-8.7p1+x509-13.2/version.h 2021-08-30 20:07:00.000000000 +0300 |
154 |
--@@ -2,5 +2,4 @@ |
155 |
-- |
156 |
-- #define SSH_VERSION "OpenSSH_8.7" |
157 |
-- |
158 |
---#define SSH_PORTABLE "p1" |
159 |
---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE |
160 |
--+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" |
161 |
- diff -ruN openssh-8.7p1/version.m4 openssh-8.7p1+x509-13.2/version.m4 |
162 |
- --- openssh-8.7p1/version.m4 1970-01-01 02:00:00.000000000 +0200 |
163 |
- +++ openssh-8.7p1+x509-13.2/version.m4 2021-08-30 20:07:00.000000000 +0300 |
164 |
|
165 |
diff --git a/net-misc/openssh/openssh-8.7_p1-r1.ebuild b/net-misc/openssh/openssh-8.7_p1-r2.ebuild |
166 |
similarity index 99% |
167 |
rename from net-misc/openssh/openssh-8.7_p1-r1.ebuild |
168 |
rename to net-misc/openssh/openssh-8.7_p1-r2.ebuild |
169 |
index f5ffce0f449..d2f32ef627b 100644 |
170 |
--- a/net-misc/openssh/openssh-8.7_p1-r1.ebuild |
171 |
+++ b/net-misc/openssh/openssh-8.7_p1-r2.ebuild |
172 |
@@ -21,7 +21,7 @@ HPN_PATCHES=( |
173 |
) |
174 |
|
175 |
SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz" |
176 |
-X509_VER="13.2" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" |
177 |
+X509_VER="13.2.1" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" |
178 |
|
179 |
DESCRIPTION="Port of OpenBSD's free SSH release" |
180 |
HOMEPAGE="https://www.openssh.com/" |