diff options
Diffstat (limited to 'source/l/polkit')
| -rw-r--r-- | source/l/polkit/0001-configure-fix-elogind-support.patch | 29 | ||||
| -rwxr-xr-x | source/l/polkit/polkit.SlackBuild | 18 |
2 files changed, 42 insertions, 5 deletions
diff --git a/source/l/polkit/0001-configure-fix-elogind-support.patch b/source/l/polkit/0001-configure-fix-elogind-support.patch new file mode 100644 index 00000000..4c40bd9b --- /dev/null +++ b/source/l/polkit/0001-configure-fix-elogind-support.patch @@ -0,0 +1,29 @@ +From 08bb656496cd3d6213bbe9473f63f2d4a110da6e Mon Sep 17 00:00:00 2001 +From: Rasmus Thomsen <cogitri@exherbo.org> +Date: Wed, 11 Apr 2018 13:14:14 +0200 +Subject: [PATCH] configure: fix elogind support + +HAVE_LIBSYSTEMD is used to determine which source files to use. +We have to check if either have_libsystemd or have_libelogind is +true, as both of these need the source files which are used when +HAVE_LIBSYSTEMD is true. +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 36df239..da47ecb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -221,7 +221,7 @@ AS_IF([test "x$cross_compiling" != "xyes" ], [ + + AC_SUBST(LIBSYSTEMD_CFLAGS) + AC_SUBST(LIBSYSTEMD_LIBS) +-AM_CONDITIONAL(HAVE_LIBSYSTEMD, [test "$have_libsystemd" = "yes"], [Using libsystemd]) ++AM_CONDITIONAL(HAVE_LIBSYSTEMD, [test "$have_libsystemd" = "yes" || test "$have_libelogind" = "yes" ], [Using libsystemd]) + + dnl --------------------------------------------------------------------------- + dnl - systemd unit / service files +-- +2.17.0 + diff --git a/source/l/polkit/polkit.SlackBuild b/source/l/polkit/polkit.SlackBuild index 3182b995..0c12c80a 100755 --- a/source/l/polkit/polkit.SlackBuild +++ b/source/l/polkit/polkit.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=polkit VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -82,6 +82,9 @@ find . \ zcat $CWD/dont-set-wheel-group-as-admin.diff.gz | patch -p1 || exit 1 +# https://gitlab.freedesktop.org/polkit/polkit/-/issues/29 +zcat $CWD/0001-configure-fix-elogind-support.patch.gz | patch -p1 || exit 1 + # If we get here and don't have a polkitd user/group, add one. # Otherwise a few directories in the package will have wrong permissions. if ! grep -q "^polkitd:" /etc/passwd ; then @@ -99,9 +102,15 @@ else fi if [ ! -r configure ]; then - NOCONFIGURE=1 ./autogen.sh + if [ -x ./autogen.sh ]; then + NOCONFIGURE=1 ./autogen.sh + else + autoreconf -vif + fi fi +LIBELOGIND_CFLAGS="$(pkg-config --cflags libelogind)" \ +LIBELOGIND_LIBS="$(pkg-config --libs libelogind)" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -117,7 +126,7 @@ CXXFLAGS="$SLKCFLAGS" \ --disable-examples \ --enable-introspection \ --enable-libsystemd-login=no \ - --enable-libelogind=no \ + --enable-libelogind=yes \ $PAM_OPTIONS \ $SHADOW_OPTIONS \ --enable-verbose-mode \ @@ -179,9 +188,8 @@ if [ -r ChangeLog ]; then fi mkdir -p $PKG/install -zcat $CWD/doinst.sh > $PKG/install/doinst.sh +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - |