[Buildroot] [PATCH v2 1/6] package/nginx: fix mail modules not building

[Buildroot] [PATCH v2 1/6] package/nginx: fix mail modules not building

[Martin Bark]

Add the missing --with-mail configure option

Signed-off-by: Martin Bark <martin@barkynet.com>

---
Changes v1 -> v2
 - new in v2. split from the patch to bump nginx to 1.10.0
   (suggested by Thomas Petazzoni)
---
 package/nginx/nginx.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk
index 7348e48..f6bae7e 100644
--- a/package/nginx/nginx.mk
+++ b/package/nginx/nginx.mk
@@ -193,6 +193,7 @@ endif # BR2_PACKAGE_NGINX_HTTP
 
 # mail modules
 ifeq ($(BR2_PACKAGE_NGINX_MAIL),y)
+NGINX_CONF_OPTS += --with-mail
 
 ifeq ($(BR2_PACKAGE_NGINX_MAIL_SSL_MODULE),y)
 NGINX_DEPENDENCIES += openssl
-- 
2.7.4

[Buildroot] [PATCH v2 2/6] package/nginx: fix error is nginx.service

[Martin Bark]

When using systemd nginx fails to start with the error

    /usr/bin/mkdir: invalid option -- 't'

This is due to a missing space before the semicolon in nginx.service.
For systemd to handle multiple commands in ExecStartPre it requires the
semicolon to be a separate word or the use of multiple ExecStartPre.

This commit splits the multiple commands into two ExecStartPre lines
which fixes the error and improves readability.

Signed-off-by: Martin Bark <martin@barkynet.com>

---
Changes v1 -> v2
 - Split single ExecStartPre into two ExecStartPre lines
   (suggested by Thomas Petazzoni)
 - Reorder before bump to 1.10.0 as this happens in 1.8.1 too
---
 package/nginx/nginx.service | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/nginx/nginx.service b/package/nginx/nginx.service
index 619755f..320df9a 100644
--- a/package/nginx/nginx.service
+++ b/package/nginx/nginx.service
@@ -5,7 +5,8 @@ After=syslog.target network.target
 [Service]
 Type=forking
 PIDFile=/var/run/nginx.pid
-ExecStartPre=/usr/bin/mkdir -p /var/log/nginx /var/tmp/nginx; /usr/sbin/nginx -t -q -g 'pid /var/run/nginx.pid; daemon on; master_process on;'
+ExecStartPre=/usr/bin/mkdir -p /var/log/nginx /var/tmp/nginx
+ExecStartPre=/usr/sbin/nginx -t -q -g 'pid /var/run/nginx.pid; daemon on; master_process on;'
 ExecStart=/usr/sbin/nginx -g 'pid /var/run/nginx.pid; daemon on; master_process on;'
 ExecReload=/usr/sbin/nginx -g 'pid /var/run/nginx.pid; daemon on; master_process on;' -s reload
 ExecStop=/usr/sbin/nginx -g 'pid /var/run/nginx.pid;' -s quit
-- 
2.7.4

[Buildroot] [PATCH v2 3/6] package/nginx: bump version to 1.10.0

[Martin Bark]

The ngx_http_spdy_module has been superseded by the ngx_http_v2_module
so BR2_PACKAGE_NGINX_HTTP_SPDY_MODULE has changed to
BR2_PACKAGE_NGINX_HTTP_V2_MODULE

Signed-off-by: Martin Bark <martin@barkynet.com>

---
Changes v1 -> v2
 - split setting --with-mail into separate patch
   (suggested by Thomas Petazzoni)
---
 Config.in.legacy                                              |  9 +++++++++
 ...auto-type-sizeof-rework-autotest-to-be-cross-compila.patch | 11 +++--------
 package/nginx/Config.in                                       |  4 ++--
 package/nginx/nginx.hash                                      |  2 +-
 package/nginx/nginx.mk                                        |  6 +++---
 5 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 9f694f8..fd1c5bc 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,15 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2016.05"
 
