From nobody@FreeBSD.org  Sun Mar 21 19:45:01 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 93571106566B
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 21 Mar 2010 19:45:01 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 67A8E8FC16
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 21 Mar 2010 19:45:01 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o2LJj1Y7076667
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 21 Mar 2010 19:45:01 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o2LJj1Rf076666;
	Sun, 21 Mar 2010 19:45:01 GMT
	(envelope-from nobody)
Message-Id: <201003211945.o2LJj1Rf076666@www.freebsd.org>
Date: Sun, 21 Mar 2010 19:45:01 GMT
From: Ryan Steinmetz <rpsfa@rit.edu>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] Unbreak net/freeradius on 9.0-CURRENT (fix utmpx.h support)
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         144937
>Category:       ports
>Synopsis:       [patch] Unbreak net/freeradius on 9.0-CURRENT (fix utmpx.h support)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sylvio
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 21 19:50:01 UTC 2010
>Closed-Date:    Sat Apr 03 00:25:43 UTC 2010
>Last-Modified:  Sat Apr 03 00:25:43 UTC 2010
>Originator:     Ryan Steinmetz
>Release:        9.0-CURRENT-201002
>Organization:
Rochester Institute of Technology
>Environment:
FreeBSD xxx.rit.edu 9.0-CURRENT-201002 FreeBSD 9.0-CURRENT-201002 #0: Fri Feb 12 22:57:16 UTC 2010     root@obrian.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
Unbreak net/freeradius on 9.0-CURRENT by fixing utmpx.h support.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -urN /root/freeradius/Makefile /usr/ports/net/freeradius/Makefile
--- /root/freeradius/Makefile	2010-03-21 19:36:51.000000000 -0400
+++ /usr/ports/net/freeradius/Makefile	2010-03-21 19:37:34.000000000 -0400
@@ -63,10 +63,6 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} > 900007
-BROKEN=		fails to build with new utmpx
-.endif
-
 # Default requirements for rc script
 _REQUIRE=	NETWORKING SERVERS
 
diff -urN /root/freeradius/files/patch-src__include__sysutmp.h /usr/ports/net/freeradius/files/patch-src__include__sysutmp.h
--- /root/freeradius/files/patch-src__include__sysutmp.h	1969-12-31 19:00:00.000000000 -0500
+++ /usr/ports/net/freeradius/files/patch-src__include__sysutmp.h	2010-03-21 19:37:26.000000000 -0400
@@ -0,0 +1,20 @@
+--- ./src/include/sysutmp.h.orig	2009-12-30 10:44:35.000000000 -0500
++++ ./src/include/sysutmp.h	2010-03-06 09:32:13.075571526 -0500
+@@ -30,7 +30,7 @@
+ #  define UT_NAMESIZE	32
+ #  define UT_LINESIZE	32
+ #  define UT_HOSTSIZE	257
+-#ifdef hpux
++#if defined(hpux) || defined(__FreeBSD__)
+ #  define ut_name ut_user
+ #endif
+ #else
+@@ -43,7 +43,7 @@
+ #  define UT_HOSTSIZE	64
+ #endif
+ 
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(bsdi) || defined(__OpenBSD__) || defined(__APPLE__)
++#if (defined(__FreeBSD__) && !defined(HAVE_UTMPX_H)) || defined(__NetBSD__) || defined(bsdi) || defined(__OpenBSD__) || defined(__APPLE__)
+ #  ifndef UTMP_FILE
+ #    define UTMP_FILE "/var/run/utmp"
+ #  endif


>Release-Note:
>Audit-Trail:
Class-Changed-From-To: change-request->maintainer-update 
Class-Changed-By: edwin 
Class-Changed-When: Sun Mar 21 19:50:12 UTC 2010 
Class-Changed-Why:  
Fix category (submitter is maintainer) (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=144937 
Responsible-Changed-From-To: freebsd-ports-bugs->sylvio 
Responsible-Changed-By: sylvio 
Responsible-Changed-When: Sun Mar 21 20:00:23 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/144937: commit references a PR
Date: Sat,  3 Apr 2010 00:12:58 +0000 (UTC)

 sylvio      2010-04-03 00:12:43 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net/freeradius       Makefile 
   Added files:
     net/freeradius/files patch-src__include__sysutmp.h 
   Log:
   - Unbreak on 9.0-CURRENT by fixing utmpx.h support.
   
   PR:             ports/144937
   Submitted by:   Ryan Steinmetz <rpsfa@rit.edu> (maintainer)
   Approved by:    itetcu (mentor)
   
   Revision  Changes    Path
   1.74      +0 -4      ports/net/freeradius/Makefile
   1.1       +20 -0     ports/net/freeradius/files/patch-src__include__sysutmp.h (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: sylvio 
State-Changed-When: Sat Apr 3 00:25:42 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

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