diff --git a/contrib/src/libressl/SHA512SUMS b/contrib/src/libressl/SHA512SUMS index 36b648b01d65073f6132b4811ef5840d0a6c599e..4b684b3376e09a1d0885f0e2c43c4c0ebeb098ee 100644 --- a/contrib/src/libressl/SHA512SUMS +++ b/contrib/src/libressl/SHA512SUMS @@ -1,2 +1 @@ -b62ff408a0cdbbc670f4deea92865551c4b4e5c4ccf3f63d2e0cec929330f5abf5fe42defc6c33ee1edf2ad91e6df27e009197ee705bf84b135dad6ea2f7d6b0 portable-v3.5.3.tar.gz -ed2f02f3a2c3be68a754d1b34a3194905ca28db6981fed6b36288c2cc318c756dc8d604e2401091ad1201326f3c5899538969e81b5954fe235f29a5e877b2feb openbsd-libressl-v3.5.3.tar.gz +19f97f7c2b5cb4591ee6f191255b441373176b1b6539aa6ac2cd54494a14beaf126b151eb2f0b7fb650796fc0e37e2a9b1508ca50722adc7107c460904a5dbb7 libressl-3.5.3.tar.gz diff --git a/contrib/src/libressl/rules.mak b/contrib/src/libressl/rules.mak index a55dc8fe69bb37cb41d4ea548123db3a56528d72..59a4cd9258b7e6afb60ee1ca0906e43b21a9b9d1 100644 --- a/contrib/src/libressl/rules.mak +++ b/contrib/src/libressl/rules.mak @@ -19,34 +19,23 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # SSL_VERSION := 3.5.3 -LIBRESSL_VERSION := v$(SSL_VERSION) -OPENBSD_VERSION := libressl-v$(SSL_VERSION) -LIBRESSL_URL := https://github.com/libressl-portable/portable/archive/$(LIBRESSL_VERSION).tar.gz -OPENBSD_URL := https://github.com/libressl-portable/openbsd/archive/$(OPENBSD_VERSION).tar.gz +LIBRESSL_VERSION := libressl-$(SSL_VERSION) +LIBRESSL_URL := https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/$(LIBRESSL_VERSION).tar.gz # Check if openssl or libressl is already present on the system ifeq ($(or $(call need_pkg,"openssl >= 1.0.0"),$(call need_pkg,"libressl >= 1.0.0")),) PKGS_FOUND += libressl endif -# Pure dependency of restinio: do not add to PKGS. - -$(TARBALLS)/portable-$(LIBRESSL_VERSION).tar.gz: +$(TARBALLS)/$(LIBRESSL_VERSION).tar.gz: $(call download,$(LIBRESSL_URL)) -$(TARBALLS)/openbsd-$(OPENBSD_VERSION).tar.gz: - $(call download,$(OPENBSD_URL)) - -libressl: portable-$(LIBRESSL_VERSION).tar.gz openbsd-$(OPENBSD_VERSION).tar.gz +libressl: $(LIBRESSL_VERSION).tar.gz $(UNPACK) - mv portable-$(SSL_VERSION) portable-v$(SSL_VERSION) - $(APPLY) $(SRC)/libressl/0001-build-don-t-fetch-git-tag-if-openbsd-directory-exist.patch - mv openbsd-$(OPENBSD_VERSION) $(UNPACK_DIR)/openbsd $(MOVE) .libressl: libressl .sum-libressl mkdir -p "$(PREFIX)/include" - cd $< && ./autogen.sh ifdef HAVE_WIN32 cd $< && $(HOSTVARS) CPPFLAGS=-D__MINGW_USE_VC2005_COMPAT ./configure $(HOSTCONF) && $(MAKE) && $(MAKE) install else ifdef HAVE_WIN64 @@ -63,4 +52,4 @@ endif rm -rf $(PREFIX)/lib/*.so $(PREFIX)/lib/*.so.* touch $@ -.sum-libressl: portable-$(LIBRESSL_VERSION).tar.gz openbsd-$(OPENBSD_VERSION).tar.gz +.sum-libressl: $(LIBRESSL_VERSION).tar.gz