From sgk@kolobov.com  Fri Jun 13 16:00:18 2003
Return-Path: <sgk@kolobov.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6ADFC37B401
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 13 Jun 2003 16:00:18 -0700 (PDT)
Received: from outpost.globcon.net (outpost.globcon.net [62.141.88.161])
	by mx1.FreeBSD.org (Postfix) with SMTP id C8CE943FBD
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 13 Jun 2003 16:00:16 -0700 (PDT)
	(envelope-from sgk@kolobov.com)
Received: (qmail 40375 invoked from network); 13 Jun 2003 23:00:19 -0000
Received: from unknown (HELO kolobov.com) (213.247.180.114)
  by outpost.globcon.net with SMTP; 13 Jun 2003 23:00:19 -0000
Received: (qmail 17437 invoked by uid 911); 13 Jun 2003 23:00:05 -0000
Message-Id: <20030613230005.17436.qmail@kolobov.com>
Date: 13 Jun 2003 23:00:05 -0000
From: Sergei Kolobov <sergei@kolobov.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: bjk@m-net.arbornet.org
Subject: [PATCH] sysutils/userinfo: unbreak under 5.x
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         53300
>Category:       ports
>Synopsis:       [PATCH] sysutils/userinfo: unbreak under 5.x
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    osa
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 13 16:00:30 PDT 2003
>Closed-Date:    Tue Jul 15 05:49:52 PDT 2003
>Last-Modified:  Tue Jul 15 05:49:52 PDT 2003
>Originator:     Sergei Kolobov
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD elf.chetwood.ru 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Thu Jun  5 02:19:41 MSD
>Description:
- Unbreak under 5.x (changes in kinfo_proc struct)
- Use the same CONFIGURE_TARGET as other ports
- Allow the manpage to be compressed

Added files:
- files/patch-src::common.h
- files/patch-src::process.c

Port maintainer - bjk@m-net.arbornet.org - has been copied.
>How-To-Repeat:
>Fix:

--- userinfo-1.10a.patch begins here ---
diff -ruN --exclude=CVS userinfo.cvs/Makefile userinfo/Makefile
--- userinfo.cvs/Makefile	Tue Apr 15 00:13:56 2003
+++ userinfo/Makefile	Sat Jun 14 02:53:00 2003
@@ -14,19 +14,11 @@
 COMMENT=	Show information about local users
 
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		ui.1
-MANCOMPRESSED=	no
-
-CONFIGURE_TARGET=
 
 pre-build:
-	${CP} ${WRKSRC}/doc/ui.man ${WRKSRC}/doc/ui.1
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 500000
-BROKEN=	"Doesn't work on 5.x, mainainter informed - 2003-04-07"
-.endif
+	${MV} ${WRKSRC}/doc/ui.man ${WRKSRC}/doc/ui.1
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN --exclude=CVS userinfo.cvs/files/patch-src::common.h userinfo/files/patch-src::common.h
--- userinfo.cvs/files/patch-src::common.h	Thu Jan  1 03:00:00 1970
+++ userinfo/files/patch-src::common.h	Sat Jun 14 02:46:30 2003
@@ -0,0 +1,10 @@
+--- src/common.h.orig	Sat Jun 14 02:45:40 2003
++++ src/common.h	Sat Jun 14 02:21:13 2003
+@@ -16,6 +16,7 @@
+     along with this program; if not, write to the Free Software
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
++#include <sys/types.h>
+ #include <pwd.h>
+ #include "config.h"
+ 
diff -ruN --exclude=CVS userinfo.cvs/files/patch-src::process.c userinfo/files/patch-src::process.c
--- userinfo.cvs/files/patch-src::process.c	Thu Jan  1 03:00:00 1970
+++ userinfo/files/patch-src::process.c	Sat Jun 14 02:47:07 2003
@@ -0,0 +1,27 @@
+--- src/process.c.orig	Sat Jun 14 02:33:21 2003
++++ src/process.c	Sat Jun 14 02:42:29 2003
+@@ -63,15 +63,24 @@
+     }
+ 
+     for (i = 0; i < cnt; i++) {
++#if __FreeBSD_version < 500000
+ 	if (kp[i].kp_eproc.e_flag & EPROC_SLEADER && kp[i].kp_eproc.e_tdev !=
+ 		-1) {
+ 	    pid = kp[i].kp_proc.p_pid;
++#else
++	if (kp[i].ki_kiflag & KI_SLEADER && kp[i].ki_tdev != -1) {
++	    pid = kp[i].ki_pid;
++#endif
+ 	    break;
+ 	}
+     }
+ 
+     if (!pid)
++#if __FreeBSD_version < 500000
+ 	pid = kp[0].kp_eproc.e_ppid;
++#else
++	pid = kp[0].ki_ppid;
++#endif
+ 
+     return (pid > 1) ? pid : -1;
+ }
--- userinfo-1.10a.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->osa 
Responsible-Changed-By: osa 
Responsible-Changed-When: Fri Jun 13 16:39:19 PDT 2003 
Responsible-Changed-Why:  
I'll handle this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=53300 

From: "Sergey A. Osokin" <osa@FreeBSD.org>
To: Sergei Kolobov <sergei@kolobov.com>
Cc: FreeBSD-gnats-submit@FreeBSD.org, bjk@m-net.arbornet.org
Subject: Re: ports/53300: [PATCH] sysutils/userinfo: unbreak under 5.x
Date: Mon, 23 Jun 2003 20:20:21 +0400

 > - Unbreak under 5.x (changes in kinfo_proc struct)
 > - Use the same CONFIGURE_TARGET as other ports
 > - Allow the manpage to be compressed
 
 Looks good!
 Dear Ben Kibbey, please approve this patch.
 
 -- 
 
 Rgdz,                        /"\  ASCII RIBBON CAMPAIGN
 Sergey Osokin aka oZZ,       \ /    AGAINST HTML MAIL
 http://ozz.pp.ru/             X          AND NEWS
                              / \
State-Changed-From-To: open->closed 
State-Changed-By: osa 
State-Changed-When: Tue Jul 15 05:49:27 PDT 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=53300 
>Unformatted:
