pool/exim
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to 4.70

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/server:mail/exim?expand=0&rev=82
This commit is contained in:
Peter Poeml 2009-11-14 11:21:14 +00:00 committed by Git OBS Bridge
parent 119fc19e82
commit e6c4891501
6 changed files with 25 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
exim-4.60-external-pcre.diff
View File

@ -1,71 +0,0 @@
diff -uNr exim-4.60.orig/exim_monitor/em_hdr.h exim-4.60/exim_monitor/em_hdr.h
--- exim-4.60.orig/exim_monitor/em_hdr.h 2005-11-28 11:57:32.000000000 +0100
+++ exim-4.60/exim_monitor/em_hdr.h 2006-03-24 08:30:25.497181713 +0100
@@ -87,7 +87,7 @@
/* Regular expression include */
-#include "pcre/pcre.h"
+#include <pcre.h>
/* Includes from the main source of Exim. We need to have MAXPACKET defined for
the benefit of structs.h. One of these days I should tidy up this interface so
diff -uNr exim-4.60.orig/OS/Makefile-Base exim-4.60/OS/Makefile-Base
--- exim-4.60.orig/OS/Makefile-Base 2005-11-28 11:57:32.000000000 +0100
+++ exim-4.60/OS/Makefile-Base 2006-03-24 08:31:33.352339217 +0100
@@ -103,7 +103,7 @@
# 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; \
diff -uNr exim-4.60.orig/src/exim.h exim-4.60/src/exim.h
--- exim-4.60.orig/src/exim.h 2005-11-28 11:57:32.000000000 +0100
+++ exim-4.60/src/exim.h 2006-03-24 08:30:25.515178572 +0100
@@ -414,7 +414,7 @@
/* The header from the PCRE regex package */
-#include "pcre/pcre.h"
+#include <pcre.h>
/* Exim includes are in several files. Note that local_scan.h #includes
config.h, mytypes.h, and store.h, so we don't need to mention them explicitly.

11
exim-4.69-overflow.patch
View File

@ -1,11 +0,0 @@
--- src/daemon.c
+++ src/daemon.c
@@ -1661,7 +1661,7 @@
{
uschar opt[8];
uschar *p = opt;
- uschar *extra[4];
+ uschar *extra[5];
int extracount = 1;
signal(SIGALRM, SIG_DFL);

3
exim-4.69.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:18e856cfdb682ba8e8ccb943ab538734d34d0ecefd63465ecc5430bc15915069
size 1658939

3
exim-4.70.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:528782809f877619265b5bf971c3fd20626ef633eb8fce6d4deb3b9c0b56d667
size 1560329

20
exim.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Sat Nov 14 10:54:59 UTC 2009 - poeml@cmdline.net
- update to 4.70
This release is a combination feature and bug fix release.
The major new features are:-
* Native DKIM support without an external library.
* Experimental DCC support via dccifd (contributed by Wolfgang Breyha).
Other changes:-
* PCRE is no longer included with the Exim distribution. You will
need a separate PCRE library (and matching headers) to compile
Exim. You will need to change your Local/Makefile to support
this. Most modern systems have a packaged PCRE library,
alternatively PCRE can be found at http://www.pcre.org/
* Experimental Yahoo! Domainkeys support dropped in favor of
native DKIM support.
* The documentation has been updated and regenerated.
As usual, all changes are in the doc/ChangeLog file:
http://vcs.exim.org/viewvc/exim/exim-doc/doc-txt/ChangeLog?view=markup&pathrev=exim_4_70
-------------------------------------------------------------------
Tue Jun 9 17:47:56 CEST 2009 - poeml@suse.de

8
exim.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package exim (Version 4.69)
# spec file for package exim (Version 4.70)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -37,7 +37,7 @@ Provides: smtp_daemon
Requires: logrotate
PreReq: %insserv_prereq %fillup_prereq /usr/sbin/useradd fileutils textutils
%endif
Version: 4.69
Version: 4.70
Release: 1
Summary: The Exim Mail Transfer Agent, a Replacement for sendmail
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -51,8 +51,6 @@ Source20: http://www.logic.univie.ac.at/~ametzler/debian/exim4manpages/exi
Source30: eximstats-html-update.py
Source31: eximstats.conf
Patch: exim-4.12-tail.patch
Patch1: exim-4.69-overflow.patch
Patch2: exim-4.60-external-pcre.diff
%if !%{?build_with_mysql:1}0
%package -n eximon
@ -117,8 +115,6 @@ Authors:
%prep
%setup -q -n exim-%{version}
%patch
%patch1
%patch2 -p1
# build with fPIE/pie on SUSE 10.0 or newer, or on any other platform
%if %{?suse_version:%suse_version}%{?!suse_version:99999} > 930
fPIE="-fPIE"