nginx: Bump to version 1.15.0

PATCH New Ignacy Gawędzki 3 participants 7 messages Jun 27, 2018 – Jun 30, 2018

lore

Share & tools

lore

Ignacy Gawędzki

author

2018-06-27 13:51 UTC #0 lore raw

PATCH 1/1 nginx: Bump to version 1.15.0

Signed-off-by Ignacy Gaw?dzki <[email protected]>

---
 ...-rework-autotest-to-be-cross-compila.patch |   6 +-
 ...-mechanism-allowing-to-force-feature.patch |   8 +-
 ...ture_run_force_result-for-each-featu.patch |  56 ++--
 ...auto-lib-libxslt-conf-use-pkg-config.patch |  10 +-
 ...ake-sys_nerr-guessing-cross-friendly.patch |  16 +-
 ...auto-lib-openssl-conf-use-pkg-config.patch | 249 ++++++++++++++++--
 ...7-auto-lib-libgd-conf-use-pkg-config.patch |   6 +-
 ...linux_config.h-only-include-dlfcn.h-.patch |   6 +-
 ...x-PCRE-condition-WRT-the-http-and-ht.patch |  33 ---
 package/nginx/nginx.hash                      |   4 +-
 package/nginx/nginx.mk                        |   2 +-
 11 files changed, 291 insertions(+), 105 deletions(-)
 delete mode 100644 package/nginx/0009-auto-lib-conf-fix-PCRE-condition-WRT-the-http-and-ht.patch

package/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch +3 -3

index 5b1a50b264..52c8da38c0 100644
@@ -1,4 +1,4 @@
-From fb158af083e72c9aa0a8dfd4c6965f950192a230 Mon Sep 17 00:00:00 2001
+From 218eab509628bffd494516803fdef9585b2e30d8 Mon Sep 17 00:00:00 2001
 From: Samuel Martin <[email protected]>
 Date: Tue, 4 Jul 2017 11:09:20 -0400
 Subject: [PATCH] auto/type/sizeof: rework autotest to be cross-compilation

@@ -22,7 +22,7 @@ Refresh for 1.12.0
  1 file changed, 28 insertions(+), 9 deletions(-)
 
 diff --git a/auto/types/sizeof b/auto/types/sizeof
-index 480d8cf..61dcd2d 100644
+index 480d8cfa..61dcd2de 100644
 --- a/auto/types/sizeof
 +++ b/auto/types/sizeof
 @@ -14,7 +14,7 @@ END

@@ -85,5 +85,5 @@ index 480d8cf..61dcd2d 100644
  fi
  
 -- 
-2.9.4
+2.17.1

package/nginx/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch +4 -4

index 13bef5ffdb..3d04ef14cc 100644
@@ -1,4 +1,4 @@
-From ef72be22ad6d58e230f75553d80b470b80c3303a Mon Sep 17 00:00:00 2001
+From cf8a5c215f691ec8a2c43d8451d9efdcc2b270f5 Mon Sep 17 00:00:00 2001
 From: Samuel Martin <[email protected]>
 Date: Sun, 4 May 2014 00:40:49 +0200
 Subject: [PATCH] auto/feature: add mechanism allowing to force feature run

@@ -13,11 +13,11 @@ This mechanism aims to make easier cross-compilation support.
 
 Signed-off-by: Samuel Martin <[email protected]>
 ---
- auto/feature | 80 ++++++++++++++++++++++++++++++++++++++++++++----------------
+ auto/feature | 80 ++++++++++++++++++++++++++++++++++++++--------------
  1 file changed, 59 insertions(+), 21 deletions(-)
 
 diff --git a/auto/feature b/auto/feature
-index 1145f28..a194b85 100644
+index 3561f594..8016d802 100644
 --- a/auto/feature
 +++ b/auto/feature
 @@ -52,50 +52,88 @@ if [ -x $NGX_AUTOTEST ]; then

@@ -131,5 +131,5 @@ index 1145f28..a194b85 100644
          ;;
  
 -- 
-1.9.2
+2.17.1

package/nginx/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch +28 ~~-28~~

163 lines not on this page · raw message

package/nginx/0004-auto-lib-libxslt-conf-use-pkg-config.patch +5 -5

