diff --git a/ChangeLog b/ChangeLog index d6c3826..a5fac49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ E-MailRelay Change Log ====================== +1.8 -> 1.8.1 +------------ +* Changed the definition of "--as-proxy" to use "--poll 0" rather than "--immediate" [bug-id 1961652]. +* Fixed stalling bug when using server-side TLS/SSL ("--server-tls") [bug-id 1961655]. +* Improved Debian packaging for Linux ("make deb"). + 1.7 -> 1.8 ---------- * Speed optimisations (as identified by KCachegrind/valgrind in KDevelop). diff --git a/Makefile.am b/Makefile.am index ceaa216..2bffd47 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,7 +27,7 @@ EXTRA_DIST = \ emailrelay-gui.xcodeproj/project.pbxproj \ emailrelay.xcodeproj/project.pbxproj -SUBDIRS = bin src lib etc doc test extra +SUBDIRS = bin src lib etc doc debian test extra e_doc_DATA = NEWS README ChangeLog @@ -39,20 +39,28 @@ RPM_ROOT=/usr/src/rpm RPM=$(RPM_ROOT)/RPMS/i386/emailrelay-$(VERSION)-1.i386.rpm DEB=emailrelay_$(VERSION)-1_i386.deb TAR=emailrelay-$(VERSION).tar.gz + .PHONY: rpm rpm: $(RPM) + $(RPM): dist -rm -rf $(RPM_ROOT)/BUILD/emailrelay-$(VERSION) cp $(TAR) $(RPM_ROOT)/SOURCES/emailrelay-$(VERSION)-src.tar.gz cp emailrelay.spec $(RPM_ROOT)/SPECS chown root:root $(RPM_ROOT)/SPECS/emailrelay.spec rpmbuild -ba $(RPM_ROOT)/SPECS/emailrelay.spec + .PHONY: deb deb: $(DEB) + $(DEB): $(RPM) -mv emailrelay-$(VERSION) emailrelay-$(VERSION).old.$$ alien --to-deb --generate --single --keep-version $(RPM) sed -i 's/^Section:.*/Section: mail/' emailrelay-$(VERSION)/debian/control sed -i 's/^Maintainer:.*/Maintainer: Graeme Walker /' emailrelay-$(VERSION)/debian/control + chmod +x debian/pre* debian/post* + cp debian/* emailrelay-$(VERSION)/debian/ + sed -i 's:dh_installchangelogs:dh_installchangelogs ; cp etc/init.d/emailrelay debian/emailrelay.init ; dh_installinit:' emailrelay-$(VERSION)/debian/rules + sed -i 's:dh_installdeb:dh_installdeb ; echo /etc/emailrelay.conf > debian/emailrelay/DEBIAN/conffiles:' emailrelay-$(VERSION)/debian/rules cd emailrelay-$(VERSION) && debian/rules binary diff --git a/Makefile.in b/Makefile.in index 0119256..886666a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -205,7 +205,7 @@ EXTRA_DIST = \ emailrelay-gui.xcodeproj/project.pbxproj \ emailrelay.xcodeproj/project.pbxproj -SUBDIRS = bin src lib etc doc test extra +SUBDIRS = bin src lib etc doc debian test extra e_doc_DATA = NEWS README ChangeLog RPM_ROOT = /usr/src/rpm RPM = $(RPM_ROOT)/RPMS/i386/emailrelay-$(VERSION)-1.i386.rpm @@ -673,21 +673,29 @@ uninstall-am: uninstall-e_docDATA uninstall-local uninstall-local: -rmdir $(DESTDIR)$(e_docdir) 2>/dev/null -for d in "$(DESTDIR)$(e_sysconfdir)" "$(DESTDIR)$(e_libexecdir)" "$(DESTDIR)$(e_examplesdir)" "$(DESTDIR)$(e_spooldir)" "$(DESTDIR)$(e_initdir)" "$(DESTDIR)$(e_docdir)/man/man1" "$(DESTDIR)$(e_docdir)/man" "$(DESTDIR)$(e_docdir)" ; do rmdir "$$d" 2>/dev/null ; done + .PHONY: rpm rpm: $(RPM) + $(RPM): dist -rm -rf $(RPM_ROOT)/BUILD/emailrelay-$(VERSION) cp $(TAR) $(RPM_ROOT)/SOURCES/emailrelay-$(VERSION)-src.tar.gz cp emailrelay.spec $(RPM_ROOT)/SPECS chown root:root $(RPM_ROOT)/SPECS/emailrelay.spec rpmbuild -ba $(RPM_ROOT)/SPECS/emailrelay.spec + .PHONY: deb deb: $(DEB) + $(DEB): $(RPM) -mv emailrelay-$(VERSION) emailrelay-$(VERSION).old.$$ alien --to-deb --generate --single --keep-version $(RPM) sed -i 's/^Section:.*/Section: mail/' emailrelay-$(VERSION)/debian/control sed -i 's/^Maintainer:.*/Maintainer: Graeme Walker /' emailrelay-$(VERSION)/debian/control + chmod +x debian/pre* debian/post* + cp debian/* emailrelay-$(VERSION)/debian/ + sed -i 's:dh_installchangelogs:dh_installchangelogs ; cp etc/init.d/emailrelay debian/emailrelay.init ; dh_installinit:' emailrelay-$(VERSION)/debian/rules + sed -i 's:dh_installdeb:dh_installdeb ; echo /etc/emailrelay.conf > debian/emailrelay/DEBIAN/conffiles:' emailrelay-$(VERSION)/debian/rules cd emailrelay-$(VERSION) && debian/rules binary # 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/README b/README index df69c28..7dc09a8 100644 --- a/README +++ b/README @@ -115,6 +115,7 @@ Versions of the code have also been built successfully on: * Linux 2.4.20 using gcc 3.4.6 on MIPS (mipsel) * Solaris 8 using gcc on Sparc hardware * Solaris 8 using WorkShop 5.0 +* Solaris 10 * Windows NT 4.0 using MSVC 6.0 * Windows NT 4.0 using Cygwin (DLL 1.3.22) and gcc 3.2 * Windows NT 4.0 using MinGW 2.0.0 and gcc 3.2 diff --git a/README.windows b/README.windows index 75cd6f4..9086844 100644 --- a/README.windows +++ b/README.windows @@ -46,7 +46,7 @@ Note that the batch file and the main E-MailRelay executable must be in the same directory. If you need to run multiple E-MailRelay services then pass a unique service name -on the "emailrelay-server --install " command-line. This name is used to +on the "emailrelay-service --install " command-line. This name is used to derive the name of the "-start.bat" batch file that contains the E-MailRelay server's command-line switches so you will need to create this too. @@ -57,12 +57,12 @@ you can view by running "eventvwr.exe". You can increase the verbosity by adding the "--verbose" switch to the E-MailRelay command-line, typically by editing the "emailrelay-start.bat" batch script. -The E-MailRelay server also logs to the standard error stream, however the +The E-MailRelay server also logs to the standard error stream. However, the "--as-server" and "--as-proxy" switches implicitly incorporate "--close-stderr" so with these switches the standard error logging will stop soon after startup. To get continuous logging to a log file you should replace "--as-server" with -"--log" and "--as-proxy" with "--immediate --forward-to" and then use "2>" to +"--log" and "--as-proxy" with "--poll 0 --forward-to" and then use "2>" to redirect the standard error stream, eg: "c:\program files\emailrelay\emailrelay.exe" --log -v -L ... > c:\temp.out 2>&1 diff --git a/acinclude.m4 b/acinclude.m4 index c6291b1..76ac0e0 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -588,6 +588,17 @@ AC_DEFUN([ENABLE_STATIC_LINKING], AC_SUBST(STATIC_END) ]) +dnl enable-install-hook +dnl +dnl The "--enable-install-hook" switch enables the editing +dnl of "emailrelay.conf" with the correct install directories. +dnl This should be disabled when building an rpm package. +dnl +AC_DEFUN([ENABLE_INSTALL_HOOK], +[ + AM_CONDITIONAL(INSTALL_HOOK,test x$enable_install_hook != xno) +]) + dnl with-doxygen dnl dnl Sets HAVE_DOXYGEN in makefiles if doxygen is to be used. diff --git a/bin/emailrelay.sh_ b/bin/emailrelay.sh_ index 50a39b0..045f6ea 100644 --- a/bin/emailrelay.sh_ +++ b/bin/emailrelay.sh_ @@ -36,12 +36,12 @@ # 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 SMTP proxy and store-and-forward MTA. +# Provides: emailrelay +# Required-Start: $network +# Required-Stop: $network +# Default-Start: 3 4 5 +# Default-Stop: 0 1 2 6 +# Short-Description: E-MailRelay SMTP proxy and store-and-forward MTA. ### END INIT INFO ## @@ -68,7 +68,14 @@ cfg_file="__SYSCONF_DIR__/emailrelay.conf" # server configuration using the config file # -start_switches="--as-server --pid-file ${pid_file} `cat \"${cfg_file}\" 2>/dev/null | egrep -v '^#|^ *$' | sed 's/^/--/'`" +ConfigSwitches() +{ + cat "${cfg_file}" 2>/dev/null | egrep -v '^#|^ *$' | sed 's/^/--/' +} +StartSwitches() +{ + echo --as-server --pid-file \"${pid_file}\" `ConfigSwitches` +} # functions... # @@ -212,7 +219,7 @@ case "${1}" in start) shift - ${style}_cmd_start "Starting E-MailRelay server" "${emailrelay}" ${start_switches} "$@" + eval ${style}_cmd_start \"Starting E-MailRelay server\" \"${emailrelay}\" `StartSwitches` "$@" ;; stop) diff --git a/bin/make-bundle.sh_ b/bin/make-bundle.sh_ index 974db65..f3ac22a 100644 --- a/bin/make-bundle.sh_ +++ b/bin/make-bundle.sh_ @@ -29,7 +29,7 @@ force="0" ; if test "$1" = "-f" ; then force="1" ; shift ; fi name="$1" exe="$2" icon="$3" -version="$4" ; if test "${version}" = "" ; then version="1.8.0" ; fi +version="$4" ; if test "${version}" = "" ; then version="1.8.1.0" ; fi if test "${name}" = "" then diff --git a/bin/mu2docbook.sh_ b/bin/mu2docbook.sh_ index becb588..b121bc9 100644 --- a/bin/mu2docbook.sh_ +++ b/bin/mu2docbook.sh_ @@ -301,11 +301,11 @@ then Tail "${title}" "${full}" elif test "${title}" = "" then - tmp="`basename $0`.tmp" - ${awk} '{print}' > ${tmp} - title="`${awk} '/^h1/ { sub(\"[^:]*:\",\"\") ; print ; exit }' ${tmp}`" - ${awk} '{print}' ${tmp} | Main "${title}" "${full}" | Anchorise - rm -f ${tmp} + tmp="/tmp/`basename $0`.$$.tmp" + ${awk} '{print}' > "${tmp}" + title="`${awk} '/^h1/ { sub(\"[^:]*:\",\"\") ; print ; exit }' \"${tmp}\"`" + ${awk} '{print}' "${tmp}" | Main "${title}" "${full}" | Anchorise + rm -f "${tmp}" else Main "${title}" "${full}" | Anchorise fi diff --git a/bin/mu2html.sh_ b/bin/mu2html.sh_ index 42d9746..df6b015 100644 --- a/bin/mu2html.sh_ +++ b/bin/mu2html.sh_ @@ -265,11 +265,12 @@ Anchorise() if test "${title}" = "" then - tmp="`basename $0`.tmp" - ${awk} '{print}' > ${tmp} - title="`${awk} '/^h1/ { sub(\"[^:]*:\",\"\") ; print ; exit }' ${tmp}`" - ${awk} '{print}' ${tmp} | Main "${title}" "${stylesheet}" "${full}" | Anchorise - rm -f ${tmp} + tmp="/tmp/`basename $0`.$$.tmp" + ${awk} '{print}' > "${tmp}" + touch "${tmp}" + title="`${awk} '/^h1/ { sub(\"[^:]*:\",\"\") ; print ; exit }' \"${tmp}\"`" + ${awk} '{print}' "${tmp}" | Main "${title}" "${stylesheet}" "${full}" | Anchorise + rm -f "${tmp}" else Main "${title}" "${stylesheet}" "${full}" | Anchorise fi diff --git a/configure b/configure index ad654ba..94434af 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for E-MailRelay 1.8. +# Generated by GNU Autoconf 2.61 for E-MailRelay 1.8.1. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -572,8 +572,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='E-MailRelay' PACKAGE_TARNAME='emailrelay' -PACKAGE_VERSION='1.8' -PACKAGE_STRING='E-MailRelay 1.8' +PACKAGE_VERSION='1.8.1' +PACKAGE_STRING='E-MailRelay 1.8.1' PACKAGE_BUGREPORT='' ac_unique_file="src/gsmtp/gsmtp.h" @@ -743,6 +743,8 @@ GLOB_TRUE GLOB_FALSE STATIC_START STATIC_END +INSTALL_HOOK_TRUE +INSTALL_HOOK_FALSE e_docdir e_initdir e_spooldir @@ -1270,7 +1272,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures E-MailRelay 1.8 to adapt to many kinds of systems. +\`configure' configures E-MailRelay 1.8.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1336,7 +1338,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of E-MailRelay 1.8:";; + short | recursive ) echo "Configuration of E-MailRelay 1.8.1:";; esac cat <<\_ACEOF @@ -1373,8 +1375,10 @@ Optional Features: --enable-mac enable building for a mac os x target (default auto) --enable-static-linking prefer static linking for some libraries (default no) - --enable-fhs force FHS-compliant directories, ignoring --prefix - etc (default no) + --enable-install-hook enable fixing up the start/stop configuration file + at install time (default yes) + --enable-fhs force linux FHS-compliant directories, ignoring + --prefix etc (default no) Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1465,7 +1469,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -E-MailRelay configure 1.8 +E-MailRelay configure 1.8.1 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1479,7 +1483,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by E-MailRelay $as_me 1.8, which was +It was created by E-MailRelay $as_me 1.8.1, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2170,7 +2174,7 @@ fi # Define the identity of the package. PACKAGE='emailrelay' - VERSION='1.8' + VERSION='1.8.1' # Some tools Automake needs. @@ -7551,6 +7555,22 @@ fi +# Check whether --enable-install-hook was given. +if test "${enable_install_hook+set}" = set; then + enableval=$enable_install_hook; +fi + + + if test x$enable_install_hook != xno; then + INSTALL_HOOK_TRUE= + INSTALL_HOOK_FALSE='#' +else + INSTALL_HOOK_TRUE='#' + INSTALL_HOOK_FALSE= +fi + + + # Check whether --enable-fhs was given. if test "${enable_fhs+set}" = set; then enableval=$enable_fhs; @@ -7646,7 +7666,7 @@ fi if test "$e_qtmoc" = "" ; then e_qtmoc="moc" ; fi -ac_config_files="$ac_config_files Makefile src/Makefile src/glib/Makefile src/gssl/Makefile src/gnet/Makefile src/gsmtp/Makefile src/gpop/Makefile src/main/Makefile src/win32/Makefile src/gui/Makefile lib/Makefile lib/gcc2.95/Makefile lib/msvc6.0/Makefile bin/Makefile doc/Makefile etc/Makefile test/Makefile extra/Makefile extra/mips/Makefile src/fragments/Makefile" +ac_config_files="$ac_config_files Makefile src/Makefile src/glib/Makefile src/gssl/Makefile src/gnet/Makefile src/gsmtp/Makefile src/gpop/Makefile src/main/Makefile src/win32/Makefile src/gui/Makefile lib/Makefile lib/gcc2.95/Makefile lib/msvc6.0/Makefile bin/Makefile doc/Makefile etc/Makefile test/Makefile extra/Makefile extra/mips/Makefile debian/Makefile src/fragments/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -7870,6 +7890,13 @@ echo "$as_me: error: conditional \"GLOB\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${INSTALL_HOOK_TRUE}" && test -z "${INSTALL_HOOK_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"INSTALL_HOOK\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"INSTALL_HOOK\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -8170,7 +8197,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by E-MailRelay $as_me 1.8, which was +This file was extended by E-MailRelay $as_me 1.8.1, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8223,7 +8250,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -E-MailRelay config.status 1.8 +E-MailRelay config.status 1.8.1 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -8358,6 +8385,7 @@ do "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; "extra/Makefile") CONFIG_FILES="$CONFIG_FILES extra/Makefile" ;; "extra/mips/Makefile") CONFIG_FILES="$CONFIG_FILES extra/mips/Makefile" ;; + "debian/Makefile") CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;; "src/fragments/Makefile") CONFIG_FILES="$CONFIG_FILES src/fragments/Makefile" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 @@ -8592,6 +8620,8 @@ GLOB_TRUE!$GLOB_TRUE$ac_delim GLOB_FALSE!$GLOB_FALSE$ac_delim STATIC_START!$STATIC_START$ac_delim STATIC_END!$STATIC_END$ac_delim +INSTALL_HOOK_TRUE!$INSTALL_HOOK_TRUE$ac_delim +INSTALL_HOOK_FALSE!$INSTALL_HOOK_FALSE$ac_delim e_docdir!$e_docdir$ac_delim e_initdir!$e_initdir$ac_delim e_spooldir!$e_spooldir$ac_delim @@ -8603,7 +8633,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 42; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 44; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.ac b/configure.ac index 5407a42..1ddb743 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ dnl dnl Process this file with autoconf to produce a configure script. dnl -AC_INIT([E-MailRelay],[1.8],,[emailrelay]) +AC_INIT([E-MailRelay],[1.8.1],,[emailrelay]) AC_CONFIG_SRCDIR(src/gsmtp/gsmtp.h) AM_INIT_AUTOMAKE([no-define]) AM_CONFIG_HEADER(config.h) @@ -193,13 +193,19 @@ dnl AC_ARG_ENABLE(static-linking,AC_HELP_STRING([--enable-static-linking],[prefer static linking for some libraries (default no)])) ENABLE_STATIC_LINKING +dnl === +dnl "--enable-install-hook" +dnl +AC_ARG_ENABLE(install-hook,AC_HELP_STRING([--enable-install-hook],[enable fixing up the start/stop configuration file at install time (default yes)])) +ENABLE_INSTALL_HOOK + dnl === dnl directory tweaking and "--enable-fhs" ... dnl dnl define e_ prefixed directory variables dnl dnl not AC_PREFIX_DEFAULT([/usr]) -AC_ARG_ENABLE(fhs,AC_HELP_STRING([--enable-fhs],[force FHS-compliant directories, ignoring --prefix etc (default no)])) +AC_ARG_ENABLE(fhs,AC_HELP_STRING([--enable-fhs],[force linux FHS-compliant directories, ignoring --prefix etc (default no)])) SET_DIRECTORIES AC_SUBST(e_docdir) AC_SUBST(e_initdir) @@ -213,5 +219,5 @@ if test "$e_qtmoc" = "" ; then e_qtmoc="moc" ; fi dnl === dnl generate files... dnl -AC_OUTPUT(Makefile src/Makefile src/glib/Makefile src/gssl/Makefile src/gnet/Makefile src/gsmtp/Makefile src/gpop/Makefile src/main/Makefile src/win32/Makefile src/gui/Makefile lib/Makefile lib/gcc2.95/Makefile lib/msvc6.0/Makefile bin/Makefile doc/Makefile etc/Makefile test/Makefile extra/Makefile extra/mips/Makefile src/fragments/Makefile) +AC_OUTPUT(Makefile src/Makefile src/glib/Makefile src/gssl/Makefile src/gnet/Makefile src/gsmtp/Makefile src/gpop/Makefile src/main/Makefile src/win32/Makefile src/gui/Makefile lib/Makefile lib/gcc2.95/Makefile lib/msvc6.0/Makefile bin/Makefile doc/Makefile etc/Makefile test/Makefile extra/Makefile extra/mips/Makefile debian/Makefile src/fragments/Makefile) diff --git a/debian/Makefile.am b/debian/Makefile.am new file mode 100644 index 0000000..ae6a6e5 --- /dev/null +++ b/debian/Makefile.am @@ -0,0 +1,17 @@ +# +## Copyright (C) 2001-2008 Graeme Walker +## +## 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 3 of the License, 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, see . +# +EXTRA_DIST = preinst postinst prerm postrm copyright changelog diff --git a/debian/Makefile.in b/debian/Makefile.in new file mode 100644 index 0000000..0be2920 --- /dev/null +++ b/debian/Makefile.in @@ -0,0 +1,321 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +subdir = debian +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +COMPILER_VERSION = @COMPILER_VERSION@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FRAGMENTS_LIST = @FRAGMENTS_LIST@ +GREP = @GREP@ +GZIP = @GZIP@ +HAVE_DOXYGEN = @HAVE_DOXYGEN@ +HAVE_MAN2HTML = @HAVE_MAN2HTML@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKE = @MAKE@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MOC = @MOC@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +QT_CFLAGS = @QT_CFLAGS@ +QT_LIBS = @QT_LIBS@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SSL_LIBS = @SSL_LIBS@ +STATIC_END = @STATIC_END@ +STATIC_START = @STATIC_START@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build_alias = @build_alias@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +e_docdir = @e_docdir@ +e_examplesdir = @e_examplesdir@ +e_initdir = @e_initdir@ +e_libexecdir = @e_libexecdir@ +e_qtmoc = @e_qtmoc@ +e_spooldir = @e_spooldir@ +e_sysconfdir = @e_sysconfdir@ +exec_prefix = @exec_prefix@ +host_alias = @host_alias@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# +# +EXTRA_DIST = preinst postinst prerm postrm copyright changelog +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu debian/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu debian/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am + +# 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/debian/changelog b/debian/changelog new file mode 100644 index 0000000..4a23f30 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,276 @@ +emailrelay (1.8.1) unstable; urgency=low + * Changed the definition of "--as-proxy" to use "--poll 0" rather than "--immediate" [bug-id 1961652]. + * Fixed stalling bug when using server-side TLS/SSL ("--server-tls") [bug-id 1961655]. + * Improved Debian packaging for Linux ("make deb"). + -- maintainer graeme_walker Wed, 21 May 2008 10:15:55 +0000 + +emailrelay (1.8) unstable; urgency=low + * Speed optimisations (as identified by KCachegrind/valgrind in KDevelop). + * Build-time size optimisations (eg. "./configure --disable-exec --enable-small-exceptions ..."). + * Build-time options to reduce runtime library dependencies (eg. "./configure --disable-dns --disable-identity"). + * New switch to limit the size of submitted messages ("--size"). + * New semantics for "--poll 0", providing a good alternative to "--immediate" when proxying. + * SMTP client protocol emits a RSET after a rejected recipient as a workround for broken server protocols. + * SMTP client protocol continues if the server advertises AUTH but the client has no authentication secrets. + * When a message cannot be forwarded the offending SMTP protocol response number, if any, is put in the envelope file. + * A warning is printed if logging is requested but both stderr and syslog are disabled. + * A cross-compiling toolchain builder script added for running on mips-based routers ("extra/mips"). + * New example scripts for SMTP multicasting and editing envelope files. + * Improved native support for Mac OS X (10.5) with graphical installation from disk image. + * Compatibility with gcc 2.95 restored. + -- maintainer graeme_walker Thu, 17 Apr 2008 00:00:00 +0000 + +emailrelay (1.7) unstable; urgency=low + * TLS/SSL support for SMTP using OpenSSL ("./configure --with-openssl" with "--client-tls" and "--server-tls"). + * Authentication mechanism "PLAIN" added. + * Some tightening up of the SMTP server protocol. + * Windows service wrapper has an "--uninstall" option. + * Windows installation GUI uninstalls the service before reinstalling it. + -- maintainer graeme_walker Tue, 02 Oct 2007 00:00:00 +0000 + +emailrelay (1.6) unstable; urgency=low + * GPLv3 licence (see "http://gplv3.fsf.org"). + * New "--prompt-timeout" switch for the timeout when waiting for the initial 220 prompt from the SMTP server. + * Fix for flow-control assertion error when the POP server sends a very long list of spooled messages. + * Wildcard matching for trusted IP addresses in the authentication secrets file can now use CIDR notation. + * More fine-grained switching of effective user-id to read files and directories when running as root. + * Fewer new client connections when proxying. + * The server drops the connection if a remote SMTP client causes too many protocol errors. + * More complete implementation of "--hidden" on Windows. + * Scanner switch ("--scanner") replaced by a more general "--filter" and "--client-filter" switch syntax. + * Support for address verification ("--verifier") over the network. + * Better support for running as a Windows service ("emailrelay-service --install"). + * Utility filter program "emailrelay-filter-copy" exits with 100 if it deletes the envelope file. + * Windows "cscript.exe" wrapper is added automatically to non-bat/exe "--filter" command-lines. + * Installation GUI makes backups of the files it edits and preserves authentication secrets. + * Installation GUI can install "init.d" links. + * Experimental SpamAssassin spamc/spamd protocol support. + * Acceptance tests added to the distribution. + -- maintainer graeme_walker Mon, 27 Aug 2007 00:00:00 +0000 + +emailrelay (1.5) unstable; urgency=low + * New installation and configuration GUI using TrollTech Qt 4.x ("./configure --enable-gui") + * Default address verifier accepts all addresses as valid and never treats them as local mailboxes. + * Fix for server exit bug when failing to send data down a newly accepted connection. + * Spooled content files can be left in the parent directory to save diskspace when using "--pop-by-name". + * Client protocol improved for the case where there are no valid recipients. + * New "--syslog" switch to override "--no-syslog". + * New "--filter-timeout" switch added. + * Support for "--foo=bar" switch syntax (ie. with "="). + * Multiple listening interfaces allowed with a comma-separated "--interface" list. + * New "--filter" utility called "emailrelay-filter-copy" to support "--pop-by-name". + * Documentation also created in docbook format (requires xmlto). + * Windows installation document revised. + -- maintainer graeme_walker Tue, 10 Apr 2007 00:00:00 +0000 + +emailrelay (1.4) unstable; urgency=low + * POP3 server (enable with "--pop", disable at build-time with "./configure --disable-pop"). + * Fix for logging reentrancy bug (affects "./configure --enable-debug" with "--debug"). + * Fix to ensure sockets are always non-blocking (affects "--scanner"). + * Allow "--verifier" scripts to reject addresses with a temporary "4xx" error code. + * Automatic re-reading of secrets files. + * Write to the Windows event log even if no write access to the registry. + * Modification of set-group-id policy if not started as root. + * Better checking of spool directory access on startup. + * New "emailrelay-submit.sh" example script for submitting messages for "--pop-by-name". + * The "--dont-listen" switch is now "--no-smtp". + * Better IPv6 support (Linux only). + -- maintainer graeme_walker Mon, 09 Jan 2006 00:00:00 +0000 + +emailrelay (1.3.3) unstable; urgency=low + * No bind() for outgoing connections [bug-id 1051689]. + * Updated rpm spec file [bug-id 1224850]. + * Fix for gcc3.4 compilation error in "md5.cpp". + * Fix for glob()/size_t compilation warning. + * Documentation of "auth" switches corrected. + * State-machine template type declaration modernised, possibly breaking older compilers. + -- maintainer graeme_walker Sun, 24 Jul 2005 00:00:00 +0000 + +emailrelay (1.3.2) unstable; urgency=low + * Fix for core dump when "--client-filter" pre-processing fails. + * Revised code structure to prepare for asynchronous pre-processing. + * Better diagnostics when pre-processor exec() fails. + * Better cleanup of empty and orphaned files. + -- maintainer graeme_walker Mon, 07 Jun 2004 00:00:00 +0000 + +emailrelay (1.3.1) unstable; urgency=low + * Windows resource leak from CreateProcess() fixed. + * Windows dialog box double-close fix. + * Some documentation for the "--scanner" switch. + * New usage patterns section in the user guide. + -- maintainer graeme_walker Fri, 14 May 2004 00:00:00 +0000 + +emailrelay (1.3) unstable; urgency=low + * Client protocol waits for a greeting from the server on startup [bug-id 842156]. + * Fix for incorrect backslash normalisation on "--verifier" command-lines containing spaces [bug-id 890646]. + * Verifier programs can now summarily abort a connection using an exit value of 100. + * New "--anonymous" switch that reduces information leakage to the SMTP client and disables "VRFY". + * Better validation of "MAIL-FROM" and "RCPT-TO" formatting. + * Rewrite of low-level MD5 code. + * Performance tuning. + * Template "emailrelay.conf" gets installed in "/etc". + * New switches for the "configure" script. + * More JavaScript example scripts. + -- maintainer graeme_walker Thu, 26 Feb 2004 00:00:00 +0000 + +emailrelay (1.2) unstable; urgency=low + * The "--filter" and "--verifier" arguments interpreted as command-lines; spaces in executable paths now need escaping. + * The "--interface" switch applies to outgoing connections too. + * New "--client-filter" switch to do synchronous message processing before sending. + * Keeps authentication after a "rset" command. + * Fix for dangling reference bug, seen after "quit" command on Windows. + * JavaScript examples in the documentation. + -- maintainer graeme_walker Mon, 03 Nov 2003 00:00:00 +0000 + +emailrelay (1.1.2) unstable; urgency=low + * Earlier check for un-bindable ports on startup, and later fork()ing [bug-id 776972]. + * Resolved the file-descriptor kludge for "--verifier" on Windows. + * Less strict about failing eight bit messages sent to servers with no "8BITMIME" extension. + * Supplementary group memberships revoked at startup if root or suid. + * Pre-processor ("--filter") program's standard output searched for a failure reason string. + * Undocumented "--scanner" switch added for asynchronous processing by a separate network server. + -- maintainer graeme_walker Sun, 07 Sep 2003 00:00:00 +0000 + +emailrelay (1.1.1) unstable; urgency=low + * Restored the fix for building with gcc2.96. + * Support for MinGW builds on Windows. + * More reasonable size of the "--help --verbose" message box on Windows. + * Windows "--icon" switch changed from "-i" to "-c" to avoid conflicting with "--interface". + * Shows "next server address" correctly in the configuration report when using "--forward-to". + * Fix for "make install" when "man2html" is not available. + * Updated init script. + -- maintainer graeme_walker Sat, 05 Jul 2003 00:00:00 +0000 + +emailrelay (1.1.0) unstable; urgency=low + * In proxy mode unexpected client-side disconnects and timeouts do not leave ".bad" files [see also bug-id 659039]. + * By default proxy mode does not interpret addresses for local delivery ("--postmaster"). + * Polling option added ("--poll") to rescan the spool directory periodically. + * New special exit code (103) for the pre-processor to trigger immediate polling; 100 to 107 now reserved. + * Orphaned zero-length content files are deleted properly if the server-side dialogue is cut short. + * The "--interface" switch applies to the "--admin" interface too. + * Improved internal event architecture using slot/signal design pattern, and fewer singleton classes. + * Event notification available through the administration interface. + * New "--hidden" switch for Windows. + * Syslog output includes process-id. + * Support for Sun WorkShop 5.0 added. + * Documentation overhaul. + -- maintainer graeme_walker Sun, 18 May 2003 00:00:00 +0000 + +emailrelay (1.0.2) unstable; urgency=low + * Support for trusted IP addresses, allowing certain clients to avoid authentication. + * Address verifier interface extended to include authentication information. + * New public mail relay section added to the user guide. + * Example verifier scripts etc. added to the reference guide. + -- maintainer graeme_walker Sun, 16 Feb 2003 00:00:00 +0000 + +emailrelay (1.0.1) unstable; urgency=low + * In proxy mode unexpected client-side disconnects and timeouts result in ".bad" files [bug-id 659039]. + * Require successful "AUTH" before "MAIL FROM" when using "--server-auth". + * Better word-wrap on "--help" output. + * Use of RedHat's "functions" code, and support for "chkconfig", added to the "init.d" script. + * Builds with gcc3.2 (1.0.0-pl5). + * Fix for files left as "busy" after a connection failure in proxy mode [bug-id 631032] (1.0.0-pl3/4/5). + * Trivial documentation fixes (1.0.0-pl3). + * Fix for the double-dot escape bug in the client protocol [bug-id 611624] (1.0.0-pl2). + * Fix build when using gcc2.96 rather than gcc2.95 (1.0.0-pl1). + * Fix default spool directory in example scripts (1.0.0-pl1). + -- maintainer graeme_walker Sun, 12 Jan 2003 00:00:00 +0000 + +emailrelay (1.0.0) unstable; urgency=low + * 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]. + -- maintainer graeme_walker Fri, 16 Aug 2002 00:00:00 +0000 + +emailrelay (0.9.9) unstable; urgency=low + * More flexible logging options ("--verbose" and "--debug" work better). + * File Hierarchy Standard (FHS) option for "configure" ("--enable-fhs"). + * FHS-compatible RPMs. + * Spool files writeable by pre-processor when server started as root. + * Default directories in executables and scripts come from "configure". + * The "init.d" script is renamed "emailrelay" (was "emailrelay.sh"). + * Man pages are gzipped when installed. + * Fix for access violation under Windows NT when client disconnects. + * Use of event log when compiled on Windows NT. + * Fix for info-after-flush bug when using the administration interface. [rc2] + * New "resubmit" script. [rc2] + * Submit utility works under Windows. [rc2] + * Improved Windows project files. [rc2] + -- maintainer graeme_walker Mon, 22 Apr 2002 00:00:00 +0000 + +emailrelay (0.9.8) unstable; urgency=low + * Fix for running pre-processor ("--filter") as root. + * Ignore bogus "AUTH=LOGIN" lines in EHLO response. + * Submit utility improved to work with mutt. + * Installation of submit man page. + -- maintainer graeme_walker Tue, 26 Mar 2002 00:00:00 +0000 + +emailrelay (0.9.7) unstable; urgency=low + * CRAM-MD5 authentication mechanism added. + * Revoke root permissions at start up, and reclaim them when needed. + * Allow mail pre-processing ("--filter") when started as root. + * Domain-override switch ("--domain") added. + * Non-privileged user switch ("--user") added. + * Better handling of NarrowPipe exception (ie. 8-bit message to 7-bit server). + * Allow null return path in MAIL-FROM. + * Reject recipients which look like "@localhost" (as used by fetchmail for local delivery). + * Treat recipients which look like "postmaster@localhost" or "postmaster@" as local postmaster. + * Optional timestamps on log output ("--log-time"). + * Fix EHLO to HELO fallback for 501/502 responses in client protocol. + * Submission utility "emailrelay-submit" added. + * HTML4.0 compliant HTML documentation, using CSS. + -- maintainer graeme_walker Sun, 17 Mar 2002 00:00:00 +0000 + +emailrelay (0.9.6) unstable; urgency=low + * SMTP AUTHentication extension -- LOGIN mechanism only. + * Client-side protocol timeout. + * Client-side connection timeout. + * Preprocessor can cancel further message processing. + * Client's IP address recorded in envelope files. + * Multiple hard-coded listening addresses supported at compile-time. + * Fix for automatic reopening of stderr stream. + -- maintainer graeme_walker Tue, 18 Dec 2001 00:00:00 +0000 + +emailrelay (0.9.5) unstable; urgency=low + * system-tray + dialog-box user interface + * fix for dropped connections + * fix for content file deletion + * fix for directory iterator + -- maintainer graeme_walker Sat, 27 Oct 2001 00:00:00 +0000 + +emailrelay (0.9.4) unstable; urgency=low + * Fixed memory leak when no "--log" switch. + * Windows build is more "gui" and less "command-line". + * "Info" command added to the administration interface. + * Doxygen files removed from binary RPM. + -- maintainer graeme_walker Tue, 23 Oct 2001 00:00:00 +0000 + +emailrelay (0.9.3) unstable; urgency=low + * Proxy mode ("--immediate" and "--as-proxy"). + * Message pre-processing ("--filter"). + * Message store classes better separated using abstract interfaces. + * Improved notification script, with MIME encoding. + * Builds with old 2.91 version of gcc. + -- maintainer graeme_walker Fri, 19 Oct 2001 00:00:00 +0000 + +emailrelay (0.9.2) unstable; urgency=low + * Better autoconf detection. + * Workround for FreeBSD uname() feature. + * Added missing ".sh_" files to the distribution. + * Fixed a benign directory iterator bug. + * Use of gcc's "exception" header. + -- maintainer graeme_walker Thu, 13 Sep 2001 00:00:00 +0000 + +emailrelay (0.9.1) unstable; urgency=low + * Improved documentation from doxygen. + * More complete use of namespaces. + * Experimental compile-time support for IPv6. + -- maintainer graeme_walker Sat, 08 Sep 2001 00:00:00 +0000 + diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..4084349 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,19 @@ +Copyright +========= +Copyright (C) 2001-2008 Graeme Walker + +Refer to the file COPYING (included), /usr/share/common-licenses/GPL-3, or + for the terms of the GNU General Public License. + +Binary distributions +-------------------- +Binary distributions of E-MailRelay may include copyrighted code from: +* OpenSSL Toolkit (http://www.openssl.org) +* MinGW (http://www.mingw.org) +* Trolltech Qt (http://trolltech.com) + +These are distributed under licenses compatible with the GPLv3. Please +refer to their websites for further details. + +This product includes software developed by the OpenSSL Project +for use in the OpenSSL Toolkit. (http://www.openssl.org/) diff --git a/debian/postinst b/debian/postinst new file mode 100644 index 0000000..e7dedbc --- /dev/null +++ b/debian/postinst @@ -0,0 +1,37 @@ +#!/bin/sh +# +# postinst +# + +spool="/var/spool/emailrelay" +submit="/usr/sbin/emailrelay-submit" + +create_spool() +{ + test -d "$spool" || mkdir "$spool" +} + +fix_permissions() +{ + if ls -nd "$spool" | cut -d' ' --fields=3,4 | grep -q '^0 0$' + then + chgrp daemon "$spool" && chmod 775 "$spool" + fi + if ls -n "$submit" | cut -d' ' --fields=3,4 | grep -q '^0 0$' + then + chgrp daemon "$submit" && chmod g+s "$submit" + fi +} + +fix_html() +{ + # index.html refers to changelog.html + cd /usr/share/doc/emailrelay && gzip -d -c changelog.html.gz > changelog.html +} + +#DEBHELPER# + +create_spool +fix_permissions +fix_html + diff --git a/debian/postrm b/debian/postrm new file mode 100644 index 0000000..4eac298 --- /dev/null +++ b/debian/postrm @@ -0,0 +1,15 @@ +#!/bin/sh +# +# postrm +# + +spool="/var/spool/emailrelay" + +rm -f /usr/share/doc/emailrelay/changelog.html || true +if test "$1" = "purge" +then + rmdir "$spool" || true +fi + +#DEBHELPER# + diff --git a/debian/preinst b/debian/preinst new file mode 100644 index 0000000..6f9014c --- /dev/null +++ b/debian/preinst @@ -0,0 +1,20 @@ +#!/bin/sh +# +# preinst +# + +spool="/var/spool/emailrelay" + +create_spool() +{ + test -d "$spool" || mkdir "$spool" + if ls -nd "$spool" | cut -d' ' --fields=3,4 | grep -q '^0 0$' + then + chgrp daemon "$spool" && chmod 775 "$spool" + fi +} + +create_spool + +#DEBHELPER# + diff --git a/debian/prerm b/debian/prerm new file mode 100644 index 0000000..65c6c9b --- /dev/null +++ b/debian/prerm @@ -0,0 +1,7 @@ +#!/bin/sh +# +# prerm +# + +#DEBHELPER# + diff --git a/doc/Makefile.am b/doc/Makefile.am index 60617eb..9a967c8 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -94,7 +94,7 @@ emailrelay-poke.1.gz: emailrelay-poke.1 install-data-local: install-e_docDATA $(mkinstalldirs) "$(DESTDIR)$(e_docdir)/doxygen" - if test "$(HAVE_DOXYGEN)" = "yes" ; then for file in doxygen/* ; do $(INSTALL) "$$file" "$(DESTDIR)$(e_docdir)/$$file" ; done ; fi + for file in doxygen/* ; do $(INSTALL) --mode=644 "$$file" "$(DESTDIR)$(e_docdir)/$$file" ; done uninstall-local: -find "$(DESTDIR)$(e_docdir)/doxygen" -type f | xargs rm -f diff --git a/doc/Makefile.in b/doc/Makefile.in index 7c64cbd..7b7c2ab 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -478,7 +478,7 @@ emailrelay-poke.1.gz: emailrelay-poke.1 install-data-local: install-e_docDATA $(mkinstalldirs) "$(DESTDIR)$(e_docdir)/doxygen" - if test "$(HAVE_DOXYGEN)" = "yes" ; then for file in doxygen/* ; do $(INSTALL) "$$file" "$(DESTDIR)$(e_docdir)/$$file" ; done ; fi + for file in doxygen/* ; do $(INSTALL) --mode=644 "$$file" "$(DESTDIR)$(e_docdir)/$$file" ; done uninstall-local: -find "$(DESTDIR)$(e_docdir)/doxygen" -type f | xargs rm -f diff --git a/doc/emailrelay-man.html b/doc/emailrelay-man.html index a30109a..4303bdc 100644 --- a/doc/emailrelay-man.html +++ b/doc/emailrelay-man.html @@ -87,7 +87,7 @@ Runs as a client, forwarding spooled mail to <host>: equivalent to --lo
-y, --as-proxy <host:port>
-Runs as a proxy: equivalent to --log --close-stderr --immediate --forward-to. +Runs as a proxy: equivalent to --log --close-stderr --poll=0 --forward-to.
-d, --as-server
diff --git a/doc/emailrelay.1 b/doc/emailrelay.1 index 47b872d..f4c49d5 100644 --- a/doc/emailrelay.1 +++ b/doc/emailrelay.1 @@ -65,7 +65,7 @@ Disables the smtp vrfy command and sends less verbose smtp responses. Runs as a client, forwarding spooled mail to : equivalent to \fI--log\fR \fI--no-syslog\fR \fI--no-daemon\fR \fI--dont-serve\fR \fI--forward\fR \fI--forward-to\fR. .TP .B \-y, --as-proxy \fI\fR -Runs as a proxy: equivalent to \fI--log\fR \fI--close-stderr\fR \fI--immediate\fR \fI--forward-to\fR. +Runs as a proxy: equivalent to \fI--log\fR \fI--close-stderr\fR \fI--poll\fR=0 \fI--forward-to\fR. .TP .B \-d, --as-server Runs as a server: equivalent to \fI--log\fR \fI--close-stderr\fR. diff --git a/doc/reference.txt b/doc/reference.txt index 8602dcb..bbcd04a 100644 --- a/doc/reference.txt +++ b/doc/reference.txt @@ -21,7 +21,7 @@ where is: Runs as a client, forwarding spooled mail to : equivalent to "--log --no-syslog --no-daemon --dont-serve --forward --forward-to". # --as-proxy (-y) - Runs as a proxy: equivalent to "--log --close-stderr --immediate --forward-to". + Runs as a proxy: equivalent to "--log --close-stderr --poll=0 --forward-to". # --as-server (-d) Runs as a server: equivalent to "--log --close-stderr". diff --git a/doc/userguide.txt b/doc/userguide.txt index e7f40bc..73b79ec 100644 --- a/doc/userguide.txt +++ b/doc/userguide.txt @@ -149,7 +149,7 @@ For more verbose logging add the "--verbose" switch. If this becomes difficult to read via the system log (especially on Windows) then try logging to the standard error stream and redirect that to a file. Bear in mind that you will need have to replace "--as-server" with "--log" and "--as-proxy" with -"--immediate --forward-to" since the "--as-server" and "--as-proxy" switches +"--poll 0 --forward-to" since the "--as-server" and "--as-proxy" switches implicitly close the standard error stream soon after startup. emailrelay --log --verbose > emailrelay.log 2>&1 @@ -327,24 +327,6 @@ failed e-mails to bounce back to your in-tray by running the "emailrelay-notify.sh" script periodically as "root", although this does require "procmail" to act as a delivery agent. -Polling and timeouts --------------------- -In normal proxy mode, using "--immediate" or "--as-proxy", the E-MailRelay -server will try forward each message as soon as it is received and only then -will it acknowledge receipt of the message back to the submitting client. This -has the advantage that any problems with the forwarding process can be reported -back to the submitting client; any failures should be reported your e-mail -client program and the failed messages should stay in its "outbox". - -However, some e-mail client programs are not always prepared to wait long enough -for the message to be forwarded and this can result in problems with timeouts. A -good fix for this is to use the "--poll" mechanism as a replacement for -"--immediate"/"--as-proxy". In this way the submitting e-mail client program -does not have to wait for the E-MailRelay server to forward each message and so -it should not time out. If you have timeout problems try replacing "--immediate" -with "--poll 0" so that forwarding is done as soon as the client has finished -submitting messages. - Usage patterns -------------- The simplest ways of using E-MailRelay for SMTP are as a proxy or as a diff --git a/doc/windows.txt b/doc/windows.txt index 51ea90e..a1577dc 100644 --- a/doc/windows.txt +++ b/doc/windows.txt @@ -46,7 +46,7 @@ Note that the batch file and the main E-MailRelay executable must be in the same directory. If you need to run multiple E-MailRelay services then pass a unique service name -on the "emailrelay-server --install " command-line. This name is used to +on the "emailrelay-service --install " command-line. This name is used to derive the name of the "-start.bat" batch file that contains the E-MailRelay server's command-line switches so you will need to create this too. @@ -57,12 +57,12 @@ you can view by running "eventvwr.exe". You can increase the verbosity by adding the "--verbose" switch to the E-MailRelay command-line, typically by editing the "emailrelay-start.bat" batch script. -The E-MailRelay server also logs to the standard error stream, however the +The E-MailRelay server also logs to the standard error stream. However, the "--as-server" and "--as-proxy" switches implicitly incorporate "--close-stderr" so with these switches the standard error logging will stop soon after startup. To get continuous logging to a log file you should replace "--as-server" with -"--log" and "--as-proxy" with "--immediate --forward-to" and then use "2>" to +"--log" and "--as-proxy" with "--poll 0 --forward-to" and then use "2>" to redirect the standard error stream, eg: "c:\program files\emailrelay\emailrelay.exe" --log -v -L ... > c:\temp.out 2>&1 diff --git a/emailrelay.spec b/emailrelay.spec index 5e65d20..c402bf3 100644 --- a/emailrelay.spec +++ b/emailrelay.spec @@ -1,11 +1,11 @@ Summary: Simple e-mail message transfer agent and proxy using SMTP Name: emailrelay -Version: 1.8 +Version: 1.8.1 Release: 1 License: GPL3 Group: System Environment/Daemons URL: http://emailrelay.sourceforge.net/ -Source: http://sourceforge.net/sourceforge/emailrelay/emailrelay-1.8-src.tar.gz +Source: http://sourceforge.net/sourceforge/emailrelay/emailrelay-1.8.1-src.tar.gz BuildRoot: /tmp/emailrelay-install %description @@ -30,7 +30,7 @@ Distribution is under the GNU General Public License V3. %setup %build -./configure --enable-fhs --disable-gui --without-man2html --without-doxygen --with-openssl --enable-static-linking +./configure --enable-fhs --disable-gui --without-man2html --without-doxygen --with-openssl --enable-static-linking --disable-install-hook make %install @@ -79,6 +79,8 @@ test "$RPM_BUILD_ROOT" = "/" || rm -rf "$RPM_BUILD_ROOT" %doc /usr/share/doc/emailrelay/ChangeLog %doc /usr/share/doc/emailrelay/windows.txt /usr/share/doc/emailrelay/emailrelay-man.html +%docdir /usr/share/doc/emailrelay/doxygen +/usr/share/doc/emailrelay/doxygen/index.html %dir /usr/lib/emailrelay %dir /usr/lib/emailrelay/examples /usr/lib/emailrelay/examples/emailrelay-process.sh diff --git a/etc/Makefile.am b/etc/Makefile.am index ae1c541..63562d1 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -19,6 +19,15 @@ EXTRA_DIST = emailrelay.conf.template e_sysconf_DATA = emailrelay.conf.template +if INSTALL_HOOK + install-data-hook: if test -f "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf" ; then : ; else cat "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf.template" | sed "s:^#spool-dir /var/spool/emailrelay:spool-dir $(DESTDIR)$(e_spooldir):g" | sed 's:"/var/spool/emailrelay":"'"$(e_spooldir)"'":g' | sed "s:/etc:$(e_sysconfdir):g" | sed "s:/usr/local/bin:$(e_libexecdir):g" > "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf" ; fi +else + +install-data-hook: + if test -f "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf" ; then : ; else cp "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf.template" "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf" ; fi + +endif + diff --git a/etc/Makefile.in b/etc/Makefile.in index ef48f33..c87ed35 100644 --- a/etc/Makefile.in +++ b/etc/Makefile.in @@ -352,8 +352,11 @@ uninstall-am: uninstall-e_sysconfDATA uninstall-am uninstall-e_sysconfDATA -install-data-hook: - if test -f "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf" ; then : ; else cat "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf.template" | sed "s:^#spool-dir /var/spool/emailrelay:spool-dir $(DESTDIR)$(e_spooldir):g" | sed 's:"/var/spool/emailrelay":"'"$(e_spooldir)"'":g' | sed "s:/etc:$(e_sysconfdir):g" | sed "s:/usr/local/bin:$(e_libexecdir):g" > "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf" ; fi +@INSTALL_HOOK_TRUE@install-data-hook: +@INSTALL_HOOK_TRUE@ if test -f "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf" ; then : ; else cat "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf.template" | sed "s:^#spool-dir /var/spool/emailrelay:spool-dir $(DESTDIR)$(e_spooldir):g" | sed 's:"/var/spool/emailrelay":"'"$(e_spooldir)"'":g' | sed "s:/etc:$(e_sysconfdir):g" | sed "s:/usr/local/bin:$(e_libexecdir):g" > "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf" ; fi + +@INSTALL_HOOK_FALSE@install-data-hook: +@INSTALL_HOOK_FALSE@ if test -f "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf" ; then : ; else cp "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf.template" "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf" ; fi # 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/etc/emailrelay.conf.template b/etc/emailrelay.conf.template index 3756b66..87675a0 100644 --- a/etc/emailrelay.conf.template +++ b/etc/emailrelay.conf.template @@ -73,6 +73,15 @@ # #client-tls +# Name: server-tls +# Format: server-tls +# Description: Enables the tls/ssl layer when acting as an smtp server. +# Use the "openssl" utility to create and test a ".pem" certificate file. +# Note that OpenSSL requires certificates to be installed in a trusted +# directory, such as "/etc/ssl/certs". Use a full path to the certificate file. +# +#server-tls /etc/ssl/certs/emailrelay.pem + # Name: connection-timeout # Format: connection-timeout