package/exim: bump version to 4.89
PATCH 1/1 package/exim: bump version to 4.89
Rebased patch #0003, added uClibc compatibility patch.
Signed-off-by Bernd Kuhls <[email protected]>
--- ...ip-version-check-and-symlink-installation.patch | 11 +++++---- package/exim/0004-glibc.patch | 27 ++++++++++++++++++++++ package/exim/exim.hash | 2 +- package/exim/exim.mk | 4 ++-- 4 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 package/exim/0004-glibc.patch
package/exim/0003-Skip-version-check-and-symlink-installation.patch +6 -5
@@ -9,6 +9,8 @@ Inspired by: http://patch-tracker.debian.org/patch/series/view/exim4/4.76-2/35_install.dpatch Signed-off-by: Luca Ceresoli <[email protected]> +(rebased against exim 4.89) +Signed-off-by: Bernd Kuhls <[email protected]> --- scripts/exim_install | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
@@ -17,7 +19,7 @@ diff --git a/scripts/exim_install b/scripts/exim_install index e68e7d5..487a4e1 100755 --- a/scripts/exim_install +++ b/scripts/exim_install -@@ -59,6 +59,8 @@ while [ $# -gt 0 ] ; do +@@ -58,6 +58,8 @@ shift done
@@ -26,15 +28,14 @@ index e68e7d5..487a4e1 100755 # Get the values of BIN_DIRECTORY, CONFIGURE_FILE, INFO_DIRECTORY, NO_SYMLINK, # SYSTEM_ALIASES_FILE, and EXE from the global Makefile (in the build # directory). EXE is empty except in the Cygwin environment. In each case, keep -@@ -218,8 +220,9 @@ while [ $# -gt 0 ]; do +@@ -217,9 +219,7 @@ # The exim binary is handled specially if [ $name = exim${EXE} ]; then -- version=exim-`./exim -bV -C /dev/null | \ +- exim="./exim -bV -C /dev/null" +- version=exim-`$exim 2>/dev/null | \ - awk '/Exim version/ { OFS=""; print $3,"-",substr($4,2,length($4)-1) }'`${EXE} + version=exim -+# version=exim-`./exim -bV -C /dev/null | \ -+# awk '/Exim version/ { OFS=""; print $3,"-",substr($4,2,length($4)-1) }'`${EXE} if [ "${version}" = "exim-${EXE}" ]; then echo $com ""
package/exim/0004-glibc.patch new file +27 -0
@@ -0,0 +1,27 @@ +uClibc does not contain gnu/libc-version.h + +Patch sent upstream: https://bugs.exim.org/show_bug.cgi?id=2070 + +Signed-off-by: Bernd Kuhls <[email protected]> + +diff -uNr exim-4.88.org/src/exim.c exim-4.88/src/exim.c +--- exim-4.88.org/src/exim.c 2016-12-18 15:02:28.000000000 +0100 ++++ exim-4.88/src/exim.c 2016-12-26 12:12:57.000000000 +0100 +@@ -12,7 +12,7 @@ + + #include "exim.h" + +-#ifdef __GLIBC__ ++#if defined(__GLIBC__) && !defined(__UCLIBC__) + # include <gnu/libc-version.h> + #endif + +@@ -1044,7 +1044,7 @@ + fprintf(f, "Compiler: <unknown>\n"); + #endif + +-#ifdef __GLIBC__ ++#if defined(__GLIBC__) && !defined(__UCLIBC__) + fprintf(f, "Library version: Glibc: Compile: %d.%d\n", + __GLIBC__, __GLIBC_MINOR__); + if (__GLIBC_PREREQ(2, 1))
package/exim/exim.hash +1 -1
@@ -1,2 +1,2 @@ # Locally calculated -sha256 d4b7994c89240d2f9a9fcd7a2dffa4b72f14379001a24266f4dbb0fbe5131514 exim-4.87.1.tar.bz2 +sha256 912f2ee03c8dba06a3a4c0ee40522d367e1b65dc59e38dfcc1f5d9eecff51ab0 exim-4.89.tar.bz2
package/exim/exim.mk +2 -2
@@ -4,9 +4,9 @@ # ################################################################################ -EXIM_VERSION = 4.87.1 +EXIM_VERSION = 4.89 EXIM_SOURCE = exim-$(EXIM_VERSION).tar.bz2 -EXIM_SITE = ftp://ftp.exim.org/pub/exim/exim4/old +EXIM_SITE = ftp://ftp.exim.org/pub/exim/exim4 EXIM_LICENSE = GPLv2+ EXIM_LICENSE_FILES = LICENCE EXIM_DEPENDENCIES = pcre berkeleydb host-pkgconf
Signature · 1 line
2.11.0
PATCH 1/1 package/exim: bump version to 4.89
Hello,
Quoted 3 lines · Bernd Kuhls
Rebased patch #0003, added uClibc compatibility patch.
Signed-off-by Bernd Kuhls <[email protected]>
I've applied, but I have a request below.
package/exim/exim.mk line 9
Quoted 2 lines
package/exim/exim.mk +1
-1-EXIM_SITE = ftp://ftp.exim.org/pub/exim/exim4/old +EXIM_SITE = ftp://ftp.exim.org/pub/exim/exim4
Could you get in touch with upstream, and ask them to stop moving tarballs? This is *really* annoying for things like Buildroot.
Currently, 4.89 is in ftp://ftp.exim.org/pub/exim/exim4, but as soon as they will release 4.90 (or whatever is the next version), they will move the 4.89 tarball to ftp://ftp.exim.org/pub/exim/exim4/old/. This is really really bad to make downloads reproducible on the long run.
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com