summaryrefslogtreecommitdiff
path: root/package/libressl
diff options
context:
space:
mode:
Diffstat (limited to 'package/libressl')
-rw-r--r--package/libressl/Makefile14
-rw-r--r--package/libressl/patches/patch-Makefile_in11
2 files changed, 10 insertions, 15 deletions
diff --git a/package/libressl/Makefile b/package/libressl/Makefile
index 4cbd25ee8..f5df34fc5 100644
--- a/package/libressl/Makefile
+++ b/package/libressl/Makefile
@@ -4,15 +4,17 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libressl
-PKG_VERSION:= 3.1.3
+PKG_VERSION:= 3.9.2
PKG_RELEASE:= 1
-PKG_HASH:= c76b0316acf612ecb62f5cb014a20d972a663bd9e40abf952a86f3b998b69fa0
+PKG_HASH:= 7b031dac64a59eb6ee3304f7ffb75dad33ab8c9d279c847f92c89fb846068f97
PKG_DESCR:= ssl/tls library
PKG_SECTION:= libs/crypto
PKG_URL:= http://www.libressl.org
PKG_SITES:= http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/
PKG_OPTS:= dev
+PKG_ARCH_DEPENDS:= !m68k !xtensa
+
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= LIBRESSL LIBRESSL_UTIL
@@ -27,6 +29,10 @@ $(eval $(call HOST_template,LIBRESSL,libressl,${PKG_VERSION}-${PKG_RELEASE}))
$(eval $(call PKG_template,LIBRESSL,libressl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
$(eval $(call PKG_template,LIBRESSL_UTIL,libressl-util,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBRESSL_UTIL},${PKGSD_LIBRESSL_UTIL},${PKGSC_LIBRESSL_UTIL}))
+ifeq ($(ADK_TARGET_ARCH_ARM),y)
+CONFIGURE_ARGS+= --disable-asm
+endif
+
ifeq ($(ADK_TARGET_USE_SSP),y)
CONFIGURE_ARGS+= --enable-hardening
else
@@ -34,13 +40,13 @@ CONFIGURE_ARGS+= --disable-hardening
endif
libressl-install:
+ ${INSTALL_DIR} ${IDIR_LIBRESSL}/etc/ssl
+ ${CP} ${WRKINST}/etc/ssl/openssl.cnf ${IDIR_LIBRESSL}/etc/ssl
$(INSTALL_DIR) $(IDIR_LIBRESSL)/usr/lib
$(CP) $(WRKINST)/usr/lib/lib{crypto,ssl,tls}.so* \
$(IDIR_LIBRESSL)/usr/lib
libressl-util-install:
- ${INSTALL_DIR} ${IDIR_LIBRESSL_UTIL}/etc/ssl
- ${CP} ${WRKINST}/etc/ssl/openssl.cnf ${IDIR_LIBRESSL_UTIL}/etc/ssl
${INSTALL_DIR} ${IDIR_LIBRESSL_UTIL}/usr/bin
${CP} ${WRKINST}/usr/bin/openssl ${IDIR_LIBRESSL_UTIL}/usr/bin
diff --git a/package/libressl/patches/patch-Makefile_in b/package/libressl/patches/patch-Makefile_in
deleted file mode 100644
index 745dc246d..000000000
--- a/package/libressl/patches/patch-Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libressl-3.1.2.orig/Makefile.in 2020-05-21 05:00:51.000000000 +0200
-+++ libressl-3.1.2/Makefile.in 2020-06-06 20:50:41.000000000 +0200
-@@ -191,7 +191,7 @@ am__define_uniq_tagged_files = \
- ETAGS = etags
- CTAGS = ctags
- CSCOPE = cscope
--DIST_SUBDIRS = crypto ssl tls include apps man tests
-+DIST_SUBDIRS = crypto ssl tls include apps
- am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/libcrypto.pc.in \
- $(srcdir)/libssl.pc.in $(srcdir)/libtls.pc.in \
- $(srcdir)/openssl.pc.in COPYING ChangeLog INSTALL compile \