elogind-235.2-3: updating version

2 files changed, 52 insertions, 28 deletions

diff --git a/pcr/elogind/PKGBUILD b/pcr/elogind/PKGBUILD
index 1bc733cac..794047066 100644
--- a/pcr/elogind/PKGBUILD
+++ b/pcr/elogind/PKGBUILD
@@ -1,56 +1,57 @@
-# Maintainer (Artix): artoo <artoo@manjaro.org>
+# Maintainer (Artix): artoo <artoo@cromnix.org>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgbase=elogind
 pkgname=('elogind' 'libelogind')
-pkgver=234.4
-pkgrel=1
+pkgver=235.2
+pkgrel=3
 pkgdesc="The systemd project's logind, extracted to a standalone package"
 arch=('i686' 'x86_64' 'armv7h')
 url="https://github.com/elogind/elogind"
 license=('GPL' 'LGPL2.1')
-makedepends=('intltool' 'libtool' 'gperf' 'gtk-doc' 'polkit-elogind' 'dbus-elogind' 'eudev')
+makedepends=('intltool' 'libtool' 'gperf' 'gtk-doc' 'polkit-elogind' 'dbus-elogind' 'eudev' 'libseccomp' 'meson')
 options=('!libtool')
-source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/elogind/elogind/archive/v${pkgver}.tar.gz")
-sha256sums=('ffb465a62c4281c19b07eb7fbb9ad0987f3b726ae1a868a92a3144d7714542f3')
+source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/elogind/elogind/archive/v${pkgver}.tar.gz"
+        "protect-user-XDG_RUNTIME_DIR.patch"
+        "cgroup-hierarchy.patch::https://github.com/elogind/elogind/commit/003ece760231aba0c661e2390dfd11075d72a8da.patch")
+sha256sums=('db5d7362ab7fd74a1ea863247f90f3b821cdb3e4433ba049a2fdcf5bf62b0fb9'
+            '4b04eb4bd87a6b0b15290f87b475d87920d5060ee7bf1583a2320f8f7f4c7658'
+            '652107d87b35bf78c43ac1610fa431467cf7b582ca6e38b53854286ea72dc983')
 
 prepare() {
     cd ${pkgbase}-${pkgver}
-    ./autogen.sh
+    patch -Np1 -i ${srcdir}/protect-user-XDG_RUNTIME_DIR.patch
+    patch -Np1 -i ${srcdir}/cgroup-hierarchy.patch
 }
 
 build() {
-    cd ${pkgbase}-${pkgver}
-    intltoolize
-    ./configure \
-        --sysconfdir=/etc \
-        --prefix=/usr \
-        --libdir=/usr/lib \
-        --libexecdir=/usr/lib \
-        --enable-split-usr \
-        --enable-polkit \
-        --disable-smack \
-        --enable-acl \
-        --enable-pam \
-        --with-rootlibdir=/usr/lib \
-        --with-udevrulesdir=/usr/lib/udev/rules.d \
-        --with-rootlibexecdir=/usr/lib/elogind \
-        --with-cgroup-controller=openrc
-    make
+    local meson_options=(
+        -Drootlibdir=/usr/lib
+        -Drootlibexecdir=/usr/lib/elogind
+        -Ddbuspolicydir=/usr/share/dbus-1/system.d
+        -Ddefault-hierarchy=hybrid
+        -Dcgroup-controller=openrc
+        -Dman=false
+#         -Ddefault-kill-user-processes=false
+    )
+
+    arch-meson "$pkgbase-${pkgver}" build "${meson_options[@]}"
+
+    ninja -C build
 }
 
 package_elogind() {
     pkgdesc="The systemd project's logind, extracted to a standalone package"
     provides=("elogind=${pkgver}")
-    depends=('acl' 'pam' 'dbus-elogind' 'eudev')
+    depends=('acl' 'pam' 'dbus-elogind' 'eudev' 'libseccomp' 'libelogind')
     conflicts=('systemd-sysvcompat' 'consolekit' 'pm-utils')
 #    replaces=('consolekit' 'pm-utils')
     optdepends=('elogind-openrc: elogind initscript'
                 'polkit-elogind: polkit support')
+    backup=('etc/elogind/logind.conf')
     install=elogind.install
 
-    cd ${pkgbase}-${pkgver}
-    make DESTDIR="${pkgdir}" install
+    DESTDIR="$pkgdir" ninja -C build install
 
     mkdir ${srcdir}/_libelogind
     mv -v ${pkgdir}/usr/lib/pkgconfig ${srcdir}/_libelogind
@@ -61,7 +62,7 @@ package_elogind() {
 package_libelogind(){
     pkgdesc="elogind client libraries"
     provides=('libelogind.so' "libelogind=${pkgver}")
-    depends=('libcap')
+    depends=('libcap' 'libeudev')
 
     cd ${pkgbase}-${pkgver}
 
diff --git a/pcr/elogind/protect-user-XDG_RUNTIME_DIR.patch b/pcr/elogind/protect-user-XDG_RUNTIME_DIR.patch
new file mode 100644
index 000000000..c97569ce8
--- /dev/null
+++ b/pcr/elogind/protect-user-XDG_RUNTIME_DIR.patch
@@ -0,0 +1,23 @@
+github.com/linuxmint/systemd-betsy commit-hash f7ab85f1e1169ac1598dfc1fba1c01063840b3c5
+
+
+Orignal Commit Author: https://github.com/clefebvre
+===================================================================
+--- elogind-234.4.orig/src/login/pam_elogind.c
++++ elogind-234.4/src/login/pam_elogind.c
+@@ -463,6 +463,15 @@
+                 if (r != PAM_SUCCESS)
+                         return r;
+         }
++        else {
++                if (pw->pw_uid == 0) {
++                        r = pam_misc_setenv(handle, "XDG_RUNTIME_DIR", "/run/user/0", 0);
++                        if (r != PAM_SUCCESS) {
++                                pam_syslog(handle, LOG_ERR, "Failed to set runtime dir for UID 0.");
++                                return r;
++                        }
++                }
++        }
+ 
+         if (!isempty(seat)) {
+                 r = pam_misc_setenv(handle, "XDG_SEAT", seat, 0);