Browse code

apache 2.4 dh patch update

Hanno Böck authored on 31/07/2013 12:46:19
Showing 2 changed files
... ...
@@ -9,12 +9,14 @@ DIST gentoo-apache-2.2.22-20120213.tar.bz2 64507 SHA256 737730dabf1e1ccfe9d40906
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 11
 DIST gentoo-apache-2.4.4-20130227.tar.bz2 24579 SHA256 cf27447dc87b4c145e50a6850245e3ed8d350bc3500bb249035322b23d03ccd2 SHA512 d6e8e37c53c37e9791c9d0ed3501d271212f0d2e2aac757a8a1914f20eb7b3dc0ca7e2d33a6f17dcb3572bc1f01b2c2f5876329ac8c2a4aaa7d2bca8e71f1d84 WHIRLPOOL 6364049b25c0aa21c4336dab7d1af8d3f3d06a60766fe401fc4f818f8ff7764564d136a414c444811612698221d830040ff4c5afb2a379607d5bd32b60260be6
12
+DIST gentoo-apache-2.4.4-20130725.tar.bz2 24525 SHA256 c155dae39d87acc43ef34b385a2eaf2a45ff9c11d31b1c1791a74f9946335c39 SHA512 95489af418e3674b9d20dc988f4473d5d088d892bb2e6660a46a225667b0427c904d883a19fa3a847778fa00eb8ac0f27e1a5f76f0d65a28eaf0a39747353bbb WHIRLPOOL 1fd36df2db6814d01846cb40be9443aa963a0df9b45647859e901981872f64a8b4ba95aff9a14a8985feb74d51c551ab10c6734a63d5e9d001c53ab3c4383c42
12 13
 DIST httpd-2.2.22.tar.bz2 5378934 SHA256 dcdc9f1dc722f84798caf69d69dca78daa5e09a4269060045aeca7e4f44cb231 SHA512 b6901453aaef3cac31cf763f7748e06a2492e1f72e4158627f38e45423a9bcd9bea1f74ba1a1ec9a5c7fc554eb062ea61b944e2001f19825def2e530ce8a42bc WHIRLPOOL 32a03d638f82d791effdce888a02e66189d6fe87c2179ab9f3de034fbf5c8311d24835f28e9a18addb847aa6859ed817bf2e11833e315285474eefcea6f56891
13 14
 DIST httpd-2.2.23.tar.bz2 5485205 SHA256 14fe79bd6edd957c02cb41f4175e132c08e6ff74a7d08dc1858dd8224e351c34 SHA512 69b3bc942b2a91cdb57356a5c57078794db2d8404a23080a2621cdf33ae2d9bdbbacd0f6e95fd6e71fbfa87e94942be0a014c3e8709148f991e391d03aa6dee2 WHIRLPOOL 8d00184aff654b2d7f1c5ebd471f19ffcb57107ea37179fa05c424424d7b70ff0c9abf3be68ed9f0d091b3c057f1ba24cb989937e35087c3199f82e3dddbbd4f
14 15
 DIST httpd-2.2.24.tar.bz2 5490439 SHA256 0453f5d2d7e3b1975a1c6a8a22b6d6ff768715a3b0a89b51e5f7b5851628fad7 SHA512 e1c24535bb0ae309c249c0a6fbd390064a929d960241e5e68737744f120a88b615bd5d9065fc2f749ee664ed96621c9373576e6ca32bd189d625fcd4dc1b8f01 WHIRLPOOL b24bf388e1be29cc52341d66af00318b3a60ad6db6b4df8c6cc0abf496c4e603d3b733529d21d3d1c37dad0008cacafa8078abdff6c25cb42b3874b6e176713e
15 16
 DIST httpd-2.2.25.tar.bz2 5524905 SHA256 4bcaf3524796a514b31aa5c64ce80b0cdb484bab5735416de29d00f6d50fa65a SHA512 4750e79bdab4ca28c602a808531dfc1482e86bf425d5cb3bcb42a9ccfbbfde5bfd05e66649ea741523c96de6582f5e12facbb1e7d67257bcf78a3ed7a66f80d9 WHIRLPOOL 7ce37be9b66de24cc7259c6e8a0696b496c893933b1c5dbdff5147c279fb644b5d5fc77ed02531b0f081f0c217f684d1bcd98bac26938b23c1d7a4ec085162f6
