dynlookups

2008-04-22 17:30:01 +00:00 · 2008-04-22 17:30:01 +00:00 · 8df1bb0bec
parent 4398a3ba3e
commit 8df1bb0bec
5 changed files with 3444 additions and 13 deletions
--- a/exim-4.50-config.patch
+++ b/exim-4.50-config.patch
@ -1,5 +1,5 @@
--- exim-4.50/Local/Makefile.conf	2005-02-22 19:12:14.000000000 +0000
-+++ exim-4.50/Local/Makefile	2005-02-22 19:15:10.000000000 +0000
+--- exim-4.50/src/EDITME	2005-02-22 19:12:14.000000000 +0000
+++ exim-4.50/src/EDITME	2005-02-22 19:15:10.000000000 +0000
@@ -100,7 +100,7 @@
 # /usr/local/sbin. The installation script will try to create this directory,
 # and any superior directories, if they do not exist.
--- a/exim-4.62-dlopen-localscan.patch
+++ b/exim-4.62-dlopen-localscan.patch
@ -10,8 +10,8 @@ of exim until Philip has to break the API and increase the major number)
 Marc MERLIN <marc_soft@merlins.org>

 diff -urN exim-4.14-0/src/EDITME exim-4.14-1/src/EDITME
--- exim-4.14-0/Local/Makefile	Tue Mar 11 04:20:18 2003
-+++ exim-4.14-1/Local/Makefile	Sun Mar 23 15:34:15 2003
+--- exim-4.14-0/src/EDITME	Tue Mar 11 04:20:18 2003
+++ exim-4.14-1/src/EDITME	Sun Mar 23 15:34:15 2003
@@ -388,6 +388,20 @@
 
 
--- a/exim-4.69-dynlookup-config.patch
+++ b/exim-4.69-dynlookup-config.patch
@ -0,0 +1,25 @@
+diff -u exim-4.69/src/EDITME exim-4.69/src/EDITME
+--- exim-4.69/src/EDITME	2008-04-19 23:48:03.000000000 +0100
+++ exim-4.69/src/EDITME	2008-04-19 23:54:46.000000000 +0100
+@@ -282,15 +282,17 @@
+ # LOOKUP_IBASE=yes
+ LOOKUP_LDAP=yes
+ LDAP_LIB_TYPE=OPENLDAP2
+-LOOKUP_INCLUDE=-I/usr/include/mysql
+-LOOKUP_LIBS=-lldap -llber -lsqlite3 -L/usr/$(_lib)/mysql -lmysqlclient -lpq
+-LOOKUP_MYSQL=yes
+LOOKUP_LIBS=-lldap -llber -lsqlite3
+LOOKUP_MYSQL_INCLUDE=-I/usr/include/mysql
+LOOKUP_MYSQL_LIBS=-L/usr/${_lib}/mysql -lmysqlclient
+LOOKUP_PGSQL_LIBS=-lpq
+LOOKUP_MYSQL=2
+ LOOKUP_NIS=yes
+ LOOKUP_NISPLUS=yes
+ # LOOKUP_ORACLE=yes
+ LOOKUP_PASSWD=yes
+-LOOKUP_PGSQL=yes
+LOOKUP_PGSQL=2
+ LOOKUP_SQLITE=yes
+ # LOOKUP_WHOSON=yes
+ 
+ # These two settings are obsolete; all three lookups are compiled when
--- a/exim-4.69-dynlookup.patch
+++ b/exim-4.69-dynlookup.patch
--- a/exim.spec
+++ b/exim.spec
@ -12,7 +12,7 @@
 Summary: The exim mail transfer agent
 Name: exim
 Version: 4.69
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@ -51,6 +51,8 @@ Patch20: exim-4.63-allow-filter.patch
 Patch21: exim-4.63-localhost-is-local.patch
 Patch22: exim-4.66-greylist-conf.patch
 Patch23: exim-4.67-smarthost-config.patch
+Patch24: exim-4.69-dynlookup.patch
+Patch25: exim-4.69-dynlookup-config.patch

 Requires: /etc/aliases
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@ -70,10 +72,23 @@ routed, and there are extensive facilities for checking incoming
 mail. Exim can be installed in place of sendmail, although the
 configuration of exim is quite different to that of sendmail.

