Merge branch '3.0' into 3.1
This commit is contained in:
commit
ea06b4ca63
@ -13,8 +13,8 @@ drwxr-xr-x root/root usr/man/man8/
|
||||
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.82-1
|
||||
-rwsr-xr-x root/root usr/sbin/exim-4.82-1
|
||||
lrwxrwxrwx root/root usr/sbin/exim -> exim-4.82.1-1
|
||||
-rwsr-xr-x root/root usr/sbin/exim-4.82.1-1
|
||||
-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
|
||||
|
@ -1,4 +1,4 @@
|
||||
e00ba95600b51e47d8fedb0ed24d2bf3 exim
|
||||
4544696ce6689ba9141a0697f25a74cb exim-4.82.1.tar.bz2
|
||||
f01c2add107619cdd807ab388910edd3 exim-compile_number.patch
|
||||
6de7850fc2414e2195d2ee3b812d6d14 exim-compile_number.patch
|
||||
10b49e3305c2dda37d6d840f6f4280ee exim-config.patch
|
||||
|
@ -5,7 +5,7 @@
|
||||
|
||||
name=exim
|
||||
version=4.82.1
|
||||
release=1
|
||||
release=2
|
||||
source=(ftp://ftp.exim.org/pub/exim/exim4/$name-$version.tar.bz2 \
|
||||
$name $name-config.patch
|
||||
$name-compile_number.patch)
|
||||
|
@ -11,11 +11,11 @@ diff -Nru exim-4.82.orig/OS/Makefile-Base exim-4.82/OS/Makefile-Base
|
||||
|
||||
cnumber.h: version.h
|
||||
--- 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
|
||||
+++ exim-4.82.1/src/version.sh 2014-05-28 19:50:48.119490963 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
# automatically generated file - see ../scripts/reversion
|
||||
EXIM_RELEASE_VERSION="4.82"
|
||||
-EXIM_VARIANT_VERSION="_1-5b7a7c0-XX"
|
||||
-EXIM_COMPILE_NUMBER="1"
|
||||
+EXIM_VARIANT_VERSION=""
|
||||
+EXIM_VARIANT_VERSION=".1"
|
||||
+EXIM_COMPILE_NUMBER="0"
|
||||
|
Loading…
Reference in New Issue
Block a user