Attachment 105723 Details for Bug 146238 – a.diff

[patch] a.diff

a.diff (text/plain), 4.32 KB, created by swell.k on 2010-05-02 16:00:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: swell.k

Created: 2010-05-02 16:00:12 UTC

Size: 4.32 KB

patch

obsolete

>Index: sysutils/jfbterm/Makefile
>===================================================================
>RCS file: /a/.cvsup/ports/sysutils/jfbterm/Makefile,v
>retrieving revision 1.10
>diff -u -p -r1.10 Makefile
>--- sysutils/jfbterm/Makefile	28 Mar 2010 06:43:51 -0000	1.10
>+++ sysutils/jfbterm/Makefile	2 May 2010 14:45:10 -0000
>@@ -5,8 +5,7 @@
> # $FreeBSD: ports/sysutils/jfbterm/Makefile,v 1.10 2010/03/28 06:43:51 dinoex Exp $
> 
> PORTNAME=	jfbterm
>-PORTVERSION=	0.6.0
>-PORTREVISION=	2
>+PORTVERSION=	0.6.1
> CATEGORIES=	sysutils
> MASTER_SITES=	http://www.ac.auone-net.jp/~baba/jfbterm/ \
> 		http://chirashi-no-ura.net/files/
>Index: sysutils/jfbterm/distinfo
>===================================================================
>RCS file: /a/.cvsup/ports/sysutils/jfbterm/distinfo,v
>retrieving revision 1.4
>diff -u -p -r1.4 distinfo
>--- sysutils/jfbterm/distinfo	1 Mar 2009 19:38:06 -0000	1.4
>+++ sysutils/jfbterm/distinfo	2 May 2010 14:45:17 -0000
>@@ -1,3 +1,3 @@
>-MD5 (jfbterm-FreeBSD-0.6.0.tar.gz) = 6b29125e987e11d779093bfe22c16792
>-SHA256 (jfbterm-FreeBSD-0.6.0.tar.gz) = adad94867d07e4f29020c31144786de9927d97752529b9ff6f7d81d1fc402915
>-SIZE (jfbterm-FreeBSD-0.6.0.tar.gz) = 203682
>+MD5 (jfbterm-FreeBSD-0.6.1.tar.gz) = fc5946d2ee0a9dae0d5aa6fc806416c3
>+SHA256 (jfbterm-FreeBSD-0.6.1.tar.gz) = 8cd44a8adcf3e329fdff762e7395ad1f37bcc23702a655802175d9baf5416026
>+SIZE (jfbterm-FreeBSD-0.6.1.tar.gz) = 218596
>Index: sysutils/jfbterm/files/patch-utmpx
>===================================================================
>RCS file: sysutils/jfbterm/files/patch-utmpx
>diff -N sysutils/jfbterm/files/patch-utmpx
>--- sysutils/jfbterm/files/patch-utmpx	4 Feb 2010 17:04:19 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,95 +0,0 @@
>---- term.c.orig	2009-02-07 12:30:17.000000000 -0500
>-+++ term.c	2010-01-28 13:40:25.000000000 -0500
>-@@ -59,7 +59,11 @@
>- #include <termios.h>
>- #include <time.h>
>- #include <unistd.h>
>-+#ifdef HAVE_UTMP_H
>- #include <utmp.h>
>-+#else
>-+#include <utmpx.h>
>-+#endif
>- 
>- #if defined (__linux__)
>- #include <sys/vt.h>
>-@@ -523,6 +527,41 @@ static void writeLoginRecord(void)
>- 	pututline(&utmp);
>- 	endutent();
>- 	privilege_off();
>-+#elif defined (__FreeBSD__) && (__FreeBSD_version >= 900007)
>-+	struct utmpx utmp;
>-+	struct passwd *pw;
>-+	char *tn;
>-+
>-+	assert(initialized);
>-+
>-+	bzero(&utmp, sizeof(utmp));
>-+	pw = getpwuid(privilege_getUID());
>-+	if (pw == NULL) {
>-+		warnx("who are you?");
>-+		return; /* give up */
>-+	}
>-+	if (strncmp(self->device, "/dev/pts/", 9) == 0 ||
>-+	    strncmp(self->device, "/dev/tty", 8) == 0) {
>-+		/* Unix98 style: "/dev/pts/\*" */
>-+		/* BSD style: "/dev/tty[l-sL-S][0-9a-v]" */
>-+		tn = self->device + strlen("/dev/");
>-+		if (strlen(tn) < 5)
>-+			return; /* bad format */
>-+		strncpy(utmp.ut_id, tn, sizeof(utmp.ut_id));
>-+	} else
>-+		return; /* bad format */
>-+	utmp.ut_type = DEAD_PROCESS;
>-+	privilege_on();
>-+	setutxent();
>-+	getutxid(&utmp);
>-+	utmp.ut_type = USER_PROCESS;
>-+	utmp.ut_pid = getpid();
>-+	strncpy(utmp.ut_line, tn, sizeof(utmp.ut_line));
>-+	strncpy(utmp.ut_user, pw->pw_name, sizeof(utmp.ut_user));
>-+	gettimeofday(&(utmp.ut_tv), NULL);
>-+	pututxline(&utmp);
>-+	endutxent();
>-+	privilege_off();
>- #elif defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
>- 	struct utmp utmp;
>- 	struct passwd *pw;
>-@@ -600,6 +639,38 @@ static void eraseLoginRecord(void)
>- 	pututline(utp);
>- 	endutent();
>- 	privilege_off();
>-+#elif defined (__FreeBSD__) && (__FreeBSD_version >= 900007)
>-+	struct utmpx utmp, *utp;
>-+	char *tn;
>-+
>-+	assert(initialized);
>-+
>-+	bzero(&utmp, sizeof(utmp));
>-+	if (strncmp(self->device, "/dev/pts/", 9) == 0 ||
>-+	    strncmp(self->device, "/dev/tty", 8) == 0) {
>-+		/* Unix98 style: "/dev/pts/\*" */
>-+		/* BSD style: "/dev/tty[l-sL-S][0-9a-v]" */
>-+		tn = self->device + strlen("/dev/");
>-+		if (strlen(tn) < 5)
>-+			return; /* bad format */
>-+		strncpy(utmp.ut_id, tn, sizeof(utmp.ut_id));
>-+	} else
>-+		return; /* bad format */
>-+	utmp.ut_type = USER_PROCESS;
>-+	privilege_on();
>-+	setutxent();
>-+	utp = getutxid(&utmp);
>-+	if (utp == NULL) {
>-+		endutxent();
>-+		privilege_off();
>-+		return; /* give up */
>-+	}
>-+	utp->ut_type = DEAD_PROCESS;
>-+	bzero(utp->ut_user, sizeof(utmp.ut_user));
>-+	gettimeofday(&(utp->ut_tv), NULL);
>-+	pututxline(utp);
>-+	endutxent();
>-+	privilege_off();
>- #elif defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
>- 	struct utmp utmp;
>- 	char *tn;

Actions: View | Diff

Attachments on bug 146238: 105723