Update to nginx-naxsi-1.3

ok landry@
maintainer timeout

the commit contains a new patch file that will be
available in upstream next release
This commit is contained in:
solene 2021-02-02 22:54:04 +00:00
parent e30d35d716
commit c6c453f029
3 changed files with 22 additions and 4 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.150 2021/01/01 12:46:51 robert Exp $
# $OpenBSD: Makefile,v 1.151 2021/02/02 22:54:04 solene Exp $
BROKEN-hppa= src/core/ngx_rwlock.c:116:2: error: \#error ngx_atomic_cmp_set() is not defined!
@ -25,6 +25,7 @@ REVISION-main= 4
REVISION-xslt= 0
REVISION-passenger= 0
REVISION-stream= 0
REVISION-naxsi= 0
VERSION-rtmp= 1.2.1
@ -54,7 +55,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
_GH_MODS= \
openresty headers-more-nginx-module v0.33 \
openresty lua-nginx-module v0.10.11 \
nbs-system naxsi 0.55.3 \
nbs-system naxsi 1.3 \
kvspb nginx-auth-ldap 83c059b73566c2ee9cbda920d91b66657cf120b7 \
arut nginx-rtmp-module v${VERSION-rtmp} \
simpl ngx_devel_kit v0.3.0 \

View File

@ -1,6 +1,6 @@
SHA256 (headers-more-nginx-module-v0.33.tar.gz) = o9y6sRepwQO8HqUgD8AKe30q+X/3/VJfFvisJjLjD78=
SHA256 (lua-nginx-module-v0.10.11.tar.gz) = wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
SHA256 (naxsi-0.55.3.tar.gz) = CzyV0lB3Lcia2LSeR8HgJMWuLHbAz/pEXp/gXE3RNJU=
SHA256 (naxsi-1.3.tar.gz) = Q5yGdzctJZe0Ngu8wQvIZJDeH8dWlbGTrV3xVKIU1ig=
SHA256 (nginx-1.16.1-chroot.patch) = ohNkspocgL7QnBX7q8Kgv2lgrN0ndgLKd0v5nSCLQRU=
SHA256 (nginx-1.18.0.tar.gz) = TDc+erW/kdNKTxGgyUllYQYbpe7mAg2ycqF6cijTX5k=
SHA256 (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) = aQxOW9sq4ZsP7nXNNW0YATRo20cmFrYJeloLvjRshGQ=
@ -10,7 +10,7 @@ SHA256 (ngx_http_geoip2_module-3.3.tar.gz) = QTeEOMgz4xOhiGnQxKcnBLSDXDCsr3/WgBO
SHA256 (ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz) = ZXpA2rODS1enIREzlD1OqWwpWcv3NOUXH4eUOgOAmqg=
SIZE (headers-more-nginx-module-v0.33.tar.gz) = 28130
SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
SIZE (naxsi-0.55.3.tar.gz) = 187416
SIZE (naxsi-1.3.tar.gz) = 235626
SIZE (nginx-1.16.1-chroot.patch) = 8220
SIZE (nginx-1.18.0.tar.gz) = 1039530
SIZE (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) = 18542

View File

@ -0,0 +1,17 @@
$OpenBSD: patch-naxsi_naxsi_src_naxsi_net_h,v 1.1 2021/02/02 22:54:04 solene Exp $
already committed upstream
https://github.com/nbs-system/naxsi/commit/0395b102b7e9b5165e89e99bb62e9ddaa0a74910
Index: naxsi/naxsi_src/naxsi_net.h
--- naxsi/naxsi_src/naxsi_net.h.orig
+++ naxsi/naxsi_src/naxsi_net.h
@@ -7,7 +7,7 @@
#ifndef __NAXSI_NET_H__
#define __NAXSI_NET_H__
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
#include <netinet/in.h>
#include <sys/socket.h>
#include <sys/types.h>