From dbf962fde300a8b93ad181450b7d7a284ffca0e7 Mon Sep 17 00:00:00 2001 From: gauravko Date: Sun, 26 Nov 2023 19:15:51 +0530 Subject: [PATCH 01/18] test build --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 150bffc..9e268fb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,3 +27,4 @@ workflows: build: jobs: - build + From 5e98a17659662c19f7d8c30e13b1cf7c41737313 Mon Sep 17 00:00:00 2001 From: gauravko Date: Sun, 26 Nov 2023 19:26:15 +0530 Subject: [PATCH 02/18] build fixes --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f1265e9..5a66a2e 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ prepare-travis-env: wget --no-verbose https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz tar -xzf nginx-${NGINX_VERSION}.tar.gz ln -s nginx-${NGINX_VERSION} ${NGX_PATH} - cd ${NGX_PATH} && ./configure --with-http_ssl_module --with-cc=$(CC) --add-module=. + cd ${NGX_PATH} && ./auto/configure --with-http_ssl_module --with-cc=$(CC) --add-module=. nginx: cd ${NGX_PATH} && rm -rf ${NGX_PATH}/objs/src/core/nginx.o && make From 2a89fc11960f1a7083901c41e48e64d0fc27d2f1 Mon Sep 17 00:00:00 2001 From: gauravko Date: Sun, 26 Nov 2023 20:04:22 +0530 Subject: [PATCH 03/18] makefile fix --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5a66a2e..48e2928 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ prepare-travis-env: wget --no-verbose https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz tar -xzf nginx-${NGINX_VERSION}.tar.gz ln -s nginx-${NGINX_VERSION} ${NGX_PATH} - cd ${NGX_PATH} && ./auto/configure --with-http_ssl_module --with-cc=$(CC) --add-module=. + cd ${NGX_PATH} && ./auto/configure --with-http_ssl_module --with-cc=$(CC) --add-module=~/project nginx: cd ${NGX_PATH} && rm -rf ${NGX_PATH}/objs/src/core/nginx.o && make From 65b48b2d0fcfb95b41d4930925ef77699b04ae70 Mon Sep 17 00:00:00 2001 From: gauravko Date: Sun, 26 Nov 2023 20:06:14 +0530 Subject: [PATCH 04/18] makefile fix --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 48e2928..4ced416 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ prepare-travis-env: wget --no-verbose https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz tar -xzf nginx-${NGINX_VERSION}.tar.gz ln -s nginx-${NGINX_VERSION} ${NGX_PATH} - cd ${NGX_PATH} && ./auto/configure --with-http_ssl_module --with-cc=$(CC) --add-module=~/project + cd ${NGX_PATH} && ./configure --with-http_ssl_module --with-cc=$(CC) --add-module=~/project nginx: cd ${NGX_PATH} && rm -rf ${NGX_PATH}/objs/src/core/nginx.o && make From aa8584ef0c9d7133f2d7514940b21e82a9f28042 Mon Sep 17 00:00:00 2001 From: gauravko Date: Sun, 26 Nov 2023 20:08:10 +0530 Subject: [PATCH 05/18] makefile fix --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4ced416..a15bb21 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ prepare-travis-env: wget --no-verbose https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz tar -xzf nginx-${NGINX_VERSION}.tar.gz ln -s nginx-${NGINX_VERSION} ${NGX_PATH} - cd ${NGX_PATH} && ./configure --with-http_ssl_module --with-cc=$(CC) --add-module=~/project + cd ${NGX_PATH} && ./configure --with-http_ssl_module --with-cc=$(CC) --add-module=~/project/ngx_aws_auth nginx: cd ${NGX_PATH} && rm -rf ${NGX_PATH}/objs/src/core/nginx.o && make From 9664666898775241e01e9b2564426072a95d29a0 Mon Sep 17 00:00:00 2001 From: gauravko Date: Sun, 26 Nov 2023 20:30:58 +0530 Subject: [PATCH 06/18] makefile fix --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index a15bb21..fb4485d 100644 --- a/Makefile +++ b/Makefile @@ -16,6 +16,7 @@ prepare-travis-env: wget --no-verbose https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz tar -xzf nginx-${NGINX_VERSION}.tar.gz ln -s nginx-${NGINX_VERSION} ${NGX_PATH} + ls /root cd ${NGX_PATH} && ./configure --with-http_ssl_module --with-cc=$(CC) --add-module=~/project/ngx_aws_auth nginx: From 32830054d80155962b6919be2b442fddb4874ddc Mon Sep 17 00:00:00 2001 From: gauravko Date: Sun, 26 Nov 2023 20:33:19 +0530 Subject: [PATCH 07/18] makefile fix --- .circleci/config.yml | 1 + Makefile | 1 + 2 files changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9e268fb..2e66290 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,6 +15,7 @@ jobs: apt-get update apt-get install -y libpcre3 libpcre3-dev zlib1g-dev libssl-dev build-essential wget - checkout + - run: echo "The code is in $(pwd)" - run: name: Build and test command: | diff --git a/Makefile b/Makefile index fb4485d..a593ed7 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,7 @@ prepare-travis-env: tar -xzf nginx-${NGINX_VERSION}.tar.gz ln -s nginx-${NGINX_VERSION} ${NGX_PATH} ls /root + ls /root/project cd ${NGX_PATH} && ./configure --with-http_ssl_module --with-cc=$(CC) --add-module=~/project/ngx_aws_auth nginx: From 6ec4dfbcfa0d13b5069a458881bb5865c8c9e8ee Mon Sep 17 00:00:00 2001 From: gauravko Date: Sun, 26 Nov 2023 20:35:36 +0530 Subject: [PATCH 08/18] makefile fix --- .circleci/config.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2e66290..c9e9ec3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,11 @@ jobs: apt-get update apt-get install -y libpcre3 libpcre3-dev zlib1g-dev libssl-dev build-essential wget - checkout - - run: echo "The code is in $(pwd)" + - run: + name : check out nginx + command : | + echo "The code is in $(pwd)" + pwd - run: name: Build and test command: | From 026e4cd2e41e08b334d834c8797dfb82b929f4fd Mon Sep 17 00:00:00 2001 From: gauravko Date: Sun, 26 Nov 2023 20:37:30 +0530 Subject: [PATCH 09/18] makefile fix --- .circleci/config.yml | 2 +- Makefile | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c9e9ec3..5ac8624 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,7 +19,7 @@ jobs: name : check out nginx command : | echo "The code is in $(pwd)" - pwd + echo "The code is in $(ls -la)" - run: name: Build and test command: | diff --git a/Makefile b/Makefile index a593ed7..be4f8a3 100644 --- a/Makefile +++ b/Makefile @@ -16,9 +16,7 @@ prepare-travis-env: wget --no-verbose https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz tar -xzf nginx-${NGINX_VERSION}.tar.gz ln -s nginx-${NGINX_VERSION} ${NGX_PATH} - ls /root - ls /root/project - cd ${NGX_PATH} && ./configure --with-http_ssl_module --with-cc=$(CC) --add-module=~/project/ngx_aws_auth + cd ${NGX_PATH} && ./configure --with-http_ssl_module --with-cc=$(CC) --add-module=/root/project nginx: cd ${NGX_PATH} && rm -rf ${NGX_PATH}/objs/src/core/nginx.o && make From 23a4cd13b61d367d07f36f7b1ee595d1f58ed0b4 Mon Sep 17 00:00:00 2001 From: gauravko Date: Sun, 26 Nov 2023 20:39:28 +0530 Subject: [PATCH 10/18] makefile fix --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5ac8624..a0b6470 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,13 +13,13 @@ jobs: name: Install dependencies command: | apt-get update - apt-get install -y libpcre3 libpcre3-dev zlib1g-dev libssl-dev build-essential wget + apt-get install -y libpcre3 libpcre3-dev zlib1g-dev libssl-dev build-essential wget cmake - checkout - - run: - name : check out nginx - command : | - echo "The code is in $(pwd)" - echo "The code is in $(ls -la)" + # - run: + # name : check out nginx + # command : | + # echo "The code is in $(pwd)" + # echo "The code is in $(ls -la)" - run: name: Build and test command: | From c03ab4f087f669942389ebec4387755ed8031255 Mon Sep 17 00:00:00 2001 From: gauravko Date: Sun, 26 Nov 2023 20:44:33 +0530 Subject: [PATCH 11/18] makefile fix --- .circleci/config.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a0b6470..65db45e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,7 +13,10 @@ jobs: name: Install dependencies command: | apt-get update - apt-get install -y libpcre3 libpcre3-dev zlib1g-dev libssl-dev build-essential wget cmake + apt-get install -y libpcre3 libpcre3-dev zlib1g-dev libssl-dev build-essential wget + echo 'tzdata tzdata/Areas select Etc' | debconf-set-selections + echo 'tzdata tzdata/Zones/Etc select UTC' | debconf-set-selections + apt-get install -y cmake - checkout # - run: # name : check out nginx From 88e299fa95cc566d8b6c1935afd5b03b4f6eb627 Mon Sep 17 00:00:00 2001 From: gauravko Date: Sun, 26 Nov 2023 20:50:10 +0530 Subject: [PATCH 12/18] makefile fix --- .circleci/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 65db45e..884e529 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,8 +14,12 @@ jobs: command: | apt-get update apt-get install -y libpcre3 libpcre3-dev zlib1g-dev libssl-dev build-essential wget + -run: + name: Install cmake + command: | echo 'tzdata tzdata/Areas select Etc' | debconf-set-selections echo 'tzdata tzdata/Zones/Etc select UTC' | debconf-set-selections + DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata apt-get install -y cmake - checkout # - run: From b0fa6c0833967c34b136231e15302adb85bd6ea7 Mon Sep 17 00:00:00 2001 From: gauravko Date: Sun, 26 Nov 2023 20:52:34 +0530 Subject: [PATCH 13/18] makefile fix --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 884e529..776eb47 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,9 +14,9 @@ jobs: command: | apt-get update apt-get install -y libpcre3 libpcre3-dev zlib1g-dev libssl-dev build-essential wget - -run: - name: Install cmake - command: | + - run: + name: Install cmake + command: | echo 'tzdata tzdata/Areas select Etc' | debconf-set-selections echo 'tzdata tzdata/Zones/Etc select UTC' | debconf-set-selections DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata From eed560db865c763e4e18ef98de49bc71f69b072d Mon Sep 17 00:00:00 2001 From: gauravko Date: Mon, 27 Nov 2023 13:03:17 +0530 Subject: [PATCH 14/18] makefile fix --- .circleci/config.yml | 6 +----- Makefile | 2 ++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 776eb47..9728e9f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,11 +22,7 @@ jobs: DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata apt-get install -y cmake - checkout - # - run: - # name : check out nginx - # command : | - # echo "The code is in $(pwd)" - # echo "The code is in $(ls -la)" + - run: name: Build and test command: | diff --git a/Makefile b/Makefile index be4f8a3..8cd4060 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,8 @@ nginx: cd ${NGX_PATH} && rm -rf ${NGX_PATH}/objs/src/core/nginx.o && make vendor/cmocka: + cd /root/project + echo "git submodule init && git submodule update" git submodule init && git submodule update .cmocka_build: vendor/cmocka From f3523669146124b898ccf9da8849ba3445c9b658 Mon Sep 17 00:00:00 2001 From: gauravko Date: Mon, 27 Nov 2023 18:38:33 +0530 Subject: [PATCH 15/18] makefile fix --- Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 8cd4060..5bb8dde 100644 --- a/Makefile +++ b/Makefile @@ -22,13 +22,11 @@ nginx: cd ${NGX_PATH} && rm -rf ${NGX_PATH}/objs/src/core/nginx.o && make vendor/cmocka: - cd /root/project - echo "git submodule init && git submodule update" - git submodule init && git submodule update + cd /root/project && git submodule init && git submodule update .cmocka_build: vendor/cmocka mkdir .cmocka_build && cd .cmocka_build \ - && cmake -DCMAKE_C_COMPILER=$(CC) -DCMAKE_MAKE_PROGRAM=make ../vendor/cmocka \ + && cmake -DCMAKE_C_COMPILER=$(CC) -DCMAKE_MAKE_PROGRAM=make /root/project/vendor/cmocka \ && make && sudo make install test: .cmocka_build | nginx From cc428f6dc64ced5b43bd9042dfe325eee0e885db Mon Sep 17 00:00:00 2001 From: gauravko Date: Mon, 27 Nov 2023 18:44:42 +0530 Subject: [PATCH 16/18] makefile fix --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5bb8dde..0ed6bc1 100644 --- a/Makefile +++ b/Makefile @@ -24,8 +24,8 @@ nginx: vendor/cmocka: cd /root/project && git submodule init && git submodule update -.cmocka_build: vendor/cmocka - mkdir .cmocka_build && cd .cmocka_build \ +.cmocka_build: + cd /root/project && git submodule init && git submodule update && mkdir .cmocka_build && cd .cmocka_build \ && cmake -DCMAKE_C_COMPILER=$(CC) -DCMAKE_MAKE_PROGRAM=make /root/project/vendor/cmocka \ && make && sudo make install From 0ad0966d962eaf59c4d3fd4f42279f397784ad15 Mon Sep 17 00:00:00 2001 From: gauravko Date: Mon, 27 Nov 2023 18:46:59 +0530 Subject: [PATCH 17/18] makefile fix --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9728e9f..1f97e5b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,7 +13,7 @@ jobs: name: Install dependencies command: | apt-get update - apt-get install -y libpcre3 libpcre3-dev zlib1g-dev libssl-dev build-essential wget + apt-get install -y libpcre3 libpcre3-dev zlib1g-dev libssl-dev build-essential wget git - run: name: Install cmake command: | From 84e7780674e79ab89d346807a344ec88e03ca15a Mon Sep 17 00:00:00 2001 From: gauravko Date: Mon, 27 Nov 2023 18:49:29 +0530 Subject: [PATCH 18/18] makefile fix --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1f97e5b..ee50d98 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,7 +13,7 @@ jobs: name: Install dependencies command: | apt-get update - apt-get install -y libpcre3 libpcre3-dev zlib1g-dev libssl-dev build-essential wget git + apt-get install -y libpcre3 libpcre3-dev zlib1g-dev libssl-dev build-essential wget git sudo - run: name: Install cmake command: |