index 103f90b305..3ac9081389 100644
@@ -1,4 +1,4 @@
-From 211b9f19a3a62826fadef55d2f89d6f66fbf4aa6 Mon Sep 17 00:00:00 2001
+From ecd7d378e0d68d37e077087a4ed47c72d5d0e586 Mon Sep 17 00:00:00 2001
 From: Samuel Martin <[email protected]>
 Date: Thu, 29 May 2014 19:22:27 +0200
 Subject: [PATCH] auto/lib/libxslt/conf: use pkg-config

@@ -8,11 +8,11 @@ dependencies.
 
 Signed-off-by: Martin Bark <[email protected]>
 ---
- auto/lib/libxslt/conf | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ auto/lib/libxslt/conf | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/auto/lib/libxslt/conf b/auto/lib/libxslt/conf
-index 3a0f37b..3c2a60e 100644
+index 3a0f37be..94a531f1 100644
 --- a/auto/lib/libxslt/conf
 +++ b/auto/lib/libxslt/conf
 @@ -12,8 +12,9 @@

@@ -28,5 +28,5 @@ index 3a0f37b..3c2a60e 100644
                        xsltStylesheetPtr   sheet = NULL;
                        xmlDocPtr           doc;
 -- 
-2.8.2
+2.17.1

package/nginx/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch +8 -8

index b4d8215b34..8169876f1d 100644
@@ -1,4 +1,4 @@
-From 08617a8d29ee22831175697555558fec8f52772c Mon Sep 17 00:00:00 2001
+From e0cfa9d2dc13d1acc2b70dff2e72cd943e028524 Mon Sep 17 00:00:00 2001
 From: Samuel Martin <[email protected]>
 Date: Sun, 1 Jun 2014 16:05:04 +0200
 Subject: [PATCH] auto/unix: make sys_nerr guessing cross-friendly

@@ -16,14 +16,14 @@ Refresh for 1.8.0.
 
 Signed-off-by: Danomi Manchego <[email protected]>
 ---
- auto/os/sys_nerr | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- auto/unix        | 10 ++++++++
+ auto/os/sys_nerr | 78 ++++++++++++++++++++++++++++++++++++++++++++++++
+ auto/unix        | 10 +++++++
  2 files changed, 88 insertions(+)
  create mode 100644 auto/os/sys_nerr
 
 diff --git a/auto/os/sys_nerr b/auto/os/sys_nerr
 new file mode 100644
-index 0000000..8970f5f
+index 00000000..8970f5f6
 --- /dev/null
 +++ b/auto/os/sys_nerr
 @@ -0,0 +1,78 @@

@@ -106,10 +106,10 @@ index 0000000..8970f5f
 +
 +echo " $ngx_sys_nerr"
 diff --git a/auto/unix b/auto/unix
-index 7dbf9d1..00a7370 100755
+index 3da00537..a67ee3e2 100644
 --- a/auto/unix
 +++ b/auto/unix
-@@ -708,6 +708,10 @@ ngx_feature_incs='#include <errno.h>
+@@ -736,6 +736,10 @@ ngx_feature_incs='#include <errno.h>
                    #include <stdio.h>'
  ngx_feature_path=
  ngx_feature_libs=

@@ -120,7 +120,7 @@ index 7dbf9d1..00a7370 100755
  ngx_feature_test='printf("%d", sys_nerr);'
  . auto/feature
  
-@@ -756,6 +760,12 @@ if [ $ngx_found = no ]; then
+@@ -784,6 +788,12 @@ if [ $ngx_found = no ]; then
      . auto/feature
  fi

@@ -134,5 +134,5 @@ index 7dbf9d1..00a7370 100755
  ngx_feature="localtime_r()"
  ngx_feature_name="NGX_HAVE_LOCALTIME_R"
 -- 
-1.9.1
+2.17.1

package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch +234 ~~-15~~

263 lines not on this page · raw message

package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch +3 -3

index 34e7981c8f..0be7a4de71 100644
@@ -1,4 +1,4 @@
-From fd9885fe5fef5826034547ca6be7299863f99769 Mon Sep 17 00:00:00 2001
+From d472e1de47b21f9df940066afb5e8f306a98e9bf Mon Sep 17 00:00:00 2001
 From: Martin Bark <[email protected]>
 Date: Fri, 6 May 2016 14:48:49 +0100
 Subject: [PATCH] auto/lib/libgd/conf: use pkg-config

@@ -12,7 +12,7 @@ Signed-off-by: Martin Bark <[email protected]>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/auto/lib/libgd/conf b/auto/lib/libgd/conf
-index 6e4e91c..1c536a2 100644
+index 87761f14..4c74d8f3 100644
 --- a/auto/lib/libgd/conf
 +++ b/auto/lib/libgd/conf
 @@ -7,8 +7,8 @@

