1 |
commit: 247076038706da75eea7ecc2ba423b87cd0eead0 |
2 |
Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me> |
3 |
AuthorDate: Wed Dec 23 22:53:30 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 26 20:54:19 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24707603 |
7 |
|
8 |
x11-misc/x11vnc: security cleanup |
9 |
|
10 |
Bug: https://bugs.gentoo.org/756841 |
11 |
Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/18797 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild | 75 ------------------------------- |
16 |
x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild | 80 --------------------------------- |
17 |
2 files changed, 155 deletions(-) |
18 |
|
19 |
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild |
20 |
deleted file mode 100644 |
21 |
index 0647c2bea80..00000000000 |
22 |
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild |
23 |
+++ /dev/null |
24 |
@@ -1,75 +0,0 @@ |
25 |
-# Copyright 1999-2020 Gentoo Authors |
26 |
-# Distributed under the terms of the GNU General Public License v2 |
27 |
- |
28 |
-EAPI=7 |
29 |
- |
30 |
-inherit autotools |
31 |
- |
32 |
-DESCRIPTION="VNC server for real X displays" |
33 |
-HOMEPAGE="https://libvnc.github.io/" |
34 |
-SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz" |
35 |
- |
36 |
-LICENSE="GPL-2" |
37 |
-SLOT="0" |
38 |
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" |
39 |
-IUSE="crypt fbcon libressl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf" |
40 |
- |
41 |
-COMMON_DEPEND=" |
42 |
- >=net-libs/libvncserver-0.9.8[ssl] |
43 |
- x11-libs/libX11 |
44 |
- x11-libs/libXcursor |
45 |
- x11-libs/libXext |
46 |
- >=x11-libs/libXtst-1.1.0 |
47 |
- !libressl? ( dev-libs/openssl:0= ) |
48 |
- libressl? ( dev-libs/libressl:= ) |
49 |
- xcomposite? ( x11-libs/libXcomposite ) |
50 |
- xdamage? ( x11-libs/libXdamage ) |
51 |
- xfixes? ( x11-libs/libXfixes ) |
52 |
- xinerama? ( x11-libs/libXinerama ) |
53 |
- xrandr? ( x11-libs/libXrandr ) |
54 |
- zeroconf? ( >=net-dns/avahi-0.6.4 ) |
55 |
-" |
56 |
-DEPEND="${COMMON_DEPEND} |
57 |
- x11-base/xorg-proto |
58 |
- x11-libs/libXt |
59 |
-" |
60 |
-# https://bugzilla.redhat.com/show_bug.cgi?id=920554 |
61 |
-RDEPEND="${COMMON_DEPEND} |
62 |
- dev-lang/tk:0 |
63 |
-" |
64 |
- |
65 |
-PATCHES=( |
66 |
- "${FILESDIR}"/${P}-crypto.patch # https://github.com/LibVNC/x11vnc/issues/86 |
67 |
- "${FILESDIR}"/${P}-anonymous-ssl.patch # https://github.com/LibVNC/x11vnc/pull/85 |
68 |
-) |
69 |
- |
70 |
-src_prepare() { |
71 |
- default |
72 |
- eautoreconf |
73 |
-} |
74 |
- |
75 |
-src_configure() { |
76 |
- # --without-v4l because of missing video4linux 2.x support wrt #389079 |
77 |
- # --with-crypto --with-ssl because USE=-ssl is broken (bug #686494) |
78 |
- econf \ |
79 |
- --with-crypto \ |
80 |
- --with-ssl \ |
81 |
- --without-v4l \ |
82 |
- --without-xkeyboard \ |
83 |
- --without-fbpm \ |
84 |
- --without-dpms \ |
85 |
- $(use_with crypt) \ |
86 |
- $(use_with fbcon fbdev) \ |
87 |
- $(use_with xcomposite) \ |
88 |
- $(use_with xdamage) \ |
89 |
- $(use_with xfixes) \ |
90 |
- $(use_with xinerama) \ |
91 |
- $(use_with xrandr) \ |
92 |
- $(use_with zeroconf avahi) |
93 |
-} |
94 |
- |
95 |
-src_install() { |
96 |
- default |
97 |
- newinitd "${FILESDIR}/x11vnc.init.d" x11vnc |
98 |
- newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc |
99 |
-} |
100 |
|
101 |
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild |
102 |
deleted file mode 100644 |
103 |
index e25329e5f47..00000000000 |
104 |
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild |
105 |
+++ /dev/null |
106 |
@@ -1,80 +0,0 @@ |
107 |
-# Copyright 1999-2020 Gentoo Authors |
108 |
-# Distributed under the terms of the GNU General Public License v2 |
109 |
- |
110 |
-EAPI=7 |
111 |
- |
112 |
-inherit autotools |
113 |
- |
114 |
-DESCRIPTION="VNC server for real X displays" |
115 |
-HOMEPAGE="https://libvnc.github.io/" |
116 |
-SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz" |
117 |
- |
118 |
-LICENSE="GPL-2+-with-openssl-exception" |
119 |
-SLOT="0" |
120 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" |
121 |
-IUSE="crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf" |
122 |
- |
123 |
-COMMON_DEPEND=" |
124 |
- >=net-libs/libvncserver-0.9.8[ssl=] |
125 |
- x11-libs/libX11 |
126 |
- x11-libs/libXcursor |
127 |
- x11-libs/libXext |
128 |
- >=x11-libs/libXtst-1.1.0 |
129 |
- ssl? ( |
130 |
- !libressl? ( dev-libs/openssl:0= ) |
131 |
- libressl? ( dev-libs/libressl:= ) |
132 |
- ) |
133 |
- xcomposite? ( x11-libs/libXcomposite ) |
134 |
- xdamage? ( x11-libs/libXdamage ) |
135 |
- xfixes? ( x11-libs/libXfixes ) |
136 |
- xinerama? ( x11-libs/libXinerama ) |
137 |
- xrandr? ( x11-libs/libXrandr ) |
138 |
- zeroconf? ( >=net-dns/avahi-0.6.4 ) |
139 |
-" |
140 |
-DEPEND="${COMMON_DEPEND} |
141 |
- x11-base/xorg-proto |
142 |
- x11-libs/libXt |
143 |
-" |
144 |
-# https://bugzilla.redhat.com/show_bug.cgi?id=920554 |
145 |
-RDEPEND="${COMMON_DEPEND} |
146 |
- dev-lang/tk:0 |
147 |
-" |
148 |
- |
149 |
-PATCHES=( |
150 |
- "${FILESDIR}"/${P}-crypto.patch # https://github.com/LibVNC/x11vnc/issues/86 |
151 |
- "${FILESDIR}"/${P}-anonymous-ssl.patch # https://github.com/LibVNC/x11vnc/pull/85 |
152 |
- "${FILESDIR}"/${P}-libressl.patch |
153 |
- "${FILESDIR}"/${P}-fno-common.patch |
154 |
-) |
155 |
- |
156 |
-src_prepare() { |
157 |
- default |
158 |
- eautoreconf |
159 |
-} |
160 |
- |
161 |
-src_configure() { |
162 |
- # --without-v4l because of missing video4linux 2.x support wrt #389079 |
163 |
- local myconf=( |
164 |
- --without-v4l |
165 |
- --without-xkeyboard |
166 |
- --without-fbpm |
167 |
- --without-dpms |
168 |
- $(use_with crypt) |
169 |
- $(use_with fbcon fbdev) |
170 |
- $(use_with ssl) |
171 |
- $(use_with ssl crypto) |
172 |
- $(use_with xcomposite) |
173 |
- $(use_with xdamage) |
174 |
- $(use_with xfixes) |
175 |
- $(use_with xinerama) |
176 |
- $(use_with xrandr) |
177 |
- $(use_with zeroconf avahi) |
178 |
- ) |
179 |
- econf "${myconf[@]}" |
180 |
-} |
181 |
- |
182 |
-src_install() { |
183 |
- default |
184 |
- newinitd "${FILESDIR}/x11vnc.init.d" x11vnc |
185 |
- newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc |
186 |
-} |