Browse code

apacheupdate for noip/ecc patches

Hanno Böck authored on 20/04/2012 11:55:49
Showing 3 changed files
... ...
@@ -1,3 +1,4 @@
1
+AUX 2.2.22-envvars-std.in 1071 RMD160 4613555ac600a4941ccd43128f98a9f6a95ba57d SHA1 b69dc500bb49fb14c801c6ab130a624c24e4d7fa SHA256 1721b424f2335640e49d71e671a4be15424d29fe90f55fe4f52bd241a998d3ee
1 2
 AUX apache-noip.diff 417 RMD160 8e16f7ff130cea52449a25aafbbdeb78919d9eae SHA1 7c19a0236e4eff23bee6e69ee6708a24529a974c SHA256 c9ed84fec20e69f711600261a395a3d4b3ae2685318f6354c4d2ebd01c0ec4cc
2 3
 AUX apache-tlsext-workaround.diff 395 RMD160 c756f0e935e4392d44c57a202fd73af173b3b9b2 SHA1 f9619250609d4bd1bddc3e28e23f61cfedb93c09 SHA256 ee0b535bc401ae6b4028d4fa238198f067cacab936d69596c4d8b4ca1ea23619
3 4
 AUX httpd-2.2.16-ecc.diff 8236 RMD160 604f1124c168805b7702a6ca4a26ee7004fbab0b SHA1 3badbccc36c21710ef1c60f47963bcc631c00917 SHA256 e7fe97852875de06372d8413248fa20419946e2ab7de5198c93bffa6b5a68461
... ...
@@ -18,4 +19,5 @@ EBUILD apache-2.2.17.ebuild 2800 RMD160 c2aa5d7da738e45373e0cc7339e413bad3557e5a
18 19
 EBUILD apache-2.2.20.ebuild 2787 RMD160 33bcf018695ad8e6ce3beca2e1ce1479b7839f5a SHA1 5cb5d1cc61539e4c1bcb55fee6f5dff3b417bae4 SHA256 85f904c57696b368656837e5b195f8b2210ac703103d1a46ce7801f9983cd9ef
19 20
 EBUILD apache-2.2.21-r1.ebuild 2878 RMD160 aebdac0ad671ac05b1c7bf112a4a4e855012608a SHA1 d0ec2d7e7c4ffa517e6f7102886363f493e4b48c SHA256 e492085938fba74ae3e623f4bc8916986a0260db7666db3dee6fbcdcef71d8d2
20 21
 EBUILD apache-2.2.21.ebuild 2783 RMD160 18b86737a93ad332064e358b4078fea9c078c301 SHA1 7c8c3ac29b59c08823971f663bb4fde46ec9f3f6 SHA256 6695358dcc6ff20aec9508aaa2dca7df1fcbca92250df269a5b810b4dd129e75
22
+EBUILD apache-2.2.22-r1.ebuild 3144 RMD160 c5130c8c6edc5d684048e500d76c440dcf9ed9ef SHA1 1023434f888861822c5095e728b27c966c82b335 SHA256 be789e723540f07ade3e701ea285ce2f7a88c08f191704929eecbcfc4f12d5c2
21 23
 EBUILD apache-2.2.22.ebuild 3001 RMD160 aa73c429658766b1ff9361259939794d8f267d78 SHA1 03d45671feb3621197c4a7c3d2e5550df7386db5 SHA256 cf930cea2f7e8a8bd2f7cabe7de9ecf56efb33d10bd3fe2d70acaa6e86cebb0c
