diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2019-06-05 22:49:00 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-06-09 13:36:31 +0200 |
commit | 39b7c2d3a288642b41a319357d4452b3b2e6cb23 (patch) | |
tree | 8d4cfa5229598e34ec15b54e52468bb8fb4a87b9 /sys-auth | |
parent | gnome-extra/polkit-gnome: Drop to ~hppa (diff) | |
download | gentoo-39b7c2d3a288642b41a319357d4452b3b2e6cb23.tar.gz gentoo-39b7c2d3a288642b41a319357d4452b3b2e6cb23.tar.bz2 gentoo-39b7c2d3a288642b41a319357d4452b3b2e6cb23.zip |
sys-auth/polkit: Drop vulnerable 0.113-r4
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'sys-auth')
-rw-r--r-- | sys-auth/polkit/Manifest | 1 | ||||
-rw-r--r-- | sys-auth/polkit/files/polkit-0.113-elogind.patch | 178 | ||||
-rw-r--r-- | sys-auth/polkit/polkit-0.113-r4.ebuild | 137 |
3 files changed, 0 insertions, 316 deletions
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest index 9a7146114997..201ccd87ea20 100644 --- a/sys-auth/polkit/Manifest +++ b/sys-auth/polkit/Manifest @@ -1,3 +1,2 @@ -DIST polkit-0.113.tar.gz 1448865 BLAKE2B 93cb6abf03d0de193e9f64b953bee40faf3bd07cf6f86beb4f84edd740dedc0bcf7a1ffd6b3a1a816e5adad0ee59536dacae3d991add4c4965cc6a98566b7470 SHA512 ab177c89a20eeb2978ddbe28afb205d3619f9c5defe833eb68a85e71a0f2c905367f1295cbbfb85da5eafdd661bce474d5d84aca9195cd425a18c9b4170eb5f9 DIST polkit-0.115.tar.gz 1550932 BLAKE2B 3185ebed46209f88a9ffccbbcaf1bf180d1ae6d5ec53cf3c66d867ad43910b47a1123a3db190991ebb382a0d28fc5a119ea4bab942db324e9af5663056cf6ee1 SHA512 1153011fa93145b2c184e6b3446d3ca21b38918641aeccd8fac3985ac3e30ec6bc75be6973985fde90f2a24236592f1595be259155061c2d33358dd17c4ee4fc DIST polkit-0.116.tar.gz 1548311 BLAKE2B e9761a2934136d453a47b81dd1f132f9fc96c45b731d5fceb2aa7706f5325b6499f6acbb68032befc1b21878b1b54754685607c916ca8e02a8accca3ca014b31 SHA512 b66b01cc2bb4349de70147f41f161f0f6f41e7230b581dfb054058b48969ec57041ab05b51787c749ccfc36aa5f317952d7e7ba337b4f6f6c0a923ed5866c2d5 diff --git a/sys-auth/polkit/files/polkit-0.113-elogind.patch b/sys-auth/polkit/files/polkit-0.113-elogind.patch deleted file mode 100644 index c822e00d24a7..000000000000 --- a/sys-auth/polkit/files/polkit-0.113-elogind.patch +++ /dev/null @@ -1,178 +0,0 @@ ---- a/configure.ac 2016-11-03 20:16:02.842071344 +0100 -+++ b/configure.ac 2016-11-03 20:15:34.612071850 +0100 -@@ -183,11 +183,12 @@ - - AM_CONDITIONAL(BUILD_TEST, [test "x$enable_test" = "xyes"]) - --dnl --------------------------------------------------------------------------- --dnl - Select wether to use libsystemd-login or ConsoleKit for session tracking --dnl --------------------------------------------------------------------------- -+dnl ----------------------------------------------------------------------------------- -+dnl - Select wether to use libsystemd-login, elogind or ConsoleKit for session tracking -+dnl ----------------------------------------------------------------------------------- - - have_libsystemd=no -+have_elogind=no - SESSION_TRACKING=ConsoleKit - - AC_ARG_ENABLE([libsystemd-login], -@@ -220,6 +221,29 @@ - fi - fi - fi -+ -+AC_ARG_ENABLE([libelogind], -+ [AS_HELP_STRING([--enable-libelogind[=@<:@auto/yes/no@:>@]], [Use libelogind (auto/yes/no)])], -+ [enable_libelogind=$enableval], -+ [enable_libelogind=auto]) -+if test "$enable_libelogind" != "no"; then -+ PKG_CHECK_MODULES([LIBELOGIND], -+ [libelogind], -+ [have_libelogind=yes], -+ [have_libelogind=no]) -+ if test "$have_libelogind" = "yes"; then -+ SESSION_TRACKING=libelogind -+ AC_DEFINE([HAVE_LIBELOGIND], 1, [Define to 1 if libelogind is available]) -+ save_LIBS=$LIBS -+ LIBS=$LIBELOGIND_LIBS -+ AC_CHECK_FUNCS(sd_uid_get_display) -+ LIBS=$save_LIBS -+ else -+ if test "$enable_libelogind" = "yes"; then -+ AC_MSG_ERROR([libelogind support requested but libelogind not found]) -+ fi -+ fi -+fi - - AS_IF([test "x$cross_compiling" != "xyes" ], [ - AS_IF([test "$have_libsystemd" = "yes"], [ -@@ -245,6 +245,10 @@ - AC_SUBST(LIBSYSTEMD_LIBS) - AM_CONDITIONAL(HAVE_LIBSYSTEMD, [test "$have_libsystemd" = "yes"], [Using libsystemd]) - -+AC_SUBST(LIBELOGIND_CFLAGS) -+AC_SUBST(LIBELOGIND_LIBS) -+AM_CONDITIONAL(HAVE_LIBELOGIND, [test "$have_libelogind" = "yes"], [Using libelogind]) -+ - dnl --------------------------------------------------------------------------- - dnl - systemd unit / service files - dnl --------------------------------------------------------------------------- ---- a/src/polkitbackend/Makefile.am 2016-11-04 04:40:46.930116006 +0100 -+++ b/src/polkitbackend/Makefile.am 2016-11-04 04:42:14.586114436 +0100 -@@ -42,21 +42,28 @@ - libpolkit_backend_1_la_SOURCES += \ - polkitbackendsessionmonitor.h polkitbackendsessionmonitor-systemd.c - else -+if HAVE_LIBELOGIND -+libpolkit_backend_1_la_SOURCES += \ -+ polkitbackendsessionmonitor.h polkitbackendsessionmonitor-systemd.c -+else - libpolkit_backend_1_la_SOURCES += \ - polkitbackendsessionmonitor.h polkitbackendsessionmonitor.c - endif -+endif - - libpolkit_backend_1_la_CFLAGS = \ - -D_POLKIT_COMPILATION \ - -D_POLKIT_BACKEND_COMPILATION \ - $(GLIB_CFLAGS) \ - $(LIBSYSTEMD_CFLAGS) \ -+ $(LIBELOGIND_CFLAGS) \ - $(LIBJS_CFLAGS) \ - $(NULL) - - libpolkit_backend_1_la_LIBADD = \ - $(GLIB_LIBS) \ - $(LIBSYSTEMD_LIBS) \ -+ $(LIBELOGIND_LIBS) \ - $(top_builddir)/src/polkit/libpolkit-gobject-1.la \ - $(EXPAT_LIBS) \ - $(LIBJS_LIBS) \ ---- a/src/polkit/Makefile.am 2016-11-04 04:41:02.756115723 +0100 -+++ b/src/polkit/Makefile.am 2016-11-04 04:42:49.428113812 +0100 -@@ -85,19 +85,26 @@ - libpolkit_gobject_1_la_SOURCES += \ - polkitunixsession-systemd.c polkitunixsession.h - else -+if HAVE_LIBELOGIND -+libpolkit_gobject_1_la_SOURCES += \ -+ polkitunixsession-systemd.c polkitunixsession.h -+else - libpolkit_gobject_1_la_SOURCES += \ - polkitunixsession.c polkitunixsession.h - endif -+endif - - libpolkit_gobject_1_la_CFLAGS = \ - -D_POLKIT_COMPILATION \ - $(GLIB_CFLAGS) \ - $(LIBSYSTEMD_CFLAGS) \ -+ $(LIBELOGIND_CFLAGS) \ - $(NULL) - - libpolkit_gobject_1_la_LIBADD = \ - $(GLIB_LIBS) \ - $(LIBSYSTEMD_LIBS) \ -+ $(LIBELOGIND_LIBS) \ - $(NULL) - - libpolkit_gobject_1_la_LDFLAGS = -export-symbols-regex '(^polkit_.*)' ---- a/src/polkitbackend/polkitbackendjsauthority.c 2017-06-27 09:22:03.375841040 +0200 -+++ b/src/polkitbackend/polkitbackendjsauthority.c 2017-06-27 09:25:33.815845141 +0200 -@@ -39,6 +39,10 @@ - #include <systemd/sd-login.h> - #endif /* HAVE_LIBSYSTEMD */ - -+#ifdef HAVE_LIBELOGIND -+#include <elogind/sd-login.h> -+#endif /* HAVE_LIBELOGIND */ -+ - #include <jsapi.h> - - #include "initjs.h" /* init.js */ -@@ -793,7 +797,7 @@ - g_assert_not_reached (); - } - --#ifdef HAVE_LIBSYSTEMD -+#if defined(HAVE_LIBSYSTEMD) || defined(HAVE_LIBELOGIND) - if (sd_pid_get_session (pid, &session_str) == 0) - { - if (sd_session_get_seat (session_str, &seat_str) == 0) -@@ -801,7 +805,7 @@ - /* do nothing */ - } - } --#endif /* HAVE_LIBSYSTEMD */ -+#endif /* HAVE_LIBSYSTEMD or HAVE_LIBELOGIND */ - - g_assert (POLKIT_IS_UNIX_USER (user_for_subject)); - uid = polkit_unix_user_get_uid (POLKIT_UNIX_USER (user_for_subject)); ---- a/src/polkitbackend/polkitbackendsessionmonitor-systemd.c 2016-11-04 04:44:29.650112018 +0100 -+++ b/src/polkitbackend/polkitbackendsessionmonitor-systemd.c 2016-11-04 04:46:52.718109455 +0100 -@@ -25,7 +25,11 @@ - #include <grp.h> - #include <string.h> - #include <glib/gstdio.h> -+#ifdef HAVE_LIBSYSTEMD - #include <systemd/sd-login.h> -+#else -+#include <elogind/sd-login.h> -+#endif /* HAVE_LIBSYSTEMD versus HAVE_LIBELOGIND */ - #include <stdlib.h> - - #include <polkit/polkit.h> ---- a/src/polkit/polkitunixsession-systemd.c 2016-11-04 04:44:29.651112017 +0100 -+++ b/src/polkit/polkitunixsession-systemd.c 2016-11-04 04:47:07.160109197 +0100 -@@ -30,7 +30,11 @@ - #include "polkiterror.h" - #include "polkitprivate.h" - -+#ifdef HAVE_LIBSYSTEMD - #include <systemd/sd-login.h> -+#else -+#include <elogind/sd-login.h> -+#endif /* HAVE_LIBSYSTEMD versus HAVE_ELOGIND */ - - /** - * SECTION:polkitunixsession diff --git a/sys-auth/polkit/polkit-0.113-r4.ebuild b/sys-auth/polkit/polkit-0.113-r4.ebuild deleted file mode 100644 index 0774d77fbe08..000000000000 --- a/sys-auth/polkit/polkit-0.113-r4.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools pam pax-utils systemd user xdg-utils - -DESCRIPTION="Policy framework for controlling privileges for system-wide services" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/polkit" -SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86" -IUSE="elogind examples gtk +introspection jit kde nls pam selinux systemd test" - -REQUIRED_USE="?? ( elogind systemd )" - -CDEPEND=" - dev-lang/spidermonkey:0/mozjs185[-debug] - dev-libs/glib:2 - dev-libs/expat - elogind? ( sys-auth/elogind ) - introspection? ( dev-libs/gobject-introspection ) - pam? ( - sys-auth/pambase - virtual/pam - ) - systemd? ( sys-apps/systemd:0= ) -" -DEPEND="${CDEPEND} - app-text/docbook-xml-dtd:4.1.2 - app-text/docbook-xsl-stylesheets - dev-libs/gobject-introspection-common - dev-libs/libxslt - dev-util/glib-utils - dev-util/gtk-doc-am - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig -" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-policykit ) -" -PDEPEND=" - gtk? ( || ( - >=gnome-extra/polkit-gnome-0.105 - >=lxde-base/lxsession-0.5.2 - ) ) - kde? ( kde-plasma/polkit-kde-agent ) - !systemd? ( !elogind? ( sys-auth/consolekit[policykit] ) ) -" - -DOCS=( docs/TODO HACKING NEWS README ) - -PATCHES=( "${FILESDIR}"/${P}-elogind.patch ) - -QA_MULTILIB_PATHS=" - usr/lib/polkit-1/polkit-agent-helper-1 - usr/lib/polkit-1/polkitd" - -pkg_setup() { - local u=polkitd - local g=polkitd - local h=/var/lib/polkit-1 - - enewgroup ${g} - enewuser ${u} -1 -1 ${h} ${g} - esethome ${u} ${h} -} - -src_prepare() { - default - - sed -i -e 's|unix-group:wheel|unix-user:0|' src/polkitbackend/*-default.rules || die #401513 - - # Workaround upstream hack around standard gtk-doc behavior, bug #552170 - sed -i -e 's/@ENABLE_GTK_DOC_TRUE@\(TARGET_DIR\)/\1/' \ - -e '/install-data-local:/,/uninstall-local:/ s/@ENABLE_GTK_DOC_TRUE@//' \ - -e 's/@ENABLE_GTK_DOC_FALSE@install-data-local://' \ - docs/polkit/Makefile.in || die - - # disable broken test - bug #624022 - sed -i -e "/^SUBDIRS/s/polkitbackend//" test/Makefile.am || die - - # Fix cross-building, bug #590764, elogind patch, bug #598615 - eautoreconf -} - -src_configure() { - xdg_environment_reset - - econf \ - --localstatedir="${EPREFIX}"/var \ - --disable-static \ - --enable-man-pages \ - --disable-gtk-doc \ - --disable-examples \ - --with-mozjs=mozjs185 \ - $(use_enable elogind libelogind) \ - $(use_enable introspection) \ - $(use_enable nls) \ - $(use pam && echo --with-pam-module-dir="$(getpam_mod_dir)") \ - --with-authfw=$(usex pam pam shadow) \ - $(use_enable systemd libsystemd-login) \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ - $(use_enable test) \ - --with-os-type=gentoo -} - -src_compile() { - default - - # Required for polkitd on hardened/PaX due to spidermonkey's JIT - pax-mark mr src/polkitbackend/.libs/polkitd test/polkitbackend/.libs/polkitbackendjsauthoritytest -} - -src_install() { - default - - fowners -R polkitd:root /{etc,usr/share}/polkit-1/rules.d - - diropts -m0700 -o polkitd -g polkitd - keepdir /var/lib/polkit-1 - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins src/examples/{*.c,*.policy*} - fi - - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - chown -R polkitd:root "${EROOT}"/{etc,usr/share}/polkit-1/rules.d - chown -R polkitd:polkitd "${EROOT}"/var/lib/polkit-1 -} |