[Midnightbsd-cvs] mports [20441] trunk/sysutils/consolekit: fix several issues with consolekit
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Oct 3 17:23:51 EDT 2015
Revision: 20441
http://svnweb.midnightbsd.org/mports/?rev=20441
Author: laffer1
Date: 2015-10-03 17:23:50 -0400 (Sat, 03 Oct 2015)
Log Message:
-----------
fix several issues with consolekit
Modified Paths:
--------------
trunk/sysutils/consolekit/Makefile
trunk/sysutils/consolekit/files/ck-get-x11-display-device
trunk/sysutils/consolekit/files/patch-src_ck-sysdeps-freebsd.c
trunk/sysutils/consolekit/pkg-plist
Modified: trunk/sysutils/consolekit/Makefile
===================================================================
--- trunk/sysutils/consolekit/Makefile 2015-10-03 21:16:29 UTC (rev 20440)
+++ trunk/sysutils/consolekit/Makefile 2015-10-03 21:23:50 UTC (rev 20441)
@@ -2,7 +2,7 @@
PORTNAME= consolekit
PORTVERSION= 0.4.5
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= sysutils gnome
MASTER_SITES= http://www.freedesktop.org/software/ConsoleKit/dist/
DISTFILES= ConsoleKit-${PORTVERSION}${EXTRACT_SUFX}
Modified: trunk/sysutils/consolekit/files/ck-get-x11-display-device
===================================================================
--- trunk/sysutils/consolekit/files/ck-get-x11-display-device 2015-10-03 21:16:29 UTC (rev 20440)
+++ trunk/sysutils/consolekit/files/ck-get-x11-display-device 2015-10-03 21:23:50 UTC (rev 20441)
@@ -26,6 +26,11 @@
device=$(${FSTAT} -p ${pid} | ${GREP} ttyv | ${AWK} '{print $8}')
+if [ -z "${device}" -a -f "/var/log/Xorg.$dispnum.log" ]; then
+ device=$(awk '/using VT number/ { print "ttyv" ($7 - 1); }' \
+ "/var/log/Xorg.$dispnum.log")
+fi
+
if [ -z "${device}" ]; then
echo "ERROR: Failed to find TTY device for X server on display ${dispnum}"
exit 1
Modified: trunk/sysutils/consolekit/files/patch-src_ck-sysdeps-freebsd.c
===================================================================
--- trunk/sysutils/consolekit/files/patch-src_ck-sysdeps-freebsd.c 2015-10-03 21:16:29 UTC (rev 20440)
+++ trunk/sysutils/consolekit/files/patch-src_ck-sysdeps-freebsd.c 2015-10-03 21:23:50 UTC (rev 20441)
@@ -1,5 +1,5 @@
---- src/ck-sysdeps-freebsd.c.orig 2008-04-03 20:36:21.000000000 -0400
-+++ src/ck-sysdeps-freebsd.c 2009-04-18 18:04:39.000000000 -0400
+--- src/ck-sysdeps-freebsd.c.orig 2010-09-03 15:54:31.000000000 +0200
++++ src/ck-sysdeps-freebsd.c 2015-03-23 09:28:20.476513000 +0100
@@ -27,6 +27,7 @@
#include <unistd.h>
#include <string.h>
@@ -57,7 +57,17 @@
}
hash = g_hash_table_new_full (g_str_hash,
-@@ -270,6 +273,7 @@ ck_unix_pid_get_env_hash (pid_t pid)
+@@ -261,6 +264,9 @@ ck_unix_pid_get_env_hash (pid_t pid)
+ for (i = 0; penv[i] != NULL; i++) {
+ char **vals;
+
++ if (!penv[i][0])
++ continue;
++
+ vals = g_strsplit (penv[i], "=", 2);
+ if (vals != NULL) {
+ g_hash_table_insert (hash,
+@@ -270,6 +276,7 @@ ck_unix_pid_get_env_hash (pid_t pid)
}
}
@@ -65,7 +75,7 @@
kvm_close (kd);
return hash;
-@@ -280,7 +284,7 @@ ck_unix_pid_get_env (pid_t pid,
+@@ -280,7 +287,7 @@ ck_unix_pid_get_env (pid_t pid,
const char *var)
{
GHashTable *hash;
@@ -74,7 +84,7 @@
/*
* Would probably be more efficient to just loop through the
-@@ -288,6 +292,8 @@ ck_unix_pid_get_env (pid_t pid,
+@@ -288,6 +295,8 @@ ck_unix_pid_get_env (pid_t pid,
* table, but this works for now.
*/
hash = ck_unix_pid_get_env_hash (pid);
@@ -83,7 +93,7 @@
val = g_strdup (g_hash_table_lookup (hash, var));
g_hash_table_destroy (hash);
-@@ -327,38 +333,38 @@ gboolean
+@@ -327,38 +336,38 @@ gboolean
ck_get_max_num_consoles (guint *num)
{
int max_consoles;
@@ -138,8 +148,8 @@
+ return TRUE;
}
- char *
-@@ -369,7 +375,12 @@ ck_get_console_device_for_num (guint num
+ gboolean
+@@ -375,7 +384,12 @@ ck_get_console_device_for_num (guint num
/* The device number is always one less than the VT number. */
num--;
@@ -153,7 +163,7 @@
return device;
}
-@@ -379,6 +390,7 @@ ck_get_console_num_from_device (const ch
+@@ -385,6 +399,7 @@ ck_get_console_num_from_device (const ch
guint *num)
{
guint n;
@@ -161,7 +171,7 @@
gboolean ret;
n = 0;
-@@ -388,7 +400,11 @@ ck_get_console_num_from_device (const ch
+@@ -394,7 +409,11 @@ ck_get_console_num_from_device (const ch
return FALSE;
}
@@ -174,7 +184,7 @@
/* The VT number is always one more than the device number. */
n++;
ret = TRUE;
-@@ -408,6 +424,7 @@ ck_get_active_console_num (int consol
+@@ -414,6 +433,7 @@ ck_get_active_console_num (int consol
gboolean ret;
int res;
int active;
@@ -182,7 +192,7 @@
g_assert (console_fd != -1);
-@@ -420,7 +437,12 @@ ck_get_active_console_num (int consol
+@@ -426,7 +446,12 @@ ck_get_active_console_num (int consol
goto out;
}
Modified: trunk/sysutils/consolekit/pkg-plist
===================================================================
--- trunk/sysutils/consolekit/pkg-plist 2015-10-03 21:16:29 UTC (rev 20440)
+++ trunk/sysutils/consolekit/pkg-plist 2015-10-03 21:23:50 UTC (rev 20441)
@@ -11,10 +11,12 @@
lib/ConsoleKit/scripts/ck-system-stop
lib/libck-connector.so
lib/libck-connector.so.0
+lib/pam_ck_connector.so
libdata/pkgconfig/ck-connector.pc
libexec/ck-collect-session-info
libexec/ck-get-x11-display-device
libexec/ck-get-x11-server-pid
+man/man8/pam_ck_connector.8.gz
sbin/console-kit-daemon
share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Manager.xml
share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Seat.xml
@@ -21,22 +23,12 @@
share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Session.xml
share/dbus-1/system-services/org.freedesktop.ConsoleKit.service
share/polkit-1/actions/org.freedesktop.consolekit.policy
- at exec mkdir -p %D/etc/ConsoleKit/run-session.d
- at exec mkdir -p %D/etc/ConsoleKit/run-seat.d
- at exec mkdir -p %D/lib/ConsoleKit/run-session.d
- at exec mkdir -p %D/lib/ConsoleKit/run-seat.d
- at dirrm lib/ConsoleKit/scripts
- at dirrmtry lib/ConsoleKit/run-session.d
- at dirrmtry lib/ConsoleKit/run-seat.d
- at dirrmtry lib/ConsoleKit
- at dirrm include/ConsoleKit/ck-connector
- at dirrm include/ConsoleKit
- at dirrm etc/ConsoleKit/seats.d
- at dirrmtry etc/ConsoleKit/run-session.d
- at dirrmtry etc/ConsoleKit/run-seat.d
- at dirrm etc/ConsoleKit
- at exec mkdir -p /var/run/ConsoleKit
- at exec mkdir -p /var/log/ConsoleKit
- at exec touch -f /var/log/ConsoleKit/history
- at unexec rm -rf /var/run/ConsoleKit 2>/dev/null || true
- at unexec rm -rf /var/log/ConsoleKit 2>/dev/null || true
+ at dir /var/run/ConsoleKit
+ at dir /var/log/ConsoleKit
+ at exec /usr/bin/touch /var/log/ConsoleKit/history
+ at rmtry /var/log/ConsoleKit/history
+ at dir etc/ConsoleKit/run-seat.d
+ at dir etc/ConsoleKit/run-session.d
+ at dir lib/ConsoleKit/run-seat.d
+ at dir lib/ConsoleKit/run-session.d
+
More information about the Midnightbsd-cvs
mailing list