Skip to content

Commit 6f9f024

Browse files
authored
Bump OpenSSL to 3.0.17. (#69)
1 parent 1751f77 commit 6f9f024

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

Makefile

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ XZ_VERSION=5.6.4
6161
# Preference is to use OpenSSL 3; however, Cryptography 3.4.8 (and
6262
# probably some other packages as well) only works with 1.1.1, so
6363
# we need to preserve the ability to build the older OpenSSL (for now...)
64-
OPENSSL_VERSION=3.0.16
64+
OPENSSL_VERSION=3.0.17
6565
# OPENSSL_VERSION=1.1.1w
6666
# The Series is the first 2 digits of the version number. (e.g., 1.1.1w -> 1.1)
6767
OPENSSL_SERIES=$(shell echo $(OPENSSL_VERSION) | grep -Eo "\d+\.\d+")
@@ -331,6 +331,7 @@ XZ-$(target): $$(XZ_DIST-$(target))
331331
OPENSSL_SRCDIR-$(target)=build/$(os)/$(target)/openssl-$(OPENSSL_VERSION)
332332
OPENSSL_INSTALL-$(target)=$(PROJECT_DIR)/install/$(os)/$(target)/openssl-$(OPENSSL_VERSION)
333333
OPENSSL_SSL_LIB-$(target)=$$(OPENSSL_INSTALL-$(target))/lib/libssl.a
334+
OPENSSL_SSL_XCPRIVACY-$(target)=$$(OPENSSL_INSTALL-$(target))/share/PrivacyInfo.xcprivacy
334335
OPENSSL_DIST-$(target)=dist/openssl-$(OPENSSL_VERSION)-$(BUILD_NUMBER)-$(target).tar.gz
335336

336337
$$(OPENSSL_SRCDIR-$(target))/Configure: downloads/openssl-$(OPENSSL_VERSION).tar.gz
@@ -394,11 +395,19 @@ $$(OPENSSL_SSL_LIB-$(target)): $$(OPENSSL_SRCDIR-$(target))/libssl.a
394395
make install_sw \
395396
2>&1 | tee -a ../openssl-$(OPENSSL_VERSION).install.log
396397

397-
$$(OPENSSL_DIST-$(target)): $$(OPENSSL_SSL_LIB-$(target))
398+
$$(OPENSSL_SSL_XCPRIVACY-$(target)): $$(OPENSSL_SRCDIR-$(target))/libssl.a
399+
@echo ">>> Install xcprivacy file for $(target)"
400+
mkdir -p $$(OPENSSL_INSTALL-$(target))/share
401+
cp $$(OPENSSL_SRCDIR-$(target))/os-dep/Apple/PrivacyInfo.xcprivacy $$(OPENSSL_INSTALL-$(target))/share
402+
403+
$$(OPENSSL_DIST-$(target)): $$(OPENSSL_SSL_LIB-$(target)) $$(OPENSSL_SSL_XCPRIVACY-$(target))
398404
@echo ">>> Build OpenSSL distribution for $(target)"
399405
mkdir -p dist
400406

401-
cd $$(OPENSSL_INSTALL-$(target)) && tar zcvf $(PROJECT_DIR)/$$(OPENSSL_DIST-$(target)) lib include
407+
cd $$(OPENSSL_INSTALL-$(target)) && \
408+
tar zcvf $(PROJECT_DIR)/$$(OPENSSL_DIST-$(target)) \
409+
-X $(PROJECT_DIR)/patch/dylib-exclude.txt \
410+
lib include share
402411

403412
.PHONY: OpenSSL-$(target)
404413
OpenSSL-$(target): $$(OPENSSL_DIST-$(target))

patch/dylib-exclude.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
**/*.dylib

0 commit comments

Comments
 (0)