61 Commits

Author SHA1 Message Date
Max Kellermann 4e389f64d7 nginx: add PACKAGECONFIG[ssl]
Signed-off-by: Max Kellermann <max.kellermann@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-09-24 11:49:45 -07:00
Khem Raj f0acce20d4 nginx: Upgrade to 1.15.2
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-08-15 08:20:06 -07:00
Derek Straka 715eac320f nginx: remove the 1.13 recipe in favor of the new dev branch of 1.5.x
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-07-12 07:19:42 -07:00
Derek Straka 7cb4eb4a95 nginx: enable thread pools by default
The thread pool feature can be enabled without significant extra binary size.  Thread pools can increase performance by an order of magnitude on some configurations

Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-07-12 07:19:42 -07:00
Derek Straka f51ba94d3a nginx: update latest development version to 1.13.12
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
2018-05-17 08:17:50 -07:00
Derek Straka c94bc52ed9 nginx: update stable version to 1.14.0
License-Update: Update license file for latest copyright date

Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
2018-05-17 08:17:49 -07:00
Armin Kuster cf2be348ae nginx: refresh patches
WARNING: nginx-1.12.2-r0 do_patch:
Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
The context lines in the patches can be updated with devtool:

    devtool modify <recipe>
    devtool finish --force-patch-refresh <recipe> <layer_path>

Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
Applying patch nginx-cross.patch
patching file auto/feature
patching file auto/options
Hunk #1 succeeded at 386 (offset 33 lines).
Hunk #2 succeeded at 580 (offset 35 lines).
Hunk #3 succeeded at 599 (offset 22 lines).
patching file auto/types/sizeof
patching file auto/unix
Hunk #1 succeeded at 587 (offset 194 lines).
Hunk #2 succeeded at 604 with fuzz 1 (offset 188 lines).
Hunk #3 succeeded at 620 with fuzz 2 (offset 188 lines).

Now at patch nginx-cross.patch

