Alexander Pyhalov
2018-04-19 90fdcbd8d3a19356f998ac43bf4699b1dae6055f
apache24: update to 2.4.33
1 files deleted
1 files added
4 files modified
70 ■■■■ changed files
components/web/apache24/Makefile 4 ●●●● patch | view | raw | blame | history
components/web/apache24/apache-24.p5m 2 ●●●●● patch | view | raw | blame | history
components/web/apache24/documentation.p5m 4 ●●●● patch | view | raw | blame | history
components/web/apache24/manifests/sample-manifest.p5m 6 ●●●●● patch | view | raw | blame | history
components/web/apache24/patches/bug52774.patch 35 ●●●●● patch | view | raw | blame | history
components/web/apache24/patches/use-lua5.3.patch 19 ●●●●● patch | view | raw | blame | history
components/web/apache24/Makefile
@@ -23,13 +23,13 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=        apache2
COMPONENT_VERSION=    2.4.29
COMPONENT_VERSION=    2.4.33
COMPONENT_PROJECT_URL=    http://httpd.apache.org/
COMPONENT_SRC_NAME=    httpd
COMPONENT_SRC=        $(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH=    \
   sha256:948e4a11278a5954698b880b30f401b1e9ab743713ee2c7280a54dd4ddd87085
   sha256:cd34636caf03c9a897ddfc928fc866c965f23d909b9612880563a7ad0d1a7e5b
COMPONENT_ARCHIVE_URL=    http://archive.apache.org/dist/httpd/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB=    utility/apache
components/web/apache24/apache-24.p5m
@@ -320,6 +320,7 @@
file path=usr/apache2/2.4/libexec/$(MACH64)/mod_proxy_html.so
file path=usr/apache2/2.4/libexec/$(MACH64)/mod_proxy_http.so
file path=usr/apache2/2.4/libexec/$(MACH64)/mod_proxy_scgi.so
file path=usr/apache2/2.4/libexec/$(MACH64)/mod_proxy_uwsgi.so
file path=usr/apache2/2.4/libexec/$(MACH64)/mod_proxy_wstunnel.so
file path=usr/apache2/2.4/libexec/$(MACH64)/mod_ratelimit.so
file path=usr/apache2/2.4/libexec/$(MACH64)/mod_reflector.so
@@ -429,6 +430,7 @@
file path=usr/apache2/2.4/libexec/mod_proxy_html.so
file path=usr/apache2/2.4/libexec/mod_proxy_http.so
file path=usr/apache2/2.4/libexec/mod_proxy_scgi.so
file path=usr/apache2/2.4/libexec/mod_proxy_uwsgi.so
file path=usr/apache2/2.4/libexec/mod_proxy_wstunnel.so
file path=usr/apache2/2.4/libexec/mod_ratelimit.so
file path=usr/apache2/2.4/libexec/mod_reflector.so
components/web/apache24/documentation.p5m
@@ -599,6 +599,8 @@
file path=usr/apache2/2.4/manual/mod/mod_macro.html
file path=usr/apache2/2.4/manual/mod/mod_macro.html.en
file path=usr/apache2/2.4/manual/mod/mod_macro.html.fr
file path=usr/apache2/2.4/manual/mod/mod_md.html
file path=usr/apache2/2.4/manual/mod/mod_md.html.en
file path=usr/apache2/2.4/manual/mod/mod_mime.html
file path=usr/apache2/2.4/manual/mod/mod_mime.html.en
file path=usr/apache2/2.4/manual/mod/mod_mime.html.fr
@@ -657,6 +659,8 @@
file path=usr/apache2/2.4/manual/mod/mod_proxy_scgi.html
file path=usr/apache2/2.4/manual/mod/mod_proxy_scgi.html.en
file path=usr/apache2/2.4/manual/mod/mod_proxy_scgi.html.fr
file path=usr/apache2/2.4/manual/mod/mod_proxy_uwsgi.html
file path=usr/apache2/2.4/manual/mod/mod_proxy_uwsgi.html.en
file path=usr/apache2/2.4/manual/mod/mod_proxy_wstunnel.html
file path=usr/apache2/2.4/manual/mod/mod_proxy_wstunnel.html.en
file path=usr/apache2/2.4/manual/mod/mod_ratelimit.html
components/web/apache24/manifests/sample-manifest.p5m
@@ -251,6 +251,7 @@
file path=usr/apache2/2.4/libexec/$(MACH64)/mod_proxy_html.so
file path=usr/apache2/2.4/libexec/$(MACH64)/mod_proxy_http.so
file path=usr/apache2/2.4/libexec/$(MACH64)/mod_proxy_scgi.so
file path=usr/apache2/2.4/libexec/$(MACH64)/mod_proxy_uwsgi.so
file path=usr/apache2/2.4/libexec/$(MACH64)/mod_proxy_wstunnel.so
file path=usr/apache2/2.4/libexec/$(MACH64)/mod_ratelimit.so
file path=usr/apache2/2.4/libexec/$(MACH64)/mod_reflector.so
@@ -360,6 +361,7 @@
file path=usr/apache2/2.4/libexec/mod_proxy_html.so
file path=usr/apache2/2.4/libexec/mod_proxy_http.so
file path=usr/apache2/2.4/libexec/mod_proxy_scgi.so
file path=usr/apache2/2.4/libexec/mod_proxy_uwsgi.so
file path=usr/apache2/2.4/libexec/mod_proxy_wstunnel.so
file path=usr/apache2/2.4/libexec/mod_ratelimit.so
file path=usr/apache2/2.4/libexec/mod_reflector.so
@@ -987,6 +989,8 @@
file path=usr/apache2/2.4/manual/mod/mod_macro.html
file path=usr/apache2/2.4/manual/mod/mod_macro.html.en
file path=usr/apache2/2.4/manual/mod/mod_macro.html.fr
file path=usr/apache2/2.4/manual/mod/mod_md.html
file path=usr/apache2/2.4/manual/mod/mod_md.html.en
file path=usr/apache2/2.4/manual/mod/mod_mime.html
file path=usr/apache2/2.4/manual/mod/mod_mime.html.en
file path=usr/apache2/2.4/manual/mod/mod_mime.html.fr
@@ -1045,6 +1049,8 @@
file path=usr/apache2/2.4/manual/mod/mod_proxy_scgi.html
file path=usr/apache2/2.4/manual/mod/mod_proxy_scgi.html.en
file path=usr/apache2/2.4/manual/mod/mod_proxy_scgi.html.fr
file path=usr/apache2/2.4/manual/mod/mod_proxy_uwsgi.html
file path=usr/apache2/2.4/manual/mod/mod_proxy_uwsgi.html.en
file path=usr/apache2/2.4/manual/mod/mod_proxy_wstunnel.html
file path=usr/apache2/2.4/manual/mod/mod_proxy_wstunnel.html.en
file path=usr/apache2/2.4/manual/mod/mod_ratelimit.html
components/web/apache24/patches/bug52774.patch
File was deleted
components/web/apache24/patches/use-lua5.3.patch
New file
@@ -0,0 +1,19 @@
Earlier Apache detected lua 5.3 automatically. Avoid switching to lua 5.2
--- modules/lua/config.m4.1    2018-04-19 18:07:25.641376284 +0000
+++ modules/lua/config.m4    2018-04-19 18:10:00.407186327 +0000
@@ -56,10 +56,10 @@
 fi
 if test -n "$PKGCONFIG" -a -z "$lua_path" \
-   && $PKGCONFIG --atleast-version=5.1 lua; then
-  LUA_LIBS="`$PKGCONFIG --libs lua`"
-  LUA_CFLAGS="`$PKGCONFIG --cflags lua`"
-  LUA_VERSION="`$PKGCONFIG --modversion lua`"
+   && $PKGCONFIG --atleast-version=5.3 lua5.3; then
+  LUA_LIBS="`$PKGCONFIG --libs lua5.3`"
+  LUA_CFLAGS="`$PKGCONFIG --cflags lua5.3`"
+  LUA_VERSION="`$PKGCONFIG --modversion lua5.3`"
   AC_MSG_NOTICE([using Lua $LUA_VERSION configuration from pkg-config])
 else
   AC_CHECK_LIB(m, pow, lib_m="-lm")