[PATCH] Makefile: Handle broken curl version number in version check
- From
Tom G. Christensen <tgc@statsbiblioteket.dk>
- Date
- Jan 30, 2015, 09:52 UTC
- Message-ID
- <1422611554-15393-1-git-send-email-tgc@statsbiblioteket.dk>
- In-Reply-To
- <54CA2E84.6090604@statsbiblioteket.dk>
curl 7.11.0 through 7.12.2 when built from their official release archives will present a 5 digit version number instead of the documented 6 digits which breaks the version check in the Makefile. Correct these broken version numbers on the fly when extracting them to ensure the comparison works correctly.
Signed-off-by: Tom G. Christensen <tgc@statsbiblioteket.dk> ---
This was discoved while building on RHEL4 which has curl 7.12.1. The makefile check for curl >= 7.34.0 failed and enabled USE_CURL_FOR_IMAP_SEND.
# curl-config --vernum 70C01 # { echo 072200; curl-config --vernum 2>/dev/null ; } | sort -r | sed -ne 2p 072200 #
I checked the curl release tarballs and this problem seems to exist for curl 7.11.0 (0x70B00) through 7.12.2 (0x70C02). In both 7.10.7 (0x070a07) and 7.12.3 (0x070c03) the version is correctly set using 6 hex digits as documented. I tried to verify this using the official curl repo on github but it does not seem to record this discrepancy and shows the correct 6 digit version numbers for the affected releases.
Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile index c44eb3a..69a2ce3 100644 --- a/Makefile +++ b/Makefile @@ -1035,13 +1035,13 @@ else REMOTE_CURL_NAMES = $(REMOTE_CURL_PRIMARY) $(REMOTE_CURL_ALIASES) PROGRAM_OBJS += http-fetch.o PROGRAMS += $(REMOTE_CURL_NAMES) - curl_check := $(shell (echo 070908; curl-config --vernum) 2>/dev/null | sort -r | sed -ne 2p) + curl_check := $(shell (echo 070908; curl-config --vernum | sed -e '/^70[B-C]/ s/^7/07/') 2>/dev/null | sort -r | sed -ne 2p) ifeq "$(curl_check)" "070908" ifndef NO_EXPAT PROGRAM_OBJS += http-push.o endif endif - curl_check := $(shell (echo 072200; curl-config --vernum) 2>/dev/null | sort -r | sed -ne 2p) + curl_check := $(shell (echo 072200; curl-config --vernum | sed -e '/^70[B-C]/ s/^7/07/') 2>/dev/null | sort -r | sed -ne 2p) ifeq "$(curl_check)" "072200" USE_CURL_FOR_IMAP_SEND = YesPlease endif
-- 2.2.2