Merge pull request #2 from surfly/fedora40

tonysurfly · web-flow · commit 4389a56e53f5 · 2024-07-18T17:09:09.000+02:00
Upgrade nginx to 1.26.1 for Fedora 40
diff --git a/.gitignore b/.gitignore
@@ -1 +1 @@
-rpms
+rpms/*.rpm
diff --git a/Containerfile b/Containerfile
@@ -1,4 +1,4 @@
-FROM fedora:39
+FROM fedora:40
 
 RUN dnf install rpm-build dnf-utils tree -y
 
diff --git a/Containerfile.debug b/Containerfile.debug
@@ -1,3 +1,3 @@
-FROM fedora:39
+FROM fedora:40
 
 RUN dnf install rpm-build dnf-utils tree -y
diff --git a/nginx.spec b/nginx.spec
@@ -9,7 +9,7 @@
 %global lua_resty_core_version 0.1.28
 %global lua_resty_lrucache_version 0.13
 %global ngx_devel_kit_version 0.3.3
-%global luajit2_version 2.1-20240314
+%global luajit2_version 2.1-20240626
 %global ngx_http_redis_version 0.4.1-cmm
 %global headers_more_version 0.37
 %global modsecurity_nginx_version 1.0.3
@@ -19,7 +19,7 @@
 
 Name: nginx-lua-waf
 Summary: High performance web server nginx with lua and modsecurity plugins
-Version: 1.25.4
+Version: 1.26.1
 Release: 1%{?dist}
 Conflicts: nginx nginx-mimetypes nginx-core luajit
 
@@ -75,6 +75,7 @@ cp -r %{buildroot}/../luajit/* /
 export LUAJIT_LIB=/usr/lib
 export LUAJIT_INC=/usr/include/luajit-2.1
 export DESTDIR=%{buildroot}
+export CFLAGS="-std=gnu89"
 nginx_ldopts="$RPM_LD_FLAGS -Wl,-E"
 ./configure \
     --prefix=%{_datadir}/nginx \
diff --git a/rpms/.gitkeep b/rpms/.gitkeep

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM fedora:39`
	`1`	`+FROM fedora:40`
`2`	`2`
`3`	`3`	`RUN dnf install rpm-build dnf-utils tree -y`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-FROM fedora:39`
	`1`	`+FROM fedora:40`
`2`	`2`
`3`	`3`	`RUN dnf install rpm-build dnf-utils tree -y`