Browse code

apache 2.4.4

Hanno Böck authored on 01/03/2013 20:52:53
Showing 2 changed files
... ...
@@ -8,10 +8,13 @@ AUX httpd-2.2.16-ecc.diff 8236 SHA256 e7fe97852875de06372d8413248fa20419946e2ab7
8 8
 DIST gentoo-apache-2.2.22-20120213.tar.bz2 64507 SHA256 737730dabf1e1ccfe9d409067dc3c4d37d16f7fa1e792f5bf39268d904ce1c31 SHA512 f364bdbee967b3bc797d2053b9eb347af963f99275441093930d0057465e1a12567106f5c5ac21a45a4bbd4b353ce67553038d6146f469a7bf980a9148471170 WHIRLPOOL f5a3ab44fc14ddf67ccf0785006b1d9f5c49b915114f9d7e97858fba447a5ee872c741e73c17e121b61cc0aa678b42dc154616cd64054461c552d3a8c29f4f17
9 9
 DIST gentoo-apache-2.2.23-20121012.tar.bz2 64135 SHA256 711a88f26c58b10b082f7ff411366cd768f9450101da050438a2f77abeab7333 SHA512 92a49f954b82d4427862f41977625a60641731cc25ab3efdd666be8db839038e7b1c2ef2f878d5efed243eaa63237e88ee4993cd25cca1dfbb0f56a6b2093d57 WHIRLPOOL 221d9c0cf999430afc11a8e48ae67019c7f31daca827a5db7615aca24859788743e5da00e4c99b7b7b375e58fafd6c148339e5671be939dbc30735031e12c49f
10 10
 DIST gentoo-apache-2.4.3-20121012.tar.bz2 24541 SHA256 aeed23c716f05d7430a6d905fb75c192418c9ba90feb96fcc474138c4addfd69 SHA512 fe37c91328bf090aacd4012030845b2e4461a116b9b60d95108c4a4749729bef5ac526d4bd3570406f3d7afe41b0f634c2e9a167ee416a56f5f82f46eb27cc26 WHIRLPOOL 421efb4a7940b52cbc2e054c5ef2f79ff19c13a3140941ec659da3ff61a70491485c1c375db29b1fa6c4dc45761df1f0fc63bd3d867c8937d33f5b6c948bade0
11
+DIST gentoo-apache-2.4.4-20130227.tar.bz2 24579 SHA256 cf27447dc87b4c145e50a6850245e3ed8d350bc3500bb249035322b23d03ccd2 SHA512 d6e8e37c53c37e9791c9d0ed3501d271212f0d2e2aac757a8a1914f20eb7b3dc0ca7e2d33a6f17dcb3572bc1f01b2c2f5876329ac8c2a4aaa7d2bca8e71f1d84 WHIRLPOOL 6364049b25c0aa21c4336dab7d1af8d3f3d06a60766fe401fc4f818f8ff7764564d136a414c444811612698221d830040ff4c5afb2a379607d5bd32b60260be6
11 12
 DIST httpd-2.2.22.tar.bz2 5378934 SHA256 dcdc9f1dc722f84798caf69d69dca78daa5e09a4269060045aeca7e4f44cb231 SHA512 b6901453aaef3cac31cf763f7748e06a2492e1f72e4158627f38e45423a9bcd9bea1f74ba1a1ec9a5c7fc554eb062ea61b944e2001f19825def2e530ce8a42bc WHIRLPOOL 32a03d638f82d791effdce888a02e66189d6fe87c2179ab9f3de034fbf5c8311d24835f28e9a18addb847aa6859ed817bf2e11833e315285474eefcea6f56891
12 13
 DIST httpd-2.2.23.tar.bz2 5485205 SHA256 14fe79bd6edd957c02cb41f4175e132c08e6ff74a7d08dc1858dd8224e351c34 SHA512 69b3bc942b2a91cdb57356a5c57078794db2d8404a23080a2621cdf33ae2d9bdbbacd0f6e95fd6e71fbfa87e94942be0a014c3e8709148f991e391d03aa6dee2 WHIRLPOOL 8d00184aff654b2d7f1c5ebd471f19ffcb57107ea37179fa05c424424d7b70ff0c9abf3be68ed9f0d091b3c057f1ba24cb989937e35087c3199f82e3dddbbd4f
13 14
 DIST httpd-2.4.3.tar.bz2 4559279 SHA256 d82102b9c111f1892fb20a2bccf4370de579c6521b2f172ed0b36f2759fb249e SHA512 d4501ae69aacb75d960bc8cb61c9e1ff52e6e42a37c37ca84c839262e183ca2f305794da28266aa2119d211ba0f4531705f66330079ab594c05e92ae8196d1ab WHIRLPOOL 4ffb7dc8057200f676557a70591d6938e92a8990d88dc88237d278f185290d260312dd8cfdd08994ffd7b7280502b3debea0f3e02acc718dd9db613222b6d2ae
15
+DIST httpd-2.4.4.tar.bz2 4780289 SHA256 92aabddeca76a4ac7330b143df1407bbf35574c7291c15172238ac598d97655c SHA512 d68789e1e585b4acf26e4e32d063fa512525f8fcc2077b1dbf573dd9f4b47667772d94bb65fefb354fbfae331e87b3fdea422a732838c86d8887eed4b3a76af0 WHIRLPOOL c2ec29a0d52ff1d674f103d0d59c0acd15b194b1102ba5078ef76b62aa959ff92adc5977e095b30c6a778cd9385f9c4ded9bfdc6ce8fba381735ca1aa84aa9f0
14 16
 EBUILD apache-2.2.22-r1.ebuild 3206 SHA256 4c72b2164c32c34e85c6a8e99c68464e5505eeb79bf94eed7ad1d62ba2045c0e SHA512 bafab5ef6f8d8675614473c01ae71655b1cd94b75658353e8351df1cb8b9667b2164d501f98b4492810a2ec2d3415db6c5df416bc51aed4fc4ec6fc4a155288b WHIRLPOOL d6f4c9b06b3cfcad613084bb7902c7ba942848a8233b50ff48474e7407c3e1d4523f44a0ca9f0790510122719609ec767afbaf3fdd60b6dd7918fe409e9b08a2
15 17
 EBUILD apache-2.2.22.ebuild 3001 SHA256 cf930cea2f7e8a8bd2f7cabe7de9ecf56efb33d10bd3fe2d70acaa6e86cebb0c SHA512 1de2c503698334b00c3b44cad9680d8699e7ad21c80a746af4154d03433da4bcc072cf572d2ce9dbf478f6c97423ee2650521d877f2c62a27ec0189d5c66c045 WHIRLPOOL aadae0ae48a37cdd5ed3995c92fa5bf925fd2c12792cdcce08305191c09703a80bd7bc264c61165e8c26687bde97ad543722d04e090620cd7fe473c76688e233
16 18
 EBUILD apache-2.2.23.ebuild 3181 SHA256 b6502801683bcd8708e247fd11e8d7a639a7412f77d3a631827705f20e43c878 SHA512 860dce68ab969c4bacdedc3fec4d48937d7a331921e86fe02d6b1481a59cd8997d336b9c9bbc6cf9a69dd3719acc411abae1809e7770b42d31adb1cefd5dc560 WHIRLPOOL e2e128e74236c6a306d511cdc8d1e9799e9818fc842a1884eb48a8ef8683669ba321ca228ec780015e1c88044cff2904652c4a1c93a2f3af84e3552c8e7d3363
17 19
 EBUILD apache-2.4.3.ebuild 7203 SHA256 082ee4bc36fe78621a32ad8ae3f3117943b5572e1456618d1b547cf344c4d687 SHA512 56786dc2e5f835e1894760ad85bfba6ffd531b50e7e9f782240ac2deb7464a2aa222cd04495ab7bd81f0e30c91972f417857c9fd4ee53587ebc91ba6a542c41e WHIRLPOOL 4e8e22861a21d8defd9c8eb57fc5548ba38a911db640fc63b6a15fdcfcf86c8fbf50b09f78321ea784bf81340718242d5a7fa6c6ed1c4e0c31a4e79affc64d24
20
+EBUILD apache-2.4.4-r1.ebuild 7252 SHA256 64b4537ade811698d002a19da3b32dc54fc590c76cab613095f7086502b34dca SHA512 30f72175c5093f6fcee56892b79e3c72106c7f160a5dff3f7f29c0be376ed94271b35f536ec4d3d539f352a90c9d741b368eb8aaeada501da8a22f1f8cfa67dc WHIRLPOOL 0bd24504dcbab1e364209e622f93a5baf78976761f9e4de7a85686417e6077829f8ca1ab7a87724f3c03362249de3fada01c06e9f553ec8bd24cf1bead516a4b
18 21
new file mode 100644
... ...
@@ -0,0 +1,216 @@
1
+# Copyright 1999-2013 Gentoo Foundation
2
+# Distributed under the terms of the GNU General Public License v2
3
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.4-r1.ebuild,v 1.1 2013/02/27 15:49:15 chainsaw Exp $
4
+
5
+EAPI="2"
6
+
7
+# latest gentoo apache files
8
+GENTOO_PATCHSTAMP="20130227"
9
+GENTOO_DEVELOPER="patrick"
10
+GENTOO_PATCHNAME="gentoo-apache-2.4.4"
11
+
12
+# IUSE/USE_EXPAND magic
13
+IUSE_MPMS_FORK="itk peruser prefork"
14
+IUSE_MPMS_THREAD="event worker"
15
+
16
+# << obsolete modules:
17
+# authn_default authz_default mem_cache
18
+# mem_cache is replaced by cache_disk
19
+# ?? buggy modules
20
+# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
21
+# >> added modules for reason:
22
+# compat: compatibility with 2.2 access control
23
+# authz_host: new module for access control
24
+# authn_core: functionality provided by authn_alias in previous versions
25
+# authz_core: new module, provides core authorization capabilities
26
+# cache_disk: replacement for mem_cache
27
+# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
28
+# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
29
+# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
30
+# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
31
+# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
32
+# socache_shmcb: shared object cache provider. Default config with ssl needs it
33
+# unixd: fixes startup error: Invalid command 'User'
34
+IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest authn_alias authn_anon
35
+authn_core authn_dbd authn_dbm authn_file authz_core authz_dbm
36
+authz_groupfile authz_host authz_owner authz_user autoindex cache cache_disk cern_meta
37
+charset_lite cgi cgid dav dav_fs dav_lock dbd deflate dir dumpio
38
+env expires ext_filter file_cache filter headers ident imagemap include info
39
+lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat
40
+log_config log_forensic logio mime mime_magic negotiation proxy
41
+proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi proxy_fcgi rewrite
42
+reqtimeout setenvif slotmem_shm speling socache_shmcb status substitute unique_id userdir usertrack
43
+unixd version vhost_alias"
44
+# The following are also in the source as of this version, but are not available
45
+# for user selection:
46
+# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
47
+# optional_fn_import optional_hook_export optional_hook_import
48
+
49
+# inter-module dependencies
50
+# TODO: this may still be incomplete
51
+MODULE_DEPENDS="
52
+	dav_fs:dav
53
+	dav_lock:dav
54
+	deflate:filter
55
+	cache_disk:cache
56
+	ext_filter:filter
57
+	file_cache:cache
58
+	lbmethod_byrequests:proxy_balancer
59
+	lbmethod_byrequests:slotmem_shm
60
+	lbmethod_bytraffic:proxy_balancer
61
+	lbmethod_bybusyness:proxy_balancer
62
+	lbmethod_heartbeat:proxy_balancer
63
+	log_forensic:log_config
64
+	logio:log_config
65
+	cache_disk:cache
66
+	mime_magic:mime
67
+	proxy_ajp:proxy
68
+	proxy_balancer:proxy
69
+	proxy_connect:proxy
70
+	proxy_ftp:proxy
71
+	proxy_http:proxy
72
+	proxy_scgi:proxy
73
+	proxy_fcgi:proxy
74
+	substitute:filter
75
+"
76
+
77
+# module<->define mappings
78
+MODULE_DEFINES="
79
+	auth_digest:AUTH_DIGEST
80
+	authnz_ldap:AUTHNZ_LDAP
81
+	cache:CACHE
82
+	cache_disk:CACHE
83
+	dav:DAV
84
+	dav_fs:DAV
85
+	dav_lock:DAV
86
+	file_cache:CACHE
87
+	info:INFO
88
+	ldap:LDAP
89
+	proxy:PROXY
90
+	proxy_ajp:PROXY
91
+	proxy_balancer:PROXY
92
+	proxy_connect:PROXY
93
+	proxy_ftp:PROXY
94
+	proxy_http:PROXY
95
+	proxy_fcgi:PROXY
96
+	socache_shmcb:SSL
97
+	ssl:SSL
98
+	status:STATUS
99
+	suexec:SUEXEC
100
+	userdir:USERDIR
101
+"
102
+
103
+# critical modules for the default config
104
+MODULE_CRITICAL="
105
+	authn_core
106
+	authz_core
107
+	authz_host
108
+	dir
109
+	mime
110
+	unixd
111
+"
112
+# dependend criticals
113
+use ssl && MODULE_CRITICAL+=" socache_shmcb"
114
+use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
115
+
116
+inherit eutils apache-2
117
+
118
+DESCRIPTION="The Apache Web Server."
119
+HOMEPAGE="http://httpd.apache.org/"
120
+
121
+# some helper scripts are Apache-1.1, thus both are here
122
+LICENSE="Apache-2.0 Apache-1.1"
123
+SLOT="2"
124
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
125
+IUSE=""
126
+
127
+DEPEND="${DEPEND}
128
+	>=dev-libs/openssl-0.9.8m
129
+	apache2_modules_deflate? ( sys-libs/zlib )"
130
+
131
+# dependency on >=dev-libs/apr-1.4.5 for bug #368651
132
+RDEPEND="${RDEPEND}
133
+	>=dev-libs/apr-1.4.5
134
+	>=dev-libs/openssl-0.9.8m
135
+	apache2_modules_mime? ( app-misc/mime-types )"
136
+
137
+# init script fixup - should be rolled into next tarball #389965
138
+src_prepare() {
139
+	#epatch "${FILESDIR}"/apache-npn
140
+	epatch "${FILESDIR}"/apache-2.4.3-dhparam.diff
141
+	# the following patch can be removed once it is included in
142
+	# GENTOO_PATCHNAME="gentoo-apache-2.4.1" ...
143
+	if [ -f "${FILESDIR}/${GENTOO_PATCHNAME}-${GENTOO_DEVELOPER}-${GENTOO_PATCHSTAMP}-${PVR}.patch" ]; then
144
+		cd "${GENTOO_PATCHDIR}" || die "Failed to cd to ${GENTOO_PATCHDIR}"
145
+		epatch "${FILESDIR}/${GENTOO_PATCHNAME}-${GENTOO_DEVELOPER}-${GENTOO_PATCHSTAMP}-${PVR}.patch" \
146
+			|| die "epatch failed"
147
+		cd "${S}" || die "Failed to cd to ${S}"
148
+	fi
149
+	apache-2_src_prepare
150
+	sed -i -e 's/! test -f/test -f/' "${GENTOO_PATCHDIR}"/init/apache2.initd || die "Failed to fix init script"
151
+}
152
+
153
+src_install() {
154
+	apache-2_src_install
155
+	for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do
156
+		rm "${D}"/$i || die "Failed to prune apache-tools bits"
157
+	done
158
+	for i in /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}; do
159
+		rm "${D}"/$i || die "Failed to prune apache-tools bits"
160
+	done
161
+	for i in /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}; do
162
+		rm "${D}"/$i || die "Failed to prune apache-tools bits"
163
+	done
164
+	for i in /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}; do
165
+		rm "${D}/"$i || die "Failed to prune apache-tools bits"
166
+	done
167
+
168
+	# well, actually installing things makes them more installed, I guess?
169
+	cp "${S}"/support/apxs "${D}"/usr/sbin/apxs || die "Failed to install apxs"
170
+	chmod 0755 "${D}"/usr/sbin/apxs
171
+
172
+	# create dir defined in 40_mod_ssl.conf
173
+	if use ssl; then
174
+		dodir /var/run/apache_ssl_mutex || die "Failed to mkdir ssl_mutex"
175
+	fi
176
+}
177
+
178
+pkg_postinst()
179
+{
180
+	apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
181
+	# warnings that default config might not work out of the box
182
+	for mod in $MODULE_CRITICAL; do
183
+		if ! use "apache2_modules_${mod}"; then
184
+			echo
185
+			ewarn "Warning: Critical module not installed!"
186
+			ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
187
+			ewarn "are highly recomended but might not be in the base profile yet."
188
+			ewarn "Default config for ssl needs module 'socache_shmcb'."
189
+			ewarn "Enabling the following flags is highly recommended:"
190
+			for cmod in $MODULE_CRITICAL; do
191
+				use "apache2_modules_${cmod}" || \
192
+					ewarn "+ apache2_modules_${cmod}"
193
+			done
194
+			echo
195
+			break
196
+		fi
197
+	done
198
+	# warning for proxy_balancer and missing load balancing scheduler
199
+	if use apache2_modules_proxy_balancer; then
200
+		local lbset=
201
+		for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
202
+			if use "apache2_modules_${mod}"; then
203
+				lbset=1 && break
204
+			fi
205
+		done
206
+		if [ ! $lbset ]; then
207
+			echo
208
+			ewarn "Info: Missing load balancing scheduler algorithm module"
209
+			ewarn "(They were split off from proxy_balancer in 2.3)"
210
+			ewarn "In order to get the ability of load balancing, at least"
211
+			ewarn "one of these modules has to be present:"
212
+			ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
213
+			echo
214
+		fi
215
+	fi
216
+}