@@ -27,5 +27,5 @@ index 6e4e91c..1c536a2 100644
      . auto/feature
  
 -- 
-2.8.2
+2.17.1

package/nginx/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch +3 -3

index c10fcd11c9..f0b4aad3cc 100644
@@ -1,4 +1,4 @@
-From 8dc9dffc1f99ac951865f3135dfb5061a08d1f85 Mon Sep 17 00:00:00 2001
+From 668028d7d22f130ce1cdfe8bc425663f50e2b9c1 Mon Sep 17 00:00:00 2001
 From: Martin Bark <[email protected]>
 Date: Fri, 6 May 2016 16:29:17 +0100
 Subject: [PATCH] src/os/unix/ngx_linux_config.h: only include dlfcn.h if

@@ -10,7 +10,7 @@ Signed-off-by: Martin Bark <[email protected]>
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/src/os/unix/ngx_linux_config.h b/src/os/unix/ngx_linux_config.h
-index 2f6129d..4244086 100644
+index 3036caeb..e282a1f7 100644
 --- a/src/os/unix/ngx_linux_config.h
 +++ b/src/os/unix/ngx_linux_config.h
 @@ -55,10 +55,12 @@

@@ -29,5 +29,5 @@ index 2f6129d..4244086 100644
  
  #if (NGX_HAVE_POSIX_SEM)
 -- 
-2.8.2
+2.17.1

package/nginx/0009-auto-lib-conf-fix-PCRE-condition-WRT-the-http-and-ht.patch deleted +0 ~~-33~~

deleted file mode 100644
index 08456511dc..0000000000
@@ -1,33 +0,0 @@
-From 9668f0d5ecd2382fd36b7ff6a3a29abd04f6533f Mon Sep 17 00:00:00 2001
-From: Samuel Martin <[email protected]>
-Date: Fri, 14 Jul 2017 11:50:08 +0200
-Subject: [PATCH] auto/lib/conf: fix PCRE condition WRT the http and
- http_rewrite options
-
-http_rewrite module cannot be selected when http server is disabled, so
-fix the PCRE check condition to avoid irrelevant check failure.
-
-Fixes:
-  http://autobuild.buildroot.net/results/bc7/bc7458b97a88785653845afd30fe9d5f3a69905b/build-end.log
-
-Signed-off-by: Samuel Martin <[email protected]>
----
- auto/lib/conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/auto/lib/conf b/auto/lib/conf
-index 0b8545a3..2c7af104 100644
---- a/auto/lib/conf
-+++ b/auto/lib/conf
-@@ -7,7 +7,7 @@ if [ $USE_PCRE = YES -o $PCRE != NONE ]; then
-     . auto/lib/pcre/conf
- 
- else
--    if [ $USE_PCRE = DISABLED -a $HTTP_REWRITE = YES ]; then
-+    if [ $USE_PCRE = DISABLED -a $HTTP = YES -a $HTTP_REWRITE = YES ]; then
- 
- cat << END
- 
--- 
-2.13.2
-

package/nginx/nginx.hash +2 -2

index 9936ca1dfa..51284aefbe 100644
@@ -1,4 +1,4 @@
 # Locally calculated after checking pgp signature
-sha256	305f379da1d5fb5aefa79e45c829852ca6983c7cd2a79328f8e084a324cf0416	nginx-1.12.2.tar.gz
+sha256	b0b58c9a3fd73aa8b89edf5cfadc6641a352e0e6d3071db1eb3215d72b7fb516	nginx-1.15.0.tar.gz
 # License files, locally calculated
-sha256	75820469c890db641e54078df018e497fde0542211aa704e15320316a2175780	LICENSE
+sha256	e18f05bcaad47528f8b21861d4a0fb9815ca1bbb4be946c51a51d36623758bcc	LICENSE

package/nginx/nginx.mk +1 -1

index e5652af6df..23cf2b46d5 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NGINX_VERSION = 1.12.2
+NGINX_VERSION = 1.15.0
 NGINX_SITE = http://nginx.org/download
 NGINX_LICENSE = BSD-2-Clause
 NGINX_LICENSE_FILES = LICENSE

Signature · 1 line

2.17.1

Thomas Petazzoni

2018-06-28 19:13 UTC #1 lore raw

PATCH 1/1 nginx: Bump to version 1.15.0

Hello,

Quoted 10 lines · Ignacy Gaw?dzki

