From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A1C71139694 for ; Thu, 23 Feb 2017 03:29:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A8F2AE0CD7; Thu, 23 Feb 2017 03:29:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 725C7E0CD7 for ; Thu, 23 Feb 2017 03:29:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D765234155D for ; Thu, 23 Feb 2017 03:29:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 91B49515E for ; Thu, 23 Feb 2017 03:29:40 +0000 (UTC) From: "Aric Belsito" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aric Belsito" Message-ID: <1487820543.fb42c05d1344fa7b9650a2d2ad3e317d69821a69.lluixhi@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: sys-auth/polkit/, sys-auth/polkit/files/ X-VCS-Repository: proj/musl X-VCS-Files: sys-auth/polkit/Manifest sys-auth/polkit/files/polkit-0.113-elogind.patch sys-auth/polkit/files/polkit-make-netgroup-support-optional.patch sys-auth/polkit/metadata.xml sys-auth/polkit/polkit-0.112-r99.ebuild sys-auth/polkit/polkit-0.113-r2.ebuild sys-auth/polkit/polkit-0.113.ebuild X-VCS-Directories: sys-auth/polkit/files/ sys-auth/polkit/ X-VCS-Committer: lluixhi X-VCS-Committer-Name: Aric Belsito X-VCS-Revision: fb42c05d1344fa7b9650a2d2ad3e317d69821a69 X-VCS-Branch: master Date: Thu, 23 Feb 2017 03:29:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: dad4321d-efa2-4e1e-91ef-4e837cdfa2b4 X-Archives-Hash: 8977e75fc1d0c8d84a377a4539718acf commit: fb42c05d1344fa7b9650a2d2ad3e317d69821a69 Author: Aric Belsito gmail com> AuthorDate: Thu Feb 23 03:29:03 2017 +0000 Commit: Aric Belsito gmail com> CommitDate: Thu Feb 23 03:29:03 2017 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=fb42c05d sys-auth/polkit: version bump to 0.113-r2 remove 0.112-r99 (no longer in tree) sys-auth/polkit/Manifest | 9 +- sys-auth/polkit/files/polkit-0.113-elogind.patch | 160 +++++++++++++++++++++ .../polkit-make-netgroup-support-optional.patch | 86 ----------- sys-auth/polkit/metadata.xml | 1 + ...kit-0.112-r99.ebuild => polkit-0.113-r2.ebuild} | 99 +++++++------ sys-auth/polkit/polkit-0.113.ebuild | 8 +- 6 files changed, 225 insertions(+), 138 deletions(-) diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest index 8645889..943dbd2 100644 --- a/sys-auth/polkit/Manifest +++ b/sys-auth/polkit/Manifest @@ -1,7 +1,6 @@ +AUX polkit-0.113-elogind.patch 5611 SHA256 e53293e21eb9ece8bea7a90e2dd440f176af185470de33a3859b9a1274413e9a SHA512 27d863690b51c7520488c7924dc24c83b0b8ebc2d0285b62a249227a7993b93c1ba526d3c9dd0aaa4d0d979ff5aac7dea8001b21a1f10236249a38a7b92c3be4 WHIRLPOOL 14dd9439136b0f17392a998d9b7f16435468ae66f91012185e67e6b56a1e6a3ec4b1bbfbe210949f31c0912cef046559a446c1d3f1939c82726604f55871b45c AUX polkit-0.113-make-netgroup-support-optional.patch 4099 SHA256 eba507f6bb0edaa0a0a4c48147543b5ba0d37faa6f672bc20b854b5f09eb7588 SHA512 91b4dcc2cad4954763b5f405504c88e3b339054c21121a586472f9b4d1d4db53e0719794628482e1b9bade0e0d3cbd882fafb402c626fdcd4aa716a7480f4f68 WHIRLPOOL 8419ff003e2629215500a8bbde4152cefddc57c080a77aa9962de8cac33686866dbc1d67a2d1e89c8ecb066c1e72b24967d65426bcf88a45ce8d627b69056488 -AUX polkit-make-netgroup-support-optional.patch 2818 SHA256 840f295f8c99005938a501e696080136bcea6696a2e0abfe4c5f0f1e46a079a0 SHA512 90ad57cdbdfcd706b1443b596eb2aa849e73e56d6c25c72683270a8f71d5e8c0144c9fa39e4267928531b1b7bf1870ab29cb6f19981ef1621419da7540d8ccbb WHIRLPOOL c68e260ce7fa65001fe0a4fcff97ebff9c447cad7d6fb8a564ebfb13e27b5c6e09be6b8f30a56cd1a3fcd0efe4346c6736e75004fd4aaeb1163209ad61eb77b7 -DIST polkit-0.112.tar.gz 1429240 SHA256 d695f43cba4748a822fbe864dd32c4887c5da1c71694a47693ace5e88fcf6af6 SHA512 e4ad1bd287b38e5650cb94b1897a959b2ceaa6c19b4478ba872eacb13b58758fd42f6ab1718976162d823d850cd5c99b3ccadf1b57d75dea7790101422029d5f WHIRLPOOL af5dd0a17b7356302b0319e80565d6ac916128dfc85b6e2711147f3de86651f11fe8d08f3d6067d7abd24e263be92403f9d8f46935ba93db571e386a603a038a DIST polkit-0.113.tar.gz 1448865 SHA256 e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81 SHA512 ab177c89a20eeb2978ddbe28afb205d3619f9c5defe833eb68a85e71a0f2c905367f1295cbbfb85da5eafdd661bce474d5d84aca9195cd425a18c9b4170eb5f9 WHIRLPOOL 106db7e6085a4ce49da44929138671eff2fd6007c80533518abe2d91ede9242b1e3cd0a1801190eeac5d4d5c1e978a30a18e47a6b604497b38853fa60c935a81 -EBUILD polkit-0.112-r99.ebuild 3316 SHA256 5e2f2cd52b93b5524d2c65e0b3dfde9cb976c5026b6ec9fc0b790e4fa902a96f SHA512 bc8fd3695cb4ce01a350e8f41161c90ab913c6740f20207546f37da2c9f6ad68de7e3cf0aaa889ada403205392cd2d5b238c9276aae59dd8df2bed691d645d06 WHIRLPOOL f3bdbe97a68e7552129b16318fa75618d85241c7bf6f91209e90cabb0776cb09018240f2ed016ce16df18cdd250fd4410fb698cfd5b29369a1851b424c265218 -EBUILD polkit-0.113.ebuild 2755 SHA256 0636e5b6b17b4ecfe655f3547e64c3eb9d1b1067c8858ff2dc00d749ed81e878 SHA512 8b665cb3618b51d0e59b18c7eeb0e8b4d440348d2a6da1bd46dc851c58f2d154e457ba85f1502e63ac286262fb4a7b3a35ec1f0c47a8402e4ce9d3f673d7ca45 WHIRLPOOL 72476a771d0d9974ec7f104c7b721a5f454989bb7ba73f8d5ca804bb79bbd5e75198421ffb44d05b05ff57fa1b1ab15cf2e7687d5f244b15965e218a85037114 -MISC metadata.xml 368 SHA256 6534d248e3385826f0d340734e1242c15261786e32db74d12499062ecbf2bddc SHA512 c7c83834285eb494682f56460e5a494a368dff4e9c9dbcfe7ad367a403e812dd64f0bbbf49b26f8f9e8f83c3c40ddeaf7489c8e632a0149e0be056be04aa031d WHIRLPOOL 90d3f192e593775dc409984aedf177315af40991781d84f080e3f0864d0107c7320c76fcdd48ca2a5d5c2415650c0b1dcceeb9026f0b4409a10741a77daf5880 +EBUILD polkit-0.113-r2.ebuild 3384 SHA256 19dc6fa1d23c3a537af57bd2151437ab34a36e63c8e532bcdc23a5d5f176e834 SHA512 4d266140ea3102c818c016299a37bbae6108e4cedcc80d762349d8237cd656754b49d836c84e940f58666305305dcf43eae0f57f34630b41de9ab2d8e1aa641d WHIRLPOOL b6a1f44e03f2dbcca44093d71208f577c9b499ac3d3fba14bff976ede213b1ce959a4acb7f2a6394fa22cbbb6a705ee83df99a1dd5c4aadc5b3e3f01e21bbb1f +EBUILD polkit-0.113.ebuild 2795 SHA256 164fdfad89e3b304220fa5a4171b0d2a784d499b22eaafbb6bd6e5b0154690a8 SHA512 ab4e1b89e42c56af10b8209e9b51359875021b37f9a9367f9321e4fd314daf9a2c7be40be3cb2c9c9ced0891a6e7abd7cbb4ae682a477f6866a211a5af51103f WHIRLPOOL 276f771c6d0270e6734febaef7b1cc01e3f4cf71a6081dbfc281264e9e4ba30a54c9daf759156b9f560673fed9e2c381d4a73e4c20457425aead322c3c216cf9 +MISC metadata.xml 493 SHA256 868f4f8f3c8593e0f1441e5e36944b3386cda4eac8d0986ab3b390d53106b71f SHA512 9c7b199d1a3b1193beb4d01e52d5e90d81821aa6df6785482da7ee37c0ca777c12095f160bc997c77d0089429c2e338cf75d0a46836416736178cd661ffa80f5 WHIRLPOOL 8ef937efdf5e1c41e16cd908fe3c13b05f33751c5c5a1d4eeab833641db31fc0808ec7bfd6b364a5db55812108b78346da03bd75baf50adaba24ec7f1920d60f diff --git a/sys-auth/polkit/files/polkit-0.113-elogind.patch b/sys-auth/polkit/files/polkit-0.113-elogind.patch new file mode 100644 index 0000000..fb142c6 --- /dev/null +++ b/sys-auth/polkit/files/polkit-0.113-elogind.patch @@ -0,0 +1,160 @@ +--- 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 2016-11-04 04:44:29.650112018 +0100 ++++ b/src/polkitbackend/polkitbackendjsauthority.c 2016-11-04 04:44:58.283111505 +0100 +@@ -39,6 +39,10 @@ + #include + #endif /* HAVE_LIBSYSTEMD */ + ++#ifdef HAVE_LIBELOGIND ++#include ++#endif /* HAVE_LIBELOGIND */ ++ + #include + + #include "initjs.h" /* init.js */ +--- 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 + #include + #include ++#ifdef HAVE_LIBSYSTEMD + #include ++#else ++#include ++#endif /* HAVE_LIBSYSTEMD versus HAVE_LIBELOGIND */ + #include + + #include +--- 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 ++#else ++#include ++#endif /* HAVE_LIBSYSTEMD versus HAVE_ELOGIND */ + + /** + * SECTION:polkitunixsession diff --git a/sys-auth/polkit/files/polkit-make-netgroup-support-optional.patch b/sys-auth/polkit/files/polkit-make-netgroup-support-optional.patch deleted file mode 100644 index 07efd0e..0000000 --- a/sys-auth/polkit/files/polkit-make-netgroup-support-optional.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 4bb6d90..8d30a95 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -158,7 +158,7 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXPAT_LIBS="-lexpat"], - [AC_MSG_ERROR([Can't find expat library. Please install expat.])]) - AC_SUBST(EXPAT_LIBS) - --AC_CHECK_FUNCS(clearenv) -+AC_CHECK_FUNCS(clearenv getnetgrent innetgr) - - if test "x$GCC" = "xyes"; then - LDFLAGS="-Wl,--as-needed $LDFLAGS" -diff --git a/src/polkitbackend/polkitbackendinteractiveauthority.c b/src/polkitbackend/polkitbackendinteractiveauthority.c -index 3bd2f0b..9d2ec61 100644 ---- a/src/polkitbackend/polkitbackendinteractiveauthority.c -+++ b/src/polkitbackend/polkitbackendinteractiveauthority.c -@@ -2103,6 +2103,7 @@ get_users_in_group (PolkitIdentity *group, - return ret; - } - -+#if defined HAVE_GETNETGRENT - static GList * - get_users_in_net_group (PolkitIdentity *group, - gboolean include_root) -@@ -2154,6 +2155,7 @@ get_users_in_net_group (PolkitIdentity *group, - endnetgrent (); - return ret; - } -+#endif - - /* ---------------------------------------------------------------------------------------------------- */ - -@@ -2243,10 +2245,12 @@ authentication_agent_initiate_challenge (AuthenticationAgent *agent, - { - user_identities = g_list_concat (user_identities, get_users_in_group (identity, FALSE)); - } -+#if defined HAVE_GETNETGRENT - else if (POLKIT_IS_UNIX_NETGROUP (identity)) - { - user_identities = g_list_concat (user_identities, get_users_in_net_group (identity, FALSE)); - } -+#endif - else - { - g_warning ("Unsupported identity"); -diff --git a/src/polkitbackend/polkitbackendjsauthority.c b/src/polkitbackend/polkitbackendjsauthority.c -index bc2fe22..b84c110 100644 ---- a/src/polkitbackend/polkitbackendjsauthority.c -+++ b/src/polkitbackend/polkitbackendjsauthority.c -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - #include - #include "polkitbackendjsauthority.h" -@@ -1450,13 +1451,16 @@ js_polkit_user_is_in_netgroup (JSContext *cx, - JSBool ret = JS_FALSE; - JSString *user_str; - JSString *netgroup_str; -- char *user; -- char *netgroup; - JSBool is_in_netgroup = JS_FALSE; - - if (!JS_ConvertArguments (cx, argc, JS_ARGV (cx, vp), "SS", &user_str, &netgroup_str)) - goto out; - -+#if defined(HAVE_INNETGR) -+ { -+ char *user; -+ char *netgroup; -+ - user = JS_EncodeString (cx, user_str); - netgroup = JS_EncodeString (cx, netgroup_str); - -@@ -1470,6 +1474,8 @@ js_polkit_user_is_in_netgroup (JSContext *cx, - - JS_free (cx, netgroup); - JS_free (cx, user); -+ } -+#endif - - ret = JS_TRUE; - diff --git a/sys-auth/polkit/metadata.xml b/sys-auth/polkit/metadata.xml index cc3a0b4..348a315 100644 --- a/sys-auth/polkit/metadata.xml +++ b/sys-auth/polkit/metadata.xml @@ -5,6 +5,7 @@ freedesktop-bugs@gentoo.org + Use sys-auth/elogind instead of sys-auth/consolekit for session tracking Use sys-apps/systemd instead of sys-auth/consolekit for session tracking diff --git a/sys-auth/polkit/polkit-0.112-r99.ebuild b/sys-auth/polkit/polkit-0.113-r2.ebuild similarity index 50% rename from sys-auth/polkit/polkit-0.112-r99.ebuild rename to sys-auth/polkit/polkit-0.113-r2.ebuild index 5ba1efe..9528e04 100644 --- a/sys-auth/polkit/polkit-0.112-r99.ebuild +++ b/sys-auth/polkit/polkit-0.113-r2.ebuild @@ -1,51 +1,61 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -inherit eutils autotools multilib pam pax-utils systemd user +EAPI=6 + +inherit autotools pam pax-utils systemd user xdg-utils DESCRIPTION="Policy framework for controlling privileges for system-wide services" -HOMEPAGE="http://www.freedesktop.org/wiki/Software/polkit" -SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz" +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="amd64 arm ~mips ppc x86" -IUSE="examples gtk +introspection jit kde nls pam selinux systemd" +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=" - ia64? ( =dev-lang/spidermonkey-1.8.5*[-debug] ) - hppa? ( =dev-lang/spidermonkey-1.8.5*[-debug] ) - mips? ( =dev-lang/spidermonkey-1.8.5*[-debug] ) - !hppa? ( !ia64? ( !mips? ( dev-lang/spidermonkey:17[-debug,jit=] ) ) ) - >=dev-libs/glib-2.32 - >=dev-libs/expat-2:= - introspection? ( >=dev-libs/gobject-introspection-1 ) + 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= )" + ) + systemd? ( sys-apps/systemd:0= ) +" DEPEND="${CDEPEND} app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-libs/libxslt + dev-util/gtk-doc-am dev-util/intltool - virtual/pkgconfig" + sys-devel/gettext + virtual/pkgconfig +" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-policykit ) " PDEPEND=" - gtk? ( || ( - >=gnome-extra/polkit-gnome-0.105 - lxde-base/lxpolkit - ) ) + gtk? ( >=gnome-extra/polkit-gnome-0.105 ) kde? ( || ( kde-plasma/polkit-kde-agent sys-auth/polkit-kde-agent - ) ) - !systemd? ( sys-auth/consolekit[policykit] )" + ) ) + !systemd? ( !elogind? ( sys-auth/consolekit[policykit] ) ) +" + +DOCS=( docs/TODO HACKING NEWS README ) + +PATCHES=( + "${FILESDIR}"/${P}-elogind.patch + "${FILESDIR}"/${P}-make-netgroup-support-optional.patch +) QA_MULTILIB_PATHS=" usr/lib/polkit-1/polkit-agent-helper-1 @@ -62,25 +72,38 @@ pkg_setup() { } src_prepare() { + default + sed -i -e 's|unix-group:wheel|unix-user:0|' src/polkitbackend/*-default.rules || die #401513 - epatch "${FILESDIR}"/${PN}-make-netgroup-support-optional.patch - eautoreconf || die + + # 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 + + # 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 \ - $(use_enable systemd libsystemd-login) \ - $(use_enable introspection) \ --disable-examples \ + --with-mozjs=mozjs185 \ + $(use_enable elogind libelogind) \ + $(use_enable introspection) \ $(use_enable nls) \ - $(if use hppa || use ia64 || use mips; then echo --with-mozjs=mozjs185; else echo --with-mozjs=mozjs-17.0; fi) \ - "$(systemd_with_unitdir)" \ - --with-authfw=$(usex pam pam shadow) \ $(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 } @@ -88,21 +111,11 @@ src_compile() { default # Required for polkitd on hardened/PaX due to spidermonkey's JIT - local f='src/polkitbackend/.libs/polkitd test/polkitbackend/.libs/polkitbackendjsauthoritytest' - local m='' - # Only used when USE="jit" is enabled for 'dev-lang/spidermonkey:17' wrt #485910 - has_version 'dev-lang/spidermonkey:17[jit]' && m='m' - # hppa, ia64 and mips uses spidermonkey-1.8.5 which requires different pax-mark flags - use hppa && m='mr' - use ia64 && m='mr' - use mips && m='mr' - [ -n "$m" ] && pax-mark ${m} ${f} + pax-mark mr src/polkitbackend/.libs/polkitd test/polkitbackend/.libs/polkitbackendjsauthoritytest } src_install() { - emake DESTDIR="${D}" install - - dodoc docs/TODO HACKING NEWS README + default fowners -R polkitd:root /{etc,usr/share}/polkit-1/rules.d @@ -114,7 +127,7 @@ src_install() { doins src/examples/{*.c,*.policy*} fi - prune_libtool_files + find "${D}" -name '*.la' -delete || die } pkg_postinst() { diff --git a/sys-auth/polkit/polkit-0.113.ebuild b/sys-auth/polkit/polkit-0.113.ebuild index e567fce..f064559 100644 --- a/sys-auth/polkit/polkit-0.113.ebuild +++ b/sys-auth/polkit/polkit-0.113.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -6,12 +6,12 @@ EAPI=5 inherit eutils multilib pam pax-utils systemd user DESCRIPTION="Policy framework for controlling privileges for system-wide services" -HOMEPAGE="http://www.freedesktop.org/wiki/Software/polkit" -SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz" +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="amd64 arm ~mips ppc x86" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" IUSE="examples gtk +introspection jit kde nls pam selinux systemd test" CDEPEND="