From teemu.korhonen@mbnet.fi  Tue Jan 29 14:23:33 2008
Return-Path: <teemu.korhonen@mbnet.fi>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 63D6316A41B
	for <freebsd-gnats-submit@freebsd.org>; Tue, 29 Jan 2008 14:23:33 +0000 (UTC)
	(envelope-from teemu.korhonen@mbnet.fi)
Received: from astana.suomi.net (astana.suomi.net [82.128.152.18])
	by mx1.freebsd.org (Postfix) with ESMTP id 13AA213C465
	for <freebsd-gnats-submit@freebsd.org>; Tue, 29 Jan 2008 14:23:33 +0000 (UTC)
	(envelope-from teemu.korhonen@mbnet.fi)
Received: from taku.suomi.net ([82.128.154.66])
 by astana.suomi.net (Sun Java System Messaging Server 6.2-3.04 (built Jul 15
 2005)) with ESMTP id <0JVE00DE2RX61U60@astana.suomi.net> for
 freebsd-gnats-submit@freebsd.org; Tue, 29 Jan 2008 15:53:30 +0200 (EET)
Received: from spam1.suomi.net (spam1.suomi.net [212.50.131.169])
 by mailstore.suomi.net
 (Sun Java(tm) System Messaging Server 6.3-4.01 (built Aug  3 2007; 32bit))
 with ESMTP id <0JVE001APRX3HQG0@mailstore.suomi.net> for
 freebsd-gnats-submit@freebsd.org; Tue, 29 Jan 2008 15:53:27 +0200 (EET)
Received: from veneficus.koti.lan
 (82-128-204-212-Korvensuora-TR1.suomi.net [82.128.204.212])
	by spam1.suomi.net (Postfix) with ESMTP id DDB462505C2	for
 <FreeBSD-gnats-submit@freebsd.org>; Tue, 29 Jan 2008 15:53:14 +0200 (EET)
Received: from veneficus.koti.lan (localhost.koti.lan [127.0.0.1])
	by veneficus.koti.lan (8.14.2/8.14.2) with ESMTP id m0TDr7WN004408	for
 <FreeBSD-gnats-submit@freebsd.org>; Tue, 29 Jan 2008 15:53:07 +0200
Received: (from teemu@localhost)	by veneficus.koti.lan (8.14.2/8.14.2/Submit)
 id m0TDr62x004407; Tue, 29 Jan 2008 15:53:06 +0200 (EET envelope-from teemu)
Message-Id: <200801291353.m0TDr62x004407@veneficus.koti.lan>
Date: Tue, 29 Jan 2008 15:53:06 +0200 (EET)
From: Teemu Korhonen <teemu.korhonen@mbnet.fi>
Reply-To: Teemu Korhonen <teemu.korhonen@mbnet.fi>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] devel/linux-js: fix for 7.x ABI breakage
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         120118
>Category:       ports
>Synopsis:       [patch] devel/linux-js: fix for 7.x ABI breakage
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 29 14:30:01 UTC 2008
>Closed-Date:    Thu May 01 13:44:20 UTC 2008
>Last-Modified:  Thu May 01 13:44:20 UTC 2008
>Originator:     Teemu Korhonen
>Release:        FreeBSD 7.0-RC1 i386
>Organization:
>Environment:
System: FreeBSD veneficus.koti.lan 7.0-RC1 FreeBSD 7.0-RC1 #0: Tue Jan 8 22:55:09 EET 2008 teemu@veneficus.koti.lan:/usr/obj/usr/src/sys/VENEFICUS i386


	
>Description:
This patch fixes the module loading error in RELENG_7.
Also removes the IGNORE-mark.

In more detail: FILEDESC_UNLOCK and FILEDESC_LOCK is
replaced with FILEDESC_SUNLOCK and FILEDESC_SLOCK
as have been done in sys_generic.c when moving to RELENG_7.
	
>How-To-Repeat:
	
>Fix:

	

--- linux-js-patch.diff begins here ---
diff -ruN /usr/ports/devel/linux-js/Makefile linux-js/Makefile
--- /usr/ports/devel/linux-js/Makefile	2008-01-27 00:24:58.000000000 +0200
+++ linux-js/Makefile	2008-01-29 10:58:58.000000000 +0200
@@ -33,10 +33,6 @@
 IGNORE=		requires FreeBSD 5.3 or superior
 .endif
 
-.if ${OSVERSION} >= 700000
-IGNORE=		module cannot be loaded on FreeBSD 7.x 
-.endif
-
 .if !exists(/usr/src/sys/Makefile)
 IGNORE=		requires kernel source files
 .endif
@@ -55,6 +51,10 @@
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/linux_js.4
+.if ${OSVERSION} >= 700000
+	@${REINPLACE_CMD} -e 's|FILEDESC_UNLOCK|FILEDESC_SUNLOCK|' ${WRKSRC}/linux_js.c
+	@${REINPLACE_CMD} -e 's|FILEDESC_LOCK|FILEDESC_SLOCK|' ${WRKSRC}/linux_js.c
+.endif
 
 post-install:
 	${MKDIR} ${PREFIX}/include/linux
--- linux-js-patch.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->jylefort 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Jan 29 14:30:10 UTC 2008 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=120118 
Responsible-Changed-From-To: jylefort->freebsd-ports-bugs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Tue Apr 29 05:28:03 UTC 2008 
Responsible-Changed-Why:  
Maintainer was reset. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/120118: commit references a PR
Date: Thu,  1 May 2008 13:14:27 +0000 (UTC)

 okazaki     2008-05-01 13:14:23 UTC
 
   FreeBSD ports repository
 
   Modified files:
     devel/linux-js       Makefile 
   Log:
   Fix for 7.x ABI breakage.
   
   PR:             120118
   Submitted by:   Teemu Korhonen
   
   Revision  Changes    Path
   1.8       +4 -4      ports/devel/linux-js/Makefile
 _______________________________________________
 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: okazaki 
State-Changed-When: Thu May 1 13:44:12 UTC 2008 
State-Changed-Why:  
Committed, thanks! 

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