From nate@root.org  Tue Jan  6 11:24:29 2004
Return-Path: <nate@root.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CCF3D16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  6 Jan 2004 11:24:29 -0800 (PST)
Received: from root.org (root.org [67.118.192.226])
	by mx1.FreeBSD.org (Postfix) with SMTP id 0A7AF43D46
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  6 Jan 2004 11:24:29 -0800 (PST)
	(envelope-from nate@root.org)
Received: (qmail 27108 invoked by uid 1000); 6 Jan 2004 19:24:29 -0000
Message-Id: <20040106112404.R27106@root.org>
Date: Tue, 6 Jan 2004 11:24:29 -0800 (PST)
From: Nate Lawson <nate@root.org>
To: FreeBSD-gnats-submit@freebsd.org
Subject: PATCH: fix build of grub-0.92

>Number:         60988
>Category:       ports
>Synopsis:       PATCH: fix build of grub-0.92
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 06 11:30:15 PST 2004
>Closed-Date:    Tue Jan 06 14:36:16 PST 2004
>Last-Modified:  Wed Jan  7 23:10:03 PST 2004
>Originator:     Nate Lawson
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
FreeBSD
>Environment:
System:

>Description:
	grub-0.92 port is broken on 5-CURRENT.  Attached patches below
	fix the build.  I don't have reiserfs so someone should test it
	but I believe the patch to it is simple.

>How-To-Repeat:
>Fix:
###	Apply this patch to the port Makefile:

--- Makefile.orig	Mon Dec 22 22:12:18 2003
+++ Makefile	Tue Jan  6 11:13:07 2004
@@ -37,12 +37,8 @@

 .include <bsd.port.pre.mk>

-.if ${OSVERSION} >= 500113
-BROKEN=		"Does not compile on FreeBSD ${OSVERSION}"
-.endif
-
 pre-build:
-	@${RM} ${WRKSRC}/docs/grub.info*
+	@${RM} -f ${WRKSRC}/docs/grub.info

 post-install:
 	@${CAT} ${PKGMESSAGE}

###	Add this patch as grub-0.92/files/patch-stage2_fsys_reiserfs.c:

--- stage2/fsys_reiserfs.c.orig	Tue Jan  6 11:05:27 2004
+++ stage2/fsys_reiserfs.c	Tue Jan  6 11:05:59 2004
@@ -112,7 +112,7 @@
   /* offset in the log of where to start replay after a crash */
   __u32 j_first_unflushed_offset;
   /* mount id to detect very old transactions */
-  __u32 long j_mount_id;
+  __u64 j_mount_id;
 };

 /* magic string to find desc blocks in the journal */

>Release-Note:
>Audit-Trail:

From: Thierry Thomas <thierry@pompo.net>
To: Nate Lawson <nate@root.org>
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: ports/60988: PATCH: fix build of grub-0.92
Date: Tue, 6 Jan 2004 21:29:20 +0100

 Le Mar  6 jan 04  20:24:29 +0100, Nate Lawson <nate@root.org>
  crivait:
 > 
 > >Number:         60988
 > >Category:       ports
 > >Synopsis:       PATCH: fix build of grub-0.92
 > >Confidential:   no
 > >Severity:       serious
 > >Priority:       medium
 > >Responsible:    freebsd-ports-bugs
 > >State:          open
 > >Quarter:        
 > >Keywords:       
 > >Date-Required:
 > >Class:          sw-bug
 > >Submitter-Id:   current-users
 > >Arrival-Date:   Tue Jan 06 11:30:15 PST 2004
 > >Closed-Date:
 > >Last-Modified:
 > >Originator:     Nate Lawson
 > >Release:        FreeBSD 5.2-CURRENT i386
 > >Organization:
 > FreeBSD
 > >Environment:
 > System:
 > 
 > >Description:
 > 	grub-0.92 port is broken on 5-CURRENT.  Attached patches below
 > 	fix the build.  I don't have reiserfs so someone should test it
 > 	but I believe the patch to it is simple.
 
 Note that 0.92 is outdated, 0.93 has been released on 08.12.2002.
 Meanwhile, I think that it should remain marked "broken", because AFAIK
 it does not support UFS2.
 
 Regards,
 -- 
 Th. Thomas.

From: Nate Lawson <nate@root.org>
To: Thierry Thomas <thierry@pompo.net>
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: ports/60988: PATCH: fix build of grub-0.92
Date: Tue, 6 Jan 2004 13:28:13 -0800 (PST)

 On Tue, 6 Jan 2004, Thierry Thomas wrote:
 > Le Mar  6 jan 04 =E0 20:24:29 +0100, Nate Lawson <nate@root.org>
 >  =E9crivait=A0:
 > >
 > > >Number:         60988
 > > >Category:       ports
 > > >Synopsis:       PATCH: fix build of grub-0.92
 > > >Confidential:   no
 > > >Severity:       serious
 > > >Priority:       medium
 > > >Responsible:    freebsd-ports-bugs
 > > >State:          open
 > > >Quarter:
 > > >Keywords:
 > > >Date-Required:
 > > >Class:          sw-bug
 > > >Submitter-Id:   current-users
 > > >Arrival-Date:   Tue Jan 06 11:30:15 PST 2004
 > > >Closed-Date:
 > > >Last-Modified:
 > > >Originator:     Nate Lawson
 > > >Release:        FreeBSD 5.2-CURRENT i386
 > > >Organization:
 > > FreeBSD
 > > >Environment:
 > > System:
 > >
 > > >Description:
 > > =09grub-0.92 port is broken on 5-CURRENT.  Attached patches below
 > > =09fix the build.  I don't have reiserfs so someone should test it
 > > =09but I believe the patch to it is simple.
 >
 > Note that 0.92 is outdated, 0.93 has been released on 08.12.2002.
 
 I know.  First things first.  Feel free to submit patches for building
 0.93.
 
 > Meanwhile, I think that it should remain marked "broken", because AFAIK
 > it does not support UFS2.
 
 There are plenty of us using UFS1 and 5-CURRENT since we don't need the
 ACLs feature and the root (or /boot) partition is small enough that there
 is no benefit from the larger tables.
 
 Again, the first thing is to get the existing grub-0.92 compiling again,
 then grub-0.93, then UFS2, ...
 
 -Nate

From: Thierry Thomas <thierry@pompo.net>
To: Nate Lawson <nate@root.org>
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: ports/60988: PATCH: fix build of grub-0.92
Date: Tue, 6 Jan 2004 22:55:17 +0100

 Le Mar  6 jan 04  22:28:13 +0100, Nate Lawson <nate@root.org>
  crivait:
 > There are plenty of us using UFS1 and 5-CURRENT since we don't need the
 > ACLs feature and the root (or /boot) partition is small enough that there
 > is no benefit from the larger tables.
 
 OK, but since UFS2 is the default for a new install, we should at least
 echo a warning.
 
 > Again, the first thing is to get the existing grub-0.92 compiling again,
 > then grub-0.93, then UFS2, ...
 
 Fine.
 -- 
 Th. Thomas.
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Tue Jan 6 14:36:09 PST 2004 
State-Changed-Why:  
Committed, thanks! 

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

From: Nate Lawson <nate@root.org>
To: Thierry Thomas <thierry@pompo.net>
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: ports/60988: PATCH: fix build of grub-0.92
Date: Wed, 7 Jan 2004 23:05:06 -0800 (PST)

 On Tue, 6 Jan 2004, Thierry Thomas wrote:
 > Le Mar  6 jan 04 =E0 22:28:13 +0100, Nate Lawson <nate@root.org>
 >  =E9crivait=A0:
 > > There are plenty of us using UFS1 and 5-CURRENT since we don't need the
 > > ACLs feature and the root (or /boot) partition is small enough that the=
 re
 > > is no benefit from the larger tables.
 >
 > OK, but since UFS2 is the default for a new install, we should at least
 > echo a warning.
 
 Feel free to add that to the port Makefile.  I'm not a ports guy so I
 don't know how to do this.
 
 -Nate
>Unformatted:
