Update more packages

10 files changed, 72 insertions, 214 deletions

diff --git a/data/inetutils/_metadata/version b/data/inetutils/_metadata/version
index 810ee4e91..d615fd0c0 100644
--- a/data/inetutils/_metadata/version
+++ b/data/inetutils/_metadata/version
@@ -1 +1 @@
-1.6
+1.9.4
diff --git a/data/inetutils/docs.diff b/data/inetutils/docs.diff
new file mode 100644
index 000000000..0bb0ccb30
--- /dev/null
+++ b/data/inetutils/docs.diff
@@ -0,0 +1,22 @@
+diff -ur inetutils-1.9.4/Makefile.am inetutils-1.9.4+iPhone/Makefile.am
+--- inetutils-1.9.4/Makefile.am	2015-06-08 21:45:35.000000000 -1000
++++ inetutils-1.9.4+iPhone/Makefile.am	2018-08-17 15:13:33.000000000 -1000
+@@ -25,7 +25,6 @@
+ SUBDIRS = lib \
+ 	libinetutils libtelnet libicmp libls \
+ 	src telnet telnetd ftp ftpd talk talkd whois ping ifconfig \
+-	doc man \
+ 	tests
+ 
+ DISTCLEANFILES = pathdefs.make paths.defs \
+diff -ur inetutils-1.9.4/Makefile.in inetutils-1.9.4+iPhone/Makefile.in
+--- inetutils-1.9.4/Makefile.in	2015-06-08 21:48:08.000000000 -1000
++++ inetutils-1.9.4+iPhone/Makefile.in	2018-08-17 15:13:50.000000000 -1000
+@@ -1416,7 +1416,6 @@
+ SUBDIRS = lib \
+ 	libinetutils libtelnet libicmp libls \
+ 	src telnet telnetd ftp ftpd talk talkd whois ping ifconfig \
+-	doc man \
+ 	tests
+ 
+ DISTCLEANFILES = pathdefs.make paths.defs \
diff --git a/data/inetutils/inetd.diff b/data/inetutils/inetd.diff
deleted file mode 100644
index 1640723dd..000000000
--- a/data/inetutils/inetd.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-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.6.tar.gz b/data/inetutils/inetutils-1.6.tar.gz
deleted file mode 100644
index a3b11e268..000000000
--- a/data/inetutils/inetutils-1.6.tar.gz
+++ /dev/null
diff --git a/data/inetutils/inetutils-1.9.4.tar.xz b/data/inetutils/inetutils-1.9.4.tar.xz
new file mode 100644
index 000000000..47af66e5f
--- /dev/null
+++ b/data/inetutils/inetutils-1.9.4.tar.xz
diff --git a/data/inetutils/logwtmp.diff b/data/inetutils/logwtmp.diff
deleted file mode 100644
index 3eb7684f3..000000000
--- a/data/inetutils/logwtmp.diff
+++ /dev/null
@@ -1,117 +0,0 @@
-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 7481d441d..d456806e4 100644
--- a/data/inetutils/make.sh
+++ b/data/inetutils/make.sh
@@ -2,7 +2,7 @@ pkg:setup
 autoconf
 # 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'
+make CFLAGS='-O2' -j8
 pkg:install
 pkg:bin ping
 pkg: mkdir -p /sbin
