polkit: try to unbreak musl build: patch based on the Alpine one.
This commit is contained in:
parent
127a61bc54
commit
9d3eff4747
2 changed files with 47 additions and 9 deletions
42
srcpkgs/polkit/patches/getnetgrent.patch
Normal file
42
srcpkgs/polkit/patches/getnetgrent.patch
Normal file
|
@ -0,0 +1,42 @@
|
||||||
|
--- configure.ac.orig 2015-05-08 10:21:01.500335031 +0200
|
||||||
|
+++ configure.ac 2015-05-08 10:21:19.483327115 +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)
|
||||||
|
+AC_CHECK_FUNCS(clearenv 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");
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'polkit'
|
# Template file for 'polkit'
|
||||||
pkgname=polkit
|
pkgname=polkit
|
||||||
version=0.112
|
version=0.112
|
||||||
revision=9
|
revision=10
|
||||||
build_pie=yes
|
build_pie=yes
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="$(vopt_enable gir introspection)
|
configure_args="$(vopt_enable gir introspection)
|
||||||
|
@ -14,8 +14,8 @@ license="GPL-2"
|
||||||
distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.gz"
|
distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.gz"
|
||||||
checksum=d695f43cba4748a822fbe864dd32c4887c5da1c71694a47693ace5e88fcf6af6
|
checksum=d695f43cba4748a822fbe864dd32c4887c5da1c71694a47693ace5e88fcf6af6
|
||||||
|
|
||||||
hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel
|
hostmakedepends="automake libtool gettext-devel pkg-config intltool libxslt
|
||||||
$(vopt_if gir gobject-introspection)"
|
docbook-xsl glib-devel gtk-doc gobject-introspection"
|
||||||
makedepends="libglib-devel expat-devel pam-devel mozjs17-devel
|
makedepends="libglib-devel expat-devel pam-devel mozjs17-devel
|
||||||
$(vopt_if systemd systemd-devel)"
|
$(vopt_if systemd systemd-devel)"
|
||||||
system_accounts="polkitd"
|
system_accounts="polkitd"
|
||||||
|
@ -26,16 +26,12 @@ make_dirs="
|
||||||
# Package build options
|
# Package build options
|
||||||
build_options="gir systemd"
|
build_options="gir systemd"
|
||||||
# Disable gir for cross builds.
|
# Disable gir for cross builds.
|
||||||
if [ "$CROSS_BUILD" ]; then
|
if [ -z "$CROSS_BUILD" ]; then
|
||||||
hostmakedepends+=" automake libtool gettext-devel gtk-doc gobject-introspection"
|
|
||||||
else
|
|
||||||
build_options_default+=" gir"
|
build_options_default+=" gir"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
pre_configure() {
|
pre_configure() {
|
||||||
if [ "$CROSS_BUILD" ]; then
|
autoreconf -fi
|
||||||
autoreconf -fi
|
|
||||||
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
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue