[gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/files/, net-misc/openssh/ - gentoo-commits

From:	Patrick McLean <chutzpah@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/files/, net-misc/openssh/
Date:	Sun, 06 Mar 2022 07:22:45
Message-Id:	`1646551347.5ec2abcc9cbcc9a06475968044b841c129f1ee88.chutzpah@gentoo`

1

commit:     5ec2abcc9cbcc9a06475968044b841c129f1ee88

2

Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>

3

AuthorDate: Sun Mar  6 07:22:27 2022 +0000

4

Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>

5

CommitDate: Sun Mar  6 07:22:27 2022 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ec2abcc

7

8

net-misc/openssh: Revbump, update X509 patch

9

10

Package-Manager: Portage-3.0.30, Repoman-3.0.3

11

Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

12

13

 net-misc/openssh/Manifest                          |  2 +-

14

 ...patch => openssh-8.9_p1-X509-glue-13.3.1.patch} | 60 ++++++++++++++++------

15

 ...h-8.9_p1-r1.ebuild => openssh-8.9_p1-r2.ebuild} |  2 +-

16

 3 files changed, 45 insertions(+), 19 deletions(-)

17

18

diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest

19

index 799f15e8b2a8..90b2cf0c98f7 100644

20

--- a/net-misc/openssh/Manifest

21

+++ b/net-misc/openssh/Manifest

22

@@ -1,7 +1,7 @@

23

 DIST openssh-8.8p1+x509-13.2.3.diff.gz 1071138 BLAKE2B dfbe53ccfdfe0a3da9bac927c5bb0ccfeb20f1ba69cef2ffb52999e6f6b0a3282e28a888aab40096fe9eed819f4c9b27592a8771d786580b8fa4f507f6b02557 SHA512 e55e9cdcde1b02b2799600083db8c3b85d207b251b99b4efabe8614bedf1daae28e5ed10cbe1f6a2e5ba766fe1eaf41be9e90fefdaae1352808c504fc0f4e7e6

24

 DIST openssh-8.8p1-sctp-1.2.patch.xz 6744 BLAKE2B 9f99e0abfbfbda2cc1c7c2a465d044c900da862e5a38f01260f388ac089b2e66c5ea7664d71d18b924552ae177e5893cdcbfbccc20eeb3aaeae00b3d552379e3 SHA512 5290c5ef08a418dcc9260812d8e75ce266e22e2258514f11da6fb178e0ae2ef16046523f72a50f74ae7b98e7eb52d16143befc8ce2919041382d314aa05adda0

25

 DIST openssh-8.8p1.tar.gz 1815060 BLAKE2B 3a054ce19781aceca5ab1a0839d7435d88aff4481e8c74b91ffd2046dc8b6f03d6bf584ecda066c0496acf43cea9ab4085f26a29e34e20736e752f204b8c76c3 SHA512 d44cd04445f9c8963513b0d5a7e8348985114ff2471e119a6e344498719ef40f09c61c354888a3be9dabcb5870e5cbe5d3aafbb861dfa1d82a4952f3d233a8df

26

-DIST openssh-8.9p1+x509-13.3.diff.gz 1109839 BLAKE2B 64bbb5afcffe11ae31fa9cb21a8668e50a08012079108cbb7444412eb05a0fbfd10fce82b347bfd9a68b765fffaa09eb30dd7d70801f723d79f45a3b5858fef9 SHA512 fb54ed71eb0c37236ea3fe6e5be77aba56d511d6d087e374059ddc21f42aa9b75d832b8a927d082b71ac41de8bc9760f3e6f6335a88af023d5618c74872f9611

27

+DIST openssh-8.9p1+x509-13.3.1.diff.gz 1113333 BLAKE2B 01fc34ed5c5c64a97db99f8f5a98f5917519474b4c22a2372f76a9c36d5dfc4efe1d03fcc43ed3d1602177f7e674a58676b9d04444d7bb66bc1c096136fd2ed0 SHA512 4fea3cf0dd0f6e0b9e28c16fb88f2a125c3ec7f86111d33e040664ab4976e697b137ffe80d02c979e2eb55a5c004f597299cfec22e730b80279665de61cb1f13

28

 DIST openssh-8.9p1-sctp-1.2.patch.xz 6752 BLAKE2B 8f87a4e604ce412f45432ae29b6ccb5a10f6bd6ddc3c688b85d75c2126387dc5d4ed2b2396691db016cc0dee3e71a557611bcf34066dee075d62c9e69e887f14 SHA512 88a36e2d87bb8b6136885094729d001953e15799e06885ff1c489300458b6e412520f7a78c48dfd24df46e58f2561051212d7948f8af63082edcb85c33b4d32b

29

 DIST openssh-8.9p1.tar.gz 1820282 BLAKE2B 02934da7f7a2954141888e63e81e38fad4fb8558ddd1032de44f69684802c62771fdd7e9e470e0715059635999c8f9d2ab95f6351217e236573ead83a867f59b SHA512 04bd38ea6fe4be31acc8c4e83de7d3dda66fb7207be2e4ba25d3b8118d13d098a283769da9e8ce1fc4fba7edf739c14efcc6c9137132919261a7f882314b0f6b

30

 DIST openssh-8_5_P1-hpn-AES-CTR-15.2.diff 30096 BLAKE2B f0c020dd2403806c79d4c37a019996d275655b04997301e247f5c4dd7fad35d12b3b7c25afb1b078d915ef2a4ae02f736f0aec9ba2a8c56a405d7ca303bcadf7 SHA512 4c2dbf99a9b5953fdb955f700272bbaeaa025f108a8860d2190197962b849f8385327af82c4d6a3a130a7fba35a74a8ec9437d642867601acb29817c49632a8f

31

32

diff --git a/net-misc/openssh/files/openssh-8.9_p1-X509-glue-13.3.patch b/net-misc/openssh/files/openssh-8.9_p1-X509-glue-13.3.1.patch

33

similarity index 64%

34

rename from net-misc/openssh/files/openssh-8.9_p1-X509-glue-13.3.patch

35

rename to net-misc/openssh/files/openssh-8.9_p1-X509-glue-13.3.1.patch

36

index 7c7767109dd5..eab5b5344d6a 100644

37

--- a/net-misc/openssh/files/openssh-8.9_p1-X509-glue-13.3.patch

38

+++ b/net-misc/openssh/files/openssh-8.9_p1-X509-glue-13.3.1.patch

39

@@ -1,7 +1,7 @@

40

-diff -ur '--exclude=.*.un~' a/openssh-8.9p1+x509-13.3.diff b/openssh-8.9p1+x509-13.3.diff

41

---- a/openssh-8.9p1+x509-13.3.diff	2022-02-24 17:19:30.830285922 -0800

42

-+++ b/openssh-8.9p1+x509-13.3.diff	2022-02-25 17:35:40.885492007 -0800

43

-@@ -993,15 +993,16 @@

44

+diff -ur '--exclude=.*.un~' a/openssh-8.9p1+x509-13.3.1.diff b/openssh-8.9p1+x509-13.3.1.diff

45

+--- a/openssh-8.9p1+x509-13.3.1.diff	2022-03-05 21:49:32.673126122 -0800

46

++++ b/openssh-8.9p1+x509-13.3.1.diff	2022-03-05 21:52:52.581776560 -0800

47

+@@ -1002,15 +1002,16 @@

48

   	char b[512];

49

  -	size_t len = ssh_digest_bytes(SSH_DIGEST_SHA512);

50

  -	u_char *hash = xmalloc(len);

51

@@ -21,7 +21,7 @@ diff -ur '--exclude=.*.un~' a/openssh-8.9p1+x509-13.3.diff b/openssh-8.9p1+x509-

52

   	(void)snprintf(b, sizeof b, "%llu%s",

53

   	    (unsigned long long)options.timing_secret, user);

54

  -	if (ssh_digest_memory(SSH_DIGEST_SHA512, b, strlen(b), hash, len) != 0)

55

-@@ -44573,8 +44574,8 @@

56

+@@ -44746,8 +44747,8 @@

57

   		gss_create_empty_oid_set(&status, &oidset);

58

   		gss_add_oid_set_member(&status, ctx->oid, &oidset);

59

60

@@ -32,16 +32,16 @@ diff -ur '--exclude=.*.un~' a/openssh-8.9p1+x509-13.3.diff b/openssh-8.9p1+x509-

61

   			gss_release_oid_set(&status, &oidset);

62

   			return (-1);

63

}

64

-@@ -51970,7 +51971,7 @@

65

- diff -ruN openssh-8.9p1/m4/openssh.m4 openssh-8.9p1+x509-13.3/m4/openssh.m4

66

+@@ -52143,7 +52144,7 @@

67

+ diff -ruN openssh-8.9p1/m4/openssh.m4 openssh-8.9p1+x509-13.3.1/m4/openssh.m4

68

  --- openssh-8.9p1/m4/openssh.m4	2022-02-23 13:31:11.000000000 +0200

69

- +++ openssh-8.9p1+x509-13.3/m4/openssh.m4	1970-01-01 02:00:00.000000000 +0200

70

+ +++ openssh-8.9p1+x509-13.3.1/m4/openssh.m4	1970-01-01 02:00:00.000000000 +0200

71

 -@@ -1,200 +0,0 @@

72

 +@@ -1,203 +0,0 @@

73

  -dnl OpenSSH-specific autoconf macros

74

  -dnl

75

-

76

-@@ -51987,6 +51988,8 @@

77

+@@ -52160,6 +52161,8 @@

78

  -	AC_COMPILE_IFELSE([AC_LANG_SOURCE([[

79

  -#include <stdlib.h>

80

  -#include <stdio.h>

81

@@ -50,7 +50,7 @@ diff -ur '--exclude=.*.un~' a/openssh-8.9p1+x509-13.3.diff b/openssh-8.9p1+x509-

82

  -int main(int argc, char **argv) {

83

  -	(void)argv;

84

  -	/* Some math to catch -ftrapv problems in the toolchain */

85

-@@ -51994,6 +51997,7 @@

86

+@@ -52167,6 +52170,7 @@

87

  -	float l = i * 2.1;

88

  -	double m = l / 0.5;

89

  -	long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;

90

@@ -58,7 +58,7 @@ diff -ur '--exclude=.*.un~' a/openssh-8.9p1+x509-13.3.diff b/openssh-8.9p1+x509-

91

  -	printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);

92

  -	/*

93

  -	 * Test fallthrough behaviour.  clang 10's -Wimplicit-fallthrough does

94

-@@ -52711,12 +52715,11 @@

95

+@@ -52884,12 +52888,11 @@

96

97

   install-files:

98

   	$(MKDIR_P) $(DESTDIR)$(bindir)

99

@@ -72,7 +72,7 @@ diff -ur '--exclude=.*.un~' a/openssh-8.9p1+x509-13.3.diff b/openssh-8.9p1+x509-

100

   	$(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH)

101

   	$(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)

102

   	$(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)

103

-@@ -73508,7 +73511,7 @@

104

+@@ -73836,7 +73839,7 @@

105

  +if test "$sshd_type" = "pkix" ; then

106

  +  unset_arg=''

107

  +else

108

@@ -81,13 +81,39 @@ diff -ur '--exclude=.*.un~' a/openssh-8.9p1+x509-13.3.diff b/openssh-8.9p1+x509-

109

+fi

110

+

111

   cat > $OBJ/sshd_config.i << _EOF

112

-@@ -137555,16 +137558,6 @@

113

+@@ -79691,25 +79694,6 @@

114

+  #ifdef __NR_getrandom

115

+  	SC_ALLOW(__NR_getrandom),

116

+  #endif

117

+-@@ -267,15 +273,15 @@

118

+- #ifdef __NR_clock_nanosleep_time64

119

+- 	SC_ALLOW(__NR_clock_nanosleep_time64),

120

+- #endif

121

+--#ifdef __NR_clock_gettime64

122

+--	SC_ALLOW(__NR_clock_gettime64),

123

+--#endif

124

+- #ifdef __NR__newselect

125

+- 	SC_ALLOW(__NR__newselect),

126

+- #endif

127

+- #ifdef __NR_ppoll

128

+- 	SC_ALLOW(__NR_ppoll),

129

+- #endif

130

+-+#ifdef __NR_ppoll_time64

131

+-+	SC_ALLOW(__NR_ppoll_time64),

132

+-+#endif

133

+- #ifdef __NR_poll

134

+- 	SC_ALLOW(__NR_poll),

135

+- #endif

136

+ @@ -288,6 +294,9 @@

137

+  #ifdef __NR_read

138

+  	SC_ALLOW(__NR_read),

139

+@@ -137848,16 +137832,6 @@

140

  +int	 asnmprintf(char **, size_t, int *, const char *, ...)

141

   	    __attribute__((format(printf, 4, 5)));

142

   void	 msetlocale(void);

143

--diff -ruN openssh-8.9p1/version.h openssh-8.9p1+x509-13.3/version.h

144

+-diff -ruN openssh-8.9p1/version.h openssh-8.9p1+x509-13.3.1/version.h

145

 ---- openssh-8.9p1/version.h	2022-02-23 13:31:11.000000000 +0200

146

--+++ openssh-8.9p1+x509-13.3/version.h	2022-02-24 20:07:00.000000000 +0200

147

+-+++ openssh-8.9p1+x509-13.3.1/version.h	2022-03-05 10:07:00.000000000 +0200

148

 -@@ -2,5 +2,4 @@

149

-

150

 - #define SSH_VERSION	"OpenSSH_8.9"

151

@@ -95,6 +121,6 @@ diff -ur '--exclude=.*.un~' a/openssh-8.9p1+x509-13.3.diff b/openssh-8.9p1+x509-

152

 --#define SSH_PORTABLE	"p1"

153

 --#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE

154

 -+#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"

155

- diff -ruN openssh-8.9p1/version.m4 openssh-8.9p1+x509-13.3/version.m4

156

+ diff -ruN openssh-8.9p1/version.m4 openssh-8.9p1+x509-13.3.1/version.m4

157

  --- openssh-8.9p1/version.m4	1970-01-01 02:00:00.000000000 +0200

158

- +++ openssh-8.9p1+x509-13.3/version.m4	2022-02-24 20:07:00.000000000 +0200

159

+ +++ openssh-8.9p1+x509-13.3.1/version.m4	2022-03-05 10:07:00.000000000 +0200

160

161

diff --git a/net-misc/openssh/openssh-8.9_p1-r1.ebuild b/net-misc/openssh/openssh-8.9_p1-r2.ebuild

162

similarity index 99%

163

rename from net-misc/openssh/openssh-8.9_p1-r1.ebuild

164

rename to net-misc/openssh/openssh-8.9_p1-r2.ebuild

165

index 562d5b5a4914..a6888564f58a 100644

166

--- a/net-misc/openssh/openssh-8.9_p1-r1.ebuild

167

+++ b/net-misc/openssh/openssh-8.9_p1-r2.ebuild

168

@@ -21,7 +21,7 @@ HPN_PATCHES=(

169

)

170

171

 SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"

172

-X509_VER="13.3" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"

173

+X509_VER="13.3.1" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"

174

175

 DESCRIPTION="Port of OpenBSD's free SSH release"

176

 HOMEPAGE="https://www.openssh.com/"

1	commit: 5ec2abcc9cbcc9a06475968044b841c129f1ee88
2	Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
3	AuthorDate: Sun Mar 6 07:22:27 2022 +0000
4	Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
5	CommitDate: Sun Mar 6 07:22:27 2022 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ec2abcc
7
8	net-misc/openssh: Revbump, update X509 patch
9
10	Package-Manager: Portage-3.0.30, Repoman-3.0.3
11	Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
12
13	net-misc/openssh/Manifest \| 2 +-
14	...patch => openssh-8.9_p1-X509-glue-13.3.1.patch} \| 60 ++++++++++++++++------
15	...h-8.9_p1-r1.ebuild => openssh-8.9_p1-r2.ebuild} \| 2 +-
16	3 files changed, 45 insertions(+), 19 deletions(-)
17
18	diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
19	index 799f15e8b2a8..90b2cf0c98f7 100644
20	--- a/net-misc/openssh/Manifest
21	+++ b/net-misc/openssh/Manifest
22	@@ -1,7 +1,7 @@
23	DIST openssh-8.8p1+x509-13.2.3.diff.gz 1071138 BLAKE2B dfbe53ccfdfe0a3da9bac927c5bb0ccfeb20f1ba69cef2ffb52999e6f6b0a3282e28a888aab40096fe9eed819f4c9b27592a8771d786580b8fa4f507f6b02557 SHA512 e55e9cdcde1b02b2799600083db8c3b85d207b251b99b4efabe8614bedf1daae28e5ed10cbe1f6a2e5ba766fe1eaf41be9e90fefdaae1352808c504fc0f4e7e6
24	DIST openssh-8.8p1-sctp-1.2.patch.xz 6744 BLAKE2B 9f99e0abfbfbda2cc1c7c2a465d044c900da862e5a38f01260f388ac089b2e66c5ea7664d71d18b924552ae177e5893cdcbfbccc20eeb3aaeae00b3d552379e3 SHA512 5290c5ef08a418dcc9260812d8e75ce266e22e2258514f11da6fb178e0ae2ef16046523f72a50f74ae7b98e7eb52d16143befc8ce2919041382d314aa05adda0
25	DIST openssh-8.8p1.tar.gz 1815060 BLAKE2B 3a054ce19781aceca5ab1a0839d7435d88aff4481e8c74b91ffd2046dc8b6f03d6bf584ecda066c0496acf43cea9ab4085f26a29e34e20736e752f204b8c76c3 SHA512 d44cd04445f9c8963513b0d5a7e8348985114ff2471e119a6e344498719ef40f09c61c354888a3be9dabcb5870e5cbe5d3aafbb861dfa1d82a4952f3d233a8df
26	-DIST openssh-8.9p1+x509-13.3.diff.gz 1109839 BLAKE2B 64bbb5afcffe11ae31fa9cb21a8668e50a08012079108cbb7444412eb05a0fbfd10fce82b347bfd9a68b765fffaa09eb30dd7d70801f723d79f45a3b5858fef9 SHA512 fb54ed71eb0c37236ea3fe6e5be77aba56d511d6d087e374059ddc21f42aa9b75d832b8a927d082b71ac41de8bc9760f3e6f6335a88af023d5618c74872f9611
27	+DIST openssh-8.9p1+x509-13.3.1.diff.gz 1113333 BLAKE2B 01fc34ed5c5c64a97db99f8f5a98f5917519474b4c22a2372f76a9c36d5dfc4efe1d03fcc43ed3d1602177f7e674a58676b9d04444d7bb66bc1c096136fd2ed0 SHA512 4fea3cf0dd0f6e0b9e28c16fb88f2a125c3ec7f86111d33e040664ab4976e697b137ffe80d02c979e2eb55a5c004f597299cfec22e730b80279665de61cb1f13
28	DIST openssh-8.9p1-sctp-1.2.patch.xz 6752 BLAKE2B 8f87a4e604ce412f45432ae29b6ccb5a10f6bd6ddc3c688b85d75c2126387dc5d4ed2b2396691db016cc0dee3e71a557611bcf34066dee075d62c9e69e887f14 SHA512 88a36e2d87bb8b6136885094729d001953e15799e06885ff1c489300458b6e412520f7a78c48dfd24df46e58f2561051212d7948f8af63082edcb85c33b4d32b
29	DIST openssh-8.9p1.tar.gz 1820282 BLAKE2B 02934da7f7a2954141888e63e81e38fad4fb8558ddd1032de44f69684802c62771fdd7e9e470e0715059635999c8f9d2ab95f6351217e236573ead83a867f59b SHA512 04bd38ea6fe4be31acc8c4e83de7d3dda66fb7207be2e4ba25d3b8118d13d098a283769da9e8ce1fc4fba7edf739c14efcc6c9137132919261a7f882314b0f6b
30	DIST openssh-8_5_P1-hpn-AES-CTR-15.2.diff 30096 BLAKE2B f0c020dd2403806c79d4c37a019996d275655b04997301e247f5c4dd7fad35d12b3b7c25afb1b078d915ef2a4ae02f736f0aec9ba2a8c56a405d7ca303bcadf7 SHA512 4c2dbf99a9b5953fdb955f700272bbaeaa025f108a8860d2190197962b849f8385327af82c4d6a3a130a7fba35a74a8ec9437d642867601acb29817c49632a8f
31
32	diff --git a/net-misc/openssh/files/openssh-8.9_p1-X509-glue-13.3.patch b/net-misc/openssh/files/openssh-8.9_p1-X509-glue-13.3.1.patch
33	similarity index 64%
34	rename from net-misc/openssh/files/openssh-8.9_p1-X509-glue-13.3.patch
35	rename to net-misc/openssh/files/openssh-8.9_p1-X509-glue-13.3.1.patch
36	index 7c7767109dd5..eab5b5344d6a 100644
37	--- a/net-misc/openssh/files/openssh-8.9_p1-X509-glue-13.3.patch
38	+++ b/net-misc/openssh/files/openssh-8.9_p1-X509-glue-13.3.1.patch
39	@@ -1,7 +1,7 @@
40	-diff -ur '--exclude=.*.un~' a/openssh-8.9p1+x509-13.3.diff b/openssh-8.9p1+x509-13.3.diff
41	---- a/openssh-8.9p1+x509-13.3.diff 2022-02-24 17:19:30.830285922 -0800
42	-+++ b/openssh-8.9p1+x509-13.3.diff 2022-02-25 17:35:40.885492007 -0800
43	-@@ -993,15 +993,16 @@
44	+diff -ur '--exclude=.*.un~' a/openssh-8.9p1+x509-13.3.1.diff b/openssh-8.9p1+x509-13.3.1.diff
45	+--- a/openssh-8.9p1+x509-13.3.1.diff 2022-03-05 21:49:32.673126122 -0800
46	++++ b/openssh-8.9p1+x509-13.3.1.diff 2022-03-05 21:52:52.581776560 -0800
47	+@@ -1002,15 +1002,16 @@
48	char b[512];
49	- size_t len = ssh_digest_bytes(SSH_DIGEST_SHA512);
50	- u_char *hash = xmalloc(len);
51	@@ -21,7 +21,7 @@ diff -ur '--exclude=.*.un~' a/openssh-8.9p1+x509-13.3.diff b/openssh-8.9p1+x509-
52	(void)snprintf(b, sizeof b, "%llu%s",
53	(unsigned long long)options.timing_secret, user);
54	- if (ssh_digest_memory(SSH_DIGEST_SHA512, b, strlen(b), hash, len) != 0)
55	-@@ -44573,8 +44574,8 @@
56	+@@ -44746,8 +44747,8 @@
57	gss_create_empty_oid_set(&status, &oidset);
58	gss_add_oid_set_member(&status, ctx->oid, &oidset);
59
60	@@ -32,16 +32,16 @@ diff -ur '--exclude=.*.un~' a/openssh-8.9p1+x509-13.3.diff b/openssh-8.9p1+x509-
61	gss_release_oid_set(&status, &oidset);
62	return (-1);
63	}
64	-@@ -51970,7 +51971,7 @@
65	- diff -ruN openssh-8.9p1/m4/openssh.m4 openssh-8.9p1+x509-13.3/m4/openssh.m4
66	+@@ -52143,7 +52144,7 @@
67	+ diff -ruN openssh-8.9p1/m4/openssh.m4 openssh-8.9p1+x509-13.3.1/m4/openssh.m4
68	--- openssh-8.9p1/m4/openssh.m4 2022-02-23 13:31:11.000000000 +0200
69	- +++ openssh-8.9p1+x509-13.3/m4/openssh.m4 1970-01-01 02:00:00.000000000 +0200
70	+ +++ openssh-8.9p1+x509-13.3.1/m4/openssh.m4 1970-01-01 02:00:00.000000000 +0200
71	-@@ -1,200 +0,0 @@
72	+@@ -1,203 +0,0 @@
73	-dnl OpenSSH-specific autoconf macros
74	-dnl
75	-
76	-@@ -51987,6 +51988,8 @@
77	+@@ -52160,6 +52161,8 @@
78	- AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
79	-#include <stdlib.h>
80	-#include <stdio.h>
81	@@ -50,7 +50,7 @@ diff -ur '--exclude=.*.un~' a/openssh-8.9p1+x509-13.3.diff b/openssh-8.9p1+x509-
82	-int main(int argc, char **argv) {
83	- (void)argv;
84	- /* Some math to catch -ftrapv problems in the toolchain */
85	-@@ -51994,6 +51997,7 @@
86	+@@ -52167,6 +52170,7 @@
87	- float l = i * 2.1;
88	- double m = l / 0.5;
89	- long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
90	@@ -58,7 +58,7 @@ diff -ur '--exclude=.*.un~' a/openssh-8.9p1+x509-13.3.diff b/openssh-8.9p1+x509-
91	- printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);
92	- /*
93	- * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does
94	-@@ -52711,12 +52715,11 @@
95	+@@ -52884,12 +52888,11 @@
96
97	install-files:
98	$(MKDIR_P) $(DESTDIR)$(bindir)
99	@@ -72,7 +72,7 @@ diff -ur '--exclude=.*.un~' a/openssh-8.9p1+x509-13.3.diff b/openssh-8.9p1+x509-
100	$(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH)
101	$(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
102	$(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)
103	-@@ -73508,7 +73511,7 @@
104	+@@ -73836,7 +73839,7 @@
105	+if test "$sshd_type" = "pkix" ; then
106	+ unset_arg=''
107	+else
108	@@ -81,13 +81,39 @@ diff -ur '--exclude=.*.un~' a/openssh-8.9p1+x509-13.3.diff b/openssh-8.9p1+x509-
109	+fi
110	+
111	cat > $OBJ/sshd_config.i << _EOF
112	-@@ -137555,16 +137558,6 @@
113	+@@ -79691,25 +79694,6 @@
114	+ #ifdef __NR_getrandom
115	+ SC_ALLOW(__NR_getrandom),
116	+ #endif
117	+-@@ -267,15 +273,15 @@
118	+- #ifdef __NR_clock_nanosleep_time64
119	+- SC_ALLOW(__NR_clock_nanosleep_time64),
120	+- #endif
121	+--#ifdef __NR_clock_gettime64
122	+-- SC_ALLOW(__NR_clock_gettime64),
123	+--#endif
124	+- #ifdef __NR__newselect
125	+- SC_ALLOW(__NR__newselect),
126	+- #endif
127	+- #ifdef __NR_ppoll
128	+- SC_ALLOW(__NR_ppoll),
129	+- #endif
130	+-+#ifdef __NR_ppoll_time64
131	+-+ SC_ALLOW(__NR_ppoll_time64),
132	+-+#endif
133	+- #ifdef __NR_poll
134	+- SC_ALLOW(__NR_poll),
135	+- #endif
136	+ @@ -288,6 +294,9 @@
137	+ #ifdef __NR_read
138	+ SC_ALLOW(__NR_read),
139	+@@ -137848,16 +137832,6 @@
140	+int asnmprintf(char *, size_t, int , const char *, ...)
141	__attribute__((format(printf, 4, 5)));
142	void msetlocale(void);
143	--diff -ruN openssh-8.9p1/version.h openssh-8.9p1+x509-13.3/version.h
144	+-diff -ruN openssh-8.9p1/version.h openssh-8.9p1+x509-13.3.1/version.h
145	---- openssh-8.9p1/version.h 2022-02-23 13:31:11.000000000 +0200
146	--+++ openssh-8.9p1+x509-13.3/version.h 2022-02-24 20:07:00.000000000 +0200
147	+-+++ openssh-8.9p1+x509-13.3.1/version.h 2022-03-05 10:07:00.000000000 +0200
148	-@@ -2,5 +2,4 @@
149	-
150	- #define SSH_VERSION "OpenSSH_8.9"
151	@@ -95,6 +121,6 @@ diff -ur '--exclude=.*.un~' a/openssh-8.9p1+x509-13.3.diff b/openssh-8.9p1+x509-
152	--#define SSH_PORTABLE "p1"
153	--#define SSH_RELEASE SSH_VERSION SSH_PORTABLE
154	-+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1"
155	- diff -ruN openssh-8.9p1/version.m4 openssh-8.9p1+x509-13.3/version.m4
156	+ diff -ruN openssh-8.9p1/version.m4 openssh-8.9p1+x509-13.3.1/version.m4
157	--- openssh-8.9p1/version.m4 1970-01-01 02:00:00.000000000 +0200
158	- +++ openssh-8.9p1+x509-13.3/version.m4 2022-02-24 20:07:00.000000000 +0200
159	+ +++ openssh-8.9p1+x509-13.3.1/version.m4 2022-03-05 10:07:00.000000000 +0200
160
161	diff --git a/net-misc/openssh/openssh-8.9_p1-r1.ebuild b/net-misc/openssh/openssh-8.9_p1-r2.ebuild
162	similarity index 99%
163	rename from net-misc/openssh/openssh-8.9_p1-r1.ebuild
164	rename to net-misc/openssh/openssh-8.9_p1-r2.ebuild
165	index 562d5b5a4914..a6888564f58a 100644
166	--- a/net-misc/openssh/openssh-8.9_p1-r1.ebuild
167	+++ b/net-misc/openssh/openssh-8.9_p1-r2.ebuild
168	@@ -21,7 +21,7 @@ HPN_PATCHES=(
169	)
170
171	SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
172	-X509_VER="13.3" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
173	+X509_VER="13.3.1" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
174
175	DESCRIPTION="Port of OpenBSD's free SSH release"
176	HOMEPAGE="https://www.openssh.com/"

Gentoo Archives: gentoo-commits