[gentoo-commits] repo/proj/libressl:master commit in: x11-misc/x11vnc/files/, x11-misc/x11vnc/ - gentoo-commits

From:	Quentin Retornaz <gentoo@××××××××.com>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/proj/libressl:master commit in: x11-misc/x11vnc/files/, x11-misc/x11vnc/
Date:	Tue, 05 Jul 2022 21:19:35
Message-Id:	`1657055937.91cd2520dd18de7426f88967aec7dd404b29d175.quentin@gentoo`

1

commit:     91cd2520dd18de7426f88967aec7dd404b29d175

2

Author:     orbea <orbea <AT> riseup <DOT> net>

3

AuthorDate: Tue Jul  5 16:07:06 2022 +0000

4

Commit:     Quentin Retornaz <gentoo <AT> retornaz <DOT> com>

5

CommitDate: Tue Jul  5 21:18:57 2022 +0000

6

URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=91cd2520

7

8

x11-misc/x11vnc: Add 0.9.16-r7

9

10

Upstream-PR: https://github.com/LibVNC/x11vnc/pull/202

11

Signed-off-by: orbea <orbea <AT> riseup.net>

12

Closes: https://github.com/gentoo/libressl/pull/435

13

Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com>

14

15

 x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch | 94 +++-------------------

16

 x11-misc/x11vnc/files/x11vnc.conf.d                |  2 +-

17

 x11-misc/x11vnc/files/x11vnc.init.d                |  2 +-

18

 .../files/{x11vnc.init.d => x11vnc.init.d-r1}      |  2 +-

19

 x11-misc/x11vnc/metadata.xml                       |  6 +-

20

 ...nc-0.9.16-r4.ebuild => x11vnc-0.9.16-r7.ebuild} |  5 +-

21

 6 files changed, 22 insertions(+), 89 deletions(-)

22

23

diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch

24

index 8e5d8a6..cad9f5e 100644

25

--- a/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch

26

+++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch

27

@@ -1,87 +1,19 @@

28

+Upstream-PR: https://github.com/LibVNC/x11vnc/pull/202

29

+

30

+From d81e9d8e56ccc1b346b5aeb4b64fa0a32737c22d Mon Sep 17 00:00:00 2001

31

+From: orbea <orbea@××××××.net>

32

+Date: Tue, 5 Jul 2022 08:57:29 -0700

33

+Subject: [PATCH] Support LibreSSL

34

+

35

+This builds with LibreSSL 3.5.x.

36

+---

37

+ src/sslhelper.c | 2 +-

38

+ 1 file changed, 1 insertion(+), 1 deletion(-)

39

+

40

 diff --git a/src/sslhelper.c b/src/sslhelper.c

41

-index 04c2e27..fb9daa6 100644

42

+index ba680b35..bd5ef0fb 100644

43

 --- a/src/sslhelper.c

44

 +++ b/src/sslhelper.c

45

