From 281778418039bda9b494a9acd3589f37c8a7aa14 Mon Sep 17 00:00:00 2001 From: "alexis.lagoutte@gmail.com" Date: Fri, 25 Mar 2016 13:02:31 +0000 Subject: [PATCH 1/6] Travis: move to (Ubuntu) Trusty (14.04) FossilOrigin-Name: ee4cd629935831bebbdadd5007ca66c3f061b44e69c27359fe896437f107570a --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 866ff2e7..fc29f8a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ compiler: - clang - gcc sudo: require +dist: trusty addons: apt: sources: From 7e547398cec4568c3271216600195a262664ac9e Mon Sep 17 00:00:00 2001 From: "alexis.lagoutte@gmail.com" Date: Fri, 25 Mar 2016 14:05:09 +0000 Subject: [PATCH 2/6] .travis.yml: Update build step after some change on build system FossilOrigin-Name: a2def5fe12bff34332c43d029a1acca8e7c5c4d36a29ef031eb263be983c394d --- .travis.yml | 36 ++++++++++-------------------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/.travis.yml b/.travis.yml index fc29f8a2..995166e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,31 +4,17 @@ compiler: - gcc sudo: require dist: trusty -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.9 - - libstdc++-4.9-dev - - autoconf - - automake - - autotools-dev - - libtool - - libgmp-dev - - libconfuse-dev - - lua5.1 - - liblua5.1-0-dev -# No yet whitelisted for Travis -# - libgnutls28-dev -# - libnl-3-dev -# - libnl-genl-3-dev before_install: + - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test + - sudo apt-get update -qq + - sudo apt-get -qq install g++-4.9 libstdc++-4.9-dev + - sudo apt-get -qq install cmake lua5.2 libnl-genl-3-dev + - sudo apt-get -qq install nettle-dev libgnutls28-dev libssl-dev + - sudo apt-get -qq install libconfuse-dev libsqlite3-dev - $CC --version - if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi - $CC --version - $CXX --version - - sudo apt-get install libgnutls28-dev libnl-genl-3-dev libnl-3-dev before_script: - cd src/contrib - sudo ./install_libuci.sh @@ -36,14 +22,12 @@ before_script: - make - cd .. - cd .. + - cd .. script: - - cd capwap - make + - cd src + - cd ac + - ./actube & - cd .. - cd wtp - - make - ./wtp & - - cd .. - - cd ac - - make - - ./actube & From f209e9e1783b152798d0b67c79887014ffd5ead1 Mon Sep 17 00:00:00 2001 From: "alexis.lagoutte@gmail.com" Date: Fri, 25 Mar 2016 14:13:45 +0000 Subject: [PATCH 3/6] Travis: don't need to build jsmn before FossilOrigin-Name: bfbc54df80cf9574e431edfa3b831ef4d2dc492cc07f00ffa26c9f8a3441b36b --- .travis.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 995166e2..f0e583e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,14 +15,6 @@ before_install: - if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi - $CC --version - $CXX --version -before_script: - - cd src/contrib - - sudo ./install_libuci.sh - - cd jsmn - - make - - cd .. - - cd .. - - cd .. script: - make - cd src From bef4687d08291ba8d7c97248bf9b5a96c46a3abb Mon Sep 17 00:00:00 2001 From: "alexis.lagoutte@gmail.com" Date: Fri, 25 Mar 2016 15:15:58 +0000 Subject: [PATCH 4/6] =?UTF-8?q?GCC:=20fix=20type=20of=20=E2=80=98rc?= =?UTF-8?q?=E2=80=99=20defaults=20to=20=E2=80=98int=E2=80=99=20[-Werror=3D?= =?UTF-8?q?implicit-int]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit FossilOrigin-Name: 52a3b3ebac9e798f775d56fc2c24cc70477c316ec35e32477380d6044ac63d19 --- src/cw/capwap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cw/capwap.h b/src/cw/capwap.h index ed44bdab..fe25c456 100644 --- a/src/cw/capwap.h +++ b/src/cw/capwap.h @@ -626,7 +626,7 @@ extern struct cw_strlist_elem mbag_item_strings[]; #define cw_strerror(rc) cw_strrc(rc) */ -static inline const char * cw_strerror(rc) { +static inline const char * cw_strerror(int rc) { if (rc<0){ if (errno==EAGAIN) return "Timed out"; From 4c4bbf1c9e3af2d2ae00536ac6aa4d9f7e516861 Mon Sep 17 00:00:00 2001 From: "alexis.lagoutte@gmail.com" Date: Fri, 25 Mar 2016 15:25:26 +0000 Subject: [PATCH 5/6] =?UTF-8?q?GCC:=20fix=20variable=20=E2=80=98w=E2=80=99?= =?UTF-8?q?=20set=20but=20not=20used=20[-Wunused-but-set-variable]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit FossilOrigin-Name: 79741d43da6831444e1d6321c02d3ffe3e2e24c606ff74fd9765ba89052bdcab --- src/cw/dtls_openssl.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/cw/dtls_openssl.c b/src/cw/dtls_openssl.c index 979a2d4d..c840302e 100644 --- a/src/cw/dtls_openssl.c +++ b/src/cw/dtls_openssl.c @@ -72,9 +72,6 @@ static void dtls_debug_cb(int write_p,int version,int type, const void * buf,siz static void dtls_info_cb (const SSL *ssl, int where, int ret) { const char *str = NULL; - int w; - - w = where & ~SSL_ST_MASK; str = where & SSL_ST_CONNECT ? "connect" : where & SSL_ST_ACCEPT ? "accept" : "undefined"; if (where & SSL_CB_LOOP) From b951b817efbd0349edca7ab15d41988e8cb363a8 Mon Sep 17 00:00:00 2001 From: "alexis.lagoutte@gmail.com" Date: Fri, 25 Mar 2016 15:28:04 +0000 Subject: [PATCH 6/6] =?UTF-8?q?GCC:=20fix=20format=5Fis=5Futf8.c:36:9:=20w?= =?UTF-8?q?arning:=20variable=20=E2=80=98j=E2=80=99=20set=20but=20not=20us?= =?UTF-8?q?ed=20[-Wunused-but-set-variable]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit FossilOrigin-Name: b8df4fd31ebce957b6ef1c5101447df3439a1a90c0aa33aefe30a220107f6154 --- src/cw/format_is_utf8.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/cw/format_is_utf8.c b/src/cw/format_is_utf8.c index b36ff7e1..724b508b 100644 --- a/src/cw/format_is_utf8.c +++ b/src/cw/format_is_utf8.c @@ -33,11 +33,9 @@ int format_is_utf8(unsigned char *str, size_t len) { size_t i = 0; - size_t j = 0; size_t bytes = 0; while (i < len) { - j = i; if (str[i] < 0x20) { return 0; }