diff options
| author |   Fabio Erculiani <lxnay@gentoo.org> | 2013-05-21 15:19:08 +0000 |
|---|---|---|
| committer | Fabio Erculiani <lxnay@gentoo.org> | 2013-05-21 15:19:08 +0000 |
| commit | 53558082810dc52917ff275bf35ed01f8be35242 (patch) | |
| tree | cfb83b98c82a4d768e277f7e3621ea61b389b8b9 /www-servers | |
| parent | Stable for HPPA (bug #470266). (diff) | |
| download | gentoo-2-53558082810dc52917ff275bf35ed01f8be35242.tar.gz gentoo-2-53558082810dc52917ff275bf35ed01f8be35242.tar.bz2 gentoo-2-53558082810dc52917ff275bf35ed01f8be35242.zip | |
drop mod_systemd patch for now, since it requires more work in apache-2.eclass, it will be available anyway in the next release, fix bug #470774
(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key ADC916E5)
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/apache/ChangeLog | 7 | ||||
| -rw-r--r-- | www-servers/apache/apache-2.4.4-r3.ebuild | 11 |
2 files changed, 11 insertions, 7 deletions
diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog index 983612385103..0cfb99ca9ba3 100644 --- a/www-servers/apache/ChangeLog +++ b/www-servers/apache/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-servers/apache # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.230 2013/05/20 08:58:01 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.231 2013/05/21 15:19:08 lxnay Exp $ + + 21 May 2013; Fabio Erculiani <lxnay@gentoo.org> apache-2.4.4-r3.ebuild: + drop mod_systemd patch for now, since it requires more work in + apache-2.eclass, it will be available anyway in the next release, fix bug + #470774 *apache-2.2.24-r1 (20 May 2013) diff --git a/www-servers/apache/apache-2.4.4-r3.ebuild b/www-servers/apache/apache-2.4.4-r3.ebuild index 01e99c0e2fc1..8c982106eedd 100644 --- a/www-servers/apache/apache-2.4.4-r3.ebuild +++ b/www-servers/apache/apache-2.4.4-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.4-r3.ebuild,v 1.3 2013/05/20 08:58:01 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.4-r3.ebuild,v 1.4 2013/05/21 15:19:08 lxnay Exp $ EAPI="2" @@ -146,10 +146,6 @@ src_prepare() { fi apache-2_src_prepare sed -i -e 's/! test -f/test -f/' "${GENTOO_PATCHDIR}"/init/apache2.initd || die "Failed to fix init script" - - # mod_systemd support, merged upstream already: - # http://svn.apache.org/viewvc?view=revision&revision=1393976 - epatch "${FILESDIR}/httpd-2.4.3-mod_systemd.patch" } src_install() { @@ -176,7 +172,10 @@ src_install() { dodir /var/run/apache_ssl_mutex || die "Failed to mkdir ssl_mutex" fi - systemd_newunit "${FILESDIR}/apache2.4.service" "apache2.service" + # Note: wait for mod_systemd to be included in the next release, + # then apache2.4.service can be used and systemd support controlled + # through --enable-systemd + systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service" systemd_dotmpfilesd "${FILESDIR}/apache.conf" insinto /etc/apache2/modules.d doins "${FILESDIR}/00_systemd.conf" |