unbreak under runtime (version mismatch) by including the OpenPKG (and not the system) MILTER API

milter-dk/milter-dk.patch

@@ -1,6 +1,15 @@
 Index: dk-filter/dk-filter.c
 --- dk-filter/dk-filter.c.orig	2006-05-19 23:42:05 +0200
-+++ dk-filter/dk-filter.c	2006-12-30 13:41:07 +0100
++++ dk-filter/dk-filter.c	2007-03-02 10:26:32 +0100
+@@ -61,7 +61,7 @@
+ 
+ /* libmilter includes */
+ #ifndef DEBUG
+-#include "libmilter/mfapi.h"
++#include "milter/mfapi.h"
+ #endif /* !DEBUG */
+ 
+ /* libdk includes */
 @@ -2076,6 +2076,13 @@
  	dfc = cc->cctx_msg;
  	assert(dfc != NULL);

milter-dk/milter-dk.spec

@@ -33,7 +33,7 @@ Class:        EVAL
 Group:        Mail
 License:      Open Source
 Version:      0.4.1
-Release:      20061230
+Release:      20070302
 
 #   package options
 %option       with_fsl  yes

milter-dkim/milter-dkim.patch

@@ -1,7 +1,16 @@
 Index: dkim-filter/dkim-filter.c
---- dkim-filter/dkim-filter.c.orig	2006-09-12 23:46:30 +0200
-+++ dkim-filter/dkim-filter.c	2006-12-30 22:15:17 +0100
-@@ -2308,6 +2308,13 @@
+--- dkim-filter/dkim-filter.c.orig	2007-03-01 22:16:43 +0100
++++ dkim-filter/dkim-filter.c	2007-03-02 10:24:31 +0100
+@@ -62,7 +62,7 @@
+ 
+ /* libmilter includes */
+ #ifndef DEBUG
+-#include "libmilter/mfapi.h"
++#include "milter/mfapi.h"
+ #endif /* !DEBUG */
+ 
+ /* libdkim includes */
+@@ -2407,6 +2407,13 @@
  		}
  	}
  

milter-greylist/milter-greylist.patch

@@ -1,6 +1,6 @@
 Index: acl.c
 --- acl.c.orig	2007-02-14 06:39:16 +0100
-+++ acl.c	2007-02-14 20:57:40 +0100
++++ acl.c	2007-03-02 10:28:02 +0100
 @@ -58,7 +58,7 @@
  #include <sys/stat.h>
  #include <netinet/in.h>
@@ -12,7 +12,7 @@ Index: acl.c
  #include "conf.h"
 Index: acl.h
 --- acl.h.orig	2007-02-05 07:05:34 +0100
-+++ acl.h	2007-02-14 20:57:40 +0100
++++ acl.h	2007-03-02 10:28:02 +0100
 @@ -46,7 +46,7 @@
  #include <sys/types.h>
  #include <netinet/in.h>
@@ -24,7 +24,7 @@ Index: acl.h
  typedef enum { AS_NONE, AS_RCPT, AS_DATA, AS_ANY, } acl_stage_t;
 Index: list.c
 --- list.c.orig	2006-12-29 19:32:44 +0100
-+++ list.c	2007-02-14 20:57:40 +0100
++++ list.c	2007-03-02 10:28:02 +0100
 @@ -45,7 +45,7 @@
  #include <errno.h>
  #include <sysexits.h>
@@ -36,7 +36,7 @@ Index: list.c
  #include "queue.h"
 Index: macro.c
 --- macro.c.orig	2006-12-29 19:32:44 +0100
-+++ macro.c	2007-02-14 20:57:40 +0100
++++ macro.c	2007-03-02 10:28:02 +0100
 @@ -45,7 +45,7 @@
  #include <syslog.h>
  #include <errno.h>
@@ -48,7 +48,16 @@ Index: macro.c
  #include "queue.h"
 Index: milter-greylist.c
 --- milter-greylist.c.orig	2007-02-14 06:12:40 +0100
-+++ milter-greylist.c	2007-02-14 21:10:13 +0100
++++ milter-greylist.c	2007-03-02 10:28:21 +0100
+@@ -77,7 +77,7 @@
+ static int check_drac(char *dotted_ip);
+ #endif
+ 
+-#include <libmilter/mfapi.h>
++#include "milter/mfapi.h"
+ 
+ #include "dump.h"
+ #include "acl.h"
 @@ -107,9 +107,7 @@
  static void add_recipient(struct mlfi_priv *, char *);
  static void set_sr_defaults(struct mlfi_priv *, char *, char *, char *);
@@ -121,3 +130,27 @@ Index: milter-greylist.c
  
  static void
  set_sr_defaults(priv, code, ecode, msg)
+Index: milter-greylist.h
+--- milter-greylist.h.orig	2007-02-05 07:05:34 +0100
++++ milter-greylist.h	2007-03-02 10:28:33 +0100
+@@ -37,7 +37,7 @@
+ #include <arpa/inet.h>
+ #include <netdb.h>
+ 
+-#include <libmilter/mfapi.h>
++#include "milter/mfapi.h"
+ #include "config.h"
+ #include "dump.h"
+ 
+Index: stat.c
+--- stat.c.orig	2007-01-01 18:29:29 +0100
++++ stat.c	2007-03-02 10:28:46 +0100
+@@ -52,7 +52,7 @@
+ #include <sys/queue.h>
+ #endif
+ 
+-#include <libmilter/mfapi.h>
++#include "milter/mfapi.h"
+ 
+ #include "milter-greylist.h"
+ #include "conf.h"

milter-greylist/milter-greylist.spec

@@ -33,7 +33,7 @@ Class:        EVAL
 Group:        Mail
 License:      BSD
 Version:      3.1.6
-Release:      20070214
+Release:      20070302
 
 #   package options
 %option       with_fsl  yes

milter-regex/milter-regex.patch

@@ -1,6 +1,6 @@
 Index: eval.h
 --- eval.h.orig	2004-10-29 16:48:41 +0200
-+++ eval.h	2006-12-30 12:16:17 +0100
++++ eval.h	2007-03-02 10:29:23 +0100
 @@ -33,7 +33,7 @@
  #ifndef _EVAL_H_
  #define _EVAL_H_
@@ -10,10 +10,28 @@ Index: eval.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	2006-12-30 12:16:01 +0100
-@@ -44,7 +44,6 @@
++++ 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 *, ...);

milter-regex/milter-regex.spec

@@ -33,7 +33,7 @@ Class:        EVAL
 Group:        Mail
 License:      BSD
 Version:      1.6
-Release:      20061230
+Release:      20070302
 
 #   package options
 %option       with_fsl  yes

milter-sa/milter-sa.patch

@@ -1,6 +1,28 @@
+Index: configure
+--- configure.orig	2006-04-05 18:00:01 +0200
++++ configure	2007-03-02 10:32:13 +0100
+@@ -7080,9 +7080,6 @@
+ 
+ 
+ # Check for libmilter and its header files in the usual locations
+-if test -d /usr/lib/libmilter ; then
+-	LDFLAGS="$LDFLAGS -L/usr/lib/libmilter"
+-fi
+ 
+ echo "$as_me:$LINENO: checking for mi_stop in -lmilter" >&5
+ echo $ECHO_N "checking for mi_stop in -lmilter... $ECHO_C" >&6
+@@ -7369,7 +7366,7 @@
+ fi
+ 
+ 
+-for ac_header in libmilter/mfapi.h
++for ac_header in milter/mfapi.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
 Index: spamass-milter.1.in
 --- spamass-milter.1.in.orig	2004-03-18 19:37:08 +0100
-+++ spamass-milter.1.in	2006-12-30 18:09:16 +0100
++++ spamass-milter.1.in	2007-03-02 10:30:55 +0100
 @@ -199,6 +199,9 @@
  Requires the
  .Fl u
@@ -13,7 +35,16 @@ Index: spamass-milter.1.in
  This allows you to connect to a remote spamd with
 Index: spamass-milter.cpp
 --- spamass-milter.cpp.orig	2006-03-23 22:41:36 +0100
-+++ spamass-milter.cpp	2006-12-30 18:09:16 +0100
++++ spamass-milter.cpp	2007-03-02 10:31:50 +0100
+@@ -100,7 +100,7 @@
+ extern "C" {
+ #endif
+ 
+-#include "libmilter/mfapi.h"
++#include "milter/mfapi.h"
+ //#include "libmilter/mfdef.h"
+ 
+ #if !HAVE_DECL_STRSEP
 @@ -170,6 +170,7 @@
  bool flag_full_email = false;		/* pass full email address to spamc */
  bool flag_expand = false;	/* alias/virtusertable expansion */

milter-sa/milter-sa.spec

@@ -33,7 +33,7 @@ Class:        EVAL
 Group:        Mail
 License:      GPL
 Version:      0.3.1
-Release:      20061230
+Release:      20070302
 
 #   package options
 %option       with_fsl  yes
@@ -75,9 +75,6 @@ AutoReqProv:  no
 
 %build
     #   configure program
-    %{l_shtool} subst \
-        -e 's;libmilter/mfapi;milter/mfapi;g' \
-        configure
     CC="%{l_cc}" \
     CXX="%{l_cxx}" \
     CFLAGS="%{l_cflags -O}" \

milter-sid/milter-sid.patch

@@ -1,6 +1,15 @@
 Index: sid-filter/sid-filter.c
 --- sid-filter/sid-filter.c.orig	2006-07-21 00:28:09 +0200
-+++ sid-filter/sid-filter.c	2006-12-30 13:48:35 +0100
++++ sid-filter/sid-filter.c	2007-03-02 10:35:06 +0100
+@@ -57,7 +57,7 @@
+ 
+ /* libmilter includes */
+ #ifndef DEBUG
+-# include <libmilter/mfapi.h>
++# include "milter/mfapi.h"
+ #endif /* !DEBUG */
+ 
+ /* libmarid includes */
 @@ -1949,6 +1949,12 @@
  	assert(ctx != NULL);
  #endif /* !DEBUG */

milter-sid/milter-sid.spec

@@ -33,7 +33,7 @@ Class:        EVAL
 Group:        Mail
 License:      Open Source
 Version:      0.2.14
-Release:      20061231
+Release:      20070302
 
 #   package options
 %option       with_fsl  yes
@@ -42,6 +42,7 @@ Release:      20061231
 Source0:      http://switch.dl.sourceforge.net/sid-milter/sid-milter-%{version}.tar.gz
 Source1:      rc.milter-sid
 Source2:      fsl.milter-sid
+Patch0:       milter-sid.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -70,6 +71,7 @@ AutoReqProv:  no
 
 %prep
     %setup -q -n sid-milter-%{version}
+    %patch -p0
 
 %build
     extlibs="%{l_fsl_libs}"