From 1551c11016e077cfdfda0338745a5d2cb10da1da Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 12 Jul 2018 18:29:46 -0400 Subject: pcr/elogind: Update v235.4->v238.1, improve - v235.4 -> v238.1 - Every time you use a "#branch=" git URL, I die a little. Use a tag or a commit hash if you use a git URL. Preferably a signed tag. - Add a prepare() function to switch to the desired commit from the ${pkgver%%.*}-stable branch *after* makepkg has verified the signed tag referred to in sources=() (same as core/systemd) - Adopt the $base_pkgver.$commits_from_stable pkgver notation of core/systemd - Add a pkgver() function to update $commits_from_stable for you (same as core/systemd) - Use 2-space indent, same as every other PKGBUILD - Do similar package splitting to libre/systemd - Depend on generic 'udev', 'libudev', rather than 'eudev', 'libeudev' - Don't depend on -elogind versions of packages, let pacman figure it out - Split libelogind-manpages in to a speparate package, to avoid conflicts with systemd-libsystemd - Drop options=('!libtool') -- recent versions use Meson, not Autotools - makedepends: Drop libtool, we use Meson now - makedepends: Drop intltool, it isn't used - makedepends/elogind:depends: Drop libseccomp, it isn't used (commented out in the source) - makedepends: Drop polkit(-elogind), README claims it isn't a compile-time dep - makedepends: Replace gtk-doc with docbook-xsl, they switched a while ago - makedepends: Add libcap, just to be safe - makedepends: Add acl, just to be safe, since it is used - elogind:conflicts: Drop consolekit, it doesn't exist - elogind:conflicts: Drop pm-utils, it doesn't exist - elogind:conflicts: Drop systemd-sysvinit, there's no reason to have it - elogind:conflicts: Add systemd, they both ship the same dbus files - libelogind:depends: Drop libcap, it isn't linked against it - libelogind:depends: Drop libeudev, it isn't linked against libudev.so --- pcr/elogind/protect-user-XDG_RUNTIME_DIR.patch | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 pcr/elogind/protect-user-XDG_RUNTIME_DIR.patch (limited to 'pcr/elogind/protect-user-XDG_RUNTIME_DIR.patch') diff --git a/pcr/elogind/protect-user-XDG_RUNTIME_DIR.patch b/pcr/elogind/protect-user-XDG_RUNTIME_DIR.patch deleted file mode 100644 index c97569ce8..000000000 --- a/pcr/elogind/protect-user-XDG_RUNTIME_DIR.patch +++ /dev/null @@ -1,23 +0,0 @@ -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); -- cgit v1.2.3