-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #12 from essentialkaos/develop
Version 1.11.2
- Loading branch information
Showing
5 changed files
with
130 additions
and
61 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| ############################################################################### | ||
|
|
||
| NORM=0 | ||
| BOLD=1 | ||
| UNLN=4 | ||
| RED=31 | ||
| GREEN=32 | ||
| BROWN=33 | ||
| BLUE=34 | ||
| MAG=35 | ||
| CYAN=36 | ||
| GREY=37 | ||
|
|
||
| CL_NORM="\e[${NORM}m" | ||
| CL_RED="\e[0;${RED};49m" | ||
| CL_GREEN="\e[0;${GREEN};49m" | ||
| CL_BROWN="\e[0;${BROWN};49m" | ||
| CL_BLUE="\e[0;${BLUE};49m" | ||
| CL_MAG="\e[0;${MAG};49m" | ||
| CL_CYAN="\e[0;${CYAN};49m" | ||
| CL_GREY="\e[0;${GREY};49m" | ||
| CL_BL_RED="\e[1;${RED};49m" | ||
| CL_BL_GREEN="\e[1;${GREEN};49m" | ||
| CL_BL_BROWN="\e[1;${BROWN};49m" | ||
| CL_BL_BLUE="\e[1;${BLUE};49m" | ||
| CL_BL_MAG="\e[1;${MAG};49m" | ||
| CL_BL_CYAN="\e[1;${CYAN};49m" | ||
| CL_BL_GREY="\e[1;${GREY};49m" | ||
|
|
||
| ############################################################################### | ||
|
|
||
| main() { | ||
| if [[ $# -ne 3 ]] ; then | ||
| echo "Usage: ./patch-check.sh webkaos.patch old-ver-dir new-ver-dir" | ||
| exit 0 | ||
| fi | ||
|
|
||
| local patch_file="$1" | ||
| local old_ver_dir="$2" | ||
| local new_ver_dir="$3" | ||
|
|
||
| local sources=$(grep '+++' "$patch_file" | tr "\t" " " | cut -f2 -d" " | cut -f2-99 -d "/") | ||
|
|
||
| show "" | ||
|
|
||
| for source_file in $sources ; do | ||
| local old_ver_hash=$(getHash "$old_ver_dir/$source_file") | ||
| local new_ver_hash=$(getHash "$new_ver_dir/$source_file") | ||
|
|
||
| if [[ "$old_ver_hash" == "$new_ver_hash" ]] ; then | ||
| show " ${CL_GREEN}✔${CL_NORM} $source_file" | ||
| else | ||
| local diff_size=$(diff -U 0 "$old_ver_dir/$source_file" "$new_ver_dir/$source_file" | grep -v ^@ | wc -l) | ||
| show " ${CL_RED}✖${CL_NORM} $source_file ${CL_GREY}($diff_size lines)${CL_NORM}" | ||
| fi | ||
| done | ||
|
|
||
| show "" | ||
| } | ||
|
|
||
| getHash() { | ||
| sha256sum "$1" | cut -f1 -d" " | ||
| } | ||
|
|
||
| show() { | ||
| if [[ -n "$2" ]] ; then | ||
| echo -e "\e[${2}m${1}${CL_NORM}" | ||
| else | ||
| echo -e "$@" | ||
| fi | ||
| } | ||
|
|
||
| ############################################################################### | ||
|
|
||
| main $@ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -44,10 +44,10 @@ | |
| %define service_home %{_cachedir}/%{service_name} | ||
|
|
||
| %define open_ssl_ver 1.0.2h | ||
| %define psol_ver 1.9.32.14 | ||
| %define psol_ver 1.11.33.2 | ||
| %define lua_module_ver 0.10.5 | ||
| %define mh_module_ver 0.30 | ||
| %define pcre_ver 8.38 | ||
| %define pcre_ver 8.39 | ||
| %define zlib_ver 1.2.8 | ||
|
|
||
| %define pagespeed_ver %{psol_ver}-beta | ||
|
|
@@ -58,8 +58,8 @@ | |
|
|
||
| Summary: Superb high performance web server | ||
| Name: webkaos | ||
| Version: 1.11.1 | ||
| Release: 1%{?dist} | ||
| Version: 1.11.2 | ||
| Release: 0%{?dist} | ||
| License: 2-clause BSD-like license | ||
| Group: System Environment/Daemons | ||
| Vendor: Nginx / Google / CloudFlare / ESSENTIALKAOS | ||
|
|
@@ -91,14 +91,14 @@ Source56: http://zlib.net/zlib-%{zlib_ver}.tar.gz | |
| Patch0: %{name}.patch | ||
| Patch1: %{name}-dynamic-tls-records.patch | ||
| Patch2: mime.patch | ||
| Patch3: pagespeed-config-%{psol_ver}.patch | ||
|
|
||
| BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) | ||
|
|
||
| Requires: initscripts >= 8.36 kaosv >= 2.8 | ||
| Requires: gd libXpm libxslt libluajit | ||
|
|
||
| BuildRequires: make gcc-c++ perl libluajit-devel | ||
| BuildRequires: make devtoolset-2-gcc-c++ devtoolset-2-binutils | ||
| BuildRequires: perl libluajit-devel | ||
|
|
||
| Requires(pre): shadow-utils | ||
| Requires(post): chkconfig | ||
|
|
@@ -152,10 +152,6 @@ Links for nginx compatibility. | |
| %patch1 -p1 | ||
| %patch2 -p1 | ||
|
|
||
| pushd ngx_pagespeed-%{pagespeed_fullver} | ||
| %patch3 -p1 | ||
| popd | ||
|
|
||
| %build | ||
|
|
||
| # Fixed bug with ngx_pagespeed comilation on i386 | ||
|
|
@@ -177,6 +173,9 @@ popd | |
|
|
||
| %{__mv} headers-more-nginx-module-%{mh_module_ver}/README.markdown ./HEADERSMORE-README.markdown | ||
|
|
||
| # Use gcc and gcc-c++ from devtoolset for build | ||
| export PATH="/opt/rh/devtoolset-2/root/usr/bin:$PATH" | ||
|
|
||
| ./configure \ | ||
| --prefix=%{_sysconfdir}/%{name} \ | ||
| --sbin-path=%{_sbindir}/%{name} \ | ||
|
|
@@ -465,6 +464,11 @@ fi | |
| ############################################################################### | ||
|
|
||
| %changelog | ||
| * Wed Jul 13 2016 Anton Novojilov <[email protected]> - 1.11.2-0 | ||
| - Nginx updated to 1.11.2 | ||
| - PageSpeed updated to 1.11.33.2 | ||
| - PCRE updated to 8.39 | ||
|
|
||
| * Tue Jun 14 2016 Anton Novojilov <[email protected]> - 1.11.1-1 | ||
| - Added patch for dynamic TLS records size | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -47,7 +47,7 @@ | |
| %define psol_ver 1.11.33.2 | ||
| %define lua_module_ver 0.10.5 | ||
| %define mh_module_ver 0.30 | ||
| %define pcre_ver 8.38 | ||
| %define pcre_ver 8.39 | ||
| %define zlib_ver 1.2.8 | ||
|
|
||
| %define pagespeed_ver %{psol_ver}-beta | ||
|
|
@@ -58,8 +58,8 @@ | |
|
|
||
| Summary: Superb high performance web server | ||
| Name: webkaos | ||
| Version: 1.11.1 | ||
| Release: 2%{?dist} | ||
| Version: 1.11.2 | ||
| Release: 0%{?dist} | ||
| License: 2-clause BSD-like license | ||
| Group: System Environment/Daemons | ||
| Vendor: Nginx / Google / CloudFlare / ESSENTIALKAOS | ||
|
|
@@ -460,6 +460,10 @@ fi | |
| ############################################################################### | ||
|
|
||
| %changelog | ||
| * Wed Jul 13 2016 Anton Novojilov <[email protected]> - 1.11.2-0 | ||
| - Nginx updated to 1.11.2 | ||
| - PCRE updated to 8.39 | ||
|
|
||
| * Fri Jun 17 2016 Anton Novojilov <[email protected]> - 1.11.1-2 | ||
| - Added TCP Fast Open support | ||
|
|
||
|
|
||