- no revision change;

- added documentation on whoson lookup method to texinfo;
- added use of whoson for relaying to default configuration
  (grep whoson /etc/mail/exim.conf);

Changed files:
    exim-whoson-config.patch -> 1.1
    exim-whoson.patch -> 1.2
    exim.spec -> 1.66

diff --git a/exim-whoson-config.patch b/exim-whoson-config.patch
new file mode 100644 (file)
index 0000000..677f715
--- /dev/null
+++ b/exim-whoson-config.patch
@@ -0,0 +1,11 @@
+--- exim.conf  Thu Jul 19 18:24:41 2001
++++ exim.conf-whoson   Thu Jul 19 18:26:15 2001
+@@ -106,7 +106,7 @@
+ # calling its own SMTP port, is locked out by default. If you want to permit
+ # relaying from the local host, you should set
+ #
+-host_accept_relay = localhost
++host_accept_relay = localhost : net-whoson;$key
+ #
+ # If you want to permit relaying through your host from certain hosts or IP
+ # networks, you need to set the option appropriately, for example

diff --git a/exim-whoson.patch b/exim-whoson.patch
index 3db3f7c6354c212e6533afade288faa6a1577546..efa9c444746387a49556849d68e115e6a73ac60d 100644 (file)
--- a/exim-whoson.patch
+++ b/exim-whoson.patch
@@ -1,6 +1,35 @@
+diff -uNr exim-3.31/exim-texinfo-3.30/doc/spec.texinfo exim-3.31-whoson/exim-texinfo-3.30/doc/spec.texinfo
+--- exim-3.31/exim-texinfo-3.30/doc/spec.texinfo       Thu Jul 19 18:41:19 2001
++++ exim-3.31-whoson/exim-texinfo-3.30/doc/spec.texinfo        Thu Jul 19 18:40:46 2001
+@@ -3586,6 +3586,7 @@
+ 
+ LOOKUP_DBM=yes
+ LOOKUP_LSEARCH=yes
++LOOKUP_WHOSON=yes
+ @end example
+ 
+ which means that only linear searching and DBM lookups are included by default.
+@@ -3758,6 +3759,17 @@
+ "More about dnsdb" below.
+ 
+ @item
++@dfn{whoson}: This is the lookup type that performs lookups for relay allowed
++dialups using WHOSON (pop before smtp) service. You have to give it an IP
++address of host in question. It returns username associated in WHOSON database
++with queried IP address, or nothing, if given IP is unknown. Primary use is:
++
++@example
++
++host_relay_accept = localhost : net-whoson;$key
++@end example
++
++@item
+ @dfn{testdb}: This is a lookup type which is for use in debugging Exim. It is
+ not likely to be useful in normal operation.
+ @end itemize
 diff -uNr exim-3.31/scripts/MakeLinks exim-3.31-whoson/scripts/MakeLinks
 --- exim-3.31/scripts/MakeLinks        Mon Jul  2 11:46:41 2001
-+++ exim-3.31-whoson/scripts/MakeLinks Wed Jul 18 23:21:46 2001
++++ exim-3.31-whoson/scripts/MakeLinks Thu Jul 19 18:28:52 2001
 @@ -79,6 +79,8 @@
  ln -s ../../src/lookups/pgsql.c          pgsql.c
  ln -s ../../src/lookups/testdb.h         testdb.h
@@ -11,9 +40,9 @@ diff -uNr exim-3.31/scripts/MakeLinks exim-3.31-whoson/scripts/MakeLinks
  
  # Likewise for the code for the directors
 diff -uNr exim-3.31/src/EDITME exim-3.31-whoson/src/EDITME
---- exim-3.31/src/EDITME       Mon Jul  2 11:46:41 2001
-+++ exim-3.31-whoson/src/EDITME        Wed Jul 18 20:38:52 2001
-@@ -577,3 +577,5 @@
+--- exim-3.31/src/EDITME       Thu Jul 19 18:41:19 2001
++++ exim-3.31-whoson/src/EDITME        Thu Jul 19 18:28:52 2001
+@@ -578,3 +578,5 @@
  # USE_TCP_WRAPPERS=yes
  
  # End of EDITME
@@ -21,7 +50,7 @@ diff -uNr exim-3.31/src/EDITME exim-3.31-whoson/src/EDITME
 +LOOKUP_WHOSON=yes
 diff -uNr exim-3.31/src/config.h.defaults exim-3.31-whoson/src/config.h.defaults
 --- exim-3.31/src/config.h.defaults    Mon Jul  2 11:46:41 2001
