aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mail/exim-monitor/Makefile2
-rw-r--r--mail/exim-monitor/distinfo2
-rw-r--r--mail/exim-monitor/files/patch-exim_monitor::em_TextPop.c14
-rw-r--r--mail/exim/Makefile5
-rw-r--r--mail/exim/distinfo4
-rw-r--r--mail/exim/files/patch-scripts::exim_install75
-rw-r--r--mail/exim/files/patch-src::EDITME36
-rw-r--r--mail/exim/files/patch-src::configure.default8
-rw-r--r--mail/exim/pkg-plist1
9 files changed, 62 insertions, 85 deletions
diff --git a/mail/exim-monitor/Makefile b/mail/exim-monitor/Makefile
index ee3d21d2971f..6ffc36948af1 100644
--- a/mail/exim-monitor/Makefile
+++ b/mail/exim-monitor/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= exim-monitor
-PORTVERSION= 4.10
+PORTVERSION= 4.12
CATEGORIES= mail
MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
http://www.exim.org/ftp/exim4/ \
diff --git a/mail/exim-monitor/distinfo b/mail/exim-monitor/distinfo
index f1c936791424..f1d331a7cf98 100644
--- a/mail/exim-monitor/distinfo
+++ b/mail/exim-monitor/distinfo
@@ -1 +1 @@
-MD5 (exim-4.10.tar.bz2) = eb92cbba59bb2320b9912c46cd3fa4d0
+MD5 (exim-4.12.tar.bz2) = 7aed2a66295a7702b9a9394ec2bc5ffd
diff --git a/mail/exim-monitor/files/patch-exim_monitor::em_TextPop.c b/mail/exim-monitor/files/patch-exim_monitor::em_TextPop.c
deleted file mode 100644
index 3b3db99a110e..000000000000
--- a/mail/exim-monitor/files/patch-exim_monitor::em_TextPop.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- exim_monitor/em_TextPop.c.orig Tue Jun 18 11:47:45 2002
-+++ exim_monitor/em_TextPop.c Tue Jun 18 11:48:07 2002
-@@ -71,8 +71,10 @@
- #include <X11/Xos.h> /* for O_RDONLY */
- #include <errno.h>
-
-+/*
- extern int errno, sys_nerr;
--/* extern char* sys_errlist[]; */
-+extern char* sys_errlist[];
-+*/
-
- #define DISMISS_NAME ("cancel")
- #define DISMISS_NAME_LEN 6
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 3b86cccc63e3..dfafb3267260 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -7,7 +7,6 @@
PORTNAME= exim
PORTVERSION= ${EXIM_VERSION}
-PORTREVISION= 4
CATEGORIES= mail
MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
http://www.exim.org/ftp/exim4/ \
@@ -27,9 +26,9 @@ USE_BZIP2= yes
USE_PERL5= yes
MAN8= exim.8
-EXIM_VERSION= 4.10
+EXIM_VERSION= 4.12
EXIM_DOCVERSION= 4.10
-EXISCAN_VERSION= 4.10-16
+EXISCAN_VERSION= 4.12-20
PLIST_SUB+= EXIM_VERSION="${EXIM_VERSION}"
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index b115186eded4..cf04558e6e66 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,3 +1,3 @@
-MD5 (exim-4.10.tar.bz2) = eb92cbba59bb2320b9912c46cd3fa4d0
+MD5 (exim-4.12.tar.bz2) = 7aed2a66295a7702b9a9394ec2bc5ffd
MD5 (exim-texinfo-4.10.tar.bz2) = 2a2a34a2457d249d568a58e985f263c0
-MD5 (exiscan-4.10-16.tar.bz2) = 9908340c2b3222aa2733281f322ecbd2
+MD5 (exiscan-4.12-20.tar.bz2) = 06fb37c2ea38f15d1d31221a1f32f621
diff --git a/mail/exim/files/patch-scripts::exim_install b/mail/exim/files/patch-scripts::exim_install
index ea626829cc31..9fdc230687ee 100644
--- a/mail/exim/files/patch-scripts::exim_install
+++ b/mail/exim/files/patch-scripts::exim_install
@@ -1,50 +1,41 @@
---- scripts/exim_install.orig Fri Nov 23 17:31:15 2001
-+++ scripts/exim_install Wed Dec 19 14:38:06 2001
-@@ -293,30 +293,15 @@
+--- scripts/exim_install.orig Wed Dec 18 12:28:00 2002
++++ scripts/exim_install Mon Jan 6 11:11:46 2003
+@@ -330,9 +330,8 @@
+ echo $com ' ' ${CONFIGURE_FILE}
+ echo $com Therefore, skipping automatic installation.
- echo $com ""
-
--if [ ! -f ${CONFIGURE_FILE} ]; then
+-elif [ ! -f ${CONFIGURE_FILE} ]; then
- echo $com Installing default configuration in ${CONFIGURE_FILE}
- echo $com because there is no existing configuration file.
-- echo ${MKDIR} -p `${DIRNAME} ${CONFIGURE_FILE}`
-- ${real} ${MKDIR} -p `${DIRNAME} ${CONFIGURE_FILE}`
-- echo ${CP} ../src/configure.default ${CONFIGURE_FILE}
-- ${real} ${CP} ../src/configure.default ${CONFIGURE_FILE}
-+ echo $com Installing default configuration file in ${CONFIGURE_FILE%/*}/configure.default
-+ ${real} mkdir -p ${CONFIGURE_FILE%/*}
-+ echo ${CP} ../src/configure.default ${CONFIGURE_FILE%/*}
-+ ${real} ${CP} ../src/configure.default ${CONFIGURE_FILE%/*}
- if [ $? -ne 0 ]; then
- echo $com ""
- echo $com "*** Exim installation ${ver}failed ***"
- exit 1
++else
++ echo $com Installing default configuration in ${CONFIGURE_FILE}.default
+ if [ "${SYSTEM_ALIASES_FILE}" = "" ] ; then
+ SYSTEM_ALIASES_FILE=/etc/aliases
+ echo $com This configuration has system aliases in ${SYSTEM_ALIASES_FILE}.
+@@ -343,7 +342,7 @@
+
+ echo sed -e '\\'
+ echo " \"/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'${SYSTEM_ALIASES_FILE}'\"" '\\'
+- echo " ../src/configure.default > \${CONFIGURE_FILE}"
++ echo " ../src/configure.default > \${CONFIGURE_FILE}.default"
+
+ # I can't find a way of writing this using the ${real} feature because
+ # it seems that the output redirection always happens, even when -n was
+@@ -352,7 +351,7 @@
+ if [ "$real" = "" ] ; then
+ sed -e \
+ "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'${SYSTEM_ALIASES_FILE}'" \
+- ../src/configure.default > ${CONFIGURE_FILE}
++ ../src/configure.default > ${CONFIGURE_FILE}.default
+ else
+ true
fi
-- if [ ! -f /etc/aliases ]; then
-- echo $com '****'
-- echo $com Installing a dummy /etc/aliases file because you do not have
-- echo $com one, and the default configuration requires it. You should
-- echo $com edit /etc/aliases and at least create an alias for postmaster.
-- echo $com '***'
-- echo ${CP} ../src/aliases.default /etc/aliases
-- ${real} ${CP} ../src/aliases.default /etc/aliases
-- fi
+@@ -372,8 +371,6 @@
+ ${real} ${CP} ../src/aliases.default ${SYSTEM_ALIASES_FILE}
+ fi
+
-else
- echo $com Configuration file ${CONFIGURE_FILE} already exists
--fi
+ fi
# Install info files if the directory is defined and the Texinfo
- # source documentation is present.
-@@ -338,12 +323,6 @@
- echo $com Info installation directory is ${INFO_DIRECTORY}
- echo $com ""
-
-- makeinfo --no-split --output exim_overview.info ../doc/oview.texinfo
-- echo ${CP} exim_overview.info ${INFO_DIRECTORY}
-- ${real} ${CP} exim_overview.info ${INFO_DIRECTORY}
-- install-info --section="Exim" \
-- --entry "* Overview: (exim_overview). Overview of the Exim system" \
-- ${INFO_DIRECTORY}/exim_overview.info ${INFO_DIRECTORY}/dir
- makeinfo --no-split --output exim.info ../doc/spec.texinfo
- echo ${CP} exim.info ${INFO_DIRECTORY}
- ${real} ${CP} exim.info ${INFO_DIRECTORY}
diff --git a/mail/exim/files/patch-src::EDITME b/mail/exim/files/patch-src::EDITME
index e75a39e535ab..d239b5e0b420 100644
--- a/mail/exim/files/patch-src::EDITME
+++ b/mail/exim/files/patch-src::EDITME
@@ -10,15 +10,15 @@
#------------------------------------------------------------------------------
@@ -113,7 +113,7 @@
- # directories if they don't exist. It will also install a default run time
+ # directories if they don't exist. It will also install a default runtime
# configuration if this file does not exist.
-CONFIGURE_FILE=/usr/exim/configure
+CONFIGURE_FILE=XX_PREFIX_XX/etc/exim/configure
-
- #------------------------------------------------------------------------------
-@@ -126,14 +126,14 @@
+ # It is possible to specify a colon-separated list of files for CONFIGURE_FILE.
+ # In this case, Exim will use the first of them that exists when it is run.
+@@ -131,14 +131,14 @@
# owner of a local mailbox.) Specifying these values as root is very strongly
# discouraged. These values are compiled into the binary.
@@ -35,7 +35,7 @@
# Many sites define a user called "exim", with an appropriate default group,
# and use
-@@ -257,6 +257,7 @@
+@@ -264,6 +264,7 @@
# LDAP_LIB_TYPE=OPENLDAP2
# LDAP_LIB_TYPE=NETSCAPE
# LDAP_LIB_TYPE=SOLARIS
@@ -43,7 +43,7 @@
# If you don't set any of these, Exim assumes the original University of
# Michigan (OpenLDAP 1) library.
-@@ -269,8 +270,9 @@
+@@ -276,8 +277,9 @@
# don't need to set LOOKUP_INCLUDE if the relevant directories are already
# specified in INCLUDE.
@@ -55,7 +55,7 @@
#------------------------------------------------------------------------------
-@@ -281,7 +283,7 @@
+@@ -288,7 +290,7 @@
# files are defaulted in the OS/Makefile-Default file, but can be overridden in
# local OS-specific make files.
@@ -64,16 +64,16 @@
-@@ -316,7 +318,7 @@
- # settings commented out.
-
+@@ -326,7 +328,7 @@
# SUPPORT_TLS=yes
+
+ # Uncomment this setting if you are using OpenSSL
-# TLS_LIBS=-lssl -lcrypto
+TLS_LIBS=-lssl -lcrypto
- # If you are running Exim as a server, note that just building it with TLS
- # support is not all you need to do. You also need to set up a suitable
-@@ -358,7 +360,7 @@
+ # Uncomment these settings if you are using GnuTLS
+ # USE_GNUTLS=yes
+@@ -377,7 +379,7 @@
# Once you have done this, "make install" will build the info files and
# install them in the directory you have defined.
@@ -82,7 +82,7 @@
#------------------------------------------------------------------------------
-@@ -371,7 +373,7 @@
+@@ -390,7 +392,7 @@
# %s. This will be replaced by one of the strings "main", "panic", or "reject"
# to form the final file names. Some installations may want something like this:
@@ -91,7 +91,7 @@
# which results in files with names /var/log/exim_mainlog, etc. The directory
# in which the log files are placed must exist; Exim does not try to create
-@@ -474,12 +476,20 @@
+@@ -493,12 +495,20 @@
# USE_TCP_WRAPPERS=yes
# CFLAGS=-O -I/usr/local/include
@@ -111,9 +111,9 @@
+
+
#------------------------------------------------------------------------------
- # The default action of the exim_install script is to install the Exim binary
- # with a unique name such as exim-4.00-1, and then set up a symbolic link
-@@ -695,7 +705,7 @@
+ # The default action of the exim_install script (which is run by "make
+ # install") is to install the Exim binary with a unique name such as
+@@ -726,7 +736,7 @@
# (process id) to a file so that it can easily be identified. The path of the
# file can be specified here. Some installations may want something like this:
diff --git a/mail/exim/files/patch-src::configure.default b/mail/exim/files/patch-src::configure.default
index 768660800cc6..47178ccf03dc 100644
--- a/mail/exim/files/patch-src::configure.default
+++ b/mail/exim/files/patch-src::configure.default
@@ -9,17 +9,17 @@
never_users = root
-@@ -365,7 +367,8 @@
+@@ -378,7 +380,8 @@
allow_fail
allow_defer
- data = ${lookup{$local_part}lsearch{/etc/aliases}}
+ data = ${lookup{$local_part}lsearch{SYSTEM_ALIASES_FILE}}
-# user = exim
+ user = mailnull
+ group = mail
file_transport = address_file
pipe_transport = address_pipe
-@@ -399,6 +402,7 @@
+@@ -412,6 +415,7 @@
file_transport = address_file
pipe_transport = address_pipe
reply_transport = address_reply
@@ -27,7 +27,7 @@
# This router matches local user mailboxes.
-@@ -442,8 +446,8 @@
+@@ -455,8 +459,8 @@
delivery_date_add
envelope_to_add
return_path_add
diff --git a/mail/exim/pkg-plist b/mail/exim/pkg-plist
index 9350adf48196..654f57fb8b1a 100644
--- a/mail/exim/pkg-plist
+++ b/mail/exim/pkg-plist
@@ -15,6 +15,7 @@ sbin/exim_dbmbuild
sbin/exicyclog
sbin/exigrep
sbin/eximstats
+sbin/exiqgrep
sbin/exiqsumm
%%PORTDOCS%%share/doc/exim/POST-INSTALL-NOTES
%%PORTDOCS%%share/doc/exim/Exim3.upgrade
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-30 22:41:28 +0000