head	1.3;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.2
	OPENPKG_E1_MP:1.2
	OPENPKG_E1_MP_2_STABLE:1.1.2.2
	OPENPKG_E1_FP:1.1.2.2
	OPENPKG_2_STABLE_MP:1.1
	OPENPKG_2_STABLE_20061018:1.1.2.2
	OPENPKG_2_STABLE:1.1.0.2;
locks; strict;
comment	@# @;


1.3
date	2007.03.02.09.33.38;	author rse;	state Exp;
branches;
next	1.2;
commitid	mO48su96MuoaRu8s;

1.2
date	2006.12.30.11.19.42;	author rse;	state Exp;
branches;
next	1.1;
commitid	35Zpx9mM0WV6rx0s;

1.1
date	2006.09.18.06.36.43;	author rse;	state Exp;
branches
	1.1.2.1;
next	;
commitid	MvBQco7C2zLibhNr;

1.1.2.1
date	2006.09.18.06.36.43;	author rse;	state dead;
branches;
next	1.1.2.2;
commitid	iZxwRSmmWscPXUQr;

1.1.2.2
date	2006.10.16.14.52.47;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.3
log
@unbreak under runtime (version mismatch) by including the OpenPKG (and not the system) MILTER API
@
text
@Index: eval.h
--- eval.h.orig	2004-10-29 16:48:41 +0200
+++ eval.h	2007-03-02 10:29:23 +0100
@@@@ -33,7 +33,7 @@@@
 #ifndef _EVAL_H_
 #define _EVAL_H_
 
-#include <regex.h>
+#include "pcreposix.h"
 
 enum { VAL_UNDEF=0, VAL_TRUE, VAL_FALSE };
 enum { COND_CONNECT, COND_HELO, COND_ENVFROM, COND_ENVRCPT,
Index: milter-regex.c
--- milter-regex.c.orig	2005-03-06 12:42:53 +0100
+++ milter-regex.c	2007-03-02 10:29:34 +0100
@@@@ -49,7 +49,7 @@@@
 #ifdef __linux__
 #include <grp.h>
 #endif
-#include <libmilter/mfapi.h>
+#include "milter/mfapi.h"
 
 #include "eval.h"
 
Index: parse.y
--- parse.y.orig	2004-10-29 16:48:42 +0200
+++ parse.y	2007-03-02 10:29:47 +0100
@@@@ -39,12 +39,11 @@@@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <libmilter/mfapi.h>
+#include "milter/mfapi.h"
 
 #include "eval.h"
 
 int			 yyerror(char *, ...);
-static int		 yyparse(void);
 static int		 define_macro(const char *, struct expr *);
 static struct expr	*find_macro(const char *);
 
@


1.2
log
@use PCRE for matching
@
text
@d3 1
a3 1
+++ eval.h	2006-12-30 12:16:17 +0100
d13 12
d27 8
a34 2
+++ parse.y	2006-12-30 12:16:01 +0100
@@@@ -44,7 +44,6 @@@@
@


1.1
log
@use all-caps Summary; use regular name instead of email in Vendor; class can be EVAL as packaging is complete; fix incorrect declaration of yyparse(); adjust style of dependencies; fix YACC dependency (bison doesn't provide byacc); fix URL in %track section; cleanup regex in substitution; cleanup style of build procedure to be more aligned with most of the other OpenPKG packages instead of some nasty ones; no need to strip(1) as we manually install via 'shtool install -s'; change run-time from super-user to restricted user; make sure the daemon is stopped and restarted on erase and upgrade; cleanup rc file (move internal variables to %config section; rm -rf not required for a file, use simple restart without temporary files, etc); cleanup OSSP fsl configuration: there is no prefix on the openlog() argument we have to match with .*
@
text
@d1 12
d14 2
a15 2
--- parse.y.orig	2004-02-26 12:29:42 +0100
+++ parse.y	2006-09-18 08:14:37 +0200
@


1.1.2.1
log
@file milter-regex.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:52:47 +0000
@
text
@d1 11
@


1.1.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 11
Index: parse.y
--- parse.y.orig	2004-02-26 12:29:42 +0100
+++ parse.y	2006-09-18 08:14:37 +0200
@@@@ -44,7 +44,6 @@@@
 #include "eval.h"
 
 int			 yyerror(char *, ...);
-static int		 yyparse(void);
 static int		 define_macro(const char *, struct expr *);
 static struct expr	*find_macro(const char *);
 
@