Permalink
Browse files

tools sync 2018.05

  • Loading branch information...
zyxmon committed May 12, 2018
1 parent 3e3bc73 commit 3a198d91c164c934b00c1125dc6b50dcbd0b19c4
Showing with 2,327 additions and 1,527 deletions.
  1. +3 −3 tools/cmake/Makefile
  2. +2 −2 tools/cmake/patches/100-disable_qt_tests.patch
  3. +0 −16 tools/cmake/patches/110-alpine_musl-compat.patch
  4. 0 ...ake/patches/{120-libarchive-fix-libressl-compat.patch → 110-libarchive-fix-libressl-compat.patch}
  5. +5 −1 tools/cmake/patches/{130-curl-fix-libressl-linking.patch → 120-curl-fix-libressl-linking.patch}
  6. +1 −1 ...s/cmake/patches/{140-bootstrap_parallel_make_flag.patch → 130-bootstrap_parallel_make_flag.patch}
  7. +68 −0 tools/cmake/patches/140-curl-fix-libressl.patch
  8. +37 −0 tools/cmake/patches/150-libarchive-fix-libressl.patch
  9. +2 −2 tools/e2fsprogs/Makefile
  10. +4 −1 tools/firmware-utils/Makefile
  11. +239 −0 tools/firmware-utils/src/dns313-header.c
  12. +204 −0 tools/firmware-utils/src/mkdapimg2.c
  13. +172 −0 tools/firmware-utils/src/mkdlinkfw-lib.c
  14. +83 −0 tools/firmware-utils/src/mkdlinkfw-lib.h
  15. +665 −0 tools/firmware-utils/src/mkdlinkfw.c
  16. +467 −40 tools/firmware-utils/src/tplink-safeloader.c
  17. +2 −2 tools/libressl/Makefile
  18. +2 −0 tools/lzma-old/Makefile
  19. +11 −0 tools/lzma-old/patches/120-add-cflags.patch
  20. +0 −8 tools/make-ext4fs/Makefile
  21. +11 −0 tools/make-ext4fs/patches/100-add-ldflags.patch
  22. +13 −11 tools/mkimage/Makefile
  23. +3 −3 tools/mkimage/patches/010-freebsd-ulong-fix.patch
  24. +42 −36 tools/mkimage/patches/030-allow-to-use-different-magic.patch
  25. +0 −11 tools/mkimage/patches/040-include_order.patch
  26. +1 −1 tools/mkimage/patches/050-image_h_portability.patch
  27. +1 −1 tools/mkimage/patches/060-remove_kernel_includes.patch
  28. +0 −52 tools/mkimage/patches/070-socfpgaimage_portability.patch
  29. +7 −7 tools/mkimage/patches/080-remove_compiler_check.patch
  30. +0 −82 tools/mkimage/patches/090-reproducible-SOURCE_DATE_EPOCH.patch
  31. +1 −1 tools/mkimage/patches/100-freebsd-compat.patch
  32. +0 −67 tools/mkimage/patches/110-fix_musl_build.patch
  33. +0 −702 tools/mkimage/patches/200-compiler-support.patch
  34. +68 −0 tools/mkimage/patches/200-rsa-sign-add-support-for-libressl.patch
  35. +14 −0 tools/mkimage/patches/210-link-libcrypto-static.patch
  36. +0 −97 tools/mkimage/patches/210-openssl-1.1.x-compat.patch
  37. +2 −2 tools/mm-macros/Makefile
  38. +2 −2 tools/mpfr/Makefile
  39. +25 −27 tools/mtd-utils/Makefile
  40. +3 −3 tools/mtd-utils/patches/100-sscanf_fix.patch
  41. +28 −23 tools/mtd-utils/patches/110-portability.patch
  42. +0 −25 tools/mtd-utils/patches/120-include_sysmacros.patch
  43. +71 −68 tools/mtd-utils/patches/130-lzma_jffs2.patch
  44. +0 −119 tools/mtd-utils/patches/135-mkubifs_optional_lzo.patch
  45. +4 −4 tools/mtd-utils/patches/200-libubigen-add-ubigen_write_terminator-function.patch
  46. +7 −16 tools/mtd-utils/patches/201-ubinize-add-terminator-support.patch
  47. +0 −43 tools/mtd-utils/patches/310-add-static-linking-option.patch
  48. +8 −8 tools/mtd-utils/patches/320-mkfs.jffs2-SOURCE_DATE_EPOCH.patch
  49. +2 −2 tools/patch/Makefile
  50. +0 −25 tools/patch/patches/001-fix-macos-vasnprintf.patch
  51. +2 −2 tools/sed/Makefile
  52. +1 −1 tools/squashfs4/Makefile
  53. +3 −10 tools/xz/Makefile
  54. +41 −0 tools/zlib/Makefile
