summaryrefslogtreecommitdiffstats
path: root/meta-webserver
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2018-04-07 20:02:17 -0700
committerArmin Kuster <akuster808@gmail.com>2018-04-13 12:43:41 -0700
commit1eb1f5588146fcd4d555ecd2de420a7f8e186aa0 (patch)
tree295088651b4a5b38c188b110f96b787097257605 /meta-webserver
parent03c0d75d34148c33b1d58b9af608aad54a763dc4 (diff)
downloadmeta-openembedded-1eb1f5588146fcd4d555ecd2de420a7f8e186aa0.tar.gz
apache2: refresh patches
WARNING: apache2-2.4.29-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 apache-configure_perlbin.patch patching file configure.in Hunk #1 succeeded at 855 with fuzz 2 (offset 217 lines). Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-webserver')
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch12
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2/apache-ssl-ltmain-rpath.patch23
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2/replace-lynx-to-curl-in-apachectl-script.patch17
3 files changed, 24 insertions, 28 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch b/meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch
index c90279d44..92c53f31d 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch
+++ b/meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch
@@ -4,11 +4,13 @@
4# 4#
5# Upstream-Status: Inappropriate [configuration] 5# Upstream-Status: Inappropriate [configuration]
6 6
7--- a/configure.in 7Index: httpd-2.4.29/configure.in
8+++ b/configure.in 8===================================================================
9@@ -638,10 +638,7 @@ 9--- httpd-2.4.29.orig/configure.in
10 AC_DEFINE_UNQUOTED(APACHE_MPM_DIR, "$MPM_DIR", 10+++ httpd-2.4.29/configure.in
11 [Location of the source for the current MPM]) 11@@ -855,10 +855,7 @@ AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "
12 AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "${rel_sysconfdir}/mime.types",
13 [Location of the MIME types config file, relative to the Apache root directory])
12 14
13-perlbin=`$ac_aux_dir/PrintPath perl` 15-perlbin=`$ac_aux_dir/PrintPath perl`
14-if test "x$perlbin" = "x"; then 16-if test "x$perlbin" = "x"; then
diff --git a/meta-webserver/recipes-httpd/apache2/apache2/apache-ssl-ltmain-rpath.patch b/meta-webserver/recipes-httpd/apache2/apache2/apache-ssl-ltmain-rpath.patch
index 413dc535e..f13da91f3 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2/apache-ssl-ltmain-rpath.patch
+++ b/meta-webserver/recipes-httpd/apache2/apache2/apache-ssl-ltmain-rpath.patch
@@ -1,11 +1,11 @@
1 build/ltmain.sh | 32 +++++++++++++++++++++++++++----- 1 build/ltmain.sh | 32 +++++++++++++++++++++++++++-----
2 1 file changed, 27 insertions(+), 5 deletions(-) 2 1 file changed, 27 insertions(+), 5 deletions(-)
3 3
4diff --git a/build/ltmain.sh b/build/ltmain.sh 4Index: httpd-2.4.29/build/ltmain.sh
5index 5eca4ae..805b461 100644 5===================================================================
6--- a/build/ltmain.sh 6--- httpd-2.4.29.orig/build/ltmain.sh
7+++ b/build/ltmain.sh 7+++ httpd-2.4.29/build/ltmain.sh
8@@ -6944,7 +6944,7 @@ func_mode_link () 8@@ -6969,7 +6969,7 @@ func_mode_link ()
9 dir=$func_resolve_sysroot_result 9 dir=$func_resolve_sysroot_result
10 # We need an absolute path. 10 # We need an absolute path.
11 case $dir in 11 case $dir in
@@ -14,7 +14,7 @@ index 5eca4ae..805b461 100644
14 *) 14 *)
15 absdir=`cd "$dir" && pwd` 15 absdir=`cd "$dir" && pwd`
16 test -z "$absdir" && \ 16 test -z "$absdir" && \
17@@ -8137,7 +8137,7 @@ func_mode_link () 17@@ -8167,7 +8167,7 @@ func_mode_link ()
18 $ECHO "*** $linklib is not portable!" 18 $ECHO "*** $linklib is not portable!"
19 fi 19 fi
20 if test lib = "$linkmode" && 20 if test lib = "$linkmode" &&
@@ -23,7 +23,7 @@ index 5eca4ae..805b461 100644
23 # Hardcode the library path. 23 # Hardcode the library path.
24 # Skip directories that are in the system default run-time 24 # Skip directories that are in the system default run-time
25 # search path. 25 # search path.
26@@ -8404,7 +8404,7 @@ func_mode_link () 26@@ -8434,7 +8434,7 @@ func_mode_link ()
27 27
28 if test lib = "$linkmode"; then 28 if test lib = "$linkmode"; then
29 if test -n "$dependency_libs" && 29 if test -n "$dependency_libs" &&
@@ -32,7 +32,7 @@ index 5eca4ae..805b461 100644
32 test yes = "$build_old_libs" || 32 test yes = "$build_old_libs" ||
33 test yes = "$link_static"; }; then 33 test yes = "$link_static"; }; then
34 # Extract -R from dependency_libs 34 # Extract -R from dependency_libs
35@@ -9025,7 +9025,8 @@ func_mode_link () 35@@ -9086,7 +9086,8 @@ func_mode_link ()
36 *) func_append finalize_rpath " $libdir" ;; 36 *) func_append finalize_rpath " $libdir" ;;
37 esac 37 esac
38 done 38 done
@@ -42,7 +42,7 @@ index 5eca4ae..805b461 100644
42 dependency_libs="$temp_xrpath $dependency_libs" 42 dependency_libs="$temp_xrpath $dependency_libs"
43 fi 43 fi
44 fi 44 fi
45@@ -9473,7 +9474,7 @@ EOF 45@@ -9534,7 +9535,7 @@ EOF
46 case $archive_cmds in 46 case $archive_cmds in
47 *\$LD\ *) wl= ;; 47 *\$LD\ *) wl= ;;
48 esac 48 esac
@@ -51,7 +51,7 @@ index 5eca4ae..805b461 100644
51 # Hardcode the library paths 51 # Hardcode the library paths
52 hardcode_libdirs= 52 hardcode_libdirs=
53 dep_rpath= 53 dep_rpath=
54@@ -10211,6 +10212,27 @@ EOF 54@@ -10272,6 +10273,27 @@ EOF
55 # Now hardcode the library paths 55 # Now hardcode the library paths
56 rpath= 56 rpath=
57 hardcode_libdirs= 57 hardcode_libdirs=
@@ -79,6 +79,3 @@ index 5eca4ae..805b461 100644
79 for libdir in $compile_rpath $finalize_rpath; do 79 for libdir in $compile_rpath $finalize_rpath; do
80 if test -n "$hardcode_libdir_flag_spec"; then 80 if test -n "$hardcode_libdir_flag_spec"; then
81 if test -n "$hardcode_libdir_separator"; then 81 if test -n "$hardcode_libdir_separator"; then
82--
831.9.1
84
diff --git a/meta-webserver/recipes-httpd/apache2/apache2/replace-lynx-to-curl-in-apachectl-script.patch b/meta-webserver/recipes-httpd/apache2/apache2/replace-lynx-to-curl-in-apachectl-script.patch
index 584ddc8d9..e4e01b2af 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2/replace-lynx-to-curl-in-apachectl-script.patch
+++ b/meta-webserver/recipes-httpd/apache2/apache2/replace-lynx-to-curl-in-apachectl-script.patch
@@ -10,11 +10,11 @@ Signed-off-by: Yulong Pei <Yulong.pei@windriver.com>
10 support/apachectl.in | 14 ++++++++++---- 10 support/apachectl.in | 14 ++++++++++----
11 1 files changed, 10 insertions(+), 4 deletions(-) 11 1 files changed, 10 insertions(+), 4 deletions(-)
12 12
13diff --git a/support/apachectl.in b/support/apachectl.in 13Index: httpd-2.4.29/support/apachectl.in
14index d4dff38..109ea13 100644 14===================================================================
15--- a/support/apachectl.in 15--- httpd-2.4.29.orig/support/apachectl.in
16+++ b/support/apachectl.in 16+++ httpd-2.4.29/support/apachectl.in
17@@ -51,11 +51,11 @@ fi 17@@ -52,11 +52,11 @@ fi
18 # a command that outputs a formatted text version of the HTML at the 18 # a command that outputs a formatted text version of the HTML at the
19 # url given on the command line. Designed for lynx, however other 19 # url given on the command line. Designed for lynx, however other
20 # programs may work. 20 # programs may work.
@@ -28,7 +28,7 @@ index d4dff38..109ea13 100644
28 # 28 #
29 # Set this variable to a command that increases the maximum 29 # Set this variable to a command that increases the maximum
30 # number of file descriptors allowed per child process. This is 30 # number of file descriptors allowed per child process. This is
31@@ -91,10 +91,16 @@ configtest) 31@@ -92,10 +92,16 @@ configtest)
32 ERROR=$? 32 ERROR=$?
33 ;; 33 ;;
34 status) 34 status)
@@ -46,7 +46,4 @@ index d4dff38..109ea13 100644
46+ fi 46+ fi
47 ;; 47 ;;
48 *) 48 *)
49 $HTTPD $ARGV 49 $HTTPD "$@"
50--
511.6.4
52