+%package mysql
+Summary: MySQL lookup support for Exim
+Group: System Environment/Daemons
+
+%description mysql
+This package contains the MySQL lookup module for Exim
+
+%package pgsql
+Summary: PostgreSQL lookup support for Exim
+Group: System Environment/Daemons
+
+%description pgsql
+This package contains the PostgreSQL lookup module for Exim
+
 %package mon
-Summary: X11 monitor application for exim
+Summary: X11 monitor application for Exim
 Group: Applications/System
-License: GPL

 %description mon
 The Exim Monitor is an optional supplement to the Exim package. It
@ -146,8 +161,6 @@ greylisting unconditional.
 %if 0%{?buildsa}
 %setup -q -T -D -a 13
 %endif
-cp src/EDITME Local/Makefile
-cp exim_monitor/EDITME Local/eximon.conf

 %patch4 -p1 -b .rhl
 %patch6 -p1 -b .config
@ -163,13 +176,21 @@ cp exim_monitor/EDITME Local/eximon.conf
 %patch21 -p1 -b .localhost
 %patch22 -p1 -b .grey
 %patch23 -p1 -b .smarthost
+%patch24 -p1 -b .dynlookup
+%patch25 -p1 -b .dynconfig
+
+cp src/EDITME Local/Makefile
+sed -i 's@^# LOOKUP_MODULE_DIR=.*@LOOKUP_MODULE_DIR=%{_libdir}/exim/%{version}-%{release}/lookups@' Local/Makefile
+cp exim_monitor/EDITME Local/eximon.conf
+

 %build
 %ifnarch s390 s390x sparc sparcv9 sparcv9v sparc64 sparc64v
-	make CFLAGS="$RPM_OPT_FLAGS -fpie" LFLAGS=-pie _lib=%{_lib}
+	PIE=-fpie
 %else
-	make CFLAGS="$RPM_OPT_FLAGS -fPIE" LFLAGS=-pie _lib=%{_lib}
+	PIE=-fPIE
 %endif
+make CFLAGS="$RPM_OPT_FLAGS $PIE" LFLAGS=-pie _lib=%{_lib} FULLECHO=

 %if 0%{?buildsa}
 # build sa-exim
@ -198,6 +219,13 @@ do
 	install -m 0755 $i $RPM_BUILD_ROOT%{_sbindir}
 done

+mkdir -p $RPM_BUILD_ROOT%{_libdir}/exim/%{version}-%{release}/lookups
+for i in mysql.so pgsql.so
+do 
+	install -m755 lookups/$i \
+	 $RPM_BUILD_ROOT%{_libdir}/exim/%{version}-%{release}/lookups
+done
+
 cd ..

 install -m 0644 src/configure.default $RPM_BUILD_ROOT%{_sysconfdir}/exim/exim.conf
@ -382,6 +410,7 @@ fi
 %{_bindir}/newaliases.exim
 /usr/lib/sendmail.exim
 %{_mandir}/*/*
+%dir %{_libdir}/exim/%{version}-%{release}/lookups

 %defattr(-,exim,exim)
 %dir %{_var}/spool/exim
@ -406,6 +435,12 @@ fi
 %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) /etc/pki/tls/certs/exim.pem
 %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) /etc/pki/tls/private/exim.pem

+%files mysql
+%{_libdir}/exim/%{version}-%{release}/lookups/mysql.so
+
+%files pgsql
+%{_libdir}/exim/%{version}-%{release}/lookups/pgsql.so
+
 %files mon
 %defattr(-,root,root)
 %{_sbindir}/eximon
@ -448,10 +483,13 @@ test "$1"  = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null || :
 %{_sysconfdir}/cron.daily/greylist-tidy.sh

 %changelog
-* Tue Mar 18 2008 Tom "spot" Callaway <tcallawa@redhat.com> 4.59-4
+* Sat Apr 19 2008 David Woodhouse <dwmw2@infradead.org> 4.69-5
+- Add dynamic lookup patch, split into subpackages (#199256)
+
+* Tue Mar 18 2008 Tom "spot" Callaway <tcallawa@redhat.com> 4.69-4
 - add Requires for versioned perl (libperl.so)

-* Mon Mar 17 2008 David Woodhouse <dwmw2@infradead.org> 4.59-3
+* Mon Mar 17 2008 David Woodhouse <dwmw2@infradead.org> 4.69-3
 - Rebuild for new perl

 * Mon Feb 04 2008 Dennis Gilmore <dennis@ausil.us> 4.69-2