Merge branch '3.0' into 3.1

This commit is contained in:
Fredrik Rinnestam 2014-05-28 19:37:29 +02:00
commit 5c88e23a73
4 changed files with 9 additions and 9 deletions

View File

@ -6,7 +6,7 @@ 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.82-1
lrwxrwxrwx root/root usr/bin/mailq -> ../sbin/exim-4.82.1-1
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man8/
-rw-r--r-- root/root usr/man/man8/exim.8.gz
@ -27,7 +27,7 @@ lrwxrwxrwx root/root usr/sbin/exim -> exim-4.82-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.82-1
lrwxrwxrwx root/root usr/sbin/sendmail -> exim-4.82.1-1
drwxr-xr-x root/root var/
drwxr-xr-x root/root var/log/
drwxr-x--- mail/mail var/log/exim/

View File

@ -1,4 +1,4 @@
e00ba95600b51e47d8fedb0ed24d2bf3 exim
feb933baa4db773c2ef76b794c60b647 exim-4.82.tar.bz2
92fd6587c9c7c80ebc3bac6063943d90 exim-compile_number.patch
4544696ce6689ba9141a0697f25a74cb exim-4.82.1.tar.bz2
f01c2add107619cdd807ab388910edd3 exim-compile_number.patch
10b49e3305c2dda37d6d840f6f4280ee exim-config.patch

View File

@ -4,7 +4,7 @@
# Depends on: db openssl libpcre tcp_wrappers
name=exim
version=4.82
version=4.82.1
release=1
source=(ftp://ftp.exim.org/pub/exim/exim4/$name-$version.tar.bz2 \
$name $name-config.patch

View File

@ -10,12 +10,12 @@ diff -Nru exim-4.82.orig/OS/Makefile-Base exim-4.82/OS/Makefile-Base
@../scripts/reversion
cnumber.h: version.h
diff -Nru exim-4.82.orig/src/version.sh exim-4.82/src/version.sh
--- exim-4.82.orig/src/version.sh 2013-10-28 15:29:04.751427646 +0100
+++ exim-4.82/src/version.sh 2013-10-28 15:29:52.016435763 +0100
--- exim-4.82.1.orig/src/version.sh 2014-05-28 19:30:19.828197324 +0200
+++ exim-4.82.1/src/version.sh 2014-05-28 19:30:50.839265749 +0200
@@ -1,4 +1,4 @@
# automatically generated file - see ../scripts/reversion
EXIM_RELEASE_VERSION="4.82"
EXIM_VARIANT_VERSION=""
-EXIM_VARIANT_VERSION="_1-5b7a7c0-XX"
-EXIM_COMPILE_NUMBER="1"
+EXIM_VARIANT_VERSION=""
+EXIM_COMPILE_NUMBER="0"