aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2007-05-12 07:17:10 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2007-05-12 07:17:10 +0000
commitc0b3a5cafbe33441b40fe786bf4f3033723de393 (patch)
tree5e2a46295ec6a6923de4cbace2ab11e5e371e3cb
parent9f0e5dee4a53772da7446706e789f3a96385011b (diff)
downloadmailfromd-c0b3a5cafbe33441b40fe786bf4f3033723de393.tar.gz
mailfromd-c0b3a5cafbe33441b40fe786bf4f3033723de393.tar.bz2
Update for the recent gnulib changes
git-svn-id: file:///svnroot/mailfromd/trunk@1422 7a8a7f39-df28-0410-adc6-e0d955640f24
-rw-r--r--ChangeLog10
-rw-r--r--README-alpha5
-rw-r--r--bootstrap2
-rw-r--r--doc/mailfromd.texi3
-rw-r--r--doc/mtasim.texi6
-rw-r--r--src/Makefile.am5
-rw-r--r--src/openat-die.c40
7 files changed, 63 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 00536f95..84a6691c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,16 @@
+2007-05-12 Sergey Poznyakoff <gray@gnu.org.ua>
+
+ * bootstrap: Avoid importing openat-die. This needs the following
+ patch:
+ http://lists.gnu.org/archive/html/bug-gnulib/2007-05/msg00056.html
+ * README-alpha: Update
+ * src/openat-die.c: New source
+ * src/Makefile.am (mtasim_SOURCES): Add openat-die.c
+ * doc/mailfromd.texi, doc/mtasim.texi: Update
+
2007-05-11 Sergey Poznyakoff <gray@gnu.org.ua>
* configure.ac, NEWS: Raise version number to 4.0. Ready for the
release.
* src/version.c: New file.
* src/Makefile.am (libmf.a): New library
diff --git a/README-alpha b/README-alpha
index 4cb0c1fc..68568139 100644
--- a/README-alpha
+++ b/README-alpha
@@ -51,12 +51,17 @@ once. Packaged alpha versions do not need bootstrapping.
and create the configuration framework. Run:
sh ./bootstrap
(make sure gnulib-tool is in your path).
+Note: at the time of this writing (2007-05-12) the following patch
+needs to be applied to gnulib before running bootstrap:
+
+http://lists.gnu.org/archive/html/bug-gnulib/2007-05/msg00056.html
+
3. Configure and build the package as described in the documentation. See
http://mailfromd.software.gnu.org.ua/manual/html_node/Building
* Copyright information:
diff --git a/bootstrap b/bootstrap
index b6161d18..fc2a8d0d 100644
--- a/bootstrap
+++ b/bootstrap
@@ -9,9 +9,9 @@ MODLIST="argp\
regex\
save-cwd\
snprintf\
strtok_r\
version-etc"
-gnulib-tool --import --avoid xalloc-die $MODLIST
+gnulib-tool --import --avoid xalloc-die --avoid openat-die $MODLIST
test -f lib/daemon.c || ln src/daemon.c lib/
autoreconf -i -f -s
diff --git a/doc/mailfromd.texi b/doc/mailfromd.texi
index d8aa4da5..c937bf80 100644
--- a/doc/mailfromd.texi
+++ b/doc/mailfromd.texi
@@ -372,14 +372,13 @@ Another major feature was the @option{--dump-macros} option and
to facilitate the configuration on @samp{Sendmail} side.
The development of 3.@i{x} (more propery, 3.1.@i{x}) series
concentrated mainly on bug-fixes, while the main development was done
on the next branch.
-@FIXME{When 4.0 is out, change the data below:}
- The version 4.0 appeared on @value{UPDATED}. The full
+ The version 4.0 appeared on May 12, 2007. The full
list of changes in this release is more than 500 lines long, so it is
impractical to list them here. In particular, this version introduced
lots of new features in @acronym{MFL} syntax and the
library of useful @acronym{MFL} functions. The runtime engine was
also improved, in particular, stack space become expandable which
eliminated many run-time errors. This version also introduced the
diff --git a/doc/mtasim.texi b/doc/mtasim.texi
index 8e5f66f8..e6fa9857 100644
--- a/doc/mtasim.texi
+++ b/doc/mtasim.texi
@@ -81,13 +81,13 @@ to:
250 RSET
@end smallexample
You can try a simple @acronym{SMTP} session now:
@smallexample
-220 mtasim (mailfromd 3.1.92) ready
+220 mtasim (mailfromd @value{VERSION}) ready
(mtasim) @kbd{ehlo localhost}
250-pleased to meet you
250 HELP
(mtasim) @kbd{mail from: <me@@localhost>}
250 Sender OK
(mtasim) @kbd{rcpt to: <him@@domain>}
@@ -122,13 +122,13 @@ $ @kbd{mtasim --port='mailfrom, S=inet:999@@localhost, F=T, T=C:100m;R:180s'}
If the milter is actually listening on this port, @command{mtasim}
will connect to it and you will get the following initial prompt:
@smallexample
@group
-220-mtasim (mailfromd 3.1.92) ready
+220-mtasim (mailfromd @value{VERSION}) ready
220 Connected to milter inet:999@@localhost
(mtasim)
@end group
@end smallexample
Notice, that it makes no difference what implementation is listening
@@ -437,13 +437,13 @@ cases.
@mtasimopt{define, summary}
@mtindex D, -D, @command{mtasim} option, summary
@item --define=@var{macro}=@var{value}
@itemx -D @var{macro}=@var{value}
Define Sendmail macro @var{macro} to the given @var{value}. It is
-similar to @code{\D} administrative command (@pxref{D command})
+similar to the @code{\D} administrative command (@pxref{D command})
@item --help
@itemx -?
Display a short help summary
@mtasimopt{milter-version, summary}
diff --git a/src/Makefile.am b/src/Makefile.am
index b017eb96..c83808a1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -60,17 +60,18 @@ mailfromd_SOURCES = \
$(M4_FILES:.m4=.c)
EXTRA_LIBRARIES=libsyslog_async.a
noinst_LIBRARIES=libmf.a @BUILD_SYSLOG_ASYNC@
libsyslog_async_a_SOURCES=syslog_async.c syslog_async.h
-libmf_a_SOURCES=version.c
+libmf_a_SOURCES=\
+ version.c
mailfromd_LDADD = ./libmf.a $(LDADD) $(SYSLOG_LIBS)
-mtasim_SOURCES = mtasim.c
+mtasim_SOURCES = mtasim.c openat-die.c
mtasim_LDADD = ./libmf.a $(LDADD) $(READLINE_LIBS)
noinst_HEADERS = mailfromd.h mu_dbm.h builtin.h dns.h spf.h drivers.c debug.h
EXTRA_DIST = \
$(M4_FILES)\
builtin.def\
diff --git a/src/openat-die.c b/src/openat-die.c
new file mode 100644
index 00000000..386d98be
--- /dev/null
+++ b/src/openat-die.c
@@ -0,0 +1,40 @@
+/* This file is part of mailfromd.
+ Copyright (C) 2007 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
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02110-1301 USA */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "mailfromd.h"
+
+void
+openat_save_fail(int errno)
+{
+ mu_error("unable to record current working directory: %s",
+ mu_strerror(errno));
+ exit(EX_OSERR);
+}
+
+void
+openat_restore_fail(int errno)
+{
+ mu_error("failed to return to initial working directory: %s",
+ mu_strerror(errno));
+ exit(EX_OSERR);
+}
+

Return to:

Send suggestions and report system problems to the System administrator.