diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-05-10 13:51:08 +0100 |
---|---|---|
committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-05-14 23:47:36 +0100 |
commit | 3190369ddb30a9285f77900d849c883785072156 (patch) | |
tree | dc55808afaedbc719403992a341f89348e3db6f5 /meta-webserver/recipes-httpd | |
parent | 3dcea929763e6a3233dbe620920f02682b28bb8d (diff) | |
download | meta-openembedded-contrib-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 baa739fd44..baa739fd44 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 3a59fb0799..3a59fb0799 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 027af04c3b..027af04c3b 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 18e4107ec7..18e4107ec7 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 873328d9b5..873328d9b5 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 ed629bfc81..afbed8e550 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 Note: EXPORT_DIRS change is conditional on using shared apr ---- httpd-2.4.1/server/Makefile.in.export -+++ httpd-2.4.1/server/Makefile.in +--- httpd-2.4.4/server/Makefile.in.export ++++ httpd-2.4.4/server/Makefile.in @@ -57,9 +57,6 @@ export_files: ( for dir in $(EXPORT_DIRS); do \ ls $$dir/*.h ; \ @@ -17,6 +17,6 @@ Note: EXPORT_DIRS change is conditional on using shared apr - for dir in $(EXPORT_DIRS_APR); do \ - ls $$dir/ap[ru].h $$dir/ap[ru]_*.h 2>/dev/null; \ - done; \ - ) | sort -u > $@ + ) | sed -e s,//,/,g | sort -u > $@ 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 16fd7d75b6..ba282319d2 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 Upstream-Status: Backport ---- httpd-2.4.2/modules/ssl/ssl_private.h -+++ httpd-2.4.2/modules/ssl/ssl_private.h +--- httpd-2.4.4/modules/ssl/ssl_private.h ++++ httpd-2.4.4/modules/ssl/ssl_private.h @@ -139,6 +139,11 @@ #define HAVE_FIPS #endif @@ -37,7 +37,7 @@ Upstream-Status: Backport #if (OPENSSL_VERSION_NUMBER >= 0x10000000) #define MODSSL_SSL_CIPHER_CONST const #define MODSSL_SSL_METHOD_CONST const -@@ -811,6 +816,7 @@ +@@ -840,6 +845,7 @@ int ssl_callback_ServerNameIndication(SSL *, int *, modssl_ctx_t *); int ssl_callback_SessionTicket(SSL *, unsigned char *, unsigned char *, EVP_CIPHER_CTX *, HMAC_CTX *, int); #endif @@ -45,9 +45,9 @@ Upstream-Status: Backport /** Session Cache Support */ void ssl_scache_init(server_rec *, apr_pool_t *); ---- httpd-2.4.2/modules/ssl/mod_ssl.c -+++ httpd-2.4.2/modules/ssl/mod_ssl.c -@@ -260,6 +260,18 @@ +--- httpd-2.4.4/modules/ssl/mod_ssl.c ++++ httpd-2.4.4/modules/ssl/mod_ssl.c +@@ -272,6 +272,18 @@ static const command_rec ssl_config_cmds[] = { AP_END_CMD }; @@ -66,9 +66,9 @@ Upstream-Status: Backport /* * the various processing hooks */ ---- httpd-2.4.2/modules/ssl/mod_ssl.h -+++ httpd-2.4.2/modules/ssl/mod_ssl.h -@@ -63,5 +63,26 @@ +--- httpd-2.4.4/modules/ssl/mod_ssl.h ++++ httpd-2.4.4/modules/ssl/mod_ssl.h +@@ -63,5 +63,26 @@ APR_DECLARE_OPTIONAL_FN(int, ssl_proxy_enable, (conn_rec *)); APR_DECLARE_OPTIONAL_FN(int, ssl_engine_disable, (conn_rec *)); @@ -95,9 +95,9 @@ Upstream-Status: Backport + #endif /* __MOD_SSL_H__ */ /** @} */ ---- httpd-2.4.2/modules/ssl/ssl_engine_init.c -+++ httpd-2.4.2/modules/ssl/ssl_engine_init.c -@@ -681,6 +681,11 @@ +--- httpd-2.4.4/modules/ssl/ssl_engine_init.c ++++ httpd-2.4.4/modules/ssl/ssl_engine_init.c +@@ -725,6 +725,11 @@ static void ssl_init_ctx_callbacks(server_rec *s, #endif SSL_CTX_set_info_callback(ctx, ssl_callback_Info); @@ -109,8 +109,8 @@ Upstream-Status: Backport } static void ssl_init_ctx_verify(server_rec *s, ---- httpd-2.4.2/modules/ssl/ssl_engine_io.c -+++ httpd-2.4.2/modules/ssl/ssl_engine_io.c +--- httpd-2.4.4/modules/ssl/ssl_engine_io.c ++++ httpd-2.4.4/modules/ssl/ssl_engine_io.c @@ -28,6 +28,7 @@ core keeps dumping.'' -- Unknown */ @@ -119,7 +119,7 @@ Upstream-Status: Backport #include "apr_date.h" /* _________________________________________________________________ -@@ -297,6 +298,7 @@ +@@ -297,6 +298,7 @@ typedef struct { apr_pool_t *pool; char buffer[AP_IOBUFSIZE]; ssl_filter_ctx_t *filter_ctx; @@ -127,7 +127,7 @@ Upstream-Status: Backport } bio_filter_in_ctx_t; /* -@@ -1374,6 +1376,27 @@ +@@ -1385,6 +1387,27 @@ static apr_status_t ssl_io_filter_input(ap_filter_t *f, APR_BRIGADE_INSERT_TAIL(bb, bucket); } @@ -155,7 +155,7 @@ Upstream-Status: Backport return APR_SUCCESS; } -@@ -1855,6 +1878,7 @@ +@@ -1866,6 +1889,7 @@ static void ssl_io_input_add_filter(ssl_filter_ctx_t *filter_ctx, conn_rec *c, inctx->block = APR_BLOCK_READ; inctx->pool = c->pool; inctx->filter_ctx = filter_ctx; @@ -163,8 +163,8 @@ Upstream-Status: Backport } /* The request_rec pointer is passed in here only to ensure that the ---- httpd-2.4.2/modules/ssl/ssl_engine_kernel.c -+++ httpd-2.4.2/modules/ssl/ssl_engine_kernel.c +--- httpd-2.4.4/modules/ssl/ssl_engine_kernel.c ++++ httpd-2.4.4/modules/ssl/ssl_engine_kernel.c @@ -29,6 +29,7 @@ time I was too famous.'' -- Unknown */ @@ -173,10 +173,10 @@ Upstream-Status: Backport #include "util_md5.h" static void ssl_configure_env(request_rec *r, SSLConnRec *sslconn); -@@ -2143,3 +2144,84 @@ - return -1; +@@ -2186,3 +2187,84 @@ int ssl_callback_SRPServerParams(SSL *ssl, int *ad, void *arg) } - #endif + + #endif /* OPENSSL_NO_SRP */ + +#ifdef HAVE_TLS_NPN +/* 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 584ddc8d94..584ddc8d94 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 f1349cb6a4..f1349cb6a4 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 064e6bdb43..2855648883 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/" DEPENDS = "expat-native pcre-native apr-native apr-util-native" SECTION = "net" LICENSE = "Apache-2.0" -PR = "r0" inherit native @@ -14,8 +13,8 @@ SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2" S = "${WORKDIR}/httpd-${PV}" LIC_FILES_CHKSUM = "file://LICENSE;md5=eff226ae95d0516d6210ed77dfdf2dcc" -SRC_URI[md5sum] = "87aaf7bc7e8715f0455997bb8c6791aa" -SRC_URI[sha256sum] = "d82102b9c111f1892fb20a2bccf4370de579c6521b2f172ed0b36f2759fb249e" +SRC_URI[md5sum] = "0e712ee2119cd798c8ae39d5f11a9206" +SRC_URI[sha256sum] = "92aabddeca76a4ac7330b143df1407bbf35574c7291c15172238ac598d97655c" do_configure () { ./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 5589f1f2e4..42a7b166ec 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/" DEPENDS = "libtool-native apache2-native openssl expat pcre apr apr-util" SECTION = "net" LICENSE = "Apache-2.0" -PR = "r1" SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \ file://server-makefile.patch \ file://httpd-2.4.1-corelimit.patch \ - file://httpd-2.4.1-export.patch \ + file://httpd-2.4.4-export.patch \ file://httpd-2.4.1-selinux.patch \ - file://httpd-2.4.2-r1332643.patch \ + file://httpd-2.4.4-r1332643.patch \ file://apache-configure_perlbin.patch \ file://replace-lynx-to-curl-in-apachectl-script.patch \ file://apache-ssl-ltmain-rpath.patch \ @@ -20,8 +19,8 @@ SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \ file://init" LIC_FILES_CHKSUM = "file://LICENSE;md5=eff226ae95d0516d6210ed77dfdf2dcc" -SRC_URI[md5sum] = "87aaf7bc7e8715f0455997bb8c6791aa" -SRC_URI[sha256sum] = "d82102b9c111f1892fb20a2bccf4370de579c6521b2f172ed0b36f2759fb249e" +SRC_URI[md5sum] = "0e712ee2119cd798c8ae39d5f11a9206" +SRC_URI[sha256sum] = "92aabddeca76a4ac7330b143df1407bbf35574c7291c15172238ac598d97655c" S = "${WORKDIR}/httpd-${PV}" |