+config BR2_PACKAGE_NGINX_HTTP_SPDY_MODULE
+	bool "nginx http spdy module removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_NGINX_HTTP_V2_MODULE
+	help
+	  The ngx_http_spdy_module has been superseded by the ngx_http_v2_module
+	  since nginx v1.9.5.  The ngx_http_v2_module modules has been automatically
+	  selected in your configuration.
+
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC
 	bool "PowerPC Sourcery toolchain has been removed"
 	select BR2_LEGACY
diff --git a/package/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch b/package/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
index 496459e..829a435 100644
--- a/package/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
+++ b/package/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
@@ -13,6 +13,8 @@ Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 Refresh for 1.8.0.
 
 Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
+[martin at barkynet.com: Updated for 1.10.0]
+Signed-off-by: Martin Bark <martin@barkynet.com>
 ---
  auto/types/sizeof | 42 ++++++++++++++++++++++++++++--------------
  1 file changed, 28 insertions(+), 14 deletions(-)
@@ -30,7 +32,7 @@ index a5f66bb..c6f31ec 100644
  
  #include <sys/types.h>
  #include <sys/time.h>
-@@ -25,29 +25,43 @@ $NGX_INCLUDE_UNISTD_H
+@@ -25,22 +25,40 @@ $NGX_INCLUDE_UNISTD_H
  $NGX_INCLUDE_INTTYPES_H
  $NGX_INCLUDE_AUTO_CONFIG_H
  
@@ -80,13 +82,6 @@ index a5f66bb..c6f31ec 100644
      echo " $ngx_size bytes"
  fi
  
--
--rm -rf $NGX_AUTOTEST*
--
--
- case $ngx_size in
-     4)
-         ngx_max_value=2147483647
 -- 
 1.9.1
 
diff --git a/package/nginx/Config.in b/package/nginx/Config.in
index be445f4..0c39a63 100644
--- a/package/nginx/Config.in
+++ b/package/nginx/Config.in
@@ -36,8 +36,8 @@ config BR2_PACKAGE_NGINX_HTTP_SSL_MODULE
 	help
 	  Enable ngx_http_ssl_module
 
-config BR2_PACKAGE_NGINX_HTTP_SPDY_MODULE
-	bool "ngx_http_spdy_module"
+config BR2_PACKAGE_NGINX_HTTP_V2_MODULE
+	bool "ngx_http_v2_module"
 	select BR2_PACKAGE_ZLIB
 	help
 	  Enable ngx_http_spdy_module
diff --git a/package/nginx/nginx.hash b/package/nginx/nginx.hash
index fe4d6b2..394f4d2 100644
--- a/package/nginx/nginx.hash
+++ b/package/nginx/nginx.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	8f4b3c630966c044ec72715754334d1fdf741caa1d5795fb4646c27d09f797b7	nginx-1.8.1.tar.gz
+sha256	8ed647c3dd65bc4ced03b0e0f6bf9e633eff6b01bac772bcf97077d58bc2be4d	nginx-1.10.0.tar.gz
diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk
index f6bae7e..25fb9a8 100644
--- a/package/nginx/nginx.mk
+++ b/package/nginx/nginx.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NGINX_VERSION = 1.8.1
+NGINX_VERSION = 1.10.0
 NGINX_SITE = http://nginx.org/download
 NGINX_LICENSE = BSD-2c
 NGINX_LICENSE_FILES = LICENSE
@@ -104,9 +104,9 @@ else
 NGINX_CONF_OPTS += --without-http-cache
 endif
 
-ifeq ($(BR2_PACKAGE_NGINX_HTTP_SPDY_MODULE),y)
+ifeq ($(BR2_PACKAGE_NGINX_HTTP_V2_MODULE),y)
 NGINX_DEPENDENCIES += zlib
-NGINX_CONF_OPTS += --with-http_spdy_module
+NGINX_CONF_OPTS += --with-http_v2_module
 endif
 
 ifeq ($(BR2_PACKAGE_NGINX_HTTP_SSL_MODULE),y)
-- 
2.7.4

[Buildroot] [PATCH v2 4/6] package/nginx: add support for stream proxy modules

[Martin Bark]

Signed-off-by: Martin Bark <martin@barkynet.com>

