bump libpng for security bug fixes

Author: houqp

.travis.yml

@@ -3,7 +3,9 @@
 
 language: c
 
-sudo: false
+dist: trusty
+sudo: required
+# sudo: false
 
 cache:
   apt: true
@@ -40,6 +42,9 @@ before_install:
     - ln -s $(which gcc-4.8) bin/gcc
     - ln -s $(which c++-4.8) bin/c++
     - ln -s $(which g++-4.8) bin/g++
+    # - curl "http://ftp.gnu.org/gnu/automake/automake-1.13.1.tar.gz" > automake-1.13.1.tar.gz
+    # - tar -zxvf automake-1.13.1.tar.gz
+    # - (cd automake-1.13.1 && ./configure --prefix=`pwd`/../ && make -j5 && make install)
     - export PATH=$PWD/bin:$PATH
 
 install:

Makefile

@@ -162,6 +162,6 @@ $(OUTPUT_DIR)/spec/base:
 		ln -sf ../../../spec $(OUTPUT_DIR)/spec/base
 
 test: $(OUTPUT_DIR)/spec $(OUTPUT_DIR)/.busted
-	cd $(OUTPUT_DIR) && busted -l ./luajit --exclude-tags=notest
+	cd $(OUTPUT_DIR) && ./luajit $(shell which busted) ./spec/base/unit
 
 .PHONY: test

thirdparty/libpng/CMakeLists.txt

@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 2.8.3)
 
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../cmake_modules")
 include("koreader_thirdparty_common")
+include("koreader_thirdparty_git")
 
 enable_language(C CXX)
 
@@ -16,14 +17,19 @@ set(CFG_ENV_VAR "CC=\"${CC}\" CXX=\"${CXX}\" CPPFLAGS=\"${CPPFLAGS}\" LDFLAGS=\"
 set(CFG_OPTS "-q --prefix=${BINARY_DIR} --disable-static --enable-shared --host=\"${CHOST}\"")
 set(CFG_CMD_STR "${CFG_ENV_VAR} ${SOURCE_DIR}/configure ${CFG_OPTS}")
 
+ko_write_gitclone_script(
+    GIT_CLONE_SCRIPT_FILENAME
+    https://github.com/glennrp/libpng.git
+    v1.6.21
+    ${SOURCE_DIR}
+)
+
 set(LIBPNG_VER "1.6.19")
 include(ExternalProject)
 ExternalProject_Add(
-    libpng
-    URL http://download.sourceforge.net/libpng/libpng-${LIBPNG_VER}.tar.gz
-    URL_MD5 3121bdc77c365a87e054b9f859f421fe
-    DOWNLOAD_DIR ${KO_DOWNLOAD_DIR}
-    # PATCH_COMMAND sh autogen.sh
+    ${PROJECT_NAME}
+    DOWNLOAD_COMMAND ${CMAKE_COMMAND} -P ${GIT_CLONE_SCRIPT_FILENAME}
+    PATCH_COMMAND sh autogen.sh
     CONFIGURE_COMMAND sh -c ${CFG_CMD_STR}
     BUILD_COMMAND $(MAKE) -j${PARALLEL_JOBS} --silent
     INSTALL_COMMAND $(MAKE) -j${PARALLEL_JOBS} --silent install