head 1.8; access; symbols pkgsrc-2019Q2:1.7.0.96 pkgsrc-2019Q2-base:1.7 pkgsrc-2019Q1:1.7.0.94 pkgsrc-2019Q1-base:1.7 pkgsrc-2018Q4:1.7.0.92 pkgsrc-2018Q4-base:1.7 pkgsrc-2018Q3:1.7.0.90 pkgsrc-2018Q3-base:1.7 pkgsrc-2018Q2:1.7.0.88 pkgsrc-2018Q2-base:1.7 pkgsrc-2018Q1:1.7.0.86 pkgsrc-2018Q1-base:1.7 pkgsrc-2017Q4:1.7.0.84 pkgsrc-2017Q4-base:1.7 pkgsrc-2017Q3:1.7.0.82 pkgsrc-2017Q3-base:1.7 pkgsrc-2017Q2:1.7.0.78 pkgsrc-2017Q2-base:1.7 pkgsrc-2017Q1:1.7.0.76 pkgsrc-2017Q1-base:1.7 pkgsrc-2016Q4:1.7.0.74 pkgsrc-2016Q4-base:1.7 pkgsrc-2016Q3:1.7.0.72 pkgsrc-2016Q3-base:1.7 pkgsrc-2016Q2:1.7.0.70 pkgsrc-2016Q2-base:1.7 pkgsrc-2016Q1:1.7.0.68 pkgsrc-2016Q1-base:1.7 pkgsrc-2015Q4:1.7.0.66 pkgsrc-2015Q4-base:1.7 pkgsrc-2015Q3:1.7.0.64 pkgsrc-2015Q3-base:1.7 pkgsrc-2015Q2:1.7.0.62 pkgsrc-2015Q2-base:1.7 pkgsrc-2015Q1:1.7.0.60 pkgsrc-2015Q1-base:1.7 pkgsrc-2014Q4:1.7.0.58 pkgsrc-2014Q4-base:1.7 pkgsrc-2014Q3:1.7.0.56 pkgsrc-2014Q3-base:1.7 pkgsrc-2014Q2:1.7.0.54 pkgsrc-2014Q2-base:1.7 pkgsrc-2014Q1:1.7.0.52 pkgsrc-2014Q1-base:1.7 pkgsrc-2013Q4:1.7.0.50 pkgsrc-2013Q4-base:1.7 pkgsrc-2013Q3:1.7.0.48 pkgsrc-2013Q3-base:1.7 pkgsrc-2013Q2:1.7.0.46 pkgsrc-2013Q2-base:1.7 pkgsrc-2013Q1:1.7.0.44 pkgsrc-2013Q1-base:1.7 pkgsrc-2012Q4:1.7.0.42 pkgsrc-2012Q4-base:1.7 pkgsrc-2012Q3:1.7.0.40 pkgsrc-2012Q3-base:1.7 pkgsrc-2012Q2:1.7.0.38 pkgsrc-2012Q2-base:1.7 pkgsrc-2012Q1:1.7.0.36 pkgsrc-2012Q1-base:1.7 pkgsrc-2011Q4:1.7.0.34 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q3:1.7.0.32 pkgsrc-2011Q3-base:1.7 pkgsrc-2011Q2:1.7.0.30 pkgsrc-2011Q2-base:1.7 pkgsrc-2011Q1:1.7.0.28 pkgsrc-2011Q1-base:1.7 pkgsrc-2010Q4:1.7.0.26 pkgsrc-2010Q4-base:1.7 pkgsrc-2010Q3:1.7.0.24 pkgsrc-2010Q3-base:1.7 pkgsrc-2010Q2:1.7.0.22 pkgsrc-2010Q2-base:1.7 pkgsrc-2010Q1:1.7.0.20 pkgsrc-2010Q1-base:1.7 pkgsrc-2009Q4:1.7.0.18 pkgsrc-2009Q4-base:1.7 pkgsrc-2009Q3:1.7.0.16 pkgsrc-2009Q3-base:1.7 pkgsrc-2009Q2:1.7.0.14 pkgsrc-2009Q2-base:1.7 pkgsrc-2009Q1:1.7.0.12 pkgsrc-2009Q1-base:1.7 pkgsrc-2008Q4:1.7.0.10 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.8 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.6 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.4 pkgsrc-2008Q2-base:1.7 cwrapper:1.7.0.2 pkgsrc-2008Q1:1.6.0.12 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.10 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.8 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.6 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.4 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.2 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.5.0.8 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.6 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.4 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.2 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.3.0.18 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.16 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.14 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.12 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.10 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.8 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.6 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.4 pkgsrc-2003Q4-base:1.3 netbsd-1-6-1:1.3.0.2 netbsd-1-6-1-base:1.3 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2-base:1.1 buildlink2:1.1.0.2; locks; strict; comment @# @; 1.8 date 2019.09.01.12.08.17; author nia; state dead; branches; next 1.7; commitid WMP8HIHe6pWzWiBB; 1.7 date 2008.05.09.18.43.07; author agc; state Exp; branches; next 1.6; 1.6 date 2006.11.25.14.01.18; author sketch; state Exp; branches; next 1.5; 1.5 date 2005.12.05.20.51.15; author rillig; state Exp; branches; next 1.4; 1.4 date 2005.10.03.19.52.04; author joerg; state Exp; branches; next 1.3; 1.3 date 2002.12.26.04.58.45; author wiz; state Exp; branches; next 1.2; 1.2 date 2002.08.25.21.52.39; author jlam; state Exp; branches; next 1.1; 1.1 date 2002.06.17.22.13.45; author agc; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2002.06.17.22.13.45; author jlam; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2002.06.23.19.04.58; author jlam; state Exp; branches; next ; desc @@ 1.8 log @eterm: Update to 0.9.6 Don't install as setuid root. @ text @$NetBSD: patch-ah,v 1.7 2008/05/09 18:43:07 agc Exp $ --- src/utmp.c.orig 2006-05-11 04:33:40.000000000 +0100 +++ src/utmp.c 2006-11-25 13:01:25.000000000 +0000 @@@@ -44,11 +44,20 @@@@ static int utmp_pos; /* BSD position of utmp-stamp */ # endif + # ifdef USE_SYSV_UTMP # ifdef HAVE_UTMPX_H +# include # undef WTMP_FILENAME -# define WTMP_FILENAME WTMPX_FILE +# ifndef _PATH_WTMPX +# define _PATH_WTMPX "/var/log/wtmp" +# endif +# if defined(WTMPX_FILE) +# define WTMP_FILENAME WTMPX_FILE +# else +# define WTMP_FILENAME _PATH_WTMPX +# endif # define update_wtmp updwtmpx # else /* HAVE_UTMPX_H */ @@@@ -128,22 +137,26 @@@@ privileges(INVOKE); # ifdef HAVE_UTMPX_H getutmp(&utmp, &utmp2); - getutid(&utmp2); /* position to entry in utmp file */ + getutxid(&utmp); /* position to entry in utmp file */ # else - getutid(&utmp); /* position to entry in utmp file */ + getutxid(&utmp); /* position to entry in utmp file */ # endif /* set up the new entry */ strncpy(utmp.ut_id, ut_id, sizeof(utmp.ut_id)); strncpy(utmp.ut_line, pty, sizeof(utmp.ut_line)); +# ifndef __APPLE__ strncpy(utmp.ut_name, pwent->pw_name, sizeof(utmp.ut_name)); +# endif strncpy(utmp.ut_user, pwent->pw_name, sizeof(utmp.ut_user)); strncpy(utmp.ut_host, hostname, sizeof(utmp.ut_host)); utmp.ut_type = USER_PROCESS; utmp.ut_pid = getpid(); # ifdef HAVE_UTMPX_H +# ifndef __APPLE__ utmp.ut_session = getsid(0); utmp.ut_xtime = time(NULL); +# endif /* __APPLE__ */ utmp.ut_tv.tv_usec = 0; # else utmp.ut_time = time(NULL); @@@@ -152,16 +165,15 @@@@ /* * write a utmp entry to the utmp file */ - utmpname(UTMP_FILENAME); + utmpxname(UTMP_FILENAME); # ifdef HAVE_UTMPX_H getutmp(&utmp, &utmp2); - pututline(&utmp2); pututxline(&utmp); # else pututline(&utmp); # endif update_wtmp(WTMP_FILENAME, &utmp); - endutent(); /* close the file */ + endutxent(); /* close the file */ privileges(REVERT); return; fd = 0; @@@@ -177,19 +189,19 @@@@ if (!ut_id[0]) return; /* entry not made */ - utmpname(UTMP_FILENAME); - setutent(); - strncpy(utmp.ut_id, ut_id, sizeof(utmp.ut_id)); - utmp.ut_type = USER_PROCESS; - if (getutid(&utmp) == NULL) { + utmpxname(UTMP_FILENAME); + setutxent(); + strncpy(utmpx.ut_id, ut_id, sizeof(utmpx.ut_id)); + utmpx.ut_type = USER_PROCESS; + if (getutxid(&utmp) == NULL) { return; } - utmp.ut_type = DEAD_PROCESS; + utmpx.ut_type = DEAD_PROCESS; utmp.ut_time = time(NULL); - pututline(&utmp); + pututxline(&utmpx); getutmpx(&utmp, &utmpx); update_wtmp(WTMP_FILENAME, &utmpx); - endutent(); + endutxent(); # else /* HAVE_UTMPX_H */ struct utmp *putmp; @ 1.7 log @Make this package build on Mac OS X. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.6 2006/11/25 14:01:18 sketch Exp $ @ 1.6 log @Update Eterm to 0.9.4, lots of bugfixes (especially fixing colourmaps), and some initial UTF-8 support. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.5 2005/12/05 20:51:15 rillig Exp $ d5 5 a9 1 @@@@ -47,8 +47,13 @@@@ d16 3 d27 1 a27 1 @@@@ -128,9 +133,9 @@@@ d39 18 a56 1 @@@@ -152,16 +157,15 @@@@ d75 1 a75 1 @@@@ -177,19 +181,19 @@@@ @ 1.5 log @Fixed pkglint warnings. The warnings are mostly quoting issues, for example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some other changes are outlined in http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html @ text @d1 5 a5 13 $NetBSD: patch-ah,v 1.4 2005/10/03 19:52:04 joerg Exp $ --- src/utmp.c.orig Thu Jun 27 14:15:53 2002 +++ src/utmp.c Sat Dec 14 21:44:17 2002 @@@@ -38,7 +38,7 @@@@ # endif /* don't go off end of ut_id & remember if an entry has been made */ -# if defined(USE_SYSV_UTMP) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) +# if defined(USE_SYSV_UTMP) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__) static char ut_id[5]; /* remember if entry to utmp made */ # else static int utmp_pos; /* BSD position of utmp-stamp */ @@@@ -47,8 +47,13 @@@@ static int utmp_pos; /* BSD p d20 1 a20 1 @@@@ -128,9 +133,9 @@@@ add_utmp_entry(const char *pty, const ch d32 1 a32 1 @@@@ -152,16 +157,15 @@@@ add_utmp_entry(const char *pty, const ch d51 1 a51 1 @@@@ -177,19 +181,19 @@@@ remove_utmp_entry(void) a78 27 @@@@ -222,7 +226,7 @@@@ remove_utmp_entry(void) # else /* USE_SYSV_UTMP */ /* BSD utmp support */ -# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__) +# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__) || defined(__DragonFly__) /* used to hold the line we are using */ static char ut_line[32]; @@@@ -348,7 +352,7 @@@@ add_utmp_entry(const char *pty, const ch return; } -# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__) +# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__) || defined(__DragonFly__) strncpy(ut_line, pty, 31); strncpy(utmp.ut_line, pty, UT_LINESIZE); @@@@ -376,7 +380,7 @@@@ add_utmp_entry(const char *pty, const ch void remove_utmp_entry(void) { -# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__) +# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__) || defined(__DragonFly__) logout(ut_line); logwtmp(ut_line, "", ""); # else /* __FreeBSD__ */ @ 1.4 log @Add DragonFly support. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.3 2002/12/26 04:58:45 wiz Exp $ d4 1 a4 1 @@@@ -38,7 +38,7 @@@@ static const char cvs_ident[] = "$Id: ut @ 1.3 log @Update to 0.9.2, provided by Tracy J. Di Marco White in PR 19393. The ReleaseNotes say: Changes in 0.9: --------------- You're kidding, right? There have been so many changes here it's not funny. If you really want to know what they all are, you can read the ChangeLog. But I'd settle for this: - All new theme format. - 3-state image support. - Pixmapped scrollbars and popup menus. - Action bindings. - IPC interface to Eterm and Enlightenment. - Auto mode for automatic syncing with Enlightenment themes. @ text @d1 1 a1 1 $NetBSD$ d4 10 a13 1 @@@@ -47,8 +47,13 @@@@ d28 1 a28 1 @@@@ -128,9 +133,9 @@@@ d40 1 a40 1 @@@@ -152,16 +157,15 @@@@ d59 1 a59 1 @@@@ -177,19 +181,19 @@@@ d87 27 @ 1.2 log @Merge packages from the buildlink2 branch back into the main trunk that have been converted to USE_BUILDLINK2. @ text @d1 5 a5 13 $NetBSD: patch-ah,v 1.1.2.1 2002/06/23 19:04:58 jlam Exp $ --- src/utmp.c 2002/06/17 21:59:32 1.1 +++ src/utmp.c 2002/06/17 22:03:43 @@@@ -39,6 +39,7 @@@@ # undef HAVE_UTMPX_H #endif #ifdef HAVE_UTMPX_H +# include # include # define USE_SYSV_UTMP #else @@@@ -95,7 +96,11 @@@@ d8 10 a17 9 # undef WTMP_FILENAME -# define WTMP_FILENAME WTMPX_FILE +# if defined(WTMPX_FILE) +# define WTMP_FILENAME WTMPX_FILE +# else +# define WTMP_FILENAME _PATH_WTMPX +# endif # define update_wtmp updwtmpx # else /* HAVE_UTMPX_H */ d19 10 a28 27 @@@@ -179,7 +184,7 @@@@ privileges(INVOKE); #ifdef HAVE_UTMPX_H getutmp(&utmp, &utmp2); - getutid(&utmp2); /* position to entry in utmp file */ + getutxid(&utmp); /* position to entry in utmp file */ #else getutid(&utmp); /* position to entry in utmp file */ #endif @@@@ -203,16 +208,15 @@@@ /* * write a utmp entry to the utmp file */ - utmpname(UTMP_FILENAME); + utmpxname(UTMP_FILENAME); #ifdef HAVE_UTMPX_H getutmp(&utmp, &utmp2); - pututline(&utmp2); pututxline(&utmp); #else pututline(&utmp); #endif update_wtmp(WTMP_FILENAME, &utmp); - endutent(); /* close the file */ + endutxent(); /* close the file */ privileges(REVERT); } d30 23 a52 2 @@@@ -228,16 +232,16 @@@@ return; /* entry not made */ d54 21 a74 18 privileges(INVOKE); - utmpname(UTMP_FILENAME); - setutent(); - if (getutid(&utmp) == NULL) + utmpxname(UTMP_FILENAME); + setutxent(); + if (getutxid(&utmpx) == NULL) return; - utmp.ut_type = DEAD_PROCESS; + utmpx.ut_type = DEAD_PROCESS; utmp.ut_time = time(NULL); - pututline(&utmp); + pututxline(&utmpx); getutmpx(&utmp, &utmpx); update_wtmp(WTMP_FILENAME, &utmpx); - endutent(); + endutxent(); privileges(REVERT); d76 2 a77 1 #else /* HAVE_UTMPX_H */ @ 1.1 log @Add patches from Rui-Xiang Guo on netbsd-help mailing list which allow Eterm to compile on -current (utmpx changes). @ text @d1 1 a1 1 $NetBSD$ @ 1.1.2.1 log @file patch-ah was added on branch buildlink2 on 2002-06-23 19:04:58 +0000 @ text @d1 76 @ 1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 76 $NetBSD: patch-ah,v 1.1.2.1 2002/06/23 19:04:58 jlam Exp $ --- src/utmp.c 2002/06/17 21:59:32 1.1 +++ src/utmp.c 2002/06/17 22:03:43 @@@@ -39,6 +39,7 @@@@ # undef HAVE_UTMPX_H #endif #ifdef HAVE_UTMPX_H +# include # include # define USE_SYSV_UTMP #else @@@@ -95,7 +96,11 @@@@ # ifdef HAVE_UTMPX_H # undef WTMP_FILENAME -# define WTMP_FILENAME WTMPX_FILE +# if defined(WTMPX_FILE) +# define WTMP_FILENAME WTMPX_FILE +# else +# define WTMP_FILENAME _PATH_WTMPX +# endif # define update_wtmp updwtmpx # else /* HAVE_UTMPX_H */ @@@@ -179,7 +184,7 @@@@ privileges(INVOKE); #ifdef HAVE_UTMPX_H getutmp(&utmp, &utmp2); - getutid(&utmp2); /* position to entry in utmp file */ + getutxid(&utmp); /* position to entry in utmp file */ #else getutid(&utmp); /* position to entry in utmp file */ #endif @@@@ -203,16 +208,15 @@@@ /* * write a utmp entry to the utmp file */ - utmpname(UTMP_FILENAME); + utmpxname(UTMP_FILENAME); #ifdef HAVE_UTMPX_H getutmp(&utmp, &utmp2); - pututline(&utmp2); pututxline(&utmp); #else pututline(&utmp); #endif update_wtmp(WTMP_FILENAME, &utmp); - endutent(); /* close the file */ + endutxent(); /* close the file */ privileges(REVERT); } @@@@ -228,16 +232,16 @@@@ return; /* entry not made */ privileges(INVOKE); - utmpname(UTMP_FILENAME); - setutent(); - if (getutid(&utmp) == NULL) + utmpxname(UTMP_FILENAME); + setutxent(); + if (getutxid(&utmpx) == NULL) return; - utmp.ut_type = DEAD_PROCESS; + utmpx.ut_type = DEAD_PROCESS; utmp.ut_time = time(NULL); - pututline(&utmp); + pututxline(&utmpx); getutmpx(&utmp, &utmpx); update_wtmp(WTMP_FILENAME, &utmpx); - endutent(); + endutxent(); privileges(REVERT); #else /* HAVE_UTMPX_H */ @