Version bump

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

3 files changed, 143 insertions, 15 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 6d684d8d927b..a6ebc4edfc11 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.248 2013/11/07 14:56:34 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.249 2013/11/20 17:50:40 polynomial-c Exp $
+
+*apache-2.2.26 (20 Nov 2013)
+
+  20 Nov 2013; Lars Wendler <polynomial-c@gentoo.org> +apache-2.2.26.ebuild:
+  Version bump.
 
   07 Nov 2013; Lars Wendler <polynomial-c@gentoo.org> -apache-2.2.24-r1.ebuild,
   apache-2.2.25.ebuild, -apache-2.4.4.ebuild, -apache-2.4.4-r3.ebuild,
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index b377b6fc097b..fa870824cff8 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -13,28 +13,30 @@ DIST gentoo-apache-2.4.4-20130725.tar.bz2 24525 SHA256 c155dae39d87acc43ef34b385
 DIST gentoo-apache-2.4.4-20130801.tar.bz2 24536 SHA256 bae819de1ded2104a65dabc759e8a7bc6b442d2588ffb99e563be8482b3d87bf SHA512 97474e7d7f17d6537337b51385be4d093f9a15cf3a0a5f567ad883c4cc653d9bd3bed6e5f308e1bb9cf648be2c4a67a3099a95bd36b1be7c15ca8c512e01b2b0 WHIRLPOOL 4b75f5477b601f4159cb1b12c5f76ae4f678c83cef4441eba0e90a9be8222e4abd981a0d2205a54ddeebd8276567670c5ad827aa19f22f17196986bfd5c05c73
 DIST httpd-2.2.24.tar.bz2 5490439 SHA256 0453f5d2d7e3b1975a1c6a8a22b6d6ff768715a3b0a89b51e5f7b5851628fad7 SHA512 e1c24535bb0ae309c249c0a6fbd390064a929d960241e5e68737744f120a88b615bd5d9065fc2f749ee664ed96621c9373576e6ca32bd189d625fcd4dc1b8f01 WHIRLPOOL b24bf388e1be29cc52341d66af00318b3a60ad6db6b4df8c6cc0abf496c4e603d3b733529d21d3d1c37dad0008cacafa8078abdff6c25cb42b3874b6e176713e
 DIST httpd-2.2.25.tar.bz2 5524905 SHA256 4bcaf3524796a514b31aa5c64ce80b0cdb484bab5735416de29d00f6d50fa65a SHA512 4750e79bdab4ca28c602a808531dfc1482e86bf425d5cb3bcb42a9ccfbbfde5bfd05e66649ea741523c96de6582f5e12facbb1e7d67257bcf78a3ed7a66f80d9 WHIRLPOOL 7ce37be9b66de24cc7259c6e8a0696b496c893933b1c5dbdff5147c279fb644b5d5fc77ed02531b0f081f0c217f684d1bcd98bac26938b23c1d7a4ec085162f6
