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.

1 files changed, 56 insertions, 3 deletions

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);