---
Changes v1 -> v2
 - no changes
---
 package/nginx/Config.in | 43 +++++++++++++++++++++++++++++++++++++++++++
 package/nginx/nginx.mk  | 18 ++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/package/nginx/Config.in b/package/nginx/Config.in
index 0c39a63..f925cc7 100644
--- a/package/nginx/Config.in
+++ b/package/nginx/Config.in
@@ -304,6 +304,49 @@ config BR2_PACKAGE_NGINX_MAIL_SMTP_MODULE
 
 endif #BR2_PACKAGE_NGINX_MAIL
 
+config BR2_PACKAGE_NGINX_STREAM
+	bool "stream proxy modules"
+
+if BR2_PACKAGE_NGINX_STREAM
+
+config BR2_PACKAGE_NGINX_STREAM_SSL_MODULE
+	bool "ngx_stream_ssl_module"
+	select BR2_PACKAGE_OPENSSL
+	help
+	  Enable ngx_stream_ssl_module
+
+config BR2_PACKAGE_NGINX_STREAM_LIMIT_CONN_MODULE
+	bool "ngx_stream_limit_conn_module"
+	default y
+	help
+	  Enable ngx_stream_limit_conn_module
+
+config BR2_PACKAGE_NGINX_STREAM_ACCESS_MODULE
+	bool "ngx_stream_access_module"
+	default y
+	help
+	  Enable ngx_stream_access_module
+
+config BR2_PACKAGE_NGINX_STREAM_UPSTREAM_HASH_MODULE
+	bool "ngx_stream_upstream_hash_module"
+	default y
+	help
+	  Enable ngx_stream_upstream_hash_module
+
+config BR2_PACKAGE_NGINX_STREAM_UPSTREAM_LEAST_CONN_MODULE
+	bool "ngx_stream_upstream_least_conn_module"
+	default y
+	help
+	  Enable ngx_stream_upstream_least_conn_module
+
+config BR2_PACKAGE_NGINX_STREAM_UPSTREAM_ZONE_MODULE
+	bool "ngx_stream_upstream_zone_module"
+	default y
+	help
+	  Enable ngx_stream_upstream_zone_module
+
+endif #BR2_PACKAGE_NGINX_STREAM
+
 comment "misc. modules"
 
 config BR2_PACKAGE_NGINX_SELECT_MODULE
diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk
index 25fb9a8..7f3b075 100644
--- a/package/nginx/nginx.mk
+++ b/package/nginx/nginx.mk
@@ -207,6 +207,24 @@ NGINX_CONF_OPTS += \
 
 endif # BR2_PACKAGE_NGINX_MAIL
 
