Github messages for voidlinux
 help / color / mirror / Atom feed
* [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
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).