mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 01:39:16 -04:00
Update 3.22 -> 3.30:
This is primarily a maintenance release, though there are a very small number of functional additions. This release does not address the "orphaned -D spool files" problem, but to date this problem has not been observed on FreeBSD systems.
This commit is contained in:
parent
88333e1951
commit
14d40c95d6
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=44173
15 changed files with 18 additions and 348 deletions
|
@ -6,13 +6,12 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
PORTNAME= exim
|
PORTNAME= exim
|
||||||
PORTVERSION= 3.22
|
PORTVERSION= 3.30
|
||||||
PORTREVISION= 7
|
|
||||||
CATEGORIES= mail
|
CATEGORIES= mail
|
||||||
MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/ \
|
MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/ \
|
||||||
http://www.exim.org/ftp/ \
|
http://www.exim.org/ftp/ \
|
||||||
ftp://ftp.is.co.za/networking/mail/transport/exim/
|
ftp://ftp.is.co.za/networking/mail/transport/exim/
|
||||||
DISTFILES= exim-3.22.tar.gz exim-texinfo-3.20.tar.gz
|
DISTFILES= exim-3.30.tar.gz exim-texinfo-3.30.tar.gz
|
||||||
|
|
||||||
MAINTAINER= sheldonh@FreeBSD.org
|
MAINTAINER= sheldonh@FreeBSD.org
|
||||||
|
|
||||||
|
@ -167,7 +166,7 @@ do-configure:
|
||||||
${SED} ${SEDLIST} < ${WRKSRC}/src/EDITME > ${WRKSRC}/Local/Makefile
|
${SED} ${SEDLIST} < ${WRKSRC}/src/EDITME > ${WRKSRC}/Local/Makefile
|
||||||
${CP} ${WRKSRC}/exim_monitor/EDITME ${WRKSRC}/Local/eximon.conf
|
${CP} ${WRKSRC}/exim_monitor/EDITME ${WRKSRC}/Local/eximon.conf
|
||||||
cd ${WRKSRC}/doc && \
|
cd ${WRKSRC}/doc && \
|
||||||
for i in ../../exim-texinfo-3.20/doc/* ; do \
|
for i in ../../exim-texinfo-3.30/doc/* ; do \
|
||||||
${LN} -sf $$i ; \
|
${LN} -sf $$i ; \
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
MD5 (exim-3.22.tar.gz) = c0514615d0be1d38c638c50afa2b9405
|
MD5 (exim-3.30.tar.gz) = 401b2f6e75a55114a26f875c0ecb55b2
|
||||||
MD5 (exim-texinfo-3.20.tar.gz) = f8ef4b785e34b0f4b8efed4679c1add0
|
MD5 (exim-texinfo-3.30.tar.gz) = 155ae0ece6c4b50f7c0a8f7d9e2d0944
|
||||||
|
|
|
@ -1,72 +0,0 @@
|
||||||
--- OS/Makefile-Base.orig Mon Jun 11 11:52:54 2001
|
|
||||||
+++ OS/Makefile-Base Mon Jun 11 12:04:56 2001
|
|
||||||
@@ -216,6 +216,9 @@
|
|
||||||
auths/auths.a \
|
|
||||||
$(LIBS) $(LIBS_EXIM) $(IPV6_LIBS) $(EXTRALIBS) $(EXTRALIBS_EXIM) \
|
|
||||||
$(DBMLIB) $(LIBRESOLV) $(LOOKUP_LIBS) $(PERL_LIBS) $(TLS_LIBS)
|
|
||||||
+ if [ x"$(STRIP_COMMAND)" != x"" ]; then \
|
|
||||||
+ $(STRIP_COMMAND) exim; \
|
|
||||||
+ fi
|
|
||||||
$(EXIM_CHMOD)
|
|
||||||
@echo " "
|
|
||||||
@echo ">>> exim binary built"
|
|
||||||
@@ -228,6 +231,9 @@
|
|
||||||
exim_fixdb: $(OBJ_FIXDB)
|
|
||||||
$(CC) $(CFLAGS) $(INCLUDE) -o exim_fixdb $(LFLAGS) $(OBJ_FIXDB) \
|
|
||||||
$(LIBS) $(EXTRALIBS) $(DBMLIB)
|
|
||||||
+ if [ x"$(STRIP_COMMAND)" != x"" ]; then \
|
|
||||||
+ $(STRIP_COMMAND) exim_fixdb; \
|
|
||||||
+ fi
|
|
||||||
@echo " "
|
|
||||||
@echo ">>> exim_fixdb utility built"
|
|
||||||
@echo " "
|
|
||||||
@@ -239,6 +245,9 @@
|
|
||||||
exim_dumpdb: $(OBJ_DUMPDB)
|
|
||||||
$(CC) $(CFLAGS) $(INCLUDE) -o exim_dumpdb $(LFLAGS) $(OBJ_DUMPDB) \
|
|
||||||
$(LIBS) $(EXTRALIBS) $(DBMLIB)
|
|
||||||
+ if [ x"$(STRIP_COMMAND)" != x"" ]; then \
|
|
||||||
+ $(STRIP_COMMAND) exim_dumpdb; \
|
|
||||||
+ fi
|
|
||||||
@echo " "
|
|
||||||
@echo ">>> exim_dumpdb utility built"
|
|
||||||
@echo " "
|
|
||||||
@@ -250,6 +259,9 @@
|
|
||||||
exim_tidydb: $(OBJ_TIDYDB)
|
|
||||||
$(CC) $(CFLAGS) $(INCLUDE) -o exim_tidydb $(LFLAGS) $(OBJ_TIDYDB) \
|
|
||||||
$(LIBS) $(EXTRALIBS) $(DBMLIB)
|
|
||||||
+ if [ x"$(STRIP_COMMAND)" != x"" ]; then \
|
|
||||||
+ $(STRIP_COMMAND) exim_tidydb; \
|
|
||||||
+ fi
|
|
||||||
@echo " "
|
|
||||||
@echo ">>> exim_tidydb utility built"
|
|
||||||
@echo " "
|
|
||||||
@@ -259,6 +271,9 @@
|
|
||||||
exim_dbmbuild: exim_dbmbuild.c config.h
|
|
||||||
$(CC) $(CFLAGS) $(INCLUDE) -o exim_dbmbuild $(LFLAGS) exim_dbmbuild.c \
|
|
||||||
$(LIBS) $(EXTRALIBS) $(DBMLIB)
|
|
||||||
+ if [ x"$(STRIP_COMMAND)" != x"" ]; then \
|
|
||||||
+ $(STRIP_COMMAND) exim_dbmbuild; \
|
|
||||||
+ fi
|
|
||||||
@echo " "
|
|
||||||
@echo ">>> exim_dbmbuild utility built"
|
|
||||||
@echo " "
|
|
||||||
@@ -268,6 +283,9 @@
|
|
||||||
exim_lock: exim_lock.c
|
|
||||||
$(CC) $(CFLAGS) $(INCLUDE) -o exim_lock $(LFLAGS) exim_lock.c \
|
|
||||||
$(LIBS) $(EXTRALIBS)
|
|
||||||
+ if [ x"$(STRIP_COMMAND)" != x"" ]; then \
|
|
||||||
+ $(STRIP_COMMAND) exim_lock; \
|
|
||||||
+ fi
|
|
||||||
@echo " "
|
|
||||||
@echo ">>> exim_lock utility built"
|
|
||||||
@echo " "
|
|
||||||
@@ -290,6 +308,9 @@
|
|
||||||
$(PURIFY) $(CC) -o eximon.bin em_version.o $(LFLAGS) $(XLFLAGS) \
|
|
||||||
$(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 pcre/libpcre.a \
|
|
||||||
$(LIBS) $(LIBS_EXIMON) $(EXTRALIBS) $(EXTRALIBS_EXIMON) -lc
|
|
||||||
+ if [ x"$(STRIP_COMMAND)" != x"" ]; then \
|
|
||||||
+ $(STRIP_COMMAND) eximon.bin; \
|
|
||||||
+ fi
|
|
||||||
@echo " "
|
|
||||||
@echo ">>> exim monitor binary built"
|
|
||||||
@echo " "
|
|
|
@ -1,4 +1,4 @@
|
||||||
This patch makes three changes to the exim_install script:
|
This patch makes two changes to the exim_install script:
|
||||||
|
|
||||||
*) Changes the test used to determine whether a file should be installed
|
*) Changes the test used to determine whether a file should be installed
|
||||||
to cope with files which we "touch" to zero bytes for packaging
|
to cope with files which we "touch" to zero bytes for packaging
|
||||||
|
@ -7,9 +7,6 @@ This patch makes three changes to the exim_install script:
|
||||||
*) Causes the configure file to be installed as a sample only. The
|
*) Causes the configure file to be installed as a sample only. The
|
||||||
administrator needs to rename this file to "activate" exim.
|
administrator needs to rename this file to "activate" exim.
|
||||||
|
|
||||||
*) Fixes the info(1) titles so that, for example ``info exim'' actually
|
|
||||||
enters the exim.info file.
|
|
||||||
|
|
||||||
--- scripts/exim_install.orig Mon Aug 2 17:43:03 1999
|
--- scripts/exim_install.orig Mon Aug 2 17:43:03 1999
|
||||||
+++ scripts/exim_install Tue Aug 3 14:31:20 1999
|
+++ scripts/exim_install Tue Aug 3 14:31:20 1999
|
||||||
@@ -146,9 +146,9 @@
|
@@ -146,9 +146,9 @@
|
||||||
|
@ -56,26 +53,3 @@ This patch makes three changes to the exim_install script:
|
||||||
|
|
||||||
# Install info files if the directory is defined and the Texinfo
|
# Install info files if the directory is defined and the Texinfo
|
||||||
# source documentation is present.
|
# source documentation is present.
|
||||||
@@ -243,19 +238,19 @@
|
|
||||||
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" \
|
|
||||||
+ --entry "* Exim 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}
|
|
||||||
install-info --section="Exim" \
|
|
||||||
- --entry "* User guide: (exim). Exim manual" \
|
|
||||||
+ --entry "* Exim Specification: (exim). Exim manual" \
|
|
||||||
${INFO_DIRECTORY}/exim.info ${INFO_DIRECTORY}/dir
|
|
||||||
makeinfo --no-split --output exim_filter.info ../doc/filter.texinfo
|
|
||||||
echo ${CP} exim_filter.info ${INFO_DIRECTORY}
|
|
||||||
${real} ${CP} exim_filter.info ${INFO_DIRECTORY}
|
|
||||||
install-info --section="Exim" \
|
|
||||||
- --entry "* Filtering: (exim_filter). Filtering mail with Exim" \
|
|
||||||
+ --entry "* Exim Filtering: (exim_filter). Filtering mail with Exim" \
|
|
||||||
${INFO_DIRECTORY}/exim_filter.info ${INFO_DIRECTORY}/dir
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- src/accept.c.orig Mon Jun 11 17:00:24 2001
|
|
||||||
+++ src/accept.c Mon Jun 11 17:01:30 2001
|
|
||||||
@@ -2503,7 +2503,7 @@
|
|
||||||
nothing on success. The function moan_smtp_batch() does not return -
|
|
||||||
it exits from the program with a non-zero return code. */
|
|
||||||
|
|
||||||
- else if (smtp_reply != NULL) moan_smtp_batch(NULL, smtp_reply);
|
|
||||||
+ else if (smtp_reply != NULL) moan_smtp_batch(NULL, "%s", smtp_reply);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Reset headers so that logging of rejects for a subsequent message doesn't
|
|
|
@ -6,13 +6,12 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
PORTNAME= exim
|
PORTNAME= exim
|
||||||
PORTVERSION= 3.22
|
PORTVERSION= 3.30
|
||||||
PORTREVISION= 7
|
|
||||||
CATEGORIES= mail
|
CATEGORIES= mail
|
||||||
MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/ \
|
MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/ \
|
||||||
http://www.exim.org/ftp/ \
|
http://www.exim.org/ftp/ \
|
||||||
ftp://ftp.is.co.za/networking/mail/transport/exim/
|
ftp://ftp.is.co.za/networking/mail/transport/exim/
|
||||||
DISTFILES= exim-3.22.tar.gz exim-texinfo-3.20.tar.gz
|
DISTFILES= exim-3.30.tar.gz exim-texinfo-3.30.tar.gz
|
||||||
|
|
||||||
MAINTAINER= sheldonh@FreeBSD.org
|
MAINTAINER= sheldonh@FreeBSD.org
|
||||||
|
|
||||||
|
@ -167,7 +166,7 @@ do-configure:
|
||||||
${SED} ${SEDLIST} < ${WRKSRC}/src/EDITME > ${WRKSRC}/Local/Makefile
|
${SED} ${SEDLIST} < ${WRKSRC}/src/EDITME > ${WRKSRC}/Local/Makefile
|
||||||
${CP} ${WRKSRC}/exim_monitor/EDITME ${WRKSRC}/Local/eximon.conf
|
${CP} ${WRKSRC}/exim_monitor/EDITME ${WRKSRC}/Local/eximon.conf
|
||||||
cd ${WRKSRC}/doc && \
|
cd ${WRKSRC}/doc && \
|
||||||
for i in ../../exim-texinfo-3.20/doc/* ; do \
|
for i in ../../exim-texinfo-3.30/doc/* ; do \
|
||||||
${LN} -sf $$i ; \
|
${LN} -sf $$i ; \
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
MD5 (exim-3.22.tar.gz) = c0514615d0be1d38c638c50afa2b9405
|
MD5 (exim-3.30.tar.gz) = 401b2f6e75a55114a26f875c0ecb55b2
|
||||||
MD5 (exim-texinfo-3.20.tar.gz) = f8ef4b785e34b0f4b8efed4679c1add0
|
MD5 (exim-texinfo-3.30.tar.gz) = 155ae0ece6c4b50f7c0a8f7d9e2d0944
|
||||||
|
|
|
@ -1,72 +0,0 @@
|
||||||
--- OS/Makefile-Base.orig Mon Jun 11 11:52:54 2001
|
|
||||||
+++ OS/Makefile-Base Mon Jun 11 12:04:56 2001
|
|
||||||
@@ -216,6 +216,9 @@
|
|
||||||
auths/auths.a \
|
|
||||||
$(LIBS) $(LIBS_EXIM) $(IPV6_LIBS) $(EXTRALIBS) $(EXTRALIBS_EXIM) \
|
|
||||||
$(DBMLIB) $(LIBRESOLV) $(LOOKUP_LIBS) $(PERL_LIBS) $(TLS_LIBS)
|
|
||||||
+ if [ x"$(STRIP_COMMAND)" != x"" ]; then \
|
|
||||||
+ $(STRIP_COMMAND) exim; \
|
|
||||||
+ fi
|
|
||||||
$(EXIM_CHMOD)
|
|
||||||
@echo " "
|
|
||||||
@echo ">>> exim binary built"
|
|
||||||
@@ -228,6 +231,9 @@
|
|
||||||
exim_fixdb: $(OBJ_FIXDB)
|
|
||||||
$(CC) $(CFLAGS) $(INCLUDE) -o exim_fixdb $(LFLAGS) $(OBJ_FIXDB) \
|
|
||||||
$(LIBS) $(EXTRALIBS) $(DBMLIB)
|
|
||||||
+ if [ x"$(STRIP_COMMAND)" != x"" ]; then \
|
|
||||||
+ $(STRIP_COMMAND) exim_fixdb; \
|
|
||||||
+ fi
|
|
||||||
@echo " "
|
|
||||||
@echo ">>> exim_fixdb utility built"
|
|
||||||
@echo " "
|
|
||||||
@@ -239,6 +245,9 @@
|
|
||||||
exim_dumpdb: $(OBJ_DUMPDB)
|
|
||||||
$(CC) $(CFLAGS) $(INCLUDE) -o exim_dumpdb $(LFLAGS) $(OBJ_DUMPDB) \
|
|
||||||
$(LIBS) $(EXTRALIBS) $(DBMLIB)
|
|
||||||
+ if [ x"$(STRIP_COMMAND)" != x"" ]; then \
|
|
||||||
+ $(STRIP_COMMAND) exim_dumpdb; \
|
|
||||||
+ fi
|
|
||||||
@echo " "
|
|
||||||
@echo ">>> exim_dumpdb utility built"
|
|
||||||
@echo " "
|
|
||||||
@@ -250,6 +259,9 @@
|
|
||||||
exim_tidydb: $(OBJ_TIDYDB)
|
|
||||||
$(CC) $(CFLAGS) $(INCLUDE) -o exim_tidydb $(LFLAGS) $(OBJ_TIDYDB) \
|
|
||||||
$(LIBS) $(EXTRALIBS) $(DBMLIB)
|
|
||||||
+ if [ x"$(STRIP_COMMAND)" != x"" ]; then \
|
|
||||||
+ $(STRIP_COMMAND) exim_tidydb; \
|
|
||||||
+ fi
|
|
||||||
@echo " "
|
|
||||||
@echo ">>> exim_tidydb utility built"
|
|
||||||
@echo " "
|
|
||||||
@@ -259,6 +271,9 @@
|
|
||||||
exim_dbmbuild: exim_dbmbuild.c config.h
|
|
||||||
$(CC) $(CFLAGS) $(INCLUDE) -o exim_dbmbuild $(LFLAGS) exim_dbmbuild.c \
|
|
||||||
$(LIBS) $(EXTRALIBS) $(DBMLIB)
|
|
||||||
+ if [ x"$(STRIP_COMMAND)" != x"" ]; then \
|
|
||||||
+ $(STRIP_COMMAND) exim_dbmbuild; \
|
|
||||||
+ fi
|
|
||||||
@echo " "
|
|
||||||
@echo ">>> exim_dbmbuild utility built"
|
|
||||||
@echo " "
|
|
||||||
@@ -268,6 +283,9 @@
|
|
||||||
exim_lock: exim_lock.c
|
|
||||||
$(CC) $(CFLAGS) $(INCLUDE) -o exim_lock $(LFLAGS) exim_lock.c \
|
|
||||||
$(LIBS) $(EXTRALIBS)
|
|
||||||
+ if [ x"$(STRIP_COMMAND)" != x"" ]; then \
|
|
||||||
+ $(STRIP_COMMAND) exim_lock; \
|
|
||||||
+ fi
|
|
||||||
@echo " "
|
|
||||||
@echo ">>> exim_lock utility built"
|
|
||||||
@echo " "
|
|
||||||
@@ -290,6 +308,9 @@
|
|
||||||
$(PURIFY) $(CC) -o eximon.bin em_version.o $(LFLAGS) $(XLFLAGS) \
|
|
||||||
$(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 pcre/libpcre.a \
|
|
||||||
$(LIBS) $(LIBS_EXIMON) $(EXTRALIBS) $(EXTRALIBS_EXIMON) -lc
|
|
||||||
+ if [ x"$(STRIP_COMMAND)" != x"" ]; then \
|
|
||||||
+ $(STRIP_COMMAND) eximon.bin; \
|
|
||||||
+ fi
|
|
||||||
@echo " "
|
|
||||||
@echo ">>> exim monitor binary built"
|
|
||||||
@echo " "
|
|
|
@ -1,4 +1,4 @@
|
||||||
This patch makes three changes to the exim_install script:
|
This patch makes two changes to the exim_install script:
|
||||||
|
|
||||||
*) Changes the test used to determine whether a file should be installed
|
*) Changes the test used to determine whether a file should be installed
|
||||||
to cope with files which we "touch" to zero bytes for packaging
|
to cope with files which we "touch" to zero bytes for packaging
|
||||||
|
@ -7,9 +7,6 @@ This patch makes three changes to the exim_install script:
|
||||||
*) Causes the configure file to be installed as a sample only. The
|
*) Causes the configure file to be installed as a sample only. The
|
||||||
administrator needs to rename this file to "activate" exim.
|
administrator needs to rename this file to "activate" exim.
|
||||||
|
|
||||||
*) Fixes the info(1) titles so that, for example ``info exim'' actually
|
|
||||||
enters the exim.info file.
|
|
||||||
|
|
||||||
--- scripts/exim_install.orig Mon Aug 2 17:43:03 1999
|
--- scripts/exim_install.orig Mon Aug 2 17:43:03 1999
|
||||||
+++ scripts/exim_install Tue Aug 3 14:31:20 1999
|
+++ scripts/exim_install Tue Aug 3 14:31:20 1999
|
||||||
@@ -146,9 +146,9 @@
|
@@ -146,9 +146,9 @@
|
||||||
|
@ -56,26 +53,3 @@ This patch makes three changes to the exim_install script:
|
||||||
|
|
||||||
# Install info files if the directory is defined and the Texinfo
|
# Install info files if the directory is defined and the Texinfo
|
||||||
# source documentation is present.
|
# source documentation is present.
|
||||||
@@ -243,19 +238,19 @@
|
|
||||||
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" \
|
|
||||||
+ --entry "* Exim 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}
|
|
||||||
install-info --section="Exim" \
|
|
||||||
- --entry "* User guide: (exim). Exim manual" \
|
|
||||||
+ --entry "* Exim Specification: (exim). Exim manual" \
|
|
||||||
${INFO_DIRECTORY}/exim.info ${INFO_DIRECTORY}/dir
|
|
||||||
makeinfo --no-split --output exim_filter.info ../doc/filter.texinfo
|
|
||||||
echo ${CP} exim_filter.info ${INFO_DIRECTORY}
|
|
||||||
${real} ${CP} exim_filter.info ${INFO_DIRECTORY}
|
|
||||||
install-info --section="Exim" \
|
|
||||||
- --entry "* Filtering: (exim_filter). Filtering mail with Exim" \
|
|
||||||
+ --entry "* Exim Filtering: (exim_filter). Filtering mail with Exim" \
|
|
||||||
${INFO_DIRECTORY}/exim_filter.info ${INFO_DIRECTORY}/dir
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- src/accept.c.orig Mon Jun 11 17:00:24 2001
|
|
||||||
+++ src/accept.c Mon Jun 11 17:01:30 2001
|
|
||||||
@@ -2503,7 +2503,7 @@
|
|
||||||
nothing on success. The function moan_smtp_batch() does not return -
|
|
||||||
it exits from the program with a non-zero return code. */
|
|
||||||
|
|
||||||
- else if (smtp_reply != NULL) moan_smtp_batch(NULL, smtp_reply);
|
|
||||||
+ else if (smtp_reply != NULL) moan_smtp_batch(NULL, "%s", smtp_reply);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Reset headers so that logging of rejects for a subsequent message doesn't
|
|
|
@ -6,13 +6,12 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
PORTNAME= exim
|
PORTNAME= exim
|
||||||
PORTVERSION= 3.22
|
PORTVERSION= 3.30
|
||||||
PORTREVISION= 7
|
|
||||||
CATEGORIES= mail
|
CATEGORIES= mail
|
||||||
MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/ \
|
MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/ \
|
||||||
http://www.exim.org/ftp/ \
|
http://www.exim.org/ftp/ \
|
||||||
ftp://ftp.is.co.za/networking/mail/transport/exim/
|
ftp://ftp.is.co.za/networking/mail/transport/exim/
|
||||||
DISTFILES= exim-3.22.tar.gz exim-texinfo-3.20.tar.gz
|
DISTFILES= exim-3.30.tar.gz exim-texinfo-3.30.tar.gz
|
||||||
|
|
||||||
MAINTAINER= sheldonh@FreeBSD.org
|
MAINTAINER= sheldonh@FreeBSD.org
|
||||||
|
|
||||||
|
@ -167,7 +166,7 @@ do-configure:
|
||||||
${SED} ${SEDLIST} < ${WRKSRC}/src/EDITME > ${WRKSRC}/Local/Makefile
|
${SED} ${SEDLIST} < ${WRKSRC}/src/EDITME > ${WRKSRC}/Local/Makefile
|
||||||
${CP} ${WRKSRC}/exim_monitor/EDITME ${WRKSRC}/Local/eximon.conf
|
${CP} ${WRKSRC}/exim_monitor/EDITME ${WRKSRC}/Local/eximon.conf
|
||||||
cd ${WRKSRC}/doc && \
|
cd ${WRKSRC}/doc && \
|
||||||
for i in ../../exim-texinfo-3.20/doc/* ; do \
|
for i in ../../exim-texinfo-3.30/doc/* ; do \
|
||||||
${LN} -sf $$i ; \
|
${LN} -sf $$i ; \
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
MD5 (exim-3.22.tar.gz) = c0514615d0be1d38c638c50afa2b9405
|
MD5 (exim-3.30.tar.gz) = 401b2f6e75a55114a26f875c0ecb55b2
|
||||||
MD5 (exim-texinfo-3.20.tar.gz) = f8ef4b785e34b0f4b8efed4679c1add0
|
MD5 (exim-texinfo-3.30.tar.gz) = 155ae0ece6c4b50f7c0a8f7d9e2d0944
|
||||||
|
|
|
@ -1,72 +0,0 @@
|
||||||
--- OS/Makefile-Base.orig Mon Jun 11 11:52:54 2001
|
|
||||||
+++ OS/Makefile-Base Mon Jun 11 12:04:56 2001
|
|
||||||
@@ -216,6 +216,9 @@
|
|
||||||
auths/auths.a \
|
|
||||||
$(LIBS) $(LIBS_EXIM) $(IPV6_LIBS) $(EXTRALIBS) $(EXTRALIBS_EXIM) \
|
|
||||||
$(DBMLIB) $(LIBRESOLV) $(LOOKUP_LIBS) $(PERL_LIBS) $(TLS_LIBS)
|
|
||||||
+ if [ x"$(STRIP_COMMAND)" != x"" ]; then \
|
|
||||||
+ $(STRIP_COMMAND) exim; \
|
|
||||||
+ fi
|
|
||||||
$(EXIM_CHMOD)
|
|
||||||
@echo " "
|
|
||||||
@echo ">>> exim binary built"
|
|
||||||
@@ -228,6 +231,9 @@
|
|
||||||
exim_fixdb: $(OBJ_FIXDB)
|
|
||||||
$(CC) $(CFLAGS) $(INCLUDE) -o exim_fixdb $(LFLAGS) $(OBJ_FIXDB) \
|
|
||||||
$(LIBS) $(EXTRALIBS) $(DBMLIB)
|
|
||||||
+ if [ x"$(STRIP_COMMAND)" != x"" ]; then \
|
|
||||||
+ $(STRIP_COMMAND) exim_fixdb; \
|
|
||||||
+ fi
|
|
||||||
@echo " "
|
|
||||||
@echo ">>> exim_fixdb utility built"
|
|
||||||
@echo " "
|
|
||||||
@@ -239,6 +245,9 @@
|
|
||||||
exim_dumpdb: $(OBJ_DUMPDB)
|
|
||||||
$(CC) $(CFLAGS) $(INCLUDE) -o exim_dumpdb $(LFLAGS) $(OBJ_DUMPDB) \
|
|
||||||
$(LIBS) $(EXTRALIBS) $(DBMLIB)
|
|
||||||
+ if [ x"$(STRIP_COMMAND)" != x"" ]; then \
|
|
||||||
+ $(STRIP_COMMAND) exim_dumpdb; \
|
|
||||||
+ fi
|
|
||||||
@echo " "
|
|
||||||
@echo ">>> exim_dumpdb utility built"
|
|
||||||
@echo " "
|
|
||||||
@@ -250,6 +259,9 @@
|
|
||||||
exim_tidydb: $(OBJ_TIDYDB)
|
|
||||||
$(CC) $(CFLAGS) $(INCLUDE) -o exim_tidydb $(LFLAGS) $(OBJ_TIDYDB) \
|
|
||||||
$(LIBS) $(EXTRALIBS) $(DBMLIB)
|
|
||||||
+ if [ x"$(STRIP_COMMAND)" != x"" ]; then \
|
|
||||||
+ $(STRIP_COMMAND) exim_tidydb; \
|
|
||||||
+ fi
|
|
||||||
@echo " "
|
|
||||||
@echo ">>> exim_tidydb utility built"
|
|
||||||
@echo " "
|
|
||||||
@@ -259,6 +271,9 @@
|
|
||||||
exim_dbmbuild: exim_dbmbuild.c config.h
|
|
||||||
$(CC) $(CFLAGS) $(INCLUDE) -o exim_dbmbuild $(LFLAGS) exim_dbmbuild.c \
|
|
||||||
$(LIBS) $(EXTRALIBS) $(DBMLIB)
|
|
||||||
+ if [ x"$(STRIP_COMMAND)" != x"" ]; then \
|
|
||||||
+ $(STRIP_COMMAND) exim_dbmbuild; \
|
|
||||||
+ fi
|
|
||||||
@echo " "
|
|
||||||
@echo ">>> exim_dbmbuild utility built"
|
|
||||||
@echo " "
|
|
||||||
@@ -268,6 +283,9 @@
|
|
||||||
exim_lock: exim_lock.c
|
|
||||||
$(CC) $(CFLAGS) $(INCLUDE) -o exim_lock $(LFLAGS) exim_lock.c \
|
|
||||||
$(LIBS) $(EXTRALIBS)
|
|
||||||
+ if [ x"$(STRIP_COMMAND)" != x"" ]; then \
|
|
||||||
+ $(STRIP_COMMAND) exim_lock; \
|
|
||||||
+ fi
|
|
||||||
@echo " "
|
|
||||||
@echo ">>> exim_lock utility built"
|
|
||||||
@echo " "
|
|
||||||
@@ -290,6 +308,9 @@
|
|
||||||
$(PURIFY) $(CC) -o eximon.bin em_version.o $(LFLAGS) $(XLFLAGS) \
|
|
||||||
$(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 pcre/libpcre.a \
|
|
||||||
$(LIBS) $(LIBS_EXIMON) $(EXTRALIBS) $(EXTRALIBS_EXIMON) -lc
|
|
||||||
+ if [ x"$(STRIP_COMMAND)" != x"" ]; then \
|
|
||||||
+ $(STRIP_COMMAND) eximon.bin; \
|
|
||||||
+ fi
|
|
||||||
@echo " "
|
|
||||||
@echo ">>> exim monitor binary built"
|
|
||||||
@echo " "
|
|
|
@ -1,4 +1,4 @@
|
||||||
This patch makes three changes to the exim_install script:
|
This patch makes two changes to the exim_install script:
|
||||||
|
|
||||||
*) Changes the test used to determine whether a file should be installed
|
*) Changes the test used to determine whether a file should be installed
|
||||||
to cope with files which we "touch" to zero bytes for packaging
|
to cope with files which we "touch" to zero bytes for packaging
|
||||||
|
@ -7,9 +7,6 @@ This patch makes three changes to the exim_install script:
|
||||||
*) Causes the configure file to be installed as a sample only. The
|
*) Causes the configure file to be installed as a sample only. The
|
||||||
administrator needs to rename this file to "activate" exim.
|
administrator needs to rename this file to "activate" exim.
|
||||||
|
|
||||||
*) Fixes the info(1) titles so that, for example ``info exim'' actually
|
|
||||||
enters the exim.info file.
|
|
||||||
|
|
||||||
--- scripts/exim_install.orig Mon Aug 2 17:43:03 1999
|
--- scripts/exim_install.orig Mon Aug 2 17:43:03 1999
|
||||||
+++ scripts/exim_install Tue Aug 3 14:31:20 1999
|
+++ scripts/exim_install Tue Aug 3 14:31:20 1999
|
||||||
@@ -146,9 +146,9 @@
|
@@ -146,9 +146,9 @@
|
||||||
|
@ -56,26 +53,3 @@ This patch makes three changes to the exim_install script:
|
||||||
|
|
||||||
# Install info files if the directory is defined and the Texinfo
|
# Install info files if the directory is defined and the Texinfo
|
||||||
# source documentation is present.
|
# source documentation is present.
|
||||||
@@ -243,19 +238,19 @@
|
|
||||||
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" \
|
|
||||||
+ --entry "* Exim 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}
|
|
||||||
install-info --section="Exim" \
|
|
||||||
- --entry "* User guide: (exim). Exim manual" \
|
|
||||||
+ --entry "* Exim Specification: (exim). Exim manual" \
|
|
||||||
${INFO_DIRECTORY}/exim.info ${INFO_DIRECTORY}/dir
|
|
||||||
makeinfo --no-split --output exim_filter.info ../doc/filter.texinfo
|
|
||||||
echo ${CP} exim_filter.info ${INFO_DIRECTORY}
|
|
||||||
${real} ${CP} exim_filter.info ${INFO_DIRECTORY}
|
|
||||||
install-info --section="Exim" \
|
|
||||||
- --entry "* Filtering: (exim_filter). Filtering mail with Exim" \
|
|
||||||
+ --entry "* Exim Filtering: (exim_filter). Filtering mail with Exim" \
|
|
||||||
${INFO_DIRECTORY}/exim_filter.info ${INFO_DIRECTORY}/dir
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- src/accept.c.orig Mon Jun 11 17:00:24 2001
|
|
||||||
+++ src/accept.c Mon Jun 11 17:01:30 2001
|
|
||||||
@@ -2503,7 +2503,7 @@
|
|
||||||
nothing on success. The function moan_smtp_batch() does not return -
|
|
||||||
it exits from the program with a non-zero return code. */
|
|
||||||
|
|
||||||
- else if (smtp_reply != NULL) moan_smtp_batch(NULL, smtp_reply);
|
|
||||||
+ else if (smtp_reply != NULL) moan_smtp_batch(NULL, "%s", smtp_reply);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Reset headers so that logging of rejects for a subsequent message doesn't
|
|
Loading…
Add table
Reference in a new issue