From bc916bc70b9bde9cc136ad59e2a5afc1fc75e9b3 Mon Sep 17 00:00:00 2001
From: markd <markd@pkgsrc.org>
Date: Thu, 7 Jul 2005 13:30:07 +0000
Subject: Fix gnome-pty-helper handling of NetBSD's utmpx.

When writing logout records NetBSD requires the ut_name field to be
filled in when calling pututxline() (otherwise utmp_update refuses to
write it) but nulled when writing to wtmpx.

Problem seen by gnome-terminal leaving stale utmpx entries on exit.
Bump PKGREVISION.
---
 x11/vte/Makefile         |  3 ++-
 x11/vte/distinfo         |  3 ++-
 x11/vte/patches/patch-ah | 25 +++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 x11/vte/patches/patch-ah

(limited to 'x11/vte')

diff --git a/x11/vte/Makefile b/x11/vte/Makefile
index 23b30638ada..a4a8ea62975 100644
--- a/x11/vte/Makefile
+++ b/x11/vte/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2005/06/01 18:03:32 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/07/07 13:30:07 markd Exp $
 #
 
 DISTNAME=	vte-0.11.13
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/vte/0.11/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/vte/distinfo b/x11/vte/distinfo
index bd83463c170..fa3769647f4 100644
--- a/x11/vte/distinfo
+++ b/x11/vte/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2005/05/18 16:19:05 drochner Exp $
+$NetBSD: distinfo,v 1.8 2005/07/07 13:30:07 markd Exp $
 
 SHA1 (vte-0.11.13.tar.bz2) = 1437f857f4be1eb53d8c1cf12d439a4092fc7cd2
 RMD160 (vte-0.11.13.tar.bz2) = 4d51361121ccfd37023334a5175bd45f515a0356
@@ -9,3 +9,4 @@ SHA1 (patch-ac) = 3b357bf9d1bca93c24f5b09dae1adec82323be0d
 SHA1 (patch-ae) = 7bc19459ab99bc71f0bc0e9fa36bcde49a512395
 SHA1 (patch-af) = 69ea7e022f6c495c3c9af681d05644b9d70e7bdc
 SHA1 (patch-ag) = a87e379e0ddc728bcd2db41856d669644be43bdc
+SHA1 (patch-ah) = 28cee2661439d7d6f1959ebf3c7d1b7b3fe0a764
diff --git a/x11/vte/patches/patch-ah b/x11/vte/patches/patch-ah
new file mode 100644
index 00000000000..1232f932116
--- /dev/null
+++ b/x11/vte/patches/patch-ah
@@ -0,0 +1,25 @@
+$NetBSD: patch-ah,v 1.1 2005/07/07 13:30:07 markd Exp $
+
+--- gnome-pty-helper/gnome-utmp.c.orig	2004-05-01 19:12:51.000000000 +1200
++++ gnome-pty-helper/gnome-utmp.c
+@@ -242,6 +242,9 @@ write_logout_record (void *data, int utm
+ #if defined(HAVE_UT_UT_ID)
+ 	strncpy (put.ut_id, ut->ut_id, sizeof (put.ut_id));
+ #endif
++#if defined(HAVE_UT_UT_NAME)
++	strncpy (put.ut_name, ut->ut_name, sizeof (put.ut_name));
++#endif
+ 
+ 	strncpy (put.ut_line, ut->ut_line, sizeof (put.ut_line));
+ 
+@@ -254,6 +257,10 @@ write_logout_record (void *data, int utm
+ 	if (utmp)
+ 		update_utmp (&put);
+ 
++#if defined(HAVE_UT_UT_NAME)
++	memset (put.ut_name, 0, sizeof (put.ut_name));
++#endif
++
+ 	if (wtmp)
+ 		update_wtmp (WTMP_OUTPUT_FILENAME, &put);
+ 
-- 
cgit v1.2.3