diff --git a/srcpkgs/polkit/files/polkit.tmpfiles b/srcpkgs/polkit/files/polkit.tmpfiles deleted file mode 100644 index 722a399d672..00000000000 --- a/srcpkgs/polkit/files/polkit.tmpfiles +++ /dev/null @@ -1,2 +0,0 @@ -d /etc/polkit-1/rules.d 0700 polkitd polkitd -d /usr/share/polkit-1/rules.d 0700 polkitd polkitd diff --git a/srcpkgs/polkit/patches/getnetgrent.patch b/srcpkgs/polkit/patches/getnetgrent.patch index dde221c3871..c03e37e61db 100644 --- a/srcpkgs/polkit/patches/getnetgrent.patch +++ b/srcpkgs/polkit/patches/getnetgrent.patch @@ -1,11 +1,11 @@ ---- configure.ac.orig 2015-05-08 10:21:01.500335031 +0200 -+++ configure.ac 2015-05-08 10:21:19.483327115 +0200 +--- 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) -+AC_CHECK_FUNCS(clearenv getnetgrent) +-AC_CHECK_FUNCS(clearenv fdatasync) ++AC_CHECK_FUNCS(clearenv fdatasync getnetgrent) if test "x$GCC" = "xyes"; then LDFLAGS="-Wl,--as-needed $LDFLAGS" diff --git a/srcpkgs/polkit/template b/srcpkgs/polkit/template index f5f8e33ff2b..99b403446cd 100644 --- a/srcpkgs/polkit/template +++ b/srcpkgs/polkit/template @@ -1,30 +1,29 @@ # Template file for 'polkit' pkgname=polkit -version=0.112 -revision=10 +version=0.113 +revision=1 build_pie=yes build_style=gnu-configure configure_args="$(vopt_enable gir introspection) - $(vopt_enable systemd) $(vopt_enable systemd libsystemd-login) + --disable-systemd --disable-libsystemd-login --disable-static --with-authfw=pam --with-os-type=void --with-mozjs=mozjs-17.0" short_desc="Authorization Toolkit" maintainer="Juan RP " homepage="http://www.freedesktop.org/wiki/Software/polkit" license="GPL-2" distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.gz" -checksum=d695f43cba4748a822fbe864dd32c4887c5da1c71694a47693ace5e88fcf6af6 +checksum=e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81 hostmakedepends="automake libtool gettext-devel pkg-config intltool libxslt docbook-xsl glib-devel gtk-doc gobject-introspection" -makedepends="libglib-devel expat-devel pam-devel mozjs17-devel - $(vopt_if systemd systemd-devel)" +makedepends="libglib-devel expat-devel pam-devel mozjs17-devel" system_accounts="polkitd" make_dirs=" /etc/polkit-1/rules.d 0700 polkitd polkitd /usr/share/polkit-1/rules.d 0700 polkitd polkitd" # Package build options -build_options="gir systemd" +build_options="gir" # Disable gir for cross builds. if [ -z "$CROSS_BUILD" ]; then build_options_default+=" gir" @@ -35,18 +34,13 @@ pre_configure() { # Drop requirement of /sys/fs/cgroup/systemd test in configure... WTF. sed -e 's,/sys/fs/cgroup/systemd/,/sys/fs/cgroup,g' -i configure } - post_configure() { if [ "$CROSS_BUILD" ]; then sed -e "s,/usr/include/js-17.0,${XBPS_CROSS_BASE}/usr/include/js-17.0," -i src/polkitbackend/Makefile fi } - post_install() { vinstall ${FILESDIR}/polkit-1.pam 644 etc/pam.d polkit-1 - if [ "$build_option_systemd" ]; then - vinstall ${FILESDIR}/polkit.tmpfiles 644 usr/lib/tmpfiles.d polkit.conf - fi } polkit-devel_package() {