22 24
new file mode 100644
... ...
@@ -0,0 +1,112 @@
1
+# Copyright 1999-2012 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.2.22-r1.ebuild,v 1.1 2012/04/20 04:22:46 patrick Exp $
4
+
5
+EAPI="2"
6
+
7
+# latest gentoo apache files
8
+GENTOO_PATCHSTAMP="20120213"
9
+GENTOO_DEVELOPER="jmbsvicetto"
10
+GENTOO_PATCHNAME="gentoo-apache-2.2.22"
11
+
12
+# IUSE/USE_EXPAND magic
13
+IUSE_MPMS_FORK="itk peruser prefork"
14
+IUSE_MPMS_THREAD="event worker"
15
+
16
+IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon
17
+authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default
18
+authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta
19
+charset_lite cgi cgid dav dav_fs dav_lock dbd deflate dir disk_cache dumpio
20
+env expires ext_filter file_cache filter headers ident imagemap include info
21
+log_config log_forensic logio mem_cache mime mime_magic negotiation proxy
22
+proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi rewrite
23
+reqtimeout setenvif speling status substitute unique_id userdir usertrack
24
+version vhost_alias"
25
+# The following are also in the source as of this version, but are not available
26
+# for user selection:
27
+# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
28
+# optional_fn_import optional_hook_export optional_hook_import
29
+
30
+# inter-module dependencies
31
+# TODO: this may still be incomplete
32
+MODULE_DEPENDS="
33
+	dav_fs:dav
34
+	dav_lock:dav
35
+	deflate:filter
36
+	disk_cache:cache
37
+	ext_filter:filter
38
+	file_cache:cache
39
+	log_forensic:log_config
40
+	logio:log_config
41
+	mem_cache:cache
42
+	mime_magic:mime
43
+	proxy_ajp:proxy
44
+	proxy_balancer:proxy
45
+	proxy_connect:proxy
46
+	proxy_ftp:proxy
47
+	proxy_http:proxy
48
+	proxy_scgi:proxy
49
+	substitute:filter
50
+"
51
+
52
+# module<->define mappings
53
+MODULE_DEFINES="
54
+	auth_digest:AUTH_DIGEST
55
+	authnz_ldap:AUTHNZ_LDAP
56
+	cache:CACHE
57
+	dav:DAV
58
+	dav_fs:DAV
59
+	dav_lock:DAV
60
+	disk_cache:CACHE
61
+	file_cache:CACHE
62
+	info:INFO
63
+	ldap:LDAP
64
+	mem_cache:CACHE
65
+	proxy:PROXY
66
+	proxy_ajp:PROXY
67
+	proxy_balancer:PROXY
68
+	proxy_connect:PROXY
69
+	proxy_ftp:PROXY
70
+	proxy_http:PROXY
71
+	ssl:SSL
72
+	status:STATUS
73
+	suexec:SUEXEC
74
+	userdir:USERDIR
75
+"
76
+
77
+# critical modules for the default config
78
+MODULE_CRITICAL="
79
+	authz_host
80
+	dir
81
+	mime
82
+"
83
+
84
+inherit apache-2
85
+
86
+DESCRIPTION="The Apache Web Server."
87
+HOMEPAGE="http://httpd.apache.org/"
88
+
89
+# some helper scripts are Apache-1.1, thus both are here
90
+LICENSE="Apache-2.0 Apache-1.1"
91
+SLOT="2"
92
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
93
+IUSE=""
94
+
95
+DEPEND="${DEPEND}
96
+	>=dev-libs/openssl-0.9.8m
97
+	apache2_modules_deflate? ( sys-libs/zlib )"
98
+
99
+# dependency on >=dev-libs/apr-1.4.5 for bug #368651
100
+RDEPEND="${RDEPEND}
101
+	>=dev-libs/apr-1.4.5
102
+	>=dev-libs/openssl-0.9.8m
103
+	apache2_modules_mime? ( app-misc/mime-types )"
104
+
105
+# init script fixup - should be rolled into next tarball #389965
106
+src_prepare() {
107
+	epatch "${FILESDIR}"/apache-noip.diff
108
+	epatch "${FILESDIR}"/httpd-2.2.16-ecc.diff
109
+	apache-2_src_prepare
110
+	sed -i -e 's/! test -f/test -f/' "${GENTOO_PATCHDIR}"/init/apache2.initd || die "Failed to fix init script"
111
+	cp ${FILESDIR}/2.2.22-envvars-std.in ${S}/support/envvars-std.in || die "Failed to apply LD_PRELOAD fix"
112
+}
0 113
new file mode 100644
... ...
@@ -0,0 +1,28 @@
1
+# Licensed to the Apache Software Foundation (ASF) under one or more
2
+# contributor license agreements.  See the NOTICE file distributed with
3
+# this work for additional information regarding copyright ownership.
4
+# The ASF licenses this file to You under the Apache License, Version 2.0
5
+# (the "License"); you may not use this file except in compliance with
6
+# the License.  You may obtain a copy of the License at
7
+#
8
+#     http://www.apache.org/licenses/LICENSE-2.0
9
+#
10
+# Unless required by applicable law or agreed to in writing, software
11
+# distributed under the License is distributed on an "AS IS" BASIS,
12
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
+# See the License for the specific language governing permissions and
14
+# limitations under the License.
15
+#
16
+#
17
+# envvars-std - default environment variables for apachectl
18
+#
19
+# This file is generated from envvars-std.in
20
+#
21
+if test "x$@SHLIBPATH_VAR@" != "x" ; then
22
+  @SHLIBPATH_VAR@="@exp_libdir@:$@SHLIBPATH_VAR@"
23
+else
24
+  @SHLIBPATH_VAR@="@exp_libdir@"
25
+fi
26
+export @SHLIBPATH_VAR@
27
+#
28
+@OS_SPECIFIC_VARS@