Date: Sun, 04 Mar 2001 08:35:28 +0900 From: amakawa@sf.t.u-tokyo.ac.jp To: FreeBSD-gnats-submit@freebsd.org Subject: ports/25516: update mail/exim to 3.22 Message-ID: <E14ZLYe-0000l7-00@nebula.sf.t.u-tokyo.ac.jp>
next in thread | raw e-mail | index | archive | help
>Number: 25516 >Category: ports >Synopsis: update mail/exim to 3.22 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Mar 03 15:40:01 PST 2001 >Closed-Date: >Last-Modified: >Originator: AMAKAWA Shuhei >Release: FreeBSD 4.2-STABLE i386 >Organization: >Environment: FreeBSD 4.2-STABLE i386 >Description: Update mail/exim to 3.22. Reflect the latest default configuration (not much real changes). >How-To-Repeat: >Fix: Removed files: files/exim.sh files/eximon.conf diff -urN /usr/ports/mail/exim/Makefile exim/Makefile --- /usr/ports/mail/exim/Makefile Mon Feb 5 22:51:43 2001 +++ exim/Makefile Sat Mar 3 20:39:45 2001 @@ -6,12 +6,12 @@ # PORTNAME= exim -PORTVERSION= 3.20 +PORTVERSION= 3.22 CATEGORIES= mail MASTER_SITES= ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/ \ http://www.exim.org/ftp/ \ ftp://ftp.is.co.za/networking/mail/transport/exim/ -DISTFILES= exim-3.20.tar.gz exim-texinfo-3.20.tar.gz +DISTFILES= exim-3.22.tar.gz exim-texinfo-3.20.tar.gz MAINTAINER= sheldonh@FreeBSD.org @@ -97,7 +97,7 @@ SEDLIST+= -e 's,XX_PAM_LIBS_XX,-lpam,' .else SEDLIST+= -e 's,XX_PAM_LIBS_XX,,' \ - -e 's,^SUPPORT_PAM,\#SUPPORT_PAM,' + -e 's,^SUPPORT_PAM,\#SUPPORT_PAM,' .endif .if !defined(WITH_PAM) || !defined(PAM_CRAM_MD5) @@ -139,16 +139,17 @@ ${SED} ${SEDLIST} < ${FILESDIR}/Makefile > ${WRKSRC}/Local/Makefile ${SED} ${SEDLIST} < ${FILESDIR}/configure.default \ > ${WRKSRC}/src/configure.default - ${CP} ${FILESDIR}/eximon.conf ${WRKSRC}/Local + ${CP} ${WRKSRC}/exim_monitor/EDITME ${WRKSRC}/Local/eximon.conf cd ${WRKSRC}/doc && \ for i in ../../exim-texinfo-3.20/doc/* ; do \ ${LN} -sf $$i ; \ done post-build: - ${INSTALL_SCRIPT} ${FILESDIR}/exim.sh \ - ${WRKSRC}/build-${OPSYS}-${MACHINE_ARCH} ${TOUCH} ${WRKSRC}/build-${OPSYS}-${MACHINE_ARCH}/eximon.bin ${TOUCH} ${WRKSRC}/build-${OPSYS}-${MACHINE_ARCH}/eximon + +post-install: + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff -urN /usr/ports/mail/exim/distinfo exim/distinfo --- /usr/ports/mail/exim/distinfo Sat Dec 23 07:42:48 2000 +++ exim/distinfo Mon Feb 5 12:22:25 2001 @@ -1,2 +1,2 @@ -MD5 (exim-3.20.tar.gz) = a004701a49ab3ec8abf8a293ae47afa0 +MD5 (exim-3.22.tar.gz) = c0514615d0be1d38c638c50afa2b9405 MD5 (exim-texinfo-3.20.tar.gz) = f8ef4b785e34b0f4b8efed4679c1add0 diff -urN /usr/ports/mail/exim/files/Makefile exim/files/Makefile --- /usr/ports/mail/exim/files/Makefile Sat Dec 23 07:42:49 2000 +++ exim/files/Makefile Sat Mar 3 19:57:15 2001 @@ -413,7 +413,7 @@ # the file name, allowing sites that run two separate daemons to distinguish # them. Some installations may want something like this -# PID_FILE_PATH=/var/run/exim%s.pid +PID_FILE_PATH=/var/run/exim%s.pid # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory # (see SPOOL_DIRECTORY below) with the name "exim-daemon.pid" for the standard diff -urN /usr/ports/mail/exim/files/configure.default exim/files/configure.default --- /usr/ports/mail/exim/files/configure.default Tue Aug 3 18:01:38 1999 +++ exim/files/configure.default Sat Mar 3 20:54:23 2001 @@ -18,6 +18,16 @@ # in fact empty). Blank lines, and lines starting with # are ignored. +############ IMPORTANT ########## IMPORTANT ########### IMPORTANT ############ +# # +# Whenever you change Exim's configuration file, you *must* remember to HUP # +# the Exim daemon, because it will not pick up the new configuration until # +# until you do this. It is usually a good idea to test a new configuration # +# for syntactic correctness (e.g. using "exim -C /config/file -bV") first. # +# # +############ IMPORTANT ########## IMPORTANT ########### IMPORTANT ############ + + ###################################################################### # MAIN CONFIGURATION SETTINGS # @@ -64,11 +74,24 @@ # If you want to accept mail addressed to your host's literal IP address, for # example, mail addressed to "user@[111.111.111.111]", then uncomment the # following line, or supply the literal domain(s) as part of "local_domains" -# above. +# above. You also need to comment "forbid_domain_literals" below. This is not +# recommended for today's Internet. # local_domains_include_host_literals +# The following line prevents Exim from recognizing addresses of the form +# "user@[111.111.111.111]" that is, with a "domain literal" (an IP address) +# instead of a named domain. The RFCs still require this form, but it makes +# little sense to permit mail to be sent to specific hosts by their IP address +# in the modern Internet, and this ancient format has been used by those +# seeking to abuse hosts by using them for unwanted relaying. If you really +# do want to support domain literals, remove the following line, and see +# also the "domain_literal" router below. + +forbid_domain_literals + + # No local deliveries will ever be run under the uids of these users (a colon- # separated list). An attempt to do so gets changed so that it runs under the # uid of "nobody" instead. This is a paranoic safety catch. Note the default @@ -78,7 +101,7 @@ exim_user = XX_BINOWN_XX exim_group = mail -never_users = root : XX_BINOWN_XX +never_users = root : toor : XX_BINOWN_XX # The use of your host as a mail relay by any host, including the local host @@ -87,27 +110,31 @@ # # host_accept_relay = localhost # +# This FreeBSD port chooses to do so. + +host_accept_relay = localhost + # If you want to permit relaying through your host from certain hosts or IP # networks, you need to set the option appropriately, for example # -# host_accept_relay = my.friends.host : 131.111.0.0/16 +# host_accept_relay = my.friends.host : 192.168.0.0/16 # # If you are an MX backup or gateway of some kind for some domains, you must # set relay_domains to match those domains. This will allow any host to # relay through your host to those domains. # +# relay_domains = +# # See the section of the manual entitled "Control of relaying" for more # information. -host_accept_relay = "127.0.0.1/32" - # The setting below causes Exim to do a reverse DNS lookup on all incoming # IP calls, in order to get the true host name. If you feel this is too # expensive, you can specify the networks for which a lookup is done, or # remove the setting entirely. -host_lookup = 0.0.0.0/0 +host_lookup = * # By default, Exim expects all envelope addresses to be fully qualified, that @@ -160,8 +187,20 @@ # percent_hack_domains = * -pid_file_path = /var/run/exim%s.pid +# When Exim can neither deliver a message nor return it to sender, it "freezes" +# the delivery error message (aka "bounce message"). There are also other +# circumstances in which messages get frozen. They will stay on the queue for +# ever unless one of the following options is set. + +# This option unfreezes unfreezes bounce messages after two days, tries +# once more to deliver them, and ignores any delivery failures. + +ignore_errmsg_errors_after = 2d + +# This option cancels (removes) frozen messages that are older than a week. + +timeout_frozen_after = 7d end @@ -184,16 +223,16 @@ driver = smtp -# This transport is used for local delivery to user mailboxes. By default -# it will be run under the uid and gid of the local user, and requires -# the sticky bit to be set on the /var/mail directory. Some systems use -# the alternative approach of running mail deliveries under a particular -# group instead of using the sticky bit. The commented options below show -# how this can be done. +# This transport is used for local delivery to user mailboxes in traditional +# BSD mailbox format. By default it will be run under the uid and gid of the +# local user, and requires the sticky bit to be set on the /var/mail directory. +# Some systems use the alternative approach of running mail deliveries under a +# particular group instead of using the sticky bit. The commented options below +# show how this can be done. local_delivery: driver = appendfile - file = /var/mail/${local_part} + file = /var/mail/$local_part delivery_date_add envelope_to_add return_path_add @@ -206,7 +245,8 @@ # to the sender of the message as a delivery error. Set return_fail_output # instead of return_output if you want this to happen only when the pipe fails # to complete normally. You can set different transports for aliases and -# forwards if you want to - see the references to address_pipe below. +# forwards if you want to - see the references to address_pipe in the directors +# section below. address_pipe: driver = pipe @@ -214,7 +254,7 @@ # This transport is used for handling deliveries directly to files that are -# generated by aliassing or forwarding. +# generated by aliasing or forwarding. address_file: driver = appendfile @@ -258,11 +298,11 @@ system_aliases: driver = aliasfile - file = /etc/aliases + file = /etc/mail/aliases search_type = lsearch + user = XX_BINOWN_XX file_transport = address_file pipe_transport = address_pipe - user = XX_BINOWN_XX # This director handles forwarding using traditional .forward files. @@ -328,14 +368,17 @@ # This router routes to remote hosts over SMTP by explicit IP address, -# given as a "domain literal" in the form [nnn.nnn.nnn.nnn]. The RFCs -# require this facility, which is why it is enabled by default in Exim. -# If you want to lock it out, set forbid_domain_literals in the main -# configuration section above. - -literal: - driver = ipliteral - transport = remote_smtp +# when an email address is given in "domain literal" form, for example, +# <user@[192.168.35.64]>. The RFCs require this facility. However, it is +# little-known these days, and has been exploited by evil people seeking +# to abuse SMTP relays. Consequently it is commented out in the default +# configuration. If you uncomment this router, you also need to comment out +# "forbid_domain_literals" above, so that Exim can recognize the syntax of +# domain literal addresses. + +# domain_literal: +# driver = ipliteral +# transport = remote_smtp end @@ -366,5 +409,15 @@ ###################################################################### # There are no rewriting specifications in this default configuration file. + +end + + + +###################################################################### +# AUTHENTICATION CONFIGURATION # +###################################################################### + +# There are no authenticator specifications in this default configuration file. # End of Exim configuration file diff -urN /usr/ports/mail/exim/files/exim.sh exim/files/exim.sh --- /usr/ports/mail/exim/files/exim.sh Wed Jul 5 13:36:37 2000 +++ exim/files/exim.sh Thu Jan 1 01:00:00 1970 @@ -1,17 +0,0 @@ -#!/bin/sh -args='-bd -q30m' - -case "$1" in -start) - [ -x /usr/local/sbin/exim ] && /usr/local/sbin/exim $args && echo -n ' exim' - ;; -stop) - killall exim && echo -n ' exim' - ;; -*) - echo "Usage: `basename $0` {start|stop}" >&2 - exit 64 - ;; -esac - -exit 0 diff -urN /usr/ports/mail/exim/files/eximon.conf exim/files/eximon.conf --- /usr/ports/mail/exim/files/eximon.conf Tue Sep 28 12:49:38 1999 +++ exim/files/eximon.conf Thu Jan 1 01:00:00 1970 @@ -1,172 +0,0 @@ -################################################## -# The Exim Monitor # -################################################## - -# This is the template for the Exim monitor's main build-time configuration -# file. It contains settings that are independent of any operating system. It -# should be edited and then saved to a file called Local/eximon.conf before -# running the make command to build the monitor, if any settings are required. -# Local/eximon.conf can be empty if no changes are needed. The examples given -# here (commented out) are the default settings. - -# Any settings made in the configuration file can be overridden at run time -# by setting up an environment variable with the same name as any of these -# options, but preceded by EXIMON_, for example, EXIMON_WINDOW_TITLE. - - -################################################################## -# Set these variables as appropriate for your system # -################################################################## - -# The qualifying name for your domain. The only use made of this is for -# testing that certain addresses are the same when displaying the -# log tail, and for shortening sender addresses in the queue display. - -# QUALIFY_DOMAIN= - -# The default minimum width and height for the whole window are 103 and -# 162 pixels respectively. This is enough to hold the left-most stripchart -# and the quit button. The values can be changed here. - -MIN_HEIGHT=162 -MIN_WIDTH=103 - -# The title for eximon's main display window. It is possible to have -# host name of the machine you are running on substituted into the -# title string. If you include the string ${fullhostname} then the -# complete name is used. If you include ${hostname} then the full -# host name will have the string contained in the DOMAIN variable -# stripped from its right-hand end before being substituted. Any other -# shell or environment variables may also be included. - -# If you use any substitutions, remember to ensure that the $ and {} -# characters are escaped from the shell, e.g. by using single quotes. - -WINDOW_TITLE="${hostname} eximon" - -# The domain that you want to be stripped from the machine's full hostname -# when forming the short host name for the eximon window title, as -# described above. - -# DOMAIN= - -# Parameters for the rolling display of the tail of the exim log file. -# The width and depth are measured in pixels; LOG_BUFFER specifies the -# amount of store to set aside for holding the log tail, which is displayed -# in a scrolling window. When this store is full, the earlier 50% of it -# is discarded - this is much more efficient that throwing it away line -# by line. The number given can be followed by the letter K to indicate -# that the value is in kilobytes. A minimum value of 1K is enforced. - -LOG_DEPTH=300 -LOG_WIDTH=950 -LOG_BUFFER=20K - -# The font which is used in the log tail display. This is defined in -# the normal X manner. It must be a "character cell" font, because this -# is required by the text widget. - -# LOG_FONT=-misc-fixed-medium-r-normal-*-14-140-*-*-*-*-iso8859-1 - -# Parameters for the display of message that are on the exim queue. -# The width and depth are measured in pixels. - -QUEUE_DEPTH=200 -QUEUE_WIDTH=950 - -# The font which is used in the queue display. - -# QUEUE_FONT=$LOG_FONT - -# When a message has more than one undelivered address, they are listed -# one below the other. A limit can be placed on the number of addresses -# displayed for any one message. If there are more, then "..." is used -# to indicate this. - -QUEUE_MAX_ADDRESSES=10 - -# The display of the contents of the queue is updated every QUEUE_INTERVAL -# seconds by default (there is a button to request update). - -QUEUE_INTERVAL=300 - -# The size of the popup text window that is used for looking at the -# contents of messages, etc. - -# TEXT_DEPTH=200 - -# The keystroke/mouse-operation that is used to pop up the menu in the -# queue window is configurable. The default is Shift with the lefthand -# mouse button. The name of an alternative can be specified in the standard -# X way of naming these things. With the default configuration for the monitor, -# individuals can override this by setting the EXIMON_MENU_EVENT environment -# variable. - -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. - -ACTION_OUTPUT=yes - -# When some action is taken on a message, such as freezing it, or changing -# its recipients, the queue display is normally automatically updated. On -# systems that have very large queues, this can take some time and be dis- -# tracting. If this option is set to "no", the queue display is no longer -# automatically updated after an action is applied to a message. - -ACTION_QUEUE_UPDATE=yes - -# When the menu item to display a message's body is invoked, the amount -# of data is limited to BODY_MAX bytes. This limit is a safety precaution -# to save the screen scrolling for ever on an enormous message. - -BODY_MAX=20000 - -# The stripcharts are updated every STRIPCHART_INTERVAL seconds. - -STRIPCHART_INTERVAL=60 - -# A stripchart showing the count of messages in the queue is always -# displayed on the left of eximon's window. Its name is "queue" by -# default, but can be changed by this variable. - -QUEUE_STRIPCHART_NAME=queue - -# The following variable may be set to the name of a disc partition. If -# it is, a stripchart showing the percentage fullness of the partition -# will be displayed as the second stripchart. This can be used to keep -# a display of a mail spool partition on the screen. - -# SIZE_STRIPCHART=/var/mail - -# The name of the size stripchar will be the last component of SIZE_STRIPCHART -# unless the following variable is set to override it. - -# SIZE_STRIPCHART_NAME=space - -# The following variable contains a specification of which stripcharts -# you want eximon to display based on log entries. The string consists of -# pairs of strings, delimited by slash characters. The first string in each -# pair is a regular expression that matches some distinguishing feature in a -# exim log entry. - -# Entries that match the expression will be counted and displayed in a -# stripchart whose title is given by the second string. The string may -# be continued over several input lines, provided that it is split -# after a slash, and an additional slash (optionally preceded by white -# space) is included at the start of the continuation line. - -# Stripcharts configured by the following parameter are displayed to the -# right of the queue and size stripcharts, in the order defined here. - -LOG_STRIPCHARTS='/ <= /in/ - / => /out/ - / => .+ D=/local/ - / => .+ T=[^ ]*smtp/smtp/' - -# End of exim_monitor/EDITME diff -urN /usr/ports/mail/exim/files/patch-aa exim/files/patch-aa --- /usr/ports/mail/exim/files/patch-aa Fri Aug 4 17:04:50 2000 +++ exim/files/patch-aa Sat Mar 3 20:05:13 2001 @@ -4,19 +4,16 @@ to cope with files which we "touch" to zero bytes for packaging purposes. -2) Causes an exim.sh startup script to be installed in the BSD-style - ${PREFIX}/etc/rc.d - -3) Causes the configure file to be installed as a sample only. The +2) Causes the configure file to be installed as a sample only. The administrator needs to rename this file to "activate" exim. -4) Changes the invocation of make-info to be less prone to fail on +3) Changes the invocation of make-info to be less prone to fail on silly errors. XXX Check that this is still necessary from time to time. ---- scripts/exim_install.orig Mon Aug 2 17:43:03 1999 -+++ scripts/exim_install Tue Aug 3 14:31:20 1999 -@@ -142,9 +142,9 @@ +--- scripts/exim_install.orig Fri Jan 19 09:32:06 2001 ++++ scripts/exim_install Sat Mar 3 20:04:17 2001 +@@ -146,9 +146,9 @@ from=../util/ fi @@ -28,33 +25,7 @@ echo $com "*** Have you built Exim successfully?" echo $com "*** Exim installation ${ver}failed ***" exit 1 -@@ -195,25 +195,40 @@ - fi - done - -+# Install exim.sh startup script in FreeBSD's ${PREFIX}/etc/rc.d so that -+# exim will start up on boot once sendmail is disabled and -+# ${PREFIX}/etc/exim/configure is in place. - -+echo $com "" - --# If there is no configuration file, install the default. -+if [ -f ${PREFIX}/etc/rc.d/exim.sh ]; then -+ echo $com "${PREFIX}/etc/rc.d/exim.sh exists, not overwritten" -+else -+ echo $com "Installing exim.sh startup script in ${PREFIX}/etc/rc.d" -+ ${real} mkdir -p ${PREFIX}/etc/rc.d -+ echo ${CP} -p exim.sh ${PREFIX}/etc/rc.d/ -+ ${real} ${CP} -p exim.sh ${PREFIX}/etc/rc.d/ -+ if [ $? -ne 0 ]; then -+ echo $com "" -+ echo $com "**** Exim installation ${ver}failed ****" -+ exit 1 -+ fi -+fi -+ -+# Install only a sample configuration, which encourages the admin to look -+# at it, since Exim won't run without a configure file. +@@ -205,19 +205,15 @@ echo $com "" @@ -78,7 +49,7 @@ # Install info files if the directory is defined and the Texinfo # source documentation is present. -@@ -235,19 +250,21 @@ +@@ -239,19 +235,21 @@ echo $com Info installation directory is ${INFO_DIRECTORY} echo $com "" diff -urN /usr/ports/mail/exim/pkg-message exim/pkg-message --- /usr/ports/mail/exim/pkg-message Thu Jan 1 01:00:00 1970 +++ exim/pkg-message Sat Mar 3 20:27:17 2001 @@ -0,0 +1,12 @@ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +Make sure that /etc/mail/mailer.conf reads +--------------------------------------- +sendmail /usr/local/sbin/exim +send-mail /usr/local/sbin/exim +mailq /usr/local/sbin/exim +newaliases /usr/local/sbin/exim +--------------------------------------- +and set +sendmail_enable="YES" +in /etc/rc.conf to start exim at system boot time. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff -urN /usr/ports/mail/exim/pkg-plist exim/pkg-plist --- /usr/ports/mail/exim/pkg-plist Sat Dec 23 07:42:49 2000 +++ exim/pkg-plist Sat Mar 3 20:07:53 2001 @@ -1,5 +1,4 @@ etc/exim/configure.sample -etc/rc.d/exim.sh info/exim_overview.info info/exim.info info/exim_filter.info >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E14ZLYe-0000l7-00>