diff options
Diffstat (limited to 'data/inetutils')
| -rw-r--r-- | data/inetutils/_metadata/conflicts | 1 | ||||
| -rw-r--r-- | data/inetutils/_metadata/homepage | 1 | ||||
| l--------- | data/inetutils/_metadata/libresolv.dep | 1 | ||||
| l--------- | data/inetutils/_metadata/ncurses.dep | 1 | ||||
| -rw-r--r-- | data/inetutils/_metadata/provides | 1 | ||||
| -rw-r--r-- | data/inetutils/_metadata/version | 2 | ||||
| -rw-r--r-- | data/inetutils/inetd.diff | 12 | ||||
| -rw-r--r-- | data/inetutils/inetutils-1.5.tar.gz | bin | 1390529 -> 0 bytes | |||
| -rw-r--r-- | data/inetutils/inetutils-1.6.tar.gz | bin | 0 -> 1675311 bytes | |||
| -rw-r--r-- | data/inetutils/logwtmp.diff | 117 | ||||
| -rw-r--r-- | data/inetutils/make.sh | 5 | ||||
| -rw-r--r-- | data/inetutils/mdns.diff | 550 | ||||
| -rw-r--r-- | data/inetutils/netinet.diff | 55 | ||||
| -rw-r--r-- | data/inetutils/sysnerr.diff | 11 | ||||
| -rw-r--r-- | data/inetutils/utmpx.diff | 72 |
15 files changed, 247 insertions, 582 deletions
diff --git a/data/inetutils/_metadata/conflicts b/data/inetutils/_metadata/conflicts new file mode 100644 index 000000000..e829ae2ef --- /dev/null +++ b/data/inetutils/_metadata/conflicts @@ -0,0 +1 @@ +coreutils (<< 7.2-6) diff --git a/data/inetutils/_metadata/homepage b/data/inetutils/_metadata/homepage new file mode 100644 index 000000000..2db9f2e9d --- /dev/null +++ b/data/inetutils/_metadata/homepage @@ -0,0 +1 @@ +http://www.gnu.org/software/inetutils/ diff --git a/data/inetutils/_metadata/libresolv.dep b/data/inetutils/_metadata/libresolv.dep deleted file mode 120000 index 40a8d5796..000000000 --- a/data/inetutils/_metadata/libresolv.dep +++ /dev/null @@ -1 +0,0 @@ -../../libresolv
\ No newline at end of file diff --git a/data/inetutils/_metadata/ncurses.dep b/data/inetutils/_metadata/ncurses.dep new file mode 120000 index 000000000..a395fad08 --- /dev/null +++ b/data/inetutils/_metadata/ncurses.dep @@ -0,0 +1 @@ +../../ncurses
\ No newline at end of file diff --git a/data/inetutils/_metadata/provides b/data/inetutils/_metadata/provides new file mode 100644 index 000000000..4cd1921af --- /dev/null +++ b/data/inetutils/_metadata/provides @@ -0,0 +1 @@ +hostname, ping, telnet diff --git a/data/inetutils/_metadata/version b/data/inetutils/_metadata/version index c239c60cb..810ee4e91 100644 --- a/data/inetutils/_metadata/version +++ b/data/inetutils/_metadata/version @@ -1 +1 @@ -1.5 +1.6 diff --git a/data/inetutils/inetd.diff b/data/inetutils/inetd.diff new file mode 100644 index 000000000..1640723dd --- /dev/null +++ b/data/inetutils/inetd.diff @@ -0,0 +1,12 @@ +diff -ru inetutils-1.6/inetd/inetd.c inetutils-1.6+iPhone/inetd/inetd.c +--- inetutils-1.6/inetd/inetd.c 2008-12-27 18:50:35.000000000 +0000 ++++ inetutils-1.6+iPhone/inetd/inetd.c 2009-04-10 21:10:19.000000000 +0000 +@@ -163,6 +163,8 @@ + #endif + #define SIGBLOCK (sigmask(SIGCHLD)|sigmask(SIGHUP)|sigmask(SIGALRM)) + ++ARGP_PROGRAM_DATA_SIMPLE ("inetd", "2008"); ++ + bool debug = false; + int nsock, maxsock; + fd_set allsock; diff --git a/data/inetutils/inetutils-1.5.tar.gz b/data/inetutils/inetutils-1.5.tar.gz Binary files differdeleted file mode 100644 index 94e0641d7..000000000 --- a/data/inetutils/inetutils-1.5.tar.gz +++ /dev/null diff --git a/data/inetutils/inetutils-1.6.tar.gz b/data/inetutils/inetutils-1.6.tar.gz Binary files differnew file mode 100644 index 000000000..a3b11e268 --- /dev/null +++ b/data/inetutils/inetutils-1.6.tar.gz diff --git a/data/inetutils/logwtmp.diff b/data/inetutils/logwtmp.diff new file mode 100644 index 000000000..3eb7684f3 --- /dev/null +++ b/data/inetutils/logwtmp.diff @@ -0,0 +1,117 @@ +diff -ru inetutils-1.6/libinetutils/Makefile.am inetutils-1.6+iPhone/libinetutils/Makefile.am +--- inetutils-1.6/libinetutils/Makefile.am 2007-06-29 16:29:31.000000000 +0000 ++++ inetutils-1.6+iPhone/libinetutils/Makefile.am 2009-04-10 20:58:01.000000000 +0000 +@@ -20,10 +20,8 @@ + + noinst_HEADERS = argcv.h libinetutils.h + +-EXTRA_DIST = logwtmp.c +- + libinetutils_a_SOURCES = argcv.c cleansess.c daemon.c des_rw.c kcmd.c \ +- krcmd.c localhost.c logwtmpko.c setsig.c shishi.c tftpsubs.c \ ++ krcmd.c localhost.c setsig.c shishi.c tftpsubs.c \ + ttymsg.c utmp_init.c utmp_logout.c + + libinetutils_a_LIBADD = daemon.o $(top_builddir)/lib/libgnu.a +diff -ru inetutils-1.6/libinetutils/Makefile.in inetutils-1.6+iPhone/libinetutils/Makefile.in +--- inetutils-1.6/libinetutils/Makefile.in 2008-12-27 20:52:24.000000000 +0000 ++++ inetutils-1.6+iPhone/libinetutils/Makefile.in 2009-04-10 20:58:14.000000000 +0000 +@@ -132,7 +132,7 @@ + libinetutils_a_DEPENDENCIES = daemon.o $(top_builddir)/lib/libgnu.a + am_libinetutils_a_OBJECTS = argcv.$(OBJEXT) cleansess.$(OBJEXT) \ + daemon.$(OBJEXT) des_rw.$(OBJEXT) kcmd.$(OBJEXT) \ +- krcmd.$(OBJEXT) localhost.$(OBJEXT) logwtmpko.$(OBJEXT) \ ++ krcmd.$(OBJEXT) localhost.$(OBJEXT) \ + setsig.$(OBJEXT) shishi.$(OBJEXT) tftpsubs.$(OBJEXT) \ + ttymsg.$(OBJEXT) utmp_init.$(OBJEXT) utmp_logout.$(OBJEXT) + libinetutils_a_OBJECTS = $(am_libinetutils_a_OBJECTS) +@@ -638,9 +638,8 @@ + whois_INSTALL_HOOK = @whois_INSTALL_HOOK@ + noinst_LIBRARIES = libinetutils.a + noinst_HEADERS = argcv.h libinetutils.h +-EXTRA_DIST = logwtmp.c + libinetutils_a_SOURCES = argcv.c cleansess.c daemon.c des_rw.c kcmd.c \ +- krcmd.c localhost.c logwtmpko.c setsig.c shishi.c tftpsubs.c \ ++ krcmd.c localhost.c setsig.c shishi.c tftpsubs.c \ + ttymsg.c utmp_init.c utmp_logout.c + + libinetutils_a_LIBADD = daemon.o $(top_builddir)/lib/libgnu.a +@@ -700,7 +699,6 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcmd.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krcmd.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localhost.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logwtmpko.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setsig.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shishi.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tftpsubs.Po@am__quote@ +diff -ru inetutils-1.6/ftpd/Makefile.am inetutils-1.6+iPhone/ftpd/Makefile.am +--- inetutils-1.6/ftpd/Makefile.am 2008-12-27 20:04:47.000000000 +0000 ++++ inetutils-1.6+iPhone/ftpd/Makefile.am 2009-04-10 21:16:12.000000000 +0000 +@@ -22,7 +22,7 @@ + + EXTRA_PROGRAMS = ftpd + +-ftpd_SOURCES = ftpcmd.y ftpd.c logwtmp.c popen.c pam.c auth.c \ ++ftpd_SOURCES = ftpcmd.y ftpd.c popen.c pam.c auth.c \ + conf.c server_mode.c + + noinst_HEADERS = extern.h +diff -ru inetutils-1.6/ftpd/Makefile.in inetutils-1.6+iPhone/ftpd/Makefile.in +--- inetutils-1.6/ftpd/Makefile.in 2008-12-27 20:52:21.000000000 +0000 ++++ inetutils-1.6+iPhone/ftpd/Makefile.in 2009-04-10 21:16:22.000000000 +0000 +@@ -130,7 +130,7 @@ + am__installdirs = "$(DESTDIR)$(inetdaemondir)" "$(DESTDIR)$(man8dir)" + inetdaemonPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + PROGRAMS = $(inetdaemon_PROGRAMS) +-am_ftpd_OBJECTS = ftpcmd.$(OBJEXT) ftpd.$(OBJEXT) logwtmp.$(OBJEXT) \ ++am_ftpd_OBJECTS = ftpcmd.$(OBJEXT) ftpd.$(OBJEXT) \ + popen.$(OBJEXT) pam.$(OBJEXT) auth.$(OBJEXT) conf.$(OBJEXT) \ + server_mode.$(OBJEXT) + ftpd_OBJECTS = $(am_ftpd_OBJECTS) +@@ -644,7 +644,7 @@ + whois_BUILD = @whois_BUILD@ + whois_INSTALL_HOOK = @whois_INSTALL_HOOK@ + inetdaemon_PROGRAMS = @ftpd_BUILD@ +-ftpd_SOURCES = ftpcmd.y ftpd.c logwtmp.c popen.c pam.c auth.c \ ++ftpd_SOURCES = ftpcmd.y ftpd.c popen.c pam.c auth.c \ + conf.c server_mode.c + + noinst_HEADERS = extern.h +@@ -728,7 +728,6 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/conf.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftpcmd.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftpd.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logwtmp.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/popen.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server_mode.Po@am__quote@ +diff -ru inetutils-1.6/ftpd/ftpd.c inetutils-1.6+iPhone/ftpd/ftpd.c +--- inetutils-1.6/ftpd/ftpd.c 2008-12-27 20:05:07.000000000 +0000 ++++ inetutils-1.6+iPhone/ftpd/ftpd.c 2009-04-10 21:22:09.000000000 +0000 +@@ -639,7 +639,7 @@ + + /* open wtmp before chroot */ + snprintf (ttyline, sizeof (ttyline), "ftp%d", getpid ()); +- logwtmp_keep_open (ttyline, pcred->name, pcred->remotehost); ++ logwtmp (ttyline, pcred->name, pcred->remotehost); + + if (pcred->guest) + { +@@ -788,7 +788,7 @@ + int atype = pcred->auth_type; + seteuid ((uid_t) 0); + if (pcred->logged_in) +- logwtmp_keep_open (ttyline, "", ""); ++ logwtmp (ttyline, "", ""); + + if (pcred->name) + free (pcred->name); +@@ -1703,7 +1703,7 @@ + if (cred.logged_in) + { + seteuid ((uid_t) 0); +- logwtmp_keep_open (ttyline, "", ""); ++ logwtmp (ttyline, "", ""); + } + /* beware of flushing buffers after a SIGPIPE */ + _exit (status); diff --git a/data/inetutils/make.sh b/data/inetutils/make.sh index 0cd6282c6..b335dcd3f 100644 --- a/data/inetutils/make.sh +++ b/data/inetutils/make.sh @@ -1,5 +1,6 @@ pkg:setup autoconf -pkg:configure ac_cv_type_sa_family_t=yes ac_cv_type_socklen_t=yes ac_cv_member_struct_utmp_ut_user=yes ac_cv_func_obstack=no --disable-ifconfig --disable-whois --disable-whois --disable-whois --disable-whois -make +# XXX: I miss talkd +pkg:configure ac_cv_type_sa_family_t=yes ac_cv_type_socklen_t=yes ac_cv_member_struct_utmp_ut_user=yes ac_cv_func_obstack=no --disable-ifconfig --disable-ping6 --disable-syslogd --disable-talkd --disable-traceroute --disable-whois ac_cv_header_utmp_h=no +make CFLAGS='-O2 -mthumb' pkg:install diff --git a/data/inetutils/mdns.diff b/data/inetutils/mdns.diff deleted file mode 100644 index 8d9676010..000000000 --- a/data/inetutils/mdns.diff +++ /dev/null @@ -1,550 +0,0 @@ -diff -rui inetutils-1.5/ftp/main.c inetutils-1.5+iPhone/ftp/main.c ---- inetutils-1.5/ftp/main.c 2006-10-11 23:30:03.000000000 +0000 -+++ inetutils-1.5+iPhone/ftp/main.c 2008-01-30 17:23:32.000000000 +0000 -@@ -1,3 +1,5 @@ -+#include <mach-o/nlist.h> -+ - /* - * Copyright (c) 1985, 1989, 1993, 1994, 2002 - * The Regents of the University of California. All rights reserved. -@@ -115,6 +117,15 @@ - int - main (int argc, char *argv[]) - { -+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 -+ struct nlist nl[2]; -+ memset(nl, 0, sizeof(nl)); -+ nl[0].n_un.n_name = (char *) "_useMDNSResponder"; -+ nlist("/usr/lib/libc.dylib", nl); -+ if (nl[0].n_type != N_UNDF) -+ *(int *) nl[0].n_value = 0; -+#endif -+ - int ch, top; - struct passwd *pw = NULL; - char *cp; -diff -rui inetutils-1.5/ftpd/ftpd.c inetutils-1.5+iPhone/ftpd/ftpd.c ---- inetutils-1.5/ftpd/ftpd.c 2006-10-11 23:23:58.000000000 +0000 -+++ inetutils-1.5+iPhone/ftpd/ftpd.c 2008-01-30 17:23:32.000000000 +0000 -@@ -1,3 +1,5 @@ -+#include <mach-o/nlist.h> -+ - /* - Ftp Server - * Copyright (c) 1985, 1988, 1990, 1992, 1993, 1994, 2002 - * The Regents of the University of California. All rights reserved. -@@ -328,6 +330,15 @@ - int - main(int argc, char *argv[], char **envp) - { -+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 -+ struct nlist nl[2]; -+ memset(nl, 0, sizeof(nl)); -+ nl[0].n_un.n_name = (char *) "_useMDNSResponder"; -+ nlist("/usr/lib/libc.dylib", nl); -+ if (nl[0].n_type != N_UNDF) -+ *(int *) nl[0].n_value = 0; -+#endif -+ - int option; - - program_name = argv[0]; -diff -rui inetutils-1.5/gwhois/whois.c inetutils-1.5+iPhone/gwhois/whois.c ---- inetutils-1.5/gwhois/whois.c 2007-06-28 23:07:04.000000000 +0000 -+++ inetutils-1.5+iPhone/gwhois/whois.c 2008-01-30 17:23:32.000000000 +0000 -@@ -1,3 +1,5 @@ -+#include <mach-o/nlist.h> -+ - /* Copyright 1999 by Marco d'Itri <md@linux.it>. - * - * This program is free software; you can redistribute it and/or modify -@@ -47,6 +49,15 @@ - - int main(int argc, char *argv[]) - { -+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 -+ struct nlist nl[2]; -+ memset(nl, 0, sizeof(nl)); -+ nl[0].n_un.n_name = (char *) "_useMDNSResponder"; -+ nlist("/usr/lib/libc.dylib", nl); -+ if (nl[0].n_type != N_UNDF) -+ *(int *) nl[0].n_value = 0; -+#endif -+ - int ch, nopar = 0; - const char *server = NULL, *port = NULL; - char *p, *q, *qstring, fstring[64] = "\0"; -diff -rui inetutils-1.5/ifconfig/ifconfig.c inetutils-1.5+iPhone/ifconfig/ifconfig.c ---- inetutils-1.5/ifconfig/ifconfig.c 2007-06-28 22:58:23.000000000 +0000 -+++ inetutils-1.5+iPhone/ifconfig/ifconfig.c 2008-01-30 17:23:32.000000000 +0000 -@@ -1,3 +1,5 @@ -+#include <mach-o/nlist.h> -+ - /* ifconfig.c -- network interface configuration utility - - Copyright (C) 2001, 2002, 2007 Free Software Foundation, Inc. -@@ -56,6 +58,15 @@ - int - main(int argc, char *argv[]) - { -+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 -+ struct nlist nl[2]; -+ memset(nl, 0, sizeof(nl)); -+ nl[0].n_un.n_name = (char *) "_useMDNSResponder"; -+ nlist("/usr/lib/libc.dylib", nl); -+ if (nl[0].n_type != N_UNDF) -+ *(int *) nl[0].n_value = 0; -+#endif -+ - int err = 0; - int sfd; - struct ifconfig *ifp; -diff -rui inetutils-1.5/inetd/inetd.c inetutils-1.5+iPhone/inetd/inetd.c ---- inetutils-1.5/inetd/inetd.c 2007-06-28 22:58:23.000000000 +0000 -+++ inetutils-1.5+iPhone/inetd/inetd.c 2008-01-30 17:23:32.000000000 +0000 -@@ -1,3 +1,5 @@ -+#include <mach-o/nlist.h> -+ - /* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 - Free Software Foundation, Inc. - -@@ -386,6 +388,15 @@ - int - main (int argc, char *argv[], char *envp[]) - { -+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 -+ struct nlist nl[2]; -+ memset(nl, 0, sizeof(nl)); -+ nl[0].n_un.n_name = (char *) "_useMDNSResponder"; -+ nlist("/usr/lib/libc.dylib", nl); -+ if (nl[0].n_type != N_UNDF) -+ *(int *) nl[0].n_value = 0; -+#endif -+ - int option; - struct servtab *sep; - int dofork; -diff -rui inetutils-1.5/logger/logger.c inetutils-1.5+iPhone/logger/logger.c ---- inetutils-1.5/logger/logger.c 2006-10-11 23:27:04.000000000 +0000 -+++ inetutils-1.5+iPhone/logger/logger.c 2008-01-30 17:23:32.000000000 +0000 -@@ -1,3 +1,5 @@ -+#include <mach-o/nlist.h> -+ - /* - * Copyright (c) 1983, 1993, 2002 - * The Regents of the University of California. All rights reserved. -@@ -101,6 +103,15 @@ - int - main (int argc, char *argv[]) - { -+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 -+ struct nlist nl[2]; -+ memset(nl, 0, sizeof(nl)); -+ nl[0].n_un.n_name = (char *) "_useMDNSResponder"; -+ nlist("/usr/lib/libc.dylib", nl); -+ if (nl[0].n_type != N_UNDF) -+ *(int *) nl[0].n_value = 0; -+#endif -+ - int option, logflags, pri; - char *tag, buf[1024]; - -diff -rui inetutils-1.5/ping/ping6.c inetutils-1.5+iPhone/ping/ping6.c ---- inetutils-1.5/ping/ping6.c 2007-06-28 22:58:24.000000000 +0000 -+++ inetutils-1.5+iPhone/ping/ping6.c 2008-01-30 17:23:32.000000000 +0000 -@@ -1,3 +1,5 @@ -+#include <mach-o/nlist.h> -+ - /* Copyright (C) 1998, 2001, 2002, 2004, 2005, 2007 Free Software Foundation, Inc. - - This file is part of GNU Inetutils. -@@ -81,6 +83,15 @@ - int - main (int argc, char **argv) - { -+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 -+ struct nlist nl[2]; -+ memset(nl, 0, sizeof(nl)); -+ nl[0].n_un.n_name = (char *) "_useMDNSResponder"; -+ nlist("/usr/lib/libc.dylib", nl); -+ if (nl[0].n_type != N_UNDF) -+ *(int *) nl[0].n_value = 0; -+#endif -+ - int c; - char *p; - int one = 1; -diff -rui inetutils-1.5/ping/ping.c inetutils-1.5+iPhone/ping/ping.c ---- inetutils-1.5/ping/ping.c 2007-06-28 22:58:24.000000000 +0000 -+++ inetutils-1.5+iPhone/ping/ping.c 2008-01-30 17:23:32.000000000 +0000 -@@ -1,3 +1,5 @@ -+#include <mach-o/nlist.h> -+ - /* Copyright (C) 1998,2001, 2002, 2005, 2007 Free Software Foundation, Inc. - - This file is part of GNU Inetutils. -@@ -106,6 +108,15 @@ - int - main (int argc, char **argv) - { -+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 -+ struct nlist nl[2]; -+ memset(nl, 0, sizeof(nl)); -+ nl[0].n_un.n_name = (char *) "_useMDNSResponder"; -+ nlist("/usr/lib/libc.dylib", nl); -+ if (nl[0].n_type != N_UNDF) -+ *(int *) nl[0].n_value = 0; -+#endif -+ - int c; - char *p; - int one = 1; -diff -rui inetutils-1.5/rcp/rcp.c inetutils-1.5+iPhone/rcp/rcp.c ---- inetutils-1.5/rcp/rcp.c 2006-10-11 23:27:33.000000000 +0000 -+++ inetutils-1.5+iPhone/rcp/rcp.c 2008-01-30 17:23:32.000000000 +0000 -@@ -1,3 +1,5 @@ -+#include <mach-o/nlist.h> -+ - /* - * Copyright (c) 1983, 1990, 1992, 1993, 2002 - * The Regents of the University of California. All rights reserved. -@@ -156,6 +158,15 @@ - int - main (int argc, char *argv[]) - { -+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 -+ struct nlist nl[2]; -+ memset(nl, 0, sizeof(nl)); -+ nl[0].n_un.n_name = (char *) "_useMDNSResponder"; -+ nlist("/usr/lib/libc.dylib", nl); -+ if (nl[0].n_type != N_UNDF) -+ *(int *) nl[0].n_value = 0; -+#endif -+ - struct servent *sp; - int ch, fflag, tflag; - char *targ; -diff -rui inetutils-1.5/rexecd/rexecd.c inetutils-1.5+iPhone/rexecd/rexecd.c ---- inetutils-1.5/rexecd/rexecd.c 2006-10-11 23:45:58.000000000 +0000 -+++ inetutils-1.5+iPhone/rexecd/rexecd.c 2008-01-30 17:23:32.000000000 +0000 -@@ -1,3 +1,5 @@ -+#include <mach-o/nlist.h> -+ - /* - * Copyright (c) 1983, 1993 - * The Regents of the University of California. All rights reserved. -@@ -105,6 +107,15 @@ - int - main (int argc, char **argv) - { -+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 -+ struct nlist nl[2]; -+ memset(nl, 0, sizeof(nl)); -+ nl[0].n_un.n_name = (char *) "_useMDNSResponder"; -+ nlist("/usr/lib/libc.dylib", nl); -+ if (nl[0].n_type != N_UNDF) -+ *(int *) nl[0].n_value = 0; -+#endif -+ - struct sockaddr_in from; - int fromlen, sockfd = STDIN_FILENO; - int c; -diff -rui inetutils-1.5/rlogin/rlogin.c inetutils-1.5+iPhone/rlogin/rlogin.c ---- inetutils-1.5/rlogin/rlogin.c 2006-10-11 23:27:58.000000000 +0000 -+++ inetutils-1.5+iPhone/rlogin/rlogin.c 2008-01-30 17:23:32.000000000 +0000 -@@ -1,3 +1,5 @@ -+#include <mach-o/nlist.h> -+ - /* - * Copyright (c) 1983, 1990, 1993, 2002 - * The Regents of the University of California. All rights reserved. -@@ -236,6 +238,15 @@ - int - main(int argc, char *argv[]) - { -+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 -+ struct nlist nl[2]; -+ memset(nl, 0, sizeof(nl)); -+ nl[0].n_un.n_name = (char *) "_useMDNSResponder"; -+ nlist("/usr/lib/libc.dylib", nl); -+ if (nl[0].n_type != N_UNDF) -+ *(int *) nl[0].n_value = 0; -+#endif -+ - struct passwd *pw; - struct servent *sp; - sigset_t smask; -diff -rui inetutils-1.5/rlogind/rlogind.c inetutils-1.5+iPhone/rlogind/rlogind.c ---- inetutils-1.5/rlogind/rlogind.c 2007-06-28 22:58:24.000000000 +0000 -+++ inetutils-1.5+iPhone/rlogind/rlogind.c 2008-01-30 17:23:32.000000000 +0000 -@@ -1,3 +1,5 @@ -+#include <mach-o/nlist.h> -+ - /* Copyright (C) 1998,2001, 2002, 2007 Free Software Foundation, Inc. - - This file is part of GNU Inetutils. -@@ -267,6 +269,15 @@ - int - main (int argc, char *argv[]) - { -+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 -+ struct nlist nl[2]; -+ memset(nl, 0, sizeof(nl)); -+ nl[0].n_un.n_name = (char *) "_useMDNSResponder"; -+ nlist("/usr/lib/libc.dylib", nl); -+ if (nl[0].n_type != N_UNDF) -+ *(int *) nl[0].n_value = 0; -+#endif -+ - int port = 0; - int maxchildren = DEFMAXCHILDREN; - int mode = MODE_INETD; -diff -rui inetutils-1.5/rsh/rsh.c inetutils-1.5+iPhone/rsh/rsh.c ---- inetutils-1.5/rsh/rsh.c 2006-10-11 23:28:34.000000000 +0000 -+++ inetutils-1.5+iPhone/rsh/rsh.c 2008-01-30 17:23:32.000000000 +0000 -@@ -1,3 +1,5 @@ -+#include <mach-o/nlist.h> -+ - /*- - * Copyright (c) 1983, 1990, 1993, 1994, 2002 - * The Regents of the University of California. All rights reserved. -@@ -220,6 +222,15 @@ - int - main (int argc, char **argv) - { -+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 -+ struct nlist nl[2]; -+ memset(nl, 0, sizeof(nl)); -+ nl[0].n_un.n_name = (char *) "_useMDNSResponder"; -+ nlist("/usr/lib/libc.dylib", nl); -+ if (nl[0].n_type != N_UNDF) -+ *(int *) nl[0].n_value = 0; -+#endif -+ - struct passwd *pw; - struct servent *sp; - sigset_t sigs, osigs; -diff -rui inetutils-1.5/rshd/rshd.c inetutils-1.5+iPhone/rshd/rshd.c ---- inetutils-1.5/rshd/rshd.c 2006-10-21 11:56:36.000000000 +0000 -+++ inetutils-1.5+iPhone/rshd/rshd.c 2008-01-30 17:23:32.000000000 +0000 -@@ -1,3 +1,5 @@ -+#include <mach-o/nlist.h> -+ - /*- - * Copyright (c) 1988, 1989, 1992, 1993, 1994, 2002 - * The Regents of the University of California. All rights reserved. -@@ -158,6 +160,15 @@ - int - main (int argc, char *argv[]) - { -+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 -+ struct nlist nl[2]; -+ memset(nl, 0, sizeof(nl)); -+ nl[0].n_un.n_name = (char *) "_useMDNSResponder"; -+ nlist("/usr/lib/libc.dylib", nl); -+ if (nl[0].n_type != N_UNDF) -+ *(int *) nl[0].n_value = 0; -+#endif -+ - extern int __check_rhosts_file; /* hook in rcmd(3) */ - struct linger linger; - int ch, on = 1, fromlen; -diff -rui inetutils-1.5/syslogd/syslogd.c inetutils-1.5+iPhone/syslogd/syslogd.c ---- inetutils-1.5/syslogd/syslogd.c 2006-10-21 12:11:57.000000000 +0000 -+++ inetutils-1.5+iPhone/syslogd/syslogd.c 2008-01-30 17:23:32.000000000 +0000 -@@ -1,3 +1,5 @@ -+#include <mach-o/nlist.h> -+ - /* syslogd - log system messages - * - * Copyright (c) 1983, 1988, 1993, 1994, 2002 -@@ -353,6 +355,15 @@ - int - main (int argc, char *argv[]) - { -+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 -+ struct nlist nl[2]; -+ memset(nl, 0, sizeof(nl)); -+ nl[0].n_un.n_name = (char *) "_useMDNSResponder"; -+ nlist("/usr/lib/libc.dylib", nl); -+ if (nl[0].n_type != N_UNDF) -+ *(int *) nl[0].n_value = 0; -+#endif -+ - int option; - size_t i; - FILE *fp; -diff -rui inetutils-1.5/talk/talk.c inetutils-1.5+iPhone/talk/talk.c ---- inetutils-1.5/talk/talk.c 2006-10-12 08:01:37.000000000 +0000 -+++ inetutils-1.5+iPhone/talk/talk.c 2008-01-30 17:23:32.000000000 +0000 -@@ -1,3 +1,5 @@ -+#include <mach-o/nlist.h> -+ - /* - * Copyright (c) 1983, 1993 - * The Regents of the University of California. All rights reserved. -@@ -71,6 +73,15 @@ - int - main (int argc, char *argv[]) - { -+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 -+ struct nlist nl[2]; -+ memset(nl, 0, sizeof(nl)); -+ nl[0].n_un.n_name = (char *) "_useMDNSResponder"; -+ nlist("/usr/lib/libc.dylib", nl); -+ if (nl[0].n_type != N_UNDF) -+ *(int *) nl[0].n_value = 0; -+#endif -+ - int c; - - program_name = argv[0]; -diff -rui inetutils-1.5/talkd/talkd.c inetutils-1.5+iPhone/talkd/talkd.c ---- inetutils-1.5/talkd/talkd.c 2007-06-28 22:58:24.000000000 +0000 -+++ inetutils-1.5+iPhone/talkd/talkd.c 2008-01-30 17:23:32.000000000 +0000 -@@ -1,3 +1,5 @@ -+#include <mach-o/nlist.h> -+ - /* Copyright (C) 1998,2001, 2002, 2007 Free Software Foundation, Inc. - - This file is part of GNU Inetutils. -@@ -59,6 +61,15 @@ - int - main(int argc, char *argv[]) - { -+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 -+ struct nlist nl[2]; -+ memset(nl, 0, sizeof(nl)); -+ nl[0].n_un.n_name = (char *) "_useMDNSResponder"; -+ nlist("/usr/lib/libc.dylib", nl); -+ if (nl[0].n_type != N_UNDF) -+ *(int *) nl[0].n_value = 0; -+#endif -+ - int c; - char *acl_file = NULL; - -diff -rui inetutils-1.5/telnet/main.c inetutils-1.5+iPhone/telnet/main.c ---- inetutils-1.5/telnet/main.c 2006-10-11 21:53:36.000000000 +0000 -+++ inetutils-1.5+iPhone/telnet/main.c 2008-01-30 17:23:32.000000000 +0000 -@@ -1,3 +1,5 @@ -+#include <mach-o/nlist.h> -+ - /* - * Copyright (c) 1988, 1990, 1993 - * The Regents of the University of California. All rights reserved. -@@ -180,6 +182,15 @@ - int - main(int argc, char *argv[]) - { -+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 -+ struct nlist nl[2]; -+ memset(nl, 0, sizeof(nl)); -+ nl[0].n_un.n_name = (char *) "_useMDNSResponder"; -+ nlist("/usr/lib/libc.dylib", nl); -+ if (nl[0].n_type != N_UNDF) -+ *(int *) nl[0].n_value = 0; -+#endif -+ - extern char *optarg; - extern int optind; - int ch; -diff -rui inetutils-1.5/telnetd/telnetd.c inetutils-1.5+iPhone/telnetd/telnetd.c ---- inetutils-1.5/telnetd/telnetd.c 2007-06-28 22:58:24.000000000 +0000 -+++ inetutils-1.5+iPhone/telnetd/telnetd.c 2008-01-30 17:23:32.000000000 +0000 -@@ -1,3 +1,5 @@ -+#include <mach-o/nlist.h> -+ - /* Copyright (C) 1998, 2001, 2002, 2004, 2007x Free Software Foundation, Inc. - - This file is part of GNU Inetutils. -@@ -112,6 +114,15 @@ - int - main (int argc, char **argv) - { -+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 -+ struct nlist nl[2]; -+ memset(nl, 0, sizeof(nl)); -+ nl[0].n_un.n_name = (char *) "_useMDNSResponder"; -+ nlist("/usr/lib/libc.dylib", nl); -+ if (nl[0].n_type != N_UNDF) -+ *(int *) nl[0].n_value = 0; -+#endif -+ - int c; - program_name = argv[0]; - while ((c = getopt_long (argc, argv, short_options, long_options, NULL)) -diff -rui inetutils-1.5/tftp/main.c inetutils-1.5+iPhone/tftp/main.c ---- inetutils-1.5/tftp/main.c 2006-10-11 23:42:52.000000000 +0000 -+++ inetutils-1.5+iPhone/tftp/main.c 2008-01-30 17:23:32.000000000 +0000 -@@ -1,3 +1,5 @@ -+#include <mach-o/nlist.h> -+ - /* - * Copyright (c) 1983, 1993 - * The Regents of the University of California. All rights reserved. -@@ -154,6 +156,15 @@ - int - main (int argc, char *argv[]) - { -+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 -+ struct nlist nl[2]; -+ memset(nl, 0, sizeof(nl)); -+ nl[0].n_un.n_name = (char *) "_useMDNSResponder"; -+ nlist("/usr/lib/libc.dylib", nl); -+ if (nl[0].n_type != N_UNDF) -+ *(int *) nl[0].n_value = 0; -+#endif -+ - struct sockaddr_in sin; - - program_name = argv[0]; -diff -rui inetutils-1.5/tftpd/tftpd.c inetutils-1.5+iPhone/tftpd/tftpd.c ---- inetutils-1.5/tftpd/tftpd.c 2006-10-11 21:46:27.000000000 +0000 -+++ inetutils-1.5+iPhone/tftpd/tftpd.c 2008-01-30 17:23:32.000000000 +0000 -@@ -1,3 +1,5 @@ -+#include <mach-o/nlist.h> -+ - /* - * Copyright (c) 1983, 1993 - * The Regents of the University of California. All rights reserved. -@@ -124,6 +126,15 @@ - int - main (int argc, char *argv[]) - { -+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 -+ struct nlist nl[2]; -+ memset(nl, 0, sizeof(nl)); -+ nl[0].n_un.n_name = (char *) "_useMDNSResponder"; -+ nlist("/usr/lib/libc.dylib", nl); -+ if (nl[0].n_type != N_UNDF) -+ *(int *) nl[0].n_value = 0; -+#endif -+ - register struct tftphdr *tp; - register int n; - int ch, on; -diff -rui inetutils-1.5/uucpd/uucpd.c inetutils-1.5+iPhone/uucpd/uucpd.c ---- inetutils-1.5/uucpd/uucpd.c 2006-10-11 23:46:12.000000000 +0000 -+++ inetutils-1.5+iPhone/uucpd/uucpd.c 2008-01-30 17:23:32.000000000 +0000 -@@ -1,3 +1,5 @@ -+#include <mach-o/nlist.h> -+ - /* - * Copyright (c) 1985, 1993 - * The Regents of the University of California. All rights reserved. -@@ -111,6 +113,15 @@ - int - main (int argc, char **argv) - { -+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 -+ struct nlist nl[2]; -+ memset(nl, 0, sizeof(nl)); -+ nl[0].n_un.n_name = (char *) "_useMDNSResponder"; -+ nlist("/usr/lib/libc.dylib", nl); -+ if (nl[0].n_type != N_UNDF) -+ *(int *) nl[0].n_value = 0; -+#endif -+ - #ifndef BSDINETD - register int s, tcp_socket; - struct servent *sp; diff --git a/data/inetutils/netinet.diff b/data/inetutils/netinet.diff new file mode 100644 index 000000000..eb20fe75a --- /dev/null +++ b/data/inetutils/netinet.diff @@ -0,0 +1,55 @@ +diff -ru inetutils-1.6/ping/ping_address.c inetutils-1.6+iPhone/ping/ping_address.c +--- inetutils-1.6/ping/ping_address.c 2008-10-14 17:40:30.000000000 +0000 ++++ inetutils-1.6+iPhone/ping/ping_address.c 2009-04-10 23:08:10.000000000 +0000 +@@ -30,6 +30,7 @@ + + /*#include <netinet/ip_icmp.h> -- deliberately not including this */ + #ifdef HAVE_NETINET_IP_VAR_H ++# include <netinet/in.h> + # include <netinet/ip_var.h> + #endif + +diff -ru inetutils-1.6/ping/ping.c inetutils-1.6+iPhone/ping/ping.c +--- inetutils-1.6/ping/ping.c 2008-12-27 21:11:02.000000000 +0000 ++++ inetutils-1.6+iPhone/ping/ping.c 2009-04-10 23:08:14.000000000 +0000 +@@ -32,6 +32,7 @@ + + /*#include <netinet/ip_icmp.h> -- deliberately not including this */ + #ifdef HAVE_NETINET_IP_VAR_H ++# include <netinet/in.h> + # include <netinet/ip_var.h> + #endif + +diff -ru inetutils-1.6/ping/ping_echo.c inetutils-1.6+iPhone/ping/ping_echo.c +--- inetutils-1.6/ping/ping_echo.c 2008-12-27 16:21:00.000000000 +0000 ++++ inetutils-1.6+iPhone/ping/ping_echo.c 2009-04-10 23:08:17.000000000 +0000 +@@ -29,6 +29,7 @@ + + /*#include <netinet/ip_icmp.h> -- deliberately not including this */ + #ifdef HAVE_NETINET_IP_VAR_H ++# include <netinet/in.h> + # include <netinet/ip_var.h> + #endif + +diff -ru inetutils-1.6/ping/ping_router.c inetutils-1.6+iPhone/ping/ping_router.c +--- inetutils-1.6/ping/ping_router.c 2008-10-14 17:40:30.000000000 +0000 ++++ inetutils-1.6+iPhone/ping/ping_router.c 2009-04-10 23:08:20.000000000 +0000 +@@ -29,6 +29,7 @@ + + /*#include <netinet/ip_icmp.h> -- deliberately not including this */ + #ifdef HAVE_NETINET_IP_VAR_H ++# include <netinet/in.h> + # include <netinet/ip_var.h> + #endif + +diff -ru inetutils-1.6/ping/ping_timestamp.c inetutils-1.6+iPhone/ping/ping_timestamp.c +--- inetutils-1.6/ping/ping_timestamp.c 2008-10-14 17:40:30.000000000 +0000 ++++ inetutils-1.6+iPhone/ping/ping_timestamp.c 2009-04-10 23:08:02.000000000 +0000 +@@ -29,6 +29,7 @@ + + /*#include <netinet/ip_icmp.h> -- deliberately not including this */ + #ifdef HAVE_NETINET_IP_VAR_H ++# include <netinet/in.h> + # include <netinet/ip_var.h> + #endif + diff --git a/data/inetutils/sysnerr.diff b/data/inetutils/sysnerr.diff deleted file mode 100644 index 402cfe598..000000000 --- a/data/inetutils/sysnerr.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru inetutils-1.5/talk/io.c inetutils-1.5+iPhone/talk/io.c ---- inetutils-1.5/talk/io.c 2006-10-11 21:46:26.000000000 +0000 -+++ inetutils-1.5+iPhone/talk/io.c 2008-01-02 02:27:47.000000000 +0000 -@@ -129,7 +129,6 @@ - } - - extern int errno; --extern int sys_nerr; - - /* - * p_error prints the system error message on the standard location 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); |