Signed-off-by Ignacy Gaw?dzki <[email protected]>

---
 ...-rework-autotest-to-be-cross-compila.patch |   6 +-
 ...-mechanism-allowing-to-force-feature.patch |   8 +-
 ...ture_run_force_result-for-each-featu.patch |  56 ++--
 ...auto-lib-libxslt-conf-use-pkg-config.patch |  10 +-
 ...ake-sys_nerr-guessing-cross-friendly.patch |  16 +-
 ...auto-lib-openssl-conf-use-pkg-config.patch | 249 ++++++++++++++++--
 ...7-auto-lib-libgd-conf-use-pkg-config.patch |   6 +-
 ...linux_config.h-only-include-dlfcn.h-.patch |   6 +-

What happened to those patches ? Just refreshed ?

Quoted 1 line

 ...x-PCRE-condition-WRT-the-http-and-ht.patch |  33 ---

Why is this patch removed ?

Thanks,

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

Ignacy Gawędzki

author

2018-06-28 22:45 UTC #2 lore raw

PATCH 1/1 nginx: Bump to version 1.15.0

On Thu, Jun 28, 2018 at 09:13:30PM +0200, thus spake Thomas Petazzoni:

Quoted 1 line

Hello,

Hi,

Quoted 12 lines · Ignacy Gaw?dzki

Quoted 10 lines

Signed-off-by Ignacy Gaw?dzki <[email protected]>

---
 ...-rework-autotest-to-be-cross-compila.patch |   6 +-
 ...-mechanism-allowing-to-force-feature.patch |   8 +-
 ...ture_run_force_result-for-each-featu.patch |  56 ++--
 ...auto-lib-libxslt-conf-use-pkg-config.patch |  10 +-
 ...ake-sys_nerr-guessing-cross-friendly.patch |  16 +-
 ...auto-lib-openssl-conf-use-pkg-config.patch | 249 ++++++++++++++++--
 ...7-auto-lib-libgd-conf-use-pkg-config.patch |   6 +-
 ...linux_config.h-only-include-dlfcn.h-.patch |   6 +-

Quoted 1 line

What happened to those patches ? Just refreshed ?

Yes, refreshed, so that they apply properly.

Quoted 3 lines

Quoted 1 line
 ...x-PCRE-condition-WRT-the-http-and-ht.patch |  33 ---
Why is this patch removed ?

It has been applied upstream.

Cheers,

Ignacy

Signature · 3 lines

Ignacy Gaw?dzki
R&D Engineer
Green Communications

Baruch Siach

2018-06-29 02:49 UTC #3 lore raw

PATCH 1/1 nginx: Bump to version 1.15.0

In reply to Ignacy Gawędzki

Hi Ignacy,

Quoted 36 lines · Ignacy Gaw?dzki

Signed-off-by Ignacy Gaw?dzki <[email protected]>

---
 ...-rework-autotest-to-be-cross-compila.patch |   6 +-
 ...-mechanism-allowing-to-force-feature.patch |   8 +-
 ...ture_run_force_result-for-each-featu.patch |  56 ++--
 ...auto-lib-libxslt-conf-use-pkg-config.patch |  10 +-
 ...ake-sys_nerr-guessing-cross-friendly.patch |  16 +-
 ...auto-lib-openssl-conf-use-pkg-config.patch | 249 ++++++++++++++++--
 ...7-auto-lib-libgd-conf-use-pkg-config.patch |   6 +-
 ...linux_config.h-only-include-dlfcn.h-.patch |   6 +-
 ...x-PCRE-condition-WRT-the-http-and-ht.patch |  33 ---
 package/nginx/nginx.hash                      |   4 +-
 package/nginx/nginx.mk                        |   2 +-
 11 files changed, 291 insertions(+), 105 deletions(-)
 delete mode 100644 package/nginx/0009-auto-lib-conf-fix-PCRE-condition-WRT-the-http-and-ht.patch

package/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch +2 -2

index 5b1a50b264..52c8da38c0 100644
@@ -1,4 +1,4 @@
-From fb158af083e72c9aa0a8dfd4c6965f950192a230 Mon Sep 17 00:00:00 2001
+From 218eab509628bffd494516803fdef9585b2e30d8 Mon Sep 17 00:00:00 2001
 From: Samuel Martin <[email protected]>
 Date: Tue, 4 Jul 2017 11:09:20 -0400
 Subject: [PATCH] auto/type/sizeof: rework autotest to be cross-compilation

