ports/core (3.2): [notify] exim: update to 4.87

crux at crux.nu crux at crux.nu
Thu Apr 7 12:13:45 UTC 2016


commit 32d711c85d4d006d2c6ddb2682d7c7623db05ada
Author: Juergen Daubert <jue at jue.li>
Date:   Thu Apr 7 13:58:47 2016 +0200

    [notify] exim: update to 4.87
    
    Note the following change in behaviour:
    
    JH/18 Bug 1709: When built with TLS support, the tls_advertise_hosts
          option now defaults to "*" (all hosts).  The variable is now
          available when not built with TLS, default unset, mainly to
          enable keeping the testuite sane.
          If a server certificate is not supplied (via tls_certificate)
          an error is logged, and clients will find TLS connections fail
          on startup.  Presumably they will retry in-clear.
    
          Packagers of Exim are strongly encouraged to create a server
          certificate at installation time.
    
    To follow that advice our rc-script creates the required certificate
    and the two variables tls_certificate and tls_privatekey are set in
    the configuration file.

diff --git a/exim/.footprint b/exim/.footprint
index 0ed33f9..9e44520 100644
--- a/exim/.footprint
+++ b/exim/.footprint
@@ -6,12 +6,11 @@ drwxr-xr-x	root/root	etc/rc.d/
 -rwxr-xr-x	root/root	etc/rc.d/exim
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
-lrwxrwxrwx	root/root	usr/bin/mailq -> ../sbin/exim-4.86.2-1
+lrwxrwxrwx	root/root	usr/bin/mailq -> ../sbin/exim
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/exicyclog
 -rwxr-xr-x	root/root	usr/sbin/exigrep
-lrwxrwxrwx	root/root	usr/sbin/exim -> exim-4.86.2-1
--rwsr-xr-x	root/root	usr/sbin/exim-4.86.2-1
+-rwsr-xr-x	root/root	usr/sbin/exim
 -rwxr-xr-x	root/root	usr/sbin/exim_checkaccess
 -rwxr-xr-x	root/root	usr/sbin/exim_dbmbuild
 -rwxr-xr-x	root/root	usr/sbin/exim_dumpdb
@@ -24,7 +23,7 @@ lrwxrwxrwx	root/root	usr/sbin/exim -> exim-4.86.2-1
 -rwxr-xr-x	root/root	usr/sbin/exiqgrep
 -rwxr-xr-x	root/root	usr/sbin/exiqsumm
 -rwxr-xr-x	root/root	usr/sbin/exiwhat
-lrwxrwxrwx	root/root	usr/sbin/sendmail -> exim-4.86.2-1
+lrwxrwxrwx	root/root	usr/sbin/sendmail -> exim
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man8/
diff --git a/exim/.md5sum b/exim/.md5sum
index cbef9d0..4e2f424 100644
--- a/exim/.md5sum
+++ b/exim/.md5sum
@@ -1,4 +1,3 @@
-d0022b47423fae3a46168e84ee0cc3df  exim
-1443a4a88d6b78ad9b6a681c51437b55  exim-4.86.2.tar.bz2
-f8232b63f2abfb86b4ae77a1db3d2c79  exim-compile_number.patch
-e0cb481dd114e6e7640342bacae1cbe5  exim-config.patch
+2e73c992dc8491a33f225efbe4da9e32  exim
+2effc2bd47ad2dc010f655c11a1b1173  exim-4.87.tar.bz2
+d007c183df359217bcfcbbebbf9d048f  exim-config.patch
diff --git a/exim/Pkgfile b/exim/Pkgfile
index 7c59117..33b6430 100644
--- a/exim/Pkgfile
+++ b/exim/Pkgfile
@@ -4,23 +4,22 @@
 # Depends on:  db openssl libpcre
 
 name=exim
