diff --git a/contrib/src/libressl/SHA512SUMS b/contrib/src/libressl/SHA512SUMS index 85ca1cf9ef3e81c4b052afeda3aea198ec2219a1..21a452c89aad63aa7cf89a559006b150ef3e1ed5 100644 --- a/contrib/src/libressl/SHA512SUMS +++ b/contrib/src/libressl/SHA512SUMS @@ -1,2 +1,3 @@ -19f97f7c2b5cb4591ee6f191255b441373176b1b6539aa6ac2cd54494a14beaf126b151eb2f0b7fb650796fc0e37e2a9b1508ca50722adc7107c460904a5dbb7 libressl-3.5.3.tar.gz -913f24aa84ce4a5034a62fce3dc19e27e39cf67f2e2b172adf4dd2ca36009c7ea60945a188bd8ea4b9fbd48c0ab8c3926207eba65d88d559c60bef49cbb96f68 libressl-3.7.0.tar.gz +b8107fc809d5a095a49cebe3192a9b609441dfaa86c7bee472c34c177854d1d8ca983eb071828593f98e0c161f75176dabeefe6067ba417b2ecbaea5aa20645f libressl-3.8.3.tar.gz +66c595ff2f72310ff5bbea8f733c84067b7fea90612bcead3588f98da409d36fa0f9fbc3b59d1e91037714464b2288d3196e7ac80efe87268af961276e9aa3aa libressl-3.9.0.tar.gz +b7b9f47c77fd27787b7c7ae7e78cd831fe9f7f32e280f54952994569bfe69ff03022e349aea9ea734c50b079693c6e15a3c1115ef0093e523437904074da5784 libressl-3.9.2.tar.gz diff --git a/contrib/src/libressl/rules.mak b/contrib/src/libressl/rules.mak index 5f70a739ba14eef784458696484005d37e623bcd..59d9b985d2e8dd7dc47809af482c872ada674892 100644 --- a/contrib/src/libressl/rules.mak +++ b/contrib/src/libressl/rules.mak @@ -18,7 +18,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -SSL_VERSION := 3.7.0 +SSL_VERSION := 3.9.2 PKG_CPE += cpe:2.3:a:openbsd:libressl:$(SSL_VERSION):*:*:*:*:*:*:* LIBRESSL_VERSION := libressl-$(SSL_VERSION) LIBRESSL_URL := https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/$(LIBRESSL_VERSION).tar.gz @@ -36,19 +36,17 @@ libressl: $(LIBRESSL_VERSION).tar.gz $(MOVE) LIBRESSL_CONF := \ + -DBUILD_SHARED_LIBS=Off \ -DLIBRESSL_TESTS=Off \ - -DLIBRESSL_APPS=Off \ - -DDESTDIR=$(PREFIX) + -DLIBRESSL_APPS=Off ifdef HAVE_ANDROID ifeq ($(ARCH),x86_64) LIBRESSL_CONF += -DENABLE_ASM=Off endif -else ifeq ($(IOS_TARGET_PLATFORM),iPhoneOS) -LIBRESSL_CONF += -DCMAKE_C_FLAGS='-miphoneos-version-min=9.3 -fembed-bitcode -arch arm64' -else ifeq ($(IOS_TARGET_PLATFORM),iPhoneSimulator) -LIBRESSL_CONF += -DCMAKE_C_FLAGS='-miphoneos-version-min=9.3 -fembed-bitcode -arch x86_64' -else ifeq ($(HOST_ARCH),arm-linux-gnueabihf) +endif + +ifeq ($(HOST_ARCH),arm-linux-gnueabihf) LIBRESSL_CONF += -DCMAKE_SYSTEM_PROCESSOR=arm -DENABLE_ASM=Off -DCMAKE_C_FLAGS='-march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard' endif @@ -59,7 +57,7 @@ ifdef HAVE_WIN32 else ifdef HAVE_WIN64 cd $< && $(HOSTVARS) ./configure $(HOSTCONF) && $(MAKE) && $(MAKE) install else - cd $< && mkdir -p build && cd build && $(CMAKE) $(LIBRESSL_CONF) .. && $(MAKE) && $(MAKE) install + cd $< && mkdir -p build && cd build && $(HOSTVARS) $(CMAKE) $(LIBRESSL_CONF) .. && $(MAKE) && $(MAKE) install endif rm -rf $(PREFIX)/lib/*.so $(PREFIX)/lib/*.so.* touch $@