+# stream modules
+ifeq ($(BR2_PACKAGE_NGINX_STREAM),y)
+NGINX_CONF_OPTS += --with-stream
+
+ifeq ($(BR2_PACKAGE_NGINX_STREAM_SSL_MODULE),y)
+NGINX_DEPENDENCIES += openssl
+NGINX_CONF_OPTS += --with-stream_ssl_module
+endif
+
+NGINX_CONF_OPTS += \
+	$(if $(BR2_PACKAGE_NGINX_STREAM_LIMIT_CONN_MODULE),,--without-stream_limit_conn_module) \
+	$(if $(BR2_PACKAGE_NGINX_STREAM_ACCESS_MODULE),,--without-stream_access_module) \
+	$(if $(BR2_PACKAGE_NGINX_STREAM_UPSTREAM_HASH_MODULE),,--without-stream_upstream_hash_module) \
+	$(if $(BR2_PACKAGE_NGINX_STREAM_UPSTREAM_LEAST_CONN_MODULE),,--without-stream_upstream_least_conn_module) \
+	$(if $(BR2_PACKAGE_NGINX_STREAM_UPSTREAM_ZONE_MODULE),,--without-stream_upstream_zone_module)
+
+endif # BR2_PACKAGE_NGINX_STREAM
+
 define NGINX_DISABLE_WERROR
 	$(SED) 's/-Werror//g' -i $(@D)/auto/cc/*
 endef
-- 
2.7.4

[Buildroot] [PATCH v2 5/6] package/nginx: add thread pool support

[Martin Bark]

Signed-off-by: Martin Bark <martin@barkynet.com>

---
Changes v1 -> v2
 - Added depends on BR2_TOOLCHAIN_HAS_THREADS
---
 package/nginx/Config.in | 7 +++++++
 package/nginx/nginx.mk  | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/package/nginx/Config.in b/package/nginx/Config.in
index f925cc7..ca3e3eb 100644
--- a/package/nginx/Config.in
+++ b/package/nginx/Config.in
@@ -18,6 +18,13 @@ config BR2_PACKAGE_NGINX_FILE_AIO
 	depends on !BR2_aarch64
 	depends on !BR2_arc
 
+config BR2_PACKAGE_NGINX_THREADS
+	bool "thread pool support"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+
+comment "thread pool support needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_PACKAGE_NGINX_HTTP
 	bool "http server"
 	default y
diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk
index 7f3b075..91772b3 100644
--- a/package/nginx/nginx.mk
+++ b/package/nginx/nginx.mk
@@ -64,7 +64,8 @@ NGINX_CONF_OPTS += \
 	--http-uwsgi-temp-path=/var/tmp/nginx/uwsgi
 
 NGINX_CONF_OPTS += \
-	$(if $(BR2_PACKAGE_NGINX_FILE_AIO),--with-file-aio)
+	$(if $(BR2_PACKAGE_NGINX_FILE_AIO),--with-file-aio) \
+	$(if $(BR2_PACKAGE_NGINX_THREADS),--with-threads)
 
 ifeq ($(BR2_PACKAGE_PCRE),y)
 NGINX_DEPENDENCIES += pcre
-- 
2.7.4

[Buildroot] [PATCH v2 6/6] package/nginx: add debug logging support

[Martin Bark]

Signed-off-by: Martin Bark <martin@barkynet.com>

---
Changes v1 -> v2
 - no changes
---
 package/nginx/Config.in | 8 ++++++++
 package/nginx/nginx.mk  | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/package/nginx/Config.in b/package/nginx/Config.in
index ca3e3eb..0ae022b 100644
--- a/package/nginx/Config.in
+++ b/package/nginx/Config.in
@@ -354,6 +354,14 @@ config BR2_PACKAGE_NGINX_STREAM_UPSTREAM_ZONE_MODULE
 
 endif #BR2_PACKAGE_NGINX_STREAM
 
+config BR2_PACKAGE_NGINX_DEBUG
+	bool "debug logging"
+	help
+	  Enable debug logging.  The debug level should be set with the error_log
+	  directive.  For example
+
+	  error_log /var/log/nginx/error.log debug;
+
 comment "misc. modules"
 
 config BR2_PACKAGE_NGINX_SELECT_MODULE
diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk
index 91772b3..c1e8367 100644
--- a/package/nginx/nginx.mk
+++ b/package/nginx/nginx.mk
@@ -226,6 +226,9 @@ NGINX_CONF_OPTS += \
 
 endif # BR2_PACKAGE_NGINX_STREAM
 
+# Debug logging
+NGINX_CONF_OPTS += $(if $(BR2_PACKAGE_NGINX_DEBUG),--with-debug)
+
 define NGINX_DISABLE_WERROR
 	$(SED) 's/-Werror//g' -i $(@D)/auto/cc/*
 endef
-- 
2.7.4

[Buildroot] [PATCH v2 1/6] package/nginx: fix mail modules not building

[Thomas Petazzoni]

Hello,

On Tue,  3 May 2016 10:36:52 +0100, Martin Bark wrote:
> Add the missing --with-mail configure option
> 
> Signed-off-by: Martin Bark <martin@barkynet.com>
> 
> ---
> Changes v1 -> v2
>  - new in v2. split from the patch to bump nginx to 1.10.0
>    (suggested by Thomas Petazzoni)
> ---
>  package/nginx/nginx.mk | 1 +
>  1 file changed, 1 insertion(+)

Thanks, I've applied the entire series. On a few patches, I had to
rewrap the Config.in help text so that it fits in 72 characters before
applying.

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com