New commits:
commit 3c1af9a777fbfc4a00bf5776764365f3fe525457
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
http/nginx: fixed perl module compilation
commit 896bbdb9cca781ea0908e1385faf21a6f7733f67
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
http/nginx: simplified syslog module option and updated the
corresponding patch
diff --git a/http/nginx/BUILD b/http/nginx/BUILD
index 679ad77..c64d44c 100755
--- a/http/nginx/BUILD
+++ b/http/nginx/BUILD
@@ -13,10 +13,6 @@ if list_find "$NGINX_MODULES" "dav_ext"; then
OPTS="--add-module=$SOURCE_DIRECTORY5 $OPTS"
fi &&
-if is_version_less $VERSION 1.7.1; then
- config_query NGINX_SYSLOG "Build with syslog support?" n
-else
- persistent_add NGINX_SYSLOG &&
- local NGINX_SYSLOG="n"
-fi &&
+persistent_remove NGINX_SYSLOG &&
if [[ "${NGINX_RELEASE}" != "devel" ]]; then
config_query_option NGINX_OPTS "Build with IPv6 support?" n \
diff --git a/http/nginx/DEPENDS b/http/nginx/DEPENDS
index 74aafcd..3fa3d6b 100755
--- a/http/nginx/DEPENDS
+++ b/http/nginx/DEPENDS
@@ -15,8 +15,9 @@ optional_depends libxslt \
"--with-http_xslt_module" "" \
"to enable HTTP XSLT module" &&
-if [[ $NGINX_SYSLOG == y ]] || is_version_less 1.7.0 $VERSION; then
- suggest_depends SYSTEM-LOGGER "" "" "to use syslog"
+if is_version_less 1.7.0 $VERSION; then
+ suggest_depends SYSTEM-LOGGER "--add-module=${SOURCE_DIRECTORY}/syslog" ""
\
+ "to use syslog"
fi &&
if list_find "$NGINX_MODULES" "dav_ext"; then
diff --git a/http/nginx/HISTORY b/http/nginx/HISTORY
index 7e556a0..739ef97 100644
--- a/http/nginx/HISTORY
+++ b/http/nginx/HISTORY
@@ -1,3 +1,8 @@
+2019-06-28 Pavel Vinogradov <public AT sourcemage.org>
+ * CONFIGURE, BUILD, DEPENDS, PRE_BUILD, syslog-1.5.6.patch: simplified
+ syslog module option and updated the corresponding patch, fixed
+ building of perl module
+
2019-06-25 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: devel version 1.17.1, 1.16.x is stable from now on
diff --git a/http/nginx/PRE_BUILD b/http/nginx/PRE_BUILD
index 557841c..9603f22 100755
--- a/http/nginx/PRE_BUILD
+++ b/http/nginx/PRE_BUILD
@@ -1,7 +1,7 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-if [[ $NGINX_SYSLOG == y ]]; then
+if [[ "$(get_spell_provider ${SPELL} SYSTEM-LOGGER)" != "" ]]; then
mkdir syslog &&
cp "$SPELL_DIRECTORY/syslog-0.8-1.6.config" syslog/config &&
patch -p1 < "$SPELL_DIRECTORY/syslog-1.5.6.patch"
@@ -19,4 +19,7 @@ if list_find "$NGINX_MODULES" "auth_ldap"; then
fi &&
if list_find "$NGINX_MODULES" "dav_ext"; then
unpack_file 5
-fi
+fi &&
+
+# our Perl insists on that
+sed "/CCFLAGS/s:}:& -fPIC:" -i src/http/modules/perl/Makefile.PL
diff --git a/http/nginx/syslog-1.5.6.patch b/http/nginx/syslog-1.5.6.patch
index 8cc3bbd..ab889ab 100644
--- a/http/nginx/syslog-1.5.6.patch
+++ b/http/nginx/syslog-1.5.6.patch
@@ -16,9 +16,9 @@
static char *ngx_log_set_levels(ngx_conf_t *cf, ngx_log_t *log);
static void ngx_log_insert(ngx_log_t *log, ngx_log_t *new_log);