From dc45b83b28fb83e9659492066e347b8dc60bc9e3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 4 Feb 2018 12:30:23 +0000 Subject: gentoo resync 04.02.2018 --- gnome-base/gnome-shell/Manifest | 4 +- .../gnome-shell/files/3.22.3-CVE-2017-8288.patch | 45 ----- .../gnome-shell/gnome-shell-3.22.3-r2.ebuild | 196 --------------------- gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild | 4 +- 4 files changed, 3 insertions(+), 246 deletions(-) delete mode 100644 gnome-base/gnome-shell/files/3.22.3-CVE-2017-8288.patch delete mode 100644 gnome-base/gnome-shell/gnome-shell-3.22.3-r2.ebuild (limited to 'gnome-base/gnome-shell') diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest index f4ae6b08f650..17309bd4334d 100644 --- a/gnome-base/gnome-shell/Manifest +++ b/gnome-base/gnome-shell/Manifest @@ -1,10 +1,8 @@ -AUX 3.22.3-CVE-2017-8288.patch 1501 BLAKE2B 6c41df368d6561303857754f61255f426b62093e8373c769030baa94d11a64cee5f390992a10c153b7d64fffd3ecd48931b31119e5e46149f4355051b52a0875 SHA512 d077946918b5b7aa3e863e017dc71644c2a63220eb21589c0790ff34f35b2545e6fe2a4e19549f0fc1dc0a46104c766826bb3c98fade6e1c54eb7ba67fe33311 AUX gnome-shell-3.12-bluetooth-flag.patch 1894 BLAKE2B a53360d103faf25aa605cd5c73eeb892ce667f57313fbd90bdcf176151158b1389ba49becd4421d825e5d63d4dcb0a2e99618f3558de87f0afe2b46851a353f0 SHA512 dc18e16e2de667bef09d66acd68fbe0f4d8c0fd1725b352b0f9f4032e43481f2655b1812ffa6f8ae8441b215a372c27f5e1035b7eceeeb22ee18b1a256e79f80 AUX gnome-shell-3.22.0-defaults.patch 1228 BLAKE2B 9bb49d830c2bbc36123ca8fdddc02d4b750a5ffd174fa653ead26a75dc9478be4b5a39c31a004a3897655aae097c23f511d6bb494b0aede51fea74294be3fcf6 SHA512 f350324af68de8f7ae9dab609fdb81e272f9d545a125f3da85d9f06e4a0de09f857517d6c7a585ff1ea3b56f4d51b049cbeb62c39472d61d45026331104c5af5 AUX gnome-shell-3.22.0-gir-build-fix.patch 882 BLAKE2B 62a816accf06abd182d1381326ad2059a59b3ff9579475b160d9c6fa715acfcf0f3d9d3544bc435b13fcdd45cf420b761ea6681718e540a39533f615b7aa0214 SHA512 b534134cc76dce49c78621d9245e9c457f4eefc3ac89dc09f036a178524b0ad3608683f43a0920fdb1d36410aebbfdecd701725217b6239f4549ef4ba82b7213 DIST gnome-shell-3.22.3.tar.xz 1952576 BLAKE2B 26d974bc45b93342db3d23f9a999734b571c6819c1fdddc20e019e282bcfbdf6d9f40850667756046187e0e3a52a57ba60962cc49b7b4b49909ec5f992e518e6 SHA512 47d67910b321a182d3ecd41f20cd923ec433cc93ab04b0b31351ca0229505ecbf343b1307585e557ee757845dc09b2371b0c2197717ed532b71878c186337ee9 DIST gnome-shell-3.24.3.tar.xz 1982088 BLAKE2B 608b3e73d546dea543a23c31a64b03c32f35d118cd79fd0371a9e392377b4dd03bc16413443d643ed604a2fa81c2838939d92ef4c89a54469a8bd83dc9661f8f SHA512 369ed80b975369b79d4ac9b3f1fbd469fdde331e9079d09eeac6398a9b3c349b09f7570dfce1ed6e1cdfaf514b4b40c6038f34b6c3c7928470b2cd65b702ff15 -EBUILD gnome-shell-3.22.3-r2.ebuild 6637 BLAKE2B 2a911e1af1ad874225a07a64c50a16677fd6f1e4399f1f155e0e9ab4a52ef124cb44b47c2e5369aac3cfa9d20929d588b241174baacc5666f38e8706e86e3d6b SHA512 60914c7e4931a73e174ad470fa8581f519c68bee9cf98bc6fb499f483b52af0efc9ca818d8b0f09fd2500177588ab2f1f05472a27eeee0498ad23f2380dc93c6 -EBUILD gnome-shell-3.22.3.ebuild 6865 BLAKE2B 5c13185446bec0e28a319d0a56dfd05dd087706433f4efaf1fe4aadeb61573f89c333c944be55a24ba444f908f9b2031556a4cf86867701c3f10515f6169d133 SHA512 c454e77fda925908ff497818dc1559217628b0b4830fe8a8d70b3251c888f6d5e7c375e57bb2eacec8a6e25af01cfafc0ec6a7f3944a0cd6eb6853fcea9f06aa +EBUILD gnome-shell-3.22.3.ebuild 6847 BLAKE2B edb25faf602ece895a316042dd62896d84755f17f26f51a217c748b653e3ca729aae959c8a2fb39d51da654ee9f961855f69f43d15ad9777d1b6b0d22c10b212 SHA512 b0cb683473ec3a3dcffb1dd9fee56a6b9ec4dfe6f311a523c3920cbb690a69d5e4e73643bde1c6eb3faf4f4a6bb8337640d42ce92b2b8fd08b26e39666449ad3 EBUILD gnome-shell-3.24.3.ebuild 6568 BLAKE2B 6ecdb9b049a67d41d9051bfc606e480419e48e9eb84742901c7e022d7aadfc7ab9d83e82c3a00e49c17a3b4c52efd4f61180717035eb6819d2df1924443f0b84 SHA512 b7fa60c65c9c642d4da55803ad0d730ce5be3e5934cca34c83e076f4517e5b252f959b9bf40757ca8eaba434d48ed2bde7460bc72b7a1f250bdafc62706bc4ab MISC metadata.xml 738 BLAKE2B f379ab17d70d0241fffcef221940031cf797d3393c903fcc75c847e4bd985242c124b598e61ae50bce7e58ababe8595533bf3fb52fea47d75712eaa2af291492 SHA512 02db87e2ac6c43ed104ae911de8caf78632b861c4efd3bbf5b0cf7dfab1d4d79e023b724b140ca86e72961c06454479f4d814ad1ae5dfd481bfbc7a45af0c18b diff --git a/gnome-base/gnome-shell/files/3.22.3-CVE-2017-8288.patch b/gnome-base/gnome-shell/files/3.22.3-CVE-2017-8288.patch deleted file mode 100644 index f9c74d62fddd..000000000000 --- a/gnome-base/gnome-shell/files/3.22.3-CVE-2017-8288.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 560e976ee9c59d75907b5ef6ed2bc336719e37d3 Mon Sep 17 00:00:00 2001 -From: Emilio Pozuelo Monfort -Date: Tue, 25 Apr 2017 17:27:42 +0200 -Subject: [PATCH] extensionSystem: handle reloading broken extensions - -Some extensions out there may fail to reload. When that happens, -we need to catch any exceptions so that we don't leave things in -a broken state that could lead to leaving extensions enabled in -the screen shield. - -https://bugzilla.gnome.org/show_bug.cgi?id=781728 ---- - js/ui/extensionSystem.js | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js -index ba33222..1feaa2f 100644 ---- a/js/ui/extensionSystem.js -+++ b/js/ui/extensionSystem.js -@@ -276,12 +276,20 @@ function _onVersionValidationChanged() { - // temporarily disable them all - enabledExtensions = []; - for (let uuid in ExtensionUtils.extensions) -- reloadExtension(ExtensionUtils.extensions[uuid]); -+ try { -+ reloadExtension(ExtensionUtils.extensions[uuid]); -+ } catch(e) { -+ logExtensionError(uuid, e); -+ } - enabledExtensions = getEnabledExtensions(); - - if (Main.sessionMode.allowExtensions) { - enabledExtensions.forEach(function(uuid) { -- enableExtension(uuid); -+ try { -+ enableExtension(uuid); -+ } catch(e) { -+ logExtensionError(uuid, e); -+ } - }); - } - } --- -2.10.1 - diff --git a/gnome-base/gnome-shell/gnome-shell-3.22.3-r2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.22.3-r2.ebuild deleted file mode 100644 index 66d73e5efc0e..000000000000 --- a/gnome-base/gnome-shell/gnome-shell-3.22.3-r2.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -GNOME2_EAUTORECONF="yes" -PYTHON_COMPAT=( python{3_4,3_5} ) - -inherit gnome2 multilib pax-utils python-r1 systemd - -DESCRIPTION="Provides core UI functions for the GNOME 3 desktop" -HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell" - -LICENSE="GPL-2+ LGPL-2+" -SLOT="0" -IUSE="+bluetooth +browser-extension +ibus +networkmanager nsplugin -openrc-force" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -KEYWORDS="amd64 ~ia64 x86" - -# libXfixes-5.0 needed for pointer barriers -# FIXME: -# * gstreamer support is currently automagic -COMMON_DEPEND=" - >=app-accessibility/at-spi2-atk-2.5.3 - >=dev-libs/atk-2[introspection] - >=app-crypt/gcr-3.7.5[introspection] - >=dev-libs/glib-2.45.3:2[dbus] - >=dev-libs/gjs-1.39 - >=dev-libs/gobject-introspection-1.49.1:= - dev-libs/libical:= - >=x11-libs/gtk+-3.15.0:3[introspection] - >=dev-libs/libcroco-0.6.8:0.6 - >=gnome-base/gnome-desktop-3.7.90:3=[introspection] - >=gnome-base/gsettings-desktop-schemas-3.21.3 - >=gnome-extra/evolution-data-server-3.17.2:= - >=media-libs/gstreamer-0.11.92:1.0 - >=net-im/telepathy-logger-0.2.4[introspection] - >=net-libs/telepathy-glib-0.19[introspection] - >=sys-auth/polkit-0.100[introspection] - >=x11-libs/libXfixes-5.0 - x11-libs/libXtst - >=x11-wm/mutter-3.22.1[introspection] - >=x11-libs/startup-notification-0.11 - - ${PYTHON_DEPS} - dev-python/pygobject:3[${PYTHON_USEDEP}] - - dev-libs/dbus-glib - dev-libs/libxml2:2 - media-libs/libcanberra[gtk3] - media-libs/mesa - >=media-sound/pulseaudio-2 - >=net-libs/libsoup-2.40:2.4[introspection] - x11-libs/libX11 - x11-libs/gdk-pixbuf:2[introspection] - - x11-apps/mesa-progs - - bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) - networkmanager? ( - app-crypt/libsecret - >=gnome-extra/nm-applet-0.9.8 - >=net-misc/networkmanager-0.9.8:=[introspection] ) - nsplugin? ( >=dev-libs/json-glib-0.13.2 ) -" -# Runtime-only deps are probably incomplete and approximate. -# Introspection deps generated using: -# grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq -# Each block: -# 1. Introspection stuff needed via imports.gi.* -# 2. gnome-session is needed for gnome-session-quit -# 3. Control shell settings -# 4. Systemd needed for suspending support -# 5. xdg-utils needed for xdg-open, used by extension tool -# 6. adwaita-icon-theme and dejavu font neeed for various icons & arrows -# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c -# 8. IBus is needed for nls integration -RDEPEND="${COMMON_DEPEND} - app-accessibility/at-spi2-core:2[introspection] - >=app-accessibility/caribou-0.4.8 - dev-libs/libgweather:2[introspection] - >=sys-apps/accountsservice-0.6.14[introspection] - >=sys-power/upower-0.99:=[introspection] - x11-libs/pango[introspection] - - >=gnome-base/gnome-session-2.91.91 - >=gnome-base/gnome-settings-daemon-3.8.3 - - !openrc-force? ( >=sys-apps/systemd-31 ) - - x11-misc/xdg-utils - - media-fonts/dejavu - >=x11-themes/adwaita-icon-theme-3.19.90 - - networkmanager? ( - net-misc/mobile-broadband-provider-info - sys-libs/timezone-data ) - ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] ) -" -# avoid circular dependency, see bug #546134 -PDEPEND=" - >=gnome-base/gdm-3.5[introspection] - >=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?] - browser-extension? ( gnome-extra/chrome-gnome-shell ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/libxslt - >=dev-util/gdbus-codegen-2.45.3 - >=dev-util/gtk-doc-am-1.17 - gnome-base/gnome-common - sys-devel/autoconf-archive - >=sys-devel/gettext-0.19.6 - virtual/pkgconfig -" - -PATCHES=( - # Change favorites defaults, bug #479918 - "${FILESDIR}"/${PN}-3.22.0-defaults.patch - # Fix automagic gnome-bluetooth dep, bug #398145 - "${FILESDIR}"/${PN}-3.12-bluetooth-flag.patch - # Add missing path to libmutter-clutter when building .gir, bug #597842 - "${FILESDIR}"/${PN}-3.22.0-gir-build-fix.patch - # Little bug when user has toggled version validation in the session, bug #616698 - "${FILESDIR}"/${PV}-CVE-2017-8288.patch -) - -src_configure() { - # Do not error out on warnings - gnome2_src_configure \ - --enable-man \ - $(use_enable !openrc-force systemd) \ - $(use_with bluetooth) \ - $(use_enable networkmanager) \ - $(use_enable nsplugin browser-plugin) \ - BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins -} - -src_install() { - gnome2_src_install - python_replicate_script "${ED}/usr/bin/gnome-shell-extension-tool" - python_replicate_script "${ED}/usr/bin/gnome-shell-perf-tool" - - # Required for gnome-shell on hardened/PaX, bug #398941 - # Future-proof for >=spidermonkey-1.8.7 following polkit's example - if has_version '=dev-lang/spidermonkey-1.8.7[jit]'; then - pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs} - # Required for gnome-shell on hardened/PaX #457146 and #457194 - # PaX EMUTRAMP need to be on - elif has_version '>=dev-libs/libffi-3.0.13[pax_kernel]'; then - pax-mark E "${ED}usr/bin/gnome-shell"{,-extension-prefs} - else - pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs} - fi -} - -pkg_postinst() { - gnome2_pkg_postinst - - if ! has_version 'media-libs/gst-plugins-good:1.0' || \ - ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then - ewarn "To make use of GNOME Shell's built-in screen recording utility," - ewarn "you need to either install media-libs/gst-plugins-good:1.0" - ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" - ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." - fi - - if ! has_version "media-libs/mesa[llvm]"; then - elog "llvmpipe is used as fallback when no 3D acceleration" - elog "is available. You will need to enable llvm USE for" - elog "media-libs/mesa." - fi - - # https://bugs.gentoo.org/show_bug.cgi?id=563084 - if has_version "x11-drivers/nvidia-drivers[-kms]"; then - ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers," - ewarn "otherwise Gnome will fail to start" - fi - - if ! systemd_is_booted; then - ewarn "${PN} needs Systemd to be *running* for working" - ewarn "properly. Please follow this guide to migrate:" - ewarn "https://wiki.gentoo.org/wiki/Systemd" - fi - - if use openrc-force; then - ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement," - ewarn "this can lead to unexpected problems and is not supported neither by" - ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem," - ewarn "you will need to disable this USE flag system wide and retest before" - ewarn "opening any bug report." - fi -} diff --git a/gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild index f4a7da3a7451..9d87933477f9 100644 --- a/gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,7 +15,7 @@ SLOT="0" IUSE="+bluetooth +ibus +networkmanager nsplugin -openrc-force" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -KEYWORDS="~alpha ~arm ~ia64 ~ppc ~ppc64" +KEYWORDS="~alpha ~arm" # libXfixes-5.0 needed for pointer barriers # FIXME: -- cgit v1.2.3