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: 22-Jan-2007 09:32:53
Branch: HEAD Handle: 2007012208325300
Modified files:
openpkg-src/milter-greylist
milter-greylist.patch milter-greylist.spec
Log:
upgrading package: milter-greylist 3.1.3 -> 3.1.4
Summary:
Revision Changes Path
1.6 +20 -102 openpkg-src/milter-greylist/milter-greylist.patch
1.7 +2 -2 openpkg-src/milter-greylist/milter-greylist.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/milter-greylist/milter-greylist.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 milter-greylist.patch
--- openpkg-src/milter-greylist/milter-greylist.patch 31 Dec 2006 12:59:01
-0000 1.5
+++ openpkg-src/milter-greylist/milter-greylist.patch 22 Jan 2007 08:32:53
-0000 1.6
@@ -1,6 +1,6 @@
Index: acl.c
---- acl.c.orig 2006-12-31 00:34:35 +0100
-+++ acl.c 2006-12-31 13:34:57 +0100
+--- acl.c.orig 2007-01-16 06:10:37 +0100
++++ acl.c 2007-01-22 09:26:17 +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 2006-12-29 19:32:44 +0100
-+++ acl.h 2006-12-31 13:34:57 +0100
+--- acl.h.orig 2007-01-10 11:54:26 +0100
++++ acl.h 2007-01-22 09:26:17 +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 2006-12-31 13:34:57 +0100
++++ list.c 2007-01-22 09:26:17 +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 2006-12-31 13:35:12 +0100
++++ macro.c 2007-01-22 09:26:17 +0100
@@ -45,7 +45,7 @@
#include <syslog.h>
#include <errno.h>
@@ -46,57 +46,12 @@
#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 13:34:57 +0100
-@@ -46,7 +46,7 @@
- [\fB-r\fR]
- [\fB-S\fR]
- [\fB-T\fR]
--[\fB-u \fIusername\fR]
-+[\fB-u \fIusername\fR[:\fIgroupname\fR]]
- [\fB-v\fR]
- [\fB-w \fIgreylist_delay\fR]
- [\fB-L \fIcidrmask\fR]
-@@ -235,10 +235,12 @@
- .I rcpt
- lines have been deprecated in favor of ACL, so do not use it.
- .TP
--.B -u \fIusername\fR
-+.B -u \fIusername\fR[:\fIgroupname\fR]
- Drop root privileges and switch to
- .I username
--credentials. Make sure this user has write access to
-+(and optionally
-+.IR groupname )
-+credentials. Make sure this user (and group) has write access to
- .I greylist.db\fR.
- Equivalent to the
- .I user
-@@ -308,6 +310,7 @@
- Alexandre Cherif,
- Eugene Crosser,
- Elrond,
-+Ralf S. Engelschall,
- Cyril Guibourg,
- Klas Heggemann,
- Matthieu Herrb,
Index: milter-greylist.c
---- milter-greylist.c.orig 2006-12-29 19:32:44 +0100
-+++ milter-greylist.c 2006-12-31 13:34:57 +0100
-@@ -334,7 +334,9 @@
- priv = (struct mlfi_priv *) smfi_getpriv(ctx);
-
- if ((priv->priv_queueid = smfi_getsymval(ctx, "{i}")) == NULL) {
-+#if 0
- mg_log(LOG_DEBUG, "smfi_getsymval failed for {i}");
-+#endif
- priv->priv_queueid = "(unknown id)";
- }
-
-@@ -618,6 +620,10 @@
-
- priv = (struct mlfi_priv *) smfi_getpriv(ctx);
+--- 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 @@
+ len = strlen(name) + strlen(sep) + strlen(value) + strlen(crlf);
+ priv->priv_msgcount += len;
+ if (priv->priv_queueid == NULL || strcmp(priv->priv_queueid, "(unknown
id)") == 0)
+ if ((priv->priv_queueid = smfi_getsymval(ctx, "{i}")) == NULL)
@@ -105,44 +60,16 @@
if (priv->priv_msgcount > conf.c_maxpeek) {
mg_log(LOG_DEBUG, "ignoring message beyond maxpeek = %d",
conf.c_maxpeek);
-@@ -820,6 +826,8 @@
- ip = "IPv6:::1";
- }
- #endif
-+ if (ip == NULL)
-+ ip = smfi_getsymval(ctx, "{client_addr}");
- if (ip == NULL) {
- mg_log(LOG_DEBUG, "smfi_getsymval failed for {if_addr}");
- ip = "0.0.0.0";
-@@ -1313,6 +1321,11 @@
+@@ -849,6 +853,8 @@
+ * Macro {if_addr} does not exist in Postfix
*/
- if (conf.c_user != NULL) {
- struct passwd *pw = NULL;
-+ struct group *gr = NULL;
-+ char *c_group = NULL;
-+
-+ if ((c_group = strchr(conf.c_user, ':')) != NULL)
-+ *c_group++ = '\0';
-
- if ((pw = getpwnam(conf.c_user)) == NULL) {
- mg_log(LOG_ERR, "%s: cannot get user %s data: %s",
-@@ -1320,6 +1333,15 @@
- exit(EX_OSERR);
- }
-
-+ if (c_group != NULL) {
-+ if ((gr = getgrnam(c_group)) == NULL) {
-+ mg_log(LOG_ERR, "%s: cannot get group %s data:
%s",
-+ argv[0], c_group, strerror(errno));
-+ exit(EX_OSERR);
-+ }
-+ pw->pw_gid = gr->gr_gid;
-+ }
-+
- #ifdef HAVE_INITGROUPS
- if (initgroups(conf.c_user, pw->pw_gid) != 0) {
- mg_log(LOG_ERR, "%s: cannot change "
-@@ -1370,6 +1392,9 @@
+ ip = smfi_getsymval(ctx, "{if_addr}");
++#else
++ ip = smfi_getsymval(ctx, "{client_addr}");
+ #endif
+ #ifdef AF_INET6
+ /*
+@@ -1445,6 +1451,9 @@
* Here we go!
*/
conf_release();
@@ -152,12 +79,3 @@
exitval = smfi_main();
mg_log(LOG_ERR, "smfi_main() returned %d", exitval);
-@@ -1396,7 +1421,7 @@
- mg_log(LOG_ERR,
- " [-f configfile] [-h] [-l] [-q] [-r] [-S] [-T]");
- mg_log(LOG_ERR,
-- " [-u username] [-v] [-w greylist_delay] [-L cidrmask]");
-+ " [-u username[:groupname]] [-v] [-w greylist_delay] [-L
cidrmask]");
- mg_log(LOG_ERR,
- " [-M prefixlen] [-P pidfile] -p socket");
- exit(EX_USAGE);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/milter-greylist/milter-greylist.spec
============================================================================
$ cvs diff -u -r1.6 -r1.7 milter-greylist.spec
--- openpkg-src/milter-greylist/milter-greylist.spec 1 Jan 2007 17:39:46
-0000 1.6
+++ openpkg-src/milter-greylist/milter-greylist.spec 22 Jan 2007 08:32:53
-0000 1.7
@@ -32,8 +32,8 @@
Class: EVAL
Group: Mail
License: BSD
-Version: 3.1.3
-Release: 20061231
+Version: 3.1.4
+Release: 20070122
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