+DIST httpd-2.2.26.tar.bz2 5390190 SHA256 af908e3dd5673f1c6f0ccc615e11d435e77517940af00e518e68ea25284b42b6 SHA512 d66bef511acfc9b0daea699c83c282a88351f6820369a6ed70c71a192a90911c6d28491d845e545a50dd394241e16e41338c054844cddcffc49af99c6208ec41 WHIRLPOOL 9ac6e8f38144b701201d87d9010a79314f331cc696660358c1cd6a27e8a712910d6cf6796156dfa2aef9aeea64d47550afc9b2afa3984afd6c8f4519d6f61744
 DIST httpd-2.4.6.tar.bz2 4949897 SHA256 dc9f3625ebc08bea55eeb0d16e71fba656f252e6cd0aa244ee7806dc3b022fea SHA512 8ade7ec5291f07a60e279f7a73a79c11c150dbf09c9e7b059e136fcb250130aa0f381b118f84e230184b065d452d5e946df8a5766991be8cdc6e8f5d4c4bac01 WHIRLPOOL 81f036bb438afa30106a402e256d641a2687b619ef7f6ea3e4ab61f30715560e1c9dd3afa3e53c4d99c77de72f100e8a1894a5a898247c381100ceb165b8a146
 EBUILD apache-2.2.24.ebuild 3098 SHA256 c742f39514dab10ec7732ac351b98fd3a5c4995e68797fa8694bc9460b0cfb21 SHA512 1dfd4da41b5c0e04f476881af504a22b553742b021177855f2d182ec14b73fb4c3ae66e9c1be87fd7a8cf4eaf9c4f4ab06514b10e2e29548bc792e40709ddf75 WHIRLPOOL 8fa3e7067a38e6b13577b801d45c8fd9dd25243730e53cb0dc3e8b9652540bb60ba19b2f5d1782fd100413f700e017ab9aa38c608ff68ee26e16a5821f7422a5
 EBUILD apache-2.2.25.ebuild 3288 SHA256 b0a9162f6d2dbf57bc312fd52cc495844a70376dc30431a1995eff6199ab51b0 SHA512 3c98bf767f7d9b9de81bb307988dfa27714f06e131c2a755dc017c760a30b17130aa50075cbcaece780c090c617360ffe47938385323e4eb2906d727395cd330 WHIRLPOOL 5fbe255a727784e58d1b099c5eba7328c89762204cfbb9ef45547793ffd65e5414190fec62d3a7c42e9094c9b0e4bb0ac5ae46295aad08b0411ca60c75ecb802
+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
-MISC ChangeLog 21937 SHA256 efac30047e42497fe55b473ec62dbcf3d691ecbad8d70f1bfad6b4d758d75e8f SHA512 79316842a42947868b1975fc018924684807c5562e335f32d6dbd7c2cbf4f9796f7dd4cb7ba03870eb29007ea67735763e94e64311bd67b7d17793be2f29e240 WHIRLPOOL 2d820d00da8db208c43272ecd6536cf4af28964223f9419fa55a7845cfe55c9d6733006e978d06c1f9849370e366c58e5a38901f34061ce252283f7a56a5c818
+MISC ChangeLog 22061 SHA256 ed3cadcf6ae7a379007dabdb233a2597a667c990cff476a333ee96cea6451e1d SHA512 324b3a727c91e8e06a728e9cbcba6e4d874307f3a43c66793a274159f315cb3b75d92d0dd280e498cf3b33f6ca2c42e29aba4f39e8fe1d1820842c3214de7536 WHIRLPOOL d5d6334e09aa4f084e6b844d1c49025ae46f20c7f766f023a47647e8fea102610196ff5dcd1bc84c2bec1254d5095bd89e23d82c9d6c62d4d2dbad28884fb0de
 MISC ChangeLog-2008 105137 SHA256 4afec18ad3c76df40314edb37b5512f81ca6223c38a899534d9d15342481accf SHA512 92dfd339b1c4ddec29222076a597220dc7faa504e2ee770339892f155febbf34004e60395f9eb21b43d3b1feb5f362c2946b69cc65151b5ba00fb53b35ccb9c6 WHIRLPOOL 89d77300aafb53ae0632904118064de19313fe51f635512314471e845574e7a624a770ae4ca4e335cff67d4fee92e062d28ef985a54c577a1b8b3ea0f621c0f8
 MISC metadata.xml 2492 SHA256 f132bc37567605f338e23ed6ec22c553e1443d2b6cf407ab0bcff359fc9b3f90 SHA512 0582259bc2d615f1f640d375aab4452613a4006dca03c8bcf9757c376599bc2c7789df44003db914e2e3a5cd5a3ce725b0bf76d92488f65c67f4859927c83d11 WHIRLPOOL 6e826e0847788527dc2499e10c8c4ec59b78e2e4859b23127c26f103fc679c1516720be587ee25753c52d04f0544e634f553a769bed2d24db8442d57be22d26f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSe6olAAoJEPiazRVxLXTF+a4P/i5nMakko/dTvMbsbf+yDkH4