@@ -22,7 +22,7 @@ Refresh for 1.12.0
  1 file changed, 28 insertions(+), 9 deletions(-)
 
 diff --git a/auto/types/sizeof b/auto/types/sizeof
-index 480d8cf..61dcd2d 100644
+index 480d8cfa..61dcd2de 100644
 --- a/auto/types/sizeof
 +++ b/auto/types/sizeof
 @@ -14,7 +14,7 @@ END

package/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch index 480d8cf..61dcd2d 100644 · line 88

Quoted 5 lines

package/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch +1 -1
@@ -85,5 +85,5 @@ index 480d8cf..61dcd2d 100644
  fi
 
 -- 
-2.9.4
+2.17.1

No need to touch patches that have not changed like this one.

[...]

package/nginx/nginx.hash line 4

Quoted 11 lines

package/nginx/nginx.hash +2 -2

index 9936ca1dfa..51284aefbe 100644
@@ -1,4 +1,4 @@
 # Locally calculated after checking pgp signature
-sha256	305f379da1d5fb5aefa79e45c829852ca6983c7cd2a79328f8e084a324cf0416	nginx-1.12.2.tar.gz
+sha256	b0b58c9a3fd73aa8b89edf5cfadc6641a352e0e6d3071db1eb3215d72b7fb516	nginx-1.15.0.tar.gz
 # License files, locally calculated
-sha256	75820469c890db641e54078df018e497fde0542211aa704e15320316a2175780	LICENSE
+sha256	e18f05bcaad47528f8b21861d4a0fb9815ca1bbb4be946c51a51d36623758bcc	LICENSE

What are the changes in the LICENSE file? Please explain in the commit log.

package/nginx/nginx.mk line 10

Quoted 13 lines

package/nginx/nginx.mk +1 -1

index e5652af6df..23cf2b46d5 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NGINX_VERSION = 1.12.2
+NGINX_VERSION = 1.15.0
 NGINX_SITE = http://nginx.org/download
 NGINX_LICENSE = BSD-2-Clause
 NGINX_LICENSE_FILES = LICENSE

baruch

Signature · 3 lines

     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -

Ignacy Gawędzki

author

2018-06-29 06:39 UTC #4 lore raw

PATCH 1/1 nginx: Bump to version 1.15.0

On Fri, Jun 29, 2018 at 05:49:33AM +0300, thus spake Baruch Siach:

Quoted 1 line

Hi Ignacy,

Hi,

Quoted 39 lines · Ignacy Gaw?dzki

Quoted 38 lines

Signed-off-by Ignacy Gaw?dzki <[email protected]>

---
 ...-rework-autotest-to-be-cross-compila.patch |   6 +-
 ...-mechanism-allowing-to-force-feature.patch |   8 +-
 ...ture_run_force_result-for-each-featu.patch |  56 ++--
 ...auto-lib-libxslt-conf-use-pkg-config.patch |  10 +-
 ...ake-sys_nerr-guessing-cross-friendly.patch |  16 +-
 ...auto-lib-openssl-conf-use-pkg-config.patch | 249 ++++++++++++++++--
 ...7-auto-lib-libgd-conf-use-pkg-config.patch |   6 +-
 ...linux_config.h-only-include-dlfcn.h-.patch |   6 +-
 ...x-PCRE-condition-WRT-the-http-and-ht.patch |  33 ---
 package/nginx/nginx.hash                      |   4 +-
 package/nginx/nginx.mk                        |   2 +-
 11 files changed, 291 insertions(+), 105 deletions(-)
 delete mode 100644 package/nginx/0009-auto-lib-conf-fix-PCRE-condition-WRT-the-http-and-ht.patch

package/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch +2 -2

index 5b1a50b264..52c8da38c0 100644
@@ -1,4 +1,4 @@
-From fb158af083e72c9aa0a8dfd4c6965f950192a230 Mon Sep 17 00:00:00 2001
+From 218eab509628bffd494516803fdef9585b2e30d8 Mon Sep 17 00:00:00 2001
 From: Samuel Martin <[email protected]>
 Date: Tue, 4 Jul 2017 11:09:20 -0400
 Subject: [PATCH] auto/type/sizeof: rework autotest to be cross-compilation

@@ -22,7 +22,7 @@ Refresh for 1.12.0
  1 file changed, 28 insertions(+), 9 deletions(-)
 
 diff --git a/auto/types/sizeof b/auto/types/sizeof
