Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version 1.26.1 #152

Merged
merged 4 commits into from
Jun 14, 2024
Merged

Version 1.26.1 #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
18227c7
Improve README
andyone Jun 11, 2024
6040185
Version 1.26.1
andyone Jun 14, 2024
89ce9e3
Update dockerfiles
andyone Jun 14, 2024
9286502
Improve README
andyone Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .docker/ol8-unprivileged.docker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,15 @@ LABEL org.opencontainers.image.title="WEBKAOS (Unprivileged)" \
org.opencontainers.image.url="https://kaos.sh/webkaos" \
org.opencontainers.image.source="https://github.com/essentialkaos/webkaos"

ARG WEBKAOS_VER=1.26.0
ARG BROTLI_VER=0.1.6
ARG WEBKAOS_VER=1.26.1
ARG REPOSITORY=kaos-release

ARG UID=1001
ARG GID=1001

# hadolint ignore=DL3031,DL3041
RUN rpm -ivh https://pkgs.kaos.st/kaos-repo-latest.el8.noarch.rpm && \
microdnf -y install --enablerepo=${REPOSITORY} webkaos-${WEBKAOS_VER} webkaos-module-brotli-${BROTLI_VER} gettext && \
microdnf -y install --enablerepo=${REPOSITORY} webkaos-${WEBKAOS_VER} gettext && \
microdnf clean all && \
rm -rf /var/cache/dnf /var/log/dnf.* && \
rm -rf /tmp/* && \
Expand Down
5 changes: 2 additions & 3 deletions .docker/ol8.docker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@ LABEL org.opencontainers.image.title="WEBKAOS" \
org.opencontainers.image.url="https://kaos.sh/webkaos" \
org.opencontainers.image.source="https://github.com/essentialkaos/webkaos"

ARG WEBKAOS_VER=1.26.0
ARG BROTLI_VER=0.1.6
ARG WEBKAOS_VER=1.26.1
ARG REPOSITORY=kaos-release

# hadolint ignore=DL3031,DL3041
RUN rpm -ivh https://pkgs.kaos.st/kaos-repo-latest.el8.noarch.rpm && \
microdnf -y install --enablerepo=${REPOSITORY} webkaos-${WEBKAOS_VER} webkaos-module-brotli-${BROTLI_VER} gettext && \
microdnf -y install --enablerepo=${REPOSITORY} webkaos-${WEBKAOS_VER} gettext && \
microdnf clean all && \
rm -rf /var/cache/dnf /var/log/dnf.* && \
rm -rf /tmp/* && \
Expand Down
5 changes: 2 additions & 3 deletions .docker/ol9-unprivileged.docker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,15 @@ LABEL org.opencontainers.image.title="WEBKAOS (Unprivileged)" \
org.opencontainers.image.url="https://kaos.sh/webkaos" \
org.opencontainers.image.source="https://github.com/essentialkaos/webkaos"

ARG WEBKAOS_VER=1.26.0
ARG BROTLI_VER=0.1.6
ARG WEBKAOS_VER=1.26.1
ARG REPOSITORY=kaos-release

ARG UID=1001
ARG GID=1001

# hadolint ignore=DL3031,DL3041
RUN rpm -ivh https://pkgs.kaos.st/kaos-repo-latest.el9.noarch.rpm && \
microdnf -y install --enablerepo=${REPOSITORY} webkaos-${WEBKAOS_VER} webkaos-module-brotli-${BROTLI_VER} gettext && \
microdnf -y install --enablerepo=${REPOSITORY} webkaos-${WEBKAOS_VER} gettext && \
microdnf clean all && \
rm -rf /var/cache/dnf /var/log/dnf.* && \
rm -rf /tmp/* && \
Expand Down
5 changes: 2 additions & 3 deletions .docker/ol9.docker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@ LABEL org.opencontainers.image.title="WEBKAOS" \
org.opencontainers.image.url="https://kaos.sh/webkaos" \
org.opencontainers.image.source="https://github.com/essentialkaos/webkaos"

ARG WEBKAOS_VER=1.26.0
ARG BROTLI_VER=0.1.6
ARG WEBKAOS_VER=1.26.1
ARG REPOSITORY=kaos-release

# hadolint ignore=DL3031,DL3041
RUN rpm -ivh https://pkgs.kaos.st/kaos-repo-latest.el9.noarch.rpm && \
microdnf -y install --enablerepo=${REPOSITORY} webkaos-${WEBKAOS_VER} webkaos-module-brotli-${BROTLI_VER} gettext && \
microdnf -y install --enablerepo=${REPOSITORY} webkaos-${WEBKAOS_VER} gettext && \
microdnf clean all && \
rm -rf /var/cache/dnf /var/log/dnf.* && \
rm -rf /tmp/* && \
Expand Down
1 change: 1 addition & 0 deletions .github/images/card.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 1 addition & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<p align="center"><a href="#readme"><img src="https://gh.kaos.st/webkaos.svg"/></a></p>
<p align="center"><a href="#readme"><img src=".github/images/card.svg"/></a></p>

`webkaos` is a web-server based on the latest version of [Nginx](http://nginx.org).

Expand All @@ -22,8 +22,6 @@
```bash
sudo dnf install -y https://pkgs.kaos.st/kaos-repo-latest.el$(grep 'CPE_NAME' /etc/os-release | tr -d '"' | cut -d':' -f5).noarch.rpm
sudo dnf install webkaos
# Install optional modules
sudo dnf install
```

#### Using Docker
Expand Down
58 changes: 29 additions & 29 deletions SOURCES/webkaos.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
diff --color -urN nginx-1.26.0-orig/auto/lib/openssl/make nginx-1.26.0/auto/lib/openssl/make
--- nginx-1.26.0-orig/auto/lib/openssl/make 2024-04-23 17:04:32.000000000 +0300
+++ nginx-1.26.0/auto/lib/openssl/make 2024-05-03 16:14:35.707263354 +0300
diff --color -urN nginx-1.26.1-orig/auto/lib/openssl/make nginx-1.26.1/auto/lib/openssl/make
--- nginx-1.26.1-orig/auto/lib/openssl/make 2024-05-28 16:28:07.000000000 +0300
+++ nginx-1.26.1/auto/lib/openssl/make 2024-06-14 15:44:38.628467319 +0300
@@ -58,18 +58,18 @@
/*) ngx_prefix="$OPENSSL/.openssl" ;;
*) ngx_prefix="$PWD/$OPENSSL/.openssl" ;;
Expand All @@ -24,9 +24,9 @@ diff --color -urN nginx-1.26.0-orig/auto/lib/openssl/make nginx-1.26.0/auto/lib/
;;

esac
diff --color -urN nginx-1.26.0-orig/src/core/nginx.c nginx-1.26.0/src/core/nginx.c
--- nginx-1.26.0-orig/src/core/nginx.c 2024-04-23 17:04:32.000000000 +0300
+++ nginx-1.26.0/src/core/nginx.c 2024-05-03 16:27:03.000000000 +0300
diff --color -urN nginx-1.26.1-orig/src/core/nginx.c nginx-1.26.1/src/core/nginx.c
--- nginx-1.26.1-orig/src/core/nginx.c 2024-05-28 16:28:07.000000000 +0300
+++ nginx-1.26.1/src/core/nginx.c 2024-06-14 15:44:38.636467338 +0300
@@ -391,12 +391,12 @@
static void
ngx_show_version_info(void)
Expand All @@ -43,13 +43,13 @@ diff --color -urN nginx-1.26.0-orig/src/core/nginx.c nginx-1.26.0/src/core/nginx
NGX_LINEFEED NGX_LINEFEED
"Options:" NGX_LINEFEED
" -?,-h : this help" NGX_LINEFEED
diff --color -urN nginx-1.26.0-orig/src/core/nginx.h nginx-1.26.0/src/core/nginx.h
--- nginx-1.26.0-orig/src/core/nginx.h 2024-04-23 17:04:32.000000000 +0300
+++ nginx-1.26.0/src/core/nginx.h 2024-05-03 16:26:17.000000000 +0300
diff --color -urN nginx-1.26.1-orig/src/core/nginx.h nginx-1.26.1/src/core/nginx.h
--- nginx-1.26.1-orig/src/core/nginx.h 2024-05-28 16:28:07.000000000 +0300
+++ nginx-1.26.1/src/core/nginx.h 2024-06-14 15:45:05.000000000 +0300
@@ -11,7 +11,7 @@

#define nginx_version 1026000
#define NGINX_VERSION "1.26.0"
#define nginx_version 1026001
#define NGINX_VERSION "1.26.1"
-#define NGINX_VER "nginx/" NGINX_VERSION
+#define NGINX_VER "webkaos/" NGINX_VERSION

Expand All @@ -64,9 +64,9 @@ diff --color -urN nginx-1.26.0-orig/src/core/nginx.h nginx-1.26.0/src/core/nginx
#define NGX_OLDPID_EXT ".oldbin"


diff --color -urN nginx-1.26.0-orig/src/core/ngx_log.c nginx-1.26.0/src/core/ngx_log.c
--- nginx-1.26.0-orig/src/core/ngx_log.c 2024-04-23 17:04:32.000000000 +0300
+++ nginx-1.26.0/src/core/ngx_log.c 2024-05-03 16:14:35.727263400 +0300
diff --color -urN nginx-1.26.1-orig/src/core/ngx_log.c nginx-1.26.1/src/core/ngx_log.c
--- nginx-1.26.1-orig/src/core/ngx_log.c 2024-05-28 16:28:07.000000000 +0300
+++ nginx-1.26.1/src/core/ngx_log.c 2024-06-14 15:44:38.650467372 +0300
@@ -202,9 +202,9 @@
return;
}
Expand Down Expand Up @@ -97,9 +97,9 @@ diff --color -urN nginx-1.26.0-orig/src/core/ngx_log.c nginx-1.26.0/src/core/ngx
return NGX_CONF_ERROR;
#endif

diff --color -urN nginx-1.26.0-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.26.0/src/http/modules/ngx_http_autoindex_module.c
--- nginx-1.26.0-orig/src/http/modules/ngx_http_autoindex_module.c 2024-04-23 17:04:32.000000000 +0300
+++ nginx-1.26.0/src/http/modules/ngx_http_autoindex_module.c 2024-05-03 16:14:35.736263421 +0300
diff --color -urN nginx-1.26.1-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.26.1/src/http/modules/ngx_http_autoindex_module.c
--- nginx-1.26.1-orig/src/http/modules/ngx_http_autoindex_module.c 2024-05-28 16:28:07.000000000 +0300
+++ nginx-1.26.1/src/http/modules/ngx_http_autoindex_module.c 2024-06-14 15:44:38.658467391 +0300
@@ -449,9 +449,11 @@
;

Expand Down Expand Up @@ -175,9 +175,9 @@ diff --color -urN nginx-1.26.0-orig/src/http/modules/ngx_http_autoindex_module.c
tm.ngx_tm_mday,
months[tm.ngx_tm_mon - 1],
tm.ngx_tm_year,
diff --color -urN nginx-1.26.0-orig/src/http/ngx_http_header_filter_module.c nginx-1.26.0/src/http/ngx_http_header_filter_module.c
--- nginx-1.26.0-orig/src/http/ngx_http_header_filter_module.c 2024-04-23 17:04:32.000000000 +0300
+++ nginx-1.26.0/src/http/ngx_http_header_filter_module.c 2024-05-03 16:14:35.744263440 +0300
diff --color -urN nginx-1.26.1-orig/src/http/ngx_http_header_filter_module.c nginx-1.26.1/src/http/ngx_http_header_filter_module.c
--- nginx-1.26.1-orig/src/http/ngx_http_header_filter_module.c 2024-05-28 16:28:07.000000000 +0300
+++ nginx-1.26.1/src/http/ngx_http_header_filter_module.c 2024-06-14 15:44:38.666467410 +0300
@@ -46,7 +46,7 @@
};

Expand Down Expand Up @@ -228,9 +228,9 @@ diff --color -urN nginx-1.26.0-orig/src/http/ngx_http_header_filter_module.c ngi
#define NGX_HTTP_OFF_5XX (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)

ngx_string("500 Internal Server Error"),
diff --color -urN nginx-1.26.0-orig/src/http/ngx_http_special_response.c nginx-1.26.0/src/http/ngx_http_special_response.c
--- nginx-1.26.0-orig/src/http/ngx_http_special_response.c 2024-04-23 17:04:32.000000000 +0300
+++ nginx-1.26.0/src/http/ngx_http_special_response.c 2024-05-03 16:14:35.752263458 +0300
diff --color -urN nginx-1.26.1-orig/src/http/ngx_http_special_response.c nginx-1.26.1/src/http/ngx_http_special_response.c
--- nginx-1.26.1-orig/src/http/ngx_http_special_response.c 2024-05-28 16:28:07.000000000 +0300
+++ nginx-1.26.1/src/http/ngx_http_special_response.c 2024-06-14 15:44:38.674467429 +0300
@@ -19,21 +19,21 @@


Expand Down Expand Up @@ -703,9 +703,9 @@ diff --color -urN nginx-1.26.0-orig/src/http/ngx_http_special_response.c nginx-1
#define NGX_HTTP_OFF_5XX (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)

ngx_string(ngx_http_error_494_page), /* 494, request header too large */
diff --color -urN nginx-1.26.0-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.26.0/src/http/v2/ngx_http_v2_filter_module.c
--- nginx-1.26.0-orig/src/http/v2/ngx_http_v2_filter_module.c 2024-04-23 17:04:32.000000000 +0300
+++ nginx-1.26.0/src/http/v2/ngx_http_v2_filter_module.c 2024-05-03 16:29:11.000000000 +0300
diff --color -urN nginx-1.26.1-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.26.1/src/http/v2/ngx_http_v2_filter_module.c
--- nginx-1.26.1-orig/src/http/v2/ngx_http_v2_filter_module.c 2024-05-28 16:28:07.000000000 +0300
+++ nginx-1.26.1/src/http/v2/ngx_http_v2_filter_module.c 2024-06-14 15:44:38.682467448 +0300
@@ -115,7 +115,7 @@
ngx_http_core_srv_conf_t *cscf;
u_char addr[NGX_SOCKADDR_STRLEN];
Expand All @@ -724,9 +724,9 @@ diff --color -urN nginx-1.26.0-orig/src/http/v2/ngx_http_v2_filter_module.c ngin
}

*pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX);
diff --color -urN nginx-1.26.0-orig/src/os/unix/ngx_setproctitle.c nginx-1.26.0/src/os/unix/ngx_setproctitle.c
--- nginx-1.26.0-orig/src/os/unix/ngx_setproctitle.c 2024-04-23 17:04:32.000000000 +0300
+++ nginx-1.26.0/src/os/unix/ngx_setproctitle.c 2024-05-03 16:14:35.768263495 +0300
diff --color -urN nginx-1.26.1-orig/src/os/unix/ngx_setproctitle.c nginx-1.26.1/src/os/unix/ngx_setproctitle.c
--- nginx-1.26.1-orig/src/os/unix/ngx_setproctitle.c 2024-05-28 16:28:07.000000000 +0300
+++ nginx-1.26.1/src/os/unix/ngx_setproctitle.c 2024-06-14 15:44:38.690467468 +0300
@@ -89,7 +89,7 @@

ngx_os_argv[1] = NULL;
Expand Down
7 changes: 5 additions & 2 deletions webkaos.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
%define service_name %{name}
%define service_home %{_cachedir}/%{service_name}

%define nginx_version 1.26.0
%define nginx_version 1.26.1
%define lua_module_ver 0.10.26
%define lua_resty_core_ver 0.1.28
%define lua_resty_lru_ver 0.13
Expand All @@ -42,7 +42,7 @@
Summary: Superb high performance web server
Name: webkaos
Version: %{nginx_version}
Release: 2%{?dist}
Release: 0%{?dist}
License: 2-clause BSD-like license
Group: System Environment/Daemons
URL: https://kaos.sh/webkaos
Expand Down Expand Up @@ -565,6 +565,9 @@ rm -rf %{buildroot}
################################################################################

%changelog
* Fri Jun 14 2024 Anton Novojilov <[email protected]> - 1.26.1-0
- Nginx updated to 1.26.1

* Sun Jun 02 2024 Anton Novojilov <[email protected]> - 1.26.0-2
- ngx_brotli module removed due to serious problems and lack of support

Expand Down
Loading