[meta-webserver]

[meta-webserver]

[salman.isd]

upgrade nginx to latest stable/mainline versions

The following changes since commit 86be1d89174ecfa91e7f323d49a301f51db01501:

  python3-sentry-sdk: upgrade 1.2.0 -> 1.3.0 (2021-07-29 10:35:05 -0700)

are available in the Git repository at:

  https://github.com/salmanisd/meta-openembedded.git upgrade-nginx
  https://github.com//tree/upgrade-nginx

Salman Ahmed (2):
  nginx: upgrade 1.18.0 -> 1.20.1
  nginx: upgrade 1.19.6 -> 1.21.1

 meta-webserver/recipes-httpd/nginx/nginx_1.18.0.bb |  6 ------
 meta-webserver/recipes-httpd/nginx/nginx_1.19.6.bb | 10 ----------
 meta-webserver/recipes-httpd/nginx/nginx_1.20.1.bb |  7 +++++++
 meta-webserver/recipes-httpd/nginx/nginx_1.21.1.bb | 10 ++++++++++
 4 files changed, 17 insertions(+), 16 deletions(-)
 delete mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.18.0.bb
 delete mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.19.6.bb
 create mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.20.1.bb
 create mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.21.1.bb

-- 
2.25.1

[[meta-webserver] 1/2] nginx: upgrade 1.18.0 -> 1.20.1

[Salman Ahmed]

Signed-off-by: Salman Ahmed <salman.ahmed@weidmueller.com>
---
 meta-webserver/recipes-httpd/nginx/nginx_1.18.0.bb | 6 ------
 meta-webserver/recipes-httpd/nginx/nginx_1.20.1.bb | 7 +++++++
 2 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.18.0.bb
 create mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.20.1.bb

diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.18.0.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.18.0.bb
deleted file mode 100644
index ac303e47d..000000000
--- a/meta-webserver/recipes-httpd/nginx/nginx_1.18.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require nginx.inc
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=52e384aaac868b755b93ad5535e2d075"
-
-SRC_URI[md5sum] = "b2d33d24d89b8b1f87ff5d251aa27eb8"
-SRC_URI[sha256sum] = "4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99"
diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.20.1.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.20.1.bb
new file mode 100644
index 000000000..7f159a2a3
--- /dev/null
+++ b/meta-webserver/recipes-httpd/nginx/nginx_1.20.1.bb
@@ -0,0 +1,7 @@
+require nginx.inc
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=206629dc7c7b3e87acb31162363ae505"
+
+SRC_URI[md5sum] = "8ca6edd5076bdfad30a69c9c9b41cc68"
+SRC_URI[sha256sum] = "e462e11533d5c30baa05df7652160ff5979591d291736cfa5edb9fd2edb48c49"
+
-- 
2.25.1

[[meta-webserver] 2/2] nginx: upgrade 1.19.6 -> 1.21.1

[Salman Ahmed]

Signed-off-by: Salman Ahmed <salman.ahmed@weidmueller.com>
---
 meta-webserver/recipes-httpd/nginx/nginx_1.19.6.bb | 10 ----------
 meta-webserver/recipes-httpd/nginx/nginx_1.21.1.bb | 10 ++++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.19.6.bb
 create mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.21.1.bb

diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.19.6.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.19.6.bb
deleted file mode 100644
index 16c80cd09..000000000
--- a/meta-webserver/recipes-httpd/nginx/nginx_1.19.6.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require nginx.inc
-
-# 1.18.x branch is the current stable branch, the recommended default
-# 1.19.x is the current mainline branches containing all new features
-DEFAULT_PREFERENCE = "-1"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=52e384aaac868b755b93ad5535e2d075"
-
-SRC_URI[md5sum] = "0be1d90b45b1bdfcf8339f299e74063a"
-SRC_URI[sha256sum] = "b11195a02b1d3285ddf2987e02c6b6d28df41bb1b1dd25f33542848ef4fc33b5"
diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.21.1.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.21.1.bb
new file mode 100644
index 000000000..b69fd7dab
--- /dev/null
+++ b/meta-webserver/recipes-httpd/nginx/nginx_1.21.1.bb
@@ -0,0 +1,10 @@
+require nginx.inc
+
+# 1.20.x branch is the current stable branch, the recommended default
+# 1.21.x is the current mainline branches containing all new features
+DEFAULT_PREFERENCE = "-1"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=206629dc7c7b3e87acb31162363ae505"
+
+SRC_URI[md5sum] = "7dce9e2136ec32dfd823736e871815b1"
+SRC_URI[sha256sum] = "68ba0311342115163a0354cad34f90c05a7e8bf689dc498abf07899eda155560"
-- 
2.25.1

