Merge 68c1865 into 72506af

Author: zecke

build.linux64x64/third-party/Makefile.libgit2

@@ -22,15 +22,12 @@ $(LIBGIT2ARCHIVE):
 $(THIRDPARTYLIBDIR)/$(LIBGIT2LIBNAME): $(LIBGIT2ARCHIVE)
 	tar x -f $(LIBGIT2ARCHIVE) -C $(THIRDPARTYDIR)
 	cd $(LIBGIT2DIR) \
-		&& cmake \
+		&& PKG_CONFIG_PATH=$(THIRDPARTYLIBDIR)/pkgconfig cmake \
 			-DCMAKE_INSTALL_PREFIX=$(THIRDPARTYOUTDIR) \
 			-DUSE_SSH=ON \
 			-DBUILD_CLAR=OFF \
 			-DCMAKE_C_FLAGS="-m64" \
-			-DLIBSSH2_FOUND=ON \
-			-DLIBSSH2_INCLUDE_DIRS=$(THIRDPARTYINCLUDEDIR) \
-			-DLIBSSH2_LIBRARY_DIRS=$(THIRDPARTYLIBDIR) \
-			-DLIBSSH2_LIBRARIES=$(THIRDPARTYLIBDIR)/libssh2.so \
+			-DOPENSSL_ROOT_DIR=$(THIRDPARTYOUTDIR) \
 		&& make \
 		&& make install
 

build.linux64x64/third-party/Makefile.libssh2

@@ -26,6 +26,7 @@ $(THIRDPARTYLIBDIR)/$(LIBSSH2LIBNAME): $(LIBSSH2ARCHIVE)
 			--prefix='$(THIRDPARTYOUTDIR)' \
 			CFLAGS='-m64' \
 			LDFLAGS='-m64' \
+			CPPFLAGS='-I$(THIRDPARTYINCLUDEDIR)' \
 		&& make \
 		&& make install
 

third-party/libgit2.spec

@@ -1,8 +1,8 @@
-libgit2_spec_download_url:=https://github.com/libgit2/libgit2/archive/v0.25.1.tar.gz
-libgit2_spec_archive_name:=libgit2-v0.25.1.tar.gz
-libgit2_spec_unpack_dir_name:=libgit2-0.25.1
-libgit2_spec_product_name_macOS:=libgit2.0.25.1.dylib
-libgit2_spec_product_name_linux:=libgit2.so.0.25.1
+libgit2_spec_download_url:=https://github.com/libgit2/libgit2/archive/v0.28.1.tar.gz
+libgit2_spec_archive_name:=libgit2-v0.28.1.tar.gz
+libgit2_spec_unpack_dir_name:=libgit2-0.28.1
+libgit2_spec_product_name_macOS:=libgit2.0.28.1.dylib
+libgit2_spec_product_name_linux:=libgit2.so.0.28.1
 libgit2_spec_product_name_windows:=libgit2.dll
 libgit2_spec_symlinks_macOS:=libgit2*.dylib
 libgit2_spec_symlinks_linux:=libgit2.so*

third-party/libpng.spec

@@ -1,6 +1,6 @@
-libpng_spec_download_url:=ftp://ftp-osl.osuosl.org/pub/libpng/src/archive/gz/libpng12/libpng-1.2.49.tar.gz
-libpng_spec_archive_name:=libpng-1.2.49.tar.gz
-libpng_spec_unpack_dir_name:=libpng-1.2.49
+libpng_spec_download_url:=ftp://ftp-osl.osuosl.org/pub/libpng/src/archive/gz/libpng12/libpng-1.6.36.tar.gz
+libpng_spec_archive_name:=libpng-1.6.36.tar.gz
+libpng_spec_unpack_dir_name:=libpng-1.6.36
 libpng_spec_product_name_macOS:=libpng12.0.dylib
 libpng_spec_product_name_linux:=
 libpng_spec_product_name_windows:=libpng12-0.dll

third-party/libssh2.spec

@@ -1,6 +1,6 @@
-libssh2_spec_download_url:=https://www.libssh2.org/download/libssh2-1.7.0.tar.gz		 
-libssh2_spec_archive_name:=libssh2-1.7.0.tar.gz
-libssh2_spec_unpack_dir_name:=libssh2-1.7.0
+libssh2_spec_download_url:=https://www.libssh2.org/download/libssh2-1.8.2.tar.gz
+libssh2_spec_archive_name:=libssh2-1.8.2.tar.gz
+libssh2_spec_unpack_dir_name:=libssh2-1.8.2
 libssh2_spec_product_name_macOS:=libssh2.1.dylib
 libssh2_spec_product_name_linux:=libssh2.so.1.0.1
 libssh2_spec_product_name_windows:=libssh2-1.dll

third-party/openssl.spec

@@ -1,6 +1,6 @@
-openssl_spec_download_url:=https://www.openssl.org/source/openssl-1.0.2q.tar.gz
-openssl_spec_archive_name:=openssl-1.0.2q.tar.gz
-openssl_spec_unpack_dir_name:=openssl-1.0.2q
+openssl_spec_download_url:=https://www.openssl.org/source/openssl-1.0.2r.tar.gz
+openssl_spec_archive_name:=openssl-1.0.2r.tar.gz
+openssl_spec_unpack_dir_name:=openssl-1.0.2r
 openssl_spec_product1_name_macOS:=libssl.1.0.0.dylib
 openssl_spec_product2_name_macOS:=libcrypto.1.0.0.dylib
 openssl_spec_product1_name_linux:=libssl.so.1.0.0