Update to consolekit-0.4.1.
WIP, need uncommited stuffs and does wrong things for now, so it is still marked as BROKEN.
This commit is contained in:
parent
f4b1d677f3
commit
4c1f5cbb5a
@ -1,11 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.5 2009/11/13 14:52:33 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.6 2010/06/27 22:15:38 ajacoutot Exp $
|
||||
|
||||
BROKEN= WIP does not work yet
|
||||
|
||||
COMMENT= Framework for defining and tracking users
|
||||
|
||||
DISTNAME= ConsoleKit-0.3.0
|
||||
PKGNAME= ${DISTNAME:L}p3
|
||||
DISTNAME= ConsoleKit-0.4.1
|
||||
PKGNAME= ${DISTNAME:L}
|
||||
|
||||
CATEGORIES= sysutils
|
||||
|
||||
@ -13,7 +13,7 @@ EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
SHARED_LIBS+= ck-connector 0.0
|
||||
|
||||
HOMEPAGE= http://freedesktop.org/wiki/Software/ConsoleKit
|
||||
HOMEPAGE= http://www.freedesktop.org/wiki/Software/ConsoleKit
|
||||
|
||||
MANTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
|
||||
|
||||
@ -23,21 +23,23 @@ PERMIT_DISTFILES_FTP= Yes
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
|
||||
WANTLIB += X11 Xau Xdmcp c dbus-1 glib-2.0 gobject-2.0 gthread-2.0
|
||||
WANTLIB += kvm pcre pthread pthread-stubs xcb z
|
||||
WANTLIB += X11 Xau Xdmcp c dbus-1 dbus-glib-1 eggdbus-1 gio-2.0
|
||||
WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 kvm pcre
|
||||
WANTLIB += pthread pthread-stubs xcb z
|
||||
|
||||
MASTER_SITES= ftp://ftp.fr.freebsd.org/pub/FreeBSD/distfiles/
|
||||
MASTER_SITES= http://www.freedesktop.org/software/ConsoleKit/dist/
|
||||
|
||||
MODULES= devel/gettext
|
||||
|
||||
LIB_DEPENDS= dbus-glib-1.>=4::x11/dbus-glib
|
||||
LIB_DEPENDS= polkit-gobject-1::sysutils/polkit
|
||||
|
||||
AUTOCONF_VERSION= 2.61
|
||||
AUTOCONF_VERSION= 2.63
|
||||
CONFIGURE_STYLE= autoconf
|
||||
CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
|
||||
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
|
||||
--localstatedir=/var \
|
||||
--with-pid-file=/var/run/consolekit.pid
|
||||
CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
|
||||
--with-pid-file=/var/run/ConsoleKit/pid \
|
||||
--enable-pam-module=no
|
||||
|
||||
USE_LIBTOOL= Yes
|
||||
USE_GMAKE= Yes
|
||||
@ -56,5 +58,7 @@ post-install:
|
||||
${PREFIX}/libexec/ck-get-x11-display-device
|
||||
${INSTALL_SCRIPT} ${FILESDIR}/ck-get-x11-server-pid \
|
||||
${PREFIX}/libexec/ck-get-x11-server-pid
|
||||
${INSTALL_SCRIPT} ${FILESDIR}/pam-foreground-compat.ck \
|
||||
${PREFIX}/lib/ConsoleKit/run-session.d/pam-foreground-compat.ck
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,5 +1,5 @@
|
||||
MD5 (ConsoleKit-0.3.0.tar.bz2) = Q7AqUiEjMLVM+zTEBE2c4A==
|
||||
RMD160 (ConsoleKit-0.3.0.tar.bz2) = eh69L0v7ZWkOcBOMmSPD/S/K9nE=
|
||||
SHA1 (ConsoleKit-0.3.0.tar.bz2) = 47YVZiLMFOvKc4KlW47RXy8rrZg=
|
||||
SHA256 (ConsoleKit-0.3.0.tar.bz2) = y8+7PfLcdoVcmcHN/wSiV+xScPpi4dIbDQV7CNiMD9Q=
|
||||
SIZE (ConsoleKit-0.3.0.tar.bz2) = 393694
|
||||
MD5 (ConsoleKit-0.4.1.tar.bz2) = SO2kSDzJeEHV+I6OAD621w==
|
||||
RMD160 (ConsoleKit-0.4.1.tar.bz2) = gAB2ZFE0rWPVguqf+zraAROjLbE=
|
||||
SHA1 (ConsoleKit-0.4.1.tar.bz2) = qyuGQ8Hmlt9Nx52e4DI73JWqpqE=
|
||||
SHA256 (ConsoleKit-0.4.1.tar.bz2) = 8DKtxhRtdFA0MVBUxYIqegnzDiCkDW6AIiH6l3NUQD4=
|
||||
SIZE (ConsoleKit-0.4.1.tar.bz2) = 398080
|
||||
|
16
sysutils/consolekit/files/pam-foreground-compat.ck
Normal file
16
sysutils/consolekit/files/pam-foreground-compat.ck
Normal file
@ -0,0 +1,16 @@
|
||||
#!/bin/sh
|
||||
TAGDIR=/var/run/console
|
||||
|
||||
[ -n "${CK_SESSION_USER_UID}" ] || exit 1
|
||||
|
||||
TAGFILE="${TAGDIR}/$(getent passwd ${CK_SESSION_USER_UID} | cut -f 1 -d:)"
|
||||
|
||||
if [ "$1" = "session_added" ]; then
|
||||
mkdir -p "${TAGDIR}"
|
||||
echo "${CK_SESSION_ID}" >> "$TAGFILE"
|
||||
fi
|
||||
|
||||
if [ "$1" = "session_removed" ] && [ -e "$TAGFILE" ]; then
|
||||
sed -i "\%^$CK_SESSION_ID\$%d" "${TAGFILE}"
|
||||
[ -s "${TAGFILE}" ] || rm -f "${TAGFILE}"
|
||||
fi
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-configure_ac,v 1.3 2009/11/13 14:52:33 ajacoutot Exp $
|
||||
--- configure.ac.orig Thu Jul 31 02:35:53 2008
|
||||
+++ configure.ac Fri Nov 13 12:40:53 2009
|
||||
$OpenBSD: patch-configure_ac,v 1.4 2010/06/27 22:15:38 ajacoutot Exp $
|
||||
--- configure.ac.orig Thu Sep 24 08:22:12 2009
|
||||
+++ configure.ac Sun Jun 27 20:50:10 2010
|
||||
@@ -176,6 +176,14 @@ dnl --------------------------------------------------
|
||||
CK_BACKEND=""
|
||||
KVM_LIBS=""
|
||||
@ -16,7 +16,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2009/11/13 14:52:33 ajacoutot Exp $
|
||||
*-*-freebsd*)
|
||||
CK_BACKEND="freebsd"
|
||||
AC_CHECK_LIB(kvm, kvm_openfiles, have_kvm=yes,
|
||||
@@ -196,6 +204,7 @@ AC_SUBST(KVM_LIBS)
|
||||
@@ -199,6 +207,7 @@ AC_SUBST(KVM_LIBS)
|
||||
|
||||
AM_CONDITIONAL(CK_COMPILE_LINUX, test x$CK_BACKEND = xlinux, [Compiling for Linux])
|
||||
AM_CONDITIONAL(CK_COMPILE_FREEBSD, test x$CK_BACKEND = xfreebsd, [Compiling for FreeBSD])
|
||||
@ -24,7 +24,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2009/11/13 14:52:33 ajacoutot Exp $
|
||||
AM_CONDITIONAL(CK_COMPILE_SOLARIS, test x$CK_BACKEND = xsolaris, [Compiling for Solaris])
|
||||
AC_SUBST(CK_BACKEND)
|
||||
|
||||
@@ -393,6 +402,7 @@ src/Makefile
|
||||
@@ -399,6 +408,7 @@ src/Makefile
|
||||
tools/Makefile
|
||||
tools/linux/Makefile
|
||||
tools/freebsd/Makefile
|
||||
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-data_ConsoleKit_conf,v 1.1 2009/11/13 14:52:33 ajacoutot Exp $
|
||||
--- data/ConsoleKit.conf.orig Fri Nov 13 15:16:35 2009
|
||||
+++ data/ConsoleKit.conf Fri Nov 13 15:17:05 2009
|
||||
@@ -90,6 +90,8 @@
|
||||
<allow send_interface="org.freedesktop.ConsoleKit.Session"
|
||||
send_member="GetIdleHint"/>
|
||||
<allow send_interface="org.freedesktop.ConsoleKit.Session"
|
||||
+ send_member="SetIdleHint"/>
|
||||
+ <allow send_interface="org.freedesktop.ConsoleKit.Session"
|
||||
send_member="GetIdleSinceHint"/>
|
||||
</policy>
|
||||
|
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-data_org_freedesktop_ConsoleKit_service_in,v 1.1 2010/06/27 22:15:38 ajacoutot Exp $
|
||||
|
||||
http://bugs.freedesktop.org/show_bug.cgi?id=25642
|
||||
|
||||
--- data/org.freedesktop.ConsoleKit.service.in.orig Wed Apr 29 21:07:29 2009
|
||||
+++ data/org.freedesktop.ConsoleKit.service.in Sun Jun 27 23:15:50 2010
|
||||
@@ -1,4 +1,4 @@
|
||||
[D-BUS Service]
|
||||
Name=org.freedesktop.ConsoleKit
|
||||
-Exec=@sbindir@/console-kit-daemon
|
||||
+Exec=@sbindir@/console-kit-daemon --no-daemon
|
||||
User=root
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.2 2009/06/07 07:49:44 ajacoutot Exp $
|
||||
--- src/Makefile.in.orig Thu Jul 31 02:41:10 2008
|
||||
+++ src/Makefile.in Sun Jun 7 09:34:50 2009
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.3 2010/06/27 22:15:38 ajacoutot Exp $
|
||||
--- src/Makefile.in.orig Thu Sep 24 08:26:34 2009
|
||||
+++ src/Makefile.in Sun Jun 27 20:52:19 2010
|
||||
@@ -46,6 +46,10 @@ host_triplet = @host@
|
||||
@CK_COMPILE_FREEBSD_TRUE@ ck-sysdeps-freebsd.c \
|
||||
@CK_COMPILE_FREEBSD_TRUE@ $(NULL)
|
||||
@ -31,7 +31,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.2 2009/06/07 07:49:44 ajacoutot Exp $
|
||||
am_libck_la_OBJECTS = ck-sysdeps-unix.lo $(am__objects_1) \
|
||||
$(am__objects_2) $(am__objects_3) $(am__objects_4)
|
||||
libck_la_OBJECTS = $(am_libck_la_OBJECTS)
|
||||
@@ -362,10 +370,12 @@ libck_event_log_la_SOURCES = \
|
||||
@@ -365,10 +373,12 @@ libck_event_log_la_SOURCES = \
|
||||
libck_la_SOURCES = ck-sysdeps.h ck-sysdeps-unix.c $(NULL) \
|
||||
$(am__append_1) $(am__append_2) $(am__append_3)
|
||||
@CK_COMPILE_FREEBSD_TRUE@libck_la_LIBADD = $(KVM_LIBS)
|
||||
@ -44,7 +44,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.2 2009/06/07 07:49:44 ajacoutot Exp $
|
||||
$(NULL)
|
||||
|
||||
BUILT_SOURCES = \
|
||||
@@ -571,6 +581,7 @@ distclean-compile:
|
||||
@@ -574,6 +584,7 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-session-leader.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-session.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-sysdeps-freebsd.Plo@am__quote@
|
||||
@ -52,10 +52,10 @@ $OpenBSD: patch-src_Makefile_in,v 1.2 2009/06/07 07:49:44 ajacoutot Exp $
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-sysdeps-linux.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-sysdeps-solaris.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-sysdeps-unix.Plo@am__quote@
|
||||
@@ -933,8 +944,6 @@ ck-marshal.h: ck-marshal.list
|
||||
install-data-local:
|
||||
-mkdir -p $(DESTDIR)$(sysconfdir)/ConsoleKit/run-session.d
|
||||
@@ -938,8 +949,6 @@ install-data-local:
|
||||
-mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d
|
||||
-mkdir -p $(DESTDIR)$(sysconfdir)/ConsoleKit/run-seat.d
|
||||
-mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
|
||||
- -mkdir -p $(DESTDIR)$(localstatedir)/run/ConsoleKit
|
||||
- -mkdir -p $(DESTDIR)$(localstatedir)/log/ConsoleKit
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
|
@ -1,23 +1,18 @@
|
||||
$OpenBSD: patch-src_ck-manager_c,v 1.1 2009/11/13 14:52:33 ajacoutot Exp $
|
||||
$OpenBSD: patch-src_ck-manager_c,v 1.2 2010/06/27 22:15:38 ajacoutot Exp $
|
||||
|
||||
Allow shutdown on systems not using policykit.
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=549150
|
||||
Don't segfault if the seats file is invalid.
|
||||
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=561106
|
||||
|
||||
--- src/ck-manager.c.orig Wed Jul 30 23:53:07 2008
|
||||
+++ src/ck-manager.c Fri Nov 13 12:41:12 2009
|
||||
@@ -1349,7 +1349,6 @@ ck_manager_restart (CkManager *manager,
|
||||
}
|
||||
#else
|
||||
g_warning ("Compiled without PolicyKit or RBAC support!");
|
||||
- goto out;
|
||||
#endif
|
||||
--- src/ck-manager.c.orig Thu Sep 24 07:10:07 2009
|
||||
+++ src/ck-manager.c Sun Jun 27 23:11:30 2010
|
||||
@@ -2434,6 +2434,10 @@ add_seat_for_file (CkManager *manager,
|
||||
|
||||
g_debug ("ConsoleKit preforming Restart: %s", action);
|
||||
@@ -1409,7 +1408,6 @@ ck_manager_stop (CkManager *manager,
|
||||
}
|
||||
#else
|
||||
g_warning ("Compiled without PolicyKit or RBAC support!");
|
||||
- goto out;
|
||||
#endif
|
||||
seat = ck_seat_new_from_file (sid, filename);
|
||||
|
||||
g_debug ("Stopping system");
|
||||
+ if (seat == NULL) {
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
connect_seat_signals (manager, seat);
|
||||
if (!ck_seat_register (seat)) {
|
||||
/* returns false if connection to bus fails */
|
||||
|
@ -1,14 +0,0 @@
|
||||
$OpenBSD: patch-src_ck-run-programs_c,v 1.2 2009/10/16 09:36:56 ajacoutot Exp $
|
||||
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=17893
|
||||
|
||||
--- src/ck-run-programs.c.orig Sun May 31 19:37:54 2009
|
||||
+++ src/ck-run-programs.c Sun May 31 19:38:07 2009
|
||||
@@ -225,6 +225,7 @@ ck_run_programs (const char *dirpath,
|
||||
out_loop:
|
||||
g_free (child_argv[0]);
|
||||
}
|
||||
+ g_dir_close (dir);
|
||||
out:
|
||||
g_strfreev (env_for_child);
|
||||
}
|
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-src_ck-session_c,v 1.3 2009/11/13 14:52:33 ajacoutot Exp $
|
||||
$OpenBSD: patch-src_ck-session_c,v 1.4 2010/06/27 22:15:38 ajacoutot Exp $
|
||||
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=18330
|
||||
|
||||
--- src/ck-session.c.orig Thu Jul 31 02:36:10 2008
|
||||
+++ src/ck-session.c Fri Nov 13 12:40:48 2009
|
||||
@@ -1100,6 +1100,8 @@ ck_session_finalize (GObject *object)
|
||||
--- src/ck-session.c.orig Wed Aug 12 23:27:02 2009
|
||||
+++ src/ck-session.c Sun Jun 27 20:50:10 2010
|
||||
@@ -1101,6 +1101,8 @@ ck_session_finalize (GObject *object)
|
||||
|
||||
session_remove_activity_watch (session);
|
||||
g_object_unref (session->priv->bus_proxy);
|
||||
|
||||
+ g_object_unref (session->priv->bus_proxy);
|
||||
+
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-src_ck-sysdeps-unix_c,v 1.2 2009/11/13 14:52:33 ajacoutot Exp $
|
||||
$OpenBSD: patch-src_ck-sysdeps-unix_c,v 1.3 2010/06/27 22:15:38 ajacoutot Exp $
|
||||
--- src/ck-sysdeps-unix.c.orig Sun May 31 19:27:59 2009
|
||||
+++ src/ck-sysdeps-unix.c Sun May 31 19:40:26 2009
|
||||
@@ -35,6 +35,11 @@
|
||||
@ -38,7 +38,7 @@ $OpenBSD: patch-src_ck-sysdeps-unix_c,v 1.2 2009/11/13 14:52:33 ajacoutot Exp $
|
||||
+#endif
|
||||
+
|
||||
+#if defined(__OpenBSD__)
|
||||
+ fd = open_a_console ("/dev/ttyC4");
|
||||
+ fd = open_a_console ("/dev/ttyC0");
|
||||
+ if (fd >= 0) {
|
||||
+ goto done;
|
||||
+ }
|
||||
|
99
sysutils/consolekit/patches/patch-src_main_c
Normal file
99
sysutils/consolekit/patches/patch-src_main_c
Normal file
@ -0,0 +1,99 @@
|
||||
$OpenBSD: patch-src_main_c,v 1.1 2010/06/27 22:15:38 ajacoutot Exp $
|
||||
|
||||
From Debian:
|
||||
Cleanup console tag files on application startup and shutdown.
|
||||
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=25744
|
||||
|
||||
--- src/main.c.orig Wed Apr 29 21:07:29 2009
|
||||
+++ src/main.c Sun Jun 27 23:14:52 2010
|
||||
@@ -149,6 +149,43 @@ delete_pid (void)
|
||||
unlink (CONSOLE_KIT_PID_FILE);
|
||||
}
|
||||
|
||||
+#define CONSOLE_TAGS_DIR "/var/run/console"
|
||||
+
|
||||
+static void
|
||||
+delete_console_tags (void)
|
||||
+{
|
||||
+ GDir *dir;
|
||||
+ GError *error = NULL;
|
||||
+ const gchar *name;
|
||||
+
|
||||
+ g_debug ("Cleaning up %s", CONSOLE_TAGS_DIR);
|
||||
+
|
||||
+ dir = g_dir_open (CONSOLE_TAGS_DIR, 0, &error);
|
||||
+ if (dir == NULL) {
|
||||
+ g_debug ("Couldn't open directory %s: %s", CONSOLE_TAGS_DIR,
|
||||
+ error->message);
|
||||
+ g_error_free (error);
|
||||
+ return;
|
||||
+ }
|
||||
+ while ((name = g_dir_read_name (dir)) != NULL) {
|
||||
+ gchar *file;
|
||||
+ file = g_build_filename (CONSOLE_TAGS_DIR, name, NULL);
|
||||
+
|
||||
+ g_debug ("Removing tag file: %s", file);
|
||||
+ if (unlink (file) == -1) {
|
||||
+ g_warning ("Couldn't delete tag file: %s", file);
|
||||
+ }
|
||||
+ g_free (file);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
+cleanup (void)
|
||||
+{
|
||||
+ delete_console_tags ();
|
||||
+ delete_pid ();
|
||||
+}
|
||||
+
|
||||
/* copied from nautilus */
|
||||
static int debug_log_pipes[2];
|
||||
|
||||
@@ -229,7 +266,7 @@ create_pid_file (void)
|
||||
snprintf (pid, sizeof (pid), "%lu\n", (long unsigned) getpid ());
|
||||
written = write (pf, pid, strlen (pid));
|
||||
close (pf);
|
||||
- g_atexit (delete_pid);
|
||||
+ g_atexit (cleanup);
|
||||
} else {
|
||||
g_warning ("Unable to write pid file %s: %s",
|
||||
CONSOLE_KIT_PID_FILE,
|
||||
@@ -294,11 +331,19 @@ main (int argc,
|
||||
|
||||
setup_debug_log (debug);
|
||||
|
||||
+ g_debug ("initializing console-kit-daemon %s", VERSION);
|
||||
+
|
||||
connection = get_system_bus ();
|
||||
if (connection == NULL) {
|
||||
goto out;
|
||||
}
|
||||
|
||||
+ manager = ck_manager_new ();
|
||||
+
|
||||
+ if (manager == NULL) {
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
bus_proxy = get_bus_proxy (connection);
|
||||
if (bus_proxy == NULL) {
|
||||
g_warning ("Could not construct bus_proxy object; bailing out");
|
||||
@@ -310,15 +355,9 @@ main (int argc,
|
||||
goto out;
|
||||
}
|
||||
|
||||
- g_debug ("initializing console-kit-daemon %s", VERSION);
|
||||
+ delete_console_tags ();
|
||||
|
||||
create_pid_file ();
|
||||
-
|
||||
- manager = ck_manager_new ();
|
||||
-
|
||||
- if (manager == NULL) {
|
||||
- goto out;
|
||||
- }
|
||||
|
||||
loop = g_main_loop_new (NULL, FALSE);
|
||||
|
69
sysutils/consolekit/patches/patch-src_main_c.orig
Normal file
69
sysutils/consolekit/patches/patch-src_main_c.orig
Normal file
@ -0,0 +1,69 @@
|
||||
$OpenBSD: patch-src_main_c.orig,v 1.1 2010/06/27 22:15:38 ajacoutot Exp $
|
||||
|
||||
From Debian:
|
||||
Cleanup console tag files on application startup and shutdown.
|
||||
|
||||
--- src/main.c.orig Wed Apr 29 21:07:29 2009
|
||||
+++ src/main.c Sun Jun 27 23:12:34 2010
|
||||
@@ -149,6 +149,43 @@ delete_pid (void)
|
||||
unlink (CONSOLE_KIT_PID_FILE);
|
||||
}
|
||||
|
||||
+#define CONSOLE_TAGS_DIR "/var/run/console"
|
||||
+
|
||||
+static void
|
||||
+delete_console_tags (void)
|
||||
+{
|
||||
+ GDir *dir;
|
||||
+ GError *error = NULL;
|
||||
+ const gchar *name;
|
||||
+
|
||||
+ g_debug ("Cleaning up %s", CONSOLE_TAGS_DIR);
|
||||
+
|
||||
+ dir = g_dir_open (CONSOLE_TAGS_DIR, 0, &error);
|
||||
+ if (dir == NULL) {
|
||||
+ g_debug ("Couldn't open directory %s: %s", CONSOLE_TAGS_DIR,
|
||||
+ error->message);
|
||||
+ g_error_free (error);
|
||||
+ return;
|
||||
+ }
|
||||
+ while ((name = g_dir_read_name (dir)) != NULL) {
|
||||
+ gchar *file;
|
||||
+ file = g_build_filename (CONSOLE_TAGS_DIR, name, NULL);
|
||||
+
|
||||
+ g_debug ("Removing tag file: %s", file);
|
||||
+ if (unlink (file) == -1) {
|
||||
+ g_warning ("Couldn't delete tag file: %s", file);
|
||||
+ }
|
||||
+ g_free (file);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
+cleanup (void)
|
||||
+{
|
||||
+ delete_console_tags ();
|
||||
+ delete_pid ();
|
||||
+}
|
||||
+
|
||||
/* copied from nautilus */
|
||||
static int debug_log_pipes[2];
|
||||
|
||||
@@ -229,7 +266,7 @@ create_pid_file (void)
|
||||
snprintf (pid, sizeof (pid), "%lu\n", (long unsigned) getpid ());
|
||||
written = write (pf, pid, strlen (pid));
|
||||
close (pf);
|
||||
- g_atexit (delete_pid);
|
||||
+ g_atexit (cleanup);
|
||||
} else {
|
||||
g_warning ("Unable to write pid file %s: %s",
|
||||
CONSOLE_KIT_PID_FILE,
|
||||
@@ -311,6 +348,8 @@ main (int argc,
|
||||
}
|
||||
|
||||
g_debug ("initializing console-kit-daemon %s", VERSION);
|
||||
+
|
||||
+ delete_console_tags ();
|
||||
|
||||
create_pid_file ();
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-tools_Makefile_in,v 1.1 2009/11/13 14:52:33 ajacoutot Exp $
|
||||
--- tools/Makefile.in.orig Thu Jul 31 02:41:10 2008
|
||||
+++ tools/Makefile.in Fri Nov 13 12:40:53 2009
|
||||
$OpenBSD: patch-tools_Makefile_in,v 1.2 2010/06/27 22:15:38 ajacoutot Exp $
|
||||
--- tools/Makefile.in.orig Thu Sep 24 08:26:34 2009
|
||||
+++ tools/Makefile.in Sun Jun 27 20:50:10 2010
|
||||
@@ -35,6 +35,7 @@ host_triplet = @host@
|
||||
@CK_COMPILE_LINUX_TRUE@am__append_1 = linux
|
||||
@CK_COMPILE_FREEBSD_TRUE@am__append_2 = freebsd
|
||||
@ -9,7 +9,7 @@ $OpenBSD: patch-tools_Makefile_in,v 1.1 2009/11/13 14:52:33 ajacoutot Exp $
|
||||
bin_PROGRAMS = ck-launch-session$(EXEEXT) ck-list-sessions$(EXEEXT) \
|
||||
ck-history$(EXEEXT) $(am__EXEEXT_1)
|
||||
sbin_PROGRAMS = ck-log-system-start$(EXEEXT) \
|
||||
@@ -304,6 +305,7 @@ DIST_SUBDIRS = \
|
||||
@@ -307,6 +308,7 @@ DIST_SUBDIRS = \
|
||||
linux \
|
||||
freebsd \
|
||||
solaris \
|
||||
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.3 2009/11/13 14:52:33 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.4 2010/06/27 22:15:39 ajacoutot Exp $
|
||||
%%SHARED%%
|
||||
@bin bin/ck-history
|
||||
@bin bin/ck-launch-session
|
||||
@ -7,7 +7,9 @@ include/ConsoleKit/
|
||||
include/ConsoleKit/ck-connector/
|
||||
include/ConsoleKit/ck-connector/ck-connector.h
|
||||
lib/ConsoleKit/
|
||||
lib/ConsoleKit/run-seat.d/
|
||||
lib/ConsoleKit/run-session.d/
|
||||
lib/ConsoleKit/run-session.d/pam-foreground-compat.ck
|
||||
lib/ConsoleKit/scripts/
|
||||
lib/ConsoleKit/scripts/ck-system-restart
|
||||
lib/ConsoleKit/scripts/ck-system-stop
|
||||
@ -32,6 +34,8 @@ share/dbus-1/system-services/org.freedesktop.ConsoleKit.service
|
||||
share/examples/consolekit/
|
||||
share/examples/consolekit/ConsoleKit/
|
||||
@sample ${SYSCONFDIR}/ConsoleKit/
|
||||
share/examples/consolekit/ConsoleKit/run-seat.d/
|
||||
@sample ${SYSCONFDIR}/ConsoleKit/run-seat.d/
|
||||
share/examples/consolekit/ConsoleKit/run-session.d/
|
||||
@sample ${SYSCONFDIR}/ConsoleKit/run-session.d/
|
||||
share/examples/consolekit/ConsoleKit/seats.d/
|
||||
@ -42,4 +46,7 @@ share/examples/consolekit/dbus-1/
|
||||
@sample ${SYSCONFDIR}/dbus-1/
|
||||
share/examples/consolekit/dbus-1/ConsoleKit.conf
|
||||
@sample ${SYSCONFDIR}/dbus-1/system.d/ConsoleKit.conf
|
||||
share/polkit-1/
|
||||
share/polkit-1/actions/
|
||||
share/polkit-1/actions/org.freedesktop.consolekit.policy
|
||||
@sample /var/log/ConsoleKit/
|
||||
|
Loading…
Reference in New Issue
Block a user