-ZN/5fb8KkmVdiwLDvXnQuupj/EY8Dw4UYX3Sp5KbuRh5Wy/yUWDKMhoPB59JRAvm
-oNvo7flKE2fj609SL0N/qSppUoRdTrhWTVaK2cda9+4LBobaaFFHcvP6KVcIvsiG
-mpB+L85fcZPMRc59vuP4LdtbSVJ0p4aq/S+X2UjTXNCWlziPxjpViubKoQyTJ2O+
-gwEFFoFDEuFxbckeBw58YvA8icffmgQl5KWG5Mr9GHEj15pE0zE/VLa9D2ebNtXu
-EWQIdsUO6w1RAIlr5vAnZvY8E40Lk51nJ3hN91ZUhnPkgAIcgu5AXXeI8/SbApAf
-K/iBPeo34An1jioSa9AVdgKvJGgnGPCu+nvj9zZZR6B/XcIkcuhY46iyku82zbWf
-9xOJxDPdCnalAlzjH2CvUfbitA7uGVa5sGgZIc8FNqb9XbgoDei6plKlqMo92mpW
-bWEg5zEGoesEiaLSYiq3OuHRw9f3/IGN1Q2+SvkWMS0xrQP1mV5P2zTFoKw0fos/
-rG2oahYmrR1GU8/rfzXOWp11Zt6M858rjH443yfRBl2+aQgDJ7k14mBBo+Ni6crX
-++7CSxlx3D/U2wxXlWvde3JWl2vL8blLrn+ECVNHEtvBubj6EH6ZlpTxSuevGlUu
-PSNq0Cirjh5Cdfk5S5jm
-=WN4a
+iQIcBAEBCAAGBQJSjPZxAAoJEPiazRVxLXTFekEP/2pTtTk+uObe/XVTgTLaeCZi
+un0eta9xDrlYNmv9bCWMuJ89ksb7gW5gVrgGOyB9Y4xtdJwnRw86CT0g8aw7eMaL
+ZzK7sKsZB9ST8z8a2gOmy8qK7W2xwBBfpCzMScoKq/upTBBpu5IKJQyCeVWUW0mr
++j77oZV4kxeYfnonxIctAIaKhBNABKyMx4zY9bskuv/EZfAKnqHU9HUodCy1L7G4
+IghmDB+LiluCVSvN9FoVq4s3UO5i/RK3t+b5djHr3VwR7CK/2iwxRTA+bYzw141k
+lRGlERD7eH3te1iu2Xn/XFrOc6Cxhp9XY0K2gBbhypEikX6oFHtG2mZ2NJNmPPpR
+X1ASGF5Xw1TON7XszK7J3LgGZ8suYTcUYpLdsCBh8fo6fY0l6J2s2IHoxtXFO6db
+qv1UIlfXm08bYe+kjTjYPbtT54+70IiuOO3RqJfwEWY4D/LbGV2221H+SPMfsPKI
+qpnbwyxTrk3Ato/C75CKwHkaKU+cZ/KimXeLwbEVk236oBerz+v6lIY1vKxY4/fp
+pjGEq/chinPo5PbiXQSWwNea9oDGH3/BLcniZUO+ioAxyR6d6B7zc5wwrK4AtqpD
+EteJsiFZhj3GuLUidnsgAdmAKWFGmGUM+Sc6NC3M/nYwpyCvN8fw0Yv4TWsI8fLZ
+eVgZwANBME5WzRS8ssZF
+=lTYv
 -----END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.2.26.ebuild b/www-servers/apache/apache-2.2.26.ebuild
new file mode 100644
index 000000000000..76ca10a79158
--- /dev/null
+++ b/www-servers/apache/apache-2.2.26.ebuild
@@ -0,0 +1,121 @@
+# 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.26.ebuild,v 1.1 2013/11/20 17:50:40 polynomial-c Exp $
+
+EAPI=5
+
+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
+	pushd "${GENTOO_PATCHDIR}" &>/dev/null || die
+	epatch "${FILESDIR}"/gentoo-apache-2.2.23-initd_fixups.patch
+	popd &>/dev/null || die
+	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"
+}