1 |
commit: 5d30d6e4cc020dc6edbf9b3a94a12159f90ead4a |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 17 08:10:14 2017 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 17 08:10:14 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d30d6e4 |
7 |
|
8 |
net-libs/webkit-gtk: security cleanup |
9 |
|
10 |
Gentoo-bug: 614876 |
11 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
12 |
|
13 |
net-libs/webkit-gtk/Manifest | 1 - |
14 |
...kit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch | 22 -- |
15 |
net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild | 287 --------------------- |
16 |
3 files changed, 310 deletions(-) |
17 |
|
18 |
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest |
19 |
index 755456d09c4..80d1baa2f12 100644 |
20 |
--- a/net-libs/webkit-gtk/Manifest |
21 |
+++ b/net-libs/webkit-gtk/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
-DIST webkitgtk-2.14.5.tar.xz 13956352 SHA256 3ca8f1c33a9b43d6c753dcac1c0788656930e06382b10fdf5c2805ea8f96369f SHA512 3351d9b05458434835fa2db050c34906649c3b1222d7936d123306634a46e35e8cc3aa1bb7512b103af1996fce722254692826b6f695e32ae176032dc8c94e1c WHIRLPOOL 011745e5e1f8926b28b34ac797480b3c79ccfcf09d844d076d8cf3087959013f39f359d7a7ef06a8e95ca7e04d28284ff4901e483180d2a41b4b05568b658e74 |
24 |
DIST webkitgtk-2.16.1.tar.xz 14675996 SHA256 eb92383232328ce655b703c64370ed3795662479719ad1b4a869ed46769d2945 SHA512 4b8de15644d0d0f9814c674020cbbab8628347915b8010977dbe2365ce276ea05b3bf86171400ae8eb5bfdebbadcfabd1efce34a177b5c82aa765bd3351e7010 WHIRLPOOL c9deacbd229804aaaba88f9fcabdcde1a460430bb60258dfc8d7393723401d7e74d645ba8bf2dcf60e87c30739e45558b747911a4671a8950efe271cb7b86586 |
25 |
DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3 |
26 |
|
27 |
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch |
28 |
deleted file mode 100644 |
29 |
index 49af4484604..00000000000 |
30 |
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch |
31 |
+++ /dev/null |
32 |
@@ -1,22 +0,0 @@ |
33 |
-2015-08-24 Alexandre Rostovtsev <tetromino@g.o> |
34 |
- |
35 |
- webkit2gtkinjectedbundle requires forwarding headers |
36 |
- https://bugs.webkit.org/show_bug.cgi?id=148379 |
37 |
- |
38 |
- Fixes GTK build with -j1 |
39 |
- |
40 |
- * PlatformGTK.cmake: |
41 |
- |
42 |
-Index: Source/WebKit2/PlatformGTK.cmake |
43 |
-=================================================================== |
44 |
---- a/Source/WebKit2/PlatformGTK.cmake (revision 188859) |
45 |
-+++ b/Source/WebKit2/PlatformGTK.cmake (working copy) |
46 |
-@@ -860,7 +860,7 @@ include_directories( |
47 |
- ) |
48 |
- |
49 |
- add_library(webkit2gtkinjectedbundle MODULE "${WEBKIT2_DIR}/WebProcess/gtk/WebGtkInjectedBundleMain.cpp") |
50 |
--add_dependencies(webkit2gtkinjectedbundle GObjectDOMBindings) |
51 |
-+add_dependencies(webkit2gtkinjectedbundle GObjectDOMBindings WebKit2-forwarding-headers) |
52 |
- add_webkit2_prefix_header(webkit2gtkinjectedbundle) |
53 |
- |
54 |
- # Add ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} to LD_LIBRARY_PATH |
55 |
|
56 |
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild |
57 |
deleted file mode 100644 |
58 |
index 62b0b0e9c57..00000000000 |
59 |
--- a/net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild |
60 |
+++ /dev/null |
61 |
@@ -1,287 +0,0 @@ |
62 |
-# Copyright 1999-2017 Gentoo Foundation |
63 |
-# Distributed under the terms of the GNU General Public License v2 |
64 |
- |
65 |
-EAPI=6 |
66 |
-CMAKE_MAKEFILE_GENERATOR="ninja" |
67 |
-PYTHON_COMPAT=( python2_7 ) |
68 |
-USE_RUBY="ruby21 ruby22 ruby23 ruby24" |
69 |
- |
70 |
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx |
71 |
- |
72 |
-MY_P="webkitgtk-${PV}" |
73 |
-DESCRIPTION="Open source web browser engine" |
74 |
-HOMEPAGE="http://www.webkitgtk.org/" |
75 |
-SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz" |
76 |
- |
77 |
-LICENSE="LGPL-2+ BSD" |
78 |
-SLOT="4/37" # soname version of libwebkit2gtk-4.0 |
79 |
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" |
80 |
- |
81 |
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X" |
82 |
- |
83 |
-# webgl needs gstreamer, bug #560612 |
84 |
-REQUIRED_USE=" |
85 |
- geolocation? ( introspection ) |
86 |
- gles2? ( egl ) |
87 |
- introspection? ( gstreamer ) |
88 |
- nsplugin? ( X ) |
89 |
- webgl? ( ^^ ( gles2 opengl ) ) |
90 |
- !webgl? ( ?? ( gles2 opengl ) ) |
91 |
- webgl? ( gstreamer ) |
92 |
- wayland? ( egl ) |
93 |
- || ( aqua wayland X ) |
94 |
-" |
95 |
- |
96 |
-# Tests fail to link for inexplicable reasons |
97 |
-# https://bugs.webkit.org/show_bug.cgi?id=148210 |
98 |
-RESTRICT="test" |
99 |
- |
100 |
-# use sqlite, svg by default |
101 |
-# Aqua support in gtk3 is untested |
102 |
-# Dependencies found at Source/cmake/OptionsGTK.cmake |
103 |
-RDEPEND=" |
104 |
- dev-db/sqlite:3= |
105 |
- >=dev-libs/glib-2.36:2 |
106 |
- dev-libs/hyphen |
107 |
- >=dev-libs/icu-3.8.1-r1:= |
108 |
- >=dev-libs/libxml2-2.8:2 |
109 |
- >=dev-libs/libxslt-1.1.7 |
110 |
- >=media-libs/fontconfig-2.8:1.0 |
111 |
- >=media-libs/freetype-2.4.2:2 |
112 |
- >=media-libs/harfbuzz-0.9.18:=[icu(+)] |
113 |
- >=media-libs/libpng-1.4:0= |
114 |
- media-libs/libwebp:= |
115 |
- >=net-libs/gnutls-3 |
116 |
- >=net-libs/libsoup-2.42:2.4[introspection?] |
117 |
- >=x11-libs/cairo-1.10.2:= |
118 |
- >=x11-libs/gtk+-3.14:3[introspection?] |
119 |
- >=x11-libs/pango-1.30.0 |
120 |
- virtual/jpeg:0= |
121 |
- |
122 |
- aqua? ( >=x11-libs/gtk+-3.14:3[aqua] ) |
123 |
- egl? ( media-libs/mesa[egl] ) |
124 |
- geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) |
125 |
- gles2? ( media-libs/mesa[gles2] ) |
126 |
- gnome-keyring? ( app-crypt/libsecret ) |
127 |
- gstreamer? ( |
128 |
- >=media-libs/gstreamer-1.2:1.0 |
129 |
- >=media-libs/gst-plugins-base-1.2:1.0 |
130 |
- >=media-libs/gst-plugins-bad-1.8:1.0[opengl?] ) |
131 |
- introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) |
132 |
- libnotify? ( x11-libs/libnotify ) |
133 |
- nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) |
134 |
- opengl? ( virtual/opengl |
135 |
- x11-libs/cairo[opengl] ) |
136 |
- spell? ( >=app-text/enchant-0.22:= ) |
137 |
- wayland? ( >=x11-libs/gtk+-3.14:3[wayland] ) |
138 |
- webgl? ( |
139 |
- x11-libs/cairo[opengl] |
140 |
- x11-libs/libXcomposite |
141 |
- x11-libs/libXdamage ) |
142 |
- X? ( |
143 |
- x11-libs/cairo[X] |
144 |
- >=x11-libs/gtk+-3.14:3[X] |
145 |
- x11-libs/libX11 |
146 |
- x11-libs/libXcomposite |
147 |
- x11-libs/libXrender |
148 |
- x11-libs/libXt ) |
149 |
-" |
150 |
- |
151 |
-# paxctl needed for bug #407085 |
152 |
-# Need real bison, not yacc |
153 |
-DEPEND="${RDEPEND} |
154 |
- ${PYTHON_DEPS} |
155 |
- ${RUBY_DEPS} |
156 |
- >=dev-lang/perl-5.10 |
157 |
- >=app-accessibility/at-spi2-core-2.5.3 |
158 |
- >=dev-libs/atk-2.8.0 |
159 |
- >=dev-util/gtk-doc-am-1.10 |
160 |
- >=dev-util/gperf-3.0.1 |
161 |
- >=sys-devel/bison-2.4.3 |
162 |
- >=sys-devel/flex-2.5.34 |
163 |
- || ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 ) |
164 |
- sys-devel/gettext |
165 |
- virtual/pkgconfig |
166 |
- |
167 |
- doc? ( >=dev-util/gtk-doc-1.10 ) |
168 |
- geolocation? ( dev-util/gdbus-codegen ) |
169 |
- introspection? ( jit? ( sys-apps/paxctl ) ) |
170 |
- test? ( |
171 |
- dev-lang/python:2.7 |
172 |
- dev-python/pygobject:3[python_targets_python2_7] |
173 |
- x11-themes/hicolor-icon-theme |
174 |
- jit? ( sys-apps/paxctl ) ) |
175 |
-" |
176 |
- |
177 |
-S="${WORKDIR}/${MY_P}" |
178 |
- |
179 |
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307 |
180 |
- |
181 |
-PATCHES=( |
182 |
- # https://bugs.gentoo.org/show_bug.cgi?id=555504 |
183 |
- "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch |
184 |
- |
185 |
- # https://bugs.gentoo.org/show_bug.cgi?id=564352 |
186 |
- # https://bugs.webkit.org/show_bug.cgi?id=167283 |
187 |
- "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch |
188 |
- |
189 |
- # https://bugs.webkit.org/show_bug.cgi?id=148379 |
190 |
- "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch |
191 |
-) |
192 |
- |
193 |
-pkg_pretend() { |
194 |
- if [[ ${MERGE_TYPE} != "binary" ]] ; then |
195 |
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then |
196 |
- einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS" |
197 |
- check-reqs_pkg_pretend |
198 |
- fi |
199 |
- |
200 |
- if ! test-flag-CXX -std=c++11 ; then |
201 |
- die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags" |
202 |
- fi |
203 |
- |
204 |
- if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then |
205 |
- die 'The active compiler needs to be gcc 4.9 (or newer)' |
206 |
- fi |
207 |
- fi |
208 |
-} |
209 |
- |
210 |
-pkg_setup() { |
211 |
- if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then |
212 |
- check-reqs_pkg_setup |
213 |
- fi |
214 |
- |
215 |
- python-any-r1_pkg_setup |
216 |
-} |
217 |
- |
218 |
-src_configure() { |
219 |
- # Respect CC, otherwise fails on prefix #395875 |
220 |
- tc-export CC |
221 |
- |
222 |
- # Arches without JIT support also need this to really disable it in all places |
223 |
- use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0 |
224 |
- |
225 |
- # It does not compile on alpha without this in LDFLAGS |
226 |
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761 |
227 |
- use alpha && append-ldflags "-Wl,--no-relax" |
228 |
- |
229 |
- # ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504 |
230 |
- use ia64 && append-ldflags "-Wl,--no-as-needed" |
231 |
- |
232 |
- # Sigbuses on SPARC with mcpu and co., bug #??? |
233 |
- use sparc && filter-flags "-mvis" |
234 |
- |
235 |
- # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634 |
236 |
- use ppc64 && append-flags "-mminimal-toc" |
237 |
- |
238 |
- # Try to use less memory, bug #469942 (see Fedora .spec for reference) |
239 |
- # --no-keep-memory doesn't work on ia64, bug #502492 |
240 |
- if ! use ia64; then |
241 |
- append-ldflags "-Wl,--no-keep-memory" |
242 |
- fi |
243 |
- |
244 |
- # We try to use gold when possible for this package |
245 |
-# if ! tc-ld-is-gold ; then |
246 |
-# append-ldflags "-Wl,--reduce-memory-overheads" |
247 |
-# fi |
248 |
- |
249 |
- # older glibc needs this for INTPTR_MAX, bug #533976 |
250 |
- if has_version "<sys-libs/glibc-2.18" ; then |
251 |
- append-cppflags "-D__STDC_LIMIT_MACROS" |
252 |
- fi |
253 |
- |
254 |
- # Multiple rendering bugs on youtube, github, etc without this, bug #547224 |
255 |
- append-flags $(test-flags -fno-strict-aliasing) |
256 |
- |
257 |
- local ruby_interpreter="" |
258 |
- |
259 |
- if has_version "virtual/rubygems[ruby_targets_ruby24]"; then |
260 |
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)" |
261 |
- elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then |
262 |
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)" |
263 |
- elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then |
264 |
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)" |
265 |
- else |
266 |
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)" |
267 |
- fi |
268 |
- |
269 |
- # TODO: Check Web Audio support |
270 |
- # should somehow let user select between them? |
271 |
- # |
272 |
- # FTL_JIT requires llvm |
273 |
- # |
274 |
- # opengl needs to be explicetly handled, bug #576634 |
275 |
- |
276 |
- local opengl_enabled |
277 |
- if use opengl || use gles2; then |
278 |
- opengl_enabled=ON |
279 |
- else |
280 |
- opengl_enabled=OFF |
281 |
- fi |
282 |
- |
283 |
- # support for webgl (aka 2d-canvas accelerating) |
284 |
- local canvas_enabled |
285 |
- if use webgl && ! use gles2 ; then |
286 |
- canvas_enabled=ON |
287 |
- else |
288 |
- canvas_enabled=OFF |
289 |
- fi |
290 |
- |
291 |
- local mycmakeargs=( |
292 |
- -DENABLE_QUARTZ_TARGET=$(usex aqua) |
293 |
- -DENABLE_API_TESTS=$(usex test) |
294 |
- -DENABLE_GTKDOC=$(usex doc) |
295 |
- -DENABLE_GEOLOCATION=$(usex geolocation) |
296 |
- $(cmake-utils_use_find_package gles2 OpenGLES2) |
297 |
- -DENABLE_GLES2=$(usex gles2) |
298 |
- -DENABLE_CREDENTIAL_STORAGE=$(usex gnome-keyring) |
299 |
- -DENABLE_VIDEO=$(usex gstreamer) |
300 |
- -DENABLE_WEB_AUDIO=$(usex gstreamer) |
301 |
- -DENABLE_INTROSPECTION=$(usex introspection) |
302 |
- -DENABLE_JIT=$(usex jit) |
303 |
- -DUSE_LIBNOTIFY=$(usex libnotify) |
304 |
- -DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin) |
305 |
- -DENABLE_SPELLCHECK=$(usex spell) |
306 |
- -DENABLE_WAYLAND_TARGET=$(usex wayland) |
307 |
- -DENABLE_WEBGL=$(usex webgl) |
308 |
- $(cmake-utils_use_find_package egl EGL) |
309 |
- $(cmake-utils_use_find_package opengl OpenGL) |
310 |
- -DENABLE_X11_TARGET=$(usex X) |
311 |
- -DENABLE_OPENGL=${opengl_enabled} |
312 |
- -DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled} |
313 |
- -DCMAKE_BUILD_TYPE=Release |
314 |
- -DPORT=GTK |
315 |
- ${ruby_interpreter} |
316 |
- ) |
317 |
- |
318 |
- # Allow it to use GOLD when possible as it has all the magic to |
319 |
- # detect when to use it and using gold for this concrete package has |
320 |
- # multiple advantages and is also the upstream default, bug #585788 |
321 |
-# if tc-ld-is-gold ; then |
322 |
-# mycmakeargs+=( -DUSE_LD_GOLD=ON ) |
323 |
-# else |
324 |
-# mycmakeargs+=( -DUSE_LD_GOLD=OFF ) |
325 |
-# fi |
326 |
- |
327 |
- cmake-utils_src_configure |
328 |
-} |
329 |
- |
330 |
-src_compile() { |
331 |
- cmake-utils_src_compile |
332 |
-} |
333 |
- |
334 |
-src_test() { |
335 |
- # Prevents test failures on PaX systems |
336 |
- use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test* |
337 |
- |
338 |
- cmake-utils_src_test |
339 |
-} |
340 |
- |
341 |
-src_install() { |
342 |
- cmake-utils_src_install |
343 |
- |
344 |
- # Prevents crashes on PaX systems, bug #522808 |
345 |
- use jit && pax-mark m "${ED}usr/bin/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess" |
346 |
- pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess" |
347 |
- use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2 |
348 |
-} |