[packages/exim/AC-branch] - up to 4.82; disable dsn support (not maintained)
arekm
arekm at pld-linux.org
Thu May 15 11:30:25 CEST 2014
commit 7637fb8ae3ddee0840edcabcefcd5b96f021792d
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu May 15 11:30:19 2014 +0200
- up to 4.82; disable dsn support (not maintained)
exim-force-sigalrm.patch | 14 +++++++-------
exim.spec | 13 ++++++-------
exim4-EDITME.patch | 27 +++++++++++++++++++++------
exim4-cflags.patch | 13 +++++++------
4 files changed, 41 insertions(+), 26 deletions(-)
---
diff --git a/exim.spec b/exim.spec
index 43781d8..7d4ea91 100644
--- a/exim.spec
+++ b/exim.spec
@@ -8,20 +8,21 @@
%bcond_without ldap # without LDAP support
%bcond_without spf # without spf support
%bcond_without srs # without srs support
+%bcond_with dsn # DSN 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.75
+Version: 4.82
Release: 1
Epoch: 2
License: GPL
Group: Networking/Daemons/SMTP
Source0: ftp://ftp.exim.org/pub/exim/exim4/%{name}-%{version}.tar.bz2
-# Source0-md5: 427fb74bbd2afbea759e6da38f25af17
+# Source0-md5: feb933baa4db773c2ef76b794c60b647
Source1: ftp://ftp.exim.org/pub/exim/exim4/%{name}-html-%{version}.tar.bz2
-# Source1-md5: 51744a0fc94ef403cb049dfc9f059ada
+# Source1-md5: 072326f172ddbda684ba5cc8bc85e0aa
Source2: %{name}.init
Source3: %{name}.cron.db
Source4: %{name}4.conf
@@ -34,8 +35,7 @@ Source9: %{name}.aliases
Source10: newaliases
Source11: %{name}.logrotate
Source12: %{name}.sysconfig
-Source13: ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/FAQ.txt.bz2
-# Source13-md5: ff781bd31fb1d574c8b9d33f4bfd34a7
+
Source14: ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/config.samples.tar.bz2
# Source14-md5: 4b93321938a800caa6127c48ad60a42b
Source15: %{name}4-smtp.pamd
@@ -160,12 +160,11 @@ Pliki nagłówkowe dla Exima.
%patch4 -p1
%patch5 -p1
#%patch6 -p1
-%patch7 -p1
+%{?with_dsn:%patch7 -p1}
%patch8 -p1
#%patch9 -p0
%patch10 -p1
-install %{SOURCE13} doc/FAQ.txt.bz2
install %{SOURCE14} doc/config.samples.tar.bz2
install -d Local
diff --git a/exim-force-sigalrm.patch b/exim-force-sigalrm.patch
index c9e93f8..c211cf0 100644
--- a/exim-force-sigalrm.patch
+++ b/exim-force-sigalrm.patch
@@ -18,15 +18,15 @@
/* Enter the never-ending loop... */
for (;;)
-@@ -1624,6 +1626,8 @@
- {
- DEBUG(D_any) debug_printf("SIGALRM received\n");
+@@ -1753,6 +1753,8 @@
+ {
+ DEBUG(D_any) debug_printf("SIGALRM received\n");
-+ time(&sigalrm_seen_last);
++ time(&sigalrm_seen_last);
+
- /* Do a full queue run in a child process, if required, unless we already
- have enough queue runners on the go. If we are not running as root, a
- re-exec is required. */
+ /* Do a full queue run in a child process, if required, unless we already
+ have enough queue runners on the go. If we are not running as root, a
+ re-exec is required. */
@@ -1885,11 +1889,19 @@
else
diff --git a/exim4-EDITME.patch b/exim4-EDITME.patch
index e2ffec7..70f9236 100644
--- a/exim4-EDITME.patch
+++ b/exim4-EDITME.patch
@@ -96,7 +96,7 @@ diff -urN exim-4.64.org/src/EDITME exim-4.64/src/EDITME
#------------------------------------------------------------------------------
# Compiling Exim with experimental features. These are documented in
-@@ -473,11 +474,11 @@
+@@ -579,15 +579,15 @@
# included in the Exim binary. You will then need to set up the run time
# configuration to make use of the mechanism(s) selected.
@@ -104,27 +104,42 @@ diff -urN exim-4.64.org/src/EDITME exim-4.64/src/EDITME
+AUTH_CRAM_MD5=yes
# AUTH_CYRUS_SASL=yes
-# AUTH_DOVECOT=yes
++AUTH_DOVECOT=yes
+ # AUTH_GSASL=yes
+ # AUTH_GSASL_PC=libgsasl
+ # AUTH_HEIMDAL_GSSAPI=yes
+ # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi
-# AUTH_PLAINTEXT=yes
-# AUTH_SPA=yes
-+AUTH_DOVECOT=yes
+AUTH_PLAINTEXT=yes
+AUTH_SPA=yes
#------------------------------------------------------------------------------
-@@ -576,10 +577,10 @@
+@@ -610,7 +610,7 @@
+ # one that is set in the headers_charset option. The default setting is
+ # defined by this setting:
+
+-HEADERS_CHARSET="ISO-8859-1"
++HEADERS_CHARSET="UTF-8"
+
+ # If you are going to make use of $header_xxx expansions in your configuration
+ # file, or if your users are going to use them in filter files, and the normal
+@@ -690,11 +690,11 @@
# leave these settings commented out.
# This setting is required for any TLS support (either OpenSSL or GnuTLS)
-# SUPPORT_TLS=yes
+SUPPORT_TLS=yes
- # Uncomment this setting if you are using OpenSSL
+ # Uncomment one of these settings if you are using OpenSSL; pkg-config vs not
+-# USE_OPENSSL_PC=openssl
-# TLS_LIBS=-lssl -lcrypto
++USE_OPENSSL_PC=openssl
+TLS_LIBS=-lssl -lcrypto
- # Uncomment these settings if you are using GnuTLS
- # USE_GNUTLS=yes
+ # Uncomment the first and either the second or the third of these if you
+ # are using GnuTLS. If you have pkg-config, then the second, else the third.
@@ -630,7 +631,7 @@
# Once you have done this, "make install" will build the info files and
# install them in the directory you have defined.
diff --git a/exim4-cflags.patch b/exim4-cflags.patch
index 14ad870..aa265dc 100644
--- a/exim4-cflags.patch
+++ b/exim4-cflags.patch
@@ -1,12 +1,13 @@
diff -urN exim-4.60.org/OS/Makefile-Linux exim-4.60/OS/Makefile-Linux
--- exim-4.60.org/OS/Makefile-Linux 2005-11-28 11:57:32.000000000 +0100
+++ exim-4.60/OS/Makefile-Linux 2006-02-17 20:17:00.698452750 +0100
-@@ -9,7 +9,7 @@
- CHOWN_COMMAND=look_for_it
- CHGRP_COMMAND=look_for_it
+@@ -13,7 +13,7 @@
+ CHMOD_COMMAND=look_for_it
--CFLAGS=-O -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-+CFLAGS=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $(CUSTOM_CFLAGS)
- CFLAGS_DYNAMIC=-shared -rdynamic
+ # Preserve CFLAGS and CFLAGS_DYNAMIC from the caller/environment
+-CFLAGS ?= -O -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
++CFLAGS ?= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $(CUSTOM_CFLAGS)
+ CFLAGS_DYNAMIC ?= -shared -rdynamic
DBMLIB = -ldb
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/exim.git/commitdiff/7637fb8ae3ddee0840edcabcefcd5b96f021792d
More information about the pld-cvs-commit
mailing list