-version=4.86.2
-release=2
+version=4.87
+release=1
 source=(ftp://ftp.exim.org/pub/exim/exim4/$name-$version.tar.bz2 \
-        $name $name-config.patch
-        $name-compile_number.patch)
+        $name $name-config.patch)
 
 build() {
     cd $name-$version
 
-    patch -p1 -i $SRC/$name-compile_number.patch
-
     sed "s/#CFLAGS#/$CFLAGS/" $SRC/$name-config.patch | patch -p1
     cp src/EDITME Local/Makefile
 
     make -j1
     make DESTDIR=$PKG install
 
+    mv $PKG/usr/sbin/{$name-$version-?,$name}
+
     install -D -m 755 $SRC/exim $PKG/etc/rc.d/exim
     install -D -m 644 doc/exim.8 $PKG/usr/share/man/man8/exim.8
 
@@ -31,6 +30,6 @@ build() {
     chown mail:mail $PKG/var/log/exim/*
     chmod 640 $PKG/var/log/exim/*
 
-    ln -sf $name-$version-1 $PKG/usr/sbin/sendmail
-    ln -sf ../sbin/$name-$version-1 $PKG/usr/bin/mailq
+    ln -sf $name $PKG/usr/sbin/sendmail
+    ln -sf ../sbin/$name $PKG/usr/bin/mailq
 }
diff --git a/exim/exim b/exim/exim
index ef9b9a4..50ee486 100644
--- a/exim/exim
+++ b/exim/exim
@@ -8,8 +8,15 @@ PROG=/usr/sbin/exim
 PID=/var/run/exim.pid
 OPTS="-bd -q15m"
 
+CRT=/etc/ssl/certs/exim.crt
+KEY=/etc/ssl/keys/exim.key
+
 case $1 in
 start)
+	if [ ! -s $CRT -o ! -s $KEY ]; then 
+		/usr/bin/mksslcert $KEY $CRT
+		chown mail $CRT $KEY
+	fi
 	$SSD --start --pidfile $PID --exec $PROG -- $OPTS
 	;;
 stop)
diff --git a/exim/exim-compile_number.patch b/exim/exim-compile_number.patch
deleted file mode 100644
index 41275a0..0000000
--- a/exim/exim-compile_number.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nru exim-4.86.orig/OS/Makefile-Base exim-4.86/OS/Makefile-Base
---- exim-4.86.orig/OS/Makefile-Base	2015-07-27 09:39:41.642108689 +0200
-+++ exim-4.86/OS/Makefile-Base	2015-07-27 09:41:21.145237745 +0200
-@@ -481,7 +481,7 @@
- 
- # Update Exim's version information and build the version object.
- 
--version.h::
-+version.h:
- 	@../scripts/reversion
- 
- cnumber.h: version.h
-diff -Nru exim-4.86.orig/src/version.sh exim-4.86/src/version.sh
---- exim-4.86.orig/src/version.sh	2015-07-27 09:39:41.645441903 +0200
-+++ exim-4.86/src/version.sh	2015-07-27 09:41:21.145237745 +0200
-@@ -1,4 +1,4 @@
- # automatically generated file - see ../scripts/reversion
- EXIM_RELEASE_VERSION=4.86
--EXIM_VARIANT_VERSION=_2
-+EXIM_VARIANT_VERSION=.2
- EXIM_COMPILE_NUMBER=0
diff --git a/exim/exim-config.patch b/exim/exim-config.patch
index 3a983e7..fb28233 100644
--- a/exim/exim-config.patch
+++ b/exim/exim-config.patch
@@ -1,6 +1,6 @@
-diff -Nru exim-4.86.2.orig/src/EDITME exim-4.86.2/src/EDITME
---- exim-4.86.2.orig/src/EDITME	2016-03-13 12:36:10.099306370 +0100
-+++ exim-4.86.2/src/EDITME	2016-03-13 12:37:02.604031333 +0100
+diff -Nru exim-4.87.orig/src/EDITME exim-4.87/src/EDITME
+--- exim-4.87.orig/src/EDITME	2016-04-07 13:13:37.489879288 +0200
++++ exim-4.87/src/EDITME	2016-04-07 13:13:56.162537206 +0200
 @@ -72,7 +72,7 @@
  # this would be wanted.
  ###############################################################################
@@ -46,7 +46,7 @@ diff -Nru exim-4.86.2.orig/src/EDITME exim-4.86.2/src/EDITME
  # SUPPORT_MAILSTORE=yes
  # SUPPORT_MBX=yes
  
-@@ -296,8 +296,8 @@
+@@ -301,8 +301,8 @@
  LOOKUP_LSEARCH=yes
  LOOKUP_DNSDB=yes
  
@@ -57,7 +57,7 @@ diff -Nru exim-4.86.2.orig/src/EDITME exim-4.86.2/src/EDITME
  # LOOKUP_IBASE=yes
  # LOOKUP_LDAP=yes
  # LOOKUP_MYSQL=yes
-@@ -373,7 +373,7 @@
+@@ -380,7 +380,7 @@
  # files are defaulted in the OS/Makefile-Default file, but can be overridden in
  # local OS-specific make files.
  
@@ -66,7 +66,7 @@ diff -Nru exim-4.86.2.orig/src/EDITME exim-4.86.2/src/EDITME
  
  
  #------------------------------------------------------------------------------
-@@ -628,14 +628,14 @@
+@@ -618,14 +618,14 @@
  # included in the Exim binary. You will then need to set up the run time
  # configuration to make use of the mechanism(s) selected.
  
@@ -83,7 +83,7 @@ diff -Nru exim-4.86.2.orig/src/EDITME exim-4.86.2/src/EDITME
  # AUTH_SPA=yes
  # AUTH_TLS=yes
  
-@@ -740,10 +740,10 @@
+@@ -730,10 +730,10 @@
  # leave these settings commented out.
  
  # This setting is required for any TLS support (either OpenSSL or GnuTLS)
@@ -96,7 +96,7 @@ diff -Nru exim-4.86.2.orig/src/EDITME exim-4.86.2/src/EDITME
  # TLS_LIBS=-lssl -lcrypto
  
  # Uncomment the first and either the second or the third of these if you
-@@ -822,7 +822,7 @@
+@@ -812,7 +812,7 @@
  # %s. This will be replaced by one of the strings "main", "panic", or "reject"
  # to form the final file names. Some installations may want something like this:
  
@@ -105,7 +105,7 @@ diff -Nru exim-4.86.2.orig/src/EDITME exim-4.86.2/src/EDITME
  
  # which results in files with names /var/log/exim_mainlog, etc. The directory
  # in which the log files are placed must exist; Exim does not try to create
-@@ -871,7 +871,7 @@
+@@ -861,7 +861,7 @@
  # files. Both the name of the command and the suffix that it adds to files
  # need to be defined here. See also the EXICYCLOG_MAX configuration.
  
@@ -114,7 +114,7 @@ diff -Nru exim-4.86.2.orig/src/EDITME exim-4.86.2/src/EDITME
  COMPRESS_SUFFIX=gz
  
  
-@@ -886,7 +886,7 @@
+@@ -876,7 +876,7 @@
  # ZCAT_COMMAND=zcat
  #
  # Or specify the full pathname:
@@ -123,7 +123,7 @@ diff -Nru exim-4.86.2.orig/src/EDITME exim-4.86.2/src/EDITME
  
  #------------------------------------------------------------------------------
  # Compiling in support for embedded Perl: If you want to be able to
-@@ -997,7 +997,7 @@
+@@ -1013,7 +1013,7 @@
  #
  # USE_TCP_WRAPPERS=yes
  # CFLAGS=-O -I/usr/local/include
@@ -132,7 +132,7 @@ diff -Nru exim-4.86.2.orig/src/EDITME exim-4.86.2/src/EDITME
  #
  # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
  # as well.
-@@ -1030,7 +1030,7 @@
+@@ -1046,7 +1046,7 @@
  # aliases). The following setting can be changed to specify a different
  # location for the system alias file.
  
@@ -141,7 +141,7 @@ diff -Nru exim-4.86.2.orig/src/EDITME exim-4.86.2/src/EDITME
  
  
  #------------------------------------------------------------------------------
-@@ -1059,7 +1059,7 @@
+@@ -1075,7 +1075,7 @@
  #------------------------------------------------------------------------------
  # Uncomment this setting to include IPv6 support.
  
@@ -150,7 +150,7 @@ diff -Nru exim-4.86.2.orig/src/EDITME exim-4.86.2/src/EDITME
  
  ###############################################################################
  #              THINGS YOU ALMOST NEVER NEED TO MENTION                        #
-@@ -1080,13 +1080,13 @@
+@@ -1096,13 +1096,13 @@
  # haven't got Perl, Exim will still build and run; you just won't be able to
  # use those utilities.
  
@@ -171,7 +171,7 @@ diff -Nru exim-4.86.2.orig/src/EDITME exim-4.86.2/src/EDITME
  
  
  #------------------------------------------------------------------------------
-@@ -1286,7 +1286,7 @@
+@@ -1304,7 +1304,7 @@
  # (process id) to a file so that it can easily be identified. The path of the
  # file can be specified here. Some installations may want something like this:
  
@@ -180,10 +180,10 @@ diff -Nru exim-4.86.2.orig/src/EDITME exim-4.86.2/src/EDITME
  
  # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
  # using the name "exim-daemon.pid".
-diff -Nru exim-4.86.2.orig/src/configure.default exim-4.86.2/src/configure.default
---- exim-4.86.2.orig/src/configure.default	2016-03-13 12:36:10.099306370 +0100
-+++ exim-4.86.2/src/configure.default	2016-03-13 12:36:24.978759386 +0100
-@@ -54,7 +54,7 @@
+diff -Nru exim-4.87.orig/src/configure.default exim-4.87/src/configure.default
+--- exim-4.87.orig/src/configure.default	2016-04-07 13:13:37.486546075 +0200
++++ exim-4.87/src/configure.default	2016-04-07 13:16:39.806618024 +0200
+@@ -55,7 +55,7 @@
  # +local_domains, +relay_to_domains, and +relay_from_hosts, respectively. They
  # are all colon-separated lists:
  
@@ -192,3 +192,23 @@ diff -Nru exim-4.86.2.orig/src/configure.default exim-4.86.2/src/configure.defau
  domainlist relay_to_domains =
  hostlist   relay_from_hosts = localhost
  # (We rely upon hostname resolution working for localhost, because the default
+@@ -150,8 +150,8 @@
+ # need the first setting, or in separate files, in which case you need both
+ # options.
+ 
+-# tls_certificate = /etc/ssl/exim.crt
+-# tls_privatekey = /etc/ssl/exim.pem
++tls_certificate = /etc/ssl/certs/exim.crt
++tls_privatekey = /etc/ssl/keys/exim.key
+ 
+ # In order to support roaming users who wish to send email from anywhere,
+ # you may want to make Exim listen on other ports as well as port 25, in
+@@ -165,7 +165,7 @@
+ # daemon_smtp_ports = 25 : 465 : 587
+ # tls_on_connect_ports = 465
+ 
+-
++asdad
+ # Specify the domain you want to be added to all unqualified addresses
+ # here. An unqualified address is one that does not contain an "@" character
+ # followed by a domain. For example, "caesar at rome.example" is a fully qualified



More information about the CRUX mailing list