update to new version 4.64

ok mbalmer@
This commit is contained in:
fkr 2006-12-28 12:44:13 +00:00
parent b1844cb460
commit f5e398ecff
5 changed files with 9 additions and 64 deletions

View File

@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.57 2006/11/09 07:13:01 fkr Exp $
# $OpenBSD: Makefile,v 1.58 2006/12/28 12:44:13 fkr Exp $
COMMENT= "Flexible mail transfer agent"
DISTNAME= exim-4.63
PKGNAME= ${DISTNAME}p1
DISTNAME= exim-4.64
CATEGORIES= mail
MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ \
http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/ \

View File

@ -1,4 +1,4 @@
MD5 (exim-4.63.tar.gz) = 187b6f4242f869288fb4562df44d9c29
RMD160 (exim-4.63.tar.gz) = 8c51efb20dab3787e5b0b8b2a196d5d879ed4843
SHA1 (exim-4.63.tar.gz) = eb729a491ac315de805be4d59adc7a8854456fa9
SIZE (exim-4.63.tar.gz) = 2066186
MD5 (exim-4.64.tar.gz) = 65a0189ade98bed1989df2d006769332
RMD160 (exim-4.64.tar.gz) = 026b376f9fcf99b219b72791d601eea043b5bfa2
SHA1 (exim-4.64.tar.gz) = b8e3d995979cb3684ef37b7953c03fd7c5ec0d35
SIZE (exim-4.64.tar.gz) = 2077268

View File

@ -6,7 +6,7 @@
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.63
+ version=exim-4.64
if [ "${version}" = "exim-${EXE}" ]; then
echo $com ""

View File

@ -1,54 +0,0 @@
--- src/pcre/pcre.c.orig Mon Nov 28 11:57:32 2005
+++ src/pcre/pcre.c Tue Nov 29 11:57:24 2005
@@ -1247,14 +1247,30 @@
int min = 0;
int max = -1;
+/* Read the minimum value and do a paranoid check: a negative value indicates
+an integer overflow. */
+
while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - '0';
+if (min < 0 || min > 65535)
+ {
+ *errorptr = ERR5;
+ return p;
+ }
+/* Read the maximum value if there is one, and again do a paranoid on its size.
+Also, max must not be less than min. */
+
if (*p == '}') max = min; else
{
if (*(++p) != '}')
{
max = 0;
while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - '0';
+ if (max < 0 || max > 65535)
+ {
+ *errorptr = ERR5;
+ return p;
+ }
if (max < min)
{
*errorptr = ERR4;
@@ -1263,16 +1279,11 @@
}
}
-/* Do paranoid checks, then fill in the required variables, and pass back the
-pointer to the terminating '}'. */
+/* Fill in the required variables, and pass back the pointer to the terminating
+'}'. */
-if (min > 65535 || max > 65535)
- *errorptr = ERR5;
-else
- {
- *minp = min;
- *maxp = max;
- }
+*minp = min;
+*maxp = max;
return p;
}

View File

@ -1,11 +1,11 @@
@comment $OpenBSD: PLIST,v 1.18 2006/11/09 07:13:01 fkr Exp $
@comment $OpenBSD: PLIST,v 1.19 2006/12/28 12:44:13 fkr Exp $
@newgroup _exim:521
@newuser _exim:521:_exim:daemon:Exim Account:/var/spool/exim:/sbin/nologin
bin/exicyclog
bin/exigrep
bin/exim
@mode 4755
bin/exim-4.63
bin/exim-4.64
@mode
bin/exim_checkaccess
bin/exim_dbmbuild