icsi-finger 1.0.28 (+ our old patches).

3 files changed, 20 insertions, 27 deletions

diff --git a/net/icsi-finger/Makefile b/net/icsi-finger/Makefile
index e1d84cde688..a3b4e1a0c8a 100644
--- a/net/icsi-finger/Makefile
+++ b/net/icsi-finger/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2011/11/22 09:04:49 is Exp $
+# $NetBSD: Makefile,v 1.20 2011/11/22 09:44:18 is Exp $
 #
 
-DISTNAME=	icsi-finger-1.0.27
-PKGREVISION=	7
+DISTNAME=	icsi-finger-1.0.28
 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 fcd1c491374..89a0a75dce3 100644
--- a/net/icsi-finger/distinfo
+++ b/net/icsi-finger/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2011/11/22 09:04:49 is Exp $
+$NetBSD: distinfo,v 1.14 2011/11/22 09:44:18 is Exp $
 
-SHA1 (icsi-finger-1.0.27.tar.Z) = 41f03c42269a402169000a6b08ba8c6330256861
-RMD160 (icsi-finger-1.0.27.tar.Z) = 92839362b6d4b1893958ca0909654f070e734aa4
-Size (icsi-finger-1.0.27.tar.Z) = 729351 bytes
+SHA1 (icsi-finger-1.0.28.tar.Z) = b9708e1d4c6ec645ffcbb17ddabb96b400b53d92
+RMD160 (icsi-finger-1.0.28.tar.Z) = c7f4e745f85e7e9a5320b625288b595c3a093391
+Size (icsi-finger-1.0.28.tar.Z) = 312479 bytes
 SHA1 (patch-aa) = 33d58b9375358e030e03e95ca504d8f6787134cd
 SHA1 (patch-ab) = d8a719d78288aad8ab3a7159f332afdd59231ebb
 SHA1 (patch-ac) = e3759d714eafae1cc6a8e974d8a79f065f7efe24
@@ -12,7 +12,7 @@ SHA1 (patch-af) = 96d691992eecbf08118a924218570325a52603b1
 SHA1 (patch-ah) = d61e893ce11a3957bbe138abc9a247b0d4b51a0e
 SHA1 (patch-ai) = 01b48ecef2c1fe191780c9a8dee61f2951ee9c10
 SHA1 (patch-aj) = 53adee387e703fcff2b8f5dba4ae593712acb2ad
-SHA1 (patch-ak) = 32f76a2e2a683225da8511aa0fcca4b709adf6a5
+SHA1 (patch-ak) = 99db200b97c28734f58d853978997ba2dbb0ad56
 SHA1 (patch-al) = 1abcd4a364d66b19e30e38422f3fda5a9cc233b3
 SHA1 (patch-am) = 50b7cc7eaa30eaab2a26a849a875322c5344a74a
 SHA1 (patch-an) = c5e4a49e7abd2b14513be38d3d06280117730e09
diff --git a/net/icsi-finger/patches/patch-ak b/net/icsi-finger/patches/patch-ak
index e22c5fb2e42..289faabca4f 100644
--- a/net/icsi-finger/patches/patch-ak
+++ b/net/icsi-finger/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.4 2011/11/22 09:04:49 is Exp $
+$NetBSD: patch-ak,v 1.5 2011/11/22 09:44:18 is Exp $
 
---- src/in.fingerd.c.orig	1996-01-10 19:26:24.000000000 +0000
+--- src/in.fingerd.c.orig	1999-03-29 06:05:30.000000000 +0000
 +++ src/in.fingerd.c
 @@ -33,9 +33,7 @@ static char *rcsid = "$Id: in.fingerd.c,
  #include <sys/types.h>
@@ -12,22 +12,16 @@ $NetBSD: patch-ak,v 1.4 2011/11/22 09:04:49 is Exp $
  #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,
+@@ -811,7 +809,7 @@ finger_users (user, options, stream)
+ 	  /* don't print trailing \n from ctime() */
+ 	  fprintf(stream, " seen at %s on %.24s",
  		   strip_hostname (upackets[i]->host),
 -		   ctime (&upackets[i]->idle_time));
 +		   ctime32 (&upackets[i]->idle_time));
- 	else
- 	  fprintf (stream, "%s seen at %s on %s",
- 		   upackets[i]->name,
- 		   strip_hostname (upackets[i]->host),
--		   ctime (&upackets[i]->idle_time));
-+		   ctime32 (&upackets[i]->idle_time));
-     }
-   else
-     {
-@@ -888,7 +886,6 @@ finger_clients (user, options, stream)
+ 
+ 	  if (*(upackets[i]->ttyloc))
+ 	    fprintf(stream, " from %s",
+@@ -897,7 +895,6 @@ finger_clients (user, options, stream)
        else
  	{
  	  status = "";
@@ -35,7 +29,7 @@ $NetBSD: patch-ak,v 1.4 2011/11/22 09:04:49 is Exp $
  	}
      
  
-@@ -1262,7 +1259,7 @@ show_unlogged_packet (packet, stream)
+@@ -1271,7 +1268,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. */
@@ -44,7 +38,7 @@ $NetBSD: patch-ak,v 1.4 2011/11/22 09:04:49 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
+@@ -1415,14 +1412,7 @@ run_target_script(script, target, cd, in
    char *arg;
  {
    int pid;
@@ -59,7 +53,7 @@ $NetBSD: patch-ak,v 1.4 2011/11/22 09:04:49 is Exp $
  
    if (access (script, X_OK) >= 0)
      {
-@@ -1528,6 +1518,7 @@ maybe_user_script (entry, stream, packet
+@@ -1537,6 +1527,7 @@ maybe_user_script (entry, stream, packet
    FILE *long_output;
    int result;
    extern char *mktemp();
@@ -67,7 +61,7 @@ $NetBSD: patch-ak,v 1.4 2011/11/22 09:04:49 is Exp $
  
  #ifndef FINGERRC
    return (0);
-@@ -1571,8 +1562,9 @@ maybe_user_script (entry, stream, packet
+@@ -1580,8 +1571,9 @@ maybe_user_script (entry, stream, packet
    /* Collect regular long finger output in file */
    strcpy (temp_file, TEMPFILE);