-index 480d8cf..61dcd2d 100644
+index 480d8cfa..61dcd2de 100644
 --- a/auto/types/sizeof
 +++ b/auto/types/sizeof
 @@ -14,7 +14,7 @@ END

@@ -85,5 +85,5 @@ index 480d8cf..61dcd2d 100644
  fi

Quoted 5 lines

package/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch index 480d8cf..61dcd2d 100644 · line 88
Quoted 3 lines
package/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch +1 -1
 -- 
-2.9.4
+2.17.1
No need to touch patches that have not changed like this one.

Yes, indeed. I did this in a batch, that's why I didn't notice that some of them are not changed at all.

Quoted 15 lines

[...]

package/nginx/nginx.hash line 4

Quoted 11 lines

package/nginx/nginx.hash +2 -2

index 9936ca1dfa..51284aefbe 100644
@@ -1,4 +1,4 @@
 # Locally calculated after checking pgp signature
-sha256	305f379da1d5fb5aefa79e45c829852ca6983c7cd2a79328f8e084a324cf0416	nginx-1.12.2.tar.gz
+sha256	b0b58c9a3fd73aa8b89edf5cfadc6641a352e0e6d3071db1eb3215d72b7fb516	nginx-1.15.0.tar.gz
 # License files, locally calculated
-sha256	75820469c890db641e54078df018e497fde0542211aa704e15320316a2175780	LICENSE
+sha256	e18f05bcaad47528f8b21861d4a0fb9815ca1bbb4be946c51a51d36623758bcc	LICENSE

What are the changes in the LICENSE file? Please explain in the commit log.

Only the dates in the copyright lines. Is that worth mentioning in the commit log, really?

Quoted 9 lines

package/nginx/nginx.mk +0 -0

index e5652af6df..23cf2b46d5 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################

Quoted 13 lines

package/nginx/nginx.mk line 10

Quoted 5 lines

package/nginx/nginx.mk +1 -1

-NGINX_VERSION = 1.12.2
+NGINX_VERSION = 1.15.0
 NGINX_SITE = http://nginx.org/download
 NGINX_LICENSE = BSD-2-Clause
 NGINX_LICENSE_FILES = LICENSE

baruch

Signature · 3 lines

     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -

Cheers,

Ignacy

Signature · 3 lines

Ignacy Gaw?dzki
R&D Engineer
Green Communications

Thomas Petazzoni

2018-06-30 20:09 UTC #5 lore raw

PATCH 1/1 nginx: Bump to version 1.15.0

Hello,

Quoted 4 lines · Ignacy Gaw?dzki

Quoted 1 line
What are the changes in the LICENSE file? Please explain in the commit log.
Only the dates in the copyright lines. Is that worth mentioning in the commit log, really?

Yes, it is, because then we know that you have checked what the changes were, and it's not that you just blindly update the license file hashes.

If changes in license file hashes are not explained in commit log, then it's basically useless to have hashes in the first place.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

Thomas Petazzoni

2018-06-30 20:22 UTC #6 lore raw

PATCH 1/1 nginx: Bump to version 1.15.0

In reply to Ignacy Gawędzki

Hello,

Quoted 15 lines · Ignacy Gaw?dzki

Signed-off-by Ignacy Gaw?dzki <[email protected]>

---
 ...-rework-autotest-to-be-cross-compila.patch |   6 +-
 ...-mechanism-allowing-to-force-feature.patch |   8 +-
 ...ture_run_force_result-for-each-featu.patch |  56 ++--
 ...auto-lib-libxslt-conf-use-pkg-config.patch |  10 +-
 ...ake-sys_nerr-guessing-cross-friendly.patch |  16 +-
 ...auto-lib-openssl-conf-use-pkg-config.patch | 249 ++++++++++++++++--
 ...7-auto-lib-libgd-conf-use-pkg-config.patch |   6 +-
 ...linux_config.h-only-include-dlfcn.h-.patch |   6 +-
 ...x-PCRE-condition-WRT-the-http-and-ht.patch |  33 ---
 package/nginx/nginx.hash                      |   4 +-
 package/nginx/nginx.mk                        |   2 +-
 11 files changed, 291 insertions(+), 105 deletions(-)
 delete mode 100644 package/nginx/0009-auto-lib-conf-fix-PCRE-condition-WRT-the-http-and-ht.patch

I've applied, after removing the unneeded patch updates, and extending the commit log with more details (which patches are updated, which patches are removed and why, why the license file hash is changed).

If you're using nginx, it would be nice if you could try to get more of our patches upstream :-)

Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com