Attachment 103875 Details for Bug 143954 – rxvt_devel_utmpx_diff.txt

rxvt_devel_utmpx_diff.txt

rxvt_devel_utmpx_diff.txt (text/plain; charset=US-ASCII), 3.98 KB, created by b. f. on 2010-02-15 16:23:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: b. f.

Created: 2010-02-15 16:23:18 UTC

Size: 3.98 KB

patch

obsolete

>diff -x '3.*' -x '*old.*' -x '*new.*' -ruN rxvt-devel.orig/Makefile rxvt-devel/Makefile
>--- rxvt-devel.orig/Makefile	2010-02-15 09:20:25.000000000 -0500
>+++ rxvt-devel/Makefile	2010-02-15 11:07:31.000000000 -0500
>@@ -39,7 +39,7 @@
> 		XIM		"Build with XIM support" off \
> 		XTERM		"Build with Xterm scrollbar" off
> 
>-CONFIGURE_ARGS=	--enable-utmp --enable-wtmp --enable-languages \
>+CONFIGURE_ARGS=	--enable-utmp --enable-lastlog \
> 		--with-xpm --enable-xpm-background --enable-shared \
> 		--enable-mousewheel --disable-languages
> USE_LDCONFIG=	yes
>@@ -48,6 +48,14 @@
> 
> .include <bsd.port.pre.mk>
> 
>+.if ${OSVERSION} >= 900007
>+CONFIGURE_ARGS+=	--disable-wtmp
>+EXTRA_PATCHES+=	${FILESDIR}/utmpx_patch-src::logging.c
>+.else
>+CONFIGURE_ARGS+=	--enable-wtmp
>+EXTRA_PATCHES+=	${FILESDIR}/utmp_patch-src::logging.c
>+.endif
>+
> # enable 256 color
> .if defined(WITH_256_COLOR)
> CONFIGURE_ARGS+=	--enable-256-color
>diff -x '3.*' -x '*old.*' -x '*new.*' -ruN rxvt-devel.orig/files/patch-src::logging.c rxvt-devel/files/patch-src::logging.c
>--- rxvt-devel.orig/files/patch-src::logging.c	2010-02-15 09:20:25.000000000 -0500
>+++ rxvt-devel/files/patch-src::logging.c	1969-12-31 19:00:00.000000000 -0500
>@@ -1,12 +0,0 @@
>---- src/logging.c
>-+++ src/logging.c
>-@@ -82,7 +82,8 @@
>-     else if (sscanf(pty, "pts/%d", &i) == 1)
>- 	sprintf(ut_id, "vt%02x", (i & 0xff));	/* sysv naming */
>- #endif
>--    else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3)) {
>-+    else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3) &&
>-+        STRNCMP(pty, "pts/", 4)) {
>- 	rxvt_print_error("can't parse tty name \"%s\"", pty);
>- 	return;
>-     }
>diff -x '3.*' -x '*old.*' -x '*new.*' -ruN rxvt-devel.orig/files/utmp_patch-src::logging.c rxvt-devel/files/utmp_patch-src::logging.c
>--- rxvt-devel.orig/files/utmp_patch-src::logging.c	1969-12-31 19:00:00.000000000 -0500
>+++ rxvt-devel/files/utmp_patch-src::logging.c	2010-02-15 11:01:15.000000000 -0500
>@@ -0,0 +1,12 @@
>+--- src/logging.c
>++++ src/logging.c
>+@@ -82,7 +82,8 @@
>+     else if (sscanf(pty, "pts/%d", &i) == 1)
>+ 	sprintf(ut_id, "vt%02x", (i & 0xff));	/* sysv naming */
>+ #endif
>+-    else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3)) {
>++    else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3) &&
>++        STRNCMP(pty, "pts/", 4)) {
>+ 	rxvt_print_error("can't parse tty name \"%s\"", pty);
>+ 	return;
>+     }
>diff -x '3.*' -x '*old.*' -x '*new.*' -ruN rxvt-devel.orig/files/utmpx_patch-src::logging.c rxvt-devel/files/utmpx_patch-src::logging.c
>--- rxvt-devel.orig/files/utmpx_patch-src::logging.c	1969-12-31 19:00:00.000000000 -0500
>+++ rxvt-devel/files/utmpx_patch-src::logging.c	2010-01-15 07:56:01.000000000 -0500
>@@ -0,0 +1,50 @@
>+--- src/logging.c
>++++ src/logging.c
>+@@ -82,7 +82,8 @@
>+     else if (sscanf(pty, "pts/%d", &i) == 1)
>+ 	sprintf(ut_id, "vt%02x", (i & 0xff));	/* sysv naming */
>+ #endif
>+-    else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3)) {
>++    else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3) &&
>++        STRNCMP(pty, "pts/", 4)) {
>+ 	rxvt_print_error("can't parse tty name \"%s\"", pty);
>+ 	return;
>+     }
>+@@ -137,7 +138,9 @@
>+     STRNCPY(utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
>+ 	    sizeof(utx->ut_user));
>+     STRNCPY(utx->ut_id, ut_id, sizeof(utx->ut_id));
>++#if 0
>+     utx->ut_session = getsid(0);
>++#endif
>+     utx->ut_tv.tv_sec = time(NULL);
>+     utx->ut_tv.tv_usec = 0;
>+     utx->ut_pid = r->h->cmd_pid;
>+@@ -202,7 +205,7 @@
>+ 	rxvt_update_wtmp(RXVT_WTMP_FILE, ut);
>+ #  endif
>+ # endif
>+-# ifdef HAVE_STRUCT_UTMPX
>++# if 0
>+ 	updwtmpx(RXVT_WTMPX_FILE, utx);
>+ # endif
>+     }
>+@@ -254,7 +257,9 @@
>+     if ((tmputx = getutxid(utx)))	/* position to entry in utmp file */
>+ 	utx = tmputx;
>+     utx->ut_type = DEAD_PROCESS;
>++#if 0
>+     utx->ut_session = getsid(0);
>++#endif
>+     utx->ut_tv.tv_sec = time(NULL);
>+     utx->ut_tv.tv_usec = 0;
>+ #endif
>+@@ -274,7 +279,7 @@
>+ 	rxvt_update_wtmp(RXVT_WTMP_FILE, ut);
>+ #  endif
>+ # endif
>+-# ifdef HAVE_STRUCT_UTMPX
>++# if 0
>+ 	updwtmpx(RXVT_WTMPX_FILE, utx);
>+ # endif
>+     }

Actions: View

Attachments on bug 143954: 103874 | 103875