diff options
| author | agc <agc@pkgsrc.org> | 2002-06-17 22:13:43 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2002-06-17 22:13:43 +0000 |
| commit | 0bc3c6f99707af11db662c8224d4a9001134c2ae (patch) | |
| tree | af82296f8721bf8ebe93575cfff209711e4a58c0 /x11 | |
| parent | 5fe610a6dcecbf0368b34e75fb808b3c0c2e7366 (diff) | |
| download | pkgsrc-0bc3c6f99707af11db662c8224d4a9001134c2ae.tar.gz | |
Add patches from Rui-Xiang Guo <rxg@ms25.url.com.tw> on netbsd-help mailing
list which allow Eterm to compile on -current (utmpx changes).
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/eterm/distinfo | 3 | ||||
| -rw-r--r-- | x11/eterm/patches/patch-ah | 76 |
2 files changed, 78 insertions, 1 deletions
diff --git a/x11/eterm/distinfo b/x11/eterm/distinfo index 161d5ac02e4..fd2e930bf23 100644 --- a/x11/eterm/distinfo +++ b/x11/eterm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2001/08/29 22:41:27 jlam Exp $ +$NetBSD: distinfo,v 1.5 2002/06/17 22:13:43 agc Exp $ SHA1 (Eterm-0.8.10.tar.gz) = 0cafeec2c9d79c874c6b312dcb105b912168ad0d Size (Eterm-0.8.10.tar.gz) = 593026 bytes @@ -15,3 +15,4 @@ SHA1 (patch-ad) = a750146fe3a0b0b2796997cf2e20e38f14be86bf SHA1 (patch-ae) = 7464d0b7b4b8d5b4c825d7fdcfa464b5e3d18a6c SHA1 (patch-af) = 8f21b197a56ddc0d66f29dcf9d5dcbe7922a28ae SHA1 (patch-ag) = 5359f122eb6fe605202288de59d71d07be4d2556 +SHA1 (patch-ah) = ebf2fa3ae2d272795f0a292b201586cc2158c973 diff --git a/x11/eterm/patches/patch-ah b/x11/eterm/patches/patch-ah new file mode 100644 index 00000000000..75e18862915 --- /dev/null +++ b/x11/eterm/patches/patch-ah @@ -0,0 +1,76 @@ +$NetBSD: patch-ah,v 1.1 2002/06/17 22:13:45 agc 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 <utmp.h> + # include <utmpx.h> + # 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 */ |