+++ /dev/null
-commit beffd0f44d8018be15af4f6159a7cf589f062eb5
-Author: fanf2 <fanf2>
-Date: Mon Jan 28 18:24:07 2008 +0000
-
- Bugzilla 662: Fix stack corruption before exec() in daemon.c.
-
-diff --git a/src/daemon.c b/src/daemon.c
-index 4b8ca4d..427ef41 100644
---- a/src/daemon.c
-+++ b/src/daemon.c
-@@ -1,4 +1,4 @@
--/* $Cambridge: exim/exim-src/src/daemon.c,v 1.24 2007/06/27 11:01:51 ph10 Exp $ */
-+/* $Cambridge: exim/exim-src/src/daemon.c,v 1.25 2008/01/28 18:24:07 fanf2 Exp $ */
-
- /*************************************************
- * Exim - an Internet mail transport agent *
-@@ -1661,7 +1661,7 @@ for (;;)
- {
- uschar opt[8];
- uschar *p = opt;
-- uschar *extra[4];
-+ uschar *extra[5];
- int extracount = 1;
-
- signal(SIGALRM, SIG_DFL);
-commit d825f0e6652a97b194daf4bc8b8eae445f770a0d
-Author: nm4 <nm4>
-Date: Fri Dec 12 14:36:37 2008 +0000
-
- Buffer overrun fix. fixes: bug #787
-
-diff --git a/src/string.c b/src/string.c
-index 7f2447b..ef39cac 100644
---- a/src/string.c
-+++ b/src/string.c
-@@ -1,4 +1,4 @@
--/* $Cambridge: exim/exim-src/src/string.c,v 1.13 2007/02/26 14:07:04 ph10 Exp $ */
-+/* $Cambridge: exim/exim-src/src/string.c,v 1.14 2008/12/12 14:36:37 nm4 Exp $ */
-
- /*************************************************
- * Exim - an Internet mail transport agent *
-@@ -1267,10 +1267,17 @@ while (*fp != 0)
- not OK, add part of the string (debugging uses this to show as
- much as possible). */
-
-+ if (p == last)
-+ {
-+ yield = FALSE;
-+ goto END_FORMAT;
-+ }
- if (p >= last - width)
- {
- yield = FALSE;
- width = precision = last - p - 1;
-+ if (width < 0) width = 0;
-+ if (precision < 0) precision = 0;
- }
- sprintf(CS p, "%*.*s", width, precision, s);
- if (fp[-1] == 'S')
%bcond_without ldap # without LDAP support
%bcond_without spf # without spf support
%bcond_without srs # without srs support
-%bcond_without dkeys # without domainkeys support
#
Summary: University of Cambridge Mail Transfer Agent
Summary(pl.UTF-8): Agent Transferu Poczty Uniwersytetu w Cambridge
Summary(pt_BR.UTF-8): Servidor de correio eletrônico exim
Name: exim
-Version: 4.69
-Release: 10
+Version: 4.70
+Release: 1
Epoch: 2
License: GPL
Group: Networking/Daemons/SMTP
-Source0: ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/%{name}-%{version}.tar.bz2
-# Source0-md5: 6f29f073328c858d8554b08cc0c3c2be
-Source1: ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/%{name}-texinfo-%{version}.tar.bz2
-# Source1-md5: effde5ffe1861bd9eb33d300590a06aa
+Source0: ftp://ftp.exim.org/pub/exim/exim4/%{name}-%{version}.tar.bz2
+# Source0-md5: 30e77669ee25e3606da74b0ff88daf83
+Source1: ftp://ftp.exim.org/pub/exim/exim4/%{name}-texinfo-%{version}.tar.bz2
+# Source1-md5: 7956b0931e4b4035a693544782402abf
Source2: %{name}.init
Source3: %{name}.cron.db
Source4: %{name}4.conf
Patch0: %{name}4-EDITME.patch
Patch1: %{name}4-monitor-EDITME.patch
Patch2: %{name}4-cflags.patch
-Patch3: %{name}4-use_system_pcre.patch
Patch4: %{name}4-Makefile-Default.patch
# http://marc.merlins.org/linux/exim/files/sa-exim-cvs/localscan_dlopen_exim_4.20_or_better.patch
Patch5: localscan_dlopen_%{name}_4.20_or_better.patch
# http://sourceforge.net/projects/eximdsn/
Patch7: %{name}_463_dsn_1_3.patch
Patch8: %{name}-spam-timeout.patch
-Patch9: %{name}-fixes.patch
Patch10: %{name}-force-sigalrm.patch
URL: http://www.exim.org/
%{?with_sasl:BuildRequires: cyrus-sasl-devel >= 2.1.0}
BuildRequires: db-devel
-%{?with_dkeys:BuildRequires: libdomainkeys-devel >= 0.68}
%{?with_spf:BuildRequires: libspf2-devel >= 1.2.5-2}
%{?with_srs:BuildRequires: libsrs_alt-devel >= 1.0}
%{?with_mysql:BuildRequires: mysql-devel}
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
-%patch9 -p1
%patch10 -p1
install %{SOURCE13} doc/FAQ.txt.bz2
%{__make} -j1 \
FULLECHO='' \
CC="%{__cc}" \
- CUSTOM_CFLAGS="%{rpmcppflags} %{rpmcflags} -DSUPPORT_DSN=yes %{?with_spf:-DEXPERIMENTAL_SPF=yes} %{?with_srs:-DEXPERIMENTAL_SRS=yes} %{?with_dkeys:-DEXPERIMENTAL_DOMAINKEYS=yes}" \
+ CUSTOM_CFLAGS="%{rpmcppflags} %{rpmcflags} -DSUPPORT_DSN=yes %{?with_spf:-DEXPERIMENTAL_SPF=yes} %{?with_srs:-DEXPERIMENTAL_SRS=yes}" \
LOOKUP_CDB=yes \
XLFLAGS=-L%{_prefix}/X11R6/%{_lib} \
X11_LD_LIB=%{_prefix}/X11R6/%{_lib} \
%{?with_whoson:LOOKUP_WHOSON=yes} \
%{?with_sasl:AUTH_CYRUS_SASL=yes} \
%{?with_ldap:LOOKUP_LDAP=yes LDAP_LIB_TYPE=OPENLDAP2} \
- LOOKUP_LIBS="%{?with_ldap:-lldap -llber} %{?with_mysql:-lmysqlclient} %{?with_pgsql:-lpq} %{?with_sqlite:-lsqlite3} %{?with_whoson:-lwhoson} %{?with_spf:-lspf2} %{?with_srs:-lsrs_alt} %{?with_sasl:-lsasl2} %{?with_dkeys:-ldomainkeys}" \
+ LOOKUP_LIBS="%{?with_ldap:-lldap -llber} %{?with_mysql:-lmysqlclient} %{?with_pgsql:-lpq} %{?with_sqlite:-lsqlite3} %{?with_whoson:-lwhoson} %{?with_spf:-lspf2} %{?with_srs:-lsrs_alt} %{?with_sasl:-lsasl2}" \
LOOKUP_INCLUDE="%{?with_mysql:-I%{_includedir}/mysql} %{?with_pgsql:-I%{_includedir}/pgsql}"
makeinfo --force -o exim_filtering.info exim-texinfo-*/doc/filter.texinfo
# If you set STRIP_COMMAND to the path of the "strip" command, it will be run
-@@ -40,8 +40,8 @@
+@@ -40,12 +40,12 @@
# Some of the following commands live in different places in different OS. We
# include them all here for generality.
-CHOWN_COMMAND=/usr/bin/chown
-CHGRP_COMMAND=/usr/bin/chgrp
+-CHMOD_COMMAND=/usr/bin/chmod
+CHOWN_COMMAND=/bin/chown
+CHGRP_COMMAND=/bin/chgrp
++CHMOD_COMMAND=/bin/chmod
MV_COMMAND=/bin/mv
RM_COMMAND=/bin/rm
+-TOUCH_COMMAND=/usr/bin/touch
++TOUCH_COMMAND=/bin/touch
+
+ # Some operating systems have different ways of building libraries of
@@ -175,7 +175,7 @@
# parameters for include and library directories that may be needed for IPv6 on
# some systems, where the support is not yet in the standard library.
+++ /dev/null
-diff -urN exim-4.52.org/OS/Makefile-Base exim-4.52/OS/Makefile-Base
---- exim-4.52.org/OS/Makefile-Base 2005-07-01 13:09:15.000000000 +0200
-+++ exim-4.52/OS/Makefile-Base 2005-07-01 20:03:16.409615448 +0200
-@@ -96,14 +96,14 @@
- # therefore always be run, even if the files exist. This shouldn't in fact be a
- # problem, but it does no harm. Other make programs will just ignore this.
-
--.PHONY: all allexim buildauths buildlookups buildpcre buildrouters \
-+.PHONY: all allexim buildauths buildlookups buildrouters \
- buildtransports checklocalmake clean
-
-
- # This is the real default target for all the various exim binaries and
- # scripts, once the configuring stuff is done.
-
--allexim: config.h buildpcre $(EXIM_MONITOR) exicyclog exinext exiwhat \
-+allexim: config.h $(EXIM_MONITOR) exicyclog exinext exiwhat \
- exigrep eximstats exipick exiqgrep exiqsumm \
- transport-filter.pl convert4r3 convert4r4 \
- exim_checkaccess \
-@@ -314,7 +314,7 @@
- local_scan.o $(EXIM_PERL) $(OBJ_WITH_CONTENT_SCAN) \
- $(OBJ_WITH_OLD_DEMIME) $(OBJ_EXPERIMENTAL)
-
--exim: pcre/libpcre.a lookups/lookups.a auths/auths.a \
-+exim: lookups/lookups.a auths/auths.a \
- routers/routers.a transports/transports.a \
- $(OBJ_EXIM) version.c
- @echo " "
-@@ -325,7 +325,7 @@
- rm -f exim
- @echo "$(LNCC) -o exim"
- $(FE)$(PURIFY) $(LNCC) -o exim $(LFLAGS) $(OBJ_EXIM) version.o \
-- pcre/libpcre.a \
-+ -lpcre \
- routers/routers.a transports/transports.a lookups/lookups.a \
- auths/auths.a \
- $(LIBRESOLV) $(LIBS) $(LIBS_EXIM) $(IPV6_LIBS) $(EXTRALIBS) \
-@@ -429,14 +429,14 @@
-
- OBJ_MONBIN = util-spool_in.o util-store.o util-string.o tod.o tree.o $(MONBIN)
-
--eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) pcre/libpcre.a \
-+eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) \
- ../exim_monitor/em_version.c
- @echo "$(CC) exim_monitor/em_version.c"
- $(FE)$(CC) -o em_version.o -c \
- $(CFLAGS) $(XINCLUDE) -I. ../exim_monitor/em_version.c
- @echo "$(LNCC) -o eximon.bin"
- $(FE)$(PURIFY) $(LNCC) -o eximon.bin em_version.o $(LFLAGS) $(XLFLAGS) \
-- $(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 pcre/libpcre.a \
-+ $(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 -lpcre \
- $(LIBS) $(LIBS_EXIMON) $(EXTRALIBS) $(EXTRALIBS_EXIMON) -lc
- @if [ x"$(STRIP_COMMAND)" != x"" ]; then \
- echo $(STRIP_COMMAND) eximon.bin; \
projects / packages / exim.git / commitdiff