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: 14-Feb-2007 21:12:34
Branch: HEAD Handle: 2007021420123400
Modified files:
openpkg-src/milter-greylist
milter-greylist.patch milter-greylist.spec
Log:
upgrading package: milter-greylist 3.1.4 -> 3.1.6
Summary:
Revision Changes Path
1.7 +61 -19 openpkg-src/milter-greylist/milter-greylist.patch
1.8 +2 -2 openpkg-src/milter-greylist/milter-greylist.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/milter-greylist/milter-greylist.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 milter-greylist.patch
--- openpkg-src/milter-greylist/milter-greylist.patch 22 Jan 2007 08:32:53
-0000 1.6
+++ openpkg-src/milter-greylist/milter-greylist.patch 14 Feb 2007 20:12:34
-0000 1.7
@@ -1,6 +1,6 @@
Index: acl.c
---- acl.c.orig 2007-01-16 06:10:37 +0100
-+++ acl.c 2007-01-22 09:26:17 +0100
+--- acl.c.orig 2007-02-14 06:39:16 +0100
++++ acl.c 2007-02-14 20:57:40 +0100
@@ -58,7 +58,7 @@
#include <sys/stat.h>
#include <netinet/in.h>
@@ -11,8 +11,8 @@
#include "acl.h"
#include "conf.h"
Index: acl.h
---- acl.h.orig 2007-01-10 11:54:26 +0100
-+++ acl.h 2007-01-22 09:26:17 +0100
+--- acl.h.orig 2007-02-05 07:05:34 +0100
++++ acl.h 2007-02-14 20:57:40 +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-01-22 09:26:17 +0100
++++ list.c 2007-02-14 20:57:40 +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-01-22 09:26:17 +0100
++++ macro.c 2007-02-14 20:57:40 +0100
@@ -45,7 +45,7 @@
#include <syslog.h>
#include <errno.h>
@@ -47,9 +47,19 @@
#ifdef HAVE_OLD_QUEUE_H
#include "queue.h"
Index: milter-greylist.c
---- milter-greylist.c.orig 2007-01-18 16:04:28 +0100
-+++ milter-greylist.c 2007-01-22 09:30:51 +0100
-@@ -635,6 +635,10 @@
+--- milter-greylist.c.orig 2007-02-14 06:12:40 +0100
++++ milter-greylist.c 2007-02-14 21:10:13 +0100
+@@ -107,9 +107,7 @@
+ static void add_recipient(struct mlfi_priv *, char *);
+ static void set_sr_defaults(struct mlfi_priv *, char *, char *, char *);
+ static sfsistat stat_from_code(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 **);
+@@ -649,6 +647,10 @@
len = strlen(name) + strlen(sep) + strlen(value) + strlen(crlf);
priv->priv_msgcount += len;
@@ -60,16 +70,7 @@
if (priv->priv_msgcount > conf.c_maxpeek) {
mg_log(LOG_DEBUG, "ignoring message beyond maxpeek = %d",
conf.c_maxpeek);
-@@ -849,6 +853,8 @@
- * Macro {if_addr} does not exist in Postfix
- */
- ip = smfi_getsymval(ctx, "{if_addr}");
-+#else
-+ ip = smfi_getsymval(ctx, "{client_addr}");
- #endif
- #ifdef AF_INET6
- /*
-@@ -1445,6 +1451,9 @@
+@@ -1452,6 +1454,9 @@
* Here we go!
*/
conf_release();
@@ -79,3 +80,44 @@
exitval = smfi_main();
mg_log(LOG_ERR, "smfi_main() returned %d", exitval);
+@@ -2443,15 +2448,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;
+@@ -2791,7 +2790,6 @@
+ return fstring;
+ }
+
+-#ifndef USE_POSTFIX
+ static char *
+ local_ipstr(priv)
+ struct mlfi_priv *priv;
+@@ -2802,6 +2800,8 @@
+ * Macro {if_addr} does not exist in Postfix
+ */
+ ip = smfi_getsymval(priv->priv_ctx, "{if_addr}");
++ if (ip == NULL)
++ ip = smfi_getsymval(priv->priv_ctx, "{client_addr}");
+ #ifdef AF_INET6
+ /*
+ * XXX: sendmail doesn't return {if_addr} when connection is
+@@ -2823,7 +2823,6 @@
+
+ return ip;
+ }
+-#endif /* !USE_POSTFIX */
+
+ static void
+ set_sr_defaults(priv, code, ecode, msg)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/milter-greylist/milter-greylist.spec
============================================================================
$ cvs diff -u -r1.7 -r1.8 milter-greylist.spec
--- openpkg-src/milter-greylist/milter-greylist.spec 22 Jan 2007 08:32:53
-0000 1.7
+++ openpkg-src/milter-greylist/milter-greylist.spec 14 Feb 2007 20:12:34
-0000 1.8
@@ -32,8 +32,8 @@
Class: EVAL
Group: Mail
License: BSD
-Version: 3.1.4
-Release: 20070122
+Version: 3.1.6
+Release: 20070214
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
