mirror of
https://github.com/void-linux/void-packages.git
synced 2025-08-02 19:02:57 +02:00
polkit: update to 0.113.0.2018.03.19.
This commit is contained in:
parent
737e1983c9
commit
567c0974cb
2 changed files with 16 additions and 87 deletions
|
@ -1,79 +0,0 @@
|
||||||
--- configure.ac.orig 2015-07-03 07:10:14.570457101 +0200
|
|
||||||
+++ configure.ac 2015-07-03 07:10:46.449875012 +0200
|
|
||||||
@@ -158,7 +158,7 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXP
|
|
||||||
[AC_MSG_ERROR([Can't find expat library. Please install expat.])])
|
|
||||||
AC_SUBST(EXPAT_LIBS)
|
|
||||||
|
|
||||||
-AC_CHECK_FUNCS(clearenv fdatasync)
|
|
||||||
+AC_CHECK_FUNCS(clearenv fdatasync getnetgrent)
|
|
||||||
|
|
||||||
if test "x$GCC" = "xyes"; then
|
|
||||||
LDFLAGS="-Wl,--as-needed $LDFLAGS"
|
|
||||||
--- src/polkitbackend/polkitbackendinteractiveauthority.c.orig 2015-05-08 10:22:03.093307918 +0200
|
|
||||||
+++ src/polkitbackend/polkitbackendinteractiveauthority.c 2015-05-08 10:23:44.516263273 +0200
|
|
||||||
@@ -2103,6 +2103,7 @@ get_users_in_group (PolkitIdentity
|
|
||||||
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
|
|
||||||
endnetgrent ();
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
@@ -2243,10 +2245,12 @@ authentication_agent_initiate_challenge
|
|
||||||
{
|
|
||||||
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");
|
|
||||||
--- src/polkitbackend/polkitbackendjsauthority.c.orig 2015-05-08 10:26:51.509181105 +0200
|
|
||||||
+++ src/polkitbackend/polkitbackendjsauthority.c 2015-05-08 10:27:41.357159439 +0200
|
|
||||||
@@ -180,13 +180,17 @@ static JSClass js_polkit_class = {
|
|
||||||
|
|
||||||
static JSBool js_polkit_log (JSContext *cx, unsigned argc, jsval *vp);
|
|
||||||
static JSBool js_polkit_spawn (JSContext *cx, unsigned argc, jsval *vp);
|
|
||||||
+#if defined HAVE_GETNETGRENT
|
|
||||||
static JSBool js_polkit_user_is_in_netgroup (JSContext *cx, unsigned argc, jsval *vp);
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
static JSFunctionSpec js_polkit_functions[] =
|
|
||||||
{
|
|
||||||
JS_FS("log", js_polkit_log, 0, 0),
|
|
||||||
JS_FS("spawn", js_polkit_spawn, 0, 0),
|
|
||||||
+#if defined HAVE_GETNETGRENT
|
|
||||||
JS_FS("_userIsInNetGroup", js_polkit_user_is_in_netgroup, 0, 0),
|
|
||||||
+#endif
|
|
||||||
JS_FS_END
|
|
||||||
};
|
|
||||||
|
|
||||||
@@ -1441,6 +1445,7 @@ js_polkit_spawn (JSContext *cx,
|
|
||||||
/* ---------------------------------------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
|
|
||||||
+#if defined HAVE_GETNETGRENT
|
|
||||||
static JSBool
|
|
||||||
js_polkit_user_is_in_netgroup (JSContext *cx,
|
|
||||||
unsigned argc,
|
|
||||||
@@ -1477,7 +1482,7 @@ js_polkit_user_is_in_netgroup (JSContext
|
|
||||||
out:
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
-
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------------------------------------- */
|
|
|
@ -1,21 +1,23 @@
|
||||||
# Template file for 'polkit'
|
# Template file for 'polkit'
|
||||||
pkgname=polkit
|
pkgname=polkit
|
||||||
version=0.113
|
version=0.113.0.2018.03.19
|
||||||
revision=2
|
revision=1
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="$(vopt_enable gir introspection)
|
configure_args="$(vopt_enable gir introspection)
|
||||||
--disable-systemd --disable-libsystemd-login
|
--disable-systemd --disable-libsystemd-login
|
||||||
--disable-static --with-authfw=pam --with-os-type=void --with-mozjs=mozjs-17.0"
|
--disable-static --with-authfw=pam --with-os-type=void --with-mozjs=mozjs-24.0"
|
||||||
short_desc="Authorization Toolkit"
|
short_desc="Authorization Toolkit"
|
||||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||||
homepage="http://www.freedesktop.org/wiki/Software/polkit"
|
homepage="http://www.freedesktop.org/wiki/Software/polkit"
|
||||||
license="GPL-2"
|
license="GPL-2"
|
||||||
distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.gz"
|
#distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.gz"
|
||||||
checksum=e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81
|
#checksum=e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81
|
||||||
|
wrksrc=$pkgname
|
||||||
|
_hash=29ba7afba1b79a325183a71966f35926dfdf506e
|
||||||
|
|
||||||
hostmakedepends="automake libtool gettext-devel pkg-config intltool libxslt
|
hostmakedepends="automake libtool gettext-devel pkg-config intltool libxslt
|
||||||
docbook-xsl glib-devel gtk-doc gobject-introspection"
|
docbook-xsl glib-devel gtk-doc gobject-introspection git autoconf-archive"
|
||||||
makedepends="libglib-devel expat-devel pam-devel mozjs17-devel"
|
makedepends="libglib-devel expat-devel pam-devel mozjs24-devel"
|
||||||
system_accounts="polkitd"
|
system_accounts="polkitd"
|
||||||
make_dirs="
|
make_dirs="
|
||||||
/etc/polkit-1/rules.d 0700 polkitd polkitd
|
/etc/polkit-1/rules.d 0700 polkitd polkitd
|
||||||
|
@ -28,8 +30,14 @@ if [ -z "$CROSS_BUILD" ]; then
|
||||||
build_options_default+=" gir"
|
build_options_default+=" gir"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
do_fetch() {
|
||||||
|
git clone https://anongit.freedesktop.org/git/polkit || :
|
||||||
|
cd $pkgname
|
||||||
|
git checkout $_hash
|
||||||
|
}
|
||||||
|
|
||||||
pre_configure() {
|
pre_configure() {
|
||||||
autoreconf -fi
|
NOCONFIGURE=1 ./autogen.sh
|
||||||
# Drop requirement of /sys/fs/cgroup/systemd test in configure... WTF.
|
# Drop requirement of /sys/fs/cgroup/systemd test in configure... WTF.
|
||||||
sed -e 's,/sys/fs/cgroup/systemd/,/sys/fs/cgroup,g' -i configure
|
sed -e 's,/sys/fs/cgroup/systemd/,/sys/fs/cgroup,g' -i configure
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue