Gentoo Archives: gentoo-commits

From: "Lars Wendler (polynomial-c)" <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-servers/apache: ChangeLog apache-2.2.31.ebuild
Date: Thu, 23 Jul 2015 14:19:08
Message-Id: 20150723141904.4FEEAC1@oystercatcher.gentoo.org
1 polynomial-c 15/07/23 14:19:04
2
3 Modified: ChangeLog
4 Added: apache-2.2.31.ebuild
5 Log:
6 Version bump (bug #555658)
7
8 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 981CA6FC)
9
10 Revision Changes Path
11 1.307 www-servers/apache/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?rev=1.307&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?rev=1.307&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?r1=1.306&r2=1.307
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v
20 retrieving revision 1.306
21 retrieving revision 1.307
22 diff -u -r1.306 -r1.307
23 --- ChangeLog 16 Jul 2015 12:52:29 -0000 1.306
24 +++ ChangeLog 23 Jul 2015 14:19:04 -0000 1.307
25 @@ -1,6 +1,11 @@
26 # ChangeLog for www-servers/apache
27 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.306 2015/07/16 12:52:29 polynomial-c Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.307 2015/07/23 14:19:04 polynomial-c Exp $
30 +
31 +*apache-2.2.31 (23 Jul 2015)
32 +
33 + 23 Jul 2015; Lars Wendler <polynomial-c@g.o> +apache-2.2.31.ebuild:
34 + Version bump (bug #555658).
35
36 16 Jul 2015; Lars Wendler <polynomial-c@g.o> apache-2.4.12-r1.ebuild,
37 apache-2.4.16.ebuild:
38
39
40
41 1.1 www-servers/apache/apache-2.2.31.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.2.31.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.2.31.ebuild?rev=1.1&content-type=text/plain
45
46 Index: apache-2.2.31.ebuild
47 ===================================================================
48 # Copyright 1999-2015 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.31.ebuild,v 1.1 2015/07/23 14:19:04 polynomial-c Exp $
51
52 EAPI=5
53
54 # latest gentoo apache files
55 GENTOO_PATCHSTAMP="20140922"
56 GENTOO_DEVELOPER="polynomial-c"
57 GENTOO_PATCHNAME="gentoo-apache-2.2.29"
58
59 # IUSE/USE_EXPAND magic
60 IUSE_MPMS_FORK="itk peruser prefork"
61 IUSE_MPMS_THREAD="event worker"
62
63 IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon
64 authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default
65 authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta
66 charset_lite cgi cgid dav dav_fs dav_lock dbd deflate dir disk_cache dumpio
67 env expires ext_filter file_cache filter headers ident imagemap include info
68 log_config log_forensic logio mem_cache mime mime_magic negotiation proxy
69 proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi rewrite
70 reqtimeout setenvif speling status substitute unique_id userdir usertrack
71 version vhost_alias"
72 # The following are also in the source as of this version, but are not available
73 # for user selection:
74 # bucketeer case_filter case_filter_in echo http isapi optional_fn_export
75 # optional_fn_import optional_hook_export optional_hook_import
76
77 # inter-module dependencies
78 # TODO: this may still be incomplete
79 MODULE_DEPENDS="
80 dav_fs:dav
81 dav_lock:dav
82 deflate:filter
83 disk_cache:cache
84 ext_filter:filter
85 file_cache:cache
86 log_forensic:log_config
87 logio:log_config
88 mem_cache:cache
89 mime_magic:mime
90 proxy_ajp:proxy
91 proxy_balancer:proxy
92 proxy_connect:proxy
93 proxy_ftp:proxy
94 proxy_http:proxy
95 proxy_scgi:proxy
96 substitute:filter
97 "
98
99 # module<->define mappings
100 MODULE_DEFINES="
101 auth_digest:AUTH_DIGEST
102 authnz_ldap:AUTHNZ_LDAP
103 cache:CACHE
104 dav:DAV
105 dav_fs:DAV
106 dav_lock:DAV
107 disk_cache:CACHE
108 file_cache:CACHE
109 info:INFO
110 ldap:LDAP
111 mem_cache:CACHE
112 proxy:PROXY
113 proxy_ajp:PROXY
114 proxy_balancer:PROXY
115 proxy_connect:PROXY
116 proxy_ftp:PROXY
117 proxy_http:PROXY
118 ssl:SSL
119 status:STATUS
120 suexec:SUEXEC
121 userdir:USERDIR
122 "
123
124 # critical modules for the default config
125 MODULE_CRITICAL="
126 authz_host
127 dir
128 mime
129 "
130
131 inherit apache-2 systemd toolchain-funcs
132
133 DESCRIPTION="The Apache Web Server"
134 HOMEPAGE="http://httpd.apache.org/"
135
136 # some helper scripts are Apache-1.1, thus both are here
137 LICENSE="Apache-2.0 Apache-1.1"
138 SLOT="2"
139 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
140 IUSE=""
141
142 src_configure() {
143 # Brain dead check.
144 tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
145
146 apache-2_src_configure
147 }
148
149 src_install() {
150 apache-2_src_install
151
152 # install apxs in /usr/bin (bug #502384) and put a symlink into the
153 # old location until all ebuilds and eclasses have been modified to
154 # use the new location.
155 local apxs_dir="/usr/bin"
156 dodir ${apxs_dir}
157 mv "${D}"/usr/sbin/apxs "${D}"${apxs_dir} || die
158 ln -s ../bin/apxs "${D}"/usr/sbin/apxs || die
159
160 systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service"
161 systemd_dotmpfilesd "${FILESDIR}/apache.conf"
162 }