16 17
 DIST httpd-2.4.3.tar.bz2 4559279 SHA256 d82102b9c111f1892fb20a2bccf4370de579c6521b2f172ed0b36f2759fb249e SHA512 d4501ae69aacb75d960bc8cb61c9e1ff52e6e42a37c37ca84c839262e183ca2f305794da28266aa2119d211ba0f4531705f66330079ab594c05e92ae8196d1ab WHIRLPOOL 4ffb7dc8057200f676557a70591d6938e92a8990d88dc88237d278f185290d260312dd8cfdd08994ffd7b7280502b3debea0f3e02acc718dd9db613222b6d2ae
17 18
 DIST httpd-2.4.4.tar.bz2 4780289 SHA256 92aabddeca76a4ac7330b143df1407bbf35574c7291c15172238ac598d97655c SHA512 d68789e1e585b4acf26e4e32d063fa512525f8fcc2077b1dbf573dd9f4b47667772d94bb65fefb354fbfae331e87b3fdea422a732838c86d8887eed4b3a76af0 WHIRLPOOL c2ec29a0d52ff1d674f103d0d59c0acd15b194b1102ba5078ef76b62aa959ff92adc5977e095b30c6a778cd9385f9c4ded9bfdc6ce8fba381735ca1aa84aa9f0
19
+DIST httpd-2.4.6.tar.bz2 4949897 SHA256 dc9f3625ebc08bea55eeb0d16e71fba656f252e6cd0aa244ee7806dc3b022fea SHA512 8ade7ec5291f07a60e279f7a73a79c11c150dbf09c9e7b059e136fcb250130aa0f381b118f84e230184b065d452d5e946df8a5766991be8cdc6e8f5d4c4bac01 WHIRLPOOL 81f036bb438afa30106a402e256d641a2687b619ef7f6ea3e4ab61f30715560e1c9dd3afa3e53c4d99c77de72f100e8a1894a5a898247c381100ceb165b8a146
18 20
 EBUILD apache-2.2.22-r1.ebuild 3206 SHA256 4c72b2164c32c34e85c6a8e99c68464e5505eeb79bf94eed7ad1d62ba2045c0e SHA512 bafab5ef6f8d8675614473c01ae71655b1cd94b75658353e8351df1cb8b9667b2164d501f98b4492810a2ec2d3415db6c5df416bc51aed4fc4ec6fc4a155288b WHIRLPOOL d6f4c9b06b3cfcad613084bb7902c7ba942848a8233b50ff48474e7407c3e1d4523f44a0ca9f0790510122719609ec767afbaf3fdd60b6dd7918fe409e9b08a2
19 21
 EBUILD apache-2.2.22.ebuild 3001 SHA256 cf930cea2f7e8a8bd2f7cabe7de9ecf56efb33d10bd3fe2d70acaa6e86cebb0c SHA512 1de2c503698334b00c3b44cad9680d8699e7ad21c80a746af4154d03433da4bcc072cf572d2ce9dbf478f6c97423ee2650521d877f2c62a27ec0189d5c66c045 WHIRLPOOL aadae0ae48a37cdd5ed3995c92fa5bf925fd2c12792cdcce08305191c09703a80bd7bc264c61165e8c26687bde97ad543722d04e090620cd7fe473c76688e233
20 22
 EBUILD apache-2.2.23.ebuild 3181 SHA256 b6502801683bcd8708e247fd11e8d7a639a7412f77d3a631827705f20e43c878 SHA512 860dce68ab969c4bacdedc3fec4d48937d7a331921e86fe02d6b1481a59cd8997d336b9c9bbc6cf9a69dd3719acc411abae1809e7770b42d31adb1cefd5dc560 WHIRLPOOL e2e128e74236c6a306d511cdc8d1e9799e9818fc842a1884eb48a8ef8683669ba321ca228ec780015e1c88044cff2904652c4a1c93a2f3af84e3552c8e7d3363
