Update to exim 4.41.
This is a major update and configuration files are not compatible. A conversion script is included and installed in ${PREFIX}/share/examples/exim4/convert4r4 New co-maintainer and much of the inital work done by Ilya Voronin. A decision was made to include the semi-official exiscan patch in the default installation, as most admins appear to use this. It is hoped that is will become part of the core exim4 code "soon". This port now creates an _exim user and group if they don't already exist. Work and testing by Ilya Voronin, Richard Welty, Axel Rau and others who I can't now find in my mailbox. Apologies if I left you out.
This commit is contained in:
parent
c81cad27d0
commit
1536f84b31
@ -1,59 +1,66 @@
|
||||
# $OpenBSD: Makefile,v 1.42 2004/07/26 10:14:27 peter Exp $
|
||||
# $OpenBSD: Makefile,v 1.43 2004/07/26 10:56:01 peter Exp $
|
||||
|
||||
COMMENT= "flexible mail transfer agent"
|
||||
|
||||
VERSION= 3.36
|
||||
VERSION_DOC= 3.30
|
||||
COMMENT= "Flexible mail transfer agent"
|
||||
VERSION= 4.41
|
||||
DISTNAME= exim-${VERSION}
|
||||
PKGNAME= ${DISTNAME}p3
|
||||
CATEGORIES= mail
|
||||
|
||||
MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim3/ \
|
||||
ftp://ftp.exim.org/pub/exim/exim3/ \
|
||||
ftp://ftp.fu-berlin.de/unix/mail/exim/exim3/
|
||||
DISTFILES= exim-${VERSION}.tar.gz exim-texinfo-${VERSION_DOC}.tar.gz
|
||||
|
||||
MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
|
||||
http://ftp.planetmirror.com/pub/exim/exim4/ \
|
||||
ftp://ftp.planetmirror.com/pub/exim/exim4/
|
||||
MASTER_SITES0= http://duncanthrax.net/exiscan-acl/
|
||||
|
||||
HOMEPAGE= http://www.exim.org/
|
||||
MAINTAINER= ilya voronin <ivoronin@ivoronin.pp.ru> \
|
||||
Peter Galbavy <peter.galbavy@knowtion.net>
|
||||
|
||||
MAINTAINER= Peter Galbavy <peter.galbavy@knowtion.net>
|
||||
# GPL
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
# ldap - once openldap is supported by exim
|
||||
FLAVORS= no_x11 no_perl mysql postgresql ldap no_ssl
|
||||
FLAVORS=no_exiscan no_x11 mysql postgresql ldap iconv
|
||||
FLAVOR?=
|
||||
|
||||
MAKE_ENV= FLAVOR="${FLAVOR}"
|
||||
MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS}"
|
||||
NO_REGRESS=Yes
|
||||
|
||||
EXIM_MAKECAT=
|
||||
EXIM_LOOKUP_INCLUDE=
|
||||
EXIM_LOOKUP_LIBS=
|
||||
.if !${FLAVOR:L:Mno_exiscan}
|
||||
PATCHFILES= exiscan-acl-4.41-24.patch:0
|
||||
PATCH_DIST_STRIP= -p1
|
||||
.endif
|
||||
|
||||
.if !${FLAVOR:L:Mno_x11}
|
||||
USE_X11= Yes
|
||||
EXIM_MAKECAT+= "EXIM_MONITOR=eximon.bin\n"
|
||||
.endif
|
||||
|
||||
.if !${FLAVOR:L:Mno_perl}
|
||||
EXIM_MAKECAT+= "EXIM_PERL=perl.o\n"
|
||||
.endif
|
||||
|
||||
.if ${FLAVOR:L:Mldap}
|
||||
LIB_DEPENDS+= ldap.2,lber:openldap-client-2.*:databases/openldap
|
||||
EXIM_MAKECAT+= "LOOKUP_LDAP=yes\nLDAP_LIB_TYPE=OPENLDAP2\n"
|
||||
EXIM_LOOKUP_INCLUDE+= -I${LOCALBASE}/include
|
||||
EXIM_LOOKUP_LIBS+= -L${LOCALBASE}/lib -lldap -llber
|
||||
USE_X11= Yes
|
||||
EXIM_MAKECAT+= "EXIM_MONITOR=eximon.bin\n"
|
||||
.endif
|
||||
|
||||
.if ${FLAVOR:L:Mmysql}
|
||||
LIB_DEPENDS+= lib/mysql/mysqlclient.10::databases/mysql
|
||||
EXIM_MAKECAT+= "LOOKUP_MYSQL=yes\n"
|
||||
EXIM_MAKECAT+= "LOOKUP_MYSQL=yes\n"
|
||||
EXIM_LOOKUP_INCLUDE+= -I${LOCALBASE}/include/mysql
|
||||
EXIM_LOOKUP_LIBS+= -L${LOCALBASE}/lib/mysql -lmysqlclient
|
||||
LIB_DEPENDS+= lib/mysql/mysqlclient.10:mysql-client-*:databases/mysql
|
||||
.endif
|
||||
|
||||
.if ${FLAVOR:L:Mpostgresql}
|
||||
EXIM_MAKECAT+= "LOOKUP_PGSQL=yes\n"
|
||||
EXIM_LOOKUP_INCLUDE+= -I${LOCALBASE}/include/postgresql
|
||||
EXIM_LOOKUP_LIBS+= -L${LOCALBASE}/lib/ -lpq
|
||||
LIB_DEPENDS+= pq.2:postgresql-client-*:databases/postgresql
|
||||
.endif
|
||||
|
||||
.if ${FLAVOR:L:Mldap}
|
||||
EXIM_MAKECAT+= "LOOKUP_LDAP=yes\n"
|
||||
EXIM_MAKECAT+= "LDAP_LIB_TYPE=OPENLDAP2\n"
|
||||
EXIM_LOOKUP_INCLUDE+= -I${LOCALBASE}/include
|
||||
EXIM_LOOKUP_LIBS+= -L${LOCALBASE}/lib -lldap -llber
|
||||
LIB_DEPENDS+= ldap.2,lber:openldap-client-2.*:databases/openldap
|
||||
.endif
|
||||
|
||||
.if ${FLAVOR:L:Miconv}
|
||||
MODULES= iconv
|
||||
EXIM_MAKECAT+= "HAVE_ICONV=yes\n"
|
||||
EXIM_EXTRA_LIBS+= -L${LOCALBASE}/lib -liconv
|
||||
EXIM_CFLAGS+= -I${LOCALBASE}/include
|
||||
.endif
|
||||
|
||||
.if ${FLAVOR:L:Mpostgresql}
|
||||
@ -63,31 +70,36 @@ EXIM_LOOKUP_INCLUDE+= -I${LOCALBASE}/include/postgresql
|
||||
EXIM_LOOKUP_LIBS+= -L${LOCALBASE}/lib -lpq
|
||||
.endif
|
||||
|
||||
.if !${FLAVOR:L:Mno_ssl}
|
||||
EXIM_MAKECAT+= "SUPPORT_TLS=yes\nTLS_LIBS=-lssl -lcrypto\n"
|
||||
.endif
|
||||
EXIM_EXTRA_LIBS+= -lwrap
|
||||
|
||||
NO_REGRESS= Yes
|
||||
EXIM_MAKECAT+= "BIN_DIRECTORY=${PREFIX}/bin\n"
|
||||
EXIM_MAKECAT+= "CONFIGURE_FILE=${SYSCONFDIR}/exim/configure\n"
|
||||
EXIM_MAKECAT+= "LOOKUP_INCLUDE=${EXIM_LOOKUP_INCLUDE}\n"
|
||||
EXIM_MAKECAT+= "LOOKUP_LIBS=${EXIM_LOOKUP_LIBS}\n"
|
||||
EXIM_MAKECAT+= "EXTRALIBS_EXIM=${EXIM_EXTRA_LIBS}\n"
|
||||
EXIM_MAKECAT+= "CFLAGS=${CFLAGS} ${EXIM_CFLAGS}\n"
|
||||
|
||||
do-configure:
|
||||
@mkdir -p ${WRKSRC}/Local
|
||||
@cp ${FILESDIR}/Makefile ${WRKSRC}/Local
|
||||
@echo -n ${EXIM_MAKECAT} >> ${WRKSRC}/Local/Makefile
|
||||
.if !${FLAVOR:L:Mno_x11}
|
||||
@cp ${FILESDIR}/eximon.conf ${WRKSRC}/Local
|
||||
.endif
|
||||
@echo -n ${EXIM_MAKECAT} >> ${WRKSRC}/Local/Makefile
|
||||
@echo "LOOKUP_INCLUDE=${EXIM_LOOKUP_INCLUDE}">>${WRKSRC}/Local/Makefile
|
||||
@echo "LOOKUP_LIBS=${EXIM_LOOKUP_LIBS}">>${WRKSRC}/Local/Makefile
|
||||
@cd ${WRKSRC}/doc ; \
|
||||
for i in ../../exim-texinfo-${VERSION_DOC}/doc/* ; do \
|
||||
ln -sf $$i ; \
|
||||
done
|
||||
|
||||
pre-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/exim
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/exim
|
||||
${INSTALL_DATA} ${WRKINST}/etc/exim/configure ${PREFIX}/share/examples/exim
|
||||
${INSTALL_DATA} ${WRKSRC}/build-`uname -s`-`uname -m`/convert4r4 ${PREFIX}/share/examples/exim
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/exim
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/spec.txt ${PREFIX}/share/doc/exim/spec.txt
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/spec.txt ${PREFIX}/share/doc/exim
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/README.SIEVE ${PREFIX}/share/doc/exim
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/filter.txt ${PREFIX}/share/doc/exim
|
||||
${INSTALL_MAN} ${WRKSRC}/doc/exim.8 ${PREFIX}/man/man8
|
||||
|
||||
.if !${FLAVOR:L:Mno_exiscan}
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/exiscan-acl-examples.txt ${PREFIX}/share/doc/exim
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/exiscan-acl-spec.txt ${PREFIX}/share/doc/exim
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,6 +1,6 @@
|
||||
MD5 (exim-3.36.tar.gz) = 8f74735d6bc4a519f31463be38dd2087
|
||||
MD5 (exim-texinfo-3.30.tar.gz) = 155ae0ece6c4b50f7c0a8f7d9e2d0944
|
||||
RMD160 (exim-3.36.tar.gz) = 9e6624005edfecaaa6bd86245a977343abc3ed86
|
||||
RMD160 (exim-texinfo-3.30.tar.gz) = 7e2d7e1fa2ef7ff82e0b8d97abde673d7d2df004
|
||||
SHA1 (exim-3.36.tar.gz) = 08df9d05ded0ef3429f402e80c161163a26f6118
|
||||
SHA1 (exim-texinfo-3.30.tar.gz) = d7b8ee14da0cf7ba5f8f425b3cd109117bedc0d3
|
||||
MD5 (exim-4.41.tar.gz) = a301e711d26e0e1849a839497008234d
|
||||
MD5 (exiscan-acl-4.41-24.patch) = 6cdc86a7700d6b83a2bfb227e51805e1
|
||||
RMD160 (exim-4.41.tar.gz) = 7353a794ef0a443d52362ee11bb43221b3edf06f
|
||||
RMD160 (exiscan-acl-4.41-24.patch) = 4cf67d67ea9544aedd51c02178dd5933edfde539
|
||||
SHA1 (exim-4.41.tar.gz) = 5771b1dbf5766c5a1a013ce4d1ba2accd8e94671
|
||||
SHA1 (exiscan-acl-4.41-24.patch) = c85531f9d4a4ef9323ef34d5e840f02beed5d65b
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,3 @@
|
||||
# $OpenBSD: eximon.conf,v 1.4 2000/08/02 15:44:12 naddy Exp $
|
||||
##################################################
|
||||
# The Exim Monitor #
|
||||
##################################################
|
||||
@ -112,14 +111,14 @@
|
||||
|
||||
# MENU_EVENT='Shift<Btn1Down>'
|
||||
|
||||
# When the menu is used to perform an operation on a message, the output
|
||||
# from the exim command that is generated is displayed in a separate window
|
||||
# by default. Set this option to "no" if you don't want to see the output -
|
||||
# the result of the operation is normally visible in the log window in any
|
||||
# case. This does not apply to the output generated from attempting to
|
||||
# deliver a message. That is always shown.
|
||||
# When the menu is used to perform an operation on a message, the result of the
|
||||
# operation is normally visible in the log window, so Eximon doesn't display
|
||||
# the output of the generated Exim command. However, you can request that
|
||||
# this output be shown in a separate window by setting ACTION_OUTPUT to "yes".
|
||||
# This does not apply to the output generated from attempting to deliver a
|
||||
# message, which is always shown.
|
||||
|
||||
# ACTION_OUTPUT=yes
|
||||
# ACTION_OUTPUT=no
|
||||
|
||||
# When some action is taken on a message, such as freezing it, or changing
|
||||
# its recipients, the queue display is normally automatically updated. On
|
||||
@ -152,7 +151,7 @@
|
||||
|
||||
# SIZE_STRIPCHART=/var/mail
|
||||
|
||||
# The name of the size stripchar will be the last component of SIZE_STRIPCHART
|
||||
# The name of the size stripchart will be the last component of SIZE_STRIPCHART
|
||||
# unless the following variable is set to override it.
|
||||
|
||||
# SIZE_STRIPCHART_NAME=space
|
||||
@ -174,7 +173,7 @@
|
||||
|
||||
# LOG_STRIPCHARTS='/ <= /in/
|
||||
# / => /out/
|
||||
# / => .+ D=/local/
|
||||
# / => .+ R=local/local/
|
||||
# / => .+ T=[^ ]*smtp/smtp/'
|
||||
|
||||
# End of exim_monitor/EDITME
|
||||
|
@ -1,17 +0,0 @@
|
||||
$OpenBSD: patch-Makefile,v 1.2 2000/08/12 23:57:45 naddy Exp $
|
||||
--- Makefile.orig Thu Jul 20 13:08:44 2000
|
||||
+++ Makefile Wed Aug 9 02:11:09 2000
|
||||
@@ -65,7 +65,12 @@ go:; @cd build-$(buildname); $(MAKE) SHE
|
||||
# The installation commands are kept in a separate script, which expects
|
||||
# to be run from inside the build directory.
|
||||
|
||||
-install:; @cd build-$(buildname); $(SHELL) ../scripts/exim_install
|
||||
+install:
|
||||
+ @cd build-$(buildname); \
|
||||
+ INST_BIN_DIRECTORY=$(PREFIX)/sbin \
|
||||
+ INST_INFO_DIRECTORY=$(PREFIX)/info \
|
||||
+ INST_CONFIGURE_FILE=$(PREFIX)/share/examples/exim/configure \
|
||||
+ $(SHELL) ../scripts/exim_install
|
||||
|
||||
# Tidy-up targets
|
||||
|
26
mail/exim/patches/patch-OS_Makefile-OpenBSD
Normal file
26
mail/exim/patches/patch-OS_Makefile-OpenBSD
Normal file
@ -0,0 +1,26 @@
|
||||
--- OS/Makefile-OpenBSD.orig Mon May 10 12:31:20 2004
|
||||
+++ OS/Makefile-OpenBSD Fri Jul 16 13:32:28 2004
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
CHOWN_COMMAND=/usr/sbin/chown
|
||||
CHGRP_COMMAND=/usr/sbin/chgrp
|
||||
-CFLAGS=-O
|
||||
+CFLAGS=-O2 -Wall
|
||||
|
||||
HAVE_SA_LEN=YES
|
||||
|
||||
@@ -10,9 +10,14 @@ X11=/usr/X11R6
|
||||
XINCLUDE=-I$(X11)/include
|
||||
XLFLAGS=-L$(X11)/lib
|
||||
|
||||
+EXIWHAT_MULTIKILL_CMD=pkill
|
||||
+EXIWHAT_MULTIKILL_ARG='exim( |$$|-)'
|
||||
+
|
||||
EXIWHAT_PS_ARG=-ax
|
||||
EXIWHAT_EGREP_ARG='/exim( |$$)'
|
||||
EXIWHAT_KILL_SIGNAL=-USR1
|
||||
+
|
||||
+HAVE_IPV6=YES
|
||||
|
||||
# OpenBSD always ships with Berkeley DB
|
||||
USE_DB=yes
|
@ -1,42 +0,0 @@
|
||||
$OpenBSD: patch-configure_default,v 1.2 2003/06/23 19:11:11 sturm Exp $
|
||||
--- src/configure.default.orig Thu Jul 20 13:08:47 2000
|
||||
+++ src/configure.default Wed Aug 9 15:51:33 2000
|
||||
@@ -23,6 +23,15 @@
|
||||
# MAIN CONFIGURATION SETTINGS #
|
||||
######################################################################
|
||||
|
||||
+
|
||||
+# Uncomment these if you want exim to run under a non-root UID/GID.
|
||||
+# Also remember to uncomment the "user = exim" line in the system
|
||||
+# aliases director.
|
||||
+
|
||||
+#exim_user = "_exim"
|
||||
+#exim_group = "_exim"
|
||||
+
|
||||
+
|
||||
# Specify your host's canonical name here. This should normally be the fully
|
||||
# qualified "official" name of your host. If this option is not set, the
|
||||
# uname() function is called to obtain the name.
|
||||
@@ -204,8 +213,7 @@ local_delivery:
|
||||
delivery_date_add
|
||||
envelope_to_add
|
||||
return_path_add
|
||||
-# group = mail
|
||||
-# mode = 0660
|
||||
+ mode = 0600
|
||||
|
||||
|
||||
# This transport is used for handling pipe deliveries generated by alias
|
||||
@@ -266,9 +274,10 @@ end
|
||||
|
||||
system_aliases:
|
||||
driver = aliasfile
|
||||
- file = /etc/aliases
|
||||
+ file = /etc/mail/aliases
|
||||
search_type = lsearch
|
||||
-# user = exim
|
||||
+ user = daemon
|
||||
+ group = guest
|
||||
file_transport = address_file
|
||||
pipe_transport = address_pipe
|
||||
|
12
mail/exim/patches/patch-scripts_exim_install
Normal file
12
mail/exim/patches/patch-scripts_exim_install
Normal file
@ -0,0 +1,12 @@
|
||||
--- scripts/exim_install.orig Mon May 10 12:31:20 2004
|
||||
+++ scripts/exim_install Thu Jul 15 17:39:22 2004
|
||||
@@ -192,8 +192,7 @@ while [ $# -gt 0 ]; do
|
||||
# The exim binary is handled specially
|
||||
|
||||
if [ $name = exim${EXE} ]; then
|
||||
- version=exim-`./exim -bV -C /dev/null | \
|
||||
- awk '/Exim version/ { OFS=""; print $3,"-",substr($4,2,length($4)-1) }'`${EXE}
|
||||
+ version=exim-4.40
|
||||
|
||||
if [ "${version}" = "exim-" ]; then
|
||||
echo $com ""
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-src_accept_c,v 1.1 2004/05/10 07:42:32 brad Exp $
|
||||
--- src/accept.c.orig 2004-05-10 01:14:55.000000000 -0400
|
||||
+++ src/accept.c 2004-05-10 01:17:15.000000000 -0400
|
||||
@@ -1895,7 +1895,7 @@ if (headers_check_syntax)
|
||||
char *verb = "is";
|
||||
int len;
|
||||
|
||||
- while (*t != ':') *tt++ = *t++;
|
||||
+ while (*t != ':' && tt < &hname[sizeof(hname)-2]) *tt++ = *t++;
|
||||
*tt = 0;
|
||||
|
||||
/* Arrange not to include any white space at the end in the
|
@ -1,23 +0,0 @@
|
||||
$OpenBSD: patch-src_daemon_c,v 1.1 2002/12/07 16:34:57 brad Exp $
|
||||
--- src/daemon.c.orig Sat Dec 7 07:59:03 2002
|
||||
+++ src/daemon.c Sat Dec 7 07:59:18 2002
|
||||
@@ -590,7 +590,7 @@ if (smtp_port < 0)
|
||||
if (pid_file_path[0] == 0)
|
||||
sprintf(buff, "%s/exim-daemon.pid", spool_directory);
|
||||
else
|
||||
- sprintf(buff, pid_file_path, "");
|
||||
+ strcpy(buff, pid_file_path);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -598,9 +598,7 @@ else
|
||||
sprintf(buff, "%s/exim-daemon.%d.pid", spool_directory, smtp_port);
|
||||
else
|
||||
{
|
||||
- char dbuff[12];
|
||||
- sprintf(dbuff, ".%d", smtp_port);
|
||||
- sprintf(buff, pid_file_path, dbuff);
|
||||
+ strcpy(buff, pid_file_path);
|
||||
}
|
||||
}
|
||||
|
@ -1,21 +0,0 @@
|
||||
$OpenBSD: patch-src_smtp_in_c,v 1.1 2003/09/03 17:21:05 brad Exp $
|
||||
--- src/smtp_in.c.orig 2003-09-02 19:31:50.000000000 -0400
|
||||
+++ src/smtp_in.c 2003-09-02 19:33:51.000000000 -0400
|
||||
@@ -2021,13 +2021,12 @@ while (done <= 0)
|
||||
|
||||
if (!check_helo(smtp_data))
|
||||
{
|
||||
- char *s;
|
||||
- smtp_printf("501 syntactically invalid %s argument(s)\r\n", hello);
|
||||
- if (*smtp_data == 0) strcpy(smtp_data, "(no argument given)");
|
||||
- s = string_printing(smtp_data);
|
||||
+ smtp_printf("501 Syntactically invalid %s argument(s)\r\n", hello);
|
||||
log_write(0, LOG_MAIN|LOG_REJECT, "rejected %s from %s: syntactically "
|
||||
"invalid argument(s): %s", hello,
|
||||
- (sender_fullhost == NULL)? "local process" : sender_fullhost, s);
|
||||
+ (sender_fullhost == NULL)? "local process" : sender_fullhost,
|
||||
+ (*smtp_data == 0)? "(no argument given)" :
|
||||
+ string_printing(smtp_data));
|
||||
break;
|
||||
}
|
||||
|
@ -1,21 +0,0 @@
|
||||
$OpenBSD: patch-src_verify_c,v 1.1 2004/05/10 07:42:32 brad Exp $
|
||||
--- src/verify.c.orig 2004-05-10 01:19:26.000000000 -0400
|
||||
+++ src/verify.c 2004-05-10 01:19:02.000000000 -0400
|
||||
@@ -892,7 +892,7 @@ if (!sender_verify_reject || (rc == DEFE
|
||||
/* Set up the key for the reject hints database, and attempt to open it.
|
||||
If successful, read the record. */
|
||||
|
||||
-sprintf(buffer, "%s:%.200s", sender_address,
|
||||
+snprintf(buffer, sizeof(buffer), "%s:%.200s", sender_address,
|
||||
(sender_host_name != NULL)? sender_host_name :
|
||||
(sender_host_address != NULL)? sender_host_address : "");
|
||||
|
||||
@@ -1182,7 +1182,7 @@ if (sender_verify_callback_error != NULL
|
||||
O_WRONLY) is needed by Berkeley native DB even when reading only. If the
|
||||
database won't open, we can do no more. */
|
||||
|
||||
-sprintf(buffer, "%s:%.200s", sender_address,
|
||||
+snprintf(buffer, sizeof(buffer), "%s:%.200s", sender_address,
|
||||
(sender_host_name != NULL)? sender_host_name :
|
||||
(sender_host_address != NULL)? sender_host_address : "");
|
||||
|
@ -1,51 +0,0 @@
|
||||
#!/bin/sh
|
||||
# $OpenBSD: DEINSTALL,v 1.2 2004/04/14 14:24:35 xsa Exp $
|
||||
#
|
||||
# De-installation setup of exim
|
||||
|
||||
# exit on errors, use a sane path and install prefix
|
||||
#
|
||||
set -e
|
||||
PATH=/bin:/usr/bin:/sbin:/usr/sbin
|
||||
PREFIX=${PKG_PREFIX:-/usr/local}
|
||||
CONFIG_DIR=${SYSCONFDIR}/exim
|
||||
|
||||
# Function: tell the user what they need to do to delete the port completely
|
||||
#
|
||||
do_notice()
|
||||
{
|
||||
echo
|
||||
echo "+---------------"
|
||||
echo "| To completely deinstall the $1 package you need to perform"
|
||||
echo "| these steps as root:"
|
||||
echo "|"
|
||||
echo "| rm -rf ${CONFIG_DIR}"
|
||||
echo "|"
|
||||
echo "| Do not do this if you plan on re-installing $1"
|
||||
echo "| at some future time."
|
||||
echo "+---------------"
|
||||
echo
|
||||
}
|
||||
|
||||
# Verify proper execution
|
||||
#
|
||||
if [ $# -ne 2 ]; then
|
||||
echo "usage: $0 distname DEINSTALL" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Verify/process the command
|
||||
#
|
||||
case $2 in
|
||||
DEINSTALL)
|
||||
if [ ${PKG_DELETE_EXTRA} != Yes -a -d ${CONFIG_DIR} ]; then
|
||||
do_notice "$1"
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
echo "usage: $0 distname DEINSTALL" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
exit 0
|
@ -1,19 +1,19 @@
|
||||
Exim is a mail transfer agent (MTA) developed at the University of
|
||||
Cambridge for use on Unix systems connected to the Internet. It is
|
||||
freely available under the terms of the GNU General Public Licence.
|
||||
In overall style it is similar to Smail 3, but its facilities are
|
||||
more extensive. It contains facilities for verifying incoming sender
|
||||
and recipient addresses, for refusing mail from specified hosts,
|
||||
networks, or senders, and for controlling mail relaying. This version
|
||||
also supports the STARTTLS extension.
|
||||
Exim is a mail transfer agent (MTA) for hosts that are running Unix or Unix-
|
||||
like operating systems. It was designed on the assumption that it would be run
|
||||
on hosts that are permanently connected to the Internet. However, it can
|
||||
be used on intermittently connected hosts with suitable configuration
|
||||
adjustments.
|
||||
|
||||
This port can be built with the following flavors:
|
||||
|
||||
* no_x11 - do not build eximon which requires X11
|
||||
* no_perl - do not include perl support
|
||||
* no_ssl - do not include SSL/TLS support
|
||||
* mysql - support mysql queries for lookups
|
||||
* postgresql - support postgresql queries for lookups
|
||||
* ldap - support ldap (OpenLDAP) queries for lookups
|
||||
* no_exiscan - do not build content scanning into the exim4
|
||||
ACL system.
|
||||
* no_x11 - do not build eximon which requires X11
|
||||
* mysql - support mysql queries for lookups
|
||||
* postgresql - support postgresql queries for lookups
|
||||
* ldap - support ldap (OpenLDAP) queries for lookups
|
||||
* iconv - support character code conversions
|
||||
|
||||
All these flavors are independent of each other.
|
||||
All this flavors are independent of each other.
|
||||
|
||||
WWW: ${HOMEPAGE}
|
||||
|
@ -1,97 +1,126 @@
|
||||
#!/bin/sh
|
||||
# $OpenBSD: INSTALL,v 1.2 2003/06/23 19:11:12 sturm Exp $
|
||||
# $OpenBSD: INSTALL,v 1.3 2004/07/26 10:56:01 peter Exp $
|
||||
#
|
||||
# Pre/post-installation setup of exim
|
||||
|
||||
# exit on errors, use a sane path and install prefix
|
||||
# use a sane path and install prefix
|
||||
#
|
||||
set -e
|
||||
PATH=/bin:/usr/bin:/sbin:/usr/sbin
|
||||
PREFIX=${PKG_PREFIX:-/usr/local}
|
||||
CONFIG_DIR=${SYSCONFDIR}/exim
|
||||
SAMPLE_CONFIG_DIR=$PREFIX/share/examples/exim
|
||||
|
||||
EXIMSPOOL=/var/spool/exim
|
||||
EXIM=_exim
|
||||
ID=521
|
||||
|
||||
# add user/group _exim if they don't already exist
|
||||
do_accts()
|
||||
{
|
||||
echo
|
||||
echo "+---------------------"
|
||||
|
||||
groupinfo -e $EXIM
|
||||
if [ $? -eq 0 ]; then
|
||||
echo "| Using existing group '$EXIM'"
|
||||
else
|
||||
echo "| Creating group '$EXIM'"
|
||||
groupadd -g $ID $EXIM
|
||||
fi
|
||||
|
||||
userinfo -e $EXIM
|
||||
if [ $? -eq 0 ]; then
|
||||
echo "| Using existing account '$EXIM'"
|
||||
else
|
||||
echo "| Creating user '$EXIM'"
|
||||
if [ -d $EXIMSPOOL ]; then
|
||||
EXIMCREATEHOME=""
|
||||
else
|
||||
EXIMCREATEHOME="-m"
|
||||
fi
|
||||
useradd -g $EXIM \
|
||||
-c "$1 Account" \
|
||||
$EXIMCREATEHOME -d $EXIMSPOOL \
|
||||
-L daemon \
|
||||
-u $ID $EXIM
|
||||
fi
|
||||
|
||||
echo "+---------------------"
|
||||
echo
|
||||
}
|
||||
|
||||
# Function: tell the user what they need to do to use the port just installed
|
||||
#
|
||||
do_notice()
|
||||
{
|
||||
echo
|
||||
echo "+---------------"
|
||||
echo "| It is strongly advised that you configure exim to use"
|
||||
echo "| a UID and GID other that 0/0. You can do this by adding"
|
||||
echo "| lines to the configure file like this:"
|
||||
echo "| "
|
||||
echo "| exim_user = \"_exim\""
|
||||
echo "| exim_group = \"_exim\""
|
||||
echo "| with uid/gid = \"521\""
|
||||
echo "| "
|
||||
echo "| but you must remember to allow that user write"
|
||||
echo "| permissions to /var/spool/exim."
|
||||
echo "| "
|
||||
echo "| If you want to do local deliveries as another user"
|
||||
echo "| (e.g. if you allow users to put procmail into their"
|
||||
echo "| .forward file) make the exim binary setuid root."
|
||||
echo "| "
|
||||
echo "| If you intend replacing sendmail with exim, then don't"
|
||||
echo "| forget to modify /etc/mailer.conf accordingly; see"
|
||||
echo "| mailwrapper(8)."
|
||||
echo
|
||||
echo "+---------------"
|
||||
echo "| If you intend replacing sendmail with exim, then don't"
|
||||
echo "| forget to modify /etc/mailer.conf accordingly; see"
|
||||
echo "| mailwrapper(8)."
|
||||
}
|
||||
|
||||
# Function: install configuration files
|
||||
#
|
||||
do_install_conf()
|
||||
{
|
||||
install -d -o root -g wheel ${CONFIG_DIR}
|
||||
install -o root -g wheel ${SAMPLE_CONFIG_DIR}/configure \
|
||||
${CONFIG_DIR}/configure
|
||||
echo "| "
|
||||
echo "| The $1 configuration files have been installed in ${CONFIG_DIR}."
|
||||
echo "| Please view these files and change the configuration to meet"
|
||||
echo "| your needs."
|
||||
echo "+---------------"
|
||||
echo
|
||||
install -d -o root -g wheel ${CONFIG_DIR}
|
||||
install -o root -g wheel ${SAMPLE_CONFIG_DIR}/configure \
|
||||
${CONFIG_DIR}/configure
|
||||
echo "| "
|
||||
echo "| A default $1 configuration file has been installed"
|
||||
echo "| in ${CONFIG_DIR}."
|
||||
echo "|"
|
||||
echo "| Please review this file and change the configuration"
|
||||
echo "| to meet your needs."
|
||||
echo "+---------------"
|
||||
echo
|
||||
}
|
||||
|
||||
# Function: tell the user what they need to do to use the port just installed
|
||||
#
|
||||
do_notice_conf()
|
||||
{
|
||||
echo "| "
|
||||
echo "| The existing $1 configuration files in ${CONFIG_DIR} have NOT"
|
||||
echo "| been changed. You may want to compare them to the current samples"
|
||||
echo "| in ${SAMPLE_CONFIG_DIR}, and update your configuration files"
|
||||
echo "| as needed."
|
||||
echo "+---------------"
|
||||
echo
|
||||
echo "| "
|
||||
echo "| The existing $1 configuration files in ${CONFIG_DIR} have NOT"
|
||||
echo "| been changed. You may want to compare them to the current samples"
|
||||
echo "| in ${SAMPLE_CONFIG_DIR}, and update your configuration files"
|
||||
echo "| as needed."
|
||||
echo "|"
|
||||
echo "| A perl script may help converting from exim-3.xx config"
|
||||
echo "| files and has been installed in"
|
||||
echo "| ${PREFIX}/share/examples/exim/convert4r4"
|
||||
echo "+---------------"
|
||||
echo
|
||||
}
|
||||
|
||||
# Verify proper execution
|
||||
#
|
||||
if [ $# -ne 2 ]; then
|
||||
echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
|
||||
exit 1
|
||||
echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Verify/process the command
|
||||
#
|
||||
case $2 in
|
||||
PRE-INSTALL)
|
||||
: nothing to pre-install for this port
|
||||
;;
|
||||
POST-INSTALL)
|
||||
do_notice "$1"
|
||||
if [ ! -d ${CONFIG_DIR} ]; then
|
||||
do_install_conf "$1"
|
||||
elif [ ! -f ${CONFIG_DIR}/configure ]; then
|
||||
do_install_conf "$1"
|
||||
else
|
||||
do_notice_conf "$1"
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
|
||||
exit 1
|
||||
;;
|
||||
PRE-INSTALL)
|
||||
do_accts $1
|
||||
;;
|
||||
POST-INSTALL)
|
||||
do_notice "$1"
|
||||
if [ ! -d ${CONFIG_DIR} ]; then
|
||||
do_install_conf "$1"
|
||||
elif [ ! -f ${CONFIG_DIR}/configure ]; then
|
||||
do_install_conf "$1"
|
||||
else
|
||||
do_notice_conf "$1"
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
exit 0
|
||||
|
2
mail/exim/pkg/PFRAG.no-no_exiscan
Normal file
2
mail/exim/pkg/PFRAG.no-no_exiscan
Normal file
@ -0,0 +1,2 @@
|
||||
share/doc/exim/exiscan-acl-examples.txt
|
||||
share/doc/exim/exiscan-acl-spec.txt
|
@ -1,3 +1,2 @@
|
||||
@comment $OpenBSD: PFRAG.no-no_x11,v 1.1 2000/08/02 15:44:12 naddy Exp $
|
||||
sbin/eximon
|
||||
sbin/eximon.bin
|
||||
bin/eximon
|
||||
bin/eximon.bin
|
||||
|
@ -1,28 +1,30 @@
|
||||
@comment $OpenBSD: PLIST,v 1.8 2004/04/14 14:24:35 xsa Exp $
|
||||
info/exim.info
|
||||
info/exim_filter.info
|
||||
info/exim_overview.info
|
||||
@exec install-info --section="Exim" --entry "* Overview: (exim_overview). Overview of the Exim system" %D/info/exim_overview.info %D/info/dir
|
||||
@exec install-info --section="Exim" --entry "* User guide: (exim). Exim manual" %D/info/exim.info %D/info/dir
|
||||
@exec install-info --section="Exim" --entry "* Filtering: (exim_filter). Filtering mail with Exim" %D/info/exim_filter.info %D/info/dir
|
||||
@unexec install-info --delete %D/info/exim_overview.info %D/info/dir
|
||||
@unexec install-info --delete %D/info/exim.info %D/info/dir
|
||||
@unexec install-info --delete %D/info/exim_filter.info %D/info/dir
|
||||
sbin/exim
|
||||
!%%no_x11%%
|
||||
sbin/exim_dumpdb
|
||||
sbin/exim_fixdb
|
||||
sbin/exim_tidydb
|
||||
sbin/exinext
|
||||
sbin/exiwhat
|
||||
sbin/exim_dbmbuild
|
||||
sbin/exicyclog
|
||||
sbin/exigrep
|
||||
sbin/eximstats
|
||||
sbin/exiqsumm
|
||||
sbin/exim_lock
|
||||
!%%no_exiscan%%
|
||||
@comment $OpenBSD: PLIST,v 1.9 2004/07/26 10:56:01 peter Exp $
|
||||
bin/exicyclog
|
||||
bin/exigrep
|
||||
bin/exim
|
||||
bin/exim-4.40
|
||||
bin/exim_checkaccess
|
||||
bin/exim_dbmbuild
|
||||
bin/exim_dumpdb
|
||||
bin/exim_fixdb
|
||||
bin/exim_lock
|
||||
bin/exim_tidydb
|
||||
bin/eximstats
|
||||
bin/exinext
|
||||
bin/exipick
|
||||
bin/exiqgrep
|
||||
bin/exiqsumm
|
||||
bin/exiwhat
|
||||
man/man8/exim.8
|
||||
share/doc/exim/README.SIEVE
|
||||
share/doc/exim/filter.txt
|
||||
share/doc/exim/spec.txt
|
||||
@dirrm share/doc/exim
|
||||
share/examples/exim/configure
|
||||
share/examples/exim/convert4r4
|
||||
@dirrm share/examples/exim
|
||||
@extraunexec rm -rf ${SYSCONFDIR}/exim
|
||||
@dirrm share/doc/exim
|
||||
@extra ${SYSCONFDIR}/exim/
|
||||
@extraunexec groupdel _exim
|
||||
@extraunexec userdel -r _exim
|
||||
|
Loading…
Reference in New Issue
Block a user