Commit 654fa834 authored by Markus Wanner's avatar Markus Wanner

Import upstream release 1.0.1.

parent 8f3cdc02
1.0.1
2018-09-24 Sam Varshavchik <mrsam@courier-mta.com>
* couriertls: additional fixes.
2018-09-24 Yoshinari Takaoka <mumumu@mumumu.org>
* couriertls: option to use a separate file for the SSL certificate's
private key, as an alternative to the combined keyfile+certificate.
1.0
2018-08-23 Sam Varshavchik <mrsam@courier-mta.com>
* Fix substitution typoes in imapd and pop3d startup scripts.
2018-08-11 Sam Varshavchik <mrsam@courier-mta.com>
* courier/libs/comtrack.c (track_find_record): Don't stop after
finding the E-mail address in the current tracking file, continue
reading the remaining tracking files.
2018-07-31 Sam Varshavchik <mrsam@courier-mta.com>
* couriermlm: Implement smtp prefiltering. Implement blocking of
Unicode messages and E-mail addresses, by default.
* rfc2045/reformime: parse utf-8 address types in DSNs.
2018-07-29 Sam Varshavchik <mrsam@courier-mta.com>
* courier: implement "utf-8" address type in delivery status
notifications.
* mailbot: generate message/global, message/global-delivery-status,
and message/global-headers, when needed, when formatting autoreplies.
* reformime: -m option uses message/global instead of message/rfc822
for UTF8 messages.
* sqwebmail: recognize message/global and message/rfc822 attachments.
Update very old login error message that references a long gone-by
era.
2018-07-28 Sam Varshavchik <mrsam@courier-mta.com>
* courier: implement the SMTPUTF8 extension.
* dotforward: parse for Delivered-To: only in the header portion
of the message.
2018-07-21 Sam Varshavchik <mrsam@courier-mta.com>
* courier-imap: update Courier-IMAP to support UTF8 POP3. Update
version of the courierpop3dsizelist cache file.
2018-07-17 Sam Varshavchik <mrsam@courier-mta.com>
* courier-imap, sqwebmail: update Courier-IMAP to support UTF8 IMAP.
Convert maildir folders to use UTF-8 for folder names. Add
--checkutf8 and --convutf8 options to maildirmake to convert
pre-UTF8 maildirs to UTF8 maildirs, a mandatory upgrade procedure.
2018-07-08 Sam Varshavchik <mrsam@courier-mta.com>
* waitlib/configure.ac: Fix typo.
2018-06-28 Sam Varshavchik <mrsam@courier-mta.com>
* libs/tcpd/starttls.c (main): Add -user option. Additional fixes
to imap/pop3 startup scripts to have couriertls drop root privileges.
2018-06-25 Sam Varshavchik <mrsam@courier-mta.com>
* rfc2045/reformime.c (main2): fix crash if -x or -X is specified
without the corresponding -s option.
2018-06-21 Sam Varshavchik <mrsam@courier-mta.com>
* libs/tcpd/tlsclient.h: add username option, used in couriertls_start
to set the child process's uid and gid.
* libs/imap/imaplogin.c (starttls): Set username option for couriertls
* libs/imap/pop3login.c (starttls): Set username option for couriertls
* imapd-ssl.dist, pop3d-ssl.dist: Use separate imap and pop3 session
cache files. Startup script: remove/set ownership and permsission
on the imap and pop3 session cache files.
2018-06-10 Sam Varshavchik <mrsam@courier-mta.com>
* courier/filters/libfilter/libfilter.c: Use argv[0] to determine
socket name. ratefilter, verifyfilter, dupfilter, and perlfilter
provide their argv[0] to lf_init().
2018-05-22 Sam Varshavchik <mrsam@courier-mta.com>
* libs/makedat/makedat.in (cidr): Fix smtpaccess syntax parsing
for IPv6 address ranges.
2018-04-26 Sam Varshavchik <mrsam@courier-mta.com>
* Update for Fedora 28 RPM.
2018-04-19 Sam Varshavchik <mrsam@courier-mta.com>
* courier/submit.C: Reformat the Received: header to comply with
RFC 5322.
2018-02-16 Sam Varshavchik <mrsam@courier-mta.com>
* libs/maildrop/search.C: ":H" pattern matching option, matching
only the main message headers.
2018-02-13 Sam Varshavchik <mrsam@courier-mta.com>
* libs/tcpd/libcouriergnutls.c: Remove usage of deprecated OpenPGP
API. Tag the "Unexpected SSL connection shutdown" with the "DEBUG"
label just like the OpenSSL version does.
* libs/tcpd/starttls.c: If TCPREMOTEIP is set, prepend it to error
messages.
2017-12-26 Sam Varshavchik <mrsam@courier-mta.com>
* libs/maildir/maildirmake.c (main): maildirmake's -q option
will create the maildir if it does not exist.
* libs/rfc2045/reformime.c (main2): Added -rU option, and a new
internal RFC2045_RW_8BIT_ALWAYS conversion option.
* libs/rfc2045/reformime.c (main2): Fix crash when the -s option
is not valid.
0.78.2
2017-11-27 Sam Varshavchik <mrsam@courier-mta.com>
......
#
# Copyright 1998 - 2009 Double Precision, Inc. See COPYING for
# Copyright 1998 - 2018 Double Precision, Inc. See COPYING for
# distribution information.
@SET_MAKE@
AUTOMAKE_OPTIONS=dist-bzip2
AM_CXXFLAGS=@COURIER_UNICODE_CXXFLAGS@
AM_DISTCHECK_CONFIGURE_FLAGS=--with-notice=unicode
SUBDIRS=afx @DBSUBDIR@ libs/numlib libs/soxwrap libs/md5 libs/sha1 \
libs/libhmac libs/random128 libs/rfc822 libs/rfc1035 \
libs/rfc2045 libs/liblock libs/maildir libs/waitlib libs/tcpd \
......@@ -142,6 +142,7 @@ dorpm:
rm -f rpm/SPECS/*
rm -f rpm/SRPMS/*
rpmbuild -ta --clean $(RPMXFLAGS) \
--define 'notice_option --with-notice=unicode' \
--define "_topdir `pwd`/rpm" \
--define '_rpmdir %{_topdir}/RPMS' \
--define '_srcrpmdir %{_topdir}/SRPMS' \
......
......@@ -15,7 +15,7 @@
@SET_MAKE@
#
# Copyright 1998 - 2009 Double Precision, Inc. See COPYING for
# Copyright 1998 - 2018 Double Precision, Inc. See COPYING for
# distribution information.
VPATH = @srcdir@
am__is_gnu_make = { \
......@@ -163,7 +163,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/courier.service.in \
$(srcdir)/courier.spec.in $(srcdir)/courier.sysvinit.in \
$(srcdir)/dbobj.config.in $(srcdir)/dbobj.h.in AUTHORS COPYING \
ChangeLog INSTALL NEWS README TODO compile config.guess \
config.rpath config.sub install-sh ltmain.sh missing
config.rpath config.sub depcomp install-sh ltmain.sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
......@@ -248,6 +248,8 @@ LD = @LD@
LDFLAGS = @LDFLAGS@
LIBDB = @LIBDB@
LIBGDBM = @LIBGDBM@
LIBIDN_CFLAGS = @LIBIDN_CFLAGS@
LIBIDN_LIBS = @LIBIDN_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
......@@ -272,6 +274,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
REPOSITORY = @REPOSITORY@
SED = @SED@
......@@ -345,6 +350,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = dist-bzip2
AM_CXXFLAGS = @COURIER_UNICODE_CXXFLAGS@
AM_DISTCHECK_CONFIGURE_FLAGS = --with-notice=unicode
SUBDIRS = afx @DBSUBDIR@ libs/numlib libs/soxwrap libs/md5 libs/sha1 \
libs/libhmac libs/random128 libs/rfc822 libs/rfc1035 \
libs/rfc2045 libs/liblock libs/maildir libs/waitlib libs/tcpd \
......@@ -958,6 +964,7 @@ dorpm:
rm -f rpm/SPECS/*
rm -f rpm/SRPMS/*
rpmbuild -ta --clean $(RPMXFLAGS) \
--define 'notice_option --with-notice=unicode' \
--define "_topdir `pwd`/rpm" \
--define '_rpmdir %{_topdir}/RPMS' \
--define '_srcrpmdir %{_topdir}/SRPMS' \
......
This diff is collapsed.
#! /bin/sh
#!/bin/sh
# Wrapper for compilers which do not understand '-c -o'.
scriptversion=2016-01-11.22; # UTC
......
#! /bin/sh
#!/bin/sh
# Attempt to guess a canonical system name.
# Copyright 1992-2017 Free Software Foundation, Inc.
......
#! /bin/sh
#!/bin/sh
# Configuration validation subroutine script.
# Copyright 1992-2017 Free Software Foundation, Inc.
......
This diff is collapsed.
dnl Process this file with autoconf to produce a configure script.
dnl
dnl Copyright 1998 - 2017 Double Precision, Inc. See COPYING for
dnl Copyright 1998 - 2018 Double Precision, Inc. See COPYING for
dnl distribution information.
AC_PREREQ(2.59)
AC_INIT(courier, 0.78.2, [courier-users@lists.sourceforge.net])
AC_INIT(courier, 1.0.1, [courier-users@lists.sourceforge.net])
version=$PACKAGE_VERSION
AC_CONFIG_SRCDIR(courier/courier.c)
AM_INIT_AUTOMAKE
......@@ -24,6 +24,46 @@ AX_COURIER_UNICODE_VERSION
AC_ARG_ENABLE(root-check, [ --disable-root-check Allow build as root (make check will fail)],
rootcheck="$enableval",
rootcheck="yes")
AC_ARG_WITH(notice,[AS_HELP_STRING([--with-notice=unicode],
[The --with-notice=unicode option is required, and indicates that you
are aware of the instructions in INSTALL for upgrading to this
version])], [notice="$withval"], [])
case "$notice" in
unicode)
;;
*)
AC_MSG_ERROR([
************************************************************************
Please rerun configure and add the
--with-notice=unicode
option.
This indicates that you've read the instructions in INSTALL about
updating from earlier versions; specifically the need to convert any
existing maildirs to a Unicode naming scheme, and the need to update
any other Courier packages together with updating this one.
If you are building RPMs directly using the spec file from the source
tarball, add a
--define 'notice_option --with-notice=unicode'
option to the rpmbuild command:
$ rpmbuild -ta --define 'notice_option --with-notice=unicode'
This message is only meant to make sure you are aware of the contents
of INSTALL about updating from earlier versions, and the need for
manual steps to update any existing maildirs.
If you are installing for the first time, you can simply rerun configure
with this option.
************************************************************************])
;;
esac
if test "$rootcheck" = "yes"
then
......@@ -113,6 +153,12 @@ then
AC_MSG_ERROR(Courier authentication library version 0.66 is required.)
fi
PKG_CHECK_MODULES(LIBIDN, libidn >= 0.0.0, [libidn=yes], [libidn=no])
if test "$libidn" != "yes"
then
AC_MSG_ERROR([libidn not found])
fi
dnl Check whether we should use gdbm, or db.
needs_withdb=0
......
......@@ -59,17 +59,16 @@
# -----------------------------------------------------------------------------
Summary: Courier 0.78.2 mail server
Summary: Courier 1.0.1 mail server
Name: courier
Version: 0.78.2
Version: 1.0.1
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.78.2.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
Source: http://download.sourceforge.net/courier/courier-1.0.1.tar.bz2
Provides: smtpdaemon server(smtp)
Provides: config(courier) = %{version}-%{release}
AutoProv: no
......@@ -86,15 +85,16 @@ Requires(postun): /sbin/service
%define initscript_courier --initscript courier
%endif
Requires: fileutils
Requires: coreutils
%if %alternatives
Obsoletes: courier-sendmail-wrapper
Provides: /usr/sbin/sendmail /usr/bin/mailq /usr/bin/rmail /usr/bin/newaliases
%endif
BuildRequires: gcc-c++
BuildRequires: courier-authlib-devel >= 0.55
BuildRequires: rpm >= 4.0.2
BuildRequires: fileutils
BuildRequires: coreutils
BuildRequires: binutils
BuildRequires: sed
BuildRequires: gawk
......@@ -153,36 +153,43 @@ BuildRequires: perl-generators
%if ! %alternatives
%package sendmail-wrapper
Summary: Courier 0.78.2 soft links for sendmail
Summary: Courier 1.0.1 soft links for sendmail
Group: Applications/Mail
Requires: courier = %{version}-%{release}
%endif
%package ldap
Summary: Courier 0.78.2 LDAP modules and configuration screen
Summary: Courier 1.0.1 LDAP modules and configuration screen
Group: Application/Mail
Requires: courier = %{version}-%{release}
%package mysql
Summary: Courier 0.78.2 MySQL configuration screen
Summary: Courier 1.0.1 MySQL configuration screen
Group: Application/Mail
Requires: courier = %{version}-%{release}
%package pgsql
Summary: Courier 0.78.2 PostgreSQL configuration screen
Summary: Courier 1.0.1 PostgreSQL configuration screen
Group: Application/Mail
Requires: courier = %{version}-%{release}
%package pop3d
Summary: Courier 0.78.2 Integrated POP3 server
Summary: Courier 1.0.1 Integrated POP3 server
Group: Applications/Mail
Requires: courier = 0.78.2 fileutils
Requires: coreutils
Requires: courier = %{version}-%{release}
%package imapd
Summary: Courier 0.78.2 Integrated IMAP server
Summary: Courier 1.0.1 Integrated IMAP server
Group: Applications/Mail
Requires: courier = 0.78.2 fileutils
Requires: coreutils
Requires: courier = %{version}-%{release}
%package webmail
Summary: Courier 0.78.2 Integrated HTTP (webmail) server
Summary: Courier 1.0.1 Integrated HTTP (webmail) server
Group: Applications/Mail
Requires: courier = 0.78.2 %{apache_documentroot} /etc/cron.hourly
Requires: %{apache_documentroot} /etc/cron.hourly
Requires: courier = %{version}-%{release}
%if %with_gpg2
Requires: gnupg2
%define gpg_option --with-gpg2
......@@ -194,40 +201,43 @@ Requires: %{apache_cgibindir}
%endif
%package webadmin
Summary: Courier 0.78.2 web-based administration tool
Summary: Courier 1.0.1 web-based administration tool
Group: Applications/Mail
Requires: courier = 0.78.2 %{apache_documentroot}
Requires: %{apache_documentroot}
Requires: courier = %{version}-%{release}
%if %is_not_mandrake
Requires: %{apache_cgibindir}
%endif
%package mlm
Summary: Courier 0.78.2 Integrated Mailing List Manager
Summary: Courier 1.0.1 Integrated Mailing List Manager
Group: Applications/Mail
Requires: courier = 0.78.2
Requires: courier = %{version}-%{release}
%package mlm-web
Summary: Courier 0.78.2 Integrated web-based mailing list interface
Summary: Courier 1.0.1 Integrated web-based mailing list interface
Group: Applications/Mail
Requires: courier-mlm = 0.78.2 %{apache_documentroot}
Requires: %{apache_documentroot}
Requires: courier-mlm = %{version}-%{release}
%if %is_not_mandrake
Requires: %{apache_cgibindir}
%endif
%package maildrop
Summary: Courier 0.78.2 Integrated mail filter
Summary: Courier 1.0.1 Integrated mail filter
Group: Applications/Mail
Requires: courier = 0.78.2
Requires: courier = %{version}-%{release}
%package fax
Summary: Courier 0.78.2 fax support
Summary: Courier 1.0.1 fax support
Group: Application/Mail
Requires: courier = 0.78.2 groff ghostscript netpbm-progs mgetty-sendfax
Requires: courier = %{version}-%{release}
Requires: groff ghostscript netpbm-progs mgetty-sendfax
%package maildrop-wrapper
Summary: Courier 0.78.2 soft links for maildrop
Summary: Courier 1.0.1 soft links for maildrop
Group: Applications/Mail
Requires: courier-maildrop = 0.78.2
Requires: courier-maildrop = %{version}-%{release}
%description
The Courier mail transfer agent (MTA) is an integrated mail/groupware
......@@ -349,7 +359,8 @@ This package conains the webadmin PostgreSQL configuration screen for Courier.
%setup -q
rm -f courier.config.cache
PATH=/usr/bin:$PATH %configure --cache-file=courier.config.cache %{?xflags: %{xflags}}
PATH=/usr/bin:$PATH %configure %{?notice_option} \
--cache-file=courier.config.cache %{?xflags: %{xflags}}
%{__cat} >README.REDHAT <<EOF
......
......@@ -69,7 +69,6 @@ License: GPL
URL: http://www.courier-mta.org
Packager: %{PACKAGER}
Source: http://download.sourceforge.net/courier/courier-@VERSION@.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
Provides: smtpdaemon server(smtp)
Provides: config(courier) = %{version}-%{release}
AutoProv: no
......@@ -86,15 +85,16 @@ Requires(postun): /sbin/service
%define initscript_courier --initscript courier
%endif
Requires: fileutils
Requires: coreutils
%if %alternatives
Obsoletes: courier-sendmail-wrapper
Provides: /usr/sbin/sendmail /usr/bin/mailq /usr/bin/rmail /usr/bin/newaliases
%endif
BuildRequires: gcc-c++
BuildRequires: courier-authlib-devel >= 0.55
BuildRequires: rpm >= 4.0.2
BuildRequires: fileutils
BuildRequires: coreutils
BuildRequires: binutils
BuildRequires: sed
BuildRequires: gawk
......@@ -155,34 +155,41 @@ BuildRequires: perl-generators
%package sendmail-wrapper
Summary: Courier @VERSION@ soft links for sendmail
Group: Applications/Mail
Requires: courier = %{version}-%{release}
%endif
%package ldap
Summary: Courier @VERSION@ LDAP modules and configuration screen
Group: Application/Mail
Requires: courier = %{version}-%{release}
%package mysql
Summary: Courier @VERSION@ MySQL configuration screen
Group: Application/Mail
Requires: courier = %{version}-%{release}
%package pgsql
Summary: Courier @VERSION@ PostgreSQL configuration screen
Group: Application/Mail
Requires: courier = %{version}-%{release}
%package pop3d
Summary: Courier @VERSION@ Integrated POP3 server
Group: Applications/Mail
Requires: courier = @VERSION@ fileutils
Requires: coreutils
Requires: courier = %{version}-%{release}
%package imapd
Summary: Courier @VERSION@ Integrated IMAP server
Group: Applications/Mail
Requires: courier = @VERSION@ fileutils
Requires: coreutils
Requires: courier = %{version}-%{release}
%package webmail
Summary: Courier @VERSION@ Integrated HTTP (webmail) server
Group: Applications/Mail
Requires: courier = @VERSION@ %{apache_documentroot} /etc/cron.hourly
Requires: %{apache_documentroot} /etc/cron.hourly
Requires: courier = %{version}-%{release}
%if %with_gpg2
Requires: gnupg2
%define gpg_option --with-gpg2
......@@ -196,7 +203,8 @@ Requires: %{apache_cgibindir}
%package webadmin
Summary: Courier @VERSION@ web-based administration tool
Group: Applications/Mail
Requires: courier = @VERSION@ %{apache_documentroot}
Requires: %{apache_documentroot}
Requires: courier = %{version}-%{release}
%if %is_not_mandrake
Requires: %{apache_cgibindir}
%endif
......@@ -204,12 +212,13 @@ Requires: %{apache_cgibindir}
%package mlm
Summary: Courier @VERSION@ Integrated Mailing List Manager
Group: Applications/Mail
Requires: courier = @VERSION@
Requires: courier = %{version}-%{release}
%package mlm-web
Summary: Courier @VERSION@ Integrated web-based mailing list interface
Group: Applications/Mail
Requires: courier-mlm = @VERSION@ %{apache_documentroot}
Requires: %{apache_documentroot}
Requires: courier-mlm = %{version}-%{release}
%if %is_not_mandrake
Requires: %{apache_cgibindir}
%endif
......@@ -217,17 +226,18 @@ Requires: %{apache_cgibindir}
%package maildrop
Summary: Courier @VERSION@ Integrated mail filter
Group: Applications/Mail
Requires: courier = @VERSION@
Requires: courier = %{version}-%{release}
%package fax
Summary: Courier @VERSION@ fax support
Group: Application/Mail
Requires: courier = @VERSION@ groff ghostscript netpbm-progs mgetty-sendfax
Requires: courier = %{version}-%{release}
Requires: groff ghostscript netpbm-progs mgetty-sendfax
%package maildrop-wrapper
Summary: Courier @VERSION@ soft links for maildrop
Group: Applications/Mail
Requires: courier-maildrop = @VERSION@
Requires: courier-maildrop = %{version}-%{release}
%description
The Courier mail transfer agent (MTA) is an integrated mail/groupware
......@@ -349,7 +359,8 @@ This package conains the webadmin PostgreSQL configuration screen for Courier.
%setup -q
rm -f courier.config.cache
PATH=/usr/bin:$PATH %configure --cache-file=courier.config.cache %{?xflags: %{xflags}}
PATH=/usr/bin:$PATH %configure %{?notice_option} \
--cache-file=courier.config.cache %{?xflags: %{xflags}}
%{__cat} >README.REDHAT <<EOF
......
......@@ -128,6 +128,11 @@ mlmdata_DATA=\
warn1text.tmpl \
warn2msg.tmpl \
webmlm.tmpl \
\
couriermlm-rcptfilter-ctlmsg \
couriermlm-rcptfilter-msg \
couriermlm-smtpfilter-ctlmsg \
couriermlm-smtpfilter-msg \
\
style.css.tmpl \
webmlmconfirm.html \
......@@ -194,7 +199,7 @@ showmodules_LDFLAGS=`@COURIERAUTHCONFIG@ --ldflags`
showconfig_SOURCES=cppmain.C showconfig.C
showconfig_DEPENDENCIES=$(COURIERDEPENDENCIES) module.esmtp/esmtpconfig.o
showconfig_LDADD=$(COURIERLDADD) module.esmtp/esmtpconfig.o
showconfig_LDFLAGS=$(COURIERLDFLAGS)
showconfig_LDFLAGS=$(COURIERLDFLAGS) @LIBIDN_LIBS@
# submit - message submission
......@@ -217,7 +222,7 @@ submit_LDADD=../libs/rfc1035/librfc1035.a \
../libs/md5/libmd5.la ../libs/random128/librandom128.la \
../libs/soxwrap/libsoxwrap.a \
`cat ../libs/soxwrap/soxlibs.dep` \
../afx/libafx.a @NETLIBS@ -lcourierauth
../afx/libafx.a @NETLIBS@ @LIBIDN_LIBS@ -lcourierauth
submit_LDFLAGS=`@COURIERAUTHCONFIG@ --ldflags`
......@@ -226,7 +231,7 @@ submit_LDFLAGS=`@COURIERAUTHCONFIG@ --ldflags`
aliaslookup_SOURCES=aliaslookup.C ldapaliasdrc.c
aliaslookup_DEPENDENCIES=libs/libcommon.la libs/libcourier.la ../afx/libafx.a
aliaslookup_LDADD=libs/libcommon.la libs/libcourier.la ../afx/libafx.a\
@dblibrary@ @NETLIBS@
@dblibrary@ @NETLIBS@ @LIBIDN_LIBS@ -lcourier-unicode
# ldapaliasd - resolve aliases via LDAP
......@@ -265,7 +270,7 @@ testmxlookup_DEPENDENCIES=../libs/rfc1035/librfc1035.a ../libs/soxwrap/libsoxwra
testmxlookup_LDADD=../libs/rfc1035/librfc1035.a ../libs/soxwrap/libsoxwrap.a `cat ../libs/soxwrap/soxlibs.dep` libs/libcourier.la \
../libs/md5/libmd5.la ../libs/random128/librandom128.la \
@dblibrary@ @NETLIBS@
@dblibrary@ @NETLIBS@ -lcourier-unicode @LIBIDN_LIBS@
# maildirmake - create a maildir
......@@ -285,7 +290,7 @@ maildirkw$(EXEEXT): ../libs/maildir/maildirkw$(EXEEXT)
aliasexp_SOURCES=cppmain.C aliasexp.C
aliasexp_DEPENDENCIES=$(COURIERDEPENDENCIES) ../libs/tcpd/libspipe.la ../libs/soxwrap/libsoxwrap.a ../libs/soxwrap/soxlibs.dep ../afx/libafx.a
aliasexp_LDADD=$(COURIERLDADD) ../libs/tcpd/libspipe.la ../libs/soxwrap/libsoxwrap.a `cat ../libs/soxwrap/soxlibs.dep` ../afx/libafx.a -lcourierauth
aliasexp_LDADD=$(COURIERLDADD) ../libs/tcpd/libspipe.la ../libs/soxwrap/libsoxwrap.a `cat ../libs/soxwrap/soxlibs.dep` ../afx/libafx.a -lcourierauth -lcourier-unicode @LIBIDN_LIBS@
aliasexp_LDFLAGS=`@COURIERAUTHCONFIG@ --ldflags`
# aliascombine - Merge alias specifications
......@@ -309,7 +314,8 @@ courierpop3d$(EXEEXT): ../libs/imap/pop3d$(EXEEXT)
mailq_SOURCES=mailq.c
mailq_DEPENDENCIES=libs/libcommon.la libs/libcourier.la ../libs/numlib/libnumlib.la
mailq_LDADD=libs/libcommon.la libs/libcourier.la ../libs/numlib/libnumlib.la
mailq_LDADD=libs/libcommon.la libs/libcourier.la ../libs/numlib/libnumlib.la \
-lcourier-unicode @LIBIDN_LIBS@
# courierd
......@@ -342,7 +348,9 @@ courierpop3login$(EXEEXT): ../libs/imap/pop3login$(EXEEXT)