[gentoo-commits] gentoo-x86 commit in www-servers/apache: apache-2.4.4-r3.ebuild apache-2.2.24-r1.ebuild ChangeLog

[Fabio Erculiani (lxnay)]

lxnay       13/05/20 08:58:01

  Modified:             apache-2.4.4-r3.ebuild ChangeLog
  Added:                apache-2.2.24-r1.ebuild
  Log:
  add systemd support to both 2.2 and 2.4 branches on behalf of the systemd team, fix bug #466096, overriding unresponsive maintainer
  
  (Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key ADC916E5)

Revision  Changes    Path
1.3                  www-servers/apache/apache-2.4.4-r3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.4-r3.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.4-r3.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.4-r3.ebuild?r1=1.2&r2=1.3

Index: apache-2.4.4-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.4-r3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apache-2.4.4-r3.ebuild	11 Apr 2013 09:24:14 -0000	1.2
+++ apache-2.4.4-r3.ebuild	20 May 2013 08:58:01 -0000	1.3
@@ -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.2 2013/04/11 09:24:14 polynomial-c Exp $
+# $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 $
 
 EAPI="2"
 
@@ -113,7 +113,7 @@
 use ssl && MODULE_CRITICAL+=" socache_shmcb"
 use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
 
-inherit eutils apache-2
+inherit eutils apache-2 systemd
 
 DESCRIPTION="The Apache Web Server."
 HOMEPAGE="http://httpd.apache.org/"
@@ -146,6 +146,10 @@
 	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() {
@@ -171,6 +175,11 @@
 	if use ssl; then
 		dodir /var/run/apache_ssl_mutex || die "Failed to mkdir ssl_mutex"
 	fi
+
+	systemd_newunit "${FILESDIR}/apache2.4.service" "apache2.service"
+	systemd_dotmpfilesd "${FILESDIR}/apache.conf"
+	insinto /etc/apache2/modules.d
+	doins "${FILESDIR}/00_systemd.conf"
 }
 
 pkg_postinst()



1.230                www-servers/apache/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?rev=1.230&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?rev=1.230&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?r1=1.229&r2=1.230

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- ChangeLog	3 May 2013 07:19:50 -0000	1.229
+++ ChangeLog	20 May 2013 08:58:01 -0000	1.230
@@ -1,6 +1,15 @@
 # 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.229 2013/05/03 07:19:50 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.230 2013/05/20 08:58:01 lxnay Exp $
+
+*apache-2.2.24-r1 (20 May 2013)
+
+  20 May 2013; Fabio Erculiani <lxnay@g.o> +apache-2.2.24-r1.ebuild,
+  apache-2.4.4-r3.ebuild, +files/00_systemd.conf,
+  +files/httpd-2.4.3-mod_systemd.patch, +files/apache.conf,
+  +files/apache2.2.service, +files/apache2.4.service:
+  add systemd support to both 2.2 and 2.4 branches on behalf of the systemd
+  team, fix bug #466096, overriding unresponsive maintainer
 
   03 May 2013; Patrick Lauer <patrick@g.o> metadata.xml:
   Remove ghelm from metadata



1.1                  www-servers/apache/apache-2.2.24-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.2.24-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.2.24-r1.ebuild?rev=1.1&content-type=text/plain

Index: apache-2.2.24-r1.ebuild
===================================================================
# 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.2.24-r1.ebuild,v 1.1 2013/05/20 08:58:01 lxnay Exp $

EAPI="2"

WANT_AUTOMAKE="1.11"

# latest gentoo apache files
GENTOO_PATCHSTAMP="20121012"
GENTOO_DEVELOPER="patrick"
GENTOO_PATCHNAME="gentoo-apache-2.2.23"

# IUSE/USE_EXPAND magic
IUSE_MPMS_FORK="itk peruser prefork"
IUSE_MPMS_THREAD="event worker"

IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon
authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default
authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta
charset_lite cgi cgid dav dav_fs dav_lock dbd deflate dir disk_cache dumpio
env expires ext_filter file_cache filter headers ident imagemap include info
log_config log_forensic logio mem_cache mime mime_magic negotiation proxy
proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi rewrite
reqtimeout setenvif speling status substitute unique_id userdir usertrack
version vhost_alias"
# The following are also in the source as of this version, but are not available
# for user selection:
# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
# optional_fn_import optional_hook_export optional_hook_import

# inter-module dependencies
# TODO: this may still be incomplete
MODULE_DEPENDS="
	dav_fs:dav
	dav_lock:dav
	deflate:filter
	disk_cache:cache
	ext_filter:filter
	file_cache:cache
	log_forensic:log_config
	logio:log_config
	mem_cache:cache
	mime_magic:mime
	proxy_ajp:proxy
	proxy_balancer:proxy
	proxy_connect:proxy
	proxy_ftp:proxy
	proxy_http:proxy
	proxy_scgi:proxy
	substitute:filter
"

# module<->define mappings
MODULE_DEFINES="
	auth_digest:AUTH_DIGEST
	authnz_ldap:AUTHNZ_LDAP
	cache:CACHE
	dav:DAV
	dav_fs:DAV
	dav_lock:DAV
	disk_cache:CACHE
	file_cache:CACHE
	info:INFO
	ldap:LDAP
	mem_cache:CACHE
	proxy:PROXY
	proxy_ajp:PROXY
	proxy_balancer:PROXY
	proxy_connect:PROXY
	proxy_ftp:PROXY
	proxy_http:PROXY
	ssl:SSL
	status:STATUS
	suexec:SUEXEC
	userdir:USERDIR
"

# critical modules for the default config
MODULE_CRITICAL="
	authz_host
	dir
	mime
"

inherit apache-2 systemd

DESCRIPTION="The Apache Web Server."
HOMEPAGE="http://httpd.apache.org/"

# some helper scripts are Apache-1.1, thus both are here
LICENSE="Apache-2.0 Apache-1.1"
SLOT="2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE=""

DEPEND="${DEPEND}
	>=dev-libs/openssl-0.9.8m
	apache2_modules_deflate? ( sys-libs/zlib )"

# dependency on >=dev-libs/apr-1.4.5 for bug #368651
RDEPEND="${RDEPEND}
	>=dev-libs/apr-1.4.5
	>=dev-libs/openssl-0.9.8m
	apache2_modules_mime? ( app-misc/mime-types )"

# init script fixup - should be rolled into next tarball #389965
src_prepare() {
	apache-2_src_prepare
	sed -i -e 's/! test -f/test -f/' "${GENTOO_PATCHDIR}"/init/apache2.initd || die "Failed to fix init script"
	cp "${FILESDIR}"/2.2.22-envvars-std.in "${S}"/support/envvars-std.in || die "Failed to apply LD_PRELOAD fix"
}

src_install() {
	apache-2_src_install

	systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service"
	systemd_dotmpfilesd "${FILESDIR}/apache.conf"
}