Update to nginx 1.23.2
This commit is contained in:
parent
2b8d4651b8
commit
0535a853da
8
.SRCINFO
8
.SRCINFO
|
@ -1,6 +1,6 @@
|
||||||
pkgbase = nginx-quic
|
pkgbase = nginx-quic
|
||||||
pkgdesc = Lightweight HTTP server and IMAP/POP3 proxy server, HTTP/3 QUIC branch
|
pkgdesc = Lightweight HTTP server and IMAP/POP3 proxy server, HTTP/3 QUIC branch
|
||||||
pkgver = 1.23.1
|
pkgver = 1.23.2
|
||||||
pkgrel = 1
|
pkgrel = 1
|
||||||
url = https://nginx.org
|
url = https://nginx.org
|
||||||
install = nginx.install
|
install = nginx.install
|
||||||
|
@ -28,8 +28,8 @@ pkgbase = nginx-quic
|
||||||
backup = etc/nginx/uwsgi_params
|
backup = etc/nginx/uwsgi_params
|
||||||
backup = etc/nginx/win-utf
|
backup = etc/nginx/win-utf
|
||||||
backup = etc/logrotate.d/nginx
|
backup = etc/logrotate.d/nginx
|
||||||
source = hg+https://hg.nginx.org/nginx-quic#revision=b30bec3d71d6
|
source = hg+https://hg.nginx.org/nginx-quic#revision=3be953161026
|
||||||
source = git+https://boringssl.googlesource.com/boringssl#commit=557b80f1a3e599459367391540488c132a000d55
|
source = git+https://boringssl.googlesource.com/boringssl#commit=b819f7e9392d25db6705a6bd3c92be3bb91775e2
|
||||||
source = service
|
source = service
|
||||||
source = logrotate
|
source = logrotate
|
||||||
sha256sums = SKIP
|
sha256sums = SKIP
|
||||||
|
@ -40,7 +40,7 @@ pkgbase = nginx-quic
|
||||||
pkgname = nginx-quic
|
pkgname = nginx-quic
|
||||||
|
|
||||||
pkgname = nginx-quic-src
|
pkgname = nginx-quic-src
|
||||||
pkgdesc = Source code of nginx-quic 1.23.1, useful for building modules
|
pkgdesc = Source code of nginx-quic 1.23.2, useful for building modules
|
||||||
arch = any
|
arch = any
|
||||||
depends =
|
depends =
|
||||||
provides = nginx-src
|
provides = nginx-src
|
||||||
|
|
26
PKGBUILD
26
PKGBUILD
|
@ -7,7 +7,7 @@
|
||||||
_pkgbase=nginx
|
_pkgbase=nginx
|
||||||
pkgbase=nginx-quic
|
pkgbase=nginx-quic
|
||||||
pkgname=(nginx-quic nginx-quic-src)
|
pkgname=(nginx-quic nginx-quic-src)
|
||||||
pkgver=1.23.1
|
pkgver=1.23.2
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server, HTTP/3 QUIC branch'
|
pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server, HTTP/3 QUIC branch'
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
|
@ -27,8 +27,8 @@ backup=('etc/nginx/fastcgi.conf'
|
||||||
install=nginx.install
|
install=nginx.install
|
||||||
provides=('nginx' 'nginx-mainline')
|
provides=('nginx' 'nginx-mainline')
|
||||||
conflicts=('nginx')
|
conflicts=('nginx')
|
||||||
source=("hg+https://hg.nginx.org/nginx-quic#revision=b30bec3d71d6"
|
source=("hg+https://hg.nginx.org/nginx-quic#revision=3be953161026"
|
||||||
"git+https://boringssl.googlesource.com/boringssl#commit=557b80f1a3e599459367391540488c132a000d55"
|
"git+https://boringssl.googlesource.com/boringssl#commit=b819f7e9392d25db6705a6bd3c92be3bb91775e2"
|
||||||
"service"
|
"service"
|
||||||
"logrotate")
|
"logrotate")
|
||||||
sha256sums=('SKIP'
|
sha256sums=('SKIP'
|
||||||
|
@ -87,9 +87,19 @@ build() {
|
||||||
export CXXFLAGS=${CXXFLAGS/-D_FORTIFY_SOURCE=[1-9]/-D_FORTIFY_SOURCE=0}
|
export CXXFLAGS=${CXXFLAGS/-D_FORTIFY_SOURCE=[1-9]/-D_FORTIFY_SOURCE=0}
|
||||||
|
|
||||||
export CXXFLAGS="$CXXFLAGS -fPIC"
|
export CXXFLAGS="$CXXFLAGS -fPIC"
|
||||||
# Disable some warnings that make Boringssl fail to compile due to a forced -Werror in CMakeLists.txt
|
export CFLAGS="$CFLAGS -fPIC"
|
||||||
# -Wno-array-bounds: 2022-05-21 for compatiblity with GCC 12.1 (https://bugs.chromium.org/p/boringssl/issues/detail?id=492&sort=-modified)
|
|
||||||
export CFLAGS="$CFLAGS -fPIC -Wno-stringop-overflow -Wno-array-parameter -Wno-array-bounds"
|
if [[ $CC == "clang" ]];then
|
||||||
|
_cc_opt="-flto"
|
||||||
|
_ld_opt="-flto -fuse-ld=lld"
|
||||||
|
else
|
||||||
|
_cc_opt=""
|
||||||
|
_ld_opt=""
|
||||||
|
|
||||||
|
# Disable some warnings that make Boringssl fail to compile due to a forced -Werror in CMakeLists.txt
|
||||||
|
# -Wno-array-bounds: 2022-05-21 for compatiblity with GCC 12.1 (https://bugs.chromium.org/p/boringssl/issues/detail?id=492&sort=-modified)
|
||||||
|
export CFLAGS="$CFLAGS -Wno-stringop-overflow -Wno-array-parameter -Wno-array-bounds"
|
||||||
|
fi
|
||||||
|
|
||||||
cd ${srcdir}/boringssl
|
cd ${srcdir}/boringssl
|
||||||
mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release ../ && make crypto ssl
|
mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release ../ && make crypto ssl
|
||||||
|
@ -114,8 +124,8 @@ build() {
|
||||||
--http-scgi-temp-path=/var/lib/nginx/scgi \
|
--http-scgi-temp-path=/var/lib/nginx/scgi \
|
||||||
--http-uwsgi-temp-path=/var/lib/nginx/uwsgi \
|
--http-uwsgi-temp-path=/var/lib/nginx/uwsgi \
|
||||||
--with-openssl=${srcdir}/boringssl \
|
--with-openssl=${srcdir}/boringssl \
|
||||||
--with-cc-opt="-I../boringssl/include" \
|
--with-cc-opt="${_cc_opt} -I../boringssl/include" \
|
||||||
--with-ld-opt="-L../boringssl/build/ssl -L../boringssl/build/crypto" \
|
--with-ld-opt="${_ld_opt} -L../boringssl/build/ssl -L../boringssl/build/crypto" \
|
||||||
${_common_flags[@]} \
|
${_common_flags[@]} \
|
||||||
${_mainline_flags[@]} \
|
${_mainline_flags[@]} \
|
||||||
${_quic_flags[@]}
|
${_quic_flags[@]}
|
||||||
|
|
Loading…
Reference in New Issue