diff --git a/contrib/src/libressl/0001-build-don-t-fetch-git-tag-if-openbsd-directory-exist.patch b/contrib/src/libressl/0001-build-don-t-fetch-git-tag-if-openbsd-directory-exist.patch new file mode 100644 index 0000000000000000000000000000000000000000..b74ad48b1553adb3d31a8cbc1654d6b474a92dee --- /dev/null +++ b/contrib/src/libressl/0001-build-don-t-fetch-git-tag-if-openbsd-directory-exist.patch @@ -0,0 +1,32 @@ +From 2fb64a2af2e3519feee18959e260ec90bcbd1f56 Mon Sep 17 00:00:00 2001 +From: Adrien Beraud <adrien.beraud@savoirfairelinux.com> +Date: Fri, 6 Apr 2018 22:39:08 -0400 +Subject: [PATCH] build: don't fetch git tag if openbsd directory exists + +--- + update.sh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/update.sh b/update.sh +index 9e9ace6..b064154 100755 +--- a/update.sh ++++ b/update.sh +@@ -11,11 +11,11 @@ if [ ! -d openbsd ]; then + else + git clone $LIBRESSL_GIT/openbsd + fi ++ (cd openbsd ++ git fetch ++ git checkout $openbsd_branch ++ git pull --rebase) + fi +-(cd openbsd +- git fetch +- git checkout $openbsd_branch +- git pull --rebase) + + # setup source paths + CWD=`pwd` +-- +2.14.1 + diff --git a/contrib/src/libressl/rules.mak b/contrib/src/libressl/rules.mak index e24404ae575577b0cb0256e69f98c0006839baf4..7a780487d9969898cc802caa04d473cac3659044 100644 --- a/contrib/src/libressl/rules.mak +++ b/contrib/src/libressl/rules.mak @@ -20,7 +20,9 @@ # LIBRESSL_VERSION := 190bd346e75575b9436a2e9e14b28618f0234e1b +OPENBSD_VERSION := OPENBSD_6_2 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 # Check if openssl or libressl is already present on the system ifeq ($(call need_pkg,"openssl >= 1.0.0" || call need_pkg,"libressl >= 1.0.0"),) @@ -32,9 +34,14 @@ endif $(TARBALLS)/portable-$(LIBRESSL_VERSION).tar.gz: $(call download,$(LIBRESSL_URL)) -libressl: portable-$(LIBRESSL_VERSION).tar.gz +$(TARBALLS)/openbsd-$(OPENBSD_VERSION).tar.gz: + $(call download,$(OPENBSD_URL)) + +libressl: portable-$(LIBRESSL_VERSION).tar.gz openbsd-$(OPENBSD_VERSION).tar.gz $(UNPACK) $(APPLY) $(SRC)/libressl/getpagesize.patch + $(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