Commit ccae36d3 authored by Drake Arconis's avatar Drake Arconis
Browse files

Merge vendor to default

parents fcf6bda9 80e40352
41200dc552abd040ad718e2089843f8052e31b04 current
41200dc552abd040ad718e2089843f8052e31b04 1.36.0
......@@ -16,6 +16,7 @@ github issues [2].
187j3x1
Alek Storm
Alex Nalivko
Alexandros Konstantinakis-Karmis
Alexis La Goutte
Amir Pakdel
Anders Bakken
......@@ -25,27 +26,33 @@ Angus Gratton
Anna Henningsen
Ant Bryan
Benedikt Christoph Wolters
Benedikt Christoph Wolters
Benjamin Peterson
Bernard Spil
Bernard Spil
Brendan Heinonen
Brian Card
Brian Suh
Daniel Evers
Daniel Stenberg
Dave Reisner
David Beitey
David Weekly
Dmitriy Vetutnev
Don
Dylan Plecki
Etienne Cimon
Fabian Möller
Fabian Wiesel
Gabi Davar
Gitai
Google Inc.
Jacob Champion
Jan Kundrát
Jan-E
Janusz Dziemidowicz
Jay Satiro
Jianqing Wang
Jim Morrison
Josh Braegger
José F. Calcerrada
Kamil Dudka
Kazuho Oku
......@@ -53,20 +60,25 @@ Kenny (kang-yen) Peng
Kenny Peng
Kit Chan
Kyle Schomp
LazyHamster
Lucas Pardue
MATSUMOTO Ryosuke
Marc Bachmann
Matt Rudary
Matt Way
Mike Conlen
Mike Frysinger
Mike Lothian
Nicholas Hurley
Nora Shoemaker
Pedro Santos
Peeyush Aggarwal
Peter Wu
Piotr Sikora
Raul Gutierrez Segales
Remo E
Reza Tavakoli
Rick Lei
Ross Smith II
Scott Mitchell
Sebastiaan Deckers
......@@ -80,11 +92,13 @@ Syohei YOSHIDA
Tapanito
Tatsuhiko Kubo
Tatsuhiro Tsujikawa
Tobias Geerinckx-Rice
Tom Harwood
Tomasz Buchert
Tomasz Torcz
Vernon Tang
Viacheslav Biriukov
Viktor Szakats
Viktor Szépe
Wenfeng Liu
Xiaoguang Sun
......@@ -94,8 +108,10 @@ ayanamist
bxshi
clemahieu
dalf
dawg
es
fangdingjun
jwchoi
kumagi
lstefani
makovich
......
......@@ -24,15 +24,15 @@
cmake_minimum_required(VERSION 3.0)
# XXX using 1.8.90 instead of 1.9.0-DEV
project(nghttp2 VERSION 1.25.0)
project(nghttp2 VERSION 1.36.0)
# See versioning rule:
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
set(LT_CURRENT 28)
set(LT_REVISION 0)
set(LT_AGE 14)
set(LT_CURRENT 31)
set(LT_REVISION 1)
set(LT_AGE 17)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
include(Version)
math(EXPR LT_SOVERSION "${LT_CURRENT} - ${LT_AGE}")
......@@ -79,7 +79,7 @@ else()
set(ENABLE_PYTHON_BINDINGS_DEFAULT OFF)
endif()
find_package(LibXml2 2.7.7)
find_package(LibXml2 2.6.26)
set(WITH_LIBXML2_DEFAULT ${LIBXML2_FOUND})
find_package(Jemalloc)
set(WITH_JEMALLOC_DEFAULT ${JEMALLOC_FOUND})
......@@ -106,7 +106,7 @@ endif()
foreach(_build_type "Release" "MinSizeRel" "RelWithDebInfo")
foreach(_lang C CXX)
string(TOUPPER "CMAKE_${_lang}_FLAGS_${_build_type}" _var)
string(REGEX REPLACE "(^| )[/-]D *NDEBUG($| )" "" ${_var} "${${_var}}")
string(REGEX REPLACE "(^| )[/-]D *NDEBUG($| )" " " ${_var} "${${_var}}")
endforeach()
endforeach()
......@@ -117,7 +117,7 @@ else()
endif()
include(ExtractValidFlags)
foreach(_cxx1x_flag -std=c++11 -std=c++0x)
foreach(_cxx1x_flag -std=c++14)
extract_valid_cxx_flags(_cxx1x_flag_supported ${_cxx1x_flag})
if(_cxx1x_flag_supported)
set(CXX1XCXXFLAGS ${_cxx1x_flag})
......@@ -302,6 +302,7 @@ check_type_size("time_t" SIZEOF_TIME_T)
include(CheckFunctionExists)
check_function_exists(_Exit HAVE__EXIT)
check_function_exists(accept4 HAVE_ACCEPT4)
check_function_exists(mkostemp HAVE_MKOSTEMP)
include(CheckSymbolExists)
# XXX does this correctly detect initgroups (un)availability on cygwin?
......
......@@ -14,6 +14,8 @@ option(ENABLE_PYTHON_BINDINGS "Build Python bindings"
${ENABLE_PYTHON_BINDINGS_DEFAULT})
option(ENABLE_FAILMALLOC "Build failmalloc test program" ON)
option(ENABLE_LIB_ONLY "Build libnghttp2 only. This is a short hand for -DENABLE_APP=0 -DENABLE_EXAMPLES=0 -DENABLE_HPACK_TOOLS=0 -DENABLE_PYTHON_BINDINGS=0")
option(ENABLE_STATIC_LIB "Build libnghttp2 in static mode also")
option(ENABLE_SHARED_LIB "Build libnghttp2 as a shared library" ON)
option(WITH_LIBXML2 "Use libxml2"
${WITH_LIBXML2_DEFAULT})
......
commit 9a9ab0813cef6c2ee36bc9531e61a4f431d9bd6e (HEAD, tag: v1.25.0, origin/master, origin/HEAD, master)
commit e7e8ee5fe6e84ae3574c6eceab5efd7c251e98ed (HEAD, tag: v1.36.0, origin/master, origin/HEAD, master)
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2017-08-18
AuthorDate: 2019-01-18
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2017-08-18
CommitDate: 2019-01-18
Update bash_completion
commit b3b4e33535ac359be8826090b66846e5457d1dc5
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2019-01-18
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2019-01-18
Update manual pages
commit 0ccaaa48ce172470c46e37abed09d4fff7f27932
commit bd93d90a899a29c73909fc3bf43a8b3bdb0c0095
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2017-08-18
AuthorDate: 2019-01-18
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2017-08-18
CommitDate: 2019-01-18
Bump up version number to 1.25.0, LT revision to 28:0:14
Don't treat text as option if it matches -[0-9]
-[0-9] is valid option, but we don't use them so far and don't want to
mark integer -1 as option.
commit 3f2fe98dd1f69c4ce58d265168d2c67e48a9a8a4
commit ea69c84b3341c916a8088677f8028b8b4535c129
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2017-08-18
AuthorDate: 2019-01-18
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2017-08-18
CommitDate: 2019-01-18
Bump up version number to 1.36.0
commit 783b649bb1e13240f42d9401a5560a24c852086e
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2019-01-18
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2019-01-18
Update AUTHORS
commit 0d91e9c255134b46c1beb456003204b1824b7a8a
commit eb21e6f8f73cf037ad9004ed9f85be07901fbce4
Merge: 439dbce6 ab2aa567
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2017-08-18
AuthorDate: 2019-01-17
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2017-08-18
CommitDate: 2019-01-17
Update doc
Merge branch 'update-http-parser'
commit 4c53da696186f747fe9ef29a475a941b4a46a93a
Merge: 788835c5 eb306f46
commit ab2aa5672b8edde45bd4af0da514fa2f12ba5af0
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2017-08-13
Commit: GitHub <noreply@github.com>
CommitDate: 2017-08-13
AuthorDate: 2019-01-17
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2019-01-17
Merge pull request #983 from addaleax/static-rcbuf
Fix test failure
lib: add nghttp2_rcbuf_is_static()
Now http_parser_parse_url returns nonzero if empty URI is given.
commit eb306f463efea645de611de2bff0a8f823deb048
Author: Anna Henningsen <anna@addaleax.net>
AuthorDate: 2017-08-12
Commit: Anna Henningsen <anna@addaleax.net>
CommitDate: 2017-08-12
commit ff87a542025471d2ba7b92199758250d03293e59
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2019-01-17
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2019-01-17
lib: add nghttp2_rcbuf_is_static()
Add a `nghttp2_rcbuf_is_static()` method to tell whether a rcbuf
is statically allocated.
This can be useful for language bindings that wish to avoid
creating duplicate strings for these buffers; concretely, I am
planning to use this in the Node HTTP/2 module that is being
introduced.
Use http-parser 0d0a24e19eb5ba232d2ea8859aba2a7cc6c42bc4
commit 788835c5fd2f60a716b6128521c9b3da458f2c13
Merge: 92d686d3 4d76606f
commit 439dbce6793814f75203614f6a7bdeaca6e49825
Merge: 803d4ba9 e9c9838c
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2017-08-09
Commit: GitHub <noreply@github.com>
CommitDate: 2017-08-09
AuthorDate: 2019-01-14
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2019-01-14
Merge branch 'nghttpx-h1-connection-pool-per-addr'
commit e9c9838cdc86d4e141435a2a8620c0d955cdf818
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2019-01-11
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2019-01-14
Merge pull request #980 from nghttp2/fix-forwarded-for-with-proxyprotocol
nghttpx: Pool h1 backend connection per address
Fix bug that forwarded for is not affected by proxy protocol
Pool HTTP/1.1 backend connection per address and reuse it only when
the next round robin index refers to this address. Previously if
there is a pooled connection, there is no round robin selection.
commit 4d76606fa269a1af5ab5eff3e9c50e7652cb134f
commit 803d4ba948430c8b3e9af0ac0d742b0a2b681c2f
Merge: 732245e5 fdcdb21c
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2017-08-09
AuthorDate: 2019-01-14
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2017-08-09
CommitDate: 2019-01-14
Fix bug that forwarded for is not affected by proxy protocol
Merge branch 'nghttpx-randomize-roundrobin-order'
commit 92d686d356f42ce048874f4af78522e694b19e56
Merge: 0f69e9c8 217d9794
commit 732245e562bdc868b0d44de2fb3429ed61c3ba05
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2017-07-28
AuthorDate: 2019-01-12
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2017-07-28
CommitDate: 2019-01-12
Merge branch 'mruby-1.3.0'
make clang-format
commit 0f69e9c8251e44ffefacc1b24cc49e45f1187ebe
commit 9e8d5433e7aebf7084161e673a110d3553530537
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2017-07-28
AuthorDate: 2019-01-12
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2017-07-28
CommitDate: 2019-01-12
Fix typo
Use clang-format-7
commit 217d9794586d0ae85c0e7707b0719ea0c17d0a49
commit fdcdb21c38ef7acf23853d47d1dc5bda69d5398f
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2017-07-09
AuthorDate: 2019-01-11
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2017-07-28
CommitDate: 2019-01-11
Update mruby to 1.3.0
Fix compile error with mruby 1.3.0
nghttpx: Randomize backend address round robin order per thread
commit cc289972fc809ee7216a970314dcc8eabcae881a
Merge: 1002c6da c601e603
commit 11d0533cfcb3d3230fbad8db56efb0387e46a621
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2017-07-15
AuthorDate: 2019-01-05
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2019-01-05
nghttpx: Ensure that cert serial does not exceed 20 bytes
commit dbb5f00d685894275d7e7e4ccd0fff0793d0d776
Merge: 9cc412e2 5b2efc0a
Author: Tatsuhiro Tsujikawa <404610+tatsuhiro-t@users.noreply.github.com>
AuthorDate: 2019-01-05
Commit: GitHub <noreply@github.com>
CommitDate: 2019-01-05
Merge pull request #1287 from rckclmbr/fix_serial_size
Fix getting long serial numbers for openssl < 1.1
commit 9cc412e2fd4fbda089d0da7a678c2682449b87dd
Merge: 082e162f 7e4c48a4
Author: Tatsuhiro Tsujikawa <404610+tatsuhiro-t@users.noreply.github.com>
AuthorDate: 2019-01-05
Commit: GitHub <noreply@github.com>
CommitDate: 2017-07-15
CommitDate: 2019-01-05
Merge pull request #1285 from staticinvocation/master
Add a CMake option to disable shared library
Merge pull request #958 from sebdeckers/patch-1
commit 5b2efc0a128102b165a8a62581a1ab3ec4ca675d
Author: Josh Braegger <jbraeg@fb.com>
AuthorDate: 2019-01-03
Commit: Josh Braegger <jbraeg@fb.com>
CommitDate: 2019-01-03
Fix getting long serial numbers for openssl < 1.1
From https://www.ietf.org/rfc/rfc5280.txt
> As noted in Section 4.1.2.2, serial numbers can be expected to
> contain long integers. Certificate users MUST be able to handle
> serialNumber values up to 20 octets in length. Conforming CAs MUST
> NOT use serialNumber values longer than 20 octets.
Without this, nghttpx will fatal.
jbraeg$ openssl x509 -in ~/test_certs/client.crt -serial -noout
serial=E0CFDFC7CEA10DF8AAF715C37FAEB410
fix: typo
jbraeg$ curl -k --key ~/test_certs/client.key --cert ~/test_certs/client.crt https://192.168.98.100:3000/; echo
curl: (56) Unexpected EOF
...
Assertion failed: n == b.size() (shrpx_tls.cc: get_x509_serial: 2051)
2019-01-03T20:25:21.289Z 1 1 f84316ae NOTICE (shrpx_log.cc:895) Worker process: [9] exited abnormally with status 0x06; exit status 0; signal Aborted(6)
2019-01-03T20:25:21.290Z 1 1 f84316ae NOTICE (shrpx.cc:4311) Shutdown momentarily
commit 7e4c48a461482275b4964ee7e0becdc6c55abf3c
Author: Brendan Heinonen <brendan@heinonen.co>
AuthorDate: 2018-12-27
Commit: Brendan Heinonen <brendan@heinonen.co>
CommitDate: 2018-12-27
commit c601e603c26673daeb8150226d50fb385ef4aa6c
Author: Sebastiaan Deckers <sebdeckers83@gmail.com>
AuthorDate: 2017-07-15
Disable shared library if ENABLE_SHARED_LIB is OFF
Signed-off-by: Brendan Heinonen <brendan@heinonen.co>
commit 082e162f3ca69282c2566fe52d8b943a11b2f38f
Merge: c78abbe1 7cc7c06c
Author: Tatsuhiro Tsujikawa <404610+tatsuhiro-t@users.noreply.github.com>
AuthorDate: 2018-12-26
Commit: GitHub <noreply@github.com>
CommitDate: 2017-07-15
CommitDate: 2018-12-26
fix: typo
Merge pull request #1282 from alagoutte/travis
Came up in downstream code review by @lucaslago https://github.com/nodejs/node/pull/14239#discussion_r127539852
Travis: Update to Xenial
commit 7cc7c06c7bab6d158e813be15efe9c722af2abb5
Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
AuthorDate: 2018-12-25
Commit: Alexis La Goutte <alexis.lagoutte@gmail.com>
CommitDate: 2018-12-26
commit 1002c6da1c13fe7f3ae8954b1b984cab4498778d
.travis(.yml): no longer need llvm-toolchain-trusty-7
clang-7 is enable by default
commit 12ebeb30d0fa36b8ede57b24c68484dc5049c4a4
Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
AuthorDate: 2018-12-25
Commit: Alexis La Goutte <alexis.lagoutte@gmail.com>
CommitDate: 2018-12-25
.travis(.yml): Update to Xenial
Xenial is now available with Travis CI
https://blog.travis-ci.com/2018-11-08-xenial-release
commit c78abbe1d268cf396b86ec79349f25e8d442ae07
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2018-12-26
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2018-12-26
Update mruby to 2.0.0
commit 124c7848c0cff3c3daab2b259424847e72d2252f
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2018-12-11
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2018-12-11
nghttpx: Add missing return
commit ce9667c4f5c0acc8ff94f8d98e18d4ed7c7d2f60
Merge: 302abf1b f3f40840
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2018-12-09
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2018-12-09
Merge branch 'nghttpx-fix-trailing-slash-handling'
commit f3f40840b3e0c50920edeab534046aabc6d0be9e
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2018-12-09
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2018-12-09
nghttpx: Fix broken trailing slash handling
nghttpx allows a pattern with trailing slash to match a request path
without it. Previously, under certain pattern registration, this does
not work.
commit 302abf1b46ec24b7db52f2f5ccc52c29dcc48556
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2018-11-23
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2018-11-23
h2load: Fix compile error with gcc
commit 089a03be4209ea26984baa9ce0236ebd42936e56
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2018-11-23
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2018-11-23
h2load: Write log file with write(2)
commit de4fe72861d39396c1b5658c37ec200cdea2eb4a
Merge: eb679253 d1b3a83f
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2017-07-12
AuthorDate: 2018-11-23
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2018-11-23
Merge branch 'pyos-master'
commit d1b3a83f5982f4da69c31302450fd13e8e2a13cb
Author: dawg <pyos100500@gmail.com>
AuthorDate: 2018-11-11
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2018-11-23
h2load: add an option to write per-request logs
commit eb6792533d0750edcfd431cafaa6740e026b37df
Merge: c98362ea 6800d317
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2018-11-23
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2018-11-23
Merge branch 'puscas-port_in_use'
commit 6800d317e7838bdfb17b2f9bfca20d3ed4331ee8
Author: Pedro Santos <pedro.vortix@gmail.com>
AuthorDate: 2018-11-11
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2017-07-12
CommitDate: 2018-11-23
src: Use llround instead of round
added access to the number of the current server port
commit 0911337689e237335c5549c9fd8cc27c7dd3dc06
commit c98362eab1e6d8de772b67448cde3bbbee058ed8
Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
AuthorDate: 2017-07-02
AuthorDate: 2018-11-23
Commit: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
CommitDate: 2017-07-02
CommitDate: 2018-11-23
Bump up version number to 1.25.0-DEV
Bump up version number to 1.36.0-DEV
......@@ -10,39 +10,47 @@
#
# $ sudo docker run -v /path/to/dest:/out nghttp2-android cp /root/build/nghttp2/src/nghttpx /out
FROM ubuntu:vivid
# Only use standalone-toolchain for reduce size
FROM ubuntu:xenial
MAINTAINER Tatsuhiro Tsujikawa
ENV ANDROID_HOME /root/android
ENV PREFIX $ANDROID_HOME/usr/local
ENV ANDROID_HOME /root
ENV TOOLCHAIN $ANDROID_HOME/toolchain
ENV PATH $TOOLCHAIN/bin:$PATH
# It would be better to use nearest ubuntu archive mirror for faster
# downloads.
# RUN sed -ie 's/archive\.ubuntu/jp.archive.ubuntu/g' /etc/apt/sources.list
ENV NDK_VERSION r14b
RUN apt-get update
# genisoimage, libc6-i386 and lib32stdc++6 are required to decompress ndk.
RUN apt-get install -y make binutils autoconf automake autotools-dev libtool \
pkg-config git curl dpkg-dev libxml2-dev \
genisoimage libc6-i386 lib32stdc++6
WORKDIR /root
RUN apt-get update && \
apt-get install -y unzip make binutils autoconf \
automake autotools-dev libtool pkg-config git \
curl dpkg-dev libxml2-dev genisoimage libc6-i386 \
lib32stdc++6 python&& \
rm -rf /var/cache/apk/*
WORKDIR /root/build
RUN curl -L -O http://dl.google.com/android/ndk/android-ndk-r10d-linux-x86_64.bin && \
chmod a+x android-ndk-r10d-linux-x86_64.bin && \
./android-ndk-r10d-linux-x86_64.bin && \
rm android-ndk-r10d-linux-x86_64.bin
# Install toolchain
RUN curl -L -O https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-linux-x86_64.zip && \
unzip -q android-ndk-$NDK_VERSION-linux-x86_64.zip && \
rm android-ndk-$NDK_VERSION-linux-x86_64.zip && \
mkdir -p $ANDROID_HOME/toolchain && \
$ANDROID_HOME/android-ndk-$NDK_VERSION/build/tools/make-standalone-toolchain.sh \
--install-dir=$ANDROID_HOME/toolchain \
--toolchain=arm-linux-androideabi-4.9 \
--force && \
rm -r android-ndk-$NDK_VERSION
ENV PREFIX /root/usr/local
WORKDIR /root/build/android-ndk-r10d
RUN /bin/bash build/tools/make-standalone-toolchain.sh \
--install-dir=$ANDROID_HOME/toolchain \
--toolchain=arm-linux-androideabi-4.9 --llvm-version=3.5 \
--system=linux-x86_64
# Setup version of libraries
ENV OPENSSL_VERSION 1.0.2d
ENV SPDYLAY_VERSION v1.4.0
ENV LIBEV_VERSION 4.19
ENV ZLIB_VERSION 1.2.8
ENV CARES_VERSION 1.13.0
ENV NGHTTP2_VERSION v1.24.0
WORKDIR /root/build
RUN git clone https://github.com/tatsuhiro-t/spdylay
RUN git clone https://github.com/tatsuhiro-t/spdylay -b $SPDYLAY_VERSION --depth 1
WORKDIR /root/build/spdylay
RUN autoreconf -i && \
./configure \
......@@ -59,22 +67,22 @@ RUN autoreconf -i && \
make install
WORKDIR /root/build
RUN curl -L -O https://www.openssl.org/source/openssl-1.0.2d.tar.gz && \
tar xf openssl-1.0.2d.tar.gz && \
rm openssl-1.0.2d.tar.gz
RUN curl -L -O https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz && \
tar xf openssl-$OPENSSL_VERSION.tar.gz && \
rm openssl-$OPENSSL_VERSION.tar.gz
WORKDIR /root/build/openssl-1.0.2d
WORKDIR /root/build/openssl-$OPENSSL_VERSION
RUN export CROSS_COMPILE=$TOOLCHAIN/bin/arm-linux-androideabi- && \
./Configure --prefix=$PREFIX android && \
make && make install_sw