@@ -7,13 +7,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=cmake
PKG_VERSION:=3.10.1
PKG_VERSION:=3.11.1
PKG_CPE_ID:=cpe:/a:kitware:cmake
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://cmake.org/files/v3.10/ \
PKG_SOURCE_URL:=https://cmake.org/files/v3.11/ \
https://fossies.org/linux/misc/
PKG_HASH:=7be36ee24b0f5928251b644d29f5ff268330a916944ef4a75e23ba01e7573284
PKG_HASH:=57bebc6ca4d1d42c6385249d148d9216087e0fda57a47dc5c858790a70217d0c
HOST_BUILD_PARALLEL:=1
HOST_CONFIGURE_PARALLEL:=1
@@ -1,6 +1,6 @@
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -273,15 +273,6 @@ add_RunCMake_test(no_install_prefix)
@@ -284,15 +284,6 @@ add_RunCMake_test(no_install_prefix)
add_RunCMake_test(configure_file)
add_RunCMake_test(CTestTimeoutAfterMatch)
@@ -18,7 +18,7 @@
add_RunCMake_test(FindPkgConfig)
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -407,13 +407,6 @@ if(BUILD_TESTING)
@@ -422,13 +422,6 @@ if(BUILD_TESTING)
list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})

This file was deleted.

