| 1 |
polynomial-c 13/11/07 14:56:35 |
| 2 |
|
| 3 |
Modified: ChangeLog apache-2.4.6-r1.ebuild |
| 4 |
apache-2.2.25.ebuild apache-2.4.6-r2.ebuild |
| 5 |
Removed: apache-2.4.4.ebuild apache-2.4.4-r3.ebuild |
| 6 |
apache-2.2.24-r1.ebuild apache-2.4.6.ebuild |
| 7 |
Log: |
| 8 |
Fixed problems with init script. Removed some older ebuilds |
| 9 |
|
| 10 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC) |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.248 www-servers/apache/ChangeLog |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?rev=1.248&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?rev=1.248&content-type=text/plain |
| 17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?r1=1.247&r2=1.248 |
| 18 |
|
| 19 |
Index: ChangeLog |
| 20 |
=================================================================== |
| 21 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v |
| 22 |
retrieving revision 1.247 |
| 23 |
retrieving revision 1.248 |
| 24 |
diff -u -r1.247 -r1.248 |
| 25 |
--- ChangeLog 8 Aug 2013 12:36:59 -0000 1.247 |
| 26 |
+++ ChangeLog 7 Nov 2013 14:56:34 -0000 1.248 |
| 27 |
@@ -1,6 +1,13 @@ |
| 28 |
# ChangeLog for www-servers/apache |
| 29 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 30 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.247 2013/08/08 12:36:59 ago Exp $ |
| 31 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.248 2013/11/07 14:56:34 polynomial-c Exp $ |
| 32 |
+ |
| 33 |
+ 07 Nov 2013; Lars Wendler <polynomial-c@g.o> -apache-2.2.24-r1.ebuild, |
| 34 |
+ apache-2.2.25.ebuild, -apache-2.4.4.ebuild, -apache-2.4.4-r3.ebuild, |
| 35 |
+ -apache-2.4.6.ebuild, apache-2.4.6-r1.ebuild, apache-2.4.6-r2.ebuild, |
| 36 |
+ +files/gentoo-apache-2.2.23-initd_fixups.patch: |
| 37 |
+ Non-maintainer commit: Fixed problems with init script. Removed some older |
| 38 |
+ ebuilds. |
| 39 |
|
| 40 |
08 Aug 2013; Agostino Sarubbo <ago@g.o> apache-2.2.25.ebuild: |
| 41 |
Stable for sh, wrt bug #476568 |
| 42 |
|
| 43 |
|
| 44 |
|
| 45 |
1.3 www-servers/apache/apache-2.4.6-r1.ebuild |
| 46 |
|
| 47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.6-r1.ebuild?rev=1.3&view=markup |
| 48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.6-r1.ebuild?rev=1.3&content-type=text/plain |
| 49 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.6-r1.ebuild?r1=1.2&r2=1.3 |
| 50 |
|
| 51 |
Index: apache-2.4.6-r1.ebuild |
| 52 |
=================================================================== |
| 53 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.6-r1.ebuild,v |
| 54 |
retrieving revision 1.2 |
| 55 |
retrieving revision 1.3 |
| 56 |
diff -u -r1.2 -r1.3 |
| 57 |
--- apache-2.4.6-r1.ebuild 28 Jul 2013 01:39:37 -0000 1.2 |
| 58 |
+++ apache-2.4.6-r1.ebuild 7 Nov 2013 14:56:35 -0000 1.3 |
| 59 |
@@ -1,6 +1,6 @@ |
| 60 |
# Copyright 1999-2013 Gentoo Foundation |
| 61 |
# Distributed under the terms of the GNU General Public License v2 |
| 62 |
-# $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 $ |
| 63 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.6-r1.ebuild,v 1.3 2013/11/07 14:56:35 polynomial-c Exp $ |
| 64 |
|
| 65 |
EAPI="2" |
| 66 |
|
| 67 |
@@ -145,7 +145,9 @@ |
| 68 |
cd "${S}" || die "Failed to cd to ${S}" |
| 69 |
fi |
| 70 |
apache-2_src_prepare |
| 71 |
- sed -i -e 's/! test -f/test -f/' "${GENTOO_PATCHDIR}"/init/apache2.initd || die "Failed to fix init script" |
| 72 |
+ pushd "${GENTOO_PATCHDIR}" &>/dev/null || die |
| 73 |
+ epatch "${FILESDIR}"/gentoo-apache-2.2.23-initd_fixups.patch |
| 74 |
+ popd &>/dev/null || die |
| 75 |
} |
| 76 |
|
| 77 |
src_install() { |
| 78 |
|
| 79 |
|
| 80 |
|
| 81 |
1.11 www-servers/apache/apache-2.2.25.ebuild |
| 82 |
|
| 83 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.2.25.ebuild?rev=1.11&view=markup |
| 84 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.2.25.ebuild?rev=1.11&content-type=text/plain |
| 85 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.2.25.ebuild?r1=1.10&r2=1.11 |
| 86 |
|
| 87 |
Index: apache-2.2.25.ebuild |
| 88 |
=================================================================== |
| 89 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.25.ebuild,v |
| 90 |
retrieving revision 1.10 |
| 91 |
retrieving revision 1.11 |
| 92 |
diff -u -r1.10 -r1.11 |
| 93 |
--- apache-2.2.25.ebuild 8 Aug 2013 12:36:59 -0000 1.10 |
| 94 |
+++ apache-2.2.25.ebuild 7 Nov 2013 14:56:35 -0000 1.11 |
| 95 |
@@ -1,6 +1,6 @@ |
| 96 |
# Copyright 1999-2013 Gentoo Foundation |
| 97 |
# Distributed under the terms of the GNU General Public License v2 |
| 98 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.25.ebuild,v 1.10 2013/08/08 12:36:59 ago Exp $ |
| 99 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.25.ebuild,v 1.11 2013/11/07 14:56:35 polynomial-c Exp $ |
| 100 |
|
| 101 |
EAPI="2" |
| 102 |
|
| 103 |
@@ -107,7 +107,9 @@ |
| 104 |
# init script fixup - should be rolled into next tarball #389965 |
| 105 |
src_prepare() { |
| 106 |
apache-2_src_prepare |
| 107 |
- sed -i -e 's/! test -f/test -f/' "${GENTOO_PATCHDIR}"/init/apache2.initd || die "Failed to fix init script" |
| 108 |
+ pushd "${GENTOO_PATCHDIR}" &>/dev/null || die |
| 109 |
+ epatch "${FILESDIR}"/gentoo-apache-2.2.23-initd_fixups.patch |
| 110 |
+ popd &>/dev/null || die |
| 111 |
cp "${FILESDIR}"/2.2.22-envvars-std.in "${S}"/support/envvars-std.in || die "Failed to apply LD_PRELOAD fix" |
| 112 |
} |
| 113 |
|
| 114 |
|
| 115 |
|
| 116 |
|
| 117 |
1.2 www-servers/apache/apache-2.4.6-r2.ebuild |
| 118 |
|
| 119 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.6-r2.ebuild?rev=1.2&view=markup |
| 120 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.6-r2.ebuild?rev=1.2&content-type=text/plain |
| 121 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.6-r2.ebuild?r1=1.1&r2=1.2 |
| 122 |
|
| 123 |
Index: apache-2.4.6-r2.ebuild |
| 124 |
=================================================================== |
| 125 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.6-r2.ebuild,v |
| 126 |
retrieving revision 1.1 |
| 127 |
retrieving revision 1.2 |
| 128 |
diff -u -r1.1 -r1.2 |
| 129 |
--- apache-2.4.6-r2.ebuild 1 Aug 2013 07:16:18 -0000 1.1 |
| 130 |
+++ apache-2.4.6-r2.ebuild 7 Nov 2013 14:56:35 -0000 1.2 |
| 131 |
@@ -1,6 +1,6 @@ |
| 132 |
# Copyright 1999-2013 Gentoo Foundation |
| 133 |
# Distributed under the terms of the GNU General Public License v2 |
| 134 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.6-r2.ebuild,v 1.1 2013/08/01 07:16:18 kensington Exp $ |
| 135 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.6-r2.ebuild,v 1.2 2013/11/07 14:56:35 polynomial-c Exp $ |
| 136 |
|
| 137 |
EAPI="2" |
| 138 |
|
| 139 |
@@ -145,7 +145,9 @@ |
| 140 |
cd "${S}" || die "Failed to cd to ${S}" |
| 141 |
fi |
| 142 |
apache-2_src_prepare |
| 143 |
- sed -i -e 's/! test -f/test -f/' "${GENTOO_PATCHDIR}"/init/apache2.initd || die "Failed to fix init script" |
| 144 |
+ pushd "${GENTOO_PATCHDIR}" &>/dev/null || die |
| 145 |
+ epatch "${FILESDIR}"/gentoo-apache-2.2.23-initd_fixups.patch |
| 146 |
+ popd &>/dev/null || die |
| 147 |
} |
| 148 |
|
| 149 |
src_install() { |
Archives