aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorYuan Tao <ty@wevs.org>2020-09-13 03:50:36 +0800
committerHauke Mehrtens <hauke@hauke-m.de>2020-09-18 20:08:51 +0200
commit649e098ec085abad1ac08b545e03db882fbfcc17 (patch)
treeaaacae0751978ed077ff64bef766eac097e80b65 /tools
parente18534f90558882bd9cbaa55bd64d775035c6556 (diff)
downloadupstream-649e098ec085abad1ac08b545e03db882fbfcc17.tar.gz
upstream-649e098ec085abad1ac08b545e03db882fbfcc17.tar.bz2
upstream-649e098ec085abad1ac08b545e03db882fbfcc17.zip
tools/libressl: update to 3.2.1
libressl update to 3.2.1 Delete 001-dont-build-tests-man.patch Add configure args : --enable-static --disable-tests The patch (001-dont-build-tests-man.patch) no longer works with the current version. Follow the patch notes: Adding the --enable-static and --disable-tests parameters should replace the patch. Signed-off-by: Yuan Tao <ty@wevs.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/libressl/Makefile6
-rw-r--r--tools/libressl/patches/001-dont-build-tests-man.patch11
2 files changed, 3 insertions, 14 deletions
diff --git a/tools/libressl/Makefile b/tools/libressl/Makefile
index 1a497935e7..0cc26a930c 100644
--- a/tools/libressl/Makefile
+++ b/tools/libressl/Makefile
@@ -8,8 +8,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libressl
-PKG_VERSION:=3.0.2
-PKG_HASH:=df7b172bf79b957dd27ef36dcaa1fb162562c0e8999e194aa8c1a3df2f15398e
+PKG_VERSION:=3.2.1
+PKG_HASH:=d28db224cfb6d18009b2a7e8cb213cd5c943bbec87550062fef6a38479250315
PKG_RELEASE:=1
PKG_CPE_ID:=cpe:/a:openbsd:libressl
@@ -23,7 +23,7 @@ HOST_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/host-build.mk
-HOST_CONFIGURE_ARGS += --disable-shared
+HOST_CONFIGURE_ARGS += --enable-static --disable-shared --disable-tests
HOST_CFLAGS += $(FPIC)
ifeq ($(GNU_HOST_NAME),x86_64-linux-gnux32)
diff --git a/tools/libressl/patches/001-dont-build-tests-man.patch b/tools/libressl/patches/001-dont-build-tests-man.patch
deleted file mode 100644
index bd09818d43..0000000000
--- a/tools/libressl/patches/001-dont-build-tests-man.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -361,7 +361,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = crypto ssl tls include apps tests man
-+SUBDIRS = crypto ssl tls include apps
- ACLOCAL_AMFLAGS = -I m4
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libcrypto.pc libssl.pc libtls.pc openssl.pc