Index: head/security/keynote/Makefile =================================================================== --- head/security/keynote/Makefile (revision 412563) +++ head/security/keynote/Makefile (revision 412564) @@ -1,41 +1,43 @@ # Created by: Stefan Esser # $FreeBSD$ PORTNAME= keynote PORTVERSION= 2.3 PORTREVISION= 2 CATEGORIES= security MASTER_SITES= http://www1.cs.columbia.edu/~angelos/Code/ MAINTAINER= ports@FreeBSD.org COMMENT= Trust-Management System LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= gmake # required to support parallel (-jX) builds USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_ENV= SSLEAY="${OPENSSLBASE}/bin" OPENSSLLIB="${OPENSSLLIB}" \ OPENSSLINC="${OPENSSLINC}" PLIST_FILES= bin/keynote include/keynote.h lib/libkeynote.a \ man/man1/keynote.1.gz man/man3/keynote.3.gz \ man/man5/keynote.5.gz PORTDOCS= * OPTIONS_DEFINE= DOCS do-install: ${INSTALL_PROGRAM} ${WRKSRC}/keynote ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/keynote.h ${STAGEDIR}${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/libkeynote.a ${STAGEDIR}${PREFIX}/lib ${INSTALL_MAN} ${WRKSRC}/man/keynote.1 ${STAGEDIR}${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/man/keynote.3 ${STAGEDIR}${MANPREFIX}/man/man3 ${INSTALL_MAN} ${WRKSRC}/man/keynote.4 \ ${STAGEDIR}${MANPREFIX}/man/man5/keynote.5 + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/HOWTO.add.crypto ${WRKSRC}/TODO \ ${WRKSRC}/doc/rfc*.txt ${STAGEDIR}${DOCSDIR} .include Index: head/security/keynote/files/patch-Makefile.in =================================================================== --- head/security/keynote/files/patch-Makefile.in (revision 412563) +++ head/security/keynote/files/patch-Makefile.in (revision 412564) @@ -1,23 +1,23 @@ ---- Makefile.in.orig Mon Nov 29 11:36:21 1999 -+++ Makefile.in Fri Mar 24 19:22:32 2000 -@@ -41,7 +41,7 @@ +--- Makefile.in.orig 2000-09-26 23:16:27 UTC ++++ Makefile.in +@@ -41,7 +41,7 @@ YACCFLAGS2 = -d -p kv -b z YACCFLAGS = -d -p kn -b k LEXFLAGS2 = -Pkv -s -i LEXFLAGS = -Cr -Pkn -s -i -CFLAGS = -O2 -Wall # -g +CFLAGS ?= -O2 -Wall # -g RMFLAGS2 = -rf RMFLAGS = -f NROFFFLAGS = -mandoc -@@ -87,9 +87,11 @@ +@@ -87,9 +87,11 @@ $(TARGET2): $(TARGET) $(OBJS2) k.tab.c: keynote.y header.h keynote.h assertion.h config.h $(YACC) $(YACCFLAGS) keynote.y +k.tab.h: | k.tab.c z.tab.c: keynote-ver.y keynote.h header.h config.h $(YACC) $(YACCFLAGS2) keynote-ver.y +z.tab.h: | z.tab.c lex.kn.c: keynote.l k.tab.h header.h keynote.h assertion.h config.h $(LEX) $(LEXFLAGS) keynote.l Index: head/security/keynote/files/patch-configure =================================================================== --- head/security/keynote/files/patch-configure (revision 412563) +++ head/security/keynote/files/patch-configure (revision 412564) @@ -1,21 +1,21 @@ ---- configure.orig Wed Oct 20 22:04:39 1999 -+++ configure Fri Mar 24 19:38:46 2000 -@@ -1256,7 +1256,7 @@ +--- configure.orig 2000-09-26 23:16:28 UTC ++++ configure +@@ -1256,7 +1256,7 @@ else fi -LIBS="-L/usr/lib -L/usr/local/lib -L/usr/ssl/lib -L/usr/openssl/lib\ +LIBS="-L/usr/lib -L/usr/local/lib -L${OPENSSLLIB} -L/usr/ssl/lib -L/usr/openssl/lib\ -L/usr/local/ssl/lib -L/usr/local/openssl/lib -L/usr/pkg/lib -L/pkg/lib" echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6 -@@ -1421,7 +1421,8 @@ +@@ -1421,7 +1421,8 @@ fi CPPFLAGS="-I/usr/include -I/usr/local/include -I/usr/ssl/include\ - -I/usr/local/ssl/include -I/usr/openssl/include -I/usr/pkg/include\ + -I/usr/local/ssl/include -I${OPENSSLINC}\ + -I/usr/openssl/include -I/usr/pkg/include\ -I/usr/local/openssl/include -I/pkg/include" echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 Index: head/security/keynote/files/patch-keynote-ver.y =================================================================== --- head/security/keynote/files/patch-keynote-ver.y (revision 412563) +++ head/security/keynote/files/patch-keynote-ver.y (revision 412564) @@ -1,20 +1,20 @@ ---- keynote-ver-orig.y Tue Oct 12 00:34:29 1999 -+++ keynote-ver.y Wed May 28 14:47:32 2003 -@@ -48,7 +48,7 @@ +--- keynote-ver.y.orig 1999-10-11 22:34:29 UTC ++++ keynote-ver.y +@@ -48,7 +48,7 @@ program: expr | STRING { if (kn_add_authorizer(sessid, $1) != 0) return keynote_errno; free($1); - } + }; expr: VSTRING EQ STRING { int i = kn_add_action(sessid, $1, $3, 0); -@@ -63,7 +63,7 @@ +@@ -63,7 +63,7 @@ expr: VSTRING EQ STRING { int i = k return i; free($1); free($3); - } expr + } expr ; %% void kverror(char *s) Index: head/security/keynote/files/patch-keynote.y =================================================================== --- head/security/keynote/files/patch-keynote.y (revision 412563) +++ head/security/keynote/files/patch-keynote.y (revision 412564) @@ -1,164 +1,164 @@ ---- keynote-orig.y Wed Jun 14 08:28:23 2000 -+++ keynote.y Wed May 28 14:47:32 2003 -@@ -90,17 +90,17 @@ +--- keynote.y.orig 2000-06-14 06:28:23 UTC ++++ keynote.y +@@ -90,17 +90,17 @@ grammarswitch: LOCINI { keynote_exceptio | PRIVATEKEY { keynote_exceptionflag = keynote_donteval = 0; } STRING { keynote_lex_remove($3); keynote_privkey = $3; - } + }; keypredicate: /* Nothing */ { keynote_returnvalue = 0; return 0; } | notemptykeypredicate { keynote_returnvalue = $1; return 0; - } + }; notemptykeypredicate: key { $$ = $1; } - | keyexp { $$ = $1; } + | keyexp { $$ = $1; }; keyexp: notemptykeypredicate AND { if (($1 == 0) && !keynote_justrecord) keynote_donteval = 1; -@@ -137,7 +137,7 @@ +@@ -137,7 +137,7 @@ keyexp: notemptykeypredicate AND { if (( $$ = get_kth($1); else $$ = 0; - } /* K-th */ + }; /* K-th */ keylist: key { /* Don't do anything if we're just recording */ -@@ -154,7 +154,7 @@ +@@ -154,7 +154,7 @@ keylist: key keynote_kth_array[$1]++; keylistcount++; - } + }; key: str { if (keynote_donteval) -@@ -192,10 +192,10 @@ +@@ -192,10 +192,10 @@ key: str { break; } } - } + }; localinit: /* Nothing */ - | localconstants + | localconstants; localconstants: VARIABLE EQQ STRING { -@@ -264,12 +264,12 @@ +@@ -264,12 +264,12 @@ localconstants: VARIABLE EQQ STRING if (i != RESULT_TRUE) return -1; - } localconstants + } localconstants ; program: prog { keynote_returnvalue = $1; return 0; - } + }; prog: /* Nada */ { $$ = 0; } | notemptyprog { -@@ -284,7 +284,7 @@ +@@ -284,7 +284,7 @@ prog: /* Nada */ { $$ = 0; } $$ = $1; else $$ = $4; - } + }; notemptyprog: expr HINT afterhint { -@@ -299,7 +299,7 @@ +@@ -299,7 +299,7 @@ notemptyprog: expr HINT afterhint $$ = keynote_current_session->ks_values_num - 1; else $$ = 0; - } + }; afterhint: str { if (keynote_exceptionflag || keynote_donteval) $$ = 0; -@@ -314,7 +314,7 @@ +@@ -314,7 +314,7 @@ afterhint: str { if (keynote_exceptionf free($1); } } - | OPENBLOCK prog CLOSEBLOCK { $$ = $2; } + | OPENBLOCK prog CLOSEBLOCK { $$ = $2; }; expr: OPENPAREN expr CLOSEPAREN { $$ = $2; } -@@ -333,19 +333,19 @@ +@@ -333,19 +333,19 @@ expr: OPENPAREN expr CLOSEPAREN { $ | floatexp { $$ = $1; } | stringexp { $$ = $1; } | TRUE { $$ = 1; } - | FALSE { $$ = 0; } + | FALSE { $$ = 0; }; numexp: numex LT numex { $$ = $1 < $3; } | numex GT numex { $$ = $1 > $3; } | numex EQ numex { $$ = $1 == $3; } | numex LE numex { $$ = $1 <= $3; } | numex GE numex { $$ = $1 >= $3; } - | numex NE numex { $$ = $1 != $3; } + | numex NE numex { $$ = $1 != $3; }; floatexp: floatex LT floatex { $$ = $1 < $3; } | floatex GT floatex { $$ = $1 > $3; } | floatex LE floatex { $$ = $1 <= $3; } - | floatex GE floatex { $$ = $1 >= $3; } + | floatex GE floatex { $$ = $1 >= $3; }; numex: numex PLUS numex { $$ = $1 + $3; } | numex MINUS numex { $$ = $1 - $3; } -@@ -383,7 +383,7 @@ +@@ -383,7 +383,7 @@ numex: numex PLUS numex { $$ = $1 + $ $$ = (int) floor(atof($2)); free($2); } - } + }; floatex: floatex PLUS floatex { $$ = ($1 + $3); } | floatex MINUS floatex { $$ = ($1 - $3); } -@@ -417,7 +417,7 @@ +@@ -417,7 +417,7 @@ floatex: floatex PLUS floatex { $$ = $$ = atof($2); free($2); } - } + }; stringexp: str EQ str { if (keynote_exceptionflag || keynote_donteval) -@@ -578,7 +578,7 @@ +@@ -578,7 +578,7 @@ stringexp: str EQ str { free($1); } } - } + }; str: str DOTT str { if (keynote_exceptionflag || keynote_donteval) $$ = (char *) NULL; -@@ -604,7 +604,7 @@ +@@ -604,7 +604,7 @@ str: str DOTT str { if (keynote_exce return -1; } } - | strnotconcat { $$ = $1; } + | strnotconcat { $$ = $1; }; strnotconcat: STRING { $$ = $1; } | OPENPAREN str CLOSEPAREN { $$ = $2; } -@@ -659,7 +659,7 @@ +@@ -659,7 +659,7 @@ strnotconcat: STRING { if (keynote_lex_add($$, LEXTYPE_CHAR) == -1) return -1; } - } + }; %% /* Index: head/security/keynote/files/patch-man__keynote.4 =================================================================== --- head/security/keynote/files/patch-man__keynote.4 (revision 412563) +++ head/security/keynote/files/patch-man__keynote.4 (revision 412564) @@ -1,11 +1,11 @@ ---- man/keynote.4.orig Tue Sep 26 16:16:32 2000 -+++ man/keynote.4 Sat Dec 1 01:52:33 2001 +--- man/keynote.4.orig 2000-09-26 23:16:32 UTC ++++ man/keynote.4 @@ -20,7 +20,7 @@ .\" PURPOSE. .\" .Dd May 22, 1999 -.Dt KEYNOTE 4 +.Dt KEYNOTE 5 .\" .TH KeyNote 4 local .Os .Sh NAME