diff options
| author | DasSkelett | 2021-04-17 14:23:03 +0200 |
|---|---|---|
| committer | DasSkelett | 2021-04-17 14:23:03 +0200 |
| commit | 13d89f73641365c70358f39ad4fb39838829faf9 (patch) | |
| tree | 32e4969059bf17011d4208a758d2894b088c0c37 | |
| parent | 551e3ed67d92e2d10c8b321439ecc3d82f4b5d0e (diff) | |
| download | aur-13d89f73641365c70358f39ad4fb39838829faf9.tar.gz | |
Switch to upstream merge of 1.19.10
Upstream merged the default branch commits for nginx 1.19.10 into the nginx-quic branch,
so let's switch back to it instead of merging it ourselves during build.
I went directly with revision [47a43b011dec][0] instead of the actual merge commit [7f95010f10b7][1]
because it contains some compatibility enhancements for the 1.19.10 changes.
[0]: https://hg.nginx.org/nginx-quic/rev/47a43b011dec "HTTP/3: keepalive_time support."
[1]: https://hg.nginx.org/nginx-quic/rev/7f95010f10b7 "Merged with the default branch."
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 12 |
2 files changed, 4 insertions, 12 deletions
@@ -1,7 +1,7 @@ pkgbase = nginx-quic pkgdesc = Lightweight HTTP server and IMAP/POP3 proxy server, HTTP/3 QUIC branch pkgver = 1.19.10 - pkgrel = 1 + pkgrel = 2 url = https://nginx.org install = nginx.install arch = i686 @@ -27,7 +27,7 @@ pkgbase = nginx-quic backup = etc/nginx/uwsgi_params backup = etc/nginx/win-utf backup = etc/logrotate.d/nginx - source = hg+https://hg.nginx.org/nginx-quic#revision=cc3e9c131d79 + source = hg+https://hg.nginx.org/nginx-quic#revision=47a43b011dec source = git+https://boringssl.googlesource.com/boringssl#commit=0da75f35d51ab7fbfa8efaf71c87606ee26f5db3 source = service source = logrotate @@ -6,7 +6,7 @@ pkgname=nginx-quic pkgver=1.19.10 -pkgrel=1 +pkgrel=2 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server, HTTP/3 QUIC branch' arch=('i686' 'x86_64') url='https://nginx.org' @@ -25,7 +25,7 @@ backup=('etc/nginx/fastcgi.conf' install=nginx.install provides=('nginx') conflicts=('nginx') -source=("hg+https://hg.nginx.org/nginx-quic#revision=cc3e9c131d79" +source=("hg+https://hg.nginx.org/nginx-quic#revision=47a43b011dec" "git+https://boringssl.googlesource.com/boringssl#commit=0da75f35d51ab7fbfa8efaf71c87606ee26f5db3" "service" "logrotate") @@ -72,14 +72,6 @@ _quic_flags=( --with-stream_quic_module ) -prepare() { - # Upstream hasn't merged the 1.19.10 update into the nginx-quic branch yet; do it manually - cd ${srcdir}/$pkgname - hg pull https://hg.nginx.org/nginx - hg merge b56c45e3bd50 - hg commit -u aur -m "[automated aur commit] Merged with default branch" -} - build() { export CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=[1-9]/-D_FORTIFY_SOURCE=0} export CXXFLAGS="$CXXFLAGS -fPIC" |