summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2014-01-15 22:48:50 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2014-01-15 22:48:50 +0000
commitc66f5c66ada5b0bf4515cbd91d9c8211fe3ffbd9 (patch)
tree886e80ae990f5b6b5881a2ff5a467b6f803053de /www-servers
parentversion bump (bug #498208, thx to Vikraman) (diff)
downloadhistorical-c66f5c66ada5b0bf4515cbd91d9c8211fe3ffbd9.tar.gz
historical-c66f5c66ada5b0bf4515cbd91d9c8211fe3ffbd9.tar.bz2
historical-c66f5c66ada5b0bf4515cbd91d9c8211fe3ffbd9.zip
proxy_scgi should behind IfDefine PROXY as well, otherwise you get undefined symbol: ap_proxy_canonenc.
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/apache/ChangeLog8
-rw-r--r--www-servers/apache/Manifest24
-rw-r--r--www-servers/apache/apache-2.4.7.ebuild5
3 files changed, 11 insertions, 26 deletions
diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index f853ca33dd8d..788b4b0843ab 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,10 @@
# 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.252 2013/11/26 08:27:56 polynomial-c Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.253 2014/01/15 22:48:44 robbat2 Exp $
+
+ 15 Jan 2014; Robin H. Johnson <robbat2@gentoo.org> apache-2.4.7.ebuild:
+ proxy_scgi should behind IfDefine PROXY as well, otherwise you get undefined
+ symbol: ap_proxy_canonenc.
26 Nov 2013; Lars Wendler <polynomial-c@gentoo.org> apache-2.4.7.ebuild,
metadata.xml:
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 90ba5e9497db..f9e8754a5102 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
AUX 00_systemd.conf 88 SHA256 487e7451ce2d834d8af09a1db09bfe235fbc87b17b13a88bf849f0739b023ce3 SHA512 c510b77450f45d8ca5b8f00ebae5de9e3dc0ecb45f9857e391ac923dadb6b5193b13e9bc372790de20bb8829f2bee5bfc0e85ad03b3a72818c5dd6a0d7f45353 WHIRLPOOL 35ff7234f1ac513a522481ed08d2281dc331835cccd1049dbbadd9f2dff7fce1700a3ae9fd8f2f490f09d82edd960f4a0b4f00a91db2bafb7c647e3b54733cef
AUX 2.2.22-envvars-std.in 1071 SHA256 1721b424f2335640e49d71e671a4be15424d29fe90f55fe4f52bd241a998d3ee SHA512 c18fd461f02ab79fc456a1ad99bf91c8891ecdabd90f41437ebf87e20b3d28d2006a10d6726164c2f0333e7aee350bd125838abaff3a188d8ab2f5f34d3e5466 WHIRLPOOL 59cbee68fc8012df01229b8d5e38045eb974bab3f08ebf5b01097dabb5275bb83e28cd09a058ce71949ca4a2439811cff457d4c7df88d7b3fc5318c6b7ef0075
AUX apache.conf 55 SHA256 ea616c5cc37979a006d69c51bda43fca15a4327d33175762652b29f5cdea1c7b SHA512 3a53beb7a283d17c14383f16ad14c0602681ac1b193cce8f5aca50ae9d9af3a71054ce4a9ab11cbcb72fe913459e1b306fd54660154e66afe10272f8c0f149f3 WHIRLPOOL fa348414f320a9f70001386dfb77d57ca4836c3ef3d251976077b7ad545d7f6752e534efadbf28c7dcb777388e3d844eba84b939dcf48881983388daf6ac23f0
@@ -21,24 +18,7 @@ EBUILD apache-2.2.25.ebuild 3288 SHA256 b0a9162f6d2dbf57bc312fd52cc495844a70376d
EBUILD apache-2.2.26.ebuild 3295 SHA256 e0e3689fab59f9e189b48a18755a18987dc2e6602ffb7a324de026a354264a26 SHA512 69d68e0a4c9117583bb4d4eb935e67b487ae0347399f7a59e3c0a0f7043776f8854e02d556ee423bec285c17bc9305322b417e7536e67d10596e5f26292e98e0 WHIRLPOOL 73b55f2e8c28f105d6fe59b9c957c3e3183ba701f27d5e663921f7b123168bbd1cceaa7e1afee990ec7bd8958d130391b49b54f0bb896f58663ed46754be7f26
EBUILD apache-2.4.6-r1.ebuild 7457 SHA256 2440b94f37d21a4caf7ffd43b8a662515df98aebd4efa373eca5f90e774730e7 SHA512 088ebd904cff8d88160f628255c9e40b3ba6abf25818464769a029246d2f74d9132a8a8f5235083f052ebb8fb44acb0ffae939a09dadd83dc80449b0032d1272 WHIRLPOOL 991f357cd3b6221a56184808247fba881901b4115cea128cf87e2d6b98eb25abcb27ea1452160513d4786fe8688c13fddd52ae9dc192d1fad51b1ee08252fce5
EBUILD apache-2.4.6-r2.ebuild 7457 SHA256 b7de783e8e1ddd59b2fa05bd8169d727e3a70d129ce4fffb886ca862de142645 SHA512 cd6844573d40f2508bc5b16d762df5869d5ba363733f07beb600fe148937166b1556de7b57cac9663c93545e820f0cf4af2bc6adb072d054778dbbb50f441465 WHIRLPOOL 7cb32151f2df8a05c03962ccf4876f5a9c0303c3caad06c960011b836d7f0243e691618ba75a7c2493242a65ef3e8b3eb75b430371846ef97d6890cd1facceb7
-EBUILD apache-2.4.7.ebuild 7424 SHA256 b46efdbb0bdc553e620207b3dab4295a420f58bc6570620c5514543822cb1433 SHA512 486fbc426beae4563762368f9fe3671c5e4b08f88c30b149891b882e4fadc8d3264ae2d19003dc3724fbd12636e06bbc983ff4a32568615dbd28bf031c1a71fc WHIRLPOOL c9d4b27481114c698bf74aa1ab77936c3288ac01f2172fc77c46a8c0035ccc049a8c9b404a004cc7d963b01d2f8076ae6f50cd0300be9ba9b26ca592538400fd
-MISC ChangeLog 22563 SHA256 fa0ba5daa5c6fc7534dd252e498fb995b0830e128dfac8b8db34b7bd316cf5bf SHA512 7b315abaf2b11f1f3313eb6a04d3e8b3f219bf90d56873b24be530b93437ccddd5adfff638be60a7bb029959f48c8a3ad984f8860e8d656d9fa91f7470dbd793 WHIRLPOOL ed6a09d82a09bae767ebf7f1091dbd7d8679b91d5e52371931298f50366a7114e628d26fbe395d24526983d6cc0a668f07f4e78688370a1089b3a387f49314ff
+EBUILD apache-2.4.7.ebuild 7437 SHA256 06bf53c76b4491c4a8480703e5a61848a132c5db0cfa0673051b42ed94b2ade4 SHA512 ab11ad16b79cbefd641a39cd8a9875619530590e7323a781e96844eb7017a7298464e59288086994750fe9adb9aafcd2ddac15a8aa5511d6a85c01656b3afda3 WHIRLPOOL 2e6d9473a9f98d5ee5566ba8bf88401d49b878397831cb6c599289555f1dbd98da4b93ec7307626f2d84fff6fa3c6c94288e234a4ec84750dd9d67db110d3d63
+MISC ChangeLog 22741 SHA256 547bf3eb0fbda72ad45ac1739a513084976e83739e537b4b3403a197fa3b7aae SHA512 6c4efa11565a8c6546c5dad7a0846c2b22ba549c73fdce9b1cbc85debd7acf94ba78d24b6f2f2b690469a0ca3b1a2d543c56d561e3e8b5e572e7e86a4a11aed2 WHIRLPOOL c5d2b17cb8ff7bdf171cd45facf580dcc840f92f0b068af7a312a5d3e4cb15a9200251ae78e8b61ab13ac696e0c10e367c95ee8f5fceccb81b4bfe0de33a1abd
MISC ChangeLog-2008 105137 SHA256 4afec18ad3c76df40314edb37b5512f81ca6223c38a899534d9d15342481accf SHA512 92dfd339b1c4ddec29222076a597220dc7faa504e2ee770339892f155febbf34004e60395f9eb21b43d3b1feb5f362c2946b69cc65151b5ba00fb53b35ccb9c6 WHIRLPOOL 89d77300aafb53ae0632904118064de19313fe51f635512314471e845574e7a624a770ae4ca4e335cff67d4fee92e062d28ef985a54c577a1b8b3ea0f621c0f8
MISC metadata.xml 2590 SHA256 165207b1cfcf0ce30ad2af5b0dd7e8cf06dbfc9ae4ed42e35bbc5d8e6ce0fdee SHA512 74bd116d0678c035c0e19f82a379c80b7f59b87db649e9c6835a3133569c52d6c0973f9445054bb1b5278d22c95f28f3d85dfda0878ae094172f7e84e15a0113 WHIRLPOOL 8c5ce73c072551040ac44c6ee632fd6144cf2673904401481a01311fe9edf72eb8e1a3d57cee9f94c1c8d9d71d1f80ce2a2f11fb9cb3274b7057489fe7b8578c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJSlFuNAAoJEPiazRVxLXTF2C0P/2oZahNN4dDxNK8gP4/GdVsp
-w8TvEmql9/qxLnk2aVguRCHXa162y/VGCGPyPZvWRH9Z8r6Z6d+digK0fkKi9CCf
-646SHifTAbBCF7WedwkTuKpGPfsjLImfCXw3guBurL4Sy35v0pdsMibg8yo/i/Sx
-qshoEdGI16aj70nip/tSmI0IyvrPZHAH7MZfT6zyu9EkQ7//UUI+tOvR6IP8REaj
-l5VVuWcrscaUWmT5joZDCeCU+LXMs6FLIt1WAAsYjocKTNb5RKBQOaua29dlIfg/
-bnk60y25bzmRiM8RNk9rgSKltHUQEqsSZB8hfNpw+OMxqWLD9iciApFLjdj2xBYK
-ClpYe/HPThc6HZf7pZPKGZ/HXKBKiEb0UFfqV8C3t8kFfjYEC0/hXUEEbf/2KnLu
-TufCPQ9PRnUjIle7xrGxVLbibvGEDE4JB6+4ltlHlI7ScVhRDI09BVV3rlfbmIRi
-aTLtiGqrMPNcuaZcKqSK0dHvBv5H/1CRvoJFsGuMgfrIJUEiff1G0vxyNmcXFf34
-CM+f3PSYPOTdV4cIHOQ25lvVoYorWxhPevtAbGJ+3Z1UQxZhnZNENe0Y6bMnwxh1
-gMT0fj/yVW5LWMyasRYsstInpCtjyQeUIJvUCB/kZlscMBR9yxF38jpg4Mq02Ujp
-2o00WrxcGp2VpNd0l90N
-=QtEw
------END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.4.7.ebuild b/www-servers/apache/apache-2.4.7.ebuild
index 3f4a421a7f82..00e4826d526e 100644
--- a/www-servers/apache/apache-2.4.7.ebuild
+++ b/www-servers/apache/apache-2.4.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.7.ebuild,v 1.2 2013/11/26 08:27:56 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.7.ebuild,v 1.3 2014/01/15 22:48:44 robbat2 Exp $
EAPI=5
@@ -93,6 +93,7 @@ MODULE_DEFINES="
proxy_ftp:PROXY
proxy_http:PROXY
proxy_fcgi:PROXY
+ proxy_scgi:PROXY
socache_shmcb:SSL
ssl:SSL
status:STATUS