summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-auth/elogind/files')
-rw-r--r--sys-auth/elogind/files/elogind-219.12-glibc.patch44
-rw-r--r--sys-auth/elogind/files/elogind-219.12-gperf.patch109
-rw-r--r--sys-auth/elogind/files/elogind-219.12-login1-perms.patch129
-rw-r--r--sys-auth/elogind/files/elogind-219.12-runtime.patch43
-rw-r--r--sys-auth/elogind/files/elogind-219.12-session.patch45
-rw-r--r--sys-auth/elogind/files/elogind-docs.patch19
-rw-r--r--sys-auth/elogind/files/elogind-lrt.patch10
7 files changed, 0 insertions, 399 deletions
diff --git a/sys-auth/elogind/files/elogind-219.12-glibc.patch b/sys-auth/elogind/files/elogind-219.12-glibc.patch
deleted file mode 100644
index 05477c3e300a..000000000000
--- a/sys-auth/elogind/files/elogind-219.12-glibc.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-commit 27d13af71c3af6b2f9b60556d2c046dbb6e36e23
-Author: Mike Frysinger <vapier@gentoo.org>
-Date: Mon Mar 14 17:44:49 2016 -0400
-
- include sys/sysmacros.h in more places
-
- Since glibc is moving away from implicitly including sys/sysmacros.h
- all the time via sys/types.h, include the header directly in more
- places. This seems to cover most makedev/major/minor usage.
-
-diff --git a/src/shared/macro.h b/src/shared/macro.h
-index c34441d..b36a956 100644
---- a/src/shared/macro.h
-+++ b/src/shared/macro.h
-@@ -23,6 +23,7 @@
- #include <inttypes.h>
- #include <stdbool.h>
- #include <sys/param.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
-
- #define _printf_(a,b) __attribute__ ((format (printf, a, b)))
-diff --git a/src/shared/util.h b/src/shared/util.h
---- a/src/shared/util.h
-+++ b/src/shared/util.h
-@@ -36,6 +36,7 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <dirent.h>
- #include <stddef.h>
- #include <unistd.h>
-diff --git a/src/systemd/sd-device.h b/src/systemd/sd-device.h
---- a/src/systemd/sd-device.h
-+++ b/src/systemd/sd-device.h
-@@ -22,6 +22,7 @@
- ***/
-
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <stdint.h>
-
- #include "_sd-common.h"
diff --git a/sys-auth/elogind/files/elogind-219.12-gperf.patch b/sys-auth/elogind/files/elogind-219.12-gperf.patch
deleted file mode 100644
index 8342b8b3e960..000000000000
--- a/sys-auth/elogind/files/elogind-219.12-gperf.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-commit c9f7b4d356a453a01aa77a6bb74ca7ef49732c08
-Author: Mike Gilbert <floppymaster@gmail.com>
-Date: Tue Jan 10 02:39:05 2017 -0500
-
- build-sys: add check for gperf lookup function signature (#5055)
-
- gperf-3.1 generates lookup functions that take a size_t length
- parameter instead of unsigned int. Test for this at configure time.
-
- Fixes: https://github.com/systemd/systemd/issues/5039
-
-diff --git a/configure.ac b/configure.ac
-index 11bd46c..d58fff5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -255,6 +255,28 @@ AC_CHECK_SIZEOF(rlim_t,,[
- #include <sys/resource.h>
- ])
-
-+GPERF_TEST="$(echo foo,bar | ${GPERF} -L ANSI-C)"
-+
-+AC_COMPILE_IFELSE(
-+ [AC_LANG_PROGRAM([
-+ #include <string.h>
-+ const char * in_word_set(const char *, size_t);
-+ $GPERF_TEST]
-+ )],
-+ [GPERF_LEN_TYPE=size_t],
-+ [AC_COMPILE_IFELSE(
-+ [AC_LANG_PROGRAM([
-+ #include <string.h>
-+ const char * in_word_set(const char *, unsigned);
-+ $GPERF_TEST]
-+ )],
-+ [GPERF_LEN_TYPE=unsigned],
-+ [AC_MSG_ERROR([** unable to determine gperf len type])]
-+ )]
-+)
-+
-+AC_DEFINE_UNQUOTED([GPERF_LEN_TYPE], [$GPERF_LEN_TYPE], [gperf len type])
-+
- # ------------------------------------------------------------------------------
- # we use python to build the man page index
- have_python=no
-diff --git a/src/shared/af-list.c b/src/shared/af-list.c
-index 3fac9c5..4b291d1 100644
---- a/src/shared/af-list.c
-+++ b/src/shared/af-list.c
-@@ -23,7 +23,7 @@
- #include "af-list.h"
- #include "macro.h"
-
--static const struct af_name* lookup_af(register const char *str, register unsigned int len);
-+static const struct af_name* lookup_af(register const char *str, register GPERF_LEN_TYPE len);
-
- #include "af-from-name.h"
- #include "af-to-name.h"
-diff --git a/src/shared/arphrd-list.c b/src/shared/arphrd-list.c
-index 6792d1e..2d598dc 100644
---- a/src/shared/arphrd-list.c
-+++ b/src/shared/arphrd-list.c
-@@ -23,7 +23,7 @@
- #include "arphrd-list.h"
- #include "macro.h"
-
--static const struct arphrd_name* lookup_arphrd(register const char *str, register unsigned int len);
-+static const struct arphrd_name* lookup_arphrd(register const char *str, register GPERF_LEN_TYPE len);
-
- #include "arphrd-from-name.h"
- #include "arphrd-to-name.h"
-diff --git a/src/shared/cap-list.c b/src/shared/cap-list.c
-index 3e773a0..d68cc78 100644
---- a/src/shared/cap-list.c
-+++ b/src/shared/cap-list.c
-@@ -26,7 +26,7 @@
- #include "parse-util.h"
- #include "util.h"
-
--static const struct capability_name* lookup_capability(register const char *str, register unsigned int len);
-+static const struct capability_name* lookup_capability(register const char *str, register GPERF_LEN_TYPE len);
-
- #include "cap-from-name.h"
- #include "cap-to-name.h"
-diff --git a/src/shared/errno-list.c b/src/shared/errno-list.c
-index 31b66ba..c6a01ee 100644
---- a/src/shared/errno-list.c
-+++ b/src/shared/errno-list.c
-@@ -23,7 +23,7 @@
- #include "errno-list.h"
-
- static const struct errno_name* lookup_errno(register const char *str,
-- register unsigned int len);
-+ register GPERF_LEN_TYPE len);
-
- #include "errno-to-name.h"
- #include "errno-from-name.h"
-diff --git a/src/login/logind.h b/src/login/logind.h
-index 086fa1e..7556ee2 100644
---- a/src/login/logind.h
-+++ b/src/login/logind.h
-@@ -182,7 +182,7 @@ int manager_unit_is_active(Manager *manager, const char *unit);
- int manager_job_is_active(Manager *manager, const char *path);
-
- /* gperf lookup function */
--const struct ConfigPerfItem* logind_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* logind_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
-
- int manager_set_lid_switch_ignore(Manager *m, usec_t until);
-
diff --git a/sys-auth/elogind/files/elogind-219.12-login1-perms.patch b/sys-auth/elogind/files/elogind-219.12-login1-perms.patch
deleted file mode 100644
index eecf38ee1d26..000000000000
--- a/sys-auth/elogind/files/elogind-219.12-login1-perms.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 1ca40c077cd9a08f96a559ba51e8dba230298c4d Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Sun, 19 Jun 2016 01:56:56 +1000
-Subject: [PATCH] Update org.freedesktop.login1.conf
-
-This mirrors an upstream change opening up all of logind's bus calls to
-unprivileged users via polkit.
-
-See systemd/systemd/issues/471.
-Closes #3.
----
- src/login/org.freedesktop.login1.conf | 68 +++++++++++++++++++++++++++++++++++
- 1 file changed, 68 insertions(+)
-
-diff --git a/src/login/org.freedesktop.login1.conf b/src/login/org.freedesktop.login1.conf
-index 1318328..2e67e3d 100644
---- a/src/login/org.freedesktop.login1.conf
-+++ b/src/login/org.freedesktop.login1.conf
-@@ -90,6 +90,42 @@
-
- <allow send_destination="org.freedesktop.login1"
- send_interface="org.freedesktop.login1.Manager"
-+ send_member="LockSession"/>
-+
-+ <allow send_destination="org.freedesktop.login1"
-+ send_interface="org.freedesktop.login1.Manager"
-+ send_member="UnlockSession"/>
-+
-+ <allow send_destination="org.freedesktop.login1"
-+ send_interface="org.freedesktop.login1.Manager"
-+ send_member="LockSessions"/>
-+
-+ <allow send_destination="org.freedesktop.login1"
-+ send_interface="org.freedesktop.login1.Manager"
-+ send_member="UnlockSessions"/>
-+
-+ <allow send_destination="org.freedesktop.login1"
-+ send_interface="org.freedesktop.login1.Manager"
-+ send_member="KillSession"/>
-+
-+ <allow send_destination="org.freedesktop.login1"
-+ send_interface="org.freedesktop.login1.Manager"
-+ send_member="KillUser"/>
-+
-+ <allow send_destination="org.freedesktop.login1"
-+ send_interface="org.freedesktop.login1.Manager"
-+ send_member="TerminateSession"/>
-+
-+ <allow send_destination="org.freedesktop.login1"
-+ send_interface="org.freedesktop.login1.Manager"
-+ send_member="TerminateUser"/>
-+
-+ <allow send_destination="org.freedesktop.login1"
-+ send_interface="org.freedesktop.login1.Manager"
-+ send_member="TerminateSeat"/>
-+
-+ <allow send_destination="org.freedesktop.login1"
-+ send_interface="org.freedesktop.login1.Manager"
- send_member="PowerOff"/>
-
- <allow send_destination="org.freedesktop.login1"
-@@ -130,6 +166,10 @@
-
- <allow send_destination="org.freedesktop.login1"
- send_interface="org.freedesktop.login1.Manager"
-+ send_member="SetWallMessage"/>
-+
-+ <allow send_destination="org.freedesktop.login1"
-+ send_interface="org.freedesktop.login1.Manager"
- send_member="AttachDevice"/>
-
- <allow send_destination="org.freedesktop.login1"
-@@ -138,6 +178,10 @@
-
- <allow send_destination="org.freedesktop.login1"
- send_interface="org.freedesktop.login1.Seat"
-+ send_member="Terminate"/>
-+
-+ <allow send_destination="org.freedesktop.login1"
-+ send_interface="org.freedesktop.login1.Seat"
- send_member="ActivateSession"/>
-
- <allow send_destination="org.freedesktop.login1"
-@@ -154,14 +198,30 @@
-
- <allow send_destination="org.freedesktop.login1"
- send_interface="org.freedesktop.login1.Session"
-+ send_member="Terminate"/>
-+
-+ <allow send_destination="org.freedesktop.login1"
-+ send_interface="org.freedesktop.login1.Session"
- send_member="Activate"/>
-
- <allow send_destination="org.freedesktop.login1"
- send_interface="org.freedesktop.login1.Session"
-+ send_member="Lock"/>
-+
-+ <allow send_destination="org.freedesktop.login1"
-+ send_interface="org.freedesktop.login1.Session"
-+ send_member="Unlock"/>
-+
-+ <allow send_destination="org.freedesktop.login1"
-+ send_interface="org.freedesktop.login1.Session"
- send_member="SetIdleHint"/>
-
- <allow send_destination="org.freedesktop.login1"
- send_interface="org.freedesktop.login1.Session"
-+ send_member="Kill"/>
-+
-+ <allow send_destination="org.freedesktop.login1"
-+ send_interface="org.freedesktop.login1.Session"
- send_member="TakeControl"/>
-
- <allow send_destination="org.freedesktop.login1"
-@@ -180,6 +240,14 @@
- send_interface="org.freedesktop.login1.Session"
- send_member="PauseDeviceComplete"/>
-
-+ <allow send_destination="org.freedesktop.login1"
-+ send_interface="org.freedesktop.login1.User"
-+ send_member="Terminate"/>
-+
-+ <allow send_destination="org.freedesktop.login1"
-+ send_interface="org.freedesktop.login1.User"
-+ send_member="Kill"/>
-+
- <allow receive_sender="org.freedesktop.login1"/>
- </policy>
-
diff --git a/sys-auth/elogind/files/elogind-219.12-runtime.patch b/sys-auth/elogind/files/elogind-219.12-runtime.patch
deleted file mode 100644
index f14806c3164d..000000000000
--- a/sys-auth/elogind/files/elogind-219.12-runtime.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 276746896985c438d317fcae414e9c83a6dd3d76 Mon Sep 17 00:00:00 2001
-From: Sven Eden <yamakuzure@gmx.net>
-Date: Fri, 20 Jan 2017 17:14:35 +0100
-Subject: [PATCH] Create /run/systemd as needed
-
-* src/login/logind.c (main): Also create /run/systemd at startup.
-* Create /run/systemd/machines, so that the login monitor works.
-* Fail if any of the needed directories could not be created.
-* But do not fail if any of the needed directories exist.
----
- src/login/logind.c | 18 +++++++++++++++---
- 1 file changed, 15 insertions(+), 3 deletions(-)
-
-diff --git a/src/login/logind.c b/src/login/logind.c
-index 1ab50ec..07a77b1 100644
---- a/src/login/logind.c
-+++ b/src/login/logind.c
-@@ -1131,10 +1131,21 @@ int main(int argc, char *argv[]) {
- * existence of /run/systemd/seats/ to determine whether
- * logind is available, so please always make sure this check
- * stays in. */
-- mkdir_label("/run/systemd/seats", 0755);
-- mkdir_label("/run/systemd/users", 0755);
-- mkdir_label("/run/systemd/sessions", 0755);
-- mkdir_label("/run/systemd/machines", 0755);
-+ r = mkdir_label("/run/systemd", 0755);
-+ if ( (r < 0) && (-EEXIST != r) )
-+ return log_error_errno(r, "Failed to create /run/systemd : %m");
-+ r = mkdir_label("/run/systemd/seats", 0755);
-+ if ( r < 0 && (-EEXIST != r) )
-+ return log_error_errno(r, "Failed to create /run/systemd/seats : %m");
-+ r = mkdir_label("/run/systemd/users", 0755);
-+ if ( r < 0 && (-EEXIST != r) )
-+ return log_error_errno(r, "Failed to create /run/systemd/users : %m");
-+ r = mkdir_label("/run/systemd/sessions", 0755);
-+ if ( r < 0 && (-EEXIST != r) )
-+ return log_error_errno(r, "Failed to create /run/systemd/sessions : %m");
-+ r = mkdir_label("/run/systemd/machines", 0755);
-+ if ( r < 0 && (-EEXIST != r) )
-+ return log_error_errno(r, "Failed to create /run/systemd/machines : %m");
-
- m = manager_new();
- if (!m) {
diff --git a/sys-auth/elogind/files/elogind-219.12-session.patch b/sys-auth/elogind/files/elogind-219.12-session.patch
deleted file mode 100644
index 82cbebdead03..000000000000
--- a/sys-auth/elogind/files/elogind-219.12-session.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From b5c5dd2ad43a3bf4fa0fb21139f8d16959b5d14e Mon Sep 17 00:00:00 2001
-From: Andy Wingo <wingo@pobox.com>
-Date: Sun, 6 Mar 2016 16:56:33 +0100
-Subject: [PATCH] Fixes to user and session saving
-
-* src/login/logind-dbus.c (method_create_session): No need to save
- session here, as session_send_create_reply will do it.
-* src/login/logind-session-dbus.c (session_send_create_reply): On the
- other hand we do need to save the user here, so the file marks them as
- being active.
----
- src/login/logind-dbus.c | 2 --
- src/login/logind-session-dbus.c | 5 +++--
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
-index 5e6952d..6f7e569 100644
---- a/src/login/logind-dbus.c
-+++ b/src/login/logind-dbus.c
-@@ -801,8 +801,6 @@ static int method_create_session(sd_bus *bus, sd_bus_message *message, void *use
- if (r < 0)
- goto fail;
-
-- session_save(session);
--
- return 1;
-
- fail:
-diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c
-index f71798b..337bbbb 100644
---- a/src/login/logind-session-dbus.c
-+++ b/src/login/logind-session-dbus.c
-@@ -721,9 +721,10 @@ int session_send_create_reply(Session *s, sd_bus_error *error) {
- if (fifo_fd < 0)
- return fifo_fd;
-
-- /* Update the session state file before we notify the client
-- * about the result. */
-+ /* Update the session and user state files before we notify
-+ * the client about the result. */
- session_save(s);
-+ user_save(s->user);
-
- p = session_bus_path(s);
- if (!p)
diff --git a/sys-auth/elogind/files/elogind-docs.patch b/sys-auth/elogind/files/elogind-docs.patch
deleted file mode 100644
index 4763be2e6d7f..000000000000
--- a/sys-auth/elogind/files/elogind-docs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -253,16 +253,6 @@
- dist_bashcompletion_DATA =
- dist_zshcompletion_DATA =
-
--dist_doc_DATA = \
-- README \
-- NEWS \
-- LICENSE.LGPL2.1 \
-- LICENSE.GPL2 \
-- LICENSE.MIT \
-- src/libelogind/sd-bus/PORTING-DBUS1 \
-- src/libelogind/sd-bus/DIFFERENCES \
-- src/libelogind/sd-bus/GVARIANT-SERIALIZATION
--
- @INTLTOOL_POLICY_RULE@
-
- # ------------------------------------------------------------------------------
diff --git a/sys-auth/elogind/files/elogind-lrt.patch b/sys-auth/elogind/files/elogind-lrt.patch
deleted file mode 100644
index 19055fa30944..000000000000
--- a/sys-auth/elogind/files/elogind-lrt.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -778,6 +778,7 @@
-
- libelogind_core_la_LIBADD = \
- $(UDEV_LIBS) \
-+ -lrt \
- libelogind-internal.la
-
- if HAVE_ACL