-@@ -803,7 +803,7 @@ static int pem_passwd_callback(char *buf, int size, int rwflag,

46

- static int crl_callback(X509_STORE_CTX *callback_ctx) {

47

- 	const ASN1_INTEGER *revoked_serial;

48

- 	X509_STORE_CTX *store_ctx;

49

--#if OPENSSL_VERSION_NUMBER > 0x10100000L

50

-+#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)

51

- 	X509_OBJECT *obj;

52

- #else

53

- 	X509_OBJECT obj;

54

-@@ -829,7 +829,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {

55

- 	* the current certificate in order to verify it's integrity. */

56

- 	store_ctx = X509_STORE_CTX_new();

57

- 	X509_STORE_CTX_init(store_ctx, revocation_store, NULL, NULL);

58

--#if OPENSSL_VERSION_NUMBER > 0x10100000L

59

-+#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)

60

- 	obj = X509_OBJECT_new();

61

- 	rc=X509_STORE_get_by_subject(store_ctx, X509_LU_CRL, subject, obj);

62

- 	crl = X509_OBJECT_get0_X509_CRL(obj);

63

-@@ -865,7 +865,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {

64

- 			rfbLog("Invalid signature on CRL\n");

65

- 			X509_STORE_CTX_set_error(callback_ctx,

66

- 				X509_V_ERR_CRL_SIGNATURE_FAILURE);

67

--#if OPENSSL_VERSION_NUMBER >= 0x10100000L

68

-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)

69

- 			X509_OBJECT_free(obj);

70

- #else

71

- 			X509_OBJECT_free_contents(&obj);

72

-@@ -883,7 +883,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {

73

- 			rfbLog("Found CRL has invalid nextUpdate field\n");

74

- 			X509_STORE_CTX_set_error(callback_ctx,

75

- 				X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD);

76

--#if OPENSSL_VERSION_NUMBER >= 0x10100000L

77

-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)

78

- 			X509_OBJECT_free(obj);

79

- #else

80

- 			X509_OBJECT_free_contents(&obj);

81

-@@ -894,14 +894,14 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {

82

- 			rfbLog("Found CRL is expired - "

83

- 				"revoking all certificates until you get updated CRL\n");

84

- 			X509_STORE_CTX_set_error(callback_ctx, X509_V_ERR_CRL_HAS_EXPIRED);

85

--#if OPENSSL_VERSION_NUMBER >= 0x10100000L

86

-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)

87

- 			X509_OBJECT_free(obj);

88

- #else

89

- 			X509_OBJECT_free_contents(&obj);

90

- #endif

91

- 			return 0; /* Reject connection */

92

- 		}

93

--#if OPENSSL_VERSION_NUMBER >= 0x10100000L

94

-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)

95

- 			X509_OBJECT_free(obj);

96

- #else

97

- 			X509_OBJECT_free_contents(&obj);

98

-@@ -912,7 +912,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {

99

- 	 * the current certificate in order to check for revocation. */

100

- 	store_ctx = X509_STORE_CTX_new();

101

- 	X509_STORE_CTX_init(store_ctx, revocation_store, NULL, NULL);

102

--#if OPENSSL_VERSION_NUMBER > 0x10100000L

103

-+#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)

104

- 	obj = X509_OBJECT_new();

105

- 	rc=X509_STORE_get_by_subject(store_ctx, X509_LU_CRL, issuer, obj);

106

- 	crl = X509_OBJECT_get0_X509_CRL(obj);

107

-@@ -942,7 +942,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {

108

- 					"revoked per CRL from issuer %s\n", serial, serial, cp);

109

- 				OPENSSL_free(cp);

110

- 				X509_STORE_CTX_set_error(callback_ctx, X509_V_ERR_CERT_REVOKED);

111

--#if OPENSSL_VERSION_NUMBER >= 0x10100000L

112

-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)

113

- 				X509_OBJECT_free(obj);

114

- #else

115

- 				X509_OBJECT_free_contents(&obj);

116

-@@ -950,7 +950,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {

117

- 				return 0; /* Reject connection */

118

- 			}

119

- 		}

120

--#if OPENSSL_VERSION_NUMBER >= 0x10100000L

121

-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)

122

- 			X509_OBJECT_free(obj);

123

- #else

124

- 			X509_OBJECT_free_contents(&obj);