[meta-webserver]

[Derek Straka]

Hello,

I'm currently looking to remove divest maintaining meta-oe layers.  Is
there anyone in the community interested in maintaining meta-webserver?
Feel free to submit a patchset removing me and I'll ack it.  Thanks.

-Derek

Re: [meta-webserver]

[Brian Hutchinson]

On Tue, Jan 10, 2017 at 5:07 PM, Brian Hutchinson <b.hutchman@gmail.com> wrote:
> In both krogoth and morty I get the following error trying to build apache2:
>
> WARNING: apache2-native-2.4.23-r0 do_fetch: Failed to fetch URL
> http://www.apache.org/dist/httpd/httpd-2.4.23.tar.bz2, attempting
> MIRRORS if available
> ERROR: apache2-native-2.4.23-r0 do_fetch: Fetcher failure: Fetch
> command failed with exit code 8, output:
> http://www.apache.org/dist/httpd/httpd-2.4.23.tar.bz2:
> 2017-01-10 16:47:16 ERROR 404: Not Found.
>
> ERROR: apache2-native-2.4.23-r0 do_fetch: Function failed: Fetcher
> failure for URL:
> 'http://www.apache.org/dist/httpd/httpd-2.4.23.tar.bz2'. Unable to
> fetch URL from any source.
> ERROR: Logfile of failure stored in:
> /home/hutch/yocto_2.1.2_bbb/layers/poky/build/tmp/work/x86_64-linux/apache2-native/2.4.23-r0/temp/log.do_fetch.17534
> ERROR: Task 1098
> (/home/hutch/yocto_2.1.2_bbb/layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.23.bb,
> do_fetch) failed with exit code '1'
> NOTE: Tasks Summary: Attempted 1033 tasks of which 0 didn't need to be
> rerun and 1 failed.
> Waiting for 0 running tasks to finish:
>
> Summary: 1 task failed:
>   /home/hutch/yocto_2.1.2_bbb/layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.23.bb,
> do_fetch
>
>
> If I go to the URL in the recipe there is no httpd-2.4.23.tar.bz2.
> Looks like it's been replaced with 2.4.25.
>
> Regards,
>
> Brian


Ooops, I see this was recently talked about.  Sorry for the noise.  I
just modified my recipe to use archive to get around the problem as I
don't know what's involved with updating to 2.4.25 ... I've never
found cross compiling Apache for an embedded device (anything other
than x86) trivial.

Regards,

Brian

[meta-webserver]

[Brian Hutchinson]

In both krogoth and morty I get the following error trying to build apache2:

WARNING: apache2-native-2.4.23-r0 do_fetch: Failed to fetch URL
http://www.apache.org/dist/httpd/httpd-2.4.23.tar.bz2, attempting
MIRRORS if available
ERROR: apache2-native-2.4.23-r0 do_fetch: Fetcher failure: Fetch
command failed with exit code 8, output:
http://www.apache.org/dist/httpd/httpd-2.4.23.tar.bz2:
2017-01-10 16:47:16 ERROR 404: Not Found.

ERROR: apache2-native-2.4.23-r0 do_fetch: Function failed: Fetcher
failure for URL:
'http://www.apache.org/dist/httpd/httpd-2.4.23.tar.bz2'. Unable to
fetch URL from any source.
ERROR: Logfile of failure stored in:
/home/hutch/yocto_2.1.2_bbb/layers/poky/build/tmp/work/x86_64-linux/apache2-native/2.4.23-r0/temp/log.do_fetch.17534
ERROR: Task 1098
(/home/hutch/yocto_2.1.2_bbb/layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.23.bb,
do_fetch) failed with exit code '1'
NOTE: Tasks Summary: Attempted 1033 tasks of which 0 didn't need to be
rerun and 1 failed.
Waiting for 0 running tasks to finish:

Summary: 1 task failed:
  /home/hutch/yocto_2.1.2_bbb/layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.23.bb,
do_fetch


If I go to the URL in the recipe there is no httpd-2.4.23.tar.bz2.
Looks like it's been replaced with 2.4.25.

Regards,

Brian