commit: 43fc584e95a71b1115a8e73629d87c2f233d3fbc Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Tue Dec 11 13:58:31 2018 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue Dec 11 14:00:27 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43fc584e
x11-libs/gksu: Remove last-rited pkg Closes: https://bugs.gentoo.org/425156 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> profiles/arch/alpha/package.use.stable.mask | 3 +- profiles/arch/arm/package.use.stable.mask | 3 +- profiles/arch/arm64/package.use.mask | 1 - profiles/arch/ia64/package.use.stable.mask | 3 +- .../arch/powerpc/ppc32/package.use.stable.mask | 3 +- .../arch/powerpc/ppc64/package.use.stable.mask | 3 +- profiles/arch/sparc/package.use.stable.mask | 3 +- profiles/package.mask | 1 - x11-libs/gksu/Manifest | 1 - .../gksu/files/gksu-2.0.2-format_security.patch | 37 ---------- x11-libs/gksu/files/gksu-2.0.2-glib-2.31.patch | 29 -------- x11-libs/gksu/files/gksu-2.0.2-nautilus-dir.patch | 58 --------------- x11-libs/gksu/gksu-2.0.2-r2.ebuild | 85 ---------------------- x11-libs/gksu/metadata.xml | 8 -- 14 files changed, 6 insertions(+), 232 deletions(-) diff --git a/profiles/arch/alpha/package.use.stable.mask b/profiles/arch/alpha/package.use.stable.mask index 797869d67db..600a4ec10ec 100644 --- a/profiles/arch/alpha/package.use.stable.mask +++ b/profiles/arch/alpha/package.use.stable.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # When you add an entry to the top of this file, add your name, the date, and @@ -42,4 +42,3 @@ dev-util/geany-plugins gtkspell gnome-base/gvfs google media-plugins/gst-plugins-meta modplug >=x11-libs/gtk+-3.12.2 cloudprint -x11-libs/gksu gnome diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask index c96af7e7594..167d8b00ca3 100644 --- a/profiles/arch/arm/package.use.stable.mask +++ b/profiles/arch/arm/package.use.stable.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Andreas Sturmlechner <ast...@gentoo.org> (04 Nov 2018) @@ -139,7 +139,6 @@ www-client/qupzilla kwallet gnome-base/gvfs google net-libs/libproxy webkit >=x11-libs/gtk+-3.12.2 cloudprint -x11-libs/gksu gnome # Ian Whyman <thev00...@gentoo.org> (22 May 2016) # RPI support on arm diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask index 7b14c4a3c27..55d0fb0dd99 100644 --- a/profiles/arch/arm64/package.use.mask +++ b/profiles/arch/arm64/package.use.mask @@ -53,7 +53,6 @@ dev-python/networkx pandas test # Unkeyworded dependencies. dev-python/matplotlib doc net-libs/gnome-online-accounts gnome -x11-libs/gksu gnome # Thomas Deutschmann <whi...@gentoo.org> (04 Jul 2018) # dev-libs/xxhash not keyworded for arm64 diff --git a/profiles/arch/ia64/package.use.stable.mask b/profiles/arch/ia64/package.use.stable.mask index 7b7ca320a84..e8785d27da7 100644 --- a/profiles/arch/ia64/package.use.stable.mask +++ b/profiles/arch/ia64/package.use.stable.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # When you add an entry to the top of this file, add your name, the date, and @@ -37,4 +37,3 @@ dev-util/geany-plugins gtkspell >=gnome-base/gnome-desktop-2.32.1-r2 license-docs gnome-base/gvfs google >=x11-libs/gtk+-3.12.2 cloudprint -x11-libs/gksu gnome diff --git a/profiles/arch/powerpc/ppc32/package.use.stable.mask b/profiles/arch/powerpc/ppc32/package.use.stable.mask index 178d09b46be..03a07acf658 100644 --- a/profiles/arch/powerpc/ppc32/package.use.stable.mask +++ b/profiles/arch/powerpc/ppc32/package.use.stable.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # When you add an entry to the top of this file, add your name, the date, and @@ -49,4 +49,3 @@ gnome-base/gvfs google mail-client/balsa webkit net-libs/libproxy webkit >=x11-libs/gtk+-3.12.2 cloudprint -x11-libs/gksu gnome diff --git a/profiles/arch/powerpc/ppc64/package.use.stable.mask b/profiles/arch/powerpc/ppc64/package.use.stable.mask index d4d19ba69d6..40df4a14f5d 100644 --- a/profiles/arch/powerpc/ppc64/package.use.stable.mask +++ b/profiles/arch/powerpc/ppc64/package.use.stable.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # When you add an entry to the top of this file, add your name, the date, and @@ -22,4 +22,3 @@ >=gnome-base/gnome-desktop-2.32.1-r2 license-docs gnome-base/gvfs google >=x11-libs/gtk+-3.12.2 cloudprint -x11-libs/gksu gnome diff --git a/profiles/arch/sparc/package.use.stable.mask b/profiles/arch/sparc/package.use.stable.mask index 23afb743224..c13e2db6af2 100644 --- a/profiles/arch/sparc/package.use.stable.mask +++ b/profiles/arch/sparc/package.use.stable.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # When you add an entry to the top of this file, add your name, the date, and @@ -57,4 +57,3 @@ dev-util/geany-plugins gtkspell >=gnome-base/gnome-desktop-2.32.1-r2 license-docs gnome-base/gvfs google >=x11-libs/gtk+-3.12.2 cloudprint -x11-libs/gksu gnome diff --git a/profiles/package.mask b/profiles/package.mask index 1d10d183799..eab01cdd080 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -146,7 +146,6 @@ dev-ruby/wikicloth # Pacho Ramos <pa...@gentoo.org> (11 Nov 2018) # Dead for years (#425156) with security issues (#534540). Removal in a # month. -x11-libs/gksu x11-libs/libgksu # Pacho Ramos <pa...@gentoo.org> (11 Nov 2018) diff --git a/x11-libs/gksu/Manifest b/x11-libs/gksu/Manifest deleted file mode 100644 index d070e81888d..00000000000 --- a/x11-libs/gksu/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gksu-2.0.2.tar.gz 468121 BLAKE2B 42324abed0d79eb00454d23a95b356b023a25e39e1119860d7f271f56b34716e4d4f9084156beb526379fdd9bbe25f2c8591e56e40238d3a79e7b3d8ff4fca58 SHA512 8afde61e10c8a22bef3c8a5c2d90bd599d00ad9b71b30b2edc9c114be91ca8456e1af5c9db03fe02416424e50aa20c23eaefb2a8fd1db77aac37da7e85604f75 diff --git a/x11-libs/gksu/files/gksu-2.0.2-format_security.patch b/x11-libs/gksu/files/gksu-2.0.2-format_security.patch deleted file mode 100644 index ca87e9af995..00000000000 --- a/x11-libs/gksu/files/gksu-2.0.2-format_security.patch +++ /dev/null @@ -1,37 +0,0 @@ -Description: Fix possible format string vulnerabilities -Author: Michael Biebl <bi...@debian.org> -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=643389 -Index: gksu-2.0.2/gksu/gksu.c -=================================================================== ---- gksu-2.0.2.orig/gksu/gksu.c 2009-03-04 19:25:32.000000000 +0100 -+++ gksu-2.0.2/gksu/gksu.c 2011-10-10 18:31:04.599677143 +0200 -@@ -146,9 +146,12 @@ - msg = g_strdup_vprintf(format, ap); - va_end(ap); - -- diag_win = gtk_message_dialog_new_with_markup (NULL, GTK_DIALOG_MODAL, -- type, GTK_BUTTONS_CLOSE, -- msg); -+ diag_win = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, -+ type, GTK_BUTTONS_CLOSE, -+ NULL); -+ -+ gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG(diag_win), -+ msg); - - gtk_signal_connect_object (GTK_OBJECT(diag_win), "delete_event", - GTK_SIGNAL_FUNC(gtk_main_quit), -@@ -176,12 +179,7 @@ - g_key_file_load_from_file (desktop, file_name, G_KEY_FILE_NONE, &error); - if (error) - { -- gchar *error_msg; -- -- error_msg = g_strdup_printf ("Could not load desktop file: %s", -- error->message); -- g_warning (error_msg); -- g_free (error_msg); -+ g_warning ("Could not load desktop file: %s", error->message); - g_error_free (error); - g_key_file_free (desktop); - return; diff --git a/x11-libs/gksu/files/gksu-2.0.2-glib-2.31.patch b/x11-libs/gksu/files/gksu-2.0.2-glib-2.31.patch deleted file mode 100644 index fd711a321ac..00000000000 --- a/x11-libs/gksu/files/gksu-2.0.2-glib-2.31.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 10c7e67e11a56e2fe1acf9b085772bc995d35bc0 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetrom...@gentoo.org> -Date: Sat, 7 Apr 2012 17:57:36 -0400 -Subject: [PATCH] Fix glib includes for building with >=glib-2.31 - -glib-2.31 and newer no longer allow most glib subheaders to be included -directly. - -https://savannah.nongnu.org/bugs/index.php?36127 ---- - nautilus-gksu/libnautilus-gksu.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/nautilus-gksu/libnautilus-gksu.c b/nautilus-gksu/libnautilus-gksu.c -index 8e44d29..4acf3f8 100644 ---- a/nautilus-gksu/libnautilus-gksu.c -+++ b/nautilus-gksu/libnautilus-gksu.c -@@ -5,7 +5,7 @@ - #include <string.h> - #include <pthread.h> - --#include <glib/gkeyfile.h> -+#include <glib.h> - #include <gtk/gtk.h> - #include <gio/gio.h> - #include <libnautilus-extension/nautilus-extension-types.h> --- -1.7.8.5 - diff --git a/x11-libs/gksu/files/gksu-2.0.2-nautilus-dir.patch b/x11-libs/gksu/files/gksu-2.0.2-nautilus-dir.patch deleted file mode 100644 index bc21b56c663..00000000000 --- a/x11-libs/gksu/files/gksu-2.0.2-nautilus-dir.patch +++ /dev/null @@ -1,58 +0,0 @@ -From d7ee2b46dad2070982b035a3136ccbb5787e9ed4 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetrom...@gentoo.org> -Date: Sat, 7 Apr 2012 19:39:03 -0400 -Subject: [PATCH] Fix nautilus extensions directory for nautilus-3 - -The gksu nautilus extension works with both nautilus-2 and nautilus-3, -so we should not assume that the extension is always installed in -/usr/lib/nautilus/extensions-2.0 - -https://savannah.nongnu.org/bugs/index.php?36129 ---- - configure.ac | 14 +++++++++++++- - nautilus-gksu/Makefile.am | 2 +- - 2 files changed, 14 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 21d33bb..d65c586 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -64,9 +64,21 @@ AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test x$use_libtool = xyes) - - AC_ARG_ENABLE(nautilus-extension, [ --enable-nautilus-extension Build the nautilus extensions module [default=yes]], enable_nautilus_extension="$enableval", enable_nautilus_extension=yes) - AM_CONDITIONAL(ENABLE_NAUTILUS_EXTENSION, test x$enable_nautilus_extension = xyes) -+AC_ARG_WITH(nautilus-extensions-dir, -+ AS_HELP_STRING([--with-nautilus-extension-dir=DIR], -+ [Directory where nautilus extensions have to be installed (usually /usr/lib/nautilus/extensions-2.0 or -3.0)])) - - if test x$enable_nautilus_extension = xyes; then -- PKG_CHECK_MODULES(NAUTILUS, [libgksu2 >= 2.0.0, libnautilus-extension]) -+ PKG_CHECK_MODULES(NAUTILUS, [libgksu2 >= 2.0.0, libnautilus-extension]) -+ if test "x$with_nautilus_extension_dir" = x; then -+ AC_MSG_CHECKING([for Nautilus extensions directory]) -+ with_nautilus_extension_dir=`pkg-config --variable=extensiondir libnautilus-extension` -+ if test "x$with_nautilus_extension_dir" = x; then -+ AC_MSG_ERROR([not found. You can specify the extensions directory manually using --with-nautilus-extension-dir=DIR]) -+ fi -+ AC_MSG_RESULT($with_nautilus_extension_dir) -+ fi -+ AC_SUBST(NAUTILUS_EXTENSION_DIR, [$with_nautilus_extensios_dir]) - fi - - AC_CONFIG_FILES([ -diff --git a/nautilus-gksu/Makefile.am b/nautilus-gksu/Makefile.am -index 3a70c78..cbe4d00 100644 ---- a/nautilus-gksu/Makefile.am -+++ b/nautilus-gksu/Makefile.am -@@ -2,7 +2,7 @@ AM_CFLAGS = -g -O2 -Wall - INCLUDES = ${NAUTILUS_CFLAGS} - AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" - --nautilus_extensiondir=$(libdir)/nautilus/extensions-2.0 -+nautilus_extensiondir=$(NAUTILUS_EXTENSION_DIR) - nautilus_extension_LTLIBRARIES = libnautilus-gksu.la - libnautilus_gksu_la_SOURCES = libnautilus-gksu.c - libnautilus_gksu_la_LDFLAGS = LDFLAGS = -module -avoid-version -no-undefined --- -1.7.8.5 - diff --git a/x11-libs/gksu/gksu-2.0.2-r2.ebuild b/x11-libs/gksu/gksu-2.0.2-r2.ebuild deleted file mode 100644 index fa4ccabcb3b..00000000000 --- a/x11-libs/gksu/gksu-2.0.2-r2.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools gnome2 fixheadtails - -DESCRIPTION="A gtk+ frontend for libgksu" -HOMEPAGE="http://www.nongnu.org/gksu/"; -SRC_URI="https://people.debian.org/~kov/gksu/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd" -IUSE="gnome" - -RDEPEND=" - >=x11-libs/libgksu-2.0.8 - >=x11-libs/gtk+-2.4:2 - >=gnome-base/gconf-2 - gnome? ( - >=gnome-base/nautilus-2 - x11-terms/gnome-terminal ) -" -DEPEND="${RDEPEND} - dev-util/gtk-doc-am - dev-util/intltool - virtual/pkgconfig -" - -src_prepare() { - ht_fix_file "${S}/gksu-migrate-conf.sh" - - # https://savannah.nongnu.org/bugs/index.php?36127 - eapply "${FILESDIR}"/${PN}-2.0.2-glib-2.31.patch - - if use gnome ; then - sed 's/x-terminal-emulator/gnome-terminal/' \ - -i gksu.desktop || die "sed 1 failed" - - # Conditional patch to avoid eautoreconf - # https://savannah.nongnu.org/bugs/index.php?36129 - eapply "${FILESDIR}"/${PN}-2.0.2-nautilus-dir.patch - - sed -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \ - -i configure.ac || die #467024 - - eautoreconf - else - sed 's/dist_desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)/dist_desktop_DATA =/' \ - -i Makefile.am Makefile.in || die "sed 2 failed" - fi - - # Fix build with format-security, bug #517664 - eapply "${FILESDIR}"/${PN}-2.0.2-format_security.patch - - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-static \ - $(use_enable gnome nautilus-extension) -} - -src_install() { - gnome2_src_install - chmod +x "${D}/usr/share/gksu/gksu-migrate-conf.sh" -} - -pkg_postinst() { - gnome2_pkg_postinst - einfo 'updating configuration' - "${ROOT}"/usr/share/gksu/gksu-migrate-conf.sh - einfo "" - einfo "A note on gksudo: It actually runs sudo to get it's work done" - einfo "However, by default, Gentoo's sudo wipes your environment." - einfo "This means that gksudo will fail to run any X-based programs." - einfo "You need to either add yourself to wheel and uncomment this line" - einfo "in your /etc/sudoers:" - einfo "Defaults:%wheel !env_reset" - einfo "Or remove the env_reset line entirely. This can cause security" - einfo "problems; if you don't trust your users, don't do this, use gksu" - einfo "instead." -} diff --git a/x11-libs/gksu/metadata.xml b/x11-libs/gksu/metadata.xml deleted file mode 100644 index 39980802b1d..00000000000 --- a/x11-libs/gksu/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="project"> - <email>gn...@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -</pkgmetadata>
