diff options
| author | Neel Chauhan <nc@FreeBSD.org> | 2022-01-28 14:51:56 -0800 |
|---|---|---|
| committer | Neel Chauhan <nc@FreeBSD.org> | 2022-01-31 13:06:19 -0800 |
| commit | a69eab30db5aa908c31f17217000bd16a44b2496 (patch) | |
| tree | 03e4995b5bec985fc81f946616fb7373fa3e5751 /x11/gdm/files/patch-common_gdm-log.c | |
| parent | devel/pycharm-ce: update 2021.2.2 -> 2021.3.1 (diff) | |
x11/gdm: Update to 41.3
Differential Revision: https://reviews.freebsd.org/D34088
Diffstat (limited to 'x11/gdm/files/patch-common_gdm-log.c')
| -rw-r--r-- | x11/gdm/files/patch-common_gdm-log.c | 41 |
1 files changed, 9 insertions, 32 deletions
diff --git a/x11/gdm/files/patch-common_gdm-log.c b/x11/gdm/files/patch-common_gdm-log.c index be0bb062fe82..c3e7b623501f 100644 --- a/x11/gdm/files/patch-common_gdm-log.c +++ b/x11/gdm/files/patch-common_gdm-log.c @@ -1,13 +1,5 @@ -$OpenBSD: patch-common_gdm-log_c,v 1.1 2015/10/18 13:25:54 ajacoutot Exp $ - -REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit) -From 9be58c9ec9a3a411492a5182ac4b0d51fdc3a323 Mon Sep 17 00:00:00 2001 -From: Ray Strode <rstrode@redhat.com> -Date: Fri, 12 Jun 2015 13:48:52 -0400 -Subject: require logind support - ---- common/gdm-log.c.orig 2018-02-19 19:16:32.000000000 +0100 -+++ common/gdm-log.c 2018-04-05 21:59:25.290775000 +0200 +--- common/gdm-log.c.orig 2022-01-12 14:15:56 UTC ++++ common/gdm-log.c @@ -30,7 +30,9 @@ #include <unistd.h> @@ -18,39 +10,24 @@ Subject: require logind support #include <glib.h> #include <glib/gstdio.h> -@@ -125,12 +127,35 @@ gdm_log_set_debug (gboolean debug) - void - gdm_log_init (void) - { -+ const char *prg_name; -+ int options; -+ - if (initialized) - return; - +@@ -131,6 +133,20 @@ gdm_log_init (void) initialized = TRUE; -+#ifdef WITH_SYSTEMD -+ is_sd_booted = sd_booted () > 0; -+#endif -+ g_log_set_default_handler (gdm_log_default_handler, NULL); + ++#ifndef WITH_SYSTEMD + /* Only set up syslog if !systemd, otherwise with systemd + * enabled, we keep the default GLib log handler which goes to + * stderr, which is routed to the appropriate place in the + * systemd service file. + */ -+ if (!is_sd_booted) { -+ prg_name = g_get_prgname (); -+ -+ options = LOG_PID; ++ const char *prg_name = g_get_prgname (); ++ int options = LOG_PID; +#ifdef LOG_PERROR -+ options |= LOG_PERROR; ++ options |= LOG_PERROR; ++#endif ++ openlog (prg_name, options, LOG_DAEMON); +#endif -+ -+ openlog (prg_name, options, LOG_DAEMON); -+ } } void |