From 0a46d723c59b5e408b76261d2aae722c2ddb2085 Mon Sep 17 00:00:00 2001 From: Graeme Walker Date: Fri, 16 Aug 2002 12:00:00 +0000 Subject: [PATCH] v1.0.0 --- ChangeLog | 13 + INSTALL | 19 +- Makefile.am | 4 +- Makefile.in | 14 +- NEWS | 8 +- README | 9 +- acinclude.m4 | 56 + aclocal.m4 | 56 + bin/Makefile.am | 5 +- bin/Makefile.in | 17 +- bin/emailrelay-doxygen-filter.sh_ | 4 + bin/emailrelay-soak.sh_ | 4 +- bin/emailrelay.sh_ | 251 ++++- bin/expand.sh_ | 93 +- bin/mu2html.sh_ | 27 +- bin/txt2mu.sh_ | 15 +- config.h.in | 7 +- configure | 978 ++++++++---------- configure.ac | 15 +- doc/Makefile.am | 20 +- doc/Makefile.in | 21 +- doc/developer.txt | 27 +- doc/emailrelay.1 | 192 ++-- doc/emailrelay.css | 21 +- doc/gnet-classes.png | Bin 0 -> 16049 bytes doc/gsmtp-classes.png | Bin 0 -> 10208 bytes doc/index.html | 18 +- doc/reference.txt | 223 ++-- doc/userguide.txt | 10 +- doc/windows.txt | 37 +- emailrelay.spec | 74 +- lib/Makefile.in | 1 + lib/gcc2.95/Makefile.in | 1 + lib/gcc2.95/sstream | 17 +- lib/msvc6.0/Makefile.in | 1 + lib/msvc6.0/cstdlib | 2 + src/Makefile.am | 2 +- src/Makefile.in | 3 +- src/glib/Makefile.am | 15 +- src/glib/Makefile.in | 127 ++- src/glib/garg.cpp | 29 +- src/glib/garg.h | 24 +- src/glib/gcleanup.h | 57 + src/glib/gcleanup_unix.cpp | 154 +++ .../gcleanup_win32.cpp} | 10 +- src/glib/gconvert.h | 4 +- src/glib/gcredentials.h | 79 -- src/glib/gdaemon.cpp | 75 -- src/glib/gdaemon.h | 37 +- src/glib/gdaemon_unix.cpp | 13 +- src/glib/gdaemon_win32.cpp | 6 - src/glib/gdate.cpp | 6 +- src/glib/gdate.h | 2 +- src/glib/gdatetime.cpp | 2 +- src/glib/gdatetime.h | 2 +- src/glib/gdatetime_unix.cpp | 4 +- src/glib/gdef.h | 31 +- src/glib/gdirectory.h | 2 +- src/glib/gdirectory_unix.cpp | 7 +- src/glib/gdirectory_win32.cpp | 2 +- src/glib/gexception.cpp | 4 +- src/glib/gexception.h | 8 +- src/glib/gfile.h | 2 +- src/glib/gfile_unix.cpp | 2 +- src/glib/gfs.h | 2 +- src/glib/ggetopt.cpp | 88 +- src/glib/ggetopt.h | 55 +- src/glib/glog.cpp | 30 +- src/glib/glog.h | 10 +- src/glib/glogoutput.h | 2 +- src/glib/glogoutput_unix.cpp | 2 +- src/glib/glogoutput_win32.cpp | 8 - src/glib/gmd5.h | 2 +- src/glib/gnoncopyable.h | 2 +- src/glib/gpath.h | 10 +- src/glib/gpidfile.cpp | 128 +++ src/glib/gpidfile.h | 93 ++ src/glib/gprocess.h | 57 +- src/glib/gprocess_unix.cpp | 253 ++++- src/glib/gprocess_win32.cpp | 138 ++- src/glib/gregistry.h | 168 +++ src/glib/gregistry_win32.cpp | 347 +++++++ src/glib/groot.h | 2 +- src/{gnet/gevent_win32.cpp => glib/gsetter.h} | 47 +- src/glib/gstatemachine.h | 6 +- src/glib/gstr.cpp | 28 +- src/glib/gstr.h | 11 + src/glib/gstrings.h | 2 +- src/glib/gtime.cpp | 4 +- src/glib/gtime.h | 2 +- src/gnet/Makefile.am | 17 +- src/gnet/Makefile.in | 184 ++-- src/gnet/gaddress.h | 8 +- src/gnet/gaddress_ipv4.cpp | 28 +- src/gnet/gclient.cpp | 4 +- src/gnet/gclient.h | 2 +- src/gnet/gconnection.h | 2 +- src/gnet/gdescriptor.h | 2 +- src/gnet/geventhandler.cpp | 2 +- src/gnet/geventhandler.h | 5 +- src/gnet/geventloop.cpp | 9 + src/gnet/geventloop.h | 16 +- src/gnet/{gselect.cpp => geventloop_unix.cpp} | 57 +- .../{gwinsock.cpp => geventloop_win32.cpp} | 134 ++- src/gnet/geventserver.h | 2 +- src/gnet/glinebuffer.h | 2 +- src/gnet/glocal.h | 2 +- src/gnet/glocal_unix.cpp | 12 + src/gnet/glocal_win32.cpp | 6 +- src/gnet/gmonitor.cpp | 52 +- src/gnet/gmonitor.h | 13 +- src/gnet/grequest.h | 2 +- src/gnet/gresolve.h | 2 +- src/gnet/gselect.h | 91 -- src/gnet/gserver.cpp | 8 + src/gnet/gserver.h | 12 +- src/gnet/gsocket.cpp | 4 +- src/gnet/gsocket.h | 2 +- src/gnet/gtimer.cpp | 61 +- src/gnet/gtimer.h | 9 +- src/gnet/gwinsock.h | 139 --- src/gsmtp/Makefile.am | 69 ++ src/gsmtp/Makefile.in | 510 +++++++++ src/{main => gsmtp}/gadminserver.cpp | 45 +- src/{main => gsmtp}/gadminserver.h | 6 +- src/{main => gsmtp}/gbase64.cpp | 2 +- src/{main => gsmtp}/gbase64.h | 2 +- src/{main => gsmtp}/gclientprotocol.cpp | 6 +- src/{main => gsmtp}/gclientprotocol.h | 4 +- src/{main => gsmtp}/gfilestore.cpp | 71 +- src/{main => gsmtp}/gfilestore.h | 17 +- src/{main => gsmtp}/gmessagestore.cpp | 5 + src/{main => gsmtp}/gmessagestore.h | 23 +- src/{main => gsmtp}/gmessagestore_unix.cpp | 0 src/{main => gsmtp}/gmessagestore_win32.cpp | 0 src/{main => gsmtp}/gnewfile.cpp | 5 +- src/{main => gsmtp}/gnewfile.h | 2 +- src/{main => gsmtp}/gnewmessage.cpp | 0 src/{main => gsmtp}/gnewmessage.h | 2 +- src/{main => gsmtp}/gprotocolmessage.cpp | 0 src/{main => gsmtp}/gprotocolmessage.h | 5 +- .../gprotocolmessageforward.cpp | 5 + src/{main => gsmtp}/gprotocolmessageforward.h | 5 +- src/{main => gsmtp}/gprotocolmessagestore.cpp | 15 +- src/{main => gsmtp}/gprotocolmessagestore.h | 6 +- src/{main => gsmtp}/gsasl.h | 4 +- src/{main => gsmtp}/gsasl_cyrus.cpp | 3 +- src/{main => gsmtp}/gsasl_native.cpp | 23 +- src/{main => gsmtp}/gsecrets.cpp | 0 src/{main => gsmtp}/gsecrets.h | 2 +- src/{main => gsmtp}/gserverprotocol.cpp | 10 +- src/{main => gsmtp}/gserverprotocol.h | 2 +- src/{main => gsmtp}/gsmtp.h | 0 src/{main => gsmtp}/gsmtpclient.cpp | 31 +- src/{main => gsmtp}/gsmtpclient.h | 12 +- src/{main => gsmtp}/gsmtpserver.cpp | 53 +- src/{main => gsmtp}/gsmtpserver.h | 39 +- src/{main => gsmtp}/gstoredfile.cpp | 24 +- src/{main => gsmtp}/gstoredfile.h | 10 +- src/{main => gsmtp}/gstoredmessage.cpp | 0 src/{main => gsmtp}/gstoredmessage.h | 5 +- src/gsmtp/gverifier.cpp | 131 +++ src/{main => gsmtp}/gverifier.h | 37 +- src/{main => gsmtp}/gxtext.cpp | 2 +- src/{main => gsmtp}/gxtext.h | 2 +- src/main/Makefile.am | 76 +- src/main/Makefile.in | 464 +++------ src/main/commandline.cpp | 127 ++- src/main/commandline.h | 12 +- src/main/commandline_unix.cpp | 25 +- src/main/commandline_win32.cpp | 27 +- src/main/common.dsp | 72 +- src/main/configuration.cpp | 56 +- src/main/configuration.h | 20 +- src/main/doxygen.cfg | 6 +- src/main/doxygen.h | 103 ++ src/main/emailrelay.dsp | 8 +- src/main/emailrelay.dsw | 12 + src/main/emailrelay.rc | 12 +- src/main/gverifier.cpp | 66 -- src/main/legal.cpp | 12 +- src/main/legal.h | 4 +- src/main/main_win32.cpp | 270 ++--- src/main/passwd.cpp | 8 +- src/main/passwd.dsp | 4 +- src/main/poke.c | 13 +- src/main/poke.dsp | 102 ++ src/main/resource.h | 2 +- src/main/run.cpp | 156 ++- src/main/run.h | 38 +- src/main/submit.cpp | 13 +- src/main/submit.dsp | 4 +- src/win32/Makefile.in | 1 + src/win32/gwinhid.cpp | 2 +- 194 files changed, 5471 insertions(+), 2794 deletions(-) mode change 100755 => 100644 configure.ac create mode 100644 doc/gnet-classes.png create mode 100644 doc/gsmtp-classes.png create mode 100644 src/glib/gcleanup.h create mode 100644 src/glib/gcleanup_unix.cpp rename src/{gnet/gevent_unix.cpp => glib/gcleanup_win32.cpp} (84%) delete mode 100644 src/glib/gcredentials.h delete mode 100644 src/glib/gdaemon.cpp create mode 100644 src/glib/gpidfile.cpp create mode 100644 src/glib/gpidfile.h create mode 100644 src/glib/gregistry.h create mode 100644 src/glib/gregistry_win32.cpp rename src/{gnet/gevent_win32.cpp => glib/gsetter.h} (61%) rename src/gnet/{gselect.cpp => geventloop_unix.cpp} (79%) rename src/gnet/{gwinsock.cpp => geventloop_win32.cpp} (65%) delete mode 100644 src/gnet/gselect.h delete mode 100644 src/gnet/gwinsock.h create mode 100644 src/gsmtp/Makefile.am create mode 100644 src/gsmtp/Makefile.in rename src/{main => gsmtp}/gadminserver.cpp (80%) rename src/{main => gsmtp}/gadminserver.h (97%) rename src/{main => gsmtp}/gbase64.cpp (99%) rename src/{main => gsmtp}/gbase64.h (99%) rename src/{main => gsmtp}/gclientprotocol.cpp (98%) rename src/{main => gsmtp}/gclientprotocol.h (99%) rename src/{main => gsmtp}/gfilestore.cpp (79%) rename src/{main => gsmtp}/gfilestore.h (93%) rename src/{main => gsmtp}/gmessagestore.cpp (97%) rename src/{main => gsmtp}/gmessagestore.h (86%) rename src/{main => gsmtp}/gmessagestore_unix.cpp (100%) rename src/{main => gsmtp}/gmessagestore_win32.cpp (100%) rename src/{main => gsmtp}/gnewfile.cpp (98%) rename src/{main => gsmtp}/gnewfile.h (99%) rename src/{main => gsmtp}/gnewmessage.cpp (100%) rename src/{main => gsmtp}/gnewmessage.h (99%) rename src/{main => gsmtp}/gprotocolmessage.cpp (100%) rename src/{main => gsmtp}/gprotocolmessage.h (97%) rename src/{main => gsmtp}/gprotocolmessageforward.cpp (97%) rename src/{main => gsmtp}/gprotocolmessageforward.h (97%) rename src/{main => gsmtp}/gprotocolmessagestore.cpp (89%) rename src/{main => gsmtp}/gprotocolmessagestore.h (96%) rename src/{main => gsmtp}/gsasl.h (99%) rename src/{main => gsmtp}/gsasl_cyrus.cpp (98%) rename src/{main => gsmtp}/gsasl_native.cpp (95%) rename src/{main => gsmtp}/gsecrets.cpp (100%) rename src/{main => gsmtp}/gsecrets.h (99%) rename src/{main => gsmtp}/gserverprotocol.cpp (98%) rename src/{main => gsmtp}/gserverprotocol.h (99%) rename src/{main => gsmtp}/gsmtp.h (100%) rename src/{main => gsmtp}/gsmtpclient.cpp (86%) rename src/{main => gsmtp}/gsmtpclient.h (93%) rename src/{main => gsmtp}/gsmtpserver.cpp (76%) rename src/{main => gsmtp}/gsmtpserver.h (77%) rename src/{main => gsmtp}/gstoredfile.cpp (93%) rename src/{main => gsmtp}/gstoredfile.h (94%) rename src/{main => gsmtp}/gstoredmessage.cpp (100%) rename src/{main => gsmtp}/gstoredmessage.h (95%) create mode 100644 src/gsmtp/gverifier.cpp rename src/{main => gsmtp}/gverifier.h (62%) rename src/{main => gsmtp}/gxtext.cpp (99%) rename src/{main => gsmtp}/gxtext.h (99%) mode change 100755 => 100644 src/main/doxygen.cfg create mode 100644 src/main/doxygen.h delete mode 100644 src/main/gverifier.cpp create mode 100644 src/main/poke.dsp mode change 100755 => 100644 src/main/run.cpp diff --git a/ChangeLog b/ChangeLog index dad5f68..473e2c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,19 @@ E-MailRelay Change Log ====================== +0.9.9 -> 1.0.0 +-------------- +* Briefer "--help" output; works with "--verbose". +* Option to listen on a specific network interface ("--interface"). +* Option for an external address verifier program ("--verifier"). +* Some Linux Standard Base stuff added to the "init.d" script. +* Pid files world-readable and deleted on abnormal termination. +* Compiles with gcc 3.0 and intel 6.0. +* Autoconf tweak for MacOS X. +* Corrected the "Received:" typo [bug-id 572236]. +* EHLO response parsing is now case-insensitive [bug-id 561522]. +* Fewer missing-secrets warnings [bug-id 564987]. + 0.9.8 -> 0.9.9 -------------- * More flexible logging options ("--verbose" and "--debug" work better). diff --git a/INSTALL b/INSTALL index cb1f796..a1a5ca9 100644 --- a/INSTALL +++ b/INSTALL @@ -1,16 +1,20 @@ Introduction ============ + What follows are generic installation instructions for doing a standard GNU "./configure; make; make install" installation from source under Linux, FreeBSD etc. The Windows installation instructions are in a separate document. - Note that a non-standard "configure" switch is available, "--enable-fhs", -which overrides all other directory modifiers, forcing compliance with the File -Hierarchy Standard. There are also a set of variables which can be defined on -the "configure" command line for controlling all the installation directories -in more detail, augmenting the standard command-line switches like "--sbindir" -and "--libexecdir". For more information refer to the E-MailRelay reference -document. + A non-standard "configure" switch is available, "--enable-fhs", which overrides +all other directory modifiers, forcing compliance with the File Hierarchy Standard. +This switch is used in building the RPMs, and may become the default in future +releases. + + There are also a set of variables which can be defined on the "configure" command +line for controlling all the installation directories in more detail, augmenting +the standard command-line switches like "--sbindir" and "--libexecdir". For more +information refer to the E-MailRelay reference document under +"Files and directories". The E-MailRelay user guide describes what needs to be done after the "make install" in order to get the emailrelay daemon to start up at boot-time, @@ -18,6 +22,7 @@ automatically forward e-mail and bounce failed mail. Basic Installation ================== + The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses those values to create a `Makefile' in each directory of the package. diff --git a/Makefile.am b/Makefile.am index 464720b..936832e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,4 +21,6 @@ SUBDIRS = src bin lib doc e_doc_DATA = NEWS README changelog.gz CLEANFILES = changelog.gz changelog.gz: ChangeLog - if test -n "$(GZIP)" ; then $(GZIP) -c $< > changelog.tmp && mv changelog.tmp changelog.gz ; fi + if test -n "$(GZIP)" ; then $(GZIP) -c $(top_srcdir)/ChangeLog > changelog.tmp && mv changelog.tmp changelog.gz ; fi +uninstall-local: + -rmdir $(DESTDIR)$(e_docdir) 2>/dev/null diff --git a/Makefile.in b/Makefile.in index 312f5d4..2d21618 100644 --- a/Makefile.in +++ b/Makefile.in @@ -79,6 +79,7 @@ POST_UNINSTALL = : AR = @AR@ AWK = @AWK@ CC = @CC@ +COMPILER_VERSION = @COMPILER_VERSION@ CXX = @CXX@ GZIP = @GZIP@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ @@ -346,7 +347,7 @@ install-data: install-data-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-recursive -uninstall-am: uninstall-e_docDATA +uninstall-am: uninstall-e_docDATA uninstall-local uninstall: uninstall-recursive all-am: Makefile $(DATA) config.h all-redirect: all-recursive-am @@ -398,12 +399,15 @@ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \ install-exec-am install-exec install-data-am install-data install-am \ -install uninstall-am uninstall all-redirect all-am all installdirs-am \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +install uninstall-local uninstall-am uninstall all-redirect all-am all \ +installdirs-am installdirs mostlyclean-generic distclean-generic \ +clean-generic maintainer-clean-generic clean mostlyclean distclean \ +maintainer-clean changelog.gz: ChangeLog - if test -n "$(GZIP)" ; then $(GZIP) -c $< > changelog.tmp && mv changelog.tmp changelog.gz ; fi + if test -n "$(GZIP)" ; then $(GZIP) -c $(top_srcdir)/ChangeLog > changelog.tmp && mv changelog.tmp changelog.gz ; fi +uninstall-local: + -rmdir $(DESTDIR)$(e_docdir) 2>/dev/null # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/NEWS b/NEWS index 5589d96..ae51f8d 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1 @@ - -To do... -* optionally enforce authentication by clients -* OS-X port -* better windows gui (esp. client side) -* sample pre-processor script for spamassassin - +no news diff --git a/README b/README index fbb5d58..510eba8 100644 --- a/README +++ b/README @@ -12,8 +12,8 @@ than to a local postmaster. Because of this functional simplicity it is extremely easy to configure, typically only requiring the address of the next-hop SMTP server to be put on the command line. -C++ source code is available for Linux, FreeBSD and Windows. Distribution is -under the GNU General Public License. +C++ source code is available for Linux, FreeBSD (etc) and Windows. +Distribution is under the GNU General Public License. Quick start ----------- @@ -78,11 +78,12 @@ and ported to Windows 98 using: The code has also been built successfully on: * Windows NT 4.0 +* MacOS X +* FreeBSD on Intel hardware +* Solaris 8, using gcc, on Sparc hardware * Linux on Alpha hardware (Debian 2.2) * Linux on Sparc hardware * Linux on RS6000 PPC hardware -* FreeBSD on Intel hardware -* Solaris, using gcc, on Sparc hardware Feedback diff --git a/acinclude.m4 b/acinclude.m4 index e25740e..cd100c7 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -18,6 +18,62 @@ dnl Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. dnl dnl === +dnl derived from lars brinkhoff... +AC_DEFUN(ACLOCAL_TYPE_SOCKLEN_T, +[AC_CACHE_CHECK([for socklen_t], aclocal_cv_type_socklen_t, +[ + AC_TRY_COMPILE( + [#include +#include ], + [socklen_t len = 42; return len;], + aclocal_cv_type_socklen_t=yes, + aclocal_cv_type_socklen_t=no) +]) + if test $aclocal_cv_type_socklen_t = yes; then + AC_DEFINE(HAVE_SOCKLEN_T, 1,[Define if socklen_t type definition in sys/socket.h]) + else + AC_DEFINE(HAVE_SOCKLEN_T, 0,[Define if socklen_t type definition in sys/socket.h]) + fi +]) + +AC_DEFUN([ACLOCAL_CHECK_GMTIME_R], +[AC_CACHE_CHECK([for gmtime_r], aclocal_cv_gmtime_r, +[ + AC_TRY_COMPILE( + [#include ], + [gmtime_r((time_t*)0,(struct tm*)0) ;], + aclocal_cv_gmtime_r=yes , + aclocal_cv_gmtime_r=no ) +]) + if test $aclocal_cv_gmtime_r = yes; then + AC_DEFINE(HAVE_GMTIME_R,1,[Define if gmtime_r in time.h]) + else + AC_DEFINE(HAVE_GMTIME_R,0,[Define if gmtime_r in time.h]) + fi +]) + +AC_DEFUN([ACLOCAL_CHECK_LOCALTIME_R], +[AC_CACHE_CHECK([for localtime_r], aclocal_cv_localtime_r, +[ + AC_TRY_COMPILE( + [#include ], + [localtime_r((time_t*)0,(struct tm*)0) ;], + aclocal_cv_localtime_r=yes , + aclocal_cv_localtime_r=no ) +]) + if test $aclocal_cv_localtime_r = yes; then + AC_DEFINE(HAVE_LOCALTIME_R,1,[Define if localtime_r in time.h]) + else + AC_DEFINE(HAVE_LOCALTIME_R,0,[Define if localtime_r in time.h]) + fi +]) + +AC_DEFUN([ACLOCAL_COMPILER_VERSION], +[ + COMPILER_VERSION=`$CXX --version 2>/dev/null | sed 's/\./ /;s/\..*//;s/ /\./;s/ .*//;s/^/gcc/'` + AC_SUBST(COMPILER_VERSION) +]) + AC_DEFUN([ENABLE_FHS], [ if test "$enable_fhs" = "yes" diff --git a/aclocal.m4 b/aclocal.m4 index bfc41fc..ab7c840 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -30,6 +30,62 @@ dnl Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. dnl dnl === +dnl derived from lars brinkhoff... +AC_DEFUN(ACLOCAL_TYPE_SOCKLEN_T, +[AC_CACHE_CHECK([for socklen_t], aclocal_cv_type_socklen_t, +[ + AC_TRY_COMPILE( + [#include +#include ], + [socklen_t len = 42; return len;], + aclocal_cv_type_socklen_t=yes, + aclocal_cv_type_socklen_t=no) +]) + if test $aclocal_cv_type_socklen_t = yes; then + AC_DEFINE(HAVE_SOCKLEN_T, 1,[Define if socklen_t type definition in sys/socket.h]) + else + AC_DEFINE(HAVE_SOCKLEN_T, 0,[Define if socklen_t type definition in sys/socket.h]) + fi +]) + +AC_DEFUN([ACLOCAL_CHECK_GMTIME_R], +[AC_CACHE_CHECK([for gmtime_r], aclocal_cv_gmtime_r, +[ + AC_TRY_COMPILE( + [#include ], + [gmtime_r((time_t*)0,(struct tm*)0) ;], + aclocal_cv_gmtime_r=yes , + aclocal_cv_gmtime_r=no ) +]) + if test $aclocal_cv_gmtime_r = yes; then + AC_DEFINE(HAVE_GMTIME_R,1,[Define if gmtime_r in time.h]) + else + AC_DEFINE(HAVE_GMTIME_R,0,[Define if gmtime_r in time.h]) + fi +]) + +AC_DEFUN([ACLOCAL_CHECK_LOCALTIME_R], +[AC_CACHE_CHECK([for localtime_r], aclocal_cv_localtime_r, +[ + AC_TRY_COMPILE( + [#include ], + [localtime_r((time_t*)0,(struct tm*)0) ;], + aclocal_cv_localtime_r=yes , + aclocal_cv_localtime_r=no ) +]) + if test $aclocal_cv_localtime_r = yes; then + AC_DEFINE(HAVE_LOCALTIME_R,1,[Define if localtime_r in time.h]) + else + AC_DEFINE(HAVE_LOCALTIME_R,0,[Define if localtime_r in time.h]) + fi +]) + +AC_DEFUN([ACLOCAL_COMPILER_VERSION], +[ + COMPILER_VERSION=`$CXX --version 2>/dev/null | sed 's/\./ /;s/\..*//;s/ /\./;s/ .*//;s/^/gcc/'` + AC_SUBST(COMPILER_VERSION) +]) + AC_DEFUN([ENABLE_FHS], [ if test "$enable_fhs" = "yes" diff --git a/bin/Makefile.am b/bin/Makefile.am index b3a9cdc..421bd64 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -37,9 +37,12 @@ emailrelay: emailrelay.sh cp emailrelay.sh emailrelay chmod ugo+x emailrelay -install-data-local: +install-data-local: install-e_examplesDATA install-e_initSCRIPTS chmod ugo+x $(DESTDIR)$(e_examplesdir)/emailrelay-notify.sh chmod ugo+x $(DESTDIR)$(e_examplesdir)/emailrelay-resubmit.sh chmod ugo+x $(DESTDIR)$(e_examplesdir)/emailrelay-deliver.sh chmod ugo+x $(DESTDIR)$(e_examplesdir)/emailrelay-process.sh +uninstall-local: + -rmdir $(DESTDIR)$(e_examplesdir) 2>/dev/null + diff --git a/bin/Makefile.in b/bin/Makefile.in index 8d8a597..368c09b 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -79,6 +79,7 @@ POST_UNINSTALL = : AR = @AR@ AWK = @AWK@ CC = @CC@ +COMPILER_VERSION = @COMPILER_VERSION@ CXX = @CXX@ GZIP = @GZIP@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ @@ -232,7 +233,8 @@ install-data: install-data-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am -uninstall-am: uninstall-e_initSCRIPTS uninstall-e_examplesDATA +uninstall-am: uninstall-e_initSCRIPTS uninstall-e_examplesDATA \ + uninstall-local uninstall: uninstall-am all-am: Makefile $(SCRIPTS) $(DATA) all-redirect: all-am @@ -274,10 +276,10 @@ maintainer-clean: maintainer-clean-am uninstall-e_examplesDATA install-e_examplesDATA tags distdir \ check-TESTS info-am info dvi-am dvi check check-am installcheck-am \ installcheck install-exec-am install-exec install-data-local \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +install-data-am install-data install-am install uninstall-local \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean .sh_.sh: @@ -288,12 +290,15 @@ emailrelay: emailrelay.sh cp emailrelay.sh emailrelay chmod ugo+x emailrelay -install-data-local: +install-data-local: install-e_examplesDATA install-e_initSCRIPTS chmod ugo+x $(DESTDIR)$(e_examplesdir)/emailrelay-notify.sh chmod ugo+x $(DESTDIR)$(e_examplesdir)/emailrelay-resubmit.sh chmod ugo+x $(DESTDIR)$(e_examplesdir)/emailrelay-deliver.sh chmod ugo+x $(DESTDIR)$(e_examplesdir)/emailrelay-process.sh +uninstall-local: + -rmdir $(DESTDIR)$(e_examplesdir) 2>/dev/null + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/bin/emailrelay-doxygen-filter.sh_ b/bin/emailrelay-doxygen-filter.sh_ index c504983..afd1103 100644 --- a/bin/emailrelay-doxygen-filter.sh_ +++ b/bin/emailrelay-doxygen-filter.sh_ @@ -23,6 +23,10 @@ # awk="gawk" +if test "`echo a | ${awk} '{print}'`" != "a" +then + awk="nawk" +fi 2>/dev/null # PreFilter() # Removes banner comments (including legalese) from the top of the file. diff --git a/bin/emailrelay-soak.sh_ b/bin/emailrelay-soak.sh_ index e127cb1..73ee86c 100644 --- a/bin/emailrelay-soak.sh_ +++ b/bin/emailrelay-soak.sh_ @@ -59,7 +59,7 @@ Auth() Content() { - echo "To:" ${USER}@localhost + echo "To:" ${USER}@`uname -n` echo "Subject: test message from process" $$ echo "From: tester" echo "" @@ -75,7 +75,7 @@ Envelope() echo "X-MailRelay-Content: 8bit" echo "X-MailRelay-From: me" echo "X-MailRelay-ToCount: 1" - echo "X-MailRelay-To-Remote:" ${USER}@localhost + echo "X-MailRelay-To-Remote:" ${USER}@`uname -n` echo "X-MailRelay-Authentication: anon" echo "X-MailRelay-Client: 127.0.0.1" echo "X-MailRelay-End: 1" diff --git a/bin/emailrelay.sh_ b/bin/emailrelay.sh_ index ce77442..98abe67 100644 --- a/bin/emailrelay.sh_ +++ b/bin/emailrelay.sh_ @@ -24,27 +24,201 @@ # A shell-script wrapper for E-MailRelay designed for # use in the SysV-init system (/etc/init.d). # -# usage: emailrelay { start [] | stop } +# See also: LSB, start_daemon (lsb), startproc (suse), +# install_initd (lsb), insserv (suse) # +# usage: emailrelay { start [] | stop | restart | force-reload | status } +# + +# LSB comment block +# +### BEGIN INIT INFO +# Provides: emailrelay +# Required-Start: $network +# Required-Stop: $network +# Default-Start: 3 4 5 +# Default-Stop: 3 4 5 +# Description: E-MailRelay store-and-forward Message Transfer Agent. +### END INIT INFO + +# choose an infrastructure style +# +if test -f /etc/rc.status +then + style="suse" + . /etc/rc.status +elif test -f /lib/lsb/init-functions +then + style="lsb" + . /lib/lsb/init-functions +else + style="unix" +fi # configuration # +switches="" +sbin="/sbin" var_run="/var/run" emailrelay="__SBIN_DIR__/emailrelay" -switches="" - -# configuration fallback -# if test \! -d "${var_run}" ; then var_run="/tmp" ; fi -if test \! -x "${emailrelay}" ; then emailrelay="emailrelay" ; fi - -# initialisation -# +if test \! -x "${emailrelay}" ; then emailrelay="./emailrelay" ; fi pid_file="${var_run}/emailrelay.pid" +PATH="${PATH}:/sbin:/bin:/usr/bin" + +# functions... +# +#