aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--NEWS11
-rw-r--r--configure.ac6
-rw-r--r--doc/mailfromd.texi8
-rw-r--r--src/main.c2
-rw-r--r--src/symtab.c2
6 files changed, 24 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index c8a53f27..e547c40e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-21 Sergey Poznyakoff <gray@gnu.org.ua>
+
+ * src/symtab.c: Ported r1584 from branches/gmach.
+ * NEWS: Update.
+ * doc/mailfromd.texi: Updated.
+ * configure.ac: Version 4.3 (preparing for the release).
+
2008-01-15 Sergey Poznyakoff <gray@gnu.org.ua>
Ported r1556 from branches/gmach.
diff --git a/NEWS b/NEWS
index 5408a5ce..f5dbfdec 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,11 @@
-Mailfromd NEWS -- history of user-visible changes. 2008-01-15
+Mailfromd NEWS -- history of user-visible changes. 2008-01-21
Copyright (C) 2005, 2006, 2007, 2008 Sergey Poznyakoff
See the end of file for copying conditions.
Please send mailfromd bug reports to <bug-mailfromd@gnu.org.ua>
-Version 4.2.90 (SVN)
+Version 4.3 (SVN)
* write built-in
@@ -30,9 +30,12 @@ interpreter.
Unless this option is given to ./configure, asynchronous syslog
implementation will not be compiled.
-* Fix compilation on Sun.
+* Bugfixes:
-* Fix header deletion (delete action).
+** Fix compilation on Sun.
+** Fix header deletion (delete action).
+** Variable shadowing was broken if a rehash happened between vardcl and
+ forget_autos.
Version 4.2, 2007-10-23
diff --git a/configure.ac b/configure.ac
index e817d177..056f46d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
# This file is part of mailfromd.
-# Copyright (C) 2005, 2006, 2007 Sergey Poznyakoff
+# Copyright (C) 2005, 2006, 2007, 2008 Sergey Poznyakoff
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -16,8 +16,8 @@
AC_PREREQ(2.59)
m4_define([MF_VERSION_MAJOR], 4)
-m4_define([MF_VERSION_MINOR], 2)
-m4_define([MF_VERSION_PATCH], 90)
+m4_define([MF_VERSION_MINOR], 3)
+dnl m4_define([MF_VERSION_PATCH], 0)
AC_INIT([mailfromd],
MF_VERSION_MAJOR.MF_VERSION_MINOR[]m4_ifdef([MF_VERSION_PATCH],.MF_VERSION_PATCH),
[bug-mailfromd@gnu.org.ua])
diff --git a/doc/mailfromd.texi b/doc/mailfromd.texi
index 6db9fd78..78ef7877 100644
--- a/doc/mailfromd.texi
+++ b/doc/mailfromd.texi
@@ -5171,8 +5171,8 @@ statements, declared in @samp{begin} blocks (see example below).
@cindex @samp{begin} and @code{delete}
@cindex @code{delete} in @samp{end}
@cindex @samp{end} and @code{delete}
-@item Header manipulation actions (@pxref{header manipulation}) can be
-used only in @samp{begin} header.
+@item Header manipulation actions (@pxref{header manipulation}) cannot
+be used in @samp{end} headers.
@end enumerate
The @samp{begin} handlers are the usual place to put global
@@ -6509,7 +6509,7 @@ the return status of the command otherwise.
@UNREVISED{}
@samp{Sieve} is a powerful mail filtering language, defined in
@acronym{RFC} 3028. @command{Mailfromd} supports an extended form
-of this language. For description of the language and available
+of this language. For a description of the language and available
extensions, @xref{Sieve Language, Sieve Language, Sieve Language,
mailutils, GNU Mailutils Manual}.
@@ -6589,7 +6589,7 @@ do
fi
if %level > 20
set flags %flags | MF_SIEVE_DEBUG_PROT
- fi
+ fi
if not sieve("/etc/mail/filter.siv", %flags)
discard
diff --git a/src/main.c b/src/main.c
index 4741dba4..6efb0e8e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1621,7 +1621,7 @@ struct mu_cfg_param mf_cfg_param[] = {
N_("Set Mailfromd debug verbosity level. Argument is a comma-"
"separated list of debug specifications, each of which has the "
"following form:\n"
- " <module: string>[=<level: number>\n"
+ " <module: string>[=<level: number>]\n"
"where <module> is the name of a Mailfromd module, and <level> "
"is the desired verbosity level for that module."),
N_("spec: list") },
diff --git a/src/symtab.c b/src/symtab.c
index 841d6cd7..c9c31194 100644
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -151,6 +151,8 @@ rehash()
1);
sp->state = old_symtab[i].state;
sp->vp = old_symtab[i].vp;
+ if (sp->state == SYM_VARIABLE)
+ sp->vp->variable.owner = sp;
}
}
free(old_symtab);

Return to:

Send suggestions and report system problems to the System administrator.