-+++ exim-3.31-whoson/src/config.h.defaults     Wed Jul 18 20:39:10 2001
++++ exim-3.31-whoson/src/config.h.defaults     Thu Jul 19 18:28:52 2001
 @@ -106,3 +106,5 @@
  #define ROOT_UID              0
  
@@ -30,7 +59,7 @@ diff -uNr exim-3.31/src/config.h.defaults exim-3.31-whoson/src/config.h.defaults
 +#define LOOKUP_WHOSON
 diff -uNr exim-3.31/src/drtables.c exim-3.31-whoson/src/drtables.c
 --- exim-3.31/src/drtables.c   Mon Jul  2 11:46:42 2001
-+++ exim-3.31-whoson/src/drtables.c    Wed Jul 18 23:52:33 2001
++++ exim-3.31-whoson/src/drtables.c    Thu Jul 19 18:28:52 2001
 @@ -75,6 +75,10 @@
  #include "lookups/testdb.h"
  #endif
@@ -64,7 +93,7 @@ diff -uNr exim-3.31/src/drtables.c exim-3.31-whoson/src/drtables.c
  
 diff -uNr exim-3.31/src/lookups/Makefile exim-3.31-whoson/src/lookups/Makefile
 --- exim-3.31/src/lookups/Makefile     Mon Jul  2 11:46:43 2001
-+++ exim-3.31-whoson/src/lookups/Makefile      Wed Jul 18 21:42:36 2001
++++ exim-3.31-whoson/src/lookups/Makefile      Thu Jul 19 18:28:52 2001
 @@ -4,7 +4,7 @@
  # defined, dummy modules get compiled.
  
@@ -83,7 +112,7 @@ diff -uNr exim-3.31/src/lookups/Makefile exim-3.31-whoson/src/lookups/Makefile
  # End
 diff -uNr exim-3.31/src/lookups/whoson.c exim-3.31-whoson/src/lookups/whoson.c
 --- exim-3.31/src/lookups/whoson.c     Thu Jan  1 01:00:00 1970
-+++ exim-3.31-whoson/src/lookups/whoson.c      Wed Jul 18 23:23:24 2001
++++ exim-3.31-whoson/src/lookups/whoson.c      Thu Jul 19 18:28:52 2001
 @@ -0,0 +1,57 @@
 +/*************************************************
 +*     Exim - an Internet mail transport agent    *
@@ -144,7 +173,7 @@ diff -uNr exim-3.31/src/lookups/whoson.c exim-3.31-whoson/src/lookups/whoson.c
 +/* End of lookups/whoson.c */
 diff -uNr exim-3.31/src/lookups/whoson.h exim-3.31-whoson/src/lookups/whoson.h
 --- exim-3.31/src/lookups/whoson.h     Thu Jan  1 01:00:00 1970
-+++ exim-3.31-whoson/src/lookups/whoson.h      Wed Jul 18 21:43:17 2001
++++ exim-3.31-whoson/src/lookups/whoson.h      Thu Jul 19 18:28:52 2001
 @@ -0,0 +1,13 @@
 +/*************************************************
 +*     Exim - an Internet mail transport agent    *

diff --git a/exim.spec b/exim.spec
index 868b9e6987a5877739fc12f65126ddda7cad1c41..94cdd4d38f3489b9e6560d2d3fc7144507ffc925 100644 (file)
--- a/exim.spec
+++ b/exim.spec
@@ -36,6 +36,7 @@ Patch3:               %{name}-use_system_pcre.patch
 Patch4:                %{name}-Makefile-Default.patch
 Patch5:                %{name}-conf.patch
 Patch6:                %{name}-whoson.patch
+Patch7:                %{name}-whoson-config.patch
 URL:           http://www.exim.org/
 %{!?_without_ldap:BuildRequires: openldap-devel >= 2.0.0}
 %{!?_without_whoson:BuildRequires: whoson-devel}
@@ -148,6 +149,7 @@ install     %{SOURCE11} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
 install src/configure.default $RPM_BUILD_ROOT%{_sysconfdir}/mail/exim.conf
 cd $RPM_BUILD_ROOT%{_sysconfdir}/mail
 patch -p0 < %{PATCH5}
+%{!?_without_whoson:patch -p0 < %{PATCH7}}
 cd -
 install %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man8/
 install %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/mail/aliases