1 files changed, 55 insertions, 17 deletions
diff --git a/data/inetutils/utmpx.diff b/data/inetutils/utmpx.diff
index b3b64cb58..319be4ea0 100644
--- a/data/inetutils/utmpx.diff
+++ b/data/inetutils/utmpx.diff
@@ -11,22 +11,60 @@ diff -ru inetutils-1.5/configure.ac inetutils-1.5+iPhone/configure.ac
    AC_DEFINE(UTMPX, 1, [FIXME])
    ;;
  esac
-diff -ru inetutils-1.5/libinetutils/utmp_logout.c inetutils-1.5+iPhone/libinetutils/utmp_logout.c
---- inetutils-1.5/libinetutils/utmp_logout.c	2006-10-11 21:46:24.000000000 +0000
-+++ inetutils-1.5+iPhone/libinetutils/utmp_logout.c	2008-01-02 02:23:02.000000000 +0000
-@@ -52,11 +52,15 @@
+diff -ru inetutils-1.6/libinetutils/utmp_logout.c inetutils-1.6+iPhone/libinetutils/utmp_logout.c
+--- inetutils-1.6/libinetutils/utmp_logout.c	2006-10-21 15:24:20.000000000 +0000
++++ inetutils-1.6+iPhone/libinetutils/utmp_logout.c	2009-04-09 10:07:11.000000000 +0000
+@@ -52,12 +52,22 @@
  
- 	if ((ut = getutxline(&utx))) {
- 		ut->ut_type = DEAD_PROCESS;
-+#ifdef HAVE_STRUCT_UTMPX_UT_EXIT
- 		ut->ut_exit.e_termination = 0;
- 		ut->ut_exit.e_exit = 0;
-+#endif
- 		gettimeofday(&(ut->ut_tv), 0);
- 		pututxline(ut);
-+#ifdef HAVE_UPDWTMPX
- 		updwtmpx(PATH_WTMPX, ut);
-+#endif
- 	}
- 	endutxent();
+   if ((ut = getutxline (&utx)))
+     {
++# ifdef HAVE_STRUCT_UTMPX_UT_TYPE
+       ut->ut_type = DEAD_PROCESS;
++# endif
++# ifdef HAVE_STRUCT_UTMPX_UT_EXIT
+       ut->ut_exit.e_termination = 0;
+       ut->ut_exit.e_exit = 0;
++# endif
++# ifdef HAVE_STRUCT_UTMPX_UT_TV
+       gettimeofday (&(ut->ut_tv), 0);
++# else
++      time (&(ut->ut_time));
++# endif
+       pututxline (ut);
++# ifdef HAVE_UPDWTMPX
+       updwtmpx (PATH_WTMPX, ut);
++# endif
+     }
+   endutxent ();
  #else
+diff -ru inetutils-1.6/libinetutils/logwtmp.c inetutils-1.6+iPhone/libinetutils/logwtmp.c
+--- inetutils-1.6/libinetutils/logwtmp.c	2007-06-29 16:29:31.000000000 +0000
++++ inetutils-1.6+iPhone/libinetutils/logwtmp.c	2009-04-10 19:44:24.000000000 +0000
+@@ -48,6 +48,7 @@
+ # include <utmp.h>
+ #else
+ # ifdef  HAVE_UTMPX_H
++#  define _UTMPX_COMPAT
+ #  include <utmpx.h>
+ #  define utmp utmpx		/* make utmpx look more like utmp */
+ # endif
+@@ -113,16 +114,16 @@
+ 
+   /* Set information in new entry.  */
+   bzero (&ut, sizeof (ut));
+-#ifdef HAVE_STRUCT_UTMP_UT_TYPE
++#if defined(HAVE_STRUCT_UTMP_UT_TYPE) || defined(HAVE_STRUCT_UTMPX_UT_TYPE)
+   ut.ut_type = USER_PROCESS;
+ #endif
+   strncpy (ut.ut_line, line, sizeof ut.ut_line);
+   strncpy (ut.ut_name, name, sizeof ut.ut_name);
+-#ifdef HAVE_STRUCT_UTMP_UT_HOST
++#if defined(HAVE_STRUCT_UTMP_UT_HOST) || defined(HAVE_STRUCT_UTMPX_UT_HOST)
+   strncpy (ut.ut_host, host, sizeof ut.ut_host);
+ #endif
+ 
+-#ifdef HAVE_STRUCT_UTMP_UT_TV
++#if defined(HAVE_STRUCT_UTMP_UT_TV) || defined(HAVE_STRUCT_UTMPX_UT_TV)
+   gettimeofday (&ut.ut_tv, NULL);
+ #else
+   time (&ut.ut_time);