diff --git a/data/inetutils/rlogind.diff b/data/inetutils/rlogind.diff
new file mode 100644
index 000000000..cb12a5627
--- /dev/null
+++ b/data/inetutils/rlogind.diff
@@ -0,0 +1,48 @@
+diff -ur inetutils-1.9.4/src/rlogind.c inetutils-1.9.4+iPhone/src/rlogind.c
+--- inetutils-1.9.4/src/rlogind.c	2015-05-12 02:13:25.000000000 -1000
++++ inetutils-1.9.4+iPhone/src/rlogind.c	2018-08-17 15:08:20.000000000 -1000
+@@ -1172,7 +1172,7 @@
+   struct auth_data auth_data;
+   char addrstr[INET6_ADDRSTRLEN];
+   const char *reply;
+-  int true;
++  int _true;
+   char c;
+   int authenticated;
+   pid_t pid;
+@@ -1204,16 +1204,16 @@
+ 	  ? ntohs (((struct sockaddr_in6 *) &auth_data.from)->sin6_port)
+ 	  : ntohs (((struct sockaddr_in *) &auth_data.from)->sin_port));
+ 
+-  true = 1;
++  _true = 1;
+   if (keepalive
+-      && setsockopt (infd, SOL_SOCKET, SO_KEEPALIVE, &true, sizeof true) < 0)
++      && setsockopt (infd, SOL_SOCKET, SO_KEEPALIVE, &_true, sizeof _true) < 0)
+     syslog (LOG_WARNING, "setsockopt (SO_KEEPALIVE): %m");
+ 
+ #if defined IP_TOS && defined IPPROTO_IP && defined IPTOS_LOWDELAY
+-  true = IPTOS_LOWDELAY;
++  _true = IPTOS_LOWDELAY;
+   if (auth_data.from.ss_family == AF_INET &&
+       setsockopt (infd, IPPROTO_IP, IP_TOS,
+-		  (char *) &true, sizeof true) < 0)
++		  (char *) &_true, sizeof _true) < 0)
+     syslog (LOG_WARNING, "setsockopt (IP_TOS): %m");
+ #endif
+ 
+@@ -1260,10 +1260,10 @@
+     }
+ 
+   /* Parent */
+-  true = 1;
+-  IF_NOT_ENCRYPT (ioctl (infd, FIONBIO, &true));
+-  ioctl (master, FIONBIO, &true);
+-  ioctl (master, TIOCPKT, &true);
++  _true = 1;
++  IF_NOT_ENCRYPT (ioctl (infd, FIONBIO, &_true));
++  ioctl (master, FIONBIO, &_true);
++  ioctl (master, TIOCPKT, &_true);
+   netf = infd;			/* Needed for cleanup() */
+   setsig (SIGCHLD, cleanup);
+   protocol (infd, master, &auth_data);
diff --git a/data/inetutils/talkd.diff b/data/inetutils/talkd.diff
deleted file mode 100644
index 2a17a1ddc..000000000
--- a/data/inetutils/talkd.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru inetutils-1.5/configure.ac inetutils-1.5+iPhone/configure.ac
---- inetutils-1.5/configure.ac	2007-06-28 22:58:23.000000000 +0000
-+++ inetutils-1.5+iPhone/configure.ac	2008-03-24 13:47:26.000000000 +0000
-@@ -470,7 +470,8 @@
-               [AC_DEFINE(HAVE_OSOCKADDR_H, 1,
-                          [Define to one if you have <osockaddr.h>.])],
- 	      [#include <sys/types.h>
--               #include <sys/socket.h> ])
-+               #include <sys/socket.h>
-+               #include <protocols/talkd.h> ])
- 
- AC_CHECK_TYPES(struct if_nameindex, , ,
-   [#include <sys/types.h>
diff --git a/data/inetutils/utmpx.diff b/data/inetutils/utmpx.diff
deleted file mode 100644
index 319be4ea0..000000000
--- a/data/inetutils/utmpx.diff
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -ru inetutils-1.5/configure.ac inetutils-1.5+iPhone/configure.ac
---- inetutils-1.5/configure.ac	2007-06-28 22:58:23.000000000 +0000
-+++ inetutils-1.5+iPhone/configure.ac	2008-01-02 02:07:05.000000000 +0000
-@@ -776,8 +776,7 @@
-   AC_DEFINE(UTMPX, 1, [FIXME])
-   AC_DEFINE(HAVE_STREAMSPTY, 1, [FIXME])
-   ;;
--*irix* | *hpux*)
--  AC_DEFINE(UTMPX, 1, [FIXME])
-+*irix* | *hpux* | *darwin*)
-   AC_DEFINE(UTMPX, 1, [FIXME])
-   ;;
- esac
-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)))
-     {
-+# 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);