Hello community, here is the log from the commit of package mlmmj checked in at Wed May 2 19:57:50 CEST 2007. -------- --- mlmmj/mlmmj.changes 2007-04-17 12:01:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/mlmmj/mlmmj.changes 2007-05-02 16:30:35.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 2 16:27:24 CEST 2007 - dbahi@suse.de + +- added mlmmj-1.2.14-discard.patch + * Implemented discard for the access rules to be able to + drop unwanted mails without notification + +------------------------------------------------------------------- New: ---- mlmmj-1.2.14-discard.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mlmmj.spec ++++++ --- /var/tmp/diff_new_pack.Z16944/_old 2007-05-02 19:57:35.000000000 +0200 +++ /var/tmp/diff_new_pack.Z16944/_new 2007-05-02 19:57:35.000000000 +0200 @@ -14,12 +14,13 @@ License: X11/MIT Group: Productivity/Networking/Email/Mailinglists Version: 1.2.14 -Release: 1 +Release: 6 URL: http://mlmmj.mmj.dk/ Summary: Mail Server Independent Reimplementation of the EZMLM Mailing List Source0: %name-%version.tar.bz2 Patch0: rFastTemplate.diff Patch1: %{name}-1.2.11_subscriber_mmap.patch +Patch2: %{name}-1.2.14-discard.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: recode @@ -39,6 +40,7 @@ %setup -q %patch0 -p1 %patch1 +%patch2 -p1 %build ./configure --prefix=/usr --mandir=%_mandir @@ -67,6 +69,10 @@ /usr/share/%name %changelog +* Wed May 02 2007 - dbahi@suse.de +- added mlmmj-1.2.14-discard.patch + * Implemented discard for the access rules to be able to + drop unwanted mails without notification * Tue Apr 17 2007 - hvogel@suse.de - update to version 1.2.14 * Fixed a small memory leak in log_oper() log rotation ++++++ mlmmj-1.2.14-discard.patch ++++++ --- mlmmj-1.2.14.org/src/mlmmj-process.c 2007-04-13 10:00:24.000000000 +0200 +++ mlmmj-1.2.14/src/mlmmj-process.c 2007-04-13 10:44:23.000000000 +0200 @@ -56,14 +56,16 @@ enum action { ALLOW, DENY, - MODERATE + MODERATE, + DISCARD }; static char *action_strs[] = { "allowed", "denied", - "moderated" + "moderated", + "discarded", }; @@ -179,6 +181,9 @@ } else if (strncmp(rule_ptr, "moderate", 8) == 0) { rule_ptr += 8; act = MODERATE; + } else if (strncmp(rule_ptr, "discard", 7) == 0) { + rule_ptr += 7; + act = DISCARD; } else { errno = 0; log_error(LOG_ARGS, "Unable to parse rule #%d \"%s\":" @@ -896,6 +901,20 @@ exit(EXIT_FAILURE); } else if (accret == MODERATE) { moderated = 1; + } else if (accret == DISCARD) { + discardname = concatstr(3, listdir, + "/queue/discarded/", randomstr); + myfree(randomstr); + if(rename(donemailname, discardname) < 0) { + log_error(LOG_ARGS, "could not rename(%s,%s)", + donemailname, discardname); + myfree(donemailname); + myfree(discardname); + exit(EXIT_FAILURE); + } + myfree(donemailname); + myfree(discardname); + exit(EXIT_SUCCESS); } } --- mlmmj-1.2.14.org/README.access 2007-04-13 10:00:24.000000000 +0200 +++ mlmmj-1.2.14/README.access 2007-04-13 11:00:29.000000000 +0200 @@ -13,11 +13,11 @@ all headers are first tested against the first rule, then all headers are tested against the second rule, and so on. -The first rule to match a header decides which action to take - allow, deny -or moderate the post. +The first rule to match a header decides which action to take - allow, deny, +discard or moderate the post. The syntax is quite simple: action[ [!]regexp] -- "Action" can be "allow", "deny" or "moderate". +- "Action" can be "allow", "deny", "discard" or "moderate". - The optional "!" makes the rule a match, if NO header matches the regular expression. - "Regexp" is a POSIX.2 extended regular expression. Matching is done case ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org