Oops, something went wrong.
@@ -20,13 +20,17 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -461,6 +461,10 @@ if(CMAKE_USE_OPENSSL)
@@ -461,6 +461,14 @@ if(CMAKE_USE_OPENSSL)
set(USE_OPENSSL ON)
set(HAVE_LIBCRYPTO ON)
set(HAVE_LIBSSL ON)
+ check_library_exists("rt" clock_gettime "" HAVE_LIBRT)
+ if(HAVE_LIBRT)
+ list(APPEND OPENSSL_LIBRARIES rt)
+ endif()
+ check_library_exists("pthread" pthread_once "" HAVE_PTHREAD)
+ if(HAVE_PTHREAD)
+ list(APPEND OPENSSL_LIBRARIES pthread)
+ endif()
list(APPEND CURL_LIBS ${OPENSSL_LIBRARIES})
include_directories(${OPENSSL_INCLUDE_DIR})
@@ -1,6 +1,6 @@
--- a/bootstrap
+++ b/bootstrap
@@ -1130,7 +1130,10 @@ int main(){ printf("1%c", (char)0x0a); r
@@ -1149,7 +1149,10 @@ int main(){ printf("1%c", (char)0x0a); r
' > "test.c"
cmake_original_make_flags="${cmake_make_flags}"
if [ "x${cmake_parallel_make}" != "x" ]; then
@@ -0,0 +1,68 @@
From 7c90c93c0b061da81f69fabdd57125b2783c15fb Mon Sep 17 00:00:00 2001
From: Bernard Spil <brnrd@FreeBSD.org>
Date: Mon, 2 Apr 2018 19:04:06 +0200
Subject: [PATCH] openssl: fix build with LibreSSL 2.7
- LibreSSL 2.7 implements (most of) OpenSSL 1.1 API
Fixes #2319
Closes #2447
Closes #2448
Signed-off-by: Bernard Spil <brnrd@FreeBSD.org>
---
lib/vtls/openssl.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
--- a/Utilities/cmcurl/lib/vtls/openssl.c
+++ b/Utilities/cmcurl/lib/vtls/openssl.c
@@ -104,7 +104,8 @@
#endif
#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && /* OpenSSL 1.1.0+ */ \
- !defined(LIBRESSL_VERSION_NUMBER)
+ !(defined(LIBRESSL_VERSION_NUMBER) && \
+ LIBRESSL_VERSION_NUMBER < 0x20700000L)
#define SSLEAY_VERSION_NUMBER OPENSSL_VERSION_NUMBER
#define HAVE_X509_GET0_EXTENSIONS 1 /* added in 1.1.0 -pre1 */
#define HAVE_OPAQUE_EVP_PKEY 1 /* since 1.1.0 -pre3 */
@@ -128,7 +129,8 @@ static unsigned long OpenSSL_version_num
#endif
#if (OPENSSL_VERSION_NUMBER >= 0x1000200fL) && /* 1.0.2 or later */ \
- !defined(LIBRESSL_VERSION_NUMBER)
+ !(defined(LIBRESSL_VERSION_NUMBER) && \
+ LIBRESSL_VERSION_NUMBER < 0x20700000L)
#define HAVE_X509_GET0_SIGNATURE 1
#endif
@@ -147,7 +149,7 @@ static unsigned long OpenSSL_version_num
* Whether SSL_CTX_set_keylog_callback is available.
* OpenSSL: supported since 1.1.1 https://github.com/openssl/openssl/pull/2287
* BoringSSL: supported since d28f59c27bac (committed 2015-11-19)
- * LibreSSL: unsupported in at least 2.5.1 (explicitly check for it since it
+ * LibreSSL: unsupported in at least 2.7.2 (explicitly check for it since it
* lies and pretends to be OpenSSL 2.0.0).
*/
#if (OPENSSL_VERSION_NUMBER >= 0x10101000L && \
@@ -259,7 +261,9 @@ static void tap_ssl_key(const SSL *ssl,
if(!session || !keylog_file_fp)
return;
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
+ !(defined(LIBRESSL_VERSION_NUMBER) && \
+ LIBRESSL_VERSION_NUMBER < 0x20700000L)
/* ssl->s3 is not checked in openssl 1.1.0-pre6, but let's assume that
* we have a valid SSL context if we have a non-NULL session. */
SSL_get_client_random(ssl, client_random, SSL3_RANDOM_SIZE);
@@ -2082,8 +2086,7 @@ static CURLcode ossl_connect_step1(struc
case CURL_SSLVERSION_TLSv1_2:
case CURL_SSLVERSION_TLSv1_3:
/* it will be handled later with the context options */
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \
- !defined(LIBRESSL_VERSION_NUMBER)
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
req_method = TLS_client_method();
#else
req_method = SSLv23_client_method();
@@ -0,0 +1,37 @@
From 5da00ad75b09e262774ec3675bbe4d5a4502a852 Mon Sep 17 00:00:00 2001
From: Bernard Spil <brnrd@FreeBSD.org>
Date: Sun, 1 Apr 2018 23:01:44 +0200
Subject: [PATCH] fix build with LibreSSL 2.7
LibreSSL 2.7 adds OpenSSL 1.1 API leading to conflicts on method names
See also: https://bugs.freebsd.org/226853
Signed-off-by: Bernard Spil <brnrd@FreeBSD.org>
---
libarchive/archive_openssl_hmac_private.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/Utilities/cmlibarchive/libarchive/archive_openssl_hmac_private.h
+++ b/Utilities/cmlibarchive/libarchive/archive_openssl_hmac_private.h
@@ -28,7 +28,8 @@
#include <openssl/hmac.h>
#include <openssl/opensslv.h>
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
#include <stdlib.h> /* malloc, free */
#include <string.h> /* memset */
static inline HMAC_CTX *HMAC_CTX_new(void)
--- a/Utilities/cmlibarchive/libarchive/archive_openssl_evp_private.h
+++ b/Utilities/cmlibarchive/libarchive/archive_openssl_evp_private.h
@@ -28,7 +28,8 @@
#include <openssl/evp.h>
#include <openssl/opensslv.h>
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
#include <stdlib.h> /* malloc, free */
#include <string.h> /* memset */
static inline EVP_MD_CTX *EVP_MD_CTX_new(void)
@@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=e2fsprogs
PKG_CPE_ID:=cpe:/a:e2fsprogs_project:e2fsprogs
PKG_VERSION:=1.43.7
PKG_HASH:=2a6367289047d68d9ba6a46cf89ab9a1efd0556cde02a51ebaf414ff51edded9
PKG_VERSION:=1.44.1
PKG_HASH:=0ca164c1c87724df904c918b2d7051ef989b51de725db66c67514dbe6dd2b9ef
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
@@ -42,7 +42,7 @@ define Host/Compile
$(call cc,mkplanexfw sha1)
$(call cc,mktplinkfw mktplinkfw-lib md5, -Wall -fgnu89-inline)
$(call cc,mktplinkfw2 mktplinkfw-lib md5, -fgnu89-inline)
$(call cc,tplink-safeloader md5, -Wall)
$(call cc,tplink-safeloader md5, -Wall --std=gnu99)
$(call cc,pc1crypt)
$(call cc,osbridge-crc)
$(call cc,wrt400n cyg_crc32)
@@ -63,6 +63,7 @@ define Host/Compile
$(call cc,mkbrncmdline)
$(call cc,mkbrnimg)
$(call cc,mkdapimg)
$(call cc,mkdapimg2)
$(call cc, mkcameofw, -Wall)
$(call cc,seama md5)
$(call cc,oseama md5, -Wall)
@@ -81,6 +82,8 @@ define Host/Compile
$(call cc,mkbuffaloimg, -Wall)
$(call cc,zyimage, -Wall)
$(call cc,mkdhpimg buffalo-lib, -Wall)
$(call cc,mkdlinkfw mkdlinkfw-lib, -lz -Wall --std=gnu99)
$(call cc,dns313-header, -Wall)
endef
define Host/Install
Oops, something went wrong.

0 comments on commit 3a198d9

Please sign in to comment.