Bug 45900 - security/sfs conflicts with bison 1.75 [patch included]
Summary: security/sfs conflicts with bison 1.75 [patch included]
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-ports (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2002-12-01 19:10 UTC by Miguel Mendez
Modified: 2002-12-22 17:17 UTC (History)
0 users

See Also:


Attachments
sfs.diff (491 bytes, patch)
2002-12-01 19:10 UTC, Miguel Mendez
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Miguel Mendez 2002-12-01 19:10:01 UTC
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.
Comment 1 Miguel Mendez 2002-12-01 22:52:59 UTC
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!
Comment 2 Ying-Chieh Liao freebsd_committer freebsd_triage 2002-12-22 17:16:53 UTC
State Changed
From-To: open->closed

committed, thanks