Revbumps. Cleaned up ebuilds a bit. Moved apxs to /usr/bin (bug #502384). Fixed bugs #489236, #493020, #493360, #503986 and #509772

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

4 files changed, 46 insertions, 41 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 46b2d8d21d15..7338df176d6a 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-servers/apache
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.274 2014/05/21 06:22:13 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.275 2014/05/22 14:02:43 polynomial-c Exp $
+
+*apache-2.4.9-r3 (22 May 2014)
+*apache-2.2.27-r3 (22 May 2014)
+
+  22 May 2014; Lars Wendler <polynomial-c@gentoo.org> -apache-2.2.27-r2.ebuild,
+  +apache-2.2.27-r3.ebuild, -apache-2.4.9-r2.ebuild, +apache-2.4.9-r3.ebuild:
+  Revbumps. Cleaned up ebuilds a bit. Moved apxs to /usr/bin (bug #502384).
+  Fixed bugs #489236, #493020, #493360, #503986 and #509772.
 
   21 May 2014; Lars Wendler <polynomial-c@gentoo.org> -apache-2.2.24.ebuild,
   -apache-2.2.25.ebuild:
diff --git a/www-servers/apache/apache-2.2.27-r2.ebuild b/www-servers/apache/apache-2.2.27-r3.ebuild
index 751d53f5c34c..231fb7a10b11 100644
--- a/www-servers/apache/apache-2.2.27-r2.ebuild
+++ b/www-servers/apache/apache-2.2.27-r3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.27-r2.ebuild,v 1.1 2014/04/21 09:45:27 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.27-r3.ebuild,v 1.1 2014/05/22 14:02:43 polynomial-c Exp $
 
 EAPI=5
 
 # latest gentoo apache files
-GENTOO_PATCHSTAMP="20140421"
+GENTOO_PATCHSTAMP="20140522"
 GENTOO_DEVELOPER="polynomial-c"
-GENTOO_PATCHNAME="gentoo-apache-2.2.27-r2"
+GENTOO_PATCHNAME="gentoo-apache-2.2.27-r3"
 
 # IUSE/USE_EXPAND magic
 IUSE_MPMS_FORK="itk peruser prefork"
@@ -92,16 +92,6 @@ SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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 )"
-
 src_configure() {
 	# Brain dead check.
 	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
@@ -112,6 +102,14 @@ src_configure() {
 src_install() {
 	apache-2_src_install
 
+	# install apxs in /usr/bin (bug #502384) and put a symlink into the
+	# old location until all ebuilds and eclasses have been modified to
+	# use the new location.
+	local apxs_dir="/usr/bin"
+	dodir ${apxs_dir}
+	mv "${D}"/usr/sbin/apxs "${D}"${apxs_dir} || die
+	ln -s ../bin/apxs "${D}"/usr/sbin/apxs || die
+
 	systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service"
 	systemd_dotmpfilesd "${FILESDIR}/apache.conf"
 }
diff --git a/www-servers/apache/apache-2.4.9-r2.ebuild b/www-servers/apache/apache-2.4.9-r3.ebuild
index 76e095ab6bf1..a12cbdcf4318 100644
--- a/www-servers/apache/apache-2.4.9-r2.ebuild
+++ b/www-servers/apache/apache-2.4.9-r3.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.9-r2.ebuild,v 1.1 2014/04/21 09:45:27 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.9-r3.ebuild,v 1.1 2014/05/22 14:02:43 polynomial-c Exp $
 
 EAPI=5
 
 # latest gentoo apache files
-GENTOO_PATCHSTAMP="20140421"
+GENTOO_PATCHSTAMP="20140522"
 GENTOO_DEVELOPER="polynomial-c"
-GENTOO_PATCHNAME="gentoo-apache-2.4.9-r2"
+GENTOO_PATCHNAME="gentoo-apache-2.4.9-r3"
 
 # IUSE/USE_EXPAND magic
-IUSE_MPMS_FORK="itk peruser prefork"
+IUSE_MPMS_FORK="peruser prefork"
 IUSE_MPMS_THREAD="event worker"
 
 # << obsolete modules:
@@ -31,16 +31,17 @@ IUSE_MPMS_THREAD="event worker"
 # slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
 # socache_shmcb: shared object cache provider. Default config with ssl needs it
 # unixd: fixes startup error: Invalid command 'User'
-IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest authn_alias authn_anon
-authn_core authn_dbd authn_dbm authn_file authz_core authz_dbm
-authz_groupfile authz_host authz_owner authz_user autoindex cache cache_disk cern_meta
-charset_lite cgi cgid dav dav_fs dav_lock dbd deflate dir dumpio
-env expires ext_filter file_cache filter headers ident imagemap include info
-lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat
-log_config log_forensic logio mime mime_magic negotiation proxy
-proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi proxy_fcgi
-rewrite ratelimit remoteip reqtimeout setenvif slotmem_shm speling socache_shmcb status substitute
-unique_id userdir usertrack unixd version vhost_alias"
+IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest
+authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authz_core
+authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
+cache cache_disk cern_meta charset_lite cgi cgid dav dav_fs dav_lock dbd deflate
+dir dumpio env expires ext_filter file_cache filter headers ident imagemap
+include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness
+lbmethod_heartbeat log_config log_forensic logio mime mime_magic negotiation
+proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi
+proxy_fcgi  proxy_wstunnel rewrite ratelimit remoteip reqtimeout setenvif
+slotmem_shm speling socache_shmcb status substitute unique_id userdir usertrack
+unixd 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
@@ -72,6 +73,7 @@ MODULE_DEPENDS="
 	proxy_http:proxy
 	proxy_scgi:proxy
 	proxy_fcgi:proxy
+	proxy_wstunnel:proxy
 	substitute:filter
 "
 
@@ -95,6 +97,7 @@ MODULE_DEFINES="
 	proxy_http:PROXY
 	proxy_fcgi:PROXY
 	proxy_scgi:PROXY
+	proxy_wstunnel:PROXY
 	socache_shmcb:SSL
 	ssl:SSL
 	status:STATUS
@@ -122,16 +125,6 @@ SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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.5.0 for bug #492578
-RDEPEND="${RDEPEND}
-	>=dev-libs/apr-1.5.0
-	>=dev-libs/openssl-0.9.8m
-	apache2_modules_mime? ( app-misc/mime-types )"
-
 pkg_setup() {
 	# dependend critical modules which are not allowed in global scope due
 	# to USE flag conditionals (bug #499260)
@@ -176,9 +169,13 @@ src_install() {
 		rm "${D}/"$i || die "Failed to prune apache-tools bits"
 	done
 
-	# well, actually installing things makes them more installed, I guess?
-	cp "${S}"/support/apxs "${D}"/usr/sbin/apxs || die "Failed to install apxs"
-	chmod 0755 "${D}"/usr/sbin/apxs
+	# install apxs in /usr/bin (bug #502384) and put a symlink into the 
+	# old location until all ebuilds and eclasses have been modified to
+	# use the new location.
+	local apxs="/usr/bin/apxs"
+	cp "${S}"/support/apxs "${D}"${apxs} || die "Failed to install apxs"
+	ln -s ../bin/apxs "${D}"/usr/sbin/apxs || die
+	chmod 0755 "${D}"${apxs} || die
 
 	# Note: wait for mod_systemd to be included in the next release,
 	# then apache2.4.service can be used and systemd support controlled
diff --git a/www-servers/apache/metadata.xml b/www-servers/apache/metadata.xml
index a941ea1e6ef3..d7b1a48889b0 100644
--- a/www-servers/apache/metadata.xml
+++ b/www-servers/apache/metadata.xml
@@ -17,6 +17,7 @@
 		<flag name='apache2_modules_access_compat'>Group authorizations based on host (name or IP address). Available as a compatibility module with previous versions.</flag>
 		<flag name='apache2_modules_authn_core'>Provides core authentication capabilities common to all authentication providers (functionality provided by authn_alias in previous versions).</flag>
 		<flag name='apache2_modules_authz_core'>Provides core authorization capabilities to various authorization/authorization modules, such as authn_file and authz_user.</flag>
+		<flag name='apache2_modules_authz_dbd'>Provides authorization capabilities via SQL database so that authenticated users can be allowed or denied access to portions of the web site by group membership.</flag>
 		<flag name='apache2_modules_cache_disk'>Disk based storage module for the HTTP caching filter (similar to mem_cache in previous versions).</flag>
 		<flag name='apache2_modules_lbmethod_byrequests'>Request counting load balancer scheduler algorithm for proxy_balancer.</flag>
 		<flag name='apache2_modules_lbmethod_bytraffic'>Weighted traffic counting load balancer scheduler algorithm for proxy_balancer.</flag>
@@ -26,6 +27,7 @@
 		<flag name='apache2_modules_socache_shmcb'>A shared object cache provider using a high-performance cyclic buffer inside a shared memory segment.</flag>
 		<flag name='apache2_modules_unixd'>Basic (required) security for Unix-family platforms.</flag>
 		<flag name='apache2_modules_proxy_fcgi'>FCGI support module for mod_proxy.</flag>
+		<flag name='apache2_modules_proxy_wstunnel'>Provides support for the tunnelling of web socket connections to a backend websockets server.</flag>
 		<flag name='apache2_modules_ratelimit'>Ratelimit module for transfer rate management</flag>
 		<flag name='apache2_modules_remoteip'>Remotip module for logging</flag>
 	</use>