Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependency openssl/openssl to v3.3.0 #91

Merged
merged 2 commits into from
Apr 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ CRITERION_VERSION=2.4.2
SHUNIT_VERSION=2.1.8
CURL_VERSION_TAG=8_6_0
CURL_VERSION=$(shell echo $(CURL_VERSION_TAG) | sed -e 's/_/./g')
OPENSSL_VERSION=3.2.1
OPENSSL_VERSION=3.3.0
ZLIB_VERSION=1.3.1

DIST ?= unknown
Expand Down Expand Up @@ -131,7 +131,7 @@ debug:
-lpthread -ldl -o $(DIST_DIR)/debug && \
$(DIST_DIR)/debug && valgrind --leak-check=full tmp/libs/debug

testdev: build_dir curl criterion stnsd ## Test without dependencies installation
testdev: build_dir curl criterion ## Test without dependencies installation

build: nss_build key_wrapper_build
nss_build : build_dir curl ## Build nss_stns
Expand Down Expand Up @@ -283,11 +283,6 @@ test_on_docker: docker
github_release: ## Create some distribution packages
ghr -u STNS --replace v$(VERSION) builds/

stnsd:
(dpkg -l |grep stnsd) || (curl -s -L -O https://github.com/STNS/cache-stnsd/releases/download/v$(STNSD_VERSION)/cache-stnsd_$(STNSD_VERSION)-1_amd64.jammy.deb && sudo dpkg -i cache-stnsd_$(STNSD_VERSION)-1_amd64.jammy.deb)
rm -rf cache-stnsd_$(STNSD_VERSION)-1_amd64.jammy.deb
sudo service cache-stnsd start

parson:
rm -rf /tmp/parson && git clone https://github.com/kgabis/parson.git /tmp/parson && \
mv /tmp/parson/parson.h ./ && \
Expand Down
4 changes: 3 additions & 1 deletion dockerfiles/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@ RUN apt install -qqy \
git \
vim \
stns-v2 \
cache-stnsd \
systemd \
init \
netcat \
libasan5 \
valgrind \
finit-sysv \
flawfinder
RUN mkdir /stns
WORKDIR /stns