wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-08-02 02:42:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

polkit: update to 0.114.

Browse source 
Closes #13389.

Signed-off-by: Enno Boland <gottox@voidlinux.eu>
This commit is contained in:
maxice8 2018-04-11 14:43:09 -03:00 • committed by Enno Boland
parent e1723d1636
commit b3d2cf1529
2 changed files with 29 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
srcpkgs/polkit/patches/fix-no-innetgr.patch → srcpkgs/polkit/patches/make-innetgr-optional.patch
View file

@ -1,6 +1,6 @@
--- configure.ac --- configure.ac
+++ configure.ac +++ configure.ac
@@ -102,7 +102,7 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXPAT_LIBS="-lexpat"], @@ -99,7 +99,7 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXPAT_LIBS="-lexpat"],
[AC_MSG_ERROR([Can't find expat library. Please install expat.])]) [AC_MSG_ERROR([Can't find expat library. Please install expat.])])
AC_SUBST(EXPAT_LIBS) AC_SUBST(EXPAT_LIBS)
@ -11,7 +11,7 @@
LDFLAGS="-Wl,--as-needed $LDFLAGS" LDFLAGS="-Wl,--as-needed $LDFLAGS"
--- src/polkitbackend/polkitbackendinteractiveauthority.c --- src/polkitbackend/polkitbackendinteractiveauthority.c
+++ src/polkitbackend/polkitbackendinteractiveauthority.c +++ src/polkitbackend/polkitbackendinteractiveauthority.c
@@ -2227,6 +2227,7 @@ get_users_in_net_group (PolkitIdentity *group, @@ -2228,6 +2228,7 @@ get_users_in_net_group (PolkitIdentity *group,
ret = NULL; ret = NULL;
name = polkit_unix_netgroup_get_name (POLKIT_UNIX_NETGROUP (group)); name = polkit_unix_netgroup_get_name (POLKIT_UNIX_NETGROUP (group));
@ -19,7 +19,7 @@
#ifdef HAVE_SETNETGRENT_RETURN #ifdef HAVE_SETNETGRENT_RETURN
if (setnetgrent (name) == 0) if (setnetgrent (name) == 0)
{ {
@@ -2235,6 +2236,7 @@ get_users_in_net_group (PolkitIdentity *group, @@ -2236,6 +2237,7 @@ get_users_in_net_group (PolkitIdentity *group,
} }
#else #else
setnetgrent (name); setnetgrent (name);
@ -27,7 +27,7 @@
#endif #endif
for (;;) for (;;)
@@ -2247,8 +2249,10 @@ get_users_in_net_group (PolkitIdentity *group, @@ -2248,8 +2250,10 @@ get_users_in_net_group (PolkitIdentity *group,
PolkitIdentity *user; PolkitIdentity *user;
GError *error = NULL; GError *error = NULL;
@ -38,7 +38,7 @@
/* Skip NULL entries since we never want to make everyone an admin /* Skip NULL entries since we never want to make everyone an admin
* Skip "-" entries which mean "no match ever" in netgroup land */ * Skip "-" entries which mean "no match ever" in netgroup land */
@@ -2273,7 +2277,9 @@ get_users_in_net_group (PolkitIdentity *group, @@ -2274,7 +2278,9 @@ get_users_in_net_group (PolkitIdentity *group,
ret = g_list_reverse (ret); ret = g_list_reverse (ret);
out: out:
@ -50,19 +50,19 @@
--- src/polkitbackend/polkitbackendjsauthority.cpp --- src/polkitbackend/polkitbackendjsauthority.cpp
+++ src/polkitbackend/polkitbackendjsauthority.cpp +++ src/polkitbackend/polkitbackendjsauthority.cpp
@@ -1492,6 +1492,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, @@ -1499,6 +1499,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx,
if (!JS_ConvertArguments (cx, argc, JS_ARGV (cx, vp), "SS", &user_str, &netgroup_str))
goto out; JS::CallArgs args = JS::CallArgsFromVp (argc, vp);
+#if defined HAVE_GETNETGRENT +#if defined HAVE_GETNETGRENT
user = JS_EncodeString (cx, user_str); user = JS_EncodeString (cx, args[0].toString());
netgroup = JS_EncodeString (cx, netgroup_str); netgroup = JS_EncodeString (cx, args[1].toString());
@@ -1507,6 +1508,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, @@ -1514,6 +1515,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx,
JS_free (cx, user); JS_free (cx, user);
ret = JS_TRUE; ret = true;
+#endif +#endif
JS_SET_RVAL (cx, vp, BOOLEAN_TO_JSVAL (is_in_netgroup)); args.rval ().setBoolean (is_in_netgroup);
out:

38
srcpkgs/polkit/template
View file

@ -1,23 +1,20 @@
# Template file for 'polkit' # Template file for 'polkit'
pkgname=polkit pkgname=polkit
version=0.113.0.2018.03.19 version=0.114
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-systemd --disable-libsystemd-login --disable-libsystemd-login --disable-libelogind --disable-static
--disable-static --with-authfw=pam --with-os-type=void --with-mozjs=mozjs-24.0" --with-authfw=pam --with-os-type=void --with-mozjs=mozjs-52.0"
hostmakedepends="autoconf-archive automake gettext-devel git glib-devel
gobject-introspection gtk-doc intltool pkg-config"
makedepends="libglib-devel mozjs52-devel pam-devel"
short_desc="Authorization Toolkit" short_desc="Authorization Toolkit"
maintainer="Juan RP <xtraeme@voidlinux.eu>" maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2.0-or-later"
homepage="http://www.freedesktop.org/wiki/Software/polkit" homepage="http://www.freedesktop.org/wiki/Software/polkit"
license="GPL-2" distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.gz"
#distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.gz" checksum=bdf4007367d758fd794de2495975c115984d206267e52d1e6ac5ceea77e8ede6
#checksum=e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81
wrksrc=$pkgname
_hash=29ba7afba1b79a325183a71966f35926dfdf506e
hostmakedepends="automake libtool gettext-devel pkg-config intltool libxslt
docbook-xsl glib-devel gtk-doc gobject-introspection git autoconf-archive"
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
@ -30,21 +27,16 @@ 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() {
NOCONFIGURE=1 ./autogen.sh autoreconf -fi
# 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
} }
post_configure() { post_configure() {
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
sed -e "s#-include \(/usr/include/mozjs-24/js/RequiredDefines\.h\)#-include ${XBPS_CROSS_BASE}\1#" \ sed -e "s#-include \(/usr/include/mozjs-52/js/RequiredDefines\.h\)#-include ${XBPS_CROSS_BASE}\1#" \
-i `find -name Makefile` -i $(find -name Makefile)
fi fi
} }