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: 12-Apr-2008 18:56:23
Branch: HEAD Handle: 2008041217562200
Modified files:
openpkg-src/milter-greylist
milter-greylist.patch milter-greylist.spec
Log:
upgrading package: milter-greylist 4.0rc2 -> 4.1.1
Summary:
Revision Changes Path
1.12 +19 -61 openpkg-src/milter-greylist/milter-greylist.patch
1.27 +4 -3 openpkg-src/milter-greylist/milter-greylist.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/milter-greylist/milter-greylist.patch
============================================================================
$ cvs diff -u -r1.11 -r1.12 milter-greylist.patch
--- openpkg-src/milter-greylist/milter-greylist.patch 8 May 2007 07:36:04
-0000 1.11
+++ openpkg-src/milter-greylist/milter-greylist.patch 12 Apr 2008 16:56:22
-0000 1.12
@@ -1,6 +1,6 @@
Index: acl.c
---- acl.c.orig 2007-04-16 04:39:10 +0200
-+++ acl.c 2007-05-08 09:28:07 +0200
+--- acl.c.orig 2007-11-11 12:57:19 +0100
++++ acl.c 2008-04-12 18:50:04 +0200
@@ -58,7 +58,7 @@
#include <sys/stat.h>
#include <netinet/in.h>
@@ -8,11 +8,11 @@
-#include <regex.h>
+#include "pcreposix.h"
+ #include "spf.h"
#include "acl.h"
- #include "conf.h"
Index: acl.h
---- acl.h.orig 2007-03-22 06:39:16 +0100
-+++ acl.h 2007-05-08 09:28:07 +0200
+--- acl.h.orig 2007-11-11 12:57:19 +0100
++++ acl.h 2008-04-12 18:50:04 +0200
@@ -46,7 +46,7 @@
#include <sys/types.h>
#include <netinet/in.h>
@@ -23,8 +23,8 @@
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 2007-05-08 09:28:07 +0200
+--- list.c.orig 2007-11-06 12:39:33 +0100
++++ list.c 2008-04-12 18:50:04 +0200
@@ -45,7 +45,7 @@
#include <errno.h>
#include <sysexits.h>
@@ -35,8 +35,8 @@
#ifdef HAVE_OLD_QUEUE_H
#include "queue.h"
Index: macro.c
---- macro.c.orig 2007-03-26 21:29:04 +0200
-+++ macro.c 2007-05-08 09:28:07 +0200
+--- macro.c.orig 2007-11-06 12:39:33 +0100
++++ macro.c 2008-04-12 18:50:04 +0200
@@ -45,7 +45,7 @@
#include <syslog.h>
#include <errno.h>
@@ -47,8 +47,8 @@
#ifdef HAVE_OLD_QUEUE_H
#include "queue.h"
Index: milter-greylist.c
---- milter-greylist.c.orig 2007-05-06 06:49:29 +0200
-+++ milter-greylist.c 2007-05-08 09:28:07 +0200
+--- milter-greylist.c.orig 2007-12-29 20:06:49 +0100
++++ milter-greylist.c 2008-04-12 18:53:46 +0200
@@ -77,7 +77,7 @@
static int check_drac(char *dotted_ip);
#endif
@@ -57,18 +57,8 @@
+#include "milter/mfapi.h"
#include "dump.h"
- #include "acl.h"
-@@ -112,9 +112,7 @@
- static void cleanup_pidfile(char *);
- static void cleanup_sock(char *);
- static int mg_setreply(SMFICTX *, struct mlfi_priv *, char *);
--#ifndef USE_POSTFIX
- static char *local_ipstr(struct mlfi_priv *);
--#endif
- static sfsistat real_connect(SMFICTX *, char *, _SOCK_ADDR *);
- static sfsistat real_helo(SMFICTX *, char *);
- static sfsistat real_envfrom(SMFICTX *, char **);
-@@ -620,6 +618,10 @@
+ #include "spf.h"
+@@ -666,6 +666,10 @@
len = strlen(name) + strlen(sep) + strlen(value) + strlen(crlf);
priv->priv_msgcount += len;
@@ -79,7 +69,7 @@
if (priv->priv_msgcount > conf.c_maxpeek) {
if (conf.c_debug)
mg_log(LOG_DEBUG,
-@@ -1427,6 +1429,9 @@
+@@ -1489,6 +1493,9 @@
* Here we go!
*/
conf_release();
@@ -89,31 +79,7 @@
exitval = smfi_main();
mg_log(LOG_ERR, "smfi_main() returned %d", exitval);
-@@ -2450,15 +2455,9 @@
- }
-
- snprintf(output, HDRLEN,
--#ifndef USE_POSTFIX
- "milter-greylist-%s (%s [%s]); %s %s (%s)",
--#else
-- "milter-greylist-%s (%s); %s %s (%s)",
--#endif
- PACKAGE_VERSION, fqdn,
--#ifndef USE_POSTFIX
- local_ipstr(priv),
--#endif
- timestr, tzstr, tznamestr);
- mystrncat(&outstr, output, &outmaxlen);
- break;
-@@ -2805,7 +2804,6 @@
- return fstring;
- }
-
--#ifndef USE_POSTFIX
- static char *
- local_ipstr(priv)
- struct mlfi_priv *priv;
-@@ -2816,6 +2814,8 @@
+@@ -2897,6 +2904,8 @@
* Macro {if_addr} does not exist in Postfix
*/
ip = smfi_getsymval(priv->priv_ctx, "{if_addr}");
@@ -122,17 +88,9 @@
#ifdef AF_INET6
/*
* XXX: sendmail doesn't return {if_addr} when connection is
-@@ -2837,7 +2837,6 @@
-
- return ip;
- }
--#endif /* !USE_POSTFIX */
-
- static void
- set_sr_defaults(priv, code, ecode, msg)
Index: milter-greylist.h
---- milter-greylist.h.orig 2007-05-02 05:36:50 +0200
-+++ milter-greylist.h 2007-05-08 09:28:07 +0200
+--- milter-greylist.h.orig 2007-11-11 12:57:19 +0100
++++ milter-greylist.h 2008-04-12 18:50:04 +0200
@@ -37,7 +37,7 @@
#include <arpa/inet.h>
#include <netdb.h>
@@ -143,8 +101,8 @@
#include "dump.h"
Index: stat.c
---- stat.c.orig 2007-02-21 22:46:36 +0100
-+++ stat.c 2007-05-08 09:28:07 +0200
+--- stat.c.orig 2007-10-06 01:12:47 +0200
++++ stat.c 2008-04-12 18:50:04 +0200
@@ -52,7 +52,7 @@
#include <sys/queue.h>
#endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/milter-greylist/milter-greylist.spec
============================================================================
$ cvs diff -u -r1.26 -r1.27 milter-greylist.spec
--- openpkg-src/milter-greylist/milter-greylist.spec 1 Jan 2008 14:58:39
-0000 1.26
+++ openpkg-src/milter-greylist/milter-greylist.spec 12 Apr 2008 16:56:22
-0000 1.27
@@ -31,8 +31,8 @@
Class: EVAL
Group: Mail
License: BSD
-Version: 4.0rc2
-Release: 20080101
+Version: 4.1.1
+Release: 20080412
# package options
%option with_fsl yes
@@ -113,7 +113,8 @@
--with-libspf2=%{l_prefix} \
%endif
--with-user=%{l_rusr} \
- --enable-dnsrbl
+ --enable-dnsrbl \
+ --enable-postfix
# build program
%{l_make} %{l_mflags}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
