Browse Source

[testing] -> [extra] 'polkit-0.115+24+g5230646-1' move

master
artoo 9 months ago
parent
commit
bcb7727976
Signed by: artoo <artoo@artixlinux.org> GPG Key ID: 3292CD0BB0DB310B

+ 3
- 5
polkit/repos/extra-x86_64/PKGBUILD View File

@@ -1,8 +1,7 @@
# $Id$
# Maintainer: Jan de Groot <jgc@archlinux.org>

pkgname=polkit
pkgver=0.115+3+g8638ec5
pkgver=0.115+24+g5230646
pkgrel=1
pkgdesc="Application development toolkit for controlling system-wide privileges"
arch=(x86_64)
@@ -10,8 +9,8 @@ license=(LGPL)
url="https://www.freedesktop.org/wiki/Software/polkit/"
depends=(glib2 pam expat elogind js52)
makedepends=(intltool gtk-doc gobject-introspection git autoconf-archive)
_commit=8638ec5cd534dcc616b68e5b0744c493c0c71dc9 # master~2
source=("git+https://anongit.freedesktop.org/git/polkit#commit=$_commit"
_commit=5230646dc6876ef6e27f57926b1bad348f636147 # master
source=("git+https://gitlab.freedesktop.org/polkit/polkit.git#commit=$_commit"
'99-artix.rules'
'elogind-configure-fix.patch')
sha256sums=('SKIP'
@@ -25,7 +24,6 @@ pkgver() {

prepare() {
cd $pkgname
git cherry-pick -n 373705b35e7f6c7dc83de5e0a3ce11ecd15d0409
patch -Np 1 -i ${srcdir}/elogind-configure-fix.patch
NOCONFIGURE=1 ./autogen.sh
}

+ 0
- 21
polkit/repos/testing-x86_64/99-artix.rules View File

@@ -1,21 +0,0 @@
polkit.addRule(function(action, subject) {
if (action.id.indexOf("org.freedesktop.udisks2.") == 0 && subject.isInGroup("storage")) {
return polkit.Result.YES;
}
});

polkit.addRule(function(action, subject) {
if (action.id == "org.freedesktop.login1.power-off" ||
action.id == "org.freedesktop.login1.reboot" ||
action.id == "org.freedesktop.login1.hibernate" ||
action.id == "org.freedesktop.login1.suspend") {
return polkit.Result.YES;
}
});

polkit.addRule(function(action, subject) {
if (action.id == "org.freedesktop.upower.hibernate" ||
action.id == "org.freedesktop.upower.suspend") {
return polkit.Result.YES;
}
});

+ 0
- 63
polkit/repos/testing-x86_64/PKGBUILD View File

@@ -1,63 +0,0 @@
# Maintainer: Jan de Groot <jgc@archlinux.org>

pkgname=polkit
pkgver=0.115+24+g5230646
pkgrel=1
pkgdesc="Application development toolkit for controlling system-wide privileges"
arch=(x86_64)
license=(LGPL)
url="https://www.freedesktop.org/wiki/Software/polkit/"
depends=(glib2 pam expat elogind js52)
makedepends=(intltool gtk-doc gobject-introspection git autoconf-archive)
_commit=5230646dc6876ef6e27f57926b1bad348f636147 # master
source=("git+https://gitlab.freedesktop.org/polkit/polkit.git#commit=$_commit"
'99-artix.rules'
'elogind-configure-fix.patch')
sha256sums=('SKIP'
'd28d6ecaf7682860e2b3768bb266bd94313546b7cd0ef3c2eace7b1576c47adb'
'd90b2a95aa3e9e1ebf9369c038c144e04900e095c5405bc4ba4901c31bf3f59b')

pkgver() {
cd $pkgname
git describe --tags | sed 's/-/+/g'
}

prepare() {
cd $pkgname
patch -Np 1 -i ${srcdir}/elogind-configure-fix.patch
NOCONFIGURE=1 ./autogen.sh
}

build() {
cd $pkgname

./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --libexecdir=/usr/lib \
--enable-libsystemd-login=no --disable-static \
--enable-gtk-doc --with-os-type=redhat \
--enable-libelogind=yes --with-systemdsystemunitdir=no

sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool

make
}

check() {
cd $pkgname
make -k check || :
}

package() {
cd $pkgname
make DESTDIR="$pkgdir" install

install -d -o root -g 102 -m 750 "$pkgdir"/{etc,usr/share}/polkit-1/rules.d

install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" <<END
u polkitd 102 "PolicyKit daemon"
m polkitd proc
END
install -m0644 "${srcdir}"/99-artix.rules "${pkgdir}"/etc/polkit-1/rules.d
}

# vim: ts=2 sw=2 et:

+ 0
- 28
polkit/repos/testing-x86_64/elogind-configure-fix.patch View File

@@ -1,28 +0,0 @@
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

Loading…
Cancel
Save