From flynn@christine.energyhq.tk  Sun Dec  1 11:03:25 2002
Return-Path: <flynn@christine.energyhq.tk>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E3DAA37B401
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  1 Dec 2002 11:03:25 -0800 (PST)
Received: from christine.energyhq.tk (213-97-200-73.uc.nombres.ttd.es [213.97.200.73])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7412F43E4A
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  1 Dec 2002 11:03:24 -0800 (PST)
	(envelope-from flynn@christine.energyhq.tk)
Received: from christine.energyhq.tk (localhost.energyhq.tk [127.0.0.1])
	by christine.energyhq.tk (8.12.6/8.12.6) with ESMTP id gB1J7Tr0012783
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 1 Dec 2002 20:07:29 +0100 (CET)
	(envelope-from flynn@christine.energyhq.tk)
Received: (from flynn@localhost)
	by christine.energyhq.tk (8.12.6/8.12.6/Submit) id gB1J7S3V012782;
	Sun, 1 Dec 2002 20:07:28 +0100 (CET)
Message-Id: <200212011907.gB1J7S3V012782@christine.energyhq.tk>
Date: Sun, 1 Dec 2002 20:07:28 +0100 (CET)
From: Miguel Mendez <flynn@energyhq.homeip.net>
Reply-To: Miguel Mendez <flynn@energyhq.homeip.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: security/sfs conflicts with bison 1.75 [patch included]
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         45900
>Category:       ports
>Synopsis:       security/sfs conflicts with bison 1.75 [patch included]
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 01 11:10:01 PST 2002
>Closed-Date:    Sun Dec 22 09:17:01 PST 2002
>Last-Modified:  Sun Dec 22 09:17:01 PST 2002
>Originator:     Miguel Mendez
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
Bison blows, Inc
>Environment:
System: FreeBSD christine.energyhq.tk 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Sun Nov 24 13:52:29 CET 2002 root@christine.energyhq.tk:/usr/obj/usr/src/sys/CHRISTINE i386


	
>Description:
If bison is detected at configure time, it will be used to generate 
the parser, but it fails. Quick solution, nuke the bison check out
of configure, and make use of good old byacc.
>How-To-Repeat:
	
>Fix:

	

--- sfs.diff begins here ---
diff -ruN sfs.old/files/patch-configure sfs/files/patch-configure
--- sfs.old/files/patch-configure	Thu Jan  1 01:00:00 1970
+++ sfs/files/patch-configure	Sun Dec  1 20:03:32 2002
@@ -0,0 +1,11 @@
+--- configure.orig	Sun Dec  1 18:53:24 2002
++++ configure	Sun Dec  1 18:53:34 2002
+@@ -1464,7 +1464,7 @@
+ 
+ fi
+ 
+-for ac_prog in 'bison -y' byacc
++for ac_prog in byacc
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
--- sfs.diff ends here ---


>Release-Note:
>Audit-Trail:

