Pullup ticket #3616 - requested by is

net/icsi-finger security update

Revisions pulled up:
- doc/CHANGES-2011                                              1.2900
- net/icsi-finger/Makefile                                      1.17-1.19
- net/icsi-finger/distinfo                                      1.10-1.13
- net/icsi-finger/patches/patch-ak                              1.2-1.4
- net/icsi-finger/patches/patch-al                              1.2
- net/icsi-finger/patches/patch-an                              1.1
- net/icsi-finger/patches/patch-lib_util_c                      1.1

---
   Module Name:	pkgsrc
   Committed By:	is
   Date:		Thu Nov 10 09:42:22 UTC 2011

   Modified Files:
   	pkgsrc/net/icsi-finger: distinfo
   Added Files:
   	pkgsrc/net/icsi-finger/patches: patch-an

   Log Message:
   Missed part of the fix for 64bit time_t from 2011/01/18 12:28:25.
   The maintainance program packet2ascii (actually, the ascii2packet part)
   needed to be fixed, too.

---
   Module Name:	pkgsrc
   Committed By:	is
   Date:		Thu Nov 10 09:59:53 UTC 2011

   Modified Files:
   	pkgsrc/net/icsi-finger: Makefile

   Log Message:
   Missed part of the fix for 64bit time_t from 2011/01/18 12:28:25.
   The maintainance program packet2ascii (actually, the ascii2packet part)
   needed to be fixed, too.

---
   Module Name:	pkgsrc
   Committed By:	dholland
   Date:		Tue Nov 15 00:11:07 UTC 2011

   Modified Files:
   	pkgsrc/net/icsi-finger: distinfo
   	pkgsrc/net/icsi-finger/patches: patch-ak patch-al
   Added Files:
   	pkgsrc/net/icsi-finger/patches: patch-lib_util_c

   Log Message:
   Use stdlib.h instead of private decls of malloc; remove union wait. Should
   fix build with newer gcc and maybe also clang.

---
   Module Name:	pkgsrc
   Committed By:	is
   Date:		Tue Nov 15 13:04:47 UTC 2011

   Modified Files:
   	pkgsrc/doc: CHANGES-2011
   	pkgsrc/net/icsi-finger: Makefile distinfo
   	pkgsrc/net/icsi-finger/patches: patch-ak

   Log Message:
   replace mktemp() by mkstemp(), updating net/icsi-finger to 1.0.27nb6

---
   Module Name:	pkgsrc
   Committed By:	is
   Date:		Tue Nov 22 09:04:49 UTC 2011

   Modified Files:
   	pkgsrc/net/icsi-finger: Makefile distinfo
   	pkgsrc/net/icsi-finger/patches: patch-ak

   Log Message:
   Remove a data-dependent case of segmentation fault in in.fingerd.

6 files changed, 112 insertions, 10 deletions

diff --git a/net/icsi-finger/Makefile b/net/icsi-finger/Makefile
index f31353f7b27..7b3fefb5cc5 100644
--- a/net/icsi-finger/Makefile
+++ b/net/icsi-finger/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2011/02/11 17:16:03 is Exp $
+# $NetBSD: Makefile,v 1.16.6.1 2011/12/08 04:01:09 sbd Exp $
 #
 
 DISTNAME=	icsi-finger-1.0.27
-PKGREVISION=	4
+PKGREVISION=	7
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.icsi.berkeley.edu/pub/ai/stolcke/software/
 EXTRACT_SUFX=	.tar.Z
diff --git a/net/icsi-finger/distinfo b/net/icsi-finger/distinfo
index 7e5405f7de4..019c8fbe8d8 100644
--- a/net/icsi-finger/distinfo
+++ b/net/icsi-finger/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2011/02/11 17:16:03 is Exp $
+$NetBSD: distinfo,v 1.9.6.1 2011/12/08 04:01:09 sbd Exp $
 
 SHA1 (icsi-finger-1.0.27.tar.Z) = 41f03c42269a402169000a6b08ba8c6330256861
 RMD160 (icsi-finger-1.0.27.tar.Z) = 92839362b6d4b1893958ca0909654f070e734aa4
@@ -12,6 +12,8 @@ SHA1 (patch-af) = 96d691992eecbf08118a924218570325a52603b1
 SHA1 (patch-ah) = d61e893ce11a3957bbe138abc9a247b0d4b51a0e
 SHA1 (patch-ai) = 01b48ecef2c1fe191780c9a8dee61f2951ee9c10
 SHA1 (patch-aj) = 53adee387e703fcff2b8f5dba4ae593712acb2ad
-SHA1 (patch-ak) = 8e9bd7da344e082deb0e51301e124a2b7f8025fe
-SHA1 (patch-al) = 28e8762269e94dec2e1b306527c2613b8a86d76d
+SHA1 (patch-ak) = 32f76a2e2a683225da8511aa0fcca4b709adf6a5
+SHA1 (patch-al) = 1abcd4a364d66b19e30e38422f3fda5a9cc233b3
 SHA1 (patch-am) = 50b7cc7eaa30eaab2a26a849a875322c5344a74a
+SHA1 (patch-an) = c5e4a49e7abd2b14513be38d3d06280117730e09
+SHA1 (patch-lib_util_c) = 160eb90114aaa9dce5d66de1392673f15aed9cd9
diff --git a/net/icsi-finger/patches/patch-ak b/net/icsi-finger/patches/patch-ak
index 618fe1e4ba6..1269899f63f 100644
--- a/net/icsi-finger/patches/patch-ak
+++ b/net/icsi-finger/patches/patch-ak
@@ -1,8 +1,18 @@
-$NetBSD: patch-ak,v 1.1 2011/01/18 12:28:25 is Exp $
+$NetBSD: patch-ak,v 1.1.6.1 2011/12/08 04:01:09 sbd Exp $
 
 --- src/in.fingerd.c.orig	1996-01-10 19:26:24.000000000 +0000
 +++ src/in.fingerd.c
