Dropped dynlookup-config patch (merged into config patch)
This commit is contained in:
parent
3a3d9940d2
commit
37b90b260b
@ -89,9 +89,8 @@ index 72e26ce..0bd97f1 100644
|
|||||||
-# LOOKUP_NISPLUS=yes
|
-# LOOKUP_NISPLUS=yes
|
||||||
+LOOKUP_LDAP=yes
|
+LOOKUP_LDAP=yes
|
||||||
+LDAP_LIB_TYPE=OPENLDAP2
|
+LDAP_LIB_TYPE=OPENLDAP2
|
||||||
+LOOKUP_INCLUDE=-I/usr/include/mysql
|
+LOOKUP_LIBS=-lldap -llber -lsqlite3
|
||||||
+LOOKUP_LIBS=-lldap -llber -lsqlite3 -L/usr/$(_lib)/mysql -lmysqlclient -lpq
|
+LOOKUP_MYSQL=2
|
||||||
+LOOKUP_MYSQL=yes
|
|
||||||
+LOOKUP_MYSQL_PC=mariadb
|
+LOOKUP_MYSQL_PC=mariadb
|
||||||
+LOOKUP_NIS=yes
|
+LOOKUP_NIS=yes
|
||||||
+LOOKUP_NISPLUS=yes
|
+LOOKUP_NISPLUS=yes
|
||||||
@ -99,7 +98,8 @@ index 72e26ce..0bd97f1 100644
|
|||||||
-# LOOKUP_PASSWD=yes
|
-# LOOKUP_PASSWD=yes
|
||||||
-# LOOKUP_PGSQL=yes
|
-# LOOKUP_PGSQL=yes
|
||||||
+LOOKUP_PASSWD=yes
|
+LOOKUP_PASSWD=yes
|
||||||
+LOOKUP_PGSQL=yes
|
+LOOKUP_PGSQL=2
|
||||||
|
+LOOKUP_PGSQL_LIBS=-lpq
|
||||||
# LOOKUP_REDIS=yes
|
# LOOKUP_REDIS=yes
|
||||||
-# LOOKUP_SQLITE=yes
|
-# LOOKUP_SQLITE=yes
|
||||||
-# LOOKUP_SQLITE_PC=sqlite3
|
-# LOOKUP_SQLITE_PC=sqlite3
|
||||||
|
@ -1,26 +0,0 @@
|
|||||||
diff --git a/src/EDITME b/src/EDITME
|
|
||||||
index ce2b047..8b773ea 100644
|
|
||||||
--- a/src/EDITME
|
|
||||||
+++ b/src/EDITME
|
|
||||||
@@ -311,15 +311,17 @@ LOOKUP_DSEARCH=yes
|
|
||||||
# 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_INCLUDE=-I/usr/include/mysql
|
|
||||||
+# LOOKUP_MYSQL_LIBS=-lmysqlclient
|
|
||||||
+LOOKUP_PGSQL_LIBS=-lpq
|
|
||||||
+LOOKUP_MYSQL=2
|
|
||||||
LOOKUP_MYSQL_PC=mariadb
|
|
||||||
LOOKUP_NIS=yes
|
|
||||||
LOOKUP_NISPLUS=yes
|
|
||||||
# LOOKUP_ORACLE=yes
|
|
||||||
LOOKUP_PASSWD=yes
|
|
||||||
-LOOKUP_PGSQL=yes
|
|
||||||
+LOOKUP_PGSQL=2
|
|
||||||
# LOOKUP_REDIS=yes
|
|
||||||
LOOKUP_SQLITE=yes
|
|
||||||
# LOOKUP_WHOSON=yes
|
|
@ -14,7 +14,7 @@
|
|||||||
Summary: The exim mail transfer agent
|
Summary: The exim mail transfer agent
|
||||||
Name: exim
|
Name: exim
|
||||||
Version: 4.90.1
|
Version: 4.90.1
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Url: http://www.exim.org/
|
Url: http://www.exim.org/
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
@ -58,7 +58,6 @@ Patch20: exim-4.90.1-allow-filter.patch
|
|||||||
Patch21: exim-4.87-localhost-is-local.patch
|
Patch21: exim-4.87-localhost-is-local.patch
|
||||||
Patch22: exim-4.90.1-greylist-conf.patch
|
Patch22: exim-4.90.1-greylist-conf.patch
|
||||||
Patch23: exim-4.90.1-smarthost-config.patch
|
Patch23: exim-4.90.1-smarthost-config.patch
|
||||||
Patch25: exim-4.90.1-dynlookup-config.patch
|
|
||||||
Patch26: exim-4.85-pic.patch
|
Patch26: exim-4.85-pic.patch
|
||||||
Patch27: exim-4.90.1-environment.patch
|
Patch27: exim-4.90.1-environment.patch
|
||||||
# Workaround for NIS removal from glibc, bug 1534920
|
# Workaround for NIS removal from glibc, bug 1534920
|
||||||
@ -209,7 +208,6 @@ greylisting unconditional.
|
|||||||
%patch21 -p1 -b .localhost
|
%patch21 -p1 -b .localhost
|
||||||
%patch22 -p1 -b .grey
|
%patch22 -p1 -b .grey
|
||||||
%patch23 -p1 -b .smarthost
|
%patch23 -p1 -b .smarthost
|
||||||
%patch25 -p1 -b .dynconfig
|
|
||||||
%patch26 -p1 -b .fpic
|
%patch26 -p1 -b .fpic
|
||||||
%patch27 -p1 -b .environment
|
%patch27 -p1 -b .environment
|
||||||
%patch33 -p1 -b .nsl-fix
|
%patch33 -p1 -b .nsl-fix
|
||||||
@ -590,6 +588,9 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || :
|
|||||||
%{_sysconfdir}/cron.daily/greylist-tidy.sh
|
%{_sysconfdir}/cron.daily/greylist-tidy.sh
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Feb 16 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 4.90.1-3
|
||||||
|
- Dropped dynlookup-config patch (merged into config patch)
|
||||||
|
|
||||||
* Fri Feb 16 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 4.90.1-2
|
* Fri Feb 16 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 4.90.1-2
|
||||||
- Fixed mysql module
|
- Fixed mysql module
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user