From: Miguel Mendez <flynn@energyhq.homeip.net>
To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports@FreeBSD.org
Cc:  
Subject: Re: ports/45900: security/sfs conflicts with bison 1.75 [patch included]
Date: Sun, 1 Dec 2002 23:52:59 +0100

 On Sun, 1 Dec 2002 11:10:01 -0800 (PST)
 FreeBSD-gnats-submit@FreeBSD.org wrote:
 
 Okay, thanks a lot to Joe Marcus for pointing out the patches in sfs
 cvsweb.
 
 Let's try a different approach, add parser.yy and scan.ll patches to our
 patchset and set USE_BISON.
 
 diff -ruN sfs.old/Makefile sfs/Makefile
 --- sfs.old/Makefile	Mon Aug  5 16:54:39 2002
 +++ sfs/Makefile	Sun Dec  1 23:51:32 2002
 @@ -8,7 +8,7 @@
  
  PORTNAME=	sfs
  PORTVERSION=	0.6
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	security net
  MASTER_SITES=	http://www.fs.net/sfs/new-york.lcs.mit.edu:85xq6pznt4mgfvj4mb23x6b8adak55ue/pub/sfswww/dist/
  
 @@ -18,6 +18,7 @@
  
  USE_GMAKE=	yes
  USE_OPENSSL=	yes
 +USE_BISON=	yes
  
  GNU_CONFIGURE=	yes
  CONFIGURE_ARGS+=--with-sfsuser=sfs \
 diff -ruN sfs.old/files/patch-parse.yy sfs/files/patch-parse.yy
 --- sfs.old/files/patch-parse.yy	Thu Jan  1 01:00:00 1970
 +++ sfs/files/patch-parse.yy	Sun Dec  1 23:47:22 2002
 @@ -0,0 +1,61 @@
 +--- rpcc/parse.yy.orig	Sat Jan 27 03:43:23 2001
 ++++ rpcc/parse.yy	Sun Dec  1 23:45:34 2002
 +@@ -1,4 +1,4 @@
 +-/* $Id: parse.yy,v 1.10 1999/05/14 00:16:01 dm Exp $ */
 ++/* $Id: parse.yy,v 1.11 2002/10/23 21:02:33 dm Exp $ */
 + 
 + /*
 +  *
 +@@ -23,6 +23,7 @@
 + 
 + %{
 + #include "rpcc.h"
 ++#define YYSTYPE YYSTYPE
 + 
 + static int proc_compare (const void *, const void *);
 + static int vers_compare (const void *, const void *);
 +@@ -97,6 +98,7 @@
 + 	  s->sconst->id = $2;
 + 	  s->sconst->val = $4;
 + 	}
 ++	;
 + 
 + def_enum: T_ENUM newid '{'
 + 	{
 +@@ -129,6 +131,7 @@
 + 	  s->sunion->tagid = $6;
 + 	}
 + 	union_taglist '}' ';'
 ++	;
 + 
 + def_program: T_PROGRAM newid '{'
 + 	{
 +@@ -143,6 +146,7 @@
 + 	  qsort (s->sprogram->vers.base (), s->sprogram->vers.size (),
 + 		 sizeof (rpc_vers), vers_compare);
 + 	}
 ++	;
 + 
 + version_list: version_decl | version_list version_decl
 + 	;
 +@@ -224,15 +228,19 @@
 + 
 + struct_decl: declaration
 + 	{ symlist.back ().sstruct->decls.push_back ($1); }
 ++	;
 + 
 + enum_taglist: enum_tag {}
 + 	| enum_taglist ',' enum_tag {}
 ++	;
 + 
 + enum_tag: enum_cnstag
 + 	{ symlist.back ().senum->tags.push_back ($1); }
 ++	;
 + 
 + enum_cnstag: newid '=' value { $$.id = $1; $$.val = $3; }
 +-	| newid { $$.id = $1; };
 ++	| newid { $$.id = $1; }
 ++	;
 + 
 + declaration: type T_ID ';'
 + 	 { $$.id = $2; $$.type = $1; $$.qual = rpc_decl::SCALAR; }
 diff -ruN sfs.old/files/patch-scan.ll sfs/files/patch-scan.ll
 --- sfs.old/files/patch-scan.ll	Thu Jan  1 01:00:00 1970
 +++ sfs/files/patch-scan.ll	Sun Dec  1 23:46:59 2002
 @@ -0,0 +1,17 @@
 +--- rpcc/scan.ll.orig	Sat Jan 27 03:43:23 2001
 ++++ rpcc/scan.ll	Sun Dec  1 23:45:45 2002
 +@@ -1,5 +1,5 @@
 + /* -*-fundamental-*- */
 +-/* $Id: scan.ll,v 1.7 1999/11/03 15:43:14 dm Exp $ */
 ++/* $Id: scan.ll,v 1.8 2002/10/23 21:02:33 dm Exp $ */
 + 
 + /*
 +  *
 +@@ -23,6 +23,7 @@
 +  */
 + 
 + %{
 ++#define YYSTYPE YYSTYPE
 + #include "rpcc.h"
 + #include "parse.h"
 + 
 
 
 -- 
         Miguel Mendez - flynn@energyhq.homeip.net
         GPG Public Key :: http://energyhq.homeip.net/files/pubkey.txt
         EnergyHQ :: http://www.energyhq.tk
         Of course it runs NetBSD!
State-Changed-From-To: open->closed 
State-Changed-By: ijliao 
State-Changed-When: Sun Dec 22 09:16:53 PST 2002 
State-Changed-Why:  
committed, thanks 

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