From bc1cae7e1aa4aac813bd50d93bef7b5a1fea213ef795f4187f6a28eb0f6d9f01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Mon, 3 Oct 2016 16:20:54 +0000 Subject: [PATCH] Accepting request 384144 from home:conecenter:rev5a1:ontology:services--c:mail--o:mta--f - Makefile tuning: + add sqlite support + disable WITH_OLD_DEMIME + enable AUTH_CYRUS_SASL + enable AUTH_TLS + enable SYSLOG_LONG_LINES + enable SUPPORT_PAM + MAX_NAMED_LIST=64 + enable EXPERIMENTAL_DMARC + enable EXPERIMENTAL_EVENT + enable EXPERIMENTAL_PROXY + enable EXPERIMENTAL_CERTNAMES + enable EXPERIMENTAL_DSN + enable EXPERIMENTAL_DANE + enable EXPERIMENTAL_SOCKS + enable EXPERIMENTAL_INTERNATIONAL OBS-URL: https://build.opensuse.org/request/show/384144 OBS-URL: https://build.opensuse.org/package/show/server:mail/exim?expand=0&rev=181 --- exim.changes | 20 ++++++++++++++++++++ exim.spec | 40 ++++++++++++++++++++++++++++++++-------- 2 files changed, 52 insertions(+), 8 deletions(-) diff --git a/exim.changes b/exim.changes index 815e29a..586add7 100644 --- a/exim.changes +++ b/exim.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Mon Apr 4 15:55:31 UTC 2016 - e.istomin@edss.ee + +- Makefile tuning: + + add sqlite support + + disable WITH_OLD_DEMIME + + enable AUTH_CYRUS_SASL + + enable AUTH_TLS + + enable SYSLOG_LONG_LINES + + enable SUPPORT_PAM + + MAX_NAMED_LIST=64 + + enable EXPERIMENTAL_DMARC + + enable EXPERIMENTAL_EVENT + + enable EXPERIMENTAL_PROXY + + enable EXPERIMENTAL_CERTNAMES + + enable EXPERIMENTAL_DSN + + enable EXPERIMENTAL_DANE + + enable EXPERIMENTAL_SOCKS + + enable EXPERIMENTAL_INTERNATIONAL + ------------------------------------------------------------------- Wed Mar 2 21:05:04 UTC 2016 - lmuelle@suse.com diff --git a/exim.spec b/exim.spec index b966c17..0f23066 100644 --- a/exim.spec +++ b/exim.spec @@ -18,12 +18,15 @@ %bcond_without mysql %bcond_without pgsql +%bcond_without sqlite %bcond_without ldap Name: exim BuildRequires: cyrus-sasl-devel BuildRequires: db-devel +BuildRequires: libidn-devel BuildRequires: libspf2-devel +BuildRequires: pam-devel %if %{with_ldap} BuildRequires: openldap2-devel %endif @@ -62,6 +65,9 @@ BuildRequires: mysql-devel %if %{with_pgsql} BuildRequires: postgresql-devel %endif +%if %{with_sqlite} +BuildRequires: sqlite3-devel +%endif Summary: The Exim Mail Transfer Agent, a Replacement for sendmail License: GPL-2.0+ Group: Productivity/Networking/Email/Servers @@ -166,16 +172,15 @@ cat <<-EOF > Local/Makefile %endif %if %{with_pgsql} LOOKUP_PGSQL=yes +%endif +%if %{with_sqlite} + LOOKUP_SQLITE=yes %endif LOOKUP_NIS=yes # LOOKUP_NISPLUS=yes - # LOOKUP_ORACLE=yes LOOKUP_PASSWD=yes - # LOOKUP_PGSQL=yes # LOOKUP_WHOSON=yes CYRUS_SASLAUTHD_SOCKET=/var/run/sasl2/mux - # LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include - # LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq LOOKUP_LIBS=-llber %if %{with_ldap} LDAP_LIB_TYPE=OPENLDAP2 @@ -188,24 +193,32 @@ cat <<-EOF > Local/Makefile %if %{with_pgsql} LOOKUP_INCLUDE+=-I /usr/include/pgsql LOOKUP_LIBS+=-lpq +%endif +%if %{with_sqlite} + LOOKUP_INCLUDE+=-I /usr/include/sqlite3 + LOOKUP_LIBS+=-lsqlite3 %endif EXIM_MONITOR=eximon.bin WITH_CONTENT_SCAN=yes - WITH_OLD_DEMIME=yes + #WITH_OLD_DEMIME=yes AUTH_CRAM_MD5=yes + AUTH_CYRUS_SASL=yes AUTH_PLAINTEXT=yes AUTH_SPA=yes AUTH_DOVECOT=yes + AUTH_TLS=yes + AUTH_LIBS=-lsasl2 SUPPORT_TLS=yes TLS_LIBS=-lssl -lcrypto INFO_DIRECTORY=%{_infodir} LOG_FILE_PATH=/var/log/exim/%%s.log EXICYCLOG_MAX=10 SYSLOG_LOG_PID=yes + SYSLOG_LONG_LINES=yes COMPRESS_COMMAND=/bin/gzip COMPRESS_SUFFIX=gz ZCAT_COMMAND=/usr/bin/zcat - # SUPPORT_PAM=yes + SUPPORT_PAM=yes # You probably need to add -lpam to EXTRALIBS # RADIUS_CONFIG_FILE=/etc/radiusclient/radiusclient.conf # CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck @@ -231,7 +244,7 @@ cat <<-EOF > Local/Makefile # LOG_MODE=0640 # LOOKUP_TESTDB=yes MAKE_SHELL=/bin/bash - # MAX_NAMED_LIST=16 + MAX_NAMED_LIST=64 # MAXINTERFACES=250 # MSGLOG_DIRECTORY_MODE=0750 # PERL_CC= @@ -244,8 +257,19 @@ cat <<-EOF > Local/Makefile HAVE_IPV6=YES EXPERIMENTAL_SPF=yes LOOKUP_LIBS+=-lspf2 + #EXPERIMENTAL_DMARC=yes + #CFLAGS += -I/usr/local/include + #LDFLAGS += -lopendmarc + EXPERIMENTAL_EVENT=yes + EXPERIMENTAL_PROXY=yes + EXPERIMENTAL_CERTNAMES=yes + EXPERIMENTAL_DSN=yes + EXPERIMENTAL_DANE=yes + EXPERIMENTAL_SOCKS=yes + EXPERIMENTAL_INTERNATIONAL=yes + LDFLAGS += -lidn CFLAGS=$RPM_OPT_FLAGS -Wall $CFLAGS_OPT_WERROR -fno-strict-aliasing -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DLDAP_DEPRECATED $fPIE - EXTRALIBS=-ldl -L/usr/X11R6/%{_lib} $pie + EXTRALIBS=-ldl -lpam -L/usr/X11R6/%{_lib} $pie EOF touch Local/eximon.conf rm -f doc/*.{orig,txt~}