From 165e59467c0b6527c2136ff4451e69ef91377427 Mon Sep 17 00:00:00 2001 From: marcus Date: Thu, 8 Nov 2007 20:38:50 +0000 Subject: Fix writing of a login record. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9918 df743ca5-7f9a-e211-a948-0013205c9059 --- x11/gdm/Makefile | 4 ++-- x11/gdm/files/patch-daemon_gdm-session-record.c | 24 +++++++++++++++++++++--- 2 files changed, 23 insertions(+), 5 deletions(-) (limited to 'x11') diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 6883b5a41..d934a551b 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/x11/gdm/Makefile,v 1.83 2007/11/06 20:57:10 marcus Exp $ +# $MCom: ports/x11/gdm/Makefile,v 1.84 2007/11/07 00:38:20 marcus Exp $ # PORTNAME= gdm PORTVERSION= 2.21.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11/gdm/files/patch-daemon_gdm-session-record.c b/x11/gdm/files/patch-daemon_gdm-session-record.c index 82935686b..d41db6e34 100644 --- a/x11/gdm/files/patch-daemon_gdm-session-record.c +++ b/x11/gdm/files/patch-daemon_gdm-session-record.c @@ -1,5 +1,5 @@ ---- daemon/gdm-session-record.c.orig 2007-11-02 20:51:29.000000000 -0400 -+++ daemon/gdm-session-record.c 2007-11-02 20:52:49.000000000 -0400 +--- daemon/gdm-session-record.c.orig 2007-10-30 14:54:03.000000000 -0400 ++++ daemon/gdm-session-record.c 2007-11-08 15:29:41.000000000 -0500 @@ -85,7 +85,7 @@ record_set_username (UTMP *u, u->ut_user); #elif defined(HAVE_UT_UT_NAME) @@ -9,7 +9,25 @@ sizeof (u->ut_name)); g_debug ("using ut_name %.*s", (int) sizeof (u->ut_name), -@@ -296,7 +296,7 @@ gdm_session_record_logout (GPid +@@ -228,7 +228,7 @@ gdm_session_record_login (GPid + updwtmpx (GDM_NEW_SESSION_RECORDS_FILE, &session_record); + #elif defined(HAVE_UPDWTMP) + updwtmp (GDM_NEW_SESSION_RECORDS_FILE, &session_record); +-#elif defined(HAVE_LOGWTMP) && defined(HAVE_UT_UT_HOST) && !defined(HAVE_LOGIN) ++#elif defined(HAVE_LOGWTMP) && defined(HAVE_UT_UT_HOST) + #if defined(HAVE_UT_UT_USER) + logwtmp (session_record.ut_line, session_record.ut_user, session_record.ut_host); + #elif defined(HAVE_UT_UT_NAME) +@@ -261,6 +261,8 @@ gdm_session_record_login (GPid + g_debug ("Adding new utmp record"); + pututxline (&session_record); + } ++#elif defined(HAVE_LOGIN) ++ login (&session_record); + #endif + } + +@@ -296,7 +298,7 @@ gdm_session_record_logout (GPid #elif defined (HAVE_UPDWTMP) updwtmp (GDM_NEW_SESSION_RECORDS_FILE, &session_record); #elif defined(HAVE_LOGWTMP) -- cgit v1.2.3