diff options
author | wangmy <wangmy@fujitsu.com> | 2022-06-13 16:51:51 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-06-30 13:39:27 -0400 |
commit | 1bbad38832746185fe7958148903c9365b09a9ac (patch) | |
tree | 9b5ab6f138615e2dcf311e404cabdcc1b0c95b4f /meta-webserver/recipes-httpd | |
parent | 308649db01c6c5ac7379bc74c6b4d95af8acc2ab (diff) | |
download | meta-openembedded-1bbad38832746185fe7958148903c9365b09a9ac.tar.gz |
apache2: upgrade 2.4.53 -> 2.4.54
0004-apache2-log-the-SELinux-context-at-startup.patch
refresh for new version.
Changelog:
https://downloads.apache.org/httpd/CHANGES_2.4.54
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-webserver/recipes-httpd')
-rw-r--r-- | meta-webserver/recipes-httpd/apache2/apache2/0004-apache2-log-the-SELinux-context-at-startup.patch | 12 | ||||
-rw-r--r-- | meta-webserver/recipes-httpd/apache2/apache2_2.4.54.bb (renamed from meta-webserver/recipes-httpd/apache2/apache2_2.4.53.bb) | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0004-apache2-log-the-SELinux-context-at-startup.patch b/meta-webserver/recipes-httpd/apache2/apache2/0004-apache2-log-the-SELinux-context-at-startup.patch index 5d8291968..3b080f54f 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2/0004-apache2-log-the-SELinux-context-at-startup.patch +++ b/meta-webserver/recipes-httpd/apache2/apache2/0004-apache2-log-the-SELinux-context-at-startup.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 37699e9be04d83c5923644e298f400e077f76e85 Mon Sep 17 00:00:00 2001 | 1 | From e47cc405eadcbe37a579c375e824e20a5c53bfad Mon Sep 17 00:00:00 2001 |
2 | From: Paul Eggleton <paul.eggleton@linux.intel.com> | 2 | From: Paul Eggleton <paul.eggleton@linux.intel.com> |
3 | Date: Tue, 17 Jul 2012 11:27:39 +0100 | 3 | Date: Tue, 17 Jul 2012 11:27:39 +0100 |
4 | Subject: [PATCH] Log the SELinux context at startup. | 4 | Subject: [PATCH] Log the SELinux context at startup. |
@@ -8,13 +8,14 @@ Log the SELinux context at startup. | |||
8 | Upstream-Status: Inappropriate [other] | 8 | Upstream-Status: Inappropriate [other] |
9 | 9 | ||
10 | Note: unlikely to be any interest in this upstream | 10 | Note: unlikely to be any interest in this upstream |
11 | |||
11 | --- | 12 | --- |
12 | configure.in | 5 +++++ | 13 | configure.in | 5 +++++ |
13 | server/core.c | 26 ++++++++++++++++++++++++++ | 14 | server/core.c | 26 ++++++++++++++++++++++++++ |
14 | 2 files changed, 31 insertions(+) | 15 | 2 files changed, 31 insertions(+) |
15 | 16 | ||
16 | diff --git a/configure.in b/configure.in | 17 | diff --git a/configure.in b/configure.in |
17 | index c799aec..76811e7 100644 | 18 | index ea6cec3..92b74b7 100644 |
18 | --- a/configure.in | 19 | --- a/configure.in |
19 | +++ b/configure.in | 20 | +++ b/configure.in |
20 | @@ -491,6 +491,11 @@ getloadavg | 21 | @@ -491,6 +491,11 @@ getloadavg |
@@ -30,7 +31,7 @@ index c799aec..76811e7 100644 | |||
30 | [AC_TRY_RUN(#define _GNU_SOURCE | 31 | [AC_TRY_RUN(#define _GNU_SOURCE |
31 | #include <unistd.h> | 32 | #include <unistd.h> |
32 | diff --git a/server/core.c b/server/core.c | 33 | diff --git a/server/core.c b/server/core.c |
33 | index 3020090..8fef5fd 100644 | 34 | index 4da7209..d3ca25b 100644 |
34 | --- a/server/core.c | 35 | --- a/server/core.c |
35 | +++ b/server/core.c | 36 | +++ b/server/core.c |
36 | @@ -65,6 +65,10 @@ | 37 | @@ -65,6 +65,10 @@ |
@@ -43,7 +44,7 @@ index 3020090..8fef5fd 100644 | |||
43 | + | 44 | + |
44 | /* LimitRequestBody handling */ | 45 | /* LimitRequestBody handling */ |
45 | #define AP_LIMIT_REQ_BODY_UNSET ((apr_off_t) -1) | 46 | #define AP_LIMIT_REQ_BODY_UNSET ((apr_off_t) -1) |
46 | #define AP_DEFAULT_LIMIT_REQ_BODY ((apr_off_t) 0) | 47 | #define AP_DEFAULT_LIMIT_REQ_BODY ((apr_off_t) 1<<30) /* 1GB */ |
47 | @@ -5126,6 +5130,28 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte | 48 | @@ -5126,6 +5130,28 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte |
48 | } | 49 | } |
49 | #endif | 50 | #endif |
@@ -73,6 +74,3 @@ index 3020090..8fef5fd 100644 | |||
73 | return OK; | 74 | return OK; |
74 | } | 75 | } |
75 | 76 | ||
76 | -- | ||
77 | 2.25.1 | ||
78 | |||
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.53.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.54.bb index 8413f5379..4b0ed2f62 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.53.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.54.bb | |||
@@ -26,7 +26,7 @@ SRC_URI:append:class-target = " \ | |||
26 | " | 26 | " |
27 | 27 | ||
28 | LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3" | 28 | LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3" |
29 | SRC_URI[sha256sum] = "d0bbd1121a57b5f2a6ff92d7b96f8050c5a45d3f14db118f64979d525858db63" | 29 | SRC_URI[sha256sum] = "eb397feeefccaf254f8d45de3768d9d68e8e73851c49afd5b7176d1ecf80c340" |
30 | 30 | ||
31 | S = "${WORKDIR}/httpd-${PV}" | 31 | S = "${WORKDIR}/httpd-${PV}" |
32 | 32 | ||