-@@ -805,12 +805,12 @@ finger_users (user, options, stream)
+@@ -33,9 +33,7 @@ static char *rcsid = "$Id: in.fingerd.c,
+ #include <sys/types.h>
+ #include <fcntl.h>
+ #include <sys/file.h>
+-#ifndef X_OK
+ #include <unistd.h>
+-#endif
+ #include <sys/stat.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+@@ -805,12 +803,12 @@ finger_users (user, options, stream)
  	  fprintf (stream, "%s (%s) seen at %s on %s",
  		   upackets[i]->real_name, upackets[i]->name,
  		   strip_hostname (upackets[i]->host),
@@ -17,7 +27,15 @@ $NetBSD: patch-ak,v 1.1 2011/01/18 12:28:25 is Exp $
      }
    else
      {
-@@ -1262,7 +1262,7 @@ show_unlogged_packet (packet, stream)
+@@ -888,7 +886,6 @@ finger_clients (user, options, stream)
+       else
+ 	{
+ 	  status = "";
+-	  idle_time = "";
+ 	}
+     
+ 
+@@ -1262,7 +1259,7 @@ show_unlogged_packet (packet, stream)
  
    /* In SunOS4 getpwnam() seems to call ctime(), so we move this call down
     * here to be sure the intended result doesn't get overwritten. */
@@ -26,3 +44,38 @@ $NetBSD: patch-ak,v 1.1 2011/01/18 12:28:25 is Exp $
    the_time[strlen(the_time) - 1] = '\0';	/* delete newline */
  
    if (*(packet->real_name))
+@@ -1406,14 +1403,7 @@ run_target_script(script, target, cd, in
+   char *arg;
+ {
+   int pid;
+-#ifdef SYSV
+   int status;
+-#else
+-#ifndef WEXITSTATUS
+-# define WEXITSTATUS(w) ((w).w_retcode)
+-#endif
+-  union wait status;
+-#endif
+ 
+   if (access (script, X_OK) >= 0)
+     {
+@@ -1528,6 +1518,7 @@ maybe_user_script (entry, stream, packet
+   FILE *long_output;
+   int result;
+   extern char *mktemp();
++  int temp_fd;
+ 
+ #ifndef FINGERRC
+   return (0);
+@@ -1571,8 +1562,9 @@ maybe_user_script (entry, stream, packet
+   /* Collect regular long finger output in file */
+   strcpy (temp_file, TEMPFILE);
+   
+-  if (!mktemp (temp_file) ||
+-      !(long_output = fopen (temp_file, "w+")))
++  temp_fd = mkstemp (temp_file);
++  if (temp_fd < 0 ||
++      !(long_output = fdopen (temp_fd, "w+")))
+     {
+       file_error (WARNING, temp_file);
+       free (user_script);
diff --git a/net/icsi-finger/patches/patch-al b/net/icsi-finger/patches/patch-al
index 5cc603c36ea..79cd3f37a68 100644
--- a/net/icsi-finger/patches/patch-al
+++ b/net/icsi-finger/patches/patch-al
@@ -1,8 +1,19 @@
-$NetBSD: patch-al,v 1.1 2011/01/18 12:28:25 is Exp $
+$NetBSD: patch-al,v 1.1.6.1 2011/12/08 04:01:09 sbd Exp $
+
+- 64-bit time_t fixes
+- use standard includes
 
 --- lib/os.c.orig	1996-07-18 23:31:32.000000000 +0000
 +++ lib/os.c
-@@ -1137,3 +1137,15 @@ same_hostip (host1, host2)
+@@ -28,6 +28,7 @@ static char *rcsid = "$Id: os.c,v 1.63 1
+ #include "../config.h"
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/param.h>
+@@ -1137,3 +1138,15 @@ same_hostip (host1, host2)
      return (addr1 == addr2);
  }
  
diff --git a/net/icsi-finger/patches/patch-an b/net/icsi-finger/patches/patch-an
new file mode 100644
index 00000000000..bbf59902b37
--- /dev/null
+++ b/net/icsi-finger/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1.2.2 2011/12/08 04:01:09 sbd Exp $
+
+--- src/packet2ascii.c.orig	1994-01-11 02:14:49.000000000 +0000
++++ src/packet2ascii.c
+@@ -101,7 +101,7 @@ char *
+ parse_time(line, sep, buffer, lineno, name)
+ 	char *line;
+ 	char sep;
+-	time_t *buffer;
++	int32_t *buffer;
+ 	int lineno;
+ 	char *name;
+ {
diff --git a/net/icsi-finger/patches/patch-lib_util_c b/net/icsi-finger/patches/patch-lib_util_c
new file mode 100644
index 00000000000..277dd08994c
--- /dev/null
+++ b/net/icsi-finger/patches/patch-lib_util_c
@@ -0,0 +1,23 @@
+$NetBSD: patch-lib_util_c,v 1.1.2.2 2011/12/08 04:01:09 sbd Exp $
+
+- use standard headers
+
+--- lib/util.c~	1997-10-19 00:06:56.000000000 +0000
++++ lib/util.c
+@@ -26,6 +26,7 @@ static char *rcsid = "$Id: util.c,v 1.27
+ #endif
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
+ #include <sys/types.h>
+@@ -239,8 +240,6 @@ memory_error_and_abort (nbytes)
+   handle_error(FATAL, "(re)alloc error. Cannot allocate %d bytes.", nbytes);
+ }
+   
+-extern char *malloc(), *realloc();
+-
+ void *
+ xmalloc (nbytes)
+      int nbytes;