Commit 6d73e5dc authored by Ondrej Sury's avatar Ondrej Sury

Imported Upstream version 0.76.0

parent 2a06c2d3
0.76.0
2016-04-23 Sam Varshavchik <mrsam@courier-mta.com>
* Stop using SSL2 and SSL3 openssl configuration methods.
2016-03-06 Sam Varshavchik <mrsam@courier-mta.com>
* libs/rfc1035/spf.c: "mx" keyword a no-op MX-less domains, rather
than returning "error".
2016-03-03 Sam Varshavchik <mrsam@courier-mta.com>
* libs/tcpd/libcouriertls.c: Add support for TLS SNI.
2015-12-20 Sam Varshavchik <mrsam@courier-mta.com>
* maildrop: implement the FLAGS variable.
2015-12-16 Andreas Kinzler <ml-ak@posteo.de>
* maildrop: fix maildrop not searching last line of text.
2015-07-19 Sam Varshavchik <mrsam@courier-mta.com>
* Add procps-ng to BuildRequires.
* maildrop: fix parsing of a message without a body.
* courier/submit.C: Write SPF-Received lines before the first
Received header. Fix bug that prevented HELO's SPF-Received line
from being written.
0.75.0
2015-06-27 "Hanno Böck" <hanno@hboeck.de>
* libs/maildrop/mailbot.c: Fix bad malloc for --feedback-* command
......
......@@ -140,7 +140,7 @@ dorpm:
rm -f rpm/SOURCES/*
rm -f rpm/SPECS/*
rm -f rpm/SRPMS/*
rpmbuild -ta --clean \
rpmbuild -ta --clean $(RPMXFLAGS) \
--define "_topdir `pwd`/rpm" \
--define '_rpmdir %{_topdir}/RPMS' \
--define '_srcrpmdir %{_topdir}/SRPMS' \
......
......@@ -254,6 +254,7 @@ LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
......@@ -955,7 +956,7 @@ dorpm:
rm -f rpm/SOURCES/*
rm -f rpm/SPECS/*
rm -f rpm/SRPMS/*
rpmbuild -ta --clean \
rpmbuild -ta --clean $(RPMXFLAGS) \
--define "_topdir `pwd`/rpm" \
--define '_rpmdir %{_topdir}/RPMS' \
--define '_srcrpmdir %{_topdir}/SRPMS' \
......
This diff is collapsed.
......@@ -2,7 +2,7 @@
# Output a system dependent set of variables, describing how to set the
# run time search path of shared libraries in an executable.
#
# Copyright 1996-2013 Free Software Foundation, Inc.
# Copyright 1996-2015 Free Software Foundation, Inc.
# Taken from GNU libtool, 2001
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
#
......@@ -367,11 +367,7 @@ else
dgux*)
hardcode_libdir_flag_spec='-L$libdir'
;;
freebsd2.2*)
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
;;
freebsd2*)
freebsd2.[01]*)
hardcode_direct=yes
hardcode_minus_L=yes
;;
......@@ -548,13 +544,11 @@ case "$host_os" in
dgux*)
library_names_spec='$libname$shrext'
;;
freebsd[23].*)
library_names_spec='$libname$shrext$versuffix'
;;
freebsd* | dragonfly*)
case "$host_os" in
freebsd[123]*)
library_names_spec='$libname$shrext$versuffix' ;;
*)
library_names_spec='$libname$shrext' ;;
esac
library_names_spec='$libname$shrext'
;;
gnu*)
library_names_spec='$libname$shrext'
......
This diff is collapsed.
dnl Process this file with autoconf to produce a configure script.
dnl
dnl Copyright 1998 - 2015 Double Precision, Inc. See COPYING for
dnl Copyright 1998 - 2016 Double Precision, Inc. See COPYING for
dnl distribution information.
AC_PREREQ(2.59)
AC_INIT(courier, 0.75.0, [courier-users@lists.sourceforge.net])
AC_INIT(courier, 0.76.0, [courier-users@lists.sourceforge.net])
version=$PACKAGE_VERSION
AC_CONFIG_SRCDIR(courier/courier.c)
AM_INIT_AUTOMAKE
......
......@@ -59,16 +59,16 @@
# -----------------------------------------------------------------------------
Summary: Courier 0.75.0 mail server
Summary: Courier 0.76.0 mail server
Name: courier
Version: 0.75.0
Version: 0.76.0
Release: 1%{?dist}%{courier_release}
Group: Applications/Mail
License: GPL
URL: http://www.courier-mta.org
Packager: %{PACKAGER}
Source: http://download.sourceforge.net/courier/courier-0.75.0.tar.bz2
Source: http://download.sourceforge.net/courier/courier-0.76.0.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
Provides: smtpdaemon server(smtp)
Provides: config(courier) = %{version}-%{release}
......@@ -100,6 +100,7 @@ BuildRequires: sed
BuildRequires: gawk
BuildRequires: perl
BuildRequires: make
BuildRequires: procps-ng
BuildRequires: %(which gpg >/dev/null 2>/dev/null && echo 'gnupg >= 1.0.5' && exit 0; echo gnupg2)
BuildRequires: expect
BuildRequires: gdbm-devel
......@@ -134,77 +135,83 @@ BuildRequires: netpbm-progs
BuildRequires: pcre-devel
Obsoletes: courier-smtpauth
%define need_perl_generators %(if rpm -q fedora-release >/dev/null 2>/dev/null; then echo "1"; exit 0; fi; echo "1"; exit 1)
%if %need_perl_generators
BuildRequires: perl-generators
%endif
%if ! %alternatives
%package sendmail-wrapper
Summary: Courier 0.75.0 soft links for sendmail
Summary: Courier 0.76.0 soft links for sendmail
Group: Applications/Mail
%endif
%package ldap
Summary: Courier 0.75.0 LDAP modules and configuration screen
Summary: Courier 0.76.0 LDAP modules and configuration screen
Group: Application/Mail
%package mysql
Summary: Courier 0.75.0 MySQL configuration screen
Summary: Courier 0.76.0 MySQL configuration screen
Group: Application/Mail
%package pgsql
Summary: Courier 0.75.0 PostgreSQL configuration screen
Summary: Courier 0.76.0 PostgreSQL configuration screen
Group: Application/Mail
%package pop3d
Summary: Courier 0.75.0 Integrated POP3 server
Summary: Courier 0.76.0 Integrated POP3 server
Group: Applications/Mail
Requires: courier = 0.75.0 fileutils
Requires: courier = 0.76.0 fileutils
%package imapd
Summary: Courier 0.75.0 Integrated IMAP server
Summary: Courier 0.76.0 Integrated IMAP server
Group: Applications/Mail
Requires: courier = 0.75.0 fileutils
Requires: courier = 0.76.0 fileutils
%package webmail
Summary: Courier 0.75.0 Integrated HTTP (webmail) server
Summary: Courier 0.76.0 Integrated HTTP (webmail) server
Group: Applications/Mail
Requires: courier = 0.75.0 %{apache_documentroot} /etc/cron.hourly %(which gpg >/dev/null 2>/dev/null && echo 'gnupg >= 1.0.5' && exit 0; echo gnupg2) expect fileutils
Requires: courier = 0.76.0 %{apache_documentroot} /etc/cron.hourly %(which gpg >/dev/null 2>/dev/null && echo 'gnupg >= 1.0.5' && exit 0; echo gnupg2) expect fileutils
%if %is_not_mandrake
Requires: %{apache_cgibindir}
%endif
%package webadmin
Summary: Courier 0.75.0 web-based administration tool
Summary: Courier 0.76.0 web-based administration tool
Group: Applications/Mail
Requires: courier = 0.75.0 %{apache_documentroot}
Requires: courier = 0.76.0 %{apache_documentroot}
%if %is_not_mandrake
Requires: %{apache_cgibindir}
%endif
%package mlm
Summary: Courier 0.75.0 Integrated Mailing List Manager
Summary: Courier 0.76.0 Integrated Mailing List Manager
Group: Applications/Mail
Requires: courier = 0.75.0
Requires: courier = 0.76.0
%package mlm-web
Summary: Courier 0.75.0 Integrated web-based mailing list interface
Summary: Courier 0.76.0 Integrated web-based mailing list interface
Group: Applications/Mail
Requires: courier-mlm = 0.75.0 %{apache_documentroot}
Requires: courier-mlm = 0.76.0 %{apache_documentroot}
%if %is_not_mandrake
Requires: %{apache_cgibindir}
%endif
%package maildrop
Summary: Courier 0.75.0 Integrated mail filter
Summary: Courier 0.76.0 Integrated mail filter
Group: Applications/Mail
Requires: courier = 0.75.0
Requires: courier = 0.76.0
%package fax
Summary: Courier 0.75.0 fax support
Summary: Courier 0.76.0 fax support
Group: Application/Mail
Requires: courier = 0.75.0 groff ghostscript netpbm-progs mgetty-sendfax
Requires: courier = 0.76.0 groff ghostscript netpbm-progs mgetty-sendfax
%package maildrop-wrapper
Summary: Courier 0.75.0 soft links for maildrop
Summary: Courier 0.76.0 soft links for maildrop
Group: Applications/Mail
Requires: courier-maildrop = 0.75.0
Requires: courier-maildrop = 0.76.0
%description
The Courier mail transfer agent (MTA) is an integrated mail/groupware
......
......@@ -100,6 +100,7 @@ BuildRequires: sed
BuildRequires: gawk
BuildRequires: perl
BuildRequires: make
BuildRequires: procps-ng
BuildRequires: %(which gpg >/dev/null 2>/dev/null && echo 'gnupg >= 1.0.5' && exit 0; echo gnupg2)
BuildRequires: expect
BuildRequires: gdbm-devel
......@@ -134,6 +135,12 @@ BuildRequires: netpbm-progs
BuildRequires: pcre-devel
Obsoletes: courier-smtpauth
%define need_perl_generators %(if rpm -q fedora-release >/dev/null 2>/dev/null; then echo "1"; exit 0; fi; echo "1"; exit 1)
%if %need_perl_generators
BuildRequires: perl-generators
%endif
%if ! %alternatives
%package sendmail-wrapper
Summary: Courier @VERSION@ soft links for sendmail
......
......@@ -494,6 +494,7 @@ LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAILDROP = @MAILDROP@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
......
This diff is collapsed.
......@@ -111,8 +111,7 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
/* Whether maildrop is installed */
......
This diff is collapsed.
......@@ -3,7 +3,7 @@ dnl
dnl Copyright 1998 - 2013 Double Precision, Inc. See COPYING for
dnl distribution information.
AC_INIT(courier, 0.75, [courier-users@lists.sourceforge.net])
AC_INIT(courier, 0.76, [courier-users@lists.sourceforge.net])
>confdefs.h # Kill PACKAGE_ macros
......
##VERSION: $Id: d46cade24fa729577b9b1a6fff156844f929a1cb-20150627135144$
##VERSION: $Id: a61b6f9173bf2b9fcb0e0e253a47f53ff34359b4-20160424075308$
#
# courierd created from courierd.dist by sysconftool
#
......@@ -308,14 +308,12 @@ ESMTP_PREFER_IPV6_MX=1
#
# OpenSSL:
#
# SSL3 - SSLv3
# SSL23 - all protocols (including TLS 1.x protocols)
# TLSv1 - TLS1
# TLSv1.1 - TLS1.1
# TLSv1.2 - TLS1.2
#
#
# SSL3+, TLSv1+, TLSv1.1+, and TLSv1.2+ - the corresponding protocol, and all
# TLSv1+, TLSv1.1+, and TLSv1.2+ - the corresponding protocol, and all
# higher protocols.
#
# The default value is TLSv1+
......
This diff is collapsed.
......@@ -346,6 +346,7 @@ LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
......
This diff is collapsed.
......@@ -57,8 +57,7 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
/* Define to the address where bug reports for this package should be sent. */
......
This diff is collapsed.
......@@ -275,6 +275,7 @@ LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
......
This diff is collapsed.
......@@ -30,8 +30,7 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
/* Define to the address where bug reports for this package should be sent. */
......
This source diff could not be displayed because it is too large. You can view the blob instead.
##VERSION: $Id: 7b218a8185f424046f3ef3322a37443983e443e3-20150606110138$
##VERSION: $Id: 7b218a8185f424046f3ef3322a37443983e443e3-20151104103938$
#
# ldapaliasrc created from ldapaliasrc.dist by sysconftool
#
......
......@@ -302,6 +302,7 @@ LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
......
This diff is collapsed.
This diff is collapsed.
......@@ -108,8 +108,7 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
/* Maximum size of an long value */
......
......@@ -280,6 +280,7 @@ LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
......
This diff is collapsed.
......@@ -39,8 +39,7 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
/* Define to the address where bug reports for this package should be sent. */
......
This diff is collapsed.
......@@ -320,6 +320,7 @@ LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
......
This diff is collapsed.
......@@ -99,8 +99,7 @@
/* Courier extension string */
#undef IS_VERP_KEYWORD
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
/* Define to the address where bug reports for this package should be sent. */
......
This source diff could not be displayed because it is too large. You can view the blob instead.
##VERSION: $Id: 7da60162a011d59e274884f305c57ea22d3c83f3-20150522071622$
##VERSION: $Id: a61b6f9173bf2b9fcb0e0e253a47f53ff34359b4-20160424075309$
#
# esmtpd-ssl created from esmtpd-ssl.dist by sysconftool
#
# Do not alter lines that begin with ##, they are used when upgrading
# this configuration.
#
# Copyright 2000-2013 Double Precision, Inc. See COPYING for
# Copyright 2000-2016 Double Precision, Inc. See COPYING for
# distribution information.
#
# This configuration file sets various options for the Courier-SMTP server
......@@ -174,13 +174,11 @@ COURIERTLS=@bindir@/couriertls
#
# OpenSSL:
#
# SSL3 - SSLv3
# SSL23 - all protocols (including TLS 1.x protocols)
# TLSv1 - TLS1
# TLSv1.1 - TLS1.1
# TLSv1.2 - TLS1.2
#
# SSL3+, TLSv1+, TLSv1.1+, and TLSv1.2+ - the corresponding protocol, and all
# TLSv1+, TLSv1.1+, and TLSv1.2+ - the corresponding protocol, and all
# higher protocols.
#
# The default value is TLSv1+
......@@ -219,30 +217,29 @@ COURIERTLS=@bindir@/couriertls
# treated as confidential, and must not be world-readable. Set TLS_CERTFILE
# instead of TLS_DHCERTFILE if this is a garden-variety certificate
#
# VIRTUAL HOSTS (servers only):
# VIRTUAL HOSTS ON THE SAME IP ADDRESS.
#
# Due to technical limitations in the original SSL/TLS protocol, a dedicated
# IP address is required for each virtual host certificate. If you have
# multiple certificates, install each certificate file as
# Install each certificate $TLS_CERTFILE.domain, so if TLS_CERTFILE is set to
# /etc/certificate.pem, then you'll need to install the actual certificate
# files as /etc/certificate.pem.www.example.com,
# /etc/certificate.pem.www.domain.com and so on. Then, create a link from
# $TLS_CERTFILE to whichever certificate you consider to be the main one,
# for example:
# /etc/certificate.pem => /etc/certificate.pem.www.example.com
#
# IP-BASED VIRTUAL HOSTS:
#
# There may be a need to support older SSL/TLS client that don't support
# virtual hosts on the same IP address, and require a dedicated IP address
# for each SSL/TLS host. If so, install each certificate file as
# $TLS_CERTFILE.aaa.bbb.ccc.ddd, where "aaa.bbb.ccc.ddd" is the IP address
# for the certificate's domain name. So, if TLS_CERTFILE is set to
# /etc/certificate.pem, then you'll need to install the actual certificate
# files as /etc/certificate.pem.192.168.0.2, /etc/certificate.pem.192.168.0.3
# and so on, for each IP address.
#
# GnuTLS only (servers only):
#
# GnuTLS implements a new TLS extension that eliminates the need to have a
# dedicated IP address for each SSL/TLS domain name. Install each certificate
# as $TLS_CERTFILE.domain, so if TLS_CERTFILE is set to /etc/certificate.pem,
# then you'll need to install the actual certificate files as
# /etc/certificate.pem.host1.example.com, /etc/certificate.pem.host2.example.com
# and so on.
#
# Note that this TLS extension also requires a corresponding support in the
# client. Older SSL/TLS clients may not support this feature.
#
# This is an experimental feature.
# In all cases, $TLS_CERTFILE needs to be linked to one of the existing
# certificate files.
TLS_CERTFILE=@mydatadir@/esmtpd.pem
......
##VERSION: $Id: 7da60162a011d59e274884f305c57ea22d3c83f3-20150522071622$
##VERSION: $Id: 7da60162a011d59e274884f305c57ea22d3c83f3-20160410201643$
#
#
# esmtpd created from esmtpd.dist by sysconftool
......@@ -226,30 +226,30 @@ TLS_CERTS=X509
# treated as confidential, and must not be world-readable. Set TLS_CERTFILE
# instead of TLS_DHCERTFILE if this is a garden-variety certificate
#
# VIRTUAL HOSTS (servers only):
#
# Due to technical limitations in the original SSL/TLS protocol, a dedicated
# IP address is required for each virtual host certificate. If you have
# multiple certificates, install each certificate file as
# VIRTUAL HOSTS ON THE SAME IP ADDRESS.
#
# Install each certificate $TLS_CERTFILE.domain, so if TLS_CERTFILE is set to
# /etc/certificate.pem, then you'll need to install the actual certificate
# files as /etc/certificate.pem.www.example.com,
# /etc/certificate.pem.www.domain.com and so on. Then, create a link from
# $TLS_CERTFILE to whichever certificate you consider to be the main one,
# for example:
# /etc/certificate.pem => /etc/certificate.pem.www.example.com
#
# IP-BASED VIRTUAL HOSTS:
#
# There may be a need to support older SSL/TLS client that don't support
# virtual hosts on the same IP address, and require a dedicated IP address
# for each SSL/TLS host. If so, install each certificate file as
# $TLS_CERTFILE.aaa.bbb.ccc.ddd, where "aaa.bbb.ccc.ddd" is the IP address
# for the certificate's domain name. So, if TLS_CERTFILE is set to
# /etc/certificate.pem, then you'll need to install the actual certificate
# files as /etc/certificate.pem.192.168.0.0.2, /etc/certificate.pem.192.68.0.0.3
# files as /etc/certificate.pem.192.168.0.2, /etc/certificate.pem.192.168.0.3
# and so on, for each IP address.
#
# GnuTLS only (servers only):
#
# GnuTLS implements a new TLS extension that eliminates the need to have a
# dedicated IP address for each SSL/TLS domain name. Install each certificate
# as $TLS_CERTFILE.domain, so if TLS_CERTFILE is set to /etc/certificate.pem,
# then you'll need to install the actual certificate files as
# /etc/certificate.pem.host1.example.com, /etc/certificate.pem.host2.example.com
# and so on.
#
# Note that this TLS extension also requires a corresponding support in the
# client. Older SSL/TLS clients may not support this feature.
#
# This is an experimental feature.
# In all cases, $TLS_CERTFILE needs to be linked to one of the existing
# certificate files.
TLS_CERTFILE=@mydatadir@/esmtpd.pem
......
......@@ -299,6 +299,7 @@ LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
......
This diff is collapsed.
......@@ -54,8 +54,7 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
/* Define to the address where bug reports for this package should be sent. */
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -292,6 +292,7 @@ LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
......
This diff is collapsed.
......@@ -78,8 +78,7 @@
/* Whether dot-local files are implemented */
#undef LOCAL_EXTENSIONS
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
/* Define to the address where bug reports for this package should be sent. */
......
This diff is collapsed.
......@@ -287,6 +287,7 @@ LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
......
This diff is collapsed.
......@@ -39,8 +39,7 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
/* Define to the address where bug reports for this package should be sent. */
......
This diff is collapsed.
......@@ -1373,7 +1373,7 @@ void RcptAliasHandler::Alias(const char *p)
else
rcptinfoptr->whitelisted_only=1;
}
if (aborted) return;
aliasbuf=p;
......@@ -1720,13 +1720,13 @@ char *sender=rfc822_gettok(addresst);
line += cme_name;
line += " with ";
if (rfc3848_receivedwith && *rfc3848_receivedwith)
line += rfc3848_receivedwith;
else
line += mf->module->name;
line += "; ";
line += rfc822_mkdate(submit_time);
// Add unique id here.
......@@ -1760,6 +1760,11 @@ char *sender=rfc822_gettok(addresst);
break;
}
if (mf->receivedspfhelo)
my_rcptinfo.submitfile.Message(mf->receivedspfhelo->c_str());
if (mf->receivedspfmailfrom)
my_rcptinfo.submitfile.Message(mf->receivedspfmailfrom
->c_str());
my_rcptinfo.submitfile.Message(line.c_str());
/* Add Authentication-Results header */
......@@ -1767,14 +1772,6 @@ char *sender=rfc822_gettok(addresst);
if (line.size() > 0)
my_rcptinfo.submitfile.Message(line.c_str());
if (line.size() > 0)