... ...
@@ -22,3 +24,5 @@ EBUILD apache-2.2.24.ebuild 3102 SHA256 b751f4d8aa98faf4f78a695368cd294777084c1d
22 24
 EBUILD apache-2.2.25.ebuild 3297 SHA256 f2a97144d474359d89e67248fa1f7a58c22e1268357b1a9978800b8b8816767a SHA512 0f3af89b8d9a70b75e3888bfd110625875ed48aa9348033c9f316401b38468f34d11bd49e223e62b81d0a52abf4a94a5c44ea8c757e51a391d6dbd659c83c1c3 WHIRLPOOL 5608f8deaf9c90eb92a03237b3516af15c0a140f0decbc9a6e874b18e0135a8969435b3d85611ceb058453071e38ce2e3f0392e142843241c7040fecb8f072a6
23 25
 EBUILD apache-2.4.3.ebuild 7203 SHA256 082ee4bc36fe78621a32ad8ae3f3117943b5572e1456618d1b547cf344c4d687 SHA512 56786dc2e5f835e1894760ad85bfba6ffd531b50e7e9f782240ac2deb7464a2aa222cd04495ab7bd81f0e30c91972f417857c9fd4ee53587ebc91ba6a542c41e WHIRLPOOL 4e8e22861a21d8defd9c8eb57fc5548ba38a911db640fc63b6a15fdcfcf86c8fbf50b09f78321ea784bf81340718242d5a7fa6c6ed1c4e0c31a4e79affc64d24
24 26
 EBUILD apache-2.4.4-r1.ebuild 7252 SHA256 64b4537ade811698d002a19da3b32dc54fc590c76cab613095f7086502b34dca SHA512 30f72175c5093f6fcee56892b79e3c72106c7f160a5dff3f7f29c0be376ed94271b35f536ec4d3d539f352a90c9d741b368eb8aaeada501da8a22f1f8cfa67dc WHIRLPOOL 0bd24504dcbab1e364209e622f93a5baf78976761f9e4de7a85686417e6077829f8ca1ab7a87724f3c03362249de3fada01c06e9f553ec8bd24cf1bead516a4b