Signed-off-by: Armin Kuster <akuster808@gmail.com>
2018-04-13 12:43:42 -07:00
Derek Straka 939c85fd90 nginx: update development version to 1.13.9
Update license checksum for copyright changes

Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
2018-03-16 19:12:26 -07:00
Martin Jansa 99aa19ff53 recipes: use oe.utils.conditional instead of deprecated base_conditional
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2018-02-01 13:48:27 +00:00
Derek Straka 04ea59d2c5 nginx: update dev version to 1.13.8
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
2018-01-16 21:35:42 -08:00
Derek Straka b9f369a659 nginx: update to version 1.13.7
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
2017-12-27 07:25:02 -08:00
Derek Straka c0b74f42e0 nginx: correctly set the endianness of the target
Add an inherit for siteinfo to get access to SITEINFO_ENDIANNESS
Add a patch to have nginx actually use the user provided --with-endian

Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
2017-12-11 07:58:56 -08:00
Derek Straka a067403b55 nginx: update development version to 1.13.6
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
2017-11-15 16:34:06 -08:00
Derek Straka 722a9f8f4f nginx: update stable version to 1.12.2
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
2017-11-15 16:34:06 -08:00
Derek Straka 7ddeabbeb1 nginx: update development version to 1.13.5
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-09-22 22:50:41 +00:00
Szombathelyi György 9205bd846c Nginx: use PACKAGECONFIG variables in configure
Signed-off-by: Gyorgy Szombathelyi <gyurco@freemail.hu>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-09-18 10:18:12 +02:00
Derek Straka 684789ee48 nginx: update development version to 1.13.3
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-08-13 13:20:58 +02:00
Derek Straka ee1efae12d nginx: update stable version to 1.12.1
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-08-13 13:20:58 +02:00
Derek Straka f0e8a034fa nginx: update to version 1.13.1
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-06-19 19:30:44 +02:00
Pascal Bach 945cdceca4 nginx: depend on zlib instead of gzip
nginx requires zlib not gzip for compression.

Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-06-12 06:56:24 +02:00
Derek Straka 24db88de47 nginx: update stable version to 1.12.0
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-06-05 11:01:42 +02:00
Derek Straka 94accd9337 nginx: update development version to 1.13.0
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-06-05 11:01:42 +02:00
Pascal Bach 23a8b1f013 nginx: use consistent pid file location accross recipe and init scripts
The recipe and the systemd service file use /run/nginx/nginx.pid,
while the sys v init script used /var/run/nginx/nginx.pid

Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-05-23 15:49:38 +02:00
Pascal Bach d050a35031 nginx: make sure the user is correctly set for the volatile directories
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-03-31 13:26:00 +02:00
Pascal Bach a4e4cfd932 nginx: set sane defaults for temp directories
Currently the build directiories en up in /usr/*_temp which is not what most
users will expect. This changes the default location to /tmp/nginx/*_tmp.

The location can still be overridden in the nginx.conf file.

Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-03-31 13:26:00 +02:00
Pascal Bach 0233f4cc15 nginx: make user in nginx.conf consistent with the default value
It gets replaces with the real NGINX_USER anyway, but it confuses people
that there is a different value by default. So just make it the same as the
default NGINX_USER

Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-03-31 13:25:56 +02:00
Derek Straka 131255dd56 nginx: update to version 1.11.10
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-02-28 12:34:16 +01:00
Derek Straka 663f8271a5 nginx: update to version 1.11.9
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-02-13 18:43:35 +01:00
Derek Straka 79c03f5ad6 nginx: update to version 1.10.3
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-02-13 18:43:34 +01:00
Alexandre Belloni 1d1a43bb06 nginx: handle systemd service file
Inherit the systemd class so the service file is properly handled.
Note that by default, the service file will be installed but not enabled.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-02-13 18:43:29 +01:00
Derek Straka 4a7fe831c7 nginx: update to version 1.11.8
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-02-13 18:43:19 +01:00
Derek Straka 9d40291916 nginx: update to version 1.11.6
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-12-09 12:02:14 +01:00
Derek Straka 116c6e08d8 nginx: update to version 1.10.2
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-11-23 15:23:56 +01:00
Derek Straka f35e4e6e03 nginx: update to version 1.11.5
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-10-25 15:31:14 +02:00
Martin Jansa f2bec07b87 nginx.inc: use 4 spaces for indentation
* like any other sane recipes do

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-08-22 15:53:57 +02:00
Szombathelyi György 8e6425cfa1 nginx: optimize systemd unit file
- Call the nginx binary directly, no need to wrap the SysV init file.
- Create /var/log/nginx with tmpfiles, like volatiles without systemd.
- Run nginx with ${NGINX_USER} (user ${NGINX_USER} in nginx.conf)

Signed-off-by: Gyorgy Szombathelyi <gyurco@freemail.hu>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-08-22 15:52:32 +02:00
Szombathelyi György 469a6ca5b8 nginx: PACKAGECONFIG for httpv2
Signed-off-by: Gyorgy Szombathelyi <gyurco@freemail.hu>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-08-22 15:49:24 +02:00
Derek Straka 2ad60db95a nginx: update to version 1.11.3
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-08-15 12:32:00 +02:00
Derek Straka ea75c65637 nginx: add the LDFLAGS to the link arguments
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-08-15 12:32:00 +02:00
Derek Straka 9efd12bfcc nginx: update to version 1.11.2
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-07-29 11:00:54 +02:00
Derek Straka 8b32e60c3c nginx: update to version 1.11.1
* Resolves CVE-2016-4450

Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-06-08 14:55:29 +02:00
Derek Straka 98c4e4f83b nginx: update stable version to 1.10.1
* Resolves CVE-2016-4450

Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-06-08 14:55:28 +02:00
Derek Straka 72c6229c95 nginx: update to version 1.9.15
Remove a now redundant nginx-cross patch with stable moving to 1.10.X
Remove a duplicate DISABLE_STATIC

Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-06 12:40:24 +02:00
Derek Straka e7ead2b552 nginx: update stable version to 1.10.0
The 1.8 version is now considered legacy and the stable versions 1.10.X
Updated the license checksum to reflect copyright date update to 2016

Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-06 12:40:23 +02:00
Ross Burton e5c807b77f meta-webserver: use bb.utils.contains() instead of base_contains()
base_contains() is a compatibility wrapper and may warn in the future, so
replace all instances with bb.utils.contains().

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-04-28 10:38:38 +02:00
Derek Straka bbb8373dfd nginx: update to 1.9.14
update the nginx-cross path to work with the latest version of nginx

Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-04-21 21:33:19 +02:00
Pascal Bach d269bb24de nginx: make the 1.8.x branch the default
The 1.9.x branch is still supported but it needs to be explicitly selected.

Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
2016-03-25 11:26:57 +01:00
Pascal Bach 6605e7f52f nginx: add stable version 1.8.1 as alternative to the mainline version 1.9.x
The 1.8 branch is the current stable branch of nginx.
This means the branch doesn't get new features, but is still supported with bugfixes.

Depending on the use case it is more suitable to use on an embedded device
than the 1.9 branch which adds new features with every release.

Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
2016-03-25 11:26:57 +01:00
Pascal Bach d5eec8b7f3 nginx: split parts out of the recipe into nginx.inc
nginx has two maintained branches.
- stable: is the long term maintained branch where only bugfixes occur
- mainline: is the branch where new features get added

This change is in preparation to support these two branches.

Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
2016-03-25 11:26:57 +01:00
Derek Straka 35d91f32c4 nginx: update to 1.9.12
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-03-14 12:20:06 +01:00