From 804fae3e9fdfd61a2d88044139f2d07122b2cf57 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 15:41:54 +0000 Subject: [PATCH 1/3] Update dependency openssl/openssl to v3.3.0 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 55cd7c3..f982501 100644 --- a/Makefile +++ b/Makefile @@ -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 From bea2df4116a7e1d763f901045d5704cf8dda3c5f Mon Sep 17 00:00:00 2001 From: pyama Date: Fri, 12 Apr 2024 17:42:44 +0900 Subject: [PATCH 2/3] fix ci --- Makefile | 7 +------ dockerfiles/Dockerfile | 4 +++- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index f982501..3a443e0 100644 --- a/Makefile +++ b/Makefile @@ -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 @@ -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 ./ && \ diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index 7126e0a..094fad0 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -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 From 8303dc2acd6796e2796ff5307400a2052285d2c4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 09:11:09 +0000 Subject: [PATCH 3/3] Update dependency curl/curl to v8_7_1 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3a443e0..1bc17ba 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ BINSYMDIR=$(PREFIX)/local/bin/ CRITERION_VERSION=2.4.2 SHUNIT_VERSION=2.1.8 -CURL_VERSION_TAG=8_6_0 +CURL_VERSION_TAG=8_7_1 CURL_VERSION=$(shell echo $(CURL_VERSION_TAG) | sed -e 's/_/./g') OPENSSL_VERSION=3.3.0 ZLIB_VERSION=1.3.1