From 1942bd8f5bf1a245df9706754dc12b523ed0c028 Mon Sep 17 00:00:00 2001 From: "heiko.reese" Date: Sat, 21 Aug 2021 00:07:29 +0200 Subject: [PATCH 1/6] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..45aada9 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,37 @@ +stages: + - build + - test + +build_buster: + stage: build + image: debian:buster + before_script: + - apt-get update && apt-get install -y build-essential exim4-dev libsodium-dev + script: + - cd src + - make all + artifacts: + paths: + - src/genkey + - src/libexim-encrypt-dlfunc.so + +build_bullseye: + stage: build + image: debian:bullseye + before_script: + - apt-get update && apt-get install -y build-essential exim4-dev libsodium-dev + script: + - cd src + - make all + artifacts: + paths: + - src/genkey + - src/libexim-encrypt-dlfunc.so + +test: + stage: test + before_script: + - apt-get update && apt-get install -y exim4-daemon-heavy openssl + script: + - cd src + - ./simple_exim_test.sh From d868072802946a5009608214469515c34aa0cfac Mon Sep 17 00:00:00 2001 From: "heiko.reese" Date: Sat, 21 Aug 2021 00:11:09 +0200 Subject: [PATCH 2/6] Update Makefile --- src/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Makefile b/src/Makefile index f12bae6..9ef30e9 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,7 +1,7 @@ CC=gcc -CFLAGS=-g -O2 -ffile-prefix-map=/=. -fstack-protector-strong -Wformat -Werror=format-security +CFLAGS=-I/usr/include/exim4 -g -O2 -ffile-prefix-map=/=. -fstack-protector-strong -Wformat -Werror=format-security LDFLAGS=-Wl,-z,relro -lsodium -LDFLAGS_LIB=-I/usr/include/exim4 -fpic -shared -export-dynamic +LDFLAGS_LIB=-fpic -shared -export-dynamic .PHONY: clean all @@ -16,4 +16,4 @@ genkey: genkey.c clean: rm -f libexim-encrypt-dlfunc.so genkey -all: libexim-encrypt-dlfunc.so genkey \ No newline at end of file +all: libexim-encrypt-dlfunc.so genkey From 09ad1ea5a03a729b21cec872aff560e4ef3e0649 Mon Sep 17 00:00:00 2001 From: "heiko.reese" Date: Sat, 21 Aug 2021 02:10:54 +0200 Subject: [PATCH 3/6] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 45aada9..c644f63 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ stages: - build - test -build_buster: +build:buster: stage: build image: debian:buster before_script: @@ -15,7 +15,7 @@ build_buster: - src/genkey - src/libexim-encrypt-dlfunc.so -build_bullseye: +build:bullseye: stage: build image: debian:bullseye before_script: @@ -28,8 +28,20 @@ build_bullseye: - src/genkey - src/libexim-encrypt-dlfunc.so -test: +test:buster: stage: test + needs: ["build:buster"] + image: debian:buster + before_script: + - apt-get update && apt-get install -y exim4-daemon-heavy openssl + script: + - cd src + - ./simple_exim_test.sh + +test:bullseye: + stage: test + needs: ["build:bullseye"] + image: debian:bullseye before_script: - apt-get update && apt-get install -y exim4-daemon-heavy openssl script: From 9925009fcce724f33c098b7450c30ab602bac4dc Mon Sep 17 00:00:00 2001 From: "heiko.reese" Date: Sat, 21 Aug 2021 02:18:00 +0200 Subject: [PATCH 4/6] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c644f63..474ddff 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,7 @@ test:buster: needs: ["build:buster"] image: debian:buster before_script: - - apt-get update && apt-get install -y exim4-daemon-heavy openssl + - apt-get update && apt-get install -y exim4-daemon-heavy openssl libsodium script: - cd src - ./simple_exim_test.sh @@ -43,7 +43,7 @@ test:bullseye: needs: ["build:bullseye"] image: debian:bullseye before_script: - - apt-get update && apt-get install -y exim4-daemon-heavy openssl + - apt-get update && apt-get install -y exim4-daemon-heavy openssl libsodium script: - cd src - ./simple_exim_test.sh From 4c6091c22723424cd729cc92a42cca934b153559 Mon Sep 17 00:00:00 2001 From: "heiko.reese" Date: Sat, 21 Aug 2021 02:28:02 +0200 Subject: [PATCH 5/6] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 59 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 474ddff..f005f67 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,9 +2,8 @@ stages: - build - test -build:buster: +.build: stage: build - image: debian:buster before_script: - apt-get update && apt-get install -y build-essential exim4-dev libsodium-dev script: @@ -15,35 +14,53 @@ build:buster: - src/genkey - src/libexim-encrypt-dlfunc.so +build:buster: + extends: + - .build + image: debian:buster + build:bullseye: - stage: build image: debian:bullseye + extends: + - .build + +build:bionic: + image: ubuntu:bionic + extends: + - .build + +build:focal: + image: ubuntu:focal + extends: + - .build +.test: + stage: test before_script: - - apt-get update && apt-get install -y build-essential exim4-dev libsodium-dev + - apt-get update && apt-get install -y exim4-daemon-heavy openssl libsodium23 script: - cd src - - make all - artifacts: - paths: - - src/genkey - - src/libexim-encrypt-dlfunc.so + - ./simple_exim_test.sh test:buster: - stage: test + extends: + - .test needs: ["build:buster"] image: debian:buster - before_script: - - apt-get update && apt-get install -y exim4-daemon-heavy openssl libsodium - script: - - cd src - - ./simple_exim_test.sh test:bullseye: - stage: test + extends: + - .test needs: ["build:bullseye"] image: debian:bullseye - before_script: - - apt-get update && apt-get install -y exim4-daemon-heavy openssl libsodium - script: - - cd src - - ./simple_exim_test.sh + +test:bionic: + extends: + - .test + needs: ["build:bionic"] + image: ubuntu:bionic + +test:focal: + extends: + - .test + needs: ["build:focal"] + image: ubuntu:focal From 3053df107ab28790f9238f7af5d7ac30f5920354 Mon Sep 17 00:00:00 2001 From: "heiko.reese" Date: Sat, 21 Aug 2021 02:32:11 +0200 Subject: [PATCH 6/6] Removed all optimization flags from Makefile. --- src/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Makefile b/src/Makefile index 9ef30e9..5964293 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,11 +1,11 @@ CC=gcc -CFLAGS=-I/usr/include/exim4 -g -O2 -ffile-prefix-map=/=. -fstack-protector-strong -Wformat -Werror=format-security -LDFLAGS=-Wl,-z,relro -lsodium -LDFLAGS_LIB=-fpic -shared -export-dynamic +CFLAGS=-I/usr/include/exim4 -g +LDFLAGS=-lsodium +LDFLAGS_LIB=-fpic -shared .PHONY: clean all -.DEFAULT_GOAL := libexim-encrypt-dlfunc.so +.DEFAULT_GOAL := all libexim-encrypt-dlfunc.so: libexim-encrypt-dlfunc.c $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDFLAGS_LIB)