diff options
Diffstat (limited to 'package/libressl')
-rw-r--r-- | package/libressl/Makefile | 14 | ||||
-rw-r--r-- | package/libressl/patches/patch-Makefile_in | 11 | ||||
-rw-r--r-- | package/libressl/patches/patch-crypto_compat_arc4random_linux_h | 11 |
3 files changed, 10 insertions, 26 deletions
diff --git a/package/libressl/Makefile b/package/libressl/Makefile index 04b31f666..ca08f24df 100644 --- a/package/libressl/Makefile +++ b/package/libressl/Makefile @@ -4,15 +4,17 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libressl -PKG_VERSION:= 2.9.2 +PKG_VERSION:= 3.9.1 PKG_RELEASE:= 1 -PKG_HASH:= c4c78167fae325b47aebd8beb54b6041d6f6a56b3743f4bd5d79b15642f9d5d4 +PKG_HASH:= 6da0b954695f7ee62b03f64200a8a4f02af93717b60cce04ab6c8df262c07a51 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 fc285e3c6..000000000 --- a/package/libressl/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- libressl-2.4.2.orig/Makefile.in 2016-08-01 01:08:10.000000000 +0200 -+++ libressl-2.4.2/Makefile.in 2016-08-22 18:34:29.881419200 +0200 -@@ -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 diff --git a/package/libressl/patches/patch-crypto_compat_arc4random_linux_h b/package/libressl/patches/patch-crypto_compat_arc4random_linux_h deleted file mode 100644 index c71462315..000000000 --- a/package/libressl/patches/patch-crypto_compat_arc4random_linux_h +++ /dev/null @@ -1,11 +0,0 @@ ---- libressl-2.4.2.orig/crypto/compat/arc4random_linux.h 2016-08-01 01:07:36.000000000 +0200 -+++ libressl-2.4.2/crypto/compat/arc4random_linux.h 2016-10-17 21:56:49.830938238 +0200 -@@ -32,7 +32,7 @@ static pthread_mutex_t arc4random_mtx = - #define _ARC4_LOCK() pthread_mutex_lock(&arc4random_mtx) - #define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx) - --#ifdef __GLIBC__ -+#if defined(__GLIBC__) && !defined(__UCLIBC__) - extern void *__dso_handle; - extern int __register_atfork(void (*)(void), void(*)(void), void (*)(void), void *); - #define _ARC4_ATFORK(f) __register_atfork(NULL, NULL, (f), __dso_handle) |