OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 02-Mar-2007 10:31:41
Branch: HEAD Handle: 2007030209314000
Modified files:
openpkg-src/milter-greylist
milter-greylist.patch milter-greylist.spec
Log:
unbreak under runtime (version mismatch) by including the OpenPKG (and
not the system) MILTER API
Summary:
Revision Changes Path
1.8 +38 -5 openpkg-src/milter-greylist/milter-greylist.patch
1.9 +1 -1 openpkg-src/milter-greylist/milter-greylist.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/milter-greylist/milter-greylist.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 milter-greylist.patch
--- openpkg-src/milter-greylist/milter-greylist.patch 14 Feb 2007 20:12:34
-0000 1.7
+++ openpkg-src/milter-greylist/milter-greylist.patch 2 Mar 2007 09:31:40
-0000 1.8
@@ -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 @@
#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 @@
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 @@
#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 @@
#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 @@
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"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/milter-greylist/milter-greylist.spec
============================================================================
$ cvs diff -u -r1.8 -r1.9 milter-greylist.spec
--- openpkg-src/milter-greylist/milter-greylist.spec 14 Feb 2007 20:12:34
-0000 1.8
+++ openpkg-src/milter-greylist/milter-greylist.spec 2 Mar 2007 09:31:40
-0000 1.9
@@ -33,7 +33,7 @@
Group: Mail
License: BSD
Version: 3.1.6
-Release: 20070214
+Release: 20070302
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
