head	1.6;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.6
	OPENPKG_E1_MP:1.6
	OPENPKG_E1_MP_2_STABLE:1.6
	OPENPKG_E1_FP:1.6
	OPENPKG_2_STABLE_20061018:1.6
	OPENPKG_2_STABLE:1.6.0.2
	OPENPKG_2_STABLE_BP:1.6
	OPENPKG_2_5_RELEASE:1.5
	OPENPKG_2_5_SOLID:1.5.0.2
	OPENPKG_2_5_SOLID_BP:1.5
	OPENPKG_2_4_RELEASE:1.4
	OPENPKG_2_4_SOLID:1.4.0.10
	OPENPKG_2_4_SOLID_BP:1.4
	OPENPKG_2_3_RELEASE:1.4
	OPENPKG_2_3_SOLID:1.4.0.8
	OPENPKG_2_3_SOLID_BP:1.4
	OPENPKG_2_2_RELEASE:1.4
	OPENPKG_2_2_SOLID:1.4.0.6
	OPENPKG_2_2_SOLID_BP:1.4
	OPENPKG_2_1_RELEASE:1.4
	OPENPKG_2_1_SOLID:1.4.0.4
	OPENPKG_2_1_SOLID_BP:1.4
	OPENPKG_2_0_RELEASE:1.4
	OPENPKG_2_0_SOLID:1.4.0.2
	OPENPKG_2_0_SOLID_BP:1.4
	OPENPKG_1_3_RELEASE:1.2
	OPENPKG_1_3_SOLID:1.2.0.6
	OPENPKG_1_3_SOLID_BP:1.2
	OPENPKG_1_2_SOLID:1.2.0.4
	OPENPKG_1_2_SOLID_BP:1.2
	OPENPKG_1_STABLE:1.2.0.2
	OPENPKG_1_STABLE_BP:1.2;
locks; strict;
comment	@# @;


1.6
date	2005.11.03.19.45.03;	author steve;	state dead;
branches;
next	1.5;
commitid	ZDjSV9iRkDDtNl8r;

1.5
date	2005.09.28.14.41.14;	author rse;	state Exp;
branches;
next	1.4;

1.4
date	2003.03.23.19.23.38;	author rse;	state dead;
branches;
next	1.3;

1.3
date	2003.03.23.18.41.12;	author rse;	state Exp;
branches;
next	1.2;

1.2
date	2002.10.21.09.38.01;	author rse;	state dead;
branches;
next	1.1;

1.1
date	2002.09.20.12.41.48;	author rse;	state Exp;
branches;
next	;


desc
@@


1.6
log
@upgrading package: xterm 205 -> 206
@
text
@Index: main.c
--- main.c.orig	2005-09-19 01:48:12 +0200
+++ main.c	2005-09-28 16:39:42 +0200
@@@@ -379,14 +379,6 @@@@
 #include <util.h>
 #endif
 
-#ifdef __FreeBSD__
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <termios.h>
-#include <libutil.h>
-#include <grp.h>
-#endif
-
 #if !defined(UTMP_FILENAME)
 #if defined(UTMP_FILE)
 #define UTMP_FILENAME UTMP_FILE
@@@@ -472,7 +464,7 @@@@
 
 static Bool added_utmp_entry = False;
 
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
+#if defined(__OpenBSD__)
 static gid_t utmpGid = -1;
 #endif
 
@@@@ -1606,7 +1598,7 @@@@
     strcpy(ptydev, PTYDEV);
 #endif
 
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
+#if defined(__OpenBSD__)
     get_pty(NULL, NULL);
     seteuid(getuid());
     setuid(getuid());
@@@@ -1944,7 +1936,7 @@@@
 	}
 #endif
 
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
+#if defined(__OpenBSD__)
 	if (resource.utmpInhibit) {
 	    /* Can totally revoke group privs */
 	    setegid(getgid());
@@@@ -2354,7 +2346,7 @@@@
 {
     int result = 1;
 
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
+#if defined(__OpenBSD__)
     static int m_tty = -1;
     static int m_pty = -1;
     struct group *ttygrp;
@@@@ -4061,7 +4053,7 @@@@
 	    }
 #endif /* USE_LASTLOG */
 
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
+#if defined(__OpenBSD__)
 	    /* Switch to real gid after writing utmp entry */
 	    utmpGid = getegid();
 	    if (getgid() != getegid()) {
@@@@ -4436,7 +4428,7 @@@@
 	&& (resource.ptyHandshake && added_utmp_entry)
 #endif /* OPT_PTY_HANDSHAKE */
 	) {
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
+#if defined(__OpenBSD__)
 	if (utmpGid != -1) {
 	    /* Switch back to group utmp */
 	    setegid(utmpGid);
@


1.5
log
@apply a patch from the FreeBSD ports for fixing utmp support
@
text
@@


1.4
log
@ops, remove again the stuff prepared for fixing 1.76 (and which break 1.77)
@
text
@d1 5
a5 12
--- xterm.h.orig	Mon Mar 10 00:39:14 2003
+++ xterm.h	Sun Mar 23 09:09:14 2003
@@@@ -41,6 +41,10 @@@@
 #ifndef included_xterm_h
 #define included_xterm_h
 
+#ifndef OPT_PTY_HANDSHAKE
+#define OPT_PTY_HANDSHAKE 0
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include <xtermcfg.h>
d7 66
@


1.3
log
@upgrading package: xterm 1.75 -> 1.77
@
text
@@


1.2
log
@author included our submitted patch now
@
text
@d1 5
a5 4
--- xtermcontrol-2.0/src/configuration.c.orig	Fri Sep 20 14:39:32 2002
+++ xtermcontrol-2.0/src/configuration.c	Fri Sep 20 14:39:18 2002
@@@@ -11,6 +11,7 @@@@
 ****************************************************************************/
d7 7
a13 5
 #include <stdio.h>
+#include <sys/types.h>
 #include <regex.h>
 #include <stdlib.h>
 #include <string.h>
@


1.1
log
@update xtermcolors -> xtermcontrol (was renamed)
@
text
@@