- build fix

[packages/exim.git] / exim.spec

diff --git a/exim.spec b/exim.spec
index dd085bddc894897ff83922cec02da6293306a206..eb340c27edbaff0a3de13cd2bbea7d73b45c5de0 100644 (file)
--- 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_without dynamic # dynamic modules
 #
 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.77
 Release:       2
 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: 5d746275f2cc85845567f9d5eb84a57a
 Source1:       ftp://ftp.exim.org/pub/exim/exim4/%{name}-html-%{version}.tar.bz2
-# Source1-md5: 51744a0fc94ef403cb049dfc9f059ada
+# Source1-md5: 5af01cdfe2f938bbac5d7a65cb3a7290
 Source2:       %{name}.init
 Source3:       %{name}.cron.db
 Source4:       %{name}4.conf
@@ -52,7 +53,7 @@ Patch7:               %{name}_463_dsn_1_3.patch
 Patch8:                %{name}-spam-timeout.patch
 Patch9:                %{name}-dkim.patch
 Patch10:       %{name}-force-sigalrm.patch
-Patch11:       %{name}-CVE-2011-1764.patch
+Patch11:       %{name}-bug-1057.patch
 URL:           http://www.exim.org/
 %{?with_sasl:BuildRequires:    cyrus-sasl-devel >= 2.1.0}
 BuildRequires: db-devel
@@ -153,6 +154,9 @@ Header files for Exim.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe dla Exima.
 
+%global        dynamic_type    yes
+%{?with_dynamic:%global dynamic_type 2}
+
 %prep
 %setup -q -a1 -a7
 %patch0 -p1
@@ -178,36 +182,52 @@ CFLAGS_DYNAMIC=-shared -rdynamic -fPIC %{rpmldflags}
 LOOKUP_CDB=yes
 XLFLAGS=-L%{_prefix}/X11R6/%{_lib}
 X11_LD_LIB=%{_prefix}/X11R6/%{_lib}
-LOOKUP_MODULE_DIR=%{_libdir}/%{name}/modules
+%{?with_dynamic:LOOKUP_MODULE_DIR=%{_libdir}/%{name}/modules}
 SUPPORT_DSN=yes
 %{?with_spf:EXPERIMENTAL_SPF=yes}
 %{?with_srs:EXPERIMENTAL_SRS=yes}
 %if %{with mysql}
-LOOKUP_MYSQL=2
+LOOKUP_MYSQL=%{dynamic_type}
+# for dynamic
 LOOKUP_MYSQL_INCLUDE=-I%{_includedir}/mysql
 LOOKUP_MYSQL_LIBS=-lmysqlclient
+# for static
+LOOKUP_INCLUDE+=-I%{_includedir}/mysql
+LOOKUP_LIBS+=-lmysqlclient
 %endif
 %if %{with pgsql}
-LOOKUP_PGSQL=2
+LOOKUP_PGSQL=%{dynamic_type}
+# for dynamic
 LOOKUP_PGSQL_INCLUDE=-I%{_includedir}/pgsql
 LOOKUP_PGSQL_LIBS=-lpq
+# for static
+LOOKUP_INCLUDE+=-I%{_includedir}/pgsql
+LOOKUP_LIBS+=-lpq
 %endif
 %if %{with sqlite}
-LOOKUP_SQLITE=2
+LOOKUP_SQLITE=%{dynamic_type}
+# for dynamic
 LOOKUP_SQLITE_LIBS=-lsqlite3
+# for static
+LOOKUP_LIBS+=-lsqlite3
 %endif
 %if %{with whoson}
-LOOKUP_WHOSON=2
+LOOKUP_WHOSON=%{dynamic_type}
+# for dynamic
 LOOKUP_WHOSON_LIBS=-lwhoson
+# for static
+LOOKUP_LIBS+=-lwhoson
 %endif
 %{?with_sasl:AUTH_CYRUS_SASL=yes}
 %if %{with ldap}
-LOOKUP_LDAP=yes
+LOOKUP_LDAP=%{dynamic_type}
 LDAP_LIB_TYPE=OPENLDAP2
-# currently dynamic ldap lookup not supported
-# LOOKUP_LDAP_LIBS=-lldap -llber
+# for dynamic
+LOOKUP_LDAP_LIBS=-lldap -llber
+# for static
+LOOKUP_LIBS+=-lldap -llber
 %endif
-LOOKUP_LIBS=%{?with_spf:-lspf2} %{?with_srs:-lsrs_alt} %{?with_sasl:-lsasl2} %{?with_ldap:-lldap -llber}
+LOOKUP_LIBS+=%{?with_spf:-lspf2} %{?with_srs:-lsrs_alt} %{?with_sasl:-lsasl2}
 EOF
 
 # have to be after Local/Makefile-Linux creation
@@ -234,7 +254,7 @@ install build-Linux-*/exim{,_fixdb,_tidydb,_dbmbuild,on.bin,_dumpdb,_lock} \
        $RPM_BUILD_ROOT%{_bindir}
 install build-Linux-*/eximon.bin $RPM_BUILD_ROOT%{_bindir}
 install build-Linux-*/eximon $RPM_BUILD_ROOT%{_bindir}
-install build-Linux-*/*/*.so $RPM_BUILD_ROOT%{_libdir}/%{name}/modules
+%{?with_dynamic:install build-Linux-*/*/*.so $RPM_BUILD_ROOT%{_libdir}/%{name}/modules}
 
 install %{SOURCE5} .
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/cron.weekly
@@ -330,12 +350,14 @@ fi
 %attr(640,exim,root) %ghost %{_var}/log/exim/*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/smtp
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.smtp
+%if %{with dynamic}
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/modules
 %{?with_mysql:%attr(755,root,root) %{_libdir}/%{name}/modules/mysql.so}
 %{?with_pgsql:%attr(755,root,root) %{_libdir}/%{name}/modules/pgsql.so}
 %{?with_sqlite:%attr(755,root,root) %{_libdir}/%{name}/modules/sqlite.so}
 %{?with_whoson:%attr(755,root,root) %{_libdir}/%{name}/modules/whoson.so}
+%endif
 %{_mandir}/man8/*
 
 %files X11