summaryrefslogtreecommitdiffstats
path: root/meta-webserver/recipes-httpd/apache2
Commit message (Collapse)AuthorAgeFilesLines
* apache2: add back patch for set perlbinChangqing Li2019-04-292-0/+35
| | | | | | | | | | Add back this patch. Without this patch, apxs's shebang will use perl under hosttools, which can be too long for shebang, and cause error: bad interpreter: No such file or directory Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* apache2: Correct packaging of build and doc related filesPeter Kjellerstedt2019-04-271-2/+7
| | | | | | | | The build related files (${datadir}/${BPN}/build and ${bindir}/apxs) belong in the -dev package, and the manual belong in the -doc package. Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* apache2: Correct appending to SYSROOT_PREPROCESS_FUNCSPeter Kjellerstedt2019-04-271-1/+1
| | | | | | | | A missing space lead to problems if something else was already added to SYSROOT_PREPROCESS_FUNCS. Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* apache2: upgrade 2.4.34 -> 2.4.39Yi Zhao2019-04-1613-713/+157
| | | | | | | | | | | | | * 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>
* apache2: set CVE_PRODUCTQi.Chen@windriver.com2019-03-291-0/+2
| | | | | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* apache2: Fix CVE-2018-11763Mingli Yu2018-11-023-0/+514
| | | | | | | | | | | | mod_http2: connection IO event handling reworked. Instead of reacting on incoming bytes, the state machine now acts on incoming frames that are affecting it. This reduces state transitions. Reference: https://people.canonical.com/~ubuntu-security/cve/2018/CVE-2018-11763.html Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* apache2: set files layout to debian styleYi Zhao2018-08-241-2/+4
| | | | | | | | | The default layout installs log files to /var/apache2/logs. But we assume the log directory is /var/log/apache2 in volatile.conf. Specify the layout to debian style to set the correct the log directory. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* apache2: upgrade 2.4.33 -> 2.4.34Yi Zhao2018-07-272-4/+4
| | | | | | | | | | | | | Security fixes: CVE-2018-8011 mod_md: DoS via Coredumps on specially crafted requests CVE-2018-1333 mod_http2: DoS for HTTP/2 connections by specially crafted requests Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* apache2: upgrade 2.4.29 -> 2.4.33Yi Zhao2018-07-0512-141/+117
| | | | | | | | | | | | | | * License-Update: Correctly identify origin of util_pcre.c/ap_regex.h as pcreposix[.ch] and correct LICENSE/NOTICE to match. * Refresh patches with devtool * Drop useless patch apache-ssl-ltmain-rpath.patch * Move all patches to one directory Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* apache2: Add PACKAGECONFIG zlib option for mod_deflateHaiqing Bai2018-06-291-0/+1
| | | | | | | | | The configure options '--enable-deflate' or '--with-z' make the package depends on zlib. PACKAGECONFIG should be defined to clear the dependency. Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* apache2/sthttpd: add alternatives for docHongxu Jia2018-05-171-1/+4
| | | | | | | | | | | | | | | There is a failure to install both of sthttpd-doc and apache2-doc to rootfs. ... |Error: Transaction check error: | file /usr/share/man/man1/htpasswd.1 conflicts between attempted installs of sthttpd-doc-2.27.1 -r0.0.armv7ahf_neon and apache2-doc-2.4.27 -r0.0.armv7ahf_neon ... Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
* apache2: refresh patchesArmin Kuster2018-04-133-28/+24
| | | | | | | | | | | | | | | | | | | | | | 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>
* apache2: update to version 2.4.29Derek Straka2017-11-152-6/+6
| | | | | | | Updated license checksum due to whitespace modifications Signed-off-by: Derek Straka <derek@asterius.io> Signed-off-by: Armin Kuster <akuster808@gmail.com>
* apache2: change files layout to debian styledengke.du@windriver.com2017-09-181-1/+9
| | | | | | | | | | The default layout installs log files and pid files into /var/apache2/logs. This is odd and also will cause security issues because selinux does not know how to label the security contexts for the files. Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com> Signed-off-by: Dengke Du <dengke.du@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* apache2: use volatiles for sysvinitdengke.du@windriver.com2017-09-182-0/+7
| | | | | Signed-off-by: Dengke Du <dengke.du@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* apache2: update to version 2.4.27Derek Straka2017-08-132-4/+4
| | | | | Signed-off-by: Derek Straka <derek@asterius.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* recipes: delete obsolete patchesOleksandr Kravchuk2017-03-161-55/+0
| | | | | | | Deleted bunch of patches which are not used anymore by any recipe. Signed-off-by: Oleksandr Kravchuk <oleksandr.kravchuk@pelagicore.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* Make use of the new bb.utils.filter() functionPeter Kjellerstedt2017-03-071-1/+1
| | | | | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* apache2: Correct the SRC_URIPeter Kjellerstedt2017-02-222-2/+2
| | | | | | | | The change to use ${APACHE_MIRROR} in the SRC_URI in dfbe6cf214 did not take into account that ${APACHE_MIRROR} already contains "/dist". Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* apache: use the APACHE_MIRROR variable in the SRC_URIDerek Straka2017-02-132-2/+2
| | | | | Signed-off-by: Derek Straka <derek@asterius.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* apache2: always use the archive.apache.org to ensure older releases are ↵Derek Straka2016-12-262-2/+2
| | | | | | | always available Signed-off-by: Derek Straka <derek@asterius.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* apache2: update to version 2.4.25Derek Straka2016-12-263-30/+4
| | | | | Signed-off-by: Derek Straka <derek@asterius.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* apache2: include .load files in modules.dJunxian.Xiao2016-11-231-0/+1
| | | | | | | | | | | | | According to other Linux distributes like Ubuntu, the modules are usually included by 'LoadModule' command in *.load files in mods-enable directory, as *.conf files in this directory are usually used for special configurations for each module. Include *.load in apache2 top conf file to be compatible with customer's normal usage habits. Signed-off-by: Junxian.Xiao <Junxian.Xiao@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* apache2: cve-2016-5387Joe Slater2016-11-232-0/+26
| | | | | | | Handle HTTP_PROXY envirnoment variable. Signed-off-by: Joe Slater <jslater@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* meta-oe: remove trailing spacesMartin Jansa2016-08-221-1/+1
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* apache2: update to version 2.4.23Derek Straka2016-07-292-4/+4
| | | | | Signed-off-by: Derek Straka <derek@asterius.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* apache2: fix libtool's path in apxsKirill Esipov2016-05-191-1/+1
| | | | | | | libtool-cross recipe install it as ${HOST_SYS}-libtool Signed-off-by: Kirill Esipov <yesipov@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* meta-webserver: use bb.utils.contains() instead of base_contains()Ross Burton2016-04-281-2/+2
| | | | | | | | base_contains() is a compatibility wrapper and may warn in the future, so replace all instances with bb.utils.contains(). Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* apache2: update to 2.4.20Derek Straka2016-04-212-4/+4
| | | | | Signed-off-by: Derek Straka <derek@asterius.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* apache2: stage apachectlIoan-Adrian Ratiu2016-03-251-0/+2
| | | | | | | | Some apache module recipes like the newly introduced apache-websocket also need apachectl at build in the sysroot besides apxs. Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* apache2: add openldap support to PACKAGECONFIGIoan-Adrian Ratiu2016-02-151-0/+1
| | | | | | | This config option is disabled by default Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* apache2: Upgrade 2.4.16 -> 2.4.18fan.xin2016-01-043-294/+4
| | | | | | | | | | | | | | | 1. Upgrade apache2 from 2.4.16 to 2.4.18 The changes in 2.4.18 is shown in following URL. http://ftp.meisei-u.ac.jp/mirror/apache/dist//httpd/CHANGES_2.4.18 2. Delete patch file npn-patch-2.4.7.patch due to this patch file can not be applied to the apache2 2.4.18's source code. The NPN support was removed with r1676004. NPN is now quite unlikely to find its way into a stable release. https://bz.apache.org/bugzilla/show_bug.cgi?id=52210 Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* apache2: fix host-user-contaminated warningsKai Kang2015-12-181-0/+2
| | | | | | | | | | | | | It shows warnings when build apache2 such as: | WARNING: QA Issue: apache2: /apache2-dev/usr/share/apache2/icons/small/movie.gif | is owned by uid 1785, which is the same as the user running bitbake. | This may be due to host contamination [host-user-contaminated] Set the owner and group to root to fix it. Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* apache2: fix config_vars.mk path contaminationGeorge McCollister2015-11-021-0/+4
| | | | | | | | Replace contaminated paths with staging paths so apxs can be successfully used in other recipes to build modules when host and target arch differ. Signed-off-by: George McCollister <george.mccollister@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* apache2: cleanup buildpaths for target stuffsWenzong Fan2015-10-131-0/+9
| | | | | | | | | | | | | | | Those buildpaths were generated from configure substitutions, they are required for cross-compiling, but obviously they should be cleaned up from target stuffs. Cleanup buildpaths from config_vars.mk and config.nice: * remove ${STAGING_DIR_HOST} from CC, CFLAGS ... * set APU_INCLUDEDIR, APU_CONFIG as empty * remove buildpath from configure line Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* apache2: wait for server to start/stop/restartAdam Chappell2015-08-311-4/+161
| | | | | | | | | | | Change start, stop, and restart functions in apache2 init script to return only after completion (i.e. the server has started/stopped, not just received a kill signal). Starting and stopping the server in quick sucession results in an error because the server will attempt to stop before it has had time to start and vice versa. Signed-off-by: Adam Chappell <adam.chappell@ni.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* apache: upgrade to 2.4.16Roy Li2015-08-243-63/+4
| | | | | | | | 2.4.16 includes fixes for CVE-2015-3185, CVE-2015-0253 and CVE-2015-3183 remove a backport patch 0001-SECURITY-CVE-2015-0228-cve.mitre.org.patch Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* apache2: fix build warning.Armin Kuster2015-07-161-0/+1
| | | | | | | WARNING: QA Issue: /usr/bin/apxs_apache2-dev contained in package apache2-dev requires /usr/bin/perl, but no providers found in its RDEPENDS [file-rdeps] Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* apache2: upgrade to 2.4.12Roy Li2015-05-135-321/+98
| | | | | | | | | Remove apache-CVE-2014-0117.patch which apache2 2.4.12 has it Update the apache-ssl-ltmain-rpath.patch Backport the patch to fix CVE-2015-0228 Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* apache2: fix a typosRoy Li2015-01-281-1/+1
| | | | | | | | | fix a typos to remove a warning: systemd[1]: [/lib/systemd/system/apache2.service:2] Unknown lvalue 'Decription' in section 'Unit' Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* apache2: add PACKAGECONFIG for selinuxWenzong Fan2014-12-092-0/+44
| | | | | | | | | | Add PACKAGECONFIG for 'selinux', otherwise there would be warnings like below: WARN: apache2: apache2 rdepends on libselinux, but it isn't a build dependency? Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* apache: add fix for CVE-2014-0117 Security AdvisoryKang Kai2014-10-312-1/+292
| | | | | | | | | | | | | | | | The patch comes from upstream: http://svn.apache.org/viewvc?view=revision&revision=1610674 SECURITY (CVE-2014-0117): Fix a crash in mod_proxy. In a reverse proxy configuration, a remote attacker could send a carefully crafted request which could crash a server process, resulting in denial of service. Thanks to Marek Kroemeke working with HP's Zero Day Initiative for reporting this issue. Submitted by: Edward Lu, breser, covener Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com> Signed-off-by: Kai Kang <kai.kang@windriver.com>
* apache2: split apache2-scripts subpkgRobert Yang2014-09-261-2/+8
| | | | | | | | | | Split apache2-scripts subpkg to put the perl script dbmmanage, so that apache2 doesn't have to RDEPEND on perl. Add another perl script apxs to apache2-dev pkg as Olof Johansson suggested. Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
* apache2: add systemd unit fileChen Qi2014-08-272-2/+25
| | | | | | | Add systemd unit file for apache2. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* apache2: update to 2.4.10Paul Eggleton2014-08-102-4/+4
| | | | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
* apache2: do not patch generated filePaul Eggleton2014-08-101-17/+0
| | | | | | | We already patch configure.ac and we're not bypassing autoreconf, so we don't need to patch configure as well. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
* recipes: Add missing pkgconfig dependenciesRichard Purdie2014-07-151-1/+1
| | | | | | | These recipes were all missing pkgconfig dependencies. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* recipes: add missing pkgconfig class inheritsRichard Purdie2014-06-211-1/+1
| | | | | | | | * These recipes all use pkg-config in some way but were missing dependencies on the tool, this patch adds them. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* apache2(-native): use pkg-config for pcre detectionKoen Kooi2014-06-213-10/+66
| | | | | | | Also fixup apache2-native recipe to use autotools and SEPB. Signed-off-by: Koen Kooi <koen.kooi@linaro.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* apache: upgrade to 2.4.9Kang Kai2014-05-022-4/+4
| | | | | | Upgrade apache from 2.4.7 to 2.4.9. Signed-off-by: Kai Kang <kai.kang@windriver.com>