commit exim

31 May 2006

Hello community,

here is the log from the commit of package exim
checked in at Wed May 31 03:01:59 CEST 2006.

--------

--- exim/exim.changes	2006-03-08 17:17:42.000000000 +0100
+++ exim/exim.changes	2006-05-30 16:15:09.000000000 +0200
@@ -1,0 +2,34 @@
+Tue May 30 16:07:30 CEST 2006 - poeml@suse.de
+
+- upstream 4.62
+  . The ${readsocket expansion item now supports Internet domain sockets as well
+    as Unix domain sockets. 
+  . If a redirect router sets up file or pipe deliveries for more than one
+    incoming address, and the relevant transport has batch_max set greater than
+    one, a batch delivery now occurs.
+  . The appendfile transport has a new option called maildirfolder_create_regex.
+  . An option called disable_ipv6, to disable the use of IPv6 completely.
+  . An increase in the number of ACL variables to 20 of each type.
+  . A change to use $auth1, $auth2, and $auth3 in authenticators instead of $1,
+    $2, $3, (though those are still set) because the numeric variables get used
+    for other things in complicated expansions.
+  . The default for rfc1413_query_timeout has been changed from 30s to 5s.
+  . It is possible to use setclassresources() on some BSD OS to control the
+    resources used in pipe deliveries.
+  . A new ACL modifier called add_header, which can be used with any verb.
+  . More errors are detectable in retry rules.
+  . Support for SQLite.
+  . Support for IGNOREQUOTA in LMTP.
+  . Extensions to the "submission mode" features.
+  . Support for Client SMTP Authorization (CSA).
+  . Support for ratelimiting hosts and users.
+  . New expansion items to help with the BATV "prvs" scheme.
+  . A "match_ip" condition, that matches an IP address against a list.
+  - numerous bug fixes and minor changes
+- add eximstats-html subpackage, which, if installed and enabled in
+  /etc/sysconfig/exim, puts HTML reports of the 'eximstats' log
+  analyzer into /srv/www/eximstats
+- try to adapt BuildRequires and suse specific rpm macros to build
+  on Fedora Core
+
+-------------------------------------------------------------------

Old:
----
  exim-4.22-rfc1413_query_timeout.diff
  exim-4.51-external-pcre.diff
  exim-4.51.tar.bz2

New:
----
  exim-4.60-external-pcre.diff
  exim-4.62.tar.bz2
  eximstats-html-update.py
  eximstats.conf

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ exim.spec ++++++
--- /var/tmp/diff_new_pack.2lOt1S/_old	2006-05-31 02:59:51.000000000 +0200
+++ /var/tmp/diff_new_pack.2lOt1S/_new	2006-05-31 02:59:51.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package exim (Version 4.51)
+# spec file for package exim (Version 4.62)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,19 +11,24 @@
 # norootforbuild
 
 Name:           exim
-BuildRequires:  db-devel openldap2-devel pcre-devel tcpd-devel xorg-x11-devel
+BuildRequires:  db-devel openldap2-devel pcre-devel
+%if %{?suse_version:1}%{?!suse_version:0}
+BuildRequires:  tcpd-devel xorg-x11-devel
+%else
+BuildRequires:  libXaw-devel libXext-devel libXt-devel openssl-devel tcp_wrappers xorg-x11-server-sdk
+%endif
 URL:            http://www.exim.org/
 Conflicts:      sendmail sendmail-tls postfix
 License:        GPL
 Group:          Productivity/Networking/Email/Servers
 Autoreqprov:    on
 provides:     smtp_daemon
-%if %suse_version > 800
+%if %{?suse_version:%suse_version}%{?!suse_version:0} > 800
 Requires:       logrotate
 PreReq:         %insserv_prereq %fillup_prereq /usr/sbin/useradd fileutils textutils
 %endif
-Version:        4.51
-Release:        12
+Version:        4.62
+Release:        1
 Summary:        The Exim Mail Transfer Agent, a Replacement for sendmail
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         exim-%{version}.tar.bz2
@@ -32,12 +37,17 @@
 Source11:       exim.rc
 Source12:       permissions.exim
 Source20:       http://www.logic.univie.ac.at/~ametzler/debian/exim4manpages/exim4-manpages....
+Source30:       eximstats-html-update.py
+Source31:       eximstats.conf
 Patch:          exim-4.12-tail.patch
-Patch1:         exim-4.22-rfc1413_query_timeout.diff
-Patch2:         exim-4.51-external-pcre.diff
+Patch2:         exim-4.60-external-pcre.diff
 %package -n eximon
 Summary:        Eximon, an graphical frontend to administer Exim's mail queue
 Group:          Productivity/Networking/Email/Servers
+%package -n eximstats-html
+Summary:        Create HTML reports of exim logs
+Group:          Productivity/Networking/Email/Servers
+Requires:       perl-GD perl-GDGraph perl-GDTextUtil
 
 %description
 Exim is a mail transport agent (MTA) developed at the University of
@@ -67,12 +77,35 @@
 --------
     Philip Hazel <ph10@cus.cam.ac.uk>
 
+
+%description -n eximstats-html
+If this package is installed alongside the exim MTA, and you enable
+EXIM_REPORT_WEEKLY_HTML in /etc/sysconfig/exim, logrotate/cron will
+create HTML reports in /srv/www/eximstats.
+
+You can edit /etc/apache2/conf.d/eximstats.conf to configure your
+webserver for the reports.
+
+The script /usr/sbin/eximstats-html-update.py can create the reports
+for log files that were rotated in the past. (You would only run this
+once, if at all. The rest is done by logrotate / cron.)
+
+
+
+Authors:
+--------
+    Philip Hazel <ph10@cus.cam.ac.uk>
+
 %prep
 %setup -q
 %patch
-%patch1 -p1
 %patch2 -p1
 bzcat %{S:30} | patch -p1
+# build with fPIE/pie on SUSE 10.0 or newer, or on any other platform
+%if %{?suse_version:%suse_version}%{?!suse_version:99999} > 930
+fPIE="-fPIE"
+pie="-pie"
+%endif
 cat <<-EOF > Local/Makefile
 	# see src/EDITME for comments.
 	BIN_DIRECTORY=/usr/sbin
@@ -173,14 +206,14 @@
 	SUPPORT_MOVE_FROZEN_MESSAGES=yes
 	HAVE_IPV6=YES
 	
-	CFLAGS=$RPM_OPT_FLAGS -Wall -fno-strict-aliasing -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DLDAP_DEPRECATED -fPIE
-	EXTRALIBS=-ldl -L/usr/X11R6/%{_lib} -pie
+	CFLAGS=$RPM_OPT_FLAGS -Wall -fno-strict-aliasing -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DLDAP_DEPRECATED $fPIE
+	EXTRALIBS=-ldl -L/usr/X11R6/%{_lib} $pie
 EOF
 touch Local/eximon.conf
 rm -f doc/*.{orig,txt~}
 
 %build
-%if %suse_version <= 800
+%if  %{?suse_version:%suse_version}%{?!suse_version:99999} <= 800
 	/usr/sbin/useradd -o -g mail -u 8 -s /bin/false -c "Mailer daemon" -d /var/spool/clientmqueue mail 2> /dev/null || :
 %endif
 make 
@@ -243,11 +276,17 @@
  
 gzip -9 doc/*.txt
 # since 10.0, the permissions file is packaged in the 'permissions' package
-%if %suse_version < 1000
-install -o root -g root -m 0755 -d $RPM_BUILD_ROOT/etc/permissions.d
-install -o root -g root -m 0644 $RPM_SOURCE_DIR/permissions.exim $RPM_BUILD_ROOT/etc/permissions.d/exim
+%if %{?suse_version:%suse_version}%{?!suse_version:99999} < 1000
+install -m 0755 -d $RPM_BUILD_ROOT/etc/permissions.d
+install -m 0644 $RPM_SOURCE_DIR/permissions.exim $RPM_BUILD_ROOT/etc/permissions.d/exim
 %endif
-%if %suse_version <= 800
+# eximstats-html files
+mkdir -p $RPM_BUILD_ROOT/srv/www/eximstats
+mkdir -p $RPM_BUILD_ROOT/etc/apache2/conf.d/
+cp -p $RPM_SOURCE_DIR/eximstats.conf $RPM_BUILD_ROOT/etc/apache2/conf.d/
+install -m 0755 $RPM_SOURCE_DIR/eximstats-html-update.py $RPM_BUILD_ROOT/%{_sbindir}
+ 
+%if %{?suse_version:%suse_version}%{?!suse_version:99999} <= 800
 
 %pre
 	/usr/sbin/useradd -o -g mail -u 8 -s /bin/false -c "Mailer daemon" -d /var/spool/clientmqueue mail 2> /dev/null || :
@@ -268,7 +307,7 @@
 for i in var/log/exim/main.log var/log/exim/panic.log var/log/exim/reject.log; do
 	if ! test -e $i; then touch $i; chown mail:mail $i; chmod 640 $i ; fi
 done
-%if %suse_version < 800
+%if %{?suse_version:%suse_version}%{?!suse_version:99999} < 800
 	echo "Updating /etc/rc.config..."
 	bin/cat > var/adm/fillup-templates/rc.config.exim <<-EOF 
 		#
@@ -284,14 +323,14 @@
 	%{fillup_and_insserv exim}
 %endif
 exit 0
-%if %suse_version > 820
+%if %{?suse_version:%suse_version}%{?!suse_version:0} > 820
 
 %preun
 %stop_on_removal exim
 %endif
 
 %postun
-%if %suse_version > 820
+%if %{?suse_version:%suse_version}%{?!suse_version:0} > 820
 %restart_on_update exim
 %endif
 %insserv_cleanup
@@ -322,7 +361,7 @@
 %dir /etc/exim
 %config /etc/init.d/exim
 %config(noreplace) /etc/logrotate.d/exim
-%if %suse_version < 1000
+%if %{?suse_version:%suse_version}%{?!suse_version:99999} < 1000
 %config(noreplace) /etc/permissions.d/exim
 %endif
 /usr/sbin/rcexim
@@ -340,7 +379,46 @@
 /usr/X11R6/bin/eximon
 /usr/X11R6/bin/eximon.bin
 
+%files -n eximstats-html
+%defattr(-,root,root)
+%attr(0750,root,www) /srv/www/eximstats
+/etc/apache2
+/etc/apache2/conf.d
+/etc/apache2/conf.d/eximstats.conf
+%{_sbindir}/eximstats-html-update.py
+
 %changelog -n exim
+* Tue May 30 2006 - poeml@suse.de
+- upstream 4.62
+  . The ${readsocket expansion item now supports Internet domain sockets as well
+  as Unix domain sockets.
+  . If a redirect router sets up file or pipe deliveries for more than one
+  incoming address, and the relevant transport has batch_max set greater than
+  one, a batch delivery now occurs.
+  . The appendfile transport has a new option called maildirfolder_create_regex.
+  . An option called disable_ipv6, to disable the use of IPv6 completely.
+  . An increase in the number of ACL variables to 20 of each type.
+  . A change to use $auth1, $auth2, and $auth3 in authenticators instead of $1,
+  $2, $3, (though those are still set) because the numeric variables get used
+  for other things in complicated expansions.
+  . The default for rfc1413_query_timeout has been changed from 30s to 5s.
+  . It is possible to use setclassresources() on some BSD OS to control the
+  resources used in pipe deliveries.
+  . A new ACL modifier called add_header, which can be used with any verb.
+  . More errors are detectable in retry rules.
+  . Support for SQLite.
+  . Support for IGNOREQUOTA in LMTP.
+  . Extensions to the "submission mode" features.
+  . Support for Client SMTP Authorization (CSA).
+  . Support for ratelimiting hosts and users.
+  . New expansion items to help with the BATV "prvs" scheme.
+  . A "match_ip" condition, that matches an IP address against a list.
+- numerous bug fixes and minor changes
+- add eximstats-html subpackage, which, if installed and enabled in
+  /etc/sysconfig/exim, puts HTML reports of the 'eximstats' log
+  analyzer into /srv/www/eximstats
+- try to adapt BuildRequires and suse specific rpm macros to build
+  on Fedora Core
 * Wed Mar 08 2006 - poeml@suse.de
 - build as non-root user
 * Wed Jan 25 2006 - mls@suse.de

++++++ exim-4.51-external-pcre.diff -> exim-4.60-external-pcre.diff ++++++
--- exim/exim-4.51-external-pcre.diff	2005-09-02 15:55:18.000000000 +0200
+++ exim/exim-4.60-external-pcre.diff	2006-04-28 17:20:04.000000000 +0200
@@ -1,12 +1,19 @@
-
-
-link exim against external pcre library
-
-
-diff -uNr exim-4.51.orig/OS/Makefile-Base exim-4.51/OS/Makefile-Base
---- exim-4.51.orig/OS/Makefile-Base	2005-05-04 13:35:39.000000000 +0200
-+++ exim-4.51/OS/Makefile-Base	2005-09-02 15:37:32.390490965 +0200
-@@ -96,7 +96,7 @@
+diff -uNr exim-4.60.orig/exim_monitor/em_hdr.h exim-4.60/exim_monitor/em_hdr.h
+--- exim-4.60.orig/exim_monitor/em_hdr.h	2005-11-28 11:57:32.000000000 +0100
++++ exim-4.60/exim_monitor/em_hdr.h	2006-03-24 08:30:25.497181713 +0100
+@@ -87,7 +87,7 @@
+ 
+ /* Regular expression include */
+ 
+-#include "pcre/pcre.h"
++#include <pcre.h>
+ 
+ /* Includes from the main source of Exim. We need to have MAXPACKET defined for
+ the benefit of structs.h. One of these days I should tidy up this interface so
+diff -uNr exim-4.60.orig/OS/Makefile-Base exim-4.60/OS/Makefile-Base
+--- exim-4.60.orig/OS/Makefile-Base	2005-11-28 11:57:32.000000000 +0100
++++ exim-4.60/OS/Makefile-Base	2006-03-24 08:31:33.352339217 +0100
+@@ -103,7 +103,7 @@
  # This is the real default target for all the various exim binaries and
  # scripts, once the configuring stuff is done.
  
@@ -15,7 +22,7 @@
          exigrep eximstats exipick exiqgrep exiqsumm \
          transport-filter.pl convert4r3 convert4r4 \
          exim_checkaccess \
-@@ -306,7 +306,7 @@
+@@ -314,7 +314,7 @@
          local_scan.o $(EXIM_PERL) $(OBJ_WITH_CONTENT_SCAN) \
          $(OBJ_WITH_OLD_DEMIME) $(OBJ_EXPERIMENTAL)
  
@@ -24,46 +31,36 @@
          routers/routers.a transports/transports.a \
          $(OBJ_EXIM) version.c
  	@echo " "
-@@ -315,7 +315,7 @@
- 	$(CC) -c $(CFLAGS) $(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE) version.c
+@@ -325,7 +325,7 @@
  	rm -f exim
- 	$(PURIFY) $(LNCC) -o exim $(LFLAGS) $(OBJ_EXIM) version.o \
+ 	@echo "$(LNCC) -o exim"
+ 	$(FE)$(PURIFY) $(LNCC) -o exim $(LFLAGS) $(OBJ_EXIM) version.o \
 -	  pcre/libpcre.a \
-+ 	  -lpcre \
++	  -lpcre \
  	  routers/routers.a transports/transports.a lookups/lookups.a \
  	  auths/auths.a \
  	  $(LIBRESOLV) $(LIBS) $(LIBS_EXIM) $(IPV6_LIBS) $(EXTRALIBS) \
-@@ -418,12 +418,12 @@
+@@ -429,14 +429,14 @@
  
  OBJ_MONBIN = util-spool_in.o util-store.o util-string.o tod.o tree.o $(MONBIN)
  
 -eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) pcre/libpcre.a \
 +eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) \
              ../exim_monitor/em_version.c
- 	$(CC) -o em_version.o -c \
+ 	@echo "$(CC) exim_monitor/em_version.c"
+ 	$(FE)$(CC) -o em_version.o -c \
  	  $(CFLAGS) $(XINCLUDE) -I. ../exim_monitor/em_version.c
- 	$(PURIFY) $(LNCC) -o eximon.bin em_version.o $(LFLAGS) $(XLFLAGS) \
+ 	@echo "$(LNCC) -o eximon.bin"
+ 	$(FE)$(PURIFY) $(LNCC) -o eximon.bin em_version.o $(LFLAGS) $(XLFLAGS) \
 -	$(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 pcre/libpcre.a \
 +	$(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 -lpcre \
  	  $(LIBS) $(LIBS_EXIMON) $(EXTRALIBS) $(EXTRALIBS_EXIMON) -lc
  	@if [ x"$(STRIP_COMMAND)" != x"" ]; then \
  	  echo $(STRIP_COMMAND) eximon.bin; \
-diff -uNr exim-4.51.orig/exim_monitor/em_hdr.h exim-4.51/exim_monitor/em_hdr.h
---- exim-4.51.orig/exim_monitor/em_hdr.h	2005-05-04 13:35:40.000000000 +0200
-+++ exim-4.51/exim_monitor/em_hdr.h	2005-09-02 15:37:32.398489578 +0200
-@@ -87,7 +87,7 @@
- 
- /* Regular expression include */
- 
--#include "pcre/pcre.h"
-+#include <pcre.h>
- 
- /* Includes from the main source of Exim. We need to have MAXPACKET defined for
- the benefit of structs.h. One of these days I should tidy up this interface so
-diff -uNr exim-4.51.orig/src/exim.h exim-4.51/src/exim.h
---- exim-4.51.orig/src/exim.h	2005-05-04 13:35:39.000000000 +0200
-+++ exim-4.51/src/exim.h	2005-09-02 15:37:32.408487843 +0200
-@@ -379,7 +379,7 @@
+diff -uNr exim-4.60.orig/src/exim.h exim-4.60/src/exim.h
+--- exim-4.60.orig/src/exim.h	2005-11-28 11:57:32.000000000 +0100
++++ exim-4.60/src/exim.h	2006-03-24 08:30:25.515178572 +0100
+@@ -414,7 +414,7 @@
  
  /* The header from the PCRE regex package */
  
@@ -71,4 +68,4 @@
 +#include <pcre.h>
  
  /* Exim includes are in several files. Note that local_scan.h #includes
- mytypes.h and store.h, so we don't need to mention them explicitly. */
+ config.h, mytypes.h, and store.h, so we don't need to mention them explicitly.

++++++ exim-4.51.tar.bz2 -> exim-4.62.tar.bz2 ++++++
++++  102677 lines of diff (skipped)

++++++ exim.logrotate ++++++
--- exim/exim.logrotate	2003-11-18 15:51:21.000000000 +0100
+++ exim/exim.logrotate	2006-04-28 17:20:07.000000000 +0200
@@ -11,9 +11,15 @@
 		cd /var/log/exim
 		test -f /etc/sysconfig/exim && source /etc/sysconfig/exim
 		if test "$EXIM_REPORT_WEEKLY" = yes; then
-			report=weekly_report-`date +%Y%m%d`
+			day=`date +%Y%m%d`
+			report=weekly_report-$day
+			eximstatsdir=/srv/www/eximstats/$day
 			touch $report; chmod 640 $report; chown :mail $report
 			eximstats main.log > $report
+			if test "$EXIM_REPORT_WEEKLY_HTML" = yes; then
+				mkdir $eximstatsdir
+				eximstats -html -charts -chartdir $eximstatsdir main.log > $eximstatsdir/index.html
+			fi
 			if ! test -e no_report_mail -a "$EXIM_REPORT_WEEKLY_SEND" = yes; then mail -s "$(sed -n '2{p;q;}' < $report) ($(hostname))" postmaster < $report; fi
 			if test -f $report.gz; then old $report.gz; fi
 			gzip -f -9 $report



++++++ sysconfig.exim ++++++
--- exim/sysconfig.exim	2003-11-19 11:15:19.000000000 +0100
+++ exim/sysconfig.exim	2006-04-28 17:20:07.000000000 +0200
@@ -23,8 +23,16 @@
 ## Type:        yesno
 ## Default:     "no"
 # 
+# Create HTML reports (see the EXIM_REPORT_WEEKLY setting) in 
+# /srv/www/eximstats?
+# needs the eximstats-html package to be installed
+#
+EXIM_REPORT_WEEKLY_HTML="no"
+
+## Type:        yesno
+## Default:     "no"
+# 
 # Send the reports (see the EXIM_REPORT_WEEKLY setting) via mail to 
 # postmaster?
 #
 EXIM_REPORT_WEEKLY_SEND="no"
-


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)