diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2019-04-15 11:39:38 +0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2019-09-02 19:53:53 -0700 |
commit | a42f773baae90558c4a2e9f207579db7edb830a5 (patch) | |
tree | d76db6c29d7a485f0151c47cbbb845ed853b1675 /meta-webserver/recipes-httpd/apache2/apache2/0006-apache2-fix-the-race-issue-of-parallel-installation.patch | |
parent | 63acd997e6eb92e59ef84a1598d90279a794549c (diff) | |
download | meta-openembedded-a42f773baae90558c4a2e9f207579db7edb830a5.tar.gz |
apache2: upgrade 2.4.34 -> 2.4.39
* Drop apache2-native recipe.
Add native to BBCLASSEXTEND in apache2 recipe.
* Refresh patches.
Drop CVE-2018-11763.patch and apache-configure_perlbin.patch
* Cleanup recipe file. Remove obsolete code.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
[Bug fix only update:
Includes CVES: CVE-2018-17189
CVE-2018-17199
CVE-2019-0190
CVE-2019-0220
CVE-2019-0196
CVE-2019-0197
CVE-2019-0215
CVE-2019-0217
CVE-2019-0211
]
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-webserver/recipes-httpd/apache2/apache2/0006-apache2-fix-the-race-issue-of-parallel-installation.patch')
-rw-r--r-- | meta-webserver/recipes-httpd/apache2/apache2/0006-apache2-fix-the-race-issue-of-parallel-installation.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0006-apache2-fix-the-race-issue-of-parallel-installation.patch b/meta-webserver/recipes-httpd/apache2/apache2/0006-apache2-fix-the-race-issue-of-parallel-installation.patch new file mode 100644 index 000000000..227d04064 --- /dev/null +++ b/meta-webserver/recipes-httpd/apache2/apache2/0006-apache2-fix-the-race-issue-of-parallel-installation.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 4f4d7d6b88b6e440263ebeb22dfb40c52bb30fd8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Zhenhua Luo <zhenhua.luo@freescale.com> | ||
3 | Date: Fri, 25 Jan 2013 18:10:50 +0800 | ||
4 | Subject: [PATCH] apache2: fix the race issue of parallel installation | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | fix following race issue when do parallel install | ||
9 | | mkdir: cannot create directory `/home/mypc/workspace/poky/build_p4080ds_release/tmp/work/ppce500mc-fsl_networking-linux/apache2/2.4.3-r1/image/usr/share/apache2': File exists | ||
10 | ... | ||
11 | | mkdir: cannot create directory `/home/mypc/workspace/poky/build_p4080ds_release/tmp/work/ppce500mc-fsl_networking-linux/apache2/2.4.3-r1/image/usr/share/apache2': File exists | ||
12 | | make[1]: *** [install-man] Error 1 | ||
13 | | make[1]: *** Waiting for unfinished jobs.... | ||
14 | |||
15 | Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> | ||
16 | --- | ||
17 | build/mkdir.sh | 2 +- | ||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/build/mkdir.sh b/build/mkdir.sh | ||
21 | index e2d5bb6..dde5ae0 100755 | ||
22 | --- a/build/mkdir.sh | ||
23 | +++ b/build/mkdir.sh | ||
24 | @@ -39,7 +39,7 @@ for file in ${1+"$@"} ; do | ||
25 | esac | ||
26 | if test ! -d "$pathcomp"; then | ||
27 | echo "mkdir $pathcomp" 1>&2 | ||
28 | - mkdir "$pathcomp" || errstatus=$? | ||
29 | + mkdir -p "$pathcomp" || errstatus=$? | ||
30 | fi | ||
31 | pathcomp="$pathcomp/" | ||
32 | done | ||
33 | -- | ||
34 | 2.7.4 | ||
35 | |||