Commit 2f6a9221 authored by Ryan Kavanagh's avatar Ryan Kavanagh

Imported Upstream version 5.4.1p1

parent 23104835
*/CVS export-ignore
*.o
*.a
*.in
*.out
*.log
*~
.#*
.deps
m4
aclocal.m4
autom4te.cache
compile
config.guess
config.h
config.status
config.sub
configure
depcomp
install-sh
libtool
ltmain.sh
missing
parse.c
stamp-h1
ylwrap
......@@ -6,11 +6,12 @@ are under a BSD licence, or a licence more free than that.
OpenSMTPD contains no GPL code.
Portable OpenSMTPD is divided in 4 parts:
Portable OpenSMTPD is divided in 5 parts:
- Original OpenSMTPD
- asr
- mail.local
- openbsd-compat
- smtpctl encrypt sub command
......@@ -36,6 +37,7 @@ OpenSMTPD
Alexander Schrijver
Marc Balmer
Ashish Shukla
Ryan Kavanagh
Charles Longeau
......@@ -108,12 +110,14 @@ OpenSMTPD
asr
===
1) Almost all code is licensed under an ISC-style license, to the following
copyright holders:
Eric Faurot
Internet Software Consortium
2) last part of getrrsetbyname_async.c is covered by 2-clause BSD license
/*
......@@ -192,8 +196,10 @@ Portable OpenSSH.
copyright holders:
Internet Software Consortium.
Todd C. Miller
David Mazieres
Damien Miller
Markus Friedl
Todd C. Miller
Henning Brauer
Pierre-Yves Ritschard
Reyk Floeter
......@@ -214,7 +220,7 @@ Portable OpenSSH.
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
2) base64.c in addition to beeing covered by an ISC-style licence, is also
2) base64.{c,h} in addition to beeing covered by an ISC-style licence, is also
covered by this one:
* Portions Copyright (c) 1995 by International Business Machines, Inc.
......@@ -248,6 +254,8 @@ Portable OpenSSH.
Damien Miller
Marc Espie
Tim Rice
The NetBSD Foundation, Inc.
Jason R. Thorpe?
Niels Provos
* Redistribution and use in source and binary forms, with or without
......@@ -274,10 +282,10 @@ Portable OpenSSH.
4) Some code is under a 3-clause BSD license, from the
following copyright holders:
The Regents of the University of California.
Ian F. Darwin
Eric P. Allman
The Regents of the University of California.
Ian F. Darwin
Damien Miller
Eric P. Allman
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
......@@ -347,7 +355,13 @@ Portable OpenSSH.
* called by a name other than "ssh" or "Secure Shell".
7) bootstrap
7) chacha_private.h
D. J. Bernstein
Public domain.
8) bootstrap (only there in the git repository)
# Copyright (c) 2002-2011 Sam Hocevar <sam@hocevar.net>
#
......@@ -356,3 +370,15 @@ Portable OpenSSH.
# and/or modify it under the terms of the Do What The Fuck You Want
# To Public License, Version 2, as published by Sam Hocevar. See
# http://sam.zoy.org/wtfpl/COPYING for more details.
smtpctl encrypt sub command
===========================
smtpctl encrypt sub command is licensed under an ISC-style license, to the
following copyright holders:
Sunil Nimmagadda
Gilles Chehade
SUBDIRS = openbsd-compat smtpd contrib regress
SUBDIRS = openbsd-compat mk contrib
ACLOCAL_AMFLAGS = -I m4
This diff is collapsed.
......@@ -35,7 +35,7 @@ Dependencies
Portable OpenSMTPD relies on:
* [autoconf](http://www.gnu.org/software/autoconf/)
* [automake](http://www.gnu.org/software/automake/)
* [Berkeley DB](http://www.oracle.com/technetwork/products/berkeleydb/overview/index.html)
* [Berkeley DB](http://www.oracle.com/technetwork/products/berkeleydb/overview/index.html) to be built with --enable-compat185 configure flag
* [bison](http://www.gnu.org/software/bison/) (or [byacc](http://invisible-island.net/byacc/byacc.html))
* [libevent](http://libevent.org/)
* [libtool](http://www.gnu.org/software/libtool/)
......@@ -57,7 +57,7 @@ Build
-----
cd opensmtpd*
./bootstrap
./bootstrap # Only if you build from git sources
./configure
make
sudo make install
......@@ -96,11 +96,15 @@ Add OpenSMTPD users
-------------------
To operate, OpenSMTPD requires at least one user, by default _smtpd; and
preferably three users, by default _smtpd, _smtpq and _smtpf.
preferably two users, by default _smtpd and _smtpq.
Using two users instead of one will increase security by a large factor so...
unless you want to voluntarily reduce security or you have absolute more faith in our code than we do, by all means use two.
The instructions below assume the default users however, the configure
script allows overriding these using the options:
--with-privsep-user, --with-queue-user and --with-filter-user.
--with-privsep-user, --with-queue-user.
### NetBSD, Linux (Debian, ArchLinux, ...)
......@@ -108,13 +112,11 @@ script allows overriding these using the options:
mkdir /var/empty
useradd -c "SMTP Daemon" -d /var/empty -s /sbin/nologin _smtpd
useradd -c "SMTP queue user" -d /var/empty -s /sbin/nologin _smtpq
useradd -c "SMTP filter user" -d /var/empty -s /sbin/nologin _smtpf
### DragonFlyBSD, FreeBSD
pw useradd _smtpd -c "SMTP Daemon" -d /var/empty -s /sbin/nologin
pw useradd _smtpq -c "SMTP queue user" -d /var/empty -s /sbin/nologin
pw useradd _smtpf -c "SMTP filter user" -d /var/empty -s /sbin/nologin
### Mac OS X
......@@ -143,7 +145,7 @@ Add a user - here we have picked 444:
/usr/bin/sudo /usr/bin/dscl . -create /Users/_smtpd NFSHomeDirectory /var/empty
/usr/bin/sudo /usr/bin/dscl . -create /Users/_smtpd UserShell /usr/bin/false
repeat for the _smtpq and _smtpf users.
repeat for the _smtpq user.
Launch smtpd
......
Jason McIntyre Documentation tweaks
Freddy Dissaux IPv6 fix on FreeBSD
Alexandre Lissy Mandriva fix
Brad Arrington ArchLinux package
Todd T. Fries Nokia N900 debian/armel
Francois Tigeot DragonFlyBSD fixes / pkgsrc
Ashish Shukla FreeBSD port, LMTP support
Jean-Loup Colautti Debian package
Rune Lynge MacOS X port
Jason A. Donenfeld Gentoo ebuild, PAM support
Gleb Kozyrev LMTP delivery improvements
Jason McIntyre
Freddy Dissaux
Alexandre Lissy
Brad Arrington
Todd T. Fries
Francois Tigeot
Ashish Shukla
Jean-Loup Colautti
Rune Lynge
Jason A. Donenfeld
Gleb Kozyrev
Colin Didier
Ryan Kavanagh
Sunil Nimmagadda
Miod Vallat Hosting hackathons with ducks and cheese and beer
Miod Vallat
And of course Gilles Chehade and Eric Faurot for their work and continuous help.
This diff is collapsed.
#! /bin/sh
# bootstrap: generic bootstrap/autogen.sh script for autotools projects
#
# Copyright (c) 2002-2011 Sam Hocevar <sam@hocevar.net>
#
# This program is free software. It comes without any warranty, to
# the extent permitted by applicable law. You can redistribute it
# and/or modify it under the terms of the Do What The Fuck You Want
# To Public License, Version 2, as published by Sam Hocevar. See
# http://sam.zoy.org/wtfpl/COPYING for more details.
#
# The latest version of this script can be found at the following place:
# http://caca.zoy.org/wiki/build
# Die if an error occurs
set -e
# Guess whether we are using configure.ac or configure.in
if test -f configure.ac; then
conffile="configure.ac"
elif test -f configure.in; then
conffile="configure.in"
else
echo "$0: could not find configure.ac or configure.in"
exit 1
fi
# Check for needed features
auxdir="`sed -ne 's/^[ \t]*A._CONFIG_AUX_DIR *([[ ]*\([^] )]*\).*/\1/p' $conffile`"
pkgconfig="`grep '^[ \t]*PKG_PROG_PKG_CONFIG' $conffile >/dev/null 2>&1 && echo yes || echo no`"
libtool="`grep '^[ \t]*A._PROG_LIBTOOL' $conffile >/dev/null 2>&1 && echo yes || echo no`"
header="`grep '^[ \t]*A._CONFIG_HEADER' $conffile >/dev/null 2>&1 && echo yes || echo no`"
makefile="`[ -f Makefile.am ] && echo yes || echo no`"
aclocalflags="`sed -ne 's/^[ \t]*ACLOCAL_AMFLAGS[ \t]*=//p' Makefile.am 2>/dev/null || :`"
# Check for automake
amvers="no"
for v in 13 12 11 10 9 8 7 6 5; do
if automake-1.${v} --version >/dev/null 2>&1; then
amvers="-1.${v}"
break
elif automake1.${v} --version >/dev/null 2>&1; then
amvers="1.${v}"
break
fi
done
if test "${amvers}" = "no" && automake --version > /dev/null 2>&1; then
amvers="`automake --version | sed -e '1s/[^0-9]*//' -e q`"
if expr "$amvers" "<" "1.5" > /dev/null 2>&1; then
amvers="no"
else
amvers=""
fi
fi
if test "$amvers" = "no"; then
echo "$0: you need automake version 1.5 or later"
exit 1
fi
# Check for autoconf
acvers="no"
for v in "" "269" "-2.69" "259" "-2.59" "253" "-2.53"; do
if autoconf${v} --version >/dev/null 2>&1; then
acvers="${v}"
break
fi
done
if test "$acvers" = "no"; then
echo "$0: you need autoconf"
exit 1
fi
# Check for libtool
if test "$libtool" = "yes"; then
libtoolize="no"
if glibtoolize --version >/dev/null 2>&1; then
libtoolize="glibtoolize"
else
for v in "16" "15" "" "14"; do
if libtoolize${v} --version >/dev/null 2>&1; then
libtoolize="libtoolize${v}"
break
fi
done
fi
if test "$libtoolize" = "no"; then
echo "$0: you need libtool"
exit 1
fi
fi
# Check for pkg-config
if test "$pkgconfig" = "yes"; then
if ! pkg-config --version >/dev/null 2>&1; then
echo "$0: you need pkg-config"
exit 1
fi
fi
# Remove old cruft
for x in aclocal.m4 configure config.guess config.log config.sub config.cache config.h.in config.h compile libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh; do rm -f $x autotools/$x; if test -n "$auxdir"; then rm -f "$auxdir/$x"; fi; done
rm -Rf autom4te.cache
if test -n "$auxdir"; then
if test ! -d "$auxdir"; then
mkdir "$auxdir"
fi
aclocalflags="${aclocalflags} -I $auxdir -I ."
fi
# Honour M4PATH because sometimes M4 doesn't
save_IFS=$IFS
IFS=:
tmp="$M4PATH"
for x in $tmp; do
if test -n "$x"; then
aclocalflags="${aclocalflags} -I $x"
fi
done
IFS=$save_IFS
# Explain what we are doing from now
set -x
# Bootstrap package
if test "$libtool" = "yes"; then
${libtoolize} --copy --force
if test -n "$auxdir" -a ! "$auxdir" = "." -a -f "ltmain.sh"; then
echo "$0: working around a minor libtool issue"
mv ltmain.sh "$auxdir/"
fi
fi
aclocal${amvers} ${aclocalflags}
autoconf${acvers}
if test "$header" = "yes"; then
autoheader${acvers}
fi
if test "$makefile" = "yes"; then
#add --include-deps if you want to bootstrap with any other compiler than gcc
#automake${amvers} --add-missing --copy --include-deps
automake${amvers} --foreign --add-missing --copy
fi
# Remove cruft that we no longer want
rm -Rf autom4te.cache
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
D/lib////
D/libexec////
/Makefile/-1.50/Mon Mar 5 11:15:41 2012//
/Makefile.inc/-1.2/Sun Jan 28 19:34:26 2001//
anoncvs@anoncvs.spacehopper.org:/cvs
if !HAVE_MAIL_LOCAL
SUBDIRS = libexec
endif
SUBDIRS = libexec
This diff is collapsed.
/getnameinfo_async.c/1.6/Result of merge//
/Makefile.inc/1.5/Sat Nov 24 17:15:45 2012//
/asr_debug.c/1.12/Result of merge//
/asr_utils.c/1.7/Result of merge//
/asr.c/1.25/Result of merge//
/asr.h/1.6/Result of merge//
/asr_private.h/1.17/Tue Apr 30 12:44:41 2013//
/async_resolver.3/1.11/Tue Apr 30 12:44:41 2013//
/getaddrinfo.c/1.1/Tue Apr 30 12:41:30 2013//
/getaddrinfo_async.c/1.17/Result of merge+Tue Apr 30 12:44:41 2013//
/gethostnamadr.c/1.6/Tue Apr 30 12:41:30 2013//
/gethostnamadr_async.c/1.19/Result of merge//
/getnameinfo.c/1.1/Tue Apr 30 12:41:30 2013//
/getnetnamadr.c/1.4/Tue Apr 30 12:41:30 2013//
/getnetnamadr_async.c/1.9/Result of merge//
/getrrsetbyname.c/1.1/Tue Apr 30 12:41:30 2013//
/getrrsetbyname_async.c/1.4/Result of merge//
/res_debug.c/1.1/Tue Apr 30 12:41:30 2013//
/res_init.c/1.1/Tue Apr 30 12:41:30 2013//
/res_mkquery.c/1.5/Tue Apr 30 12:41:30 2013//
/res_query.c/1.3/Tue Apr 30 12:44:42 2013//
/res_search_async.c/1.7/Result of merge//
/res_send.c/1.3/Tue Apr 30 12:44:42 2013//
/res_send_async.c/1.17/Result of merge//
/sethostent.c/1.1/Tue Apr 30 12:41:30 2013//
/asr.c/1.31/Result of merge//
/asr.h/1.7/Result of merge//
/asr_debug.c/1.14/Result of merge//
/getaddrinfo_async.c/1.19/Result of merge//
/getnameinfo_async.c/1.7/Result of merge//
/getnetnamadr_async.c/1.10/Result of merge//
/getrrsetbyname_async.c/1.5/Result of merge//
/res_search_async.c/1.10/Result of merge//
/res_send_async.c/1.19/Result of merge//
/Makefile.inc/1.6/Sat Sep 28 15:48:04 2013//
/asr_resolver.3/1.1/Thu Aug 8 06:55:42 2013//
/asr_private.h/1.23/Mon Nov 25 20:11:46 2013//
/asr_utils.c/1.9/Result of merge//
/getaddrinfo.c/1.3/Mon Nov 25 20:11:46 2013//
/gethostnamadr.c/1.9/Mon Nov 25 20:11:46 2013//
/gethostnamadr_async.c/1.23/Result of merge//
/getnameinfo.c/1.3/Mon Nov 25 20:11:46 2013//
/getnetnamadr.c/1.6/Mon Nov 25 20:11:46 2013//
/getrrsetbyname.c/1.3/Mon Nov 25 20:11:46 2013//
/res_debug.c/1.1/Mon Nov 25 20:11:46 2013//
/res_init.c/1.2/Mon Nov 25 20:11:46 2013//
/res_mkquery.c/1.6/Mon Nov 25 20:11:46 2013//
/res_query.c/1.6/Mon Nov 25 20:11:46 2013//
/res_send.c/1.6/Mon Nov 25 20:11:46 2013//
/sethostent.c/1.1/Mon Nov 25 20:11:46 2013//
D
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
SUBDIRS = mail.local
SUBDIRS = mail.local encrypt
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
SUBDIRS = smtpd smtpctl makemap backends
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
SUBDIRS = stub trace dnsbl monkey
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.