27
+EBUILD apache-2.4.4-r3.ebuild 7589 SHA256 9f6c67f51270ab73ed9a7b4bbf480166a1a6a0ee97f8932b36a71af2f5d7cc40 SHA512 6b148a374ac7405eb00ef2e74fdf3e2e023887c676170e83f116e12dec13deda1567a3ed6b8ab5be477dc2649adb65a65d45f1da631e0ed5d76c3ae7f4ab6546 WHIRLPOOL 23917875cfa3737e1a6259d957ae44b7fa2346d6256dea22772d33b5d7272cdfb6d1fe10e3c0515704f8eafec1db2457b8b35c1885b536e60d658eb500acf4e0
28
+EBUILD apache-2.4.6-r1.ebuild 7476 SHA256 6d6b9331dce777b11cfef9bd8b5e9ac006e93728f549225ab6945cb81037a1a9 SHA512 c5ceb713601e2372bb36bdb705d9a7d7dd8c76ffa09339124b11b0054c180606243b21e2c1e95346a7ac0d0ab302ff88e238a8447b553abf08b8a42b390d9e42 WHIRLPOOL 974cf7113269dfb87c138635abd610aaddf92aa94d9dad508b1c11c3636715d9dcce969e0d7e13db1bf854b0f9c2100c428c351795987708659d3ad3ab9ca9b1
25 29
new file mode 100644
... ...
@@ -0,0 +1,218 @@
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.6-r1.ebuild,v 1.2 2013/07/28 01:39:37 aballier Exp $
4
+
5
+EAPI="2"
6
+
7
+# latest gentoo apache files
8
+GENTOO_PATCHSTAMP="20130725"
9
+GENTOO_DEVELOPER="kensington"
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
42
+rewrite ratelimit remoteip reqtimeout setenvif slotmem_shm speling socache_shmcb status substitute
43
+unique_id userdir usertrack 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 systemd
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 ~amd64-fbsd ~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-2.4.3-dhparam.diff
140
+	# the following patch can be removed once it is included in
141
+	# GENTOO_PATCHNAME="gentoo-apache-2.4.1" ...
142
+	if [ -f "${FILESDIR}/${GENTOO_PATCHNAME}-${GENTOO_DEVELOPER}-${GENTOO_PATCHSTAMP}-${PVR}.patch" ]; then
143
+		cd "${GENTOO_PATCHDIR}" || die "Failed to cd to ${GENTOO_PATCHDIR}"
144
+		epatch "${FILESDIR}/${GENTOO_PATCHNAME}-${GENTOO_DEVELOPER}-${GENTOO_PATCHSTAMP}-${PVR}.patch" \
145
+			|| die "epatch failed"
146
+		cd "${S}" || die "Failed to cd to ${S}"
147
+	fi
148
+	apache-2_src_prepare
149
+	sed -i -e 's/! test -f/test -f/' "${GENTOO_PATCHDIR}"/init/apache2.initd || die "Failed to fix init script"
150
+}
151
+
152
+src_install() {
153
+	apache-2_src_install
154
+	for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do
155
+		rm "${D}"/$i || die "Failed to prune apache-tools bits"
156
+	done
157
+	for i in /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}; do
158
+		rm "${D}"/$i || die "Failed to prune apache-tools bits"
159
+	done
160
+	for i in /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}; do
161
+		rm "${D}"/$i || die "Failed to prune apache-tools bits"
162
+	done
163
+	for i in /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}; do
164
+		rm "${D}/"$i || die "Failed to prune apache-tools bits"
165
+	done
166
+
167
+	# well, actually installing things makes them more installed, I guess?
168
+	cp "${S}"/support/apxs "${D}"/usr/sbin/apxs || die "Failed to install apxs"
169
+	chmod 0755 "${D}"/usr/sbin/apxs
170
+
171
+	# Note: wait for mod_systemd to be included in the next release,
172
+	# then apache2.4.service can be used and systemd support controlled
173
+	# through --enable-systemd
174
+	systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service"
175
+	systemd_dotmpfilesd "${FILESDIR}/apache.conf"
176
+	#insinto /etc/apache2/modules.d
177
+	#doins "${FILESDIR}/00_systemd.conf"
178
+}
179
+
180
+pkg_postinst()
181
+{
182
+	apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
183
+	# warnings that default config might not work out of the box
184
+	for mod in $MODULE_CRITICAL; do
185
+		if ! use "apache2_modules_${mod}"; then
186
+			echo
187
+			ewarn "Warning: Critical module not installed!"
188
+			ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
189
+			ewarn "are highly recomended but might not be in the base profile yet."
190
+			ewarn "Default config for ssl needs module 'socache_shmcb'."
191
+			ewarn "Enabling the following flags is highly recommended:"
192
+			for cmod in $MODULE_CRITICAL; do
193
+				use "apache2_modules_${cmod}" || \
194
+					ewarn "+ apache2_modules_${cmod}"
195
+			done
196
+			echo
197
+			break
198
+		fi
199
+	done
200
+	# warning for proxy_balancer and missing load balancing scheduler
201
+	if use apache2_modules_proxy_balancer; then
202
+		local lbset=
203
+		for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
204
+			if use "apache2_modules_${mod}"; then
205
+				lbset=1 && break
206
+			fi
207
+		done
208
+		if [ ! $lbset ]; then
209
+			echo
210
+			ewarn "Info: Missing load balancing scheduler algorithm module"
211
+			ewarn "(They were split off from proxy_balancer in 2.3)"
212
+			ewarn "In order to get the ability of load balancing, at least"
213
+			ewarn "one of these modules has to be present:"
214
+			ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
215
+			echo
216
+		fi
217
+	fi
218
+}