patch 8.0.0240: failure with one build on CI

Problem:    The clang build on CI fails with one configuration.
Solution:   Redo a previous patch that was accidentally reverted.

diff --git a/.travis.yml b/.travis.yml
index 73aac5a5d2dfdc93a528ed0d5192c94140407835..44e320c27cbce673544b9db2ae0cc121ebbd7cc8 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -75,8 +75,10 @@ addons:
       - cscope
 
 before_install:
-  - pip install --user cpp-coveralls
-  - pip install --user requests[security]
+  - if [ "$COVERAGE" = "yes" ]; then pip install --user cpp-coveralls; fi
+    # needed for https support for coveralls
+    # building cffi only works with gcc, not with clang
+  - if [ "$COVERAGE" = "yes" ]; then CC=gcc pip install --user pyopenssl ndg-httpsclient pyasn1; fi
     # Lua is not installed on Travis OSX
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install lua; export LUA_PREFIX=/usr/local; fi
 

diff --git a/src/version.c b/src/version.c
index 36dbe3a54c6dbc459fc2c89c4bdd71580561f575..4e416171944ec4107116d9e8d433493af7e47d3c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    240,
 /**/
     239,
 /**/