mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-07 15:43:49 +02:00
polkit-elogind: update to 0.116
Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
This commit is contained in:
Jürgen Buchmüller
parent
48175c17f2
commit
59009e2c30
3 changed files with 9 additions and 159 deletions
|
|
@ -1,150 +0,0 @@
|
||||||
--- src/polkit/polkitunixgroup.c
|
|
||||||
+++ src/polkit/polkitunixgroup.c
|
|
||||||
@@ -71,6 +71,7 @@ G_DEFINE_TYPE_WITH_CODE (PolkitUnixGroup, polkit_unix_group, G_TYPE_OBJECT,
|
|
||||||
static void
|
|
||||||
polkit_unix_group_init (PolkitUnixGroup *unix_group)
|
|
||||||
{
|
|
||||||
+ unix_group->gid = -1; /* (git_t) -1 is not a valid GID under Linux */
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
@@ -100,11 +101,14 @@ polkit_unix_group_set_property (GObject *object,
|
|
||||||
GParamSpec *pspec)
|
|
||||||
{
|
|
||||||
PolkitUnixGroup *unix_group = POLKIT_UNIX_GROUP (object);
|
|
||||||
+ gint val;
|
|
||||||
|
|
||||||
switch (prop_id)
|
|
||||||
{
|
|
||||||
case PROP_GID:
|
|
||||||
- unix_group->gid = g_value_get_int (value);
|
|
||||||
+ val = g_value_get_int (value);
|
|
||||||
+ g_return_if_fail (val != -1);
|
|
||||||
+ unix_group->gid = val;
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
@@ -131,9 +135,9 @@ polkit_unix_group_class_init (PolkitUnixGroupClass *klass)
|
|
||||||
g_param_spec_int ("gid",
|
|
||||||
"Group ID",
|
|
||||||
"The UNIX group ID",
|
|
||||||
- 0,
|
|
||||||
+ G_MININT,
|
|
||||||
G_MAXINT,
|
|
||||||
- 0,
|
|
||||||
+ -1,
|
|
||||||
G_PARAM_CONSTRUCT |
|
|
||||||
G_PARAM_READWRITE |
|
|
||||||
G_PARAM_STATIC_NAME |
|
|
||||||
@@ -166,9 +170,10 @@ polkit_unix_group_get_gid (PolkitUnixGroup *group)
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
polkit_unix_group_set_gid (PolkitUnixGroup *group,
|
|
||||||
- gint gid)
|
|
||||||
+ gint gid)
|
|
||||||
{
|
|
||||||
g_return_if_fail (POLKIT_IS_UNIX_GROUP (group));
|
|
||||||
+ g_return_if_fail (gid != -1);
|
|
||||||
group->gid = gid;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -183,6 +188,8 @@ polkit_unix_group_set_gid (PolkitUnixGroup *group,
|
|
||||||
PolkitIdentity *
|
|
||||||
polkit_unix_group_new (gint gid)
|
|
||||||
{
|
|
||||||
+ g_return_val_if_fail (gid != -1, NULL);
|
|
||||||
+
|
|
||||||
return POLKIT_IDENTITY (g_object_new (POLKIT_TYPE_UNIX_GROUP,
|
|
||||||
"gid", gid,
|
|
||||||
NULL));
|
|
||||||
--- src/polkit/polkitunixprocess.c
|
|
||||||
+++ src/polkit/polkitunixprocess.c
|
|
||||||
@@ -159,9 +159,14 @@ polkit_unix_process_set_property (GObject *object,
|
|
||||||
polkit_unix_process_set_pid (unix_process, g_value_get_int (value));
|
|
||||||
break;
|
|
||||||
|
|
||||||
- case PROP_UID:
|
|
||||||
- polkit_unix_process_set_uid (unix_process, g_value_get_int (value));
|
|
||||||
+ case PROP_UID: {
|
|
||||||
+ gint val;
|
|
||||||
+
|
|
||||||
+ val = g_value_get_int (value);
|
|
||||||
+ g_return_if_fail (val != -1);
|
|
||||||
+ polkit_unix_process_set_uid (unix_process, val);
|
|
||||||
break;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
case PROP_START_TIME:
|
|
||||||
polkit_unix_process_set_start_time (unix_process, g_value_get_uint64 (value));
|
|
||||||
@@ -239,7 +244,7 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass)
|
|
||||||
g_param_spec_int ("uid",
|
|
||||||
"User ID",
|
|
||||||
"The UNIX user ID",
|
|
||||||
- -1,
|
|
||||||
+ G_MININT,
|
|
||||||
G_MAXINT,
|
|
||||||
-1,
|
|
||||||
G_PARAM_CONSTRUCT |
|
|
||||||
@@ -303,7 +308,6 @@ polkit_unix_process_set_uid (PolkitUnixProcess *process,
|
|
||||||
gint uid)
|
|
||||||
{
|
|
||||||
g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process));
|
|
||||||
- g_return_if_fail (uid >= -1);
|
|
||||||
process->uid = uid;
|
|
||||||
}
|
|
||||||
|
|
||||||
--- src/polkit/polkitunixuser.c
|
|
||||||
+++ src/polkit/polkitunixuser.c
|
|
||||||
@@ -72,6 +72,7 @@ G_DEFINE_TYPE_WITH_CODE (PolkitUnixUser, polkit_unix_user, G_TYPE_OBJECT,
|
|
||||||
static void
|
|
||||||
polkit_unix_user_init (PolkitUnixUser *unix_user)
|
|
||||||
{
|
|
||||||
+ unix_user->uid = -1; /* (uid_t) -1 is not a valid UID under Linux */
|
|
||||||
unix_user->name = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -112,11 +113,14 @@ polkit_unix_user_set_property (GObject *object,
|
|
||||||
GParamSpec *pspec)
|
|
||||||
{
|
|
||||||
PolkitUnixUser *unix_user = POLKIT_UNIX_USER (object);
|
|
||||||
+ gint val;
|
|
||||||
|
|
||||||
switch (prop_id)
|
|
||||||
{
|
|
||||||
case PROP_UID:
|
|
||||||
- unix_user->uid = g_value_get_int (value);
|
|
||||||
+ val = g_value_get_int (value);
|
|
||||||
+ g_return_if_fail (val != -1);
|
|
||||||
+ unix_user->uid = val;
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
@@ -144,9 +148,9 @@ polkit_unix_user_class_init (PolkitUnixUserClass *klass)
|
|
||||||
g_param_spec_int ("uid",
|
|
||||||
"User ID",
|
|
||||||
"The UNIX user ID",
|
|
||||||
- 0,
|
|
||||||
+ G_MININT,
|
|
||||||
G_MAXINT,
|
|
||||||
- 0,
|
|
||||||
+ -1,
|
|
||||||
G_PARAM_CONSTRUCT |
|
|
||||||
G_PARAM_READWRITE |
|
|
||||||
G_PARAM_STATIC_NAME |
|
|
||||||
@@ -182,6 +186,7 @@ polkit_unix_user_set_uid (PolkitUnixUser *user,
|
|
||||||
gint uid)
|
|
||||||
{
|
|
||||||
g_return_if_fail (POLKIT_IS_UNIX_USER (user));
|
|
||||||
+ g_return_if_fail (uid != -1);
|
|
||||||
user->uid = uid;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -196,6 +201,8 @@ polkit_unix_user_set_uid (PolkitUnixUser *user,
|
|
||||||
PolkitIdentity *
|
|
||||||
polkit_unix_user_new (gint uid)
|
|
||||||
{
|
|
||||||
+ g_return_val_if_fail (uid != -1, NULL);
|
|
||||||
+
|
|
||||||
return POLKIT_IDENTITY (g_object_new (POLKIT_TYPE_UNIX_USER,
|
|
||||||
"uid", uid,
|
|
||||||
NULL));
|
|
||||||
|
|
@ -50,15 +50,15 @@
|
||||||
|
|
||||||
--- src/polkitbackend/polkitbackendjsauthority.cpp
|
--- src/polkitbackend/polkitbackendjsauthority.cpp
|
||||||
+++ src/polkitbackend/polkitbackendjsauthority.cpp
|
+++ src/polkitbackend/polkitbackendjsauthority.cpp
|
||||||
@@ -1499,6 +1499,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx,
|
@@ -1502,6 +1502,7 @@
|
||||||
|
|
||||||
JS::CallArgs args = JS::CallArgsFromVp (argc, vp);
|
JS::CallArgs args = JS::CallArgsFromVp (argc, vp);
|
||||||
|
|
||||||
+#if defined HAVE_GETNETGRENT
|
+#if defined HAVE_GETNETGRENT
|
||||||
user = JS_EncodeString (cx, args[0].toString());
|
JS::RootedString usrstr (authority->priv->cx);
|
||||||
netgroup = JS_EncodeString (cx, args[1].toString());
|
usrstr = args[0].toString();
|
||||||
|
user = JS_EncodeStringToUTF8 (cx, usrstr);
|
||||||
@@ -1514,6 +1515,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx,
|
@@ -1521,6 +1522,7 @@
|
||||||
JS_free (cx, user);
|
JS_free (cx, user);
|
||||||
|
|
||||||
ret = true;
|
ret = true;
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'polkit-elogind'
|
# Template file for 'polkit-elogind'
|
||||||
pkgname=polkit-elogind
|
pkgname=polkit-elogind
|
||||||
version=0.115
|
version=0.116
|
||||||
revision=5
|
revision=1
|
||||||
wrksrc="polkit-${version}"
|
wrksrc="polkit-${version}"
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
build_helper="gir"
|
build_helper="gir"
|
||||||
|
|
@ -12,13 +12,13 @@ make_dirs="
|
||||||
/usr/share/polkit-1/rules.d 0700 polkitd polkitd"
|
/usr/share/polkit-1/rules.d 0700 polkitd polkitd"
|
||||||
hostmakedepends="automake libtool gettext-devel git glib-devel
|
hostmakedepends="automake libtool gettext-devel git glib-devel
|
||||||
gobject-introspection gtk-doc intltool pkg-config"
|
gobject-introspection gtk-doc intltool pkg-config"
|
||||||
makedepends="elogind-devel libglib-devel mozjs52-devel pam-devel"
|
makedepends="elogind-devel libglib-devel mozjs60-devel pam-devel"
|
||||||
short_desc="Authorization Toolkit"
|
short_desc="Authorization Toolkit"
|
||||||
maintainer="Enno Boland <gottox@voidlinux.org>"
|
maintainer="Enno Boland <gottox@voidlinux.org>"
|
||||||
license="GPL-2.0-or-later"
|
license="GPL-2.0-or-later"
|
||||||
homepage="https://www.freedesktop.org/wiki/Software/polkit"
|
homepage="https://www.freedesktop.org/wiki/Software/polkit"
|
||||||
distfiles="${FREEDESKTOP_SITE}/polkit/releases/polkit-${version}.tar.gz"
|
distfiles="${FREEDESKTOP_SITE}/polkit/releases/polkit-${version}.tar.gz"
|
||||||
checksum=2f87ecdabfbd415c6306673ceadc59846f059b18ef2fce42bac63fe283f12131
|
checksum=88170c9e711e8db305a12fdb8234fac5706c61969b94e084d0f117d8ec5d34b1
|
||||||
system_accounts="polkitd"
|
system_accounts="polkitd"
|
||||||
provides="polkit-${version}_${revision}"
|
provides="polkit-${version}_${revision}"
|
||||||
replaces="polkit>=0"
|
replaces="polkit>=0"
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue