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: 31-Dec-2006 13:59:01
Branch: HEAD Handle: 2006123112590100
Modified files:
openpkg-src/milter-greylist
greylist.conf milter-greylist.patch
milter-greylist.spec
Log:
Berkeley-DB is required for DRAC only (which we don't use); use PCRE
for regex matching; configure timeouts
Summary:
Revision Changes Path
1.8 +18 -12 openpkg-src/milter-greylist/greylist.conf
1.5 +50 -2 openpkg-src/milter-greylist/milter-greylist.patch
1.5 +4 -4 openpkg-src/milter-greylist/milter-greylist.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/milter-greylist/greylist.conf
============================================================================
$ cvs diff -u -r1.7 -r1.8 greylist.conf
--- openpkg-src/milter-greylist/greylist.conf 31 Dec 2006 12:31:31 -0000
1.7
+++ openpkg-src/milter-greylist/greylist.conf 31 Dec 2006 12:59:01 -0000
1.8
@@ -3,19 +3,25 @@
##
# daemon parameters
-user "@l_rusr@:@l_mgrp@"
-pidfile "@l_prefix@/var/milter-greylist/milter-greylist.pid"
-socket "@l_prefix@/var/milter-greylist/milter-greylist.socket"
-dumpfile "@l_prefix@/var/milter-greylist/milter-greylist.db"
+user "@l_rusr@:@l_mgrp@"
+pidfile "@l_prefix@/var/milter-greylist/milter-greylist.pid"
+socket "@l_prefix@/var/milter-greylist/milter-greylist.socket"
+
+# database storage
+dumpfile "@l_prefix@/var/milter-greylist/milter-greylist.dump"
+dumpfreq 10m
# database synchronization
-#syncaddr 192.168.0.1 port 5252
-#syncsrcaddr 192.168.0.1
-#peer 192.168.0.2
-
-# run-time behaviour
-#quiet
-report delays
+#syncaddr 192.168.0.1 port 5252
+#syncsrcaddr 192.168.0.1
+#peer 192.168.0.2
+
+# greylisting behaviour
+extendedregex
+report delays
+greylist 5m
+autowhite 3d
+timeout 5d
# access control list definition: my own networks (by address)
list "my networks by address" addr { \
@@ -182,5 +188,5 @@
racl whitelist list "broken peers by domain"
racl whitelist list "broken peers by address"
racl whitelist list "non-greylisted recipients"
-racl greylist default delay 5m autowhite 3d
+racl greylist default
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/milter-greylist/milter-greylist.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 milter-greylist.patch
--- openpkg-src/milter-greylist/milter-greylist.patch 31 Dec 2006 11:56:55
-0000 1.4
+++ openpkg-src/milter-greylist/milter-greylist.patch 31 Dec 2006 12:59:01
-0000 1.5
@@ -1,6 +1,54 @@
+Index: acl.c
+--- acl.c.orig 2006-12-31 00:34:35 +0100
++++ acl.c 2006-12-31 13:34:57 +0100
+@@ -58,7 +58,7 @@
+ #include <sys/stat.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+-#include <regex.h>
++#include "pcreposix.h"
+
+ #include "acl.h"
+ #include "conf.h"
+Index: acl.h
+--- acl.h.orig 2006-12-29 19:32:44 +0100
++++ acl.h 2006-12-31 13:34:57 +0100
+@@ -46,7 +46,7 @@
+ #include <sys/types.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+-#include <regex.h>
++#include "pcreposix.h"
+
+ typedef enum { A_GREYLIST, A_WHITELIST, A_BLACKLIST, } acl_type_t;
+ 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 2006-12-31 13:34:57 +0100
+@@ -45,7 +45,7 @@
+ #include <errno.h>
+ #include <sysexits.h>
+ #include <sys/types.h>
+-#include <regex.h>
++#include "pcreposix.h"
+
+ #ifdef HAVE_OLD_QUEUE_H
+ #include "queue.h"
+Index: macro.c
+--- macro.c.orig 2006-12-29 19:32:44 +0100
++++ macro.c 2006-12-31 13:35:12 +0100
+@@ -45,7 +45,7 @@
+ #include <syslog.h>
+ #include <errno.h>
+ #include <sysexits.h>
+-#include <regex.h>
++#include "pcreposix.h"
+
+ #ifdef HAVE_OLD_QUEUE_H
+ #include "queue.h"
Index: milter-greylist.8
--- milter-greylist.8.orig 2006-08-30 22:50:42 +0200
-+++ milter-greylist.8 2006-12-31 12:39:02 +0100
++++ milter-greylist.8 2006-12-31 13:34:57 +0100
@@ -46,7 +46,7 @@
[\fB-r\fR]
[\fB-S\fR]
@@ -35,7 +83,7 @@
Matthieu Herrb,
Index: milter-greylist.c
--- milter-greylist.c.orig 2006-12-29 19:32:44 +0100
-+++ milter-greylist.c 2006-12-31 12:41:45 +0100
++++ milter-greylist.c 2006-12-31 13:34:57 +0100
@@ -334,7 +334,9 @@
priv = (struct mlfi_priv *) smfi_getpriv(ctx);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/milter-greylist/milter-greylist.spec
============================================================================
$ cvs diff -u -r1.4 -r1.5 milter-greylist.spec
--- openpkg-src/milter-greylist/milter-greylist.spec 31 Dec 2006 10:00:44
-0000 1.4
+++ openpkg-src/milter-greylist/milter-greylist.spec 31 Dec 2006 12:59:01
-0000 1.5
@@ -52,8 +52,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20060823, bison, flex, pkgconfig
PreReq: OpenPKG, openpkg >= 20060823
-BuildPreReq: milter, db
-PreReq: milter, db
+BuildPreReq: milter, pcre
+PreReq: milter, pcre
%if "%{with_fsl}" == "yes"
BuildPreReq: fsl >= 1.2.0
PreReq: fsl >= 1.2.0
@@ -101,12 +101,12 @@
LDFLAGS="$LDFLAGS `pkg-config libcurl --libs-only-other`"
LIBS="$LIBS `pkg-config libcurl --libs-only-l`"
%endif
+ LIBS="$LIBS -lpcreposix -lpcre"
sh ./configure \
--prefix=%{l_prefix} \
--with-conffile=%{l_prefix}/etc/milter-greylist/greylist.conf \
- --with-dumpfile=%{l_prefix}/var/milter-greylist/greylist.db \
+ --with-dumpfile=%{l_prefix}/var/milter-greylist/greylist.dump \
--with-libmilter=%{l_prefix} \
- --with-db=%{l_prefix} \
%if "%{with_curl}" == "yes"
--with-libcurl=%{l_prefix} \
%endif
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
