mirror of
git://slackware.nl/current.git
synced 2025-01-10 05:25:51 +01:00
3b234388a5
a/mkinitrd-1.4.11-x86_64-12.txz: Rebuilt.
Updated to busybox-1.30.1.
mkinitrd: allow a colon-delimited list of kernel versions with -k
mkinitrd_command_generator.sh: allow a colon-delimited list of kernel
versions with -k
setup.01.mkinitrd: simplify script by using -k with a version list
ap/pamixer-1.4-x86_64-1.txz: Upgraded.
d/python-2.7.16-x86_64-1.txz: Upgraded.
Updated to the latest 2.7.x release, which fixes a few security issues.
For more information, see:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-1752
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-14647
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-5010
(* Security fix *)
d/vala-0.42.6-x86_64-1.txz: Upgraded.
l/gegl-0.4.14-x86_64-1.txz: Upgraded.
l/libsecret-0.18.8-x86_64-1.txz: Upgraded.
l/xapian-core-1.4.11-x86_64-1.txz: Upgraded.
x/mkfontscale-1.2.0-x86_64-1.txz: Upgraded.
x/xditview-1.0.5-x86_64-1.txz: Upgraded.
x/xdm-1.1.12-x86_64-1.txz: Upgraded.
225 lines
5.8 KiB
Diff
225 lines
5.8 KiB
Diff
--- ./configure.ac.orig 2019-03-02 16:06:13.000000000 -0600
|
|
+++ ./configure.ac 2019-03-03 13:30:09.779278886 -0600
|
|
@@ -395,6 +395,20 @@
|
|
PKG_CHECK_MODULES(XLIB, x11)
|
|
PKG_CHECK_MODULES(AUTH, xau)
|
|
|
|
+# ConsoleKit support
|
|
+AC_ARG_WITH(consolekit, AC_HELP_STRING([--with-consolekit], [Use ConsoleKit]),
|
|
+ [USE_CONSOLEKIT=$withval], [USE_CONSOLEKIT=yes])
|
|
+if test x"$USE_CONSOLEKIT" != xno; then
|
|
+ PKG_CHECK_MODULES(CK_CONNECTOR, ck-connector,
|
|
+ [USE_CONSOLEKIT=yes], [USE_CONSOLEKIT=no])
|
|
+ if test x"$USE_CONSOLEKIT" = xyes; then
|
|
+ AC_DEFINE([USE_CONSOLEKIT], 1, [Define to 1 to use ConsoleKit])
|
|
+ XDM_CFLAGS="$XDM_CFLAGS $CK_CONNECTOR_CFLAGS -DUSE_CONSOLEKIT"
|
|
+ XDM_LIBS="$XDM_LIBS $CK_CONNECTOR_LIBS"
|
|
+ fi
|
|
+fi
|
|
+dnl AM_CONDITIONAL(USE_CONSOLEKIT, test$USE_CONSOLEKIT = xyes)
|
|
+
|
|
#
|
|
# Greeter
|
|
#
|
|
--- ./include/dm.h.orig 2019-03-02 16:06:13.000000000 -0600
|
|
+++ ./include/dm.h 2019-03-03 13:30:09.788278885 -0600
|
|
@@ -327,6 +327,9 @@
|
|
extern char *prngdSocket;
|
|
extern int prngdPort;
|
|
# endif
|
|
+#ifdef USE_CONSOLEKIT
|
|
+extern int use_consolekit;
|
|
+#endif
|
|
|
|
extern char *greeterLib;
|
|
extern char *willing;
|
|
--- ./man/xdm.man.orig 2019-03-02 16:06:13.000000000 -0600
|
|
+++ ./man/xdm.man 2019-03-03 13:30:09.794278884 -0600
|
|
@@ -48,6 +48,8 @@
|
|
] [
|
|
.B \-session
|
|
.I session_program
|
|
+] [
|
|
+.B \-noconsolekit
|
|
]
|
|
.SH DESCRIPTION
|
|
.I Xdm
|
|
@@ -215,6 +217,10 @@
|
|
.IP "\fB\-xrm\fP \fIresource_specification\fP"
|
|
Allows an arbitrary resource to be specified, as in most
|
|
X Toolkit applications.
|
|
+.IP "\fB\-noconsolekit\fP"
|
|
+Specifies ``false'' as the value for the \fBDisplayManager.consoleKit\fP
|
|
+resource.
|
|
+This suppresses the session management using ConsoleKit.
|
|
.SH RESOURCES
|
|
At many stages the actions of
|
|
.I xdm
|
|
--- ./xdm/resource.c.orig 2019-03-02 16:06:13.000000000 -0600
|
|
+++ ./xdm/resource.c 2019-03-03 13:30:09.792278885 -0600
|
|
@@ -65,6 +65,9 @@
|
|
char *prngdSocket;
|
|
int prngdPort;
|
|
#endif
|
|
+#ifdef USE_CONSOLEKIT
|
|
+int use_consolekit;
|
|
+#endif
|
|
|
|
char *greeterLib;
|
|
char *willing;
|
|
@@ -192,6 +195,10 @@
|
|
"false"} ,
|
|
{ "willing", "Willing", DM_STRING, &willing,
|
|
""} ,
|
|
+#ifdef USE_CONSOLEKIT
|
|
+{ "consoleKit", "ConsoleKit", DM_BOOL, (char **) &use_consolekit,
|
|
+ "true"} ,
|
|
+#endif
|
|
};
|
|
|
|
#define NUM_DM_RESOURCES (sizeof DmResources / sizeof DmResources[0])
|
|
@@ -377,7 +384,11 @@
|
|
{"-debug", "*debugLevel", XrmoptionSepArg, (caddr_t) NULL },
|
|
{"-xrm", NULL, XrmoptionResArg, (caddr_t) NULL },
|
|
{"-daemon", ".daemonMode", XrmoptionNoArg, "true" },
|
|
-{"-nodaemon", ".daemonMode", XrmoptionNoArg, "false" }
|
|
+{"-nodaemon", ".daemonMode", XrmoptionNoArg, "false" },
|
|
+#ifdef USE_CONSOLEKIT
|
|
+{"-consolekit", ".consoleKit", XrmoptionNoArg, "true" },
|
|
+{"-noconsolekit", ".consoleKit", XrmoptionNoArg, "false" }
|
|
+#endif
|
|
};
|
|
|
|
static int originalArgc;
|
|
--- ./xdm/session.c.orig 2019-03-02 16:06:13.000000000 -0600
|
|
+++ ./xdm/session.c 2019-03-03 13:31:17.126272595 -0600
|
|
@@ -73,6 +73,11 @@
|
|
# endif
|
|
#endif /* USE_PAM */
|
|
|
|
+#ifdef USE_CONSOLEKIT
|
|
+#include <ck-connector.h>
|
|
+#include <dbus/dbus.h>
|
|
+#endif
|
|
+
|
|
#ifdef USE_SELINUX
|
|
#include <selinux/selinux.h>
|
|
#include <selinux/get_context_list.h>
|
|
@@ -523,6 +528,97 @@
|
|
}
|
|
}
|
|
|
|
+#ifdef USE_CONSOLEKIT
|
|
+
|
|
+static CkConnector *connector;
|
|
+
|
|
+static int openCKSession(struct verify_info *verify, struct display *d)
|
|
+{
|
|
+ int ret;
|
|
+ DBusError error;
|
|
+ char *remote_host_name = "";
|
|
+ dbus_bool_t is_local;
|
|
+ char *display_name = "";
|
|
+ char *display_device = "";
|
|
+ char devtmp[16];
|
|
+
|
|
+ if (!use_consolekit)
|
|
+ return 1;
|
|
+
|
|
+ is_local = d->displayType.location == Local;
|
|
+ if (d->peerlen > 0 && d->peer)
|
|
+ remote_host_name = d->peer;
|
|
+ if (d->name)
|
|
+ display_name = d->name;
|
|
+ /* how can we get the corresponding tty at best...? */
|
|
+ if (d->windowPath) {
|
|
+ display_device = strchr(d->windowPath, ':');
|
|
+ if (display_device && display_device[1])
|
|
+ display_device++;
|
|
+ else
|
|
+ display_device = d->windowPath;
|
|
+ snprintf(devtmp, sizeof(devtmp), "/dev/tty%s", display_device);
|
|
+ display_device = devtmp;
|
|
+ }
|
|
+
|
|
+ connector = ck_connector_new();
|
|
+ if (!connector) {
|
|
+ LogOutOfMem("ck_connector");
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
+ dbus_error_init(&error);
|
|
+ ret = ck_connector_open_session_with_parameters(
|
|
+ connector, &error,
|
|
+ "unix-user", &verify->uid,
|
|
+ "x11-display", &display_name,
|
|
+ "x11-display-device", &display_device,
|
|
+ "remote-host-name", &remote_host_name,
|
|
+ "is-local", &is_local,
|
|
+ NULL);
|
|
+ if (!ret) {
|
|
+ if (dbus_error_is_set(&error)) {
|
|
+ LogError("Dbus error: %s\n", error.message);
|
|
+ dbus_error_free(&error);
|
|
+ } else {
|
|
+ LogError("ConsoleKit error\n");
|
|
+ }
|
|
+ LogError("console-kit-daemon not running?\n");
|
|
+ ck_connector_unref(connector);
|
|
+ connector = NULL;
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
+ verify->userEnviron = setEnv(verify->userEnviron,
|
|
+ "XDG_SESSION_COOKIE", ck_connector_get_cookie(connector));
|
|
+ return 1;
|
|
+}
|
|
+
|
|
+static void closeCKSession(void)
|
|
+{
|
|
+ DBusError error;
|
|
+
|
|
+ if (!connector)
|
|
+ return;
|
|
+
|
|
+ dbus_error_init(&error);
|
|
+ if (!ck_connector_close_session(connector, &error)) {
|
|
+ if (dbus_error_is_set(&error)) {
|
|
+ LogError("Dbus error: %s\n", error.message);
|
|
+ dbus_error_free(&error);
|
|
+ } else {
|
|
+ LogError("ConsoleKit close error\n");
|
|
+ }
|
|
+ LogError("console-kit-daemon not running?\n");
|
|
+ }
|
|
+ ck_connector_unref(connector);
|
|
+ connector = NULL;
|
|
+}
|
|
+#else
|
|
+#define openCKSession(v,d) 1
|
|
+#define closeCKSession()
|
|
+#endif
|
|
+
|
|
void
|
|
SessionExit (struct display *d, int status, int removeAuth)
|
|
{
|
|
@@ -537,6 +633,8 @@
|
|
}
|
|
#endif
|
|
|
|
+ closeCKSession();
|
|
+
|
|
/* make sure the server gets reset after the session is over */
|
|
if (d->serverPid >= 2 && d->resetSignal)
|
|
kill (d->serverPid, d->resetSignal);
|
|
@@ -614,6 +712,10 @@
|
|
#ifdef USE_PAM
|
|
if (pamh) pam_open_session(pamh, 0);
|
|
#endif
|
|
+
|
|
+ if (!openCKSession(verify, d))
|
|
+ return 0;
|
|
+
|
|
switch (pid = fork ()) {
|
|
case 0:
|
|
CleanUpChild ();
|