summaryrefslogtreecommitdiffstats
path: root/meta-webserver/recipes-httpd
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-05-10 13:51:08 +0100
committerPaul Eggleton <paul.eggleton@linux.intel.com>2013-05-14 23:47:36 +0100
commit3190369ddb30a9285f77900d849c883785072156 (patch)
treedc55808afaedbc719403992a341f89348e3db6f5 /meta-webserver/recipes-httpd
parent3dcea929763e6a3233dbe620920f02682b28bb8d (diff)
downloadmeta-openembedded-3190369ddb30a9285f77900d849c883785072156.tar.gz
apache2: update to 2.4.4
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta-webserver/recipes-httpd')
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2-2.4.4/apache-configure_perlbin.patch (renamed from meta-webserver/recipes-httpd/apache2/apache2-2.4.3/apache-configure_perlbin.patch)0
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2-2.4.4/apache-ssl-ltmain-rpath.patch (renamed from meta-webserver/recipes-httpd/apache2/apache2-2.4.3/apache-ssl-ltmain-rpath.patch)0
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2-2.4.4/fix-libtool-name.patch (renamed from meta-webserver/recipes-httpd/apache2/apache2-2.4.3/fix-libtool-name.patch)0
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2-2.4.4/httpd-2.4.1-corelimit.patch (renamed from meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.1-corelimit.patch)0
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2-2.4.4/httpd-2.4.1-selinux.patch (renamed from meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.1-selinux.patch)0
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2-2.4.4/httpd-2.4.4-export.patch (renamed from meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.1-export.patch)6
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2-2.4.4/httpd-2.4.4-r1332643.patch (renamed from meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.2-r1332643.patch)44
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2-2.4.4/replace-lynx-to-curl-in-apachectl-script.patch (renamed from meta-webserver/recipes-httpd/apache2/apache2-2.4.3/replace-lynx-to-curl-in-apachectl-script.patch)0
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2-2.4.4/server-makefile.patch (renamed from meta-webserver/recipes-httpd/apache2/apache2-2.4.3/server-makefile.patch)0
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2-native_2.4.4.bb (renamed from meta-webserver/recipes-httpd/apache2/apache2-native_2.4.3.bb)5
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb (renamed from meta-webserver/recipes-httpd/apache2/apache2_2.4.3.bb)9
11 files changed, 31 insertions, 33 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2-2.4.3/apache-configure_perlbin.patch b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/apache-configure_perlbin.patch
index baa739fd4..baa739fd4 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2-2.4.3/apache-configure_perlbin.patch
+++ b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/apache-configure_perlbin.patch
diff --git a/meta-webserver/recipes-httpd/apache2/apache2-2.4.3/apache-ssl-ltmain-rpath.patch b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/apache-ssl-ltmain-rpath.patch
index 3a59fb079..3a59fb079 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2-2.4.3/apache-ssl-ltmain-rpath.patch
+++ b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/apache-ssl-ltmain-rpath.patch
diff --git a/meta-webserver/recipes-httpd/apache2/apache2-2.4.3/fix-libtool-name.patch b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/fix-libtool-name.patch
index 027af04c3..027af04c3 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2-2.4.3/fix-libtool-name.patch
+++ b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/fix-libtool-name.patch
diff --git a/meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.1-corelimit.patch b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/httpd-2.4.1-corelimit.patch
index 18e4107ec..18e4107ec 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.1-corelimit.patch
+++ b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/httpd-2.4.1-corelimit.patch
diff --git a/meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.1-selinux.patch b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/httpd-2.4.1-selinux.patch
index 873328d9b..873328d9b 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.1-selinux.patch
+++ b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/httpd-2.4.1-selinux.patch
diff --git a/meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.1-export.patch b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/httpd-2.4.4-export.patch
index ed629bfc8..afbed8e55 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.1-export.patch
+++ b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/httpd-2.4.4-export.patch
@@ -8,8 +8,8 @@ Upstream-Status: Pending
8 8
9Note: EXPORT_DIRS change is conditional on using shared apr 9Note: EXPORT_DIRS change is conditional on using shared apr
10 10
11--- httpd-2.4.1/server/Makefile.in.export 11--- httpd-2.4.4/server/Makefile.in.export
12+++ httpd-2.4.1/server/Makefile.in 12+++ httpd-2.4.4/server/Makefile.in
13@@ -57,9 +57,6 @@ export_files: 13@@ -57,9 +57,6 @@ export_files:
14 ( for dir in $(EXPORT_DIRS); do \ 14 ( for dir in $(EXPORT_DIRS); do \
15 ls $$dir/*.h ; \ 15 ls $$dir/*.h ; \
@@ -17,6 +17,6 @@ Note: EXPORT_DIRS change is conditional on using shared apr
17- for dir in $(EXPORT_DIRS_APR); do \ 17- for dir in $(EXPORT_DIRS_APR); do \
18- ls $$dir/ap[ru].h $$dir/ap[ru]_*.h 2>/dev/null; \ 18- ls $$dir/ap[ru].h $$dir/ap[ru]_*.h 2>/dev/null; \
19- done; \ 19- done; \
20 ) | sort -u > $@ 20 ) | sed -e s,//,/,g | sort -u > $@
21 21
22 exports.c: export_files 22 exports.c: export_files
diff --git a/meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.2-r1332643.patch b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/httpd-2.4.4-r1332643.patch
index 16fd7d75b..ba282319d 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.2-r1332643.patch
+++ b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/httpd-2.4.4-r1332643.patch
@@ -23,8 +23,8 @@ http://svn.apache.org/viewvc?view=revision&revision=1332643
23 23
24Upstream-Status: Backport 24Upstream-Status: Backport
25 25
26--- httpd-2.4.2/modules/ssl/ssl_private.h 26--- httpd-2.4.4/modules/ssl/ssl_private.h
27+++ httpd-2.4.2/modules/ssl/ssl_private.h 27+++ httpd-2.4.4/modules/ssl/ssl_private.h
28@@ -139,6 +139,11 @@ 28@@ -139,6 +139,11 @@
29 #define HAVE_FIPS 29 #define HAVE_FIPS
30 #endif 30 #endif
@@ -37,7 +37,7 @@ Upstream-Status: Backport
37 #if (OPENSSL_VERSION_NUMBER >= 0x10000000) 37 #if (OPENSSL_VERSION_NUMBER >= 0x10000000)
38 #define MODSSL_SSL_CIPHER_CONST const 38 #define MODSSL_SSL_CIPHER_CONST const
39 #define MODSSL_SSL_METHOD_CONST const 39 #define MODSSL_SSL_METHOD_CONST const
40@@ -811,6 +816,7 @@ 40@@ -840,6 +845,7 @@ int ssl_callback_ServerNameIndication(SSL *, int *, modssl_ctx_t *);
41 int ssl_callback_SessionTicket(SSL *, unsigned char *, unsigned char *, 41 int ssl_callback_SessionTicket(SSL *, unsigned char *, unsigned char *,
42 EVP_CIPHER_CTX *, HMAC_CTX *, int); 42 EVP_CIPHER_CTX *, HMAC_CTX *, int);
43 #endif 43 #endif
@@ -45,9 +45,9 @@ Upstream-Status: Backport
45 45
46 /** Session Cache Support */ 46 /** Session Cache Support */
47 void ssl_scache_init(server_rec *, apr_pool_t *); 47 void ssl_scache_init(server_rec *, apr_pool_t *);
48--- httpd-2.4.2/modules/ssl/mod_ssl.c 48--- httpd-2.4.4/modules/ssl/mod_ssl.c
49+++ httpd-2.4.2/modules/ssl/mod_ssl.c 49+++ httpd-2.4.4/modules/ssl/mod_ssl.c
50@@ -260,6 +260,18 @@ 50@@ -272,6 +272,18 @@ static const command_rec ssl_config_cmds[] = {
51 AP_END_CMD 51 AP_END_CMD
52 }; 52 };
53 53
@@ -66,9 +66,9 @@ Upstream-Status: Backport
66 /* 66 /*
67 * the various processing hooks 67 * the various processing hooks
68 */ 68 */
69--- httpd-2.4.2/modules/ssl/mod_ssl.h 69--- httpd-2.4.4/modules/ssl/mod_ssl.h
70+++ httpd-2.4.2/modules/ssl/mod_ssl.h 70+++ httpd-2.4.4/modules/ssl/mod_ssl.h
71@@ -63,5 +63,26 @@ 71@@ -63,5 +63,26 @@ APR_DECLARE_OPTIONAL_FN(int, ssl_proxy_enable, (conn_rec *));
72 72
73 APR_DECLARE_OPTIONAL_FN(int, ssl_engine_disable, (conn_rec *)); 73 APR_DECLARE_OPTIONAL_FN(int, ssl_engine_disable, (conn_rec *));
74 74
@@ -95,9 +95,9 @@ Upstream-Status: Backport
95+ 95+
96 #endif /* __MOD_SSL_H__ */ 96 #endif /* __MOD_SSL_H__ */
97 /** @} */ 97 /** @} */
98--- httpd-2.4.2/modules/ssl/ssl_engine_init.c 98--- httpd-2.4.4/modules/ssl/ssl_engine_init.c
99+++ httpd-2.4.2/modules/ssl/ssl_engine_init.c 99+++ httpd-2.4.4/modules/ssl/ssl_engine_init.c
100@@ -681,6 +681,11 @@ 100@@ -725,6 +725,11 @@ static void ssl_init_ctx_callbacks(server_rec *s,
101 #endif 101 #endif
102 102
103 SSL_CTX_set_info_callback(ctx, ssl_callback_Info); 103 SSL_CTX_set_info_callback(ctx, ssl_callback_Info);
@@ -109,8 +109,8 @@ Upstream-Status: Backport
109 } 109 }
110 110
111 static void ssl_init_ctx_verify(server_rec *s, 111 static void ssl_init_ctx_verify(server_rec *s,
112--- httpd-2.4.2/modules/ssl/ssl_engine_io.c 112--- httpd-2.4.4/modules/ssl/ssl_engine_io.c
113+++ httpd-2.4.2/modules/ssl/ssl_engine_io.c 113+++ httpd-2.4.4/modules/ssl/ssl_engine_io.c
114@@ -28,6 +28,7 @@ 114@@ -28,6 +28,7 @@
115 core keeps dumping.'' 115 core keeps dumping.''
116 -- Unknown */ 116 -- Unknown */
@@ -119,7 +119,7 @@ Upstream-Status: Backport
119 #include "apr_date.h" 119 #include "apr_date.h"
120 120
121 /* _________________________________________________________________ 121 /* _________________________________________________________________
122@@ -297,6 +298,7 @@ 122@@ -297,6 +298,7 @@ typedef struct {
123 apr_pool_t *pool; 123 apr_pool_t *pool;
124 char buffer[AP_IOBUFSIZE]; 124 char buffer[AP_IOBUFSIZE];
125 ssl_filter_ctx_t *filter_ctx; 125 ssl_filter_ctx_t *filter_ctx;
@@ -127,7 +127,7 @@ Upstream-Status: Backport
127 } bio_filter_in_ctx_t; 127 } bio_filter_in_ctx_t;
128 128
129 /* 129 /*
130@@ -1374,6 +1376,27 @@ 130@@ -1385,6 +1387,27 @@ static apr_status_t ssl_io_filter_input(ap_filter_t *f,
131 APR_BRIGADE_INSERT_TAIL(bb, bucket); 131 APR_BRIGADE_INSERT_TAIL(bb, bucket);
132 } 132 }
133 133
@@ -155,7 +155,7 @@ Upstream-Status: Backport
155 return APR_SUCCESS; 155 return APR_SUCCESS;
156 } 156 }
157 157
158@@ -1855,6 +1878,7 @@ 158@@ -1866,6 +1889,7 @@ static void ssl_io_input_add_filter(ssl_filter_ctx_t *filter_ctx, conn_rec *c,
159 inctx->block = APR_BLOCK_READ; 159 inctx->block = APR_BLOCK_READ;
160 inctx->pool = c->pool; 160 inctx->pool = c->pool;
161 inctx->filter_ctx = filter_ctx; 161 inctx->filter_ctx = filter_ctx;
@@ -163,8 +163,8 @@ Upstream-Status: Backport
163 } 163 }
164 164
165 /* The request_rec pointer is passed in here only to ensure that the 165 /* The request_rec pointer is passed in here only to ensure that the
166--- httpd-2.4.2/modules/ssl/ssl_engine_kernel.c 166--- httpd-2.4.4/modules/ssl/ssl_engine_kernel.c
167+++ httpd-2.4.2/modules/ssl/ssl_engine_kernel.c 167+++ httpd-2.4.4/modules/ssl/ssl_engine_kernel.c
168@@ -29,6 +29,7 @@ 168@@ -29,6 +29,7 @@
169 time I was too famous.'' 169 time I was too famous.''
170 -- Unknown */ 170 -- Unknown */
@@ -173,10 +173,10 @@ Upstream-Status: Backport
173 #include "util_md5.h" 173 #include "util_md5.h"
174 174
175 static void ssl_configure_env(request_rec *r, SSLConnRec *sslconn); 175 static void ssl_configure_env(request_rec *r, SSLConnRec *sslconn);
176@@ -2143,3 +2144,84 @@ 176@@ -2186,3 +2187,84 @@ int ssl_callback_SRPServerParams(SSL *ssl, int *ad, void *arg)
177 return -1;
178 } 177 }
179 #endif 178
179 #endif /* OPENSSL_NO_SRP */
180+ 180+
181+#ifdef HAVE_TLS_NPN 181+#ifdef HAVE_TLS_NPN
182+/* 182+/*
diff --git a/meta-webserver/recipes-httpd/apache2/apache2-2.4.3/replace-lynx-to-curl-in-apachectl-script.patch b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/replace-lynx-to-curl-in-apachectl-script.patch
index 584ddc8d9..584ddc8d9 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2-2.4.3/replace-lynx-to-curl-in-apachectl-script.patch
+++ b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/replace-lynx-to-curl-in-apachectl-script.patch
diff --git a/meta-webserver/recipes-httpd/apache2/apache2-2.4.3/server-makefile.patch b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/server-makefile.patch
index f1349cb6a..f1349cb6a 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2-2.4.3/server-makefile.patch
+++ b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/server-makefile.patch
diff --git a/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.3.bb b/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.4.bb
index 064e6bdb4..285564888 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.3.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.4.bb
@@ -5,7 +5,6 @@ HOMEPAGE = "http://httpd.apache.org/"
5DEPENDS = "expat-native pcre-native apr-native apr-util-native" 5DEPENDS = "expat-native pcre-native apr-native apr-util-native"
6SECTION = "net" 6SECTION = "net"
7LICENSE = "Apache-2.0" 7LICENSE = "Apache-2.0"
8PR = "r0"
9 8
10inherit native 9inherit native
11 10
@@ -14,8 +13,8 @@ SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2"
14S = "${WORKDIR}/httpd-${PV}" 13S = "${WORKDIR}/httpd-${PV}"
15 14
16LIC_FILES_CHKSUM = "file://LICENSE;md5=eff226ae95d0516d6210ed77dfdf2dcc" 15LIC_FILES_CHKSUM = "file://LICENSE;md5=eff226ae95d0516d6210ed77dfdf2dcc"
17SRC_URI[md5sum] = "87aaf7bc7e8715f0455997bb8c6791aa" 16SRC_URI[md5sum] = "0e712ee2119cd798c8ae39d5f11a9206"
18SRC_URI[sha256sum] = "d82102b9c111f1892fb20a2bccf4370de579c6521b2f172ed0b36f2759fb249e" 17SRC_URI[sha256sum] = "92aabddeca76a4ac7330b143df1407bbf35574c7291c15172238ac598d97655c"
19 18
20do_configure () { 19do_configure () {
21 ./configure --with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ 20 ./configure --with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.3.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb
index 5589f1f2e..42a7b166e 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.3.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb
@@ -5,14 +5,13 @@ HOMEPAGE = "http://httpd.apache.org/"
5DEPENDS = "libtool-native apache2-native openssl expat pcre apr apr-util" 5DEPENDS = "libtool-native apache2-native openssl expat pcre apr apr-util"
6SECTION = "net" 6SECTION = "net"
7LICENSE = "Apache-2.0" 7LICENSE = "Apache-2.0"
8PR = "r1"
9 8
10SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \ 9SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \
11 file://server-makefile.patch \ 10 file://server-makefile.patch \
12 file://httpd-2.4.1-corelimit.patch \ 11 file://httpd-2.4.1-corelimit.patch \
13 file://httpd-2.4.1-export.patch \ 12 file://httpd-2.4.4-export.patch \
14 file://httpd-2.4.1-selinux.patch \ 13 file://httpd-2.4.1-selinux.patch \
15 file://httpd-2.4.2-r1332643.patch \ 14 file://httpd-2.4.4-r1332643.patch \
16 file://apache-configure_perlbin.patch \ 15 file://apache-configure_perlbin.patch \
17 file://replace-lynx-to-curl-in-apachectl-script.patch \ 16 file://replace-lynx-to-curl-in-apachectl-script.patch \
18 file://apache-ssl-ltmain-rpath.patch \ 17 file://apache-ssl-ltmain-rpath.patch \
@@ -20,8 +19,8 @@ SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \
20 file://init" 19 file://init"
21 20
22LIC_FILES_CHKSUM = "file://LICENSE;md5=eff226ae95d0516d6210ed77dfdf2dcc" 21LIC_FILES_CHKSUM = "file://LICENSE;md5=eff226ae95d0516d6210ed77dfdf2dcc"
23SRC_URI[md5sum] = "87aaf7bc7e8715f0455997bb8c6791aa" 22SRC_URI[md5sum] = "0e712ee2119cd798c8ae39d5f11a9206"
24SRC_URI[sha256sum] = "d82102b9c111f1892fb20a2bccf4370de579c6521b2f172ed0b36f2759fb249e" 23SRC_URI[sha256sum] = "92aabddeca76a4ac7330b143df1407bbf35574c7291c15172238ac598d97655c"
25 24
26S = "${WORKDIR}/httpd-${PV}" 25S = "${WORKDIR}/httpd-${PV}"
27 26