* [PR PATCH] [WIP] nginx: update to 1.20.1.
@ 2021-07-20 19:15 ardadem
2021-07-21 7:52 ` [PR PATCH] [Updated] " ardadem
` (13 more replies)
0 siblings, 14 replies; 15+ messages in thread
From: ardadem @ 2021-07-20 19:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1725 bytes --]
There is a new pull request by ardadem against master on the void-packages repository
https://github.com/ardadem/void-packages pr-nginx-120
https://github.com/void-linux/void-packages/pull/32070
[WIP] nginx: update to 1.20.1.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
# TODO:
- [ ] missing checkdepends
- [ ] rebase aarch patch if it's outdated
- [ ] build for x86_64, musl and aarch64-cross
A patch file from https://github.com/void-linux/void-packages/pull/32070.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-nginx-120-32070.patch --]
[-- Type: text/x-diff, Size: 3320 bytes --]
From b44a8335257356faf981b9838e0828678cec5e2f Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 20 Jul 2021 22:08:09 +0300
Subject: [PATCH] nginx: update to 1.20.1.
---
.../fix-libressl-stapling-issues.patch | 27 -------------------
srcpkgs/nginx/template | 18 +++++++++----
2 files changed, 13 insertions(+), 32 deletions(-)
delete mode 100644 srcpkgs/nginx/patches/fix-libressl-stapling-issues.patch
diff --git a/srcpkgs/nginx/patches/fix-libressl-stapling-issues.patch b/srcpkgs/nginx/patches/fix-libressl-stapling-issues.patch
deleted file mode 100644
index 4bb73f5ebb26..000000000000
--- a/srcpkgs/nginx/patches/fix-libressl-stapling-issues.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-ref: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=237757#c5
---- a/src/event/ngx_event_openssl_stapling.c.org 2019-05-12 23:56:58.526833000 +0200
-+++ b/src/event/ngx_event_openssl_stapling.c 2019-05-13 01:31:53.737800000 +0200
-@@ -298,7 +298,10 @@
- SSL_CTX_select_current_cert(ssl->ctx, cert);
- #endif
-
--#ifdef SSL_CTRL_GET_EXTRA_CHAIN_CERTS
-+#ifdef SSL_CTX_get0_chain_certs
-+ /* OpenSSL 1.0.2+ */
-+ SSL_CTX_get0_chain_certs(ssl->ctx, &chain);
-+#elif SSL_CTRL_GET_EXTRA_CHAIN_CERTS
- /* OpenSSL 1.0.1+ */
- SSL_CTX_get_extra_chain_certs(ssl->ctx, &chain);
- #else
-@@ -655,7 +658,10 @@
- SSL_CTX_select_current_cert(staple->ssl_ctx, ctx->cert);
- #endif
-
--#ifdef SSL_CTRL_GET_EXTRA_CHAIN_CERTS
-+#ifdef SSL_CTX_get0_chain_certs
-+ /* OpenSSL 1.0.2+ */
-+ SSL_CTX_get0_chain_certs(staple->ssl_ctx, &chain);
-+#elif SSL_CTRL_GET_EXTRA_CHAIN_CERTS
- /* OpenSSL 1.0.1+ */
- SSL_CTX_get_extra_chain_certs(staple->ssl_ctx, &chain);
- #else
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index cd0b19da95c6..fdd7905367d0 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,16 +1,20 @@
# Template file for 'nginx'
pkgname=nginx
-version=1.18.0
-revision=5
+version=1.20.1
+revision=1
+_tests_commit=feb754918372
build_style=gnu-makefile
hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
makedepends="${hostmakedepends}"
+checkdepends="perl perl-IO-Socket-SSL which"
short_desc="High performance web and reverse proxy server"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://nginx.org"
-distfiles="https://nginx.org/download/nginx-${version}.tar.gz"
-checksum=4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99
+distfiles="https://nginx.org/download/nginx-${version}.tar.gz
+ https://hg.nginx.org/nginx-tests/archive/${_tests_commit}.tar.gz"
+checksum="e462e11533d5c30baa05df7652160ff5979591d291736cfa5edb9fd2edb48c49
+ 6166ed3a9202ad4065a83fa5c8f3a39d71bba9aa983b00652b7b1332291e3355"
# NOTE:
# On update, the pregenerated header file for ARM may need synchronization.
@@ -93,8 +97,12 @@ pre_build() {
sed -i 's/-lcrypt/$(LDFLAGS) &/' objs/Makefile
}
+do_check() {
+ TEST_NGINX_BINARY="${wrksrc}/objs/nginx" prove "${XBPS_BUILDDIR}/${pkgname}-tests-${_tests_commit}"
+}
+
post_install() {
- sed -e 's|\<user\s\+\w\+;|user html;|g' \
+ sed -e 's|\<user\s\+\w\+;|user http;|g' \
-e '44s|html|/usr/share/nginx/html|' \
-e '54s|html|/usr/share/nginx/html|' \
-i "$DESTDIR/etc/nginx/nginx.conf"
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] nginx: update to 1.20.1.
2021-07-20 19:15 [PR PATCH] [WIP] nginx: update to 1.20.1 ardadem
@ 2021-07-21 7:52 ` ardadem
2021-08-14 11:06 ` [PR REVIEW] " paper42
` (12 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: ardadem @ 2021-07-21 7:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1730 bytes --]
There is an updated pull request by ardadem against master on the void-packages repository
https://github.com/ardadem/void-packages pr-nginx-120
https://github.com/void-linux/void-packages/pull/32070
[WIP] nginx: update to 1.20.1.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
# TODO:
- [ ] missing checkdepends
- [ ] rebase aarch patch if it's outdated
- [ ] build for x86_64, musl and aarch64-cross
A patch file from https://github.com/void-linux/void-packages/pull/32070.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-nginx-120-32070.patch --]
[-- Type: text/x-diff, Size: 3424 bytes --]
From b48434cc3074be98092d57c9214d126ed6b94eb3 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 20 Jul 2021 22:08:09 +0300
Subject: [PATCH] nginx: update to 1.20.1.
---
.../fix-libressl-stapling-issues.patch | 27 -------------------
srcpkgs/nginx/template | 21 +++++++++++----
2 files changed, 16 insertions(+), 32 deletions(-)
delete mode 100644 srcpkgs/nginx/patches/fix-libressl-stapling-issues.patch
diff --git a/srcpkgs/nginx/patches/fix-libressl-stapling-issues.patch b/srcpkgs/nginx/patches/fix-libressl-stapling-issues.patch
deleted file mode 100644
index 4bb73f5ebb26..000000000000
--- a/srcpkgs/nginx/patches/fix-libressl-stapling-issues.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-ref: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=237757#c5
---- a/src/event/ngx_event_openssl_stapling.c.org 2019-05-12 23:56:58.526833000 +0200
-+++ b/src/event/ngx_event_openssl_stapling.c 2019-05-13 01:31:53.737800000 +0200
-@@ -298,7 +298,10 @@
- SSL_CTX_select_current_cert(ssl->ctx, cert);
- #endif
-
--#ifdef SSL_CTRL_GET_EXTRA_CHAIN_CERTS
-+#ifdef SSL_CTX_get0_chain_certs
-+ /* OpenSSL 1.0.2+ */
-+ SSL_CTX_get0_chain_certs(ssl->ctx, &chain);
-+#elif SSL_CTRL_GET_EXTRA_CHAIN_CERTS
- /* OpenSSL 1.0.1+ */
- SSL_CTX_get_extra_chain_certs(ssl->ctx, &chain);
- #else
-@@ -655,7 +658,10 @@
- SSL_CTX_select_current_cert(staple->ssl_ctx, ctx->cert);
- #endif
-
--#ifdef SSL_CTRL_GET_EXTRA_CHAIN_CERTS
-+#ifdef SSL_CTX_get0_chain_certs
-+ /* OpenSSL 1.0.2+ */
-+ SSL_CTX_get0_chain_certs(staple->ssl_ctx, &chain);
-+#elif SSL_CTRL_GET_EXTRA_CHAIN_CERTS
- /* OpenSSL 1.0.1+ */
- SSL_CTX_get_extra_chain_certs(staple->ssl_ctx, &chain);
- #else
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index cd0b19da95c6..e4d4f33bd349 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,16 +1,22 @@
# Template file for 'nginx'
pkgname=nginx
-version=1.18.0
-revision=5
+version=1.20.1
+revision=1
+_tests_commit=feb754918372
build_style=gnu-makefile
hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
makedepends="${hostmakedepends}"
+checkdepends="perl perl-IO-Socket-SSL which"
short_desc="High performance web and reverse proxy server"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://nginx.org"
-distfiles="https://nginx.org/download/nginx-${version}.tar.gz"
-checksum=4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99
+distfiles="https://nginx.org/download/nginx-${version}.tar.gz
+ https://hg.nginx.org/nginx-tests/archive/${_tests_commit}.tar.gz"
+checksum="e462e11533d5c30baa05df7652160ff5979591d291736cfa5edb9fd2edb48c49
+ 6166ed3a9202ad4065a83fa5c8f3a39d71bba9aa983b00652b7b1332291e3355"
+# tests fail when nginx run as root and there is no nginx user
+make_check=ci-skip
# NOTE:
# On update, the pregenerated header file for ARM may need synchronization.
@@ -93,8 +99,13 @@ pre_build() {
sed -i 's/-lcrypt/$(LDFLAGS) &/' objs/Makefile
}
+do_check() {
+ TEST_NGINX_BINARY="$XBPS_BUILDDIR/${pkgname}-${version}/objs/nginx" \
+ prove "../${pkgname}-tests-${_tests_commit}"
+}
+
post_install() {
- sed -e 's|\<user\s\+\w\+;|user html;|g' \
+ sed -e 's|\<user\s\+\w\+;|user http;|g' \
-e '44s|html|/usr/share/nginx/html|' \
-e '54s|html|/usr/share/nginx/html|' \
-i "$DESTDIR/etc/nginx/nginx.conf"
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR REVIEW] [WIP] nginx: update to 1.20.1.
2021-07-20 19:15 [PR PATCH] [WIP] nginx: update to 1.20.1 ardadem
2021-07-21 7:52 ` [PR PATCH] [Updated] " ardadem
@ 2021-08-14 11:06 ` paper42
2021-08-14 11:20 ` ardadem
` (11 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: paper42 @ 2021-08-14 11:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 196 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/32070#discussion_r688916702
Comment:
Could you explain why you decided to change this?
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR REVIEW] [WIP] nginx: update to 1.20.1.
2021-07-20 19:15 [PR PATCH] [WIP] nginx: update to 1.20.1 ardadem
2021-07-21 7:52 ` [PR PATCH] [Updated] " ardadem
2021-08-14 11:06 ` [PR REVIEW] " paper42
@ 2021-08-14 11:20 ` ardadem
2021-08-14 11:47 ` Chocimier
` (10 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: ardadem @ 2021-08-14 11:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 206 bytes --]
New review comment by ardadem on void-packages repository
https://github.com/void-linux/void-packages/pull/32070#discussion_r688918252
Comment:
Uh, i will not change it actually. I haven't rebase it yet.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR REVIEW] [WIP] nginx: update to 1.20.1.
2021-07-20 19:15 [PR PATCH] [WIP] nginx: update to 1.20.1 ardadem
` (2 preceding siblings ...)
2021-08-14 11:20 ` ardadem
@ 2021-08-14 11:47 ` Chocimier
2021-08-14 12:25 ` [PR PATCH] [Updated] " ardadem
` (9 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Chocimier @ 2021-08-14 11:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 485 bytes --]
New review comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/32070#discussion_r688920893
Comment:
With that, files from second archive are left in builddir, because xbps-src removes only `wrksrc`, which is `nginx-${version}` extracted from first archive here.
Add `create_wrksrc=yes` `build_wrksrc="nginx-${version}"` `TEST_NGINX_BINARY="$PWD/objs/nginx"`, so both archives are extracted under `wrksrc` and get removed after build.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] nginx: update to 1.20.1.
2021-07-20 19:15 [PR PATCH] [WIP] nginx: update to 1.20.1 ardadem
` (3 preceding siblings ...)
2021-08-14 11:47 ` Chocimier
@ 2021-08-14 12:25 ` ardadem
2021-08-14 12:34 ` [PR REVIEW] " ardadem
` (8 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: ardadem @ 2021-08-14 12:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1730 bytes --]
There is an updated pull request by ardadem against master on the void-packages repository
https://github.com/ardadem/void-packages pr-nginx-120
https://github.com/void-linux/void-packages/pull/32070
[WIP] nginx: update to 1.20.1.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
# TODO:
- [ ] missing checkdepends
- [ ] rebase aarch patch if it's outdated
- [ ] build for x86_64, musl and aarch64-cross
A patch file from https://github.com/void-linux/void-packages/pull/32070.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-nginx-120-32070.patch --]
[-- Type: text/x-diff, Size: 3321 bytes --]
From d759c083ce5eb9f3de8aa921c8792af3048a3d07 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 20 Jul 2021 22:08:09 +0300
Subject: [PATCH] nginx: update to 1.20.1.
---
.../fix-libressl-stapling-issues.patch | 27 -------------------
srcpkgs/nginx/template | 21 ++++++++++++---
2 files changed, 17 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/nginx/patches/fix-libressl-stapling-issues.patch
diff --git a/srcpkgs/nginx/patches/fix-libressl-stapling-issues.patch b/srcpkgs/nginx/patches/fix-libressl-stapling-issues.patch
deleted file mode 100644
index 4bb73f5ebb26..000000000000
--- a/srcpkgs/nginx/patches/fix-libressl-stapling-issues.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-ref: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=237757#c5
---- a/src/event/ngx_event_openssl_stapling.c.org 2019-05-12 23:56:58.526833000 +0200
-+++ b/src/event/ngx_event_openssl_stapling.c 2019-05-13 01:31:53.737800000 +0200
-@@ -298,7 +298,10 @@
- SSL_CTX_select_current_cert(ssl->ctx, cert);
- #endif
-
--#ifdef SSL_CTRL_GET_EXTRA_CHAIN_CERTS
-+#ifdef SSL_CTX_get0_chain_certs
-+ /* OpenSSL 1.0.2+ */
-+ SSL_CTX_get0_chain_certs(ssl->ctx, &chain);
-+#elif SSL_CTRL_GET_EXTRA_CHAIN_CERTS
- /* OpenSSL 1.0.1+ */
- SSL_CTX_get_extra_chain_certs(ssl->ctx, &chain);
- #else
-@@ -655,7 +658,10 @@
- SSL_CTX_select_current_cert(staple->ssl_ctx, ctx->cert);
- #endif
-
--#ifdef SSL_CTRL_GET_EXTRA_CHAIN_CERTS
-+#ifdef SSL_CTX_get0_chain_certs
-+ /* OpenSSL 1.0.2+ */
-+ SSL_CTX_get0_chain_certs(staple->ssl_ctx, &chain);
-+#elif SSL_CTRL_GET_EXTRA_CHAIN_CERTS
- /* OpenSSL 1.0.1+ */
- SSL_CTX_get_extra_chain_certs(staple->ssl_ctx, &chain);
- #else
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 73b460d23e53..e7df48d82ade 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,16 +1,24 @@
# Template file for 'nginx'
pkgname=nginx
-version=1.18.0
-revision=6
+version=1.20.1
+revision=1
+_tests_commit=feb754918372
+create_wrksrc=yes
+build_wrksrc="nginx-${version}"
build_style=gnu-makefile
hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
makedepends="${hostmakedepends}"
+checkdepends="perl perl-IO-Socket-SSL which"
short_desc="High performance web and reverse proxy server"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://nginx.org"
-distfiles="https://nginx.org/download/nginx-${version}.tar.gz"
-checksum=4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99
+distfiles="https://nginx.org/download/nginx-${version}.tar.gz
+ https://hg.nginx.org/nginx-tests/archive/${_tests_commit}.tar.gz"
+checksum="e462e11533d5c30baa05df7652160ff5979591d291736cfa5edb9fd2edb48c49
+ 6166ed3a9202ad4065a83fa5c8f3a39d71bba9aa983b00652b7b1332291e3355"
+# tests fail when nginx run as root and there is no nginx user
+make_check=ci-skip
# NOTE:
# On update, the pregenerated header file for ARM may need synchronization.
@@ -94,6 +102,11 @@ pre_build() {
sed -i 's/-lcrypt/$(LDFLAGS) &/' objs/Makefile
}
+do_check() {
+ TEST_NGINX_BINARY="$PWD/objs/nginx" \
+ prove "../${pkgname}-tests-${_tests_commit}"
+}
+
post_install() {
sed -e 's|\<user\s\+\w\+;|user html;|g' \
-e '44s|html|/usr/share/nginx/html|' \
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR REVIEW] [WIP] nginx: update to 1.20.1.
2021-07-20 19:15 [PR PATCH] [WIP] nginx: update to 1.20.1 ardadem
` (4 preceding siblings ...)
2021-08-14 12:25 ` [PR PATCH] [Updated] " ardadem
@ 2021-08-14 12:34 ` ardadem
2021-08-14 12:34 ` ardadem
` (7 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: ardadem @ 2021-08-14 12:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 240 bytes --]
New review comment by ardadem on void-packages repository
https://github.com/void-linux/void-packages/pull/32070#discussion_r688925534
Comment:
Hm, then can i ask why `create_wrksrc=yes` is not automated when there is multiple distfiles?
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR REVIEW] [WIP] nginx: update to 1.20.1.
2021-07-20 19:15 [PR PATCH] [WIP] nginx: update to 1.20.1 ardadem
` (5 preceding siblings ...)
2021-08-14 12:34 ` [PR REVIEW] " ardadem
@ 2021-08-14 12:34 ` ardadem
2021-08-14 12:50 ` ardadem
` (6 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: ardadem @ 2021-08-14 12:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 241 bytes --]
New review comment by ardadem on void-packages repository
https://github.com/void-linux/void-packages/pull/32070#discussion_r688925534
Comment:
Hm, then can i ask why `create_wrksrc=yes` is not automated when there are multiple distfiles?
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR REVIEW] [WIP] nginx: update to 1.20.1.
2021-07-20 19:15 [PR PATCH] [WIP] nginx: update to 1.20.1 ardadem
` (6 preceding siblings ...)
2021-08-14 12:34 ` ardadem
@ 2021-08-14 12:50 ` ardadem
2021-08-14 12:53 ` Chocimier
` (5 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: ardadem @ 2021-08-14 12:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 173 bytes --]
New review comment by ardadem on void-packages repository
https://github.com/void-linux/void-packages/pull/32070#discussion_r688927180
Comment:
Is there any other reason?
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR REVIEW] [WIP] nginx: update to 1.20.1.
2021-07-20 19:15 [PR PATCH] [WIP] nginx: update to 1.20.1 ardadem
` (7 preceding siblings ...)
2021-08-14 12:50 ` ardadem
@ 2021-08-14 12:53 ` Chocimier
2021-08-15 14:26 ` [PR PATCH] [Updated] " ardadem
` (4 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Chocimier @ 2021-08-14 12:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 370 bytes --]
New review comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/32070#discussion_r688927509
Comment:
Sometimes it is required to move secondary archives into main one.
Other times, it's not necessary because one file is archive and others are non-archives marked with skip_extraction and handled separately with vinstall.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] nginx: update to 1.20.1.
2021-07-20 19:15 [PR PATCH] [WIP] nginx: update to 1.20.1 ardadem
` (8 preceding siblings ...)
2021-08-14 12:53 ` Chocimier
@ 2021-08-15 14:26 ` ardadem
2021-08-15 14:30 ` ardadem
` (3 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: ardadem @ 2021-08-15 14:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1730 bytes --]
There is an updated pull request by ardadem against master on the void-packages repository
https://github.com/ardadem/void-packages pr-nginx-120
https://github.com/void-linux/void-packages/pull/32070
[WIP] nginx: update to 1.20.1.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
# TODO:
- [ ] missing checkdepends
- [ ] rebase aarch patch if it's outdated
- [ ] build for x86_64, musl and aarch64-cross
A patch file from https://github.com/void-linux/void-packages/pull/32070.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-nginx-120-32070.patch --]
[-- Type: text/x-diff, Size: 5469 bytes --]
From 91c33a56e371b34b38145d2ba29aaf3d27077ed1 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Fri, 23 Jul 2021 09:37:52 +0300
Subject: [PATCH 1/3] New package: perl-GD-2.73
---
srcpkgs/perl-GD/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/perl-GD/template
diff --git a/srcpkgs/perl-GD/template b/srcpkgs/perl-GD/template
new file mode 100644
index 000000000000..0435909e928c
--- /dev/null
+++ b/srcpkgs/perl-GD/template
@@ -0,0 +1,18 @@
+# Template file for 'perl-GD'
+pkgname=perl-GD
+version=2.73
+revision=1
+wrksrc="GD-${version}"
+build_style=perl-module
+hostmakedepends="perl-ExtUtils-PkgConfig"
+makedepends="gd-devel"
+short_desc="Interface to Gd Graphics Library"
+maintainer="Arda Demir <ddmirarda@gmail.com>"
+license="Artistic-2.0, GPL-1.0-or-later"
+homepage="https://metacpan.org/pod/GD"
+distfiles="${CPAN_SITE}/GD/GD-${version}.tar.gz"
+checksum=491c9e73238522e2987e66725a20935f4268a3864202ecbaf4659a1691ba322b
+
+post_install() {
+ vlicense LICENSE
+}
From a665c067229062245057dae9d3b3587316751281 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Sun, 15 Aug 2021 12:41:20 +0300
Subject: [PATCH 2/3] New package: perl-FCGI-0.82
---
srcpkgs/perl-FCGI/template | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 srcpkgs/perl-FCGI/template
diff --git a/srcpkgs/perl-FCGI/template b/srcpkgs/perl-FCGI/template
new file mode 100644
index 000000000000..01a5aad9da70
--- /dev/null
+++ b/srcpkgs/perl-FCGI/template
@@ -0,0 +1,19 @@
+# Template file for 'perl-FCGI'
+pkgname=perl-FCGI
+version=0.82
+revision=1
+wrksrc="FCGI-${version}"
+build_style=perl-module
+makedepends="fcgi-devel"
+short_desc="Fast CGI module"
+maintainer="Arda Demir <ddmirarda@gmail.com>"
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
+homepage="https://metacpan.org/pod/FCGI"
+distfiles="${CPAN_SITE}/FCGI/FCGI-${version}.tar.gz"
+checksum=4c7d60e26da2c07f058a4e345021e92505273b33c9542215977e084611f09ecf
+# Test requires unpackaged module: FCGI::Client
+make_check=no
+
+post_install() {
+ vlicense LICENSE
+}
From aebec8deb97e19f1169c761d0e55eb102d681ce4 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 20 Jul 2021 22:08:09 +0300
Subject: [PATCH 3/3] nginx: update to 1.20.1.
---
.../fix-libressl-stapling-issues.patch | 27 -------------------
srcpkgs/nginx/template | 21 ++++++++++++---
2 files changed, 17 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/nginx/patches/fix-libressl-stapling-issues.patch
diff --git a/srcpkgs/nginx/patches/fix-libressl-stapling-issues.patch b/srcpkgs/nginx/patches/fix-libressl-stapling-issues.patch
deleted file mode 100644
index 4bb73f5ebb26..000000000000
--- a/srcpkgs/nginx/patches/fix-libressl-stapling-issues.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-ref: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=237757#c5
---- a/src/event/ngx_event_openssl_stapling.c.org 2019-05-12 23:56:58.526833000 +0200
-+++ b/src/event/ngx_event_openssl_stapling.c 2019-05-13 01:31:53.737800000 +0200
-@@ -298,7 +298,10 @@
- SSL_CTX_select_current_cert(ssl->ctx, cert);
- #endif
-
--#ifdef SSL_CTRL_GET_EXTRA_CHAIN_CERTS
-+#ifdef SSL_CTX_get0_chain_certs
-+ /* OpenSSL 1.0.2+ */
-+ SSL_CTX_get0_chain_certs(ssl->ctx, &chain);
-+#elif SSL_CTRL_GET_EXTRA_CHAIN_CERTS
- /* OpenSSL 1.0.1+ */
- SSL_CTX_get_extra_chain_certs(ssl->ctx, &chain);
- #else
-@@ -655,7 +658,10 @@
- SSL_CTX_select_current_cert(staple->ssl_ctx, ctx->cert);
- #endif
-
--#ifdef SSL_CTRL_GET_EXTRA_CHAIN_CERTS
-+#ifdef SSL_CTX_get0_chain_certs
-+ /* OpenSSL 1.0.2+ */
-+ SSL_CTX_get0_chain_certs(staple->ssl_ctx, &chain);
-+#elif SSL_CTRL_GET_EXTRA_CHAIN_CERTS
- /* OpenSSL 1.0.1+ */
- SSL_CTX_get_extra_chain_certs(staple->ssl_ctx, &chain);
- #else
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 73b460d23e53..501a833c9d08 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,16 +1,24 @@
# Template file for 'nginx'
pkgname=nginx
-version=1.18.0
-revision=6
+version=1.20.1
+revision=1
+_tests_commit=feb754918372
+create_wrksrc=yes
+build_wrksrc="nginx-${version}"
build_style=gnu-makefile
hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
makedepends="${hostmakedepends}"
+checkdepends="perl perl-IO-Socket-SSL perl-GD perl-FCGI which"
short_desc="High performance web and reverse proxy server"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://nginx.org"
-distfiles="https://nginx.org/download/nginx-${version}.tar.gz"
-checksum=4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99
+distfiles="https://nginx.org/download/nginx-${version}.tar.gz
+ https://hg.nginx.org/nginx-tests/archive/${_tests_commit}.tar.gz"
+checksum="e462e11533d5c30baa05df7652160ff5979591d291736cfa5edb9fd2edb48c49
+ 6166ed3a9202ad4065a83fa5c8f3a39d71bba9aa983b00652b7b1332291e3355"
+# Tests fail when nginx run as root and there is no nginx user
+make_check=ci-skip
# NOTE:
# On update, the pregenerated header file for ARM may need synchronization.
@@ -94,6 +102,11 @@ pre_build() {
sed -i 's/-lcrypt/$(LDFLAGS) &/' objs/Makefile
}
+do_check() {
+ TEST_NGINX_BINARY="$PWD/objs/nginx" \
+ prove "../${pkgname}-tests-${_tests_commit}"
+}
+
post_install() {
sed -e 's|\<user\s\+\w\+;|user html;|g' \
-e '44s|html|/usr/share/nginx/html|' \
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [WIP] nginx: update to 1.20.1.
2021-07-20 19:15 [PR PATCH] [WIP] nginx: update to 1.20.1 ardadem
` (9 preceding siblings ...)
2021-08-15 14:26 ` [PR PATCH] [Updated] " ardadem
@ 2021-08-15 14:30 ` ardadem
2021-08-15 14:33 ` ardadem
` (2 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: ardadem @ 2021-08-15 14:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 302 bytes --]
New comment by ardadem on void-packages repository
https://github.com/void-linux/void-packages/pull/32070#issuecomment-899059443
Comment:
There are still some unpackaged checkdepends
```
Cache::Memcached
Protocol::WebSocket
SCGI
```
but it's okay, prove autoskips uninstalled dependencies.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: nginx: update to 1.20.1.
2021-07-20 19:15 [PR PATCH] [WIP] nginx: update to 1.20.1 ardadem
` (10 preceding siblings ...)
2021-08-15 14:30 ` ardadem
@ 2021-08-15 14:33 ` ardadem
2021-08-15 14:39 ` ardadem
2021-12-11 1:10 ` [PR PATCH] [Closed]: " Duncaen
13 siblings, 0 replies; 15+ messages in thread
From: ardadem @ 2021-08-15 14:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 429 bytes --]
New comment by ardadem on void-packages repository
https://github.com/void-linux/void-packages/pull/32070#issuecomment-899059443
Comment:
There are still some unpackaged checkdepends
```
Cache::Memcached
Protocol::WebSocket
SCGI
```
but it's okay, prove autoskips uninstalled dependencies.
I can package other checkdepends too if it's necessary. I packaged this two perl module before so i have added 'em into PR.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: nginx: update to 1.20.1.
2021-07-20 19:15 [PR PATCH] [WIP] nginx: update to 1.20.1 ardadem
` (11 preceding siblings ...)
2021-08-15 14:33 ` ardadem
@ 2021-08-15 14:39 ` ardadem
2021-12-11 1:10 ` [PR PATCH] [Closed]: " Duncaen
13 siblings, 0 replies; 15+ messages in thread
From: ardadem @ 2021-08-15 14:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 431 bytes --]
New comment by ardadem on void-packages repository
https://github.com/void-linux/void-packages/pull/32070#issuecomment-899059443
Comment:
There are still some unpackaged checkdepends
```
Cache::Memcached
Protocol::WebSocket
SCGI
```
but it's okay, prove autoskips not installed dependencies.
I can package other checkdepends too if it's necessary. I packaged this two perl module before so i have added 'em into PR.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Closed]: nginx: update to 1.20.1.
2021-07-20 19:15 [PR PATCH] [WIP] nginx: update to 1.20.1 ardadem
` (12 preceding siblings ...)
2021-08-15 14:39 ` ardadem
@ 2021-12-11 1:10 ` Duncaen
13 siblings, 0 replies; 15+ messages in thread
From: Duncaen @ 2021-12-11 1:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1433 bytes --]
There's a closed pull request on the void-packages repository
nginx: update to 1.20.1.
https://github.com/void-linux/void-packages/pull/32070
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2021-12-11 1:10 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-20 19:15 [PR PATCH] [WIP] nginx: update to 1.20.1 ardadem
2021-07-21 7:52 ` [PR PATCH] [Updated] " ardadem
2021-08-14 11:06 ` [PR REVIEW] " paper42
2021-08-14 11:20 ` ardadem
2021-08-14 11:47 ` Chocimier
2021-08-14 12:25 ` [PR PATCH] [Updated] " ardadem
2021-08-14 12:34 ` [PR REVIEW] " ardadem
2021-08-14 12:34 ` ardadem
2021-08-14 12:50 ` ardadem
2021-08-14 12:53 ` Chocimier
2021-08-15 14:26 ` [PR PATCH] [Updated] " ardadem
2021-08-15 14:30 ` ardadem
2021-08-15 14:33 ` ardadem
2021-08-15 14:39 ` ardadem
2021-12-11 1:10 ` [PR PATCH] [Closed]: " Duncaen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).