Security bump (bug #538182)

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 8eab5758dcba45fcc5be5ec7463c45525ebf8e05..88ed8d23aea65c95efd2770e6f0fd15b0b60b8b8 100644 (file)
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,11 @@
 # 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.291 2014/09/22 07:48:28 polynomial-c Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.292 2015/02/04 18:16:00 polynomial-c Exp $
+
+*apache-2.4.12 (04 Feb 2015)
+
+  04 Feb 2015; Lars Wendler <polynomial-c@gentoo.org> +apache-2.4.12.ebuild:
+  Security bump (bug #538182).
 
 *apache-2.2.29 (22 Sep 2014)
 

diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index fa2b52d30acc6457b5c15a2e799d49c50e8bc562..dd475643480a993fc003b296f6e11022bfc79fa1 100644 (file)
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -9,26 +9,28 @@ DIST gentoo-apache-2.4.10-r1-20140731.tar.bz2 24531 SHA256 8e093a18582c3a20283ed
 DIST httpd-2.2.27.tar.bz2 5616798 SHA256 205973ded6ca55c056ce9c84d73ab708f7829f330193bd39b651463b8d4f8147 SHA512 b318c157392e5c602d42eb52c8d7f1bd7258c817756fd20dcec8a8a177af3e42db4e25891473646c293ace42bc5d5608de083a14878ed446b8559709492bbf1d WHIRLPOOL c80c56d511586c87d6eb41eb8f5c00317d101b7532b127d50531409f4068aceba1022b16cf2ab122d91edcd9552fcae8543e8a31fbab78564dcd2e057b29e0f1
 DIST httpd-2.2.29.tar.bz2 5625498 SHA256 574b4f994b99178dfd5160bcb14025402e2ce381be9889b83e4be0ffbf5839a4 SHA512 0b953c97d79dfaaedaee72c6260e7a8e2e1711d47b19f9ace961b33f1226eeb58e37e04694a3e1207e0cf151a9ffbebf379d2bb81306bbf5111ec6db621a68b8 WHIRLPOOL d161104824c5bd6a42675489facf528a8ac2e727a8d2a295111b182e73bb17e7e8a52b720e74a37371e8bd3ddf5745afea32b32171831d95870daa440e7ac2a7
 DIST httpd-2.4.10.tar.bz2 5031834 SHA256 176c4dac1a745f07b7b91e7f4fd48f9c48049fa6f088efe758d61d9738669c6a SHA512 e251f5b330da17a8920c589b9e0326d6dd45db28923167718db27b0af2edf769607e9ae6fbb859afbf0c345937fd59053423a2d74bd18ff2272a0f6a19a6496f WHIRLPOOL c9f81296052a61483ceef4ae4b4c467cf64a4035030472dc8c17355f572a4887ddc6179ade2a764a4e3f0cd4ab7cc34a3fa36577a148c3df7b8d44a5f1f0424d
+DIST httpd-2.4.12.tar.bz2 5054838 SHA256 ad6d39edfe4621d8cc9a2791f6f8d6876943a9da41ac8533d77407a2e630eae4 SHA512 f69db14b421f0e1e4861fe4d8b652688d50ca9eb41c622242d11ae55687eb6c2142a8505a8c3fb6f2bd53167be535bc0a77ca1af97e0720930fc7f20f4c1f8e8 WHIRLPOOL 56512066e8978c4a3d47d0cc2bb92093fd468a9b2f46b8b07fe4db366f55fa5e74ae58bbebe2377cbe0c66f1585759115c786f62f18ac1abc534fb257689d250
 EBUILD apache-2.2.27-r4.ebuild 3114 SHA256 6ebe72db03213516e3815bbb80141950afda24be41c72bdf6975ac3ddbbf98fa SHA512 88d23d6a0471868a19b5863f72b6117e61ce2dadb760b1e6455edbc6df0cc7e23f19303f917d7ae0ca6e451e9eb23e623078420ab897f0a22f9b0bd34228946c WHIRLPOOL 96e8046f6f156e6a66ed0f384373f23d032d1240f08d74d3247c628d7bf1d9cf075554c73dcc1a5e8704b5da8608cf9be73bd8748b00d1cdac6f66079bcb9cca
 EBUILD apache-2.2.29.ebuild 3122 SHA256 dcbd276a70f3b6977b4c8a3ae1af401c13f8d569c5bb9eaa62359d1f977af4b7 SHA512 2205704a2603019240410258dbc58ed71d4f55cad407f6fe778188e7cb836b7bf57a9290d2bd88a651865906e6fea8758a2d9e58425b660288d54c2d6f884da3 WHIRLPOOL 4f3da1c4cd376f33cb9667c73d83db055e6303a93e408207d1a0870dd850e1631c0070eee2ce1169b5bbdfede31b85e35ebde6991f37a68f0a438bd09b8f635e
 EBUILD apache-2.4.10-r1.ebuild 7504 SHA256 352e6e41ae9e698867a55cbd88062d44237d677233ac53217ed72c0d2db59d52 SHA512 3a9efef257db4f1beb8bb505912601edf0b87d679a83d424d9c7f7ab2430cca9af139f598fd4ad1616b5378a3b8a0634e2bbc76e2ecdf44ac1394fdd4506205a WHIRLPOOL d181bbc65b79da77c96cb7d68a9fbbb81b565c9e0b7db50a4e1fcff7c0817e1359f662cf96a767ec1d266659df262483f4313862050a27f9d4a81f5f914d48b0
-MISC ChangeLog 28499 SHA256 0e7ac7338770bcf72acb24bb33c2a0b9644b60aaea02b824de4d7c012d3a52c3 SHA512 5492bafc01a89b1eb7b85b05fd2bb69182d17b0dc0b891f9a782c58ae0b867931e0dae27fef37d088bf7fd4b88674d48ef46b70122e947d7d182712dcaea6996 WHIRLPOOL e0ae6ed18830d767f163992f189ac374237be793c5c0e66fd0c3a704bb285fda0c76a6b2b4be79fba0e6f9664648ab743a4fcad1ac58cb88185a0f0ca4049745
+EBUILD apache-2.4.12.ebuild 7507 SHA256 8f69ce13f24211989ba9019505603aaec5e275eb2fbc863e07603dcd00ce4d39 SHA512 0b54a233b6ef171a486cb77a008339865c5322f098de3412df23b729b3b2d731cfe96d4e3e2dcab2f6f72887a2821d7c42d77f0bcd35c59e0359d66447058d39 WHIRLPOOL e72db95d26e2230220ae5de1b1a29adb8f42f808fcb0aa2dd86ec28fea46e99823d9ce5d1e03812e1cf4188a0e25035428db7d52ebd1edcbc7562b4116ace1f7
+MISC ChangeLog 28638 SHA256 114fe3dd027c18c74d00fb3a01a1b03dca17262cb87286cf0e5e523c283cd282 SHA512 be3187a02da5a82e9ce09c6e9a25035b45debabfc067602cb6c09e23ca78aa2cb8b20aaa54838849965880b954414f98378e290290f36e633d9376d5042c918a WHIRLPOOL 5689452f8f5c10751a310b2555c7446836a204c5628394f109c53030366083d189d2df629fac79f49b3ed75c690e0b6dc39a9fe78bd95b763ce2fca355d4613d
 MISC ChangeLog-2008 105137 SHA256 4afec18ad3c76df40314edb37b5512f81ca6223c38a899534d9d15342481accf SHA512 92dfd339b1c4ddec29222076a597220dc7faa504e2ee770339892f155febbf34004e60395f9eb21b43d3b1feb5f362c2946b69cc65151b5ba00fb53b35ccb9c6 WHIRLPOOL 89d77300aafb53ae0632904118064de19313fe51f635512314471e845574e7a624a770ae4ca4e335cff67d4fee92e062d28ef985a54c577a1b8b3ea0f621c0f8
 MISC metadata.xml 2882 SHA256 bb1c73d9b53a1049c14b477d4441b09670ecafcf46a0ad114c24bb284d0d194a SHA512 bd9a0a5f26e1420aa6023160208d177e233f97f2265b8fad68772a084cbc9fabb2a186f14916a5a664b5590a6052fe039874ff96b1bd9d3dc530c3750561c7ce WHIRLPOOL 0e92d1cd3fbbf3f75ebd38e356a736061c9ea19afd40b06f58abe0ed86219223cafab188bbfa4ce9c91a8cc6619de47dfc3a68edc2c39e6a38476915ad8d48ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUH9RNAAoJEPiazRVxLXTFU30P/iXHPIh/Sp1NVNONBeIXVKN6
-fpIcjrh9lFLV9FVRTRGTLF3hudkPsRq9ewW7h4r0VyvYf7c7RHtxY/a8bA3ZNNi7
-FSeBOyRV6QD2jdzZcgLhNzDWERjCD1Eb52/xbwgq4bKOon0sO1YXPWxYQdSWxPtt
-I5f/cDbbERRnBZTOsYLLbPCeXzmEyNleYvG4SXXSzxuMkD6shvQRX3UV6v+EY+X/
-3Q4oQIbsMHSS0Brx5WWUrASI2tfaYtf4QSCM8AgWLZyPvbrRPRxnNqrS8oa2iqRw
-PoFY2Eyt6JMbe6kc50xGejPaIOf/BIKGyPrBEXLhN9iMy8MPi8nLON5881M+8lWZ
-KSLZuzwZZQCpqjoR26QHrIPdCOu2ENC6ftUxt6yP6juD4HnXMQA8qVS167ecFzrV
-4tjaRpWP3AUfMA1uvrSRn4PPDT+r4ckLQgf4JK+eYMHEqPlKGahRGf+jLsfEqKon
-97jarLt3naqH6GTFcXZnhLMMcpWOcCd/cl/csVREQQh0Is+UnLkJX/ZRWEIA7F/L
-tYkkgXEoujAlC54rcf27CArXY7L8MJFjYiWXtNFhNzNEbRrTDitYWf/EWNuJK0qU
-Sn2ZhvaWPV4VNVj9KcISOVwHOw6bRAdEiSSCg7AI0Itnx0GySeDmjUjpadD15KNG
-wQE+rzBdmuMtS8n6oKqD
-=ltt8
+iQIcBAEBCAAGBQJU0mHhAAoJEPiazRVxLXTF4xQP/R/6QxMdmuwGZdfqaae2mmHw
+vqog3YzL6tfu0DnRrgcNhxHp6HQ0VbWwEBgLQ90z3XD1f2E4NDPMMdKVv8Ta3z/L
+Ww7EoyBuQm7gFVvEx8qUbwx5xgSrPzt4ek2zFgFlaZMXJOdmN66+3XNKrbzmuB0g
+SFf7TuMe+gfGSujNdEzt8D7OOnlOkjkA1yynjAcrOntySVeNGgiFFs5jEahNL+c/
+GUBQLsDLSo447EbNnM5sZ39b6lnY3etjniRmp1Jsg2eo2qffu/a7rxzoBhu7LtGZ
+Ty/IkgcIBV3tQrUCxhEHrdDauVvEQj7/wRQ9aeBEFyiSYO6D1feKjUv1dPVRAJNh
+vRiqM+FjBmrGiFqtuEIpLtCNxukorLH9QCRkNSwJ8E7eefpvI7m7G4oRTFm9SF67
+zMndyQ8vPERZ/DBPigAq/dzlXobbBl695OQDIiXpFzE+1jHibsEOYGBZ59kbO1p8
+mn/HZGdAiC1Wp9s+50K+jRVGE6iS6QEZmdS8/w41iSt4ZxzkznM3VjPgpSB5QcQU
+bZLPbMOFXiAd68zp6m9lj6Nwp2h99Di+a9zOJQPhcbsKbGf5HdYYostXch/ZsKLI
+mSVt27PAj/Fr2C+uiBwI+6boFVZKLYBXqsVhD4+lAi1Gu5NhbQSEIiwn2B1Ll1kz
+UvvMC1+Px9fXHaScC+4x
+=/L8m
 -----END PGP SIGNATURE-----

diff --git a/www-servers/apache/apache-2.4.12.ebuild b/www-servers/apache/apache-2.4.12.ebuild
new file mode 100644 (file)
index 0000000..c710a47
--- /dev/null
+++ b/www-servers/apache/apache-2.4.12.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.12.ebuild,v 1.1 2015/02/04 18:16:00 polynomial-c Exp $
+
+EAPI=5
+
+# latest gentoo apache files
+GENTOO_PATCHSTAMP="20140731"
+GENTOO_DEVELOPER="polynomial-c"
+GENTOO_PATCHNAME="gentoo-apache-2.4.10-r1"
+
+# IUSE/USE_EXPAND magic
+IUSE_MPMS_FORK="peruser prefork"
+IUSE_MPMS_THREAD="event worker"
+
+# << obsolete modules:
+# authn_default authz_default mem_cache
+# mem_cache is replaced by cache_disk
+# ?? buggy modules
+# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
+# >> added modules for reason:
+# compat: compatibility with 2.2 access control
+# authz_host: new module for access control
+# authn_core: functionality provided by authn_alias in previous versions
+# authz_core: new module, provides core authorization capabilities
+# cache_disk: replacement for mem_cache
+# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
+# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
+# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
+# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
+# 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_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
+# 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
+       cache_disk:cache
+       ext_filter:filter
+       file_cache:cache
+       lbmethod_byrequests:proxy_balancer
+       lbmethod_byrequests:slotmem_shm
+       lbmethod_bytraffic:proxy_balancer
+       lbmethod_bybusyness:proxy_balancer
+       lbmethod_heartbeat:proxy_balancer
+       log_forensic:log_config
+       logio:log_config
+       cache_disk:cache
+       mime_magic:mime
+       proxy_ajp:proxy
+       proxy_balancer:proxy
+       proxy_balancer:slotmem_shm
+       proxy_connect:proxy
+       proxy_ftp:proxy
+       proxy_http:proxy
+       proxy_scgi:proxy
+       proxy_fcgi:proxy
+       proxy_wstunnel:proxy
+       substitute:filter
+"
+
+# module<->define mappings
+MODULE_DEFINES="
+       auth_digest:AUTH_DIGEST
+       authnz_ldap:AUTHNZ_LDAP
+       cache:CACHE
+       cache_disk:CACHE
+       dav:DAV
+       dav_fs:DAV
+       dav_lock:DAV
+       file_cache:CACHE
+       info:INFO
+       ldap:LDAP
+       proxy:PROXY
+       proxy_ajp:PROXY
+       proxy_balancer:PROXY
+       proxy_connect:PROXY
+       proxy_ftp:PROXY
+       proxy_http:PROXY
+       proxy_fcgi:PROXY
+       proxy_scgi:PROXY
+       proxy_wstunnel:PROXY
+       socache_shmcb:SSL
+       ssl:SSL
+       status:STATUS
+       suexec:SUEXEC
+       userdir:USERDIR
+"
+
+# critical modules for the default config
+MODULE_CRITICAL="
+       authn_core
+       authz_core
+       authz_host
+       dir
+       mime
+       unixd
+"
+inherit eutils apache-2 systemd toolchain-funcs
+
+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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+IUSE=""
+
+pkg_setup() {
+       # dependend critical modules which are not allowed in global scope due
+       # to USE flag conditionals (bug #499260)
+       use ssl && MODULE_CRITICAL+=" socache_shmcb"
+       use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
+       apache-2_pkg_setup
+}
+
+src_configure() {
+       # Brain dead check.
+       tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+       apache-2_src_configure
+}
+
+src_compile() {
+       if tc-is-cross-compiler; then
+               # This header is the same across targets, so use the build compiler.
+               pushd server >/dev/null
+               emake gen_test_char
+               tc-export_build_env BUILD_CC
+               ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
+                       gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die
+               popd >/dev/null
+       fi
+
+       default
+}
+
+src_install() {
+       apache-2_src_install
+       for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do
+               rm "${ED}"/$i || die "Failed to prune apache-tools bits"
+       done
+       for i in /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}; do
+               rm "${ED}"/$i || die "Failed to prune apache-tools bits"
+       done
+       for i in /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}; do
+               rm "${ED}"/$i || die "Failed to prune apache-tools bits"
+       done
+       for i in /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}; do
+               rm "${ED}/"$i || die "Failed to prune apache-tools bits"
+       done
+
+       # 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 "${ED}"${apxs} || die "Failed to install apxs"
+       ln -s ../bin/apxs "${ED}"/usr/sbin/apxs || die
+       chmod 0755 "${ED}"${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
+       # 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"
+}
+
+pkg_postinst()
+{
+       apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
+       # warnings that default config might not work out of the box
+       for mod in $MODULE_CRITICAL; do
+               if ! use "apache2_modules_${mod}"; then
+                       echo
+                       ewarn "Warning: Critical module not installed!"
+                       ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
+                       ewarn "are highly recomended but might not be in the base profile yet."
+                       ewarn "Default config for ssl needs module 'socache_shmcb'."
+                       ewarn "Enabling the following flags is highly recommended:"
+                       for cmod in $MODULE_CRITICAL; do
+                               use "apache2_modules_${cmod}" || \
+                                       ewarn "+ apache2_modules_${cmod}"
+                       done
+                       echo
+                       break
+               fi
+       done
+       # warning for proxy_balancer and missing load balancing scheduler
+       if use apache2_modules_proxy_balancer; then
+               local lbset=
+               for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
+                       if use "apache2_modules_${mod}"; then
+                               lbset=1 && break
+                       fi
+               done
+               if [ ! $lbset ]; then
+                       echo
+                       ewarn "Info: Missing load balancing scheduler algorithm module"
+                       ewarn "(They were split off from proxy_balancer in 2.3)"
+                       ewarn "In order to get the ability of load balancing, at least"
+                       ewarn "one of these modules has to be present:"
+                       ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
+                       echo
+               fi
+       fi
+}