diff options
| -rw-r--r-- | www-servers/apache/ChangeLog | 7 | ||||
| -rw-r--r-- | www-servers/apache/Manifest | 20 | ||||
| -rw-r--r-- | www-servers/apache/apache-2.2.25.ebuild | 119 |
3 files changed, 141 insertions, 5 deletions
diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog index 8f2179f98696..b3fd2b198cd5 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.232 2013/06/13 01:01:13 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.233 2013/07/18 13:26:36 polynomial-c Exp $ + +*apache-2.2.25 (18 Jul 2013) + + 18 Jul 2013; Lars Wendler <polynomial-c@gentoo.org> +apache-2.2.25.ebuild: + Security bump (permission granted by bonsaikitten). 13 Jun 2013; Mike Gilbert <floppym@gentoo.org> apache-2.4.4-r3.ebuild: Don't install 00_systemd.conf since we don't install mod_systemd.so. Bug diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest index fb39d9d1d8fb..58bfcb9532d5 100644 --- a/www-servers/apache/Manifest +++ b/www-servers/apache/Manifest @@ -10,18 +10,30 @@ AUX httpd-2.4.3-mod_systemd.patch 5396 SHA256 d8f5c76dd5eb0edc9759ea300d3b320ee9 DIST gentoo-apache-2.2.23-20121012.tar.bz2 64135 SHA256 711a88f26c58b10b082f7ff411366cd768f9450101da050438a2f77abeab7333 SHA512 92a49f954b82d4427862f41977625a60641731cc25ab3efdd666be8db839038e7b1c2ef2f878d5efed243eaa63237e88ee4993cd25cca1dfbb0f56a6b2093d57 WHIRLPOOL 221d9c0cf999430afc11a8e48ae67019c7f31daca827a5db7615aca24859788743e5da00e4c99b7b7b375e58fafd6c148339e5671be939dbc30735031e12c49f DIST gentoo-apache-2.4.4-20130227.tar.bz2 24579 SHA256 cf27447dc87b4c145e50a6850245e3ed8d350bc3500bb249035322b23d03ccd2 SHA512 d6e8e37c53c37e9791c9d0ed3501d271212f0d2e2aac757a8a1914f20eb7b3dc0ca7e2d33a6f17dcb3572bc1f01b2c2f5876329ac8c2a4aaa7d2bca8e71f1d84 WHIRLPOOL 6364049b25c0aa21c4336dab7d1af8d3f3d06a60766fe401fc4f818f8ff7764564d136a414c444811612698221d830040ff4c5afb2a379607d5bd32b60260be6 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.4.4.tar.bz2 4780289 SHA256 92aabddeca76a4ac7330b143df1407bbf35574c7291c15172238ac598d97655c SHA512 d68789e1e585b4acf26e4e32d063fa512525f8fcc2077b1dbf573dd9f4b47667772d94bb65fefb354fbfae331e87b3fdea422a732838c86d8887eed4b3a76af0 WHIRLPOOL c2ec29a0d52ff1d674f103d0d59c0acd15b194b1102ba5078ef76b62aa959ff92adc5977e095b30c6a778cd9385f9c4ded9bfdc6ce8fba381735ca1aa84aa9f0 EBUILD apache-2.2.24-r1.ebuild 3268 SHA256 b3b27b6bba5c1558fd0ce68ee4c70e86f5d901ce683550d72a8d3d465c955a2b SHA512 1118413d380f01f3a3a2351df3218f30a01c3bbc2d472adb0b57b01cffdc69a20d87755cbb253df7ca66f155367fdafa728a642e503de6e9da3a67d88c436eb0 WHIRLPOOL 37283df89b9e555196af0b8cb9a7a71bd8fa988532fae989288f3755a41c35615c86ada39b23627b488774999f3df261842fb45dc5e9cf236c9a40c87ea0e602 EBUILD apache-2.2.24.ebuild 3098 SHA256 c742f39514dab10ec7732ac351b98fd3a5c4995e68797fa8694bc9460b0cfb21 SHA512 1dfd4da41b5c0e04f476881af504a22b553742b021177855f2d182ec14b73fb4c3ae66e9c1be87fd7a8cf4eaf9c4f4ab06514b10e2e29548bc792e40709ddf75 WHIRLPOOL 8fa3e7067a38e6b13577b801d45c8fd9dd25243730e53cb0dc3e8b9652540bb60ba19b2f5d1782fd100413f700e017ab9aa38c608ff68ee26e16a5821f7422a5 +EBUILD apache-2.2.25.ebuild 3272 SHA256 a3ace4823de0ab1b2902aed052037c1349241d112491acace44e3752347b1078 SHA512 1d64ff53df3c680ae280b467eb02f140e61aa045652e9d173cfb01a518a85cc6dbc0944b42ecdbd4dc867d8e62d2fbbb2d0577c3a23ea4a7f134df72fddbb009 WHIRLPOOL 4ee816f850834b3490ad5938451c1e62a8aa5ebd7de2d5772b59f5c27be962a2e7e0e55d60d835f048716c6cfb2a7874af49f067b0d02ed2c229b6f58c5cec38 EBUILD apache-2.4.4-r3.ebuild 7545 SHA256 e1a2d8b84131cb9086e702a189e2e8438062ae7637a8fededd5e3fb67f422dec SHA512 d4bbf08abf58f279abc9bf4c5c34bf8226b2c6eae2f7b332bfcd4bde4735a4f077484478a894cac343be114cb96d90cfadc54fc935ebcbb0460fb7ec30d814e5 WHIRLPOOL 6c4be7a6060d0df07fa64e4f33830e215970ff95dc9b9fbb56f4b366f72909c22c641b1c783fb2428e7e2650b4201c0252550fea5aa7c98925c7ce6c60651ed1 EBUILD apache-2.4.4.ebuild 7122 SHA256 484112ce1681f6ea85f2e7f8c8d106a0831da108ad5e3ecebf4adb26d4973965 SHA512 84d10fb9aff453c4b5f71307799c1f1f65775b5aeba22e4f6fe97e144be08ec3c0150c30331277ce60ab279e66edd0f964fbd684257b1e6834f1ba04d205c2af WHIRLPOOL 6b7d067a8a719a961240255e99388089f56d45f951e33c3c802723cc3375ece4b9b1e94386a666adfcd42abd84871297136134eea7a9cf26f6b29babd2fd8fab -MISC ChangeLog 19711 SHA256 83c24e3d33f3d0aea5a144b5215491dedc571bca02c44134e2935f4a5c146d93 SHA512 f16acb2a00d521d8096260c4053430d3410c9d33e4c7723eb4fa58c99a35ad4a08decb413875ab23e92c984a44fa323873f71cf90c7a7644888bbcec876dc807 WHIRLPOOL 56c95ff43fc853174a42926aa3bb60f7a18d197d054b6c25d6524f279256a277cfc24bf9dcf791ea6b2c55f5957e568bb0d57a5691f6792ebbcc61e0a08a1b9a +MISC ChangeLog 19878 SHA256 ba3e54751ce2926da222aaccbb7e57b78d4964564a693f365895b850fae0a1a6 SHA512 9c3d4c6e48d1ee69ff3824050e6d18c5a66aaec3c6da91e79bc55ba2ef6153ebcd904898ea585ed945c257426dd5b0751b245543f3ebc3734bd4b82b6154b5db WHIRLPOOL 6c1aedec34110b02b364688bd77e840fa2ffa80207421bd4494f2747126cfbc119c56ba0f7ef70a907c308cea21a8d75c08c2a9f06cc2616d764c0d0dfcd2574 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.20 (GNU/Linux) -iF4EAREIAAYFAlG5GdsACgkQC77qH+pIQ6SX0AD+NPMbuxXNpwDSKc+60AprTmBa -YWBj0hBMymPLroKeX9EA/iLKap5seBWF21MM8HKKkS25bO9jv5nK8knSju1qVNaf -=D9I7 +iQIcBAEBCAAGBQJR5+0NAAoJEPiazRVxLXTFY9YP/1zoyOj9/elZ7bxuuv2poNCP +lXbmv4gNSb0tnGWbZ1hoK/2TGhUVILlmaaReAowXpxd7NYQ8Om1lpDVI780G1XVA +j2B/98mRSY2nOIEU+JjMaECgQjsngSRHWRk858RgtiY6A0f2r+0SgruD52Sc/N8+ +Y4rmsnJ2/gAebviTFDZuoJ/5qcLhk0mxXMBY1+qGBPT6mjPxVPRmvK0AINGxXIgE +y9nA0rQ9wtZL0wUWwljksEQoIjoTVOcfA5+tZFWd/EOUWKQN6LzPZYp8+rmB8PaY +L4gyvTDxu5isGU7a73QncvXjxUL9USxcrr2M2icqwuTH9qfPeTN6WKvePoO0KcPh +jlaygC2ENICSbZiey2tJpXCva3H7q+kRGo7vsysg+sWQyw5BrljEfPvU4LW5mu9x +4LlSdopKbe0rzyV1g0CJuvLv2nG7qxeFvLfwGvSvOM+oP00691yBESASLMfob9zp +ETgN3Uruk1/OOw86oBGdV0EaZGo/f790jMREJzL4HpF5qWoR0RE6HYDZzlBdrVEV +Bp/iA2jFElOKE1qet7H6g5NntufkCY6ZAAXMi0Z5MZS2EsSlLDPkicmQw1UdRgPO +tN10s+ioi3bG33wT5aW8k5P+UrM674O/sG62aklc0YRDqL8vv6TzY9nJuULYW/gT +7/bXmAHvJjWO9Bw+9pTd +=TLOB -----END PGP SIGNATURE----- diff --git a/www-servers/apache/apache-2.2.25.ebuild b/www-servers/apache/apache-2.2.25.ebuild new file mode 100644 index 000000000000..077d7831fbfd --- /dev/null +++ b/www-servers/apache/apache-2.2.25.ebuild @@ -0,0 +1,119 @@ +# 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.25.ebuild,v 1.1 2013/07/18 13:26:36 polynomial-c 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" +} |