125

 @@ -1596,7 +1596,7 @@ static int switch_to_anon_dh(void) {

126

  	if (ssl_client_mode) {

127

  		return 1;

128

129

diff --git a/x11-misc/x11vnc/files/x11vnc.conf.d b/x11-misc/x11vnc/files/x11vnc.conf.d

130

index 91f2a13..7df3a13 100644

131

--- a/x11-misc/x11vnc/files/x11vnc.conf.d

132

+++ b/x11-misc/x11vnc/files/x11vnc.conf.d

133

@@ -1,4 +1,4 @@

134

-# Copyright 1999-2021 Gentoo Authors

135

+# Copyright 1999-2012 Gentoo Foundation

136

 # Distributed under the terms of the GNU General Public License v2

137

138

 # Configuration for running x11vnc as a service. This allows VNC 

139

140

diff --git a/x11-misc/x11vnc/files/x11vnc.init.d b/x11-misc/x11vnc/files/x11vnc.init.d

141

index 4adcb23..b6b16da 100644

142

--- a/x11-misc/x11vnc/files/x11vnc.init.d

143

+++ b/x11-misc/x11vnc/files/x11vnc.init.d

144

@@ -1,5 +1,5 @@

145

 #!/sbin/openrc-run

146

-# Copyright 1999-2021 Gentoo Authors

147

+# Copyright 1999-2011 Gentoo Foundation

148

 # Distributed under the terms of the GNU General Public License v2

149

150

 description="The x11vnc daemon init script"

151

152

diff --git a/x11-misc/x11vnc/files/x11vnc.init.d b/x11-misc/x11vnc/files/x11vnc.init.d-r1

153

similarity index 98%

154

copy from x11-misc/x11vnc/files/x11vnc.init.d

155

copy to x11-misc/x11vnc/files/x11vnc.init.d-r1

156

index 4adcb23..04c36ea 100644

157

--- a/x11-misc/x11vnc/files/x11vnc.init.d

158

+++ b/x11-misc/x11vnc/files/x11vnc.init.d-r1

159

@@ -6,7 +6,7 @@ description="The x11vnc daemon init script"

160

161

 depend() {

162

 	need net

163

-	need xdm

164

+	need display-manager

165

}

166

167

 checkconfig() {

168

169

diff --git a/x11-misc/x11vnc/metadata.xml b/x11-misc/x11vnc/metadata.xml

170

index 40fa318..432585e 100644

171

--- a/x11-misc/x11vnc/metadata.xml

172

+++ b/x11-misc/x11vnc/metadata.xml

173

@@ -1,11 +1,11 @@

174

 <?xml version="1.0" encoding="UTF-8"?>

175

-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">

176

+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">

177

 <pkgmetadata>

178

-	<maintainer type="person">

179

+	<maintainer type="person" proxied="yes">

180

 		<email>alexander@××××.me</email>

181

 		<name>Alexander Tsoy</name>

182

 	</maintainer>

183

-	<maintainer type="project">

184

+	<maintainer type="project" proxied="proxy">

185

 		<email>proxy-maint@g.o</email>

186

 		<name>Proxy Maintainers</name>

187

 	</maintainer>

188

189

diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r7.ebuild

190

similarity index 89%

191

rename from x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild

192

rename to x11-misc/x11vnc/x11vnc-0.9.16-r7.ebuild

193

index 9d0ae57..9ce245d 100644

194

--- a/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild

195

+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r7.ebuild

196

@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"

197

198

 LICENSE="GPL-2+-with-openssl-exception"

199

 SLOT="0"

200

-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"

201

+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"

202

 IUSE="crypt fbcon ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"

203

204

 COMMON_DEPEND="

205

@@ -20,6 +20,7 @@ COMMON_DEPEND="

206

 	x11-libs/libXcursor

207

 	x11-libs/libXext

208

 	>=x11-libs/libXtst-1.1.0

209

+	virtual/libcrypt:=

210

 	ssl? ( dev-libs/openssl:0= )

211

 	xcomposite? ( x11-libs/libXcomposite )

212

 	xdamage? ( x11-libs/libXdamage )

213

@@ -73,6 +74,6 @@ src_configure() {

214

215

 src_install() {

216

 	default

217

-	newinitd "${FILESDIR}/x11vnc.init.d" x11vnc

218

+	newinitd "${FILESDIR}/x11vnc.init.d-r1" x11vnc

219

 	newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc

220

}

1	commit: 91cd2520dd18de7426f88967aec7dd404b29d175
2	Author: orbea <orbea <AT> riseup <DOT> net>
3	AuthorDate: Tue Jul 5 16:07:06 2022 +0000
4	Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
5	CommitDate: Tue Jul 5 21:18:57 2022 +0000
6	URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=91cd2520
7
8	x11-misc/x11vnc: Add 0.9.16-r7
9
10	Upstream-PR: https://github.com/LibVNC/x11vnc/pull/202
11	Signed-off-by: orbea <orbea <AT> riseup.net>
12	Closes: https://github.com/gentoo/libressl/pull/435
13	Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com>
14
15	x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch \| 94 +++-------------------
16	x11-misc/x11vnc/files/x11vnc.conf.d \| 2 +-
17	x11-misc/x11vnc/files/x11vnc.init.d \| 2 +-
18	.../files/{x11vnc.init.d => x11vnc.init.d-r1} \| 2 +-
19	x11-misc/x11vnc/metadata.xml \| 6 +-
20	...nc-0.9.16-r4.ebuild => x11vnc-0.9.16-r7.ebuild} \| 5 +-
21	6 files changed, 22 insertions(+), 89 deletions(-)
22
23	diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch
24	index 8e5d8a6..cad9f5e 100644
25	--- a/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch
26	+++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch
27	@@ -1,87 +1,19 @@
28	+Upstream-PR: https://github.com/LibVNC/x11vnc/pull/202
29	+
30	+From d81e9d8e56ccc1b346b5aeb4b64fa0a32737c22d Mon Sep 17 00:00:00 2001
31	+From: orbea <orbea@××××××.net>
32	+Date: Tue, 5 Jul 2022 08:57:29 -0700
33	+Subject: [PATCH] Support LibreSSL
34	+
35	+This builds with LibreSSL 3.5.x.
36	+---
37	+ src/sslhelper.c \| 2 +-
38	+ 1 file changed, 1 insertion(+), 1 deletion(-)
39	+
40	diff --git a/src/sslhelper.c b/src/sslhelper.c
41	-index 04c2e27..fb9daa6 100644
42	+index ba680b35..bd5ef0fb 100644
43	--- a/src/sslhelper.c
44	+++ b/src/sslhelper.c
45	-@@ -803,7 +803,7 @@ static int pem_passwd_callback(char *buf, int size, int rwflag,
46	- static int crl_callback(X509_STORE_CTX *callback_ctx) {
47	- const ASN1_INTEGER *revoked_serial;
48	- X509_STORE_CTX *store_ctx;
49	--#if OPENSSL_VERSION_NUMBER > 0x10100000L
50	-+#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
51	- X509_OBJECT *obj;
52	- #else
53	- X509_OBJECT obj;
54	-@@ -829,7 +829,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
55	- * the current certificate in order to verify it's integrity. */
56	- store_ctx = X509_STORE_CTX_new();
57	- X509_STORE_CTX_init(store_ctx, revocation_store, NULL, NULL);
58	--#if OPENSSL_VERSION_NUMBER > 0x10100000L
59	-+#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
60	- obj = X509_OBJECT_new();
61	- rc=X509_STORE_get_by_subject(store_ctx, X509_LU_CRL, subject, obj);
62	- crl = X509_OBJECT_get0_X509_CRL(obj);
63	-@@ -865,7 +865,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
64	- rfbLog("Invalid signature on CRL\n");
65	- X509_STORE_CTX_set_error(callback_ctx,
66	- X509_V_ERR_CRL_SIGNATURE_FAILURE);
67	--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
68	-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
69	- X509_OBJECT_free(obj);
70	- #else
71	- X509_OBJECT_free_contents(&obj);
72	-@@ -883,7 +883,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
73	- rfbLog("Found CRL has invalid nextUpdate field\n");
74	- X509_STORE_CTX_set_error(callback_ctx,
75	- X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD);
76	--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
77	-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
78	- X509_OBJECT_free(obj);
79	- #else
80	- X509_OBJECT_free_contents(&obj);
81	-@@ -894,14 +894,14 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
82	- rfbLog("Found CRL is expired - "
83	- "revoking all certificates until you get updated CRL\n");
84	- X509_STORE_CTX_set_error(callback_ctx, X509_V_ERR_CRL_HAS_EXPIRED);
85	--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
86	-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
87	- X509_OBJECT_free(obj);
88	- #else
89	- X509_OBJECT_free_contents(&obj);
90	- #endif
91	- return 0; /* Reject connection */
92	- }
93	--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
94	-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
95	- X509_OBJECT_free(obj);
96	- #else
97	- X509_OBJECT_free_contents(&obj);
98	-@@ -912,7 +912,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
99	- * the current certificate in order to check for revocation. */
100	- store_ctx = X509_STORE_CTX_new();
101	- X509_STORE_CTX_init(store_ctx, revocation_store, NULL, NULL);
102	--#if OPENSSL_VERSION_NUMBER > 0x10100000L
103	-+#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
104	- obj = X509_OBJECT_new();
105	- rc=X509_STORE_get_by_subject(store_ctx, X509_LU_CRL, issuer, obj);
106	- crl = X509_OBJECT_get0_X509_CRL(obj);
107	-@@ -942,7 +942,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
108	- "revoked per CRL from issuer %s\n", serial, serial, cp);
109	- OPENSSL_free(cp);
110	- X509_STORE_CTX_set_error(callback_ctx, X509_V_ERR_CERT_REVOKED);
111	--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
112	-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
113	- X509_OBJECT_free(obj);
114	- #else
115	- X509_OBJECT_free_contents(&obj);
116	-@@ -950,7 +950,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
117	- return 0; /* Reject connection */
118	- }
119	- }
120	--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
121	-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
122	- X509_OBJECT_free(obj);
123	- #else
124	- X509_OBJECT_free_contents(&obj);
125	@@ -1596,7 +1596,7 @@ static int switch_to_anon_dh(void) {
126	if (ssl_client_mode) {
127	return 1;
128
129	diff --git a/x11-misc/x11vnc/files/x11vnc.conf.d b/x11-misc/x11vnc/files/x11vnc.conf.d
130	index 91f2a13..7df3a13 100644
131	--- a/x11-misc/x11vnc/files/x11vnc.conf.d
132	+++ b/x11-misc/x11vnc/files/x11vnc.conf.d
133	@@ -1,4 +1,4 @@
134	-# Copyright 1999-2021 Gentoo Authors
135	+# Copyright 1999-2012 Gentoo Foundation
136	# Distributed under the terms of the GNU General Public License v2
137
138	# Configuration for running x11vnc as a service. This allows VNC
139
140	diff --git a/x11-misc/x11vnc/files/x11vnc.init.d b/x11-misc/x11vnc/files/x11vnc.init.d
141	index 4adcb23..b6b16da 100644
142	--- a/x11-misc/x11vnc/files/x11vnc.init.d
143	+++ b/x11-misc/x11vnc/files/x11vnc.init.d
144	@@ -1,5 +1,5 @@
145	#!/sbin/openrc-run
146	-# Copyright 1999-2021 Gentoo Authors
147	+# Copyright 1999-2011 Gentoo Foundation
148	# Distributed under the terms of the GNU General Public License v2
149
150	description="The x11vnc daemon init script"
151
152	diff --git a/x11-misc/x11vnc/files/x11vnc.init.d b/x11-misc/x11vnc/files/x11vnc.init.d-r1
153	similarity index 98%
154	copy from x11-misc/x11vnc/files/x11vnc.init.d
155	copy to x11-misc/x11vnc/files/x11vnc.init.d-r1
156	index 4adcb23..04c36ea 100644
157	--- a/x11-misc/x11vnc/files/x11vnc.init.d
158	+++ b/x11-misc/x11vnc/files/x11vnc.init.d-r1
159	@@ -6,7 +6,7 @@ description="The x11vnc daemon init script"
160
161	depend() {
162	need net
163	- need xdm
164	+ need display-manager
165	}
166
167	checkconfig() {
168
169	diff --git a/x11-misc/x11vnc/metadata.xml b/x11-misc/x11vnc/metadata.xml
170	index 40fa318..432585e 100644
171	--- a/x11-misc/x11vnc/metadata.xml
172	+++ b/x11-misc/x11vnc/metadata.xml
173	@@ -1,11 +1,11 @@
174	<?xml version="1.0" encoding="UTF-8"?>
175	-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
176	+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
177	<pkgmetadata>
178	- <maintainer type="person">
179	+ <maintainer type="person" proxied="yes">
180	<email>alexander@××××.me</email>
181	<name>Alexander Tsoy</name>
182	</maintainer>
183	- <maintainer type="project">
184	+ <maintainer type="project" proxied="proxy">
185	<email>proxy-maint@g.o</email>
186	<name>Proxy Maintainers</name>
187	</maintainer>
188
189	diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r7.ebuild
190	similarity index 89%
191	rename from x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild
192	rename to x11-misc/x11vnc/x11vnc-0.9.16-r7.ebuild
193	index 9d0ae57..9ce245d 100644
194	--- a/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild
195	+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r7.ebuild
196	@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
197
198	LICENSE="GPL-2+-with-openssl-exception"
199	SLOT="0"
200	-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
201	+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
202	IUSE="crypt fbcon ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
203
204	COMMON_DEPEND="
205	@@ -20,6 +20,7 @@ COMMON_DEPEND="
206	x11-libs/libXcursor
207	x11-libs/libXext
208	>=x11-libs/libXtst-1.1.0
209	+ virtual/libcrypt:=
210	ssl? ( dev-libs/openssl:0= )
211	xcomposite? ( x11-libs/libXcomposite )
212	xdamage? ( x11-libs/libXdamage )
213	@@ -73,6 +74,6 @@ src_configure() {
214
215	src_install() {
216	default
217	- newinitd "${FILESDIR}/x11vnc.init.d" x11vnc
218	+ newinitd "${FILESDIR}/x11vnc.init.d-r1" x11vnc
219	newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc
220	}

Gentoo Archives: gentoo-commits