1 |
mabi 11/01/29 22:05:22 |
2 |
|
3 |
Modified: ChangeLog php-5.2.17.ebuild |
4 |
Added: php-5.3.5-r1.ebuild |
5 |
Log: |
6 |
fixed bugs #327049 (phar locale failure), #348567 (crypt_r typo), #352560 (suhosin caused circular dep), #329071 (disable phpize autoconf checks) |
7 |
|
8 |
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.467 dev-lang/php/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.467&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.467&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?r1=1.466&r2=1.467 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v |
20 |
retrieving revision 1.466 |
21 |
retrieving revision 1.467 |
22 |
diff -u -r1.466 -r1.467 |
23 |
--- ChangeLog 11 Jan 2011 19:20:11 -0000 1.466 |
24 |
+++ ChangeLog 29 Jan 2011 22:05:22 -0000 1.467 |
25 |
@@ -1,6 +1,13 @@ |
26 |
# ChangeLog for dev-lang/php |
27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.466 2011/01/11 19:20:11 jer Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.467 2011/01/29 22:05:22 mabi Exp $ |
30 |
+ |
31 |
+*php-5.3.5-r1 (29 Jan 2011) |
32 |
+ |
33 |
+ 29 Jan 2011; Matti Bickel <mabi@g.o> php-5.2.17.ebuild, |
34 |
+ +php-5.3.5-r1.ebuild: |
35 |
+ fixed bugs #327049 (phar locale failure), #348567 (crypt_r typo), #352560 |
36 |
+ (suhosin caused circular dep), #329071 (disable phpize autoconf checks) |
37 |
|
38 |
11 Jan 2011; Jeroen Roovers <jer@g.o> php-5.2.17.ebuild, |
39 |
php-5.3.5.ebuild: |
40 |
|
41 |
|
42 |
|
43 |
1.8 dev-lang/php/php-5.2.17.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.2.17.ebuild?rev=1.8&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.2.17.ebuild?rev=1.8&content-type=text/plain |
47 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.2.17.ebuild?r1=1.7&r2=1.8 |
48 |
|
49 |
Index: php-5.2.17.ebuild |
50 |
=================================================================== |
51 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.17.ebuild,v |
52 |
retrieving revision 1.7 |
53 |
retrieving revision 1.8 |
54 |
diff -u -r1.7 -r1.8 |
55 |
--- php-5.2.17.ebuild 11 Jan 2011 19:20:11 -0000 1.7 |
56 |
+++ php-5.2.17.ebuild 29 Jan 2011 22:05:22 -0000 1.8 |
57 |
@@ -1,6 +1,6 @@ |
58 |
# Copyright 1999-2011 Gentoo Foundation |
59 |
# Distributed under the terms of the GNU General Public License v2 |
60 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.17.ebuild,v 1.7 2011/01/11 19:20:11 jer Exp $ |
61 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.17.ebuild,v 1.8 2011/01/29 22:05:22 mabi Exp $ |
62 |
|
63 |
EAPI=2 |
64 |
|
65 |
@@ -228,7 +228,7 @@ |
66 |
json? ( !dev-php${PHP_MV}/pecl-json ) |
67 |
zip? ( !dev-php${PHP_MV}/pecl-zip )" |
68 |
|
69 |
-[[ -n $SUHOSIN_VERSION ]] && DEPEND="${DEPEND} suhosin? ( $php[unicode] )" |
70 |
+[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? ( $php[unicode] )" |
71 |
|
72 |
DEPEND="${DEPEND} |
73 |
sys-devel/flex |
74 |
|
75 |
|
76 |
|
77 |
1.1 dev-lang/php/php-5.3.5-r1.ebuild |
78 |
|
79 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.5-r1.ebuild?rev=1.1&view=markup |
80 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.5-r1.ebuild?rev=1.1&content-type=text/plain |
81 |
|
82 |
Index: php-5.3.5-r1.ebuild |
83 |
=================================================================== |
84 |
# Copyright 1999-2011 Gentoo Foundation |
85 |
# Distributed under the terms of the GNU General Public License v2 |
86 |
# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.5-r1.ebuild,v 1.1 2011/01/29 22:05:22 mabi Exp $ |
87 |
|
88 |
EAPI=2 |
89 |
|
90 |
PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob interbase oci8 sapdb solid" |
91 |
|
92 |
inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool |
93 |
|
94 |
SUHOSIN_VERSION="5.3.4-0.9.10" |
95 |
FPM_VERSION="builtin" |
96 |
EXPECTED_TEST_FAILURES="" |
97 |
|
98 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" |
99 |
|
100 |
function php_get_uri () |
101 |
{ |
102 |
case "${1}" in |
103 |
"php-pre") |
104 |
echo "http://downloads.php.net/johannes/${2}" |
105 |
;; |
106 |
"php") |
107 |
echo "http://www.php.net/distributions/${2}" |
108 |
;; |
109 |
"suhosin") |
110 |
echo "http://download.suhosin.org/${2}" |
111 |
;; |
112 |
"olemarkus") |
113 |
echo "http://olemarkus.org/~olemarkus/gentoo/${2}" |
114 |
;; |
115 |
"gentoo") |
116 |
echo "mirror://gentoo/${2}" |
117 |
;; |
118 |
*) |
119 |
die "unhandled case in php_get_uri" |
120 |
;; |
121 |
esac |
122 |
} |
123 |
|
124 |
PHP_MV="$(get_major_version)" |
125 |
|
126 |
# alias, so we can handle different types of releases (finals, rcs, alphas, |
127 |
# betas, ...) w/o changing the whole ebuild |
128 |
PHP_PV="${PV/_rc/RC}" |
129 |
PHP_RELEASE="php" |
130 |
PHP_P="${PN}-${PHP_PV}" |
131 |
|
132 |
PHP_PATCHSET_LOC="gentoo" |
133 |
|
134 |
PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" |
135 |
|
136 |
PHP_PATCHSET="1" |
137 |
PHP_PATCHSET_URI=" |
138 |
$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")" |
139 |
|
140 |
if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then |
141 |
# in some cases we use our own suhosin patch (very recent version, |
142 |
# patch conflicts, etc.) |
143 |
SUHOSIN_TYPE="gentoo" |
144 |
else |
145 |
SUHOSIN_TYPE="suhosin" |
146 |
fi |
147 |
|
148 |
if [[ -n ${SUHOSIN_VERSION} ]]; then |
149 |
SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; |
150 |
SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" |
151 |
fi |
152 |
|
153 |
SRC_URI=" |
154 |
${PHP_SRC_URI} |
155 |
${PHP_PATCHSET_URI}" |
156 |
|
157 |
if [[ -n ${SUHOSIN_VERSION} ]]; then |
158 |
SRC_URI="${SRC_URI} |
159 |
suhosin? ( ${SUHOSIN_URI} )" |
160 |
fi |
161 |
|
162 |
DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." |
163 |
HOMEPAGE="http://php.net/" |
164 |
LICENSE="PHP-3" |
165 |
|
166 |
SLOT="$(get_version_component_range 1-2)" |
167 |
S="${WORKDIR}/${PHP_P}" |
168 |
|
169 |
# We can build the following SAPIs in the given order |
170 |
SAPIS="cli cgi fpm embed apache2" |
171 |
|
172 |
# Gentoo-specific, common features |
173 |
IUSE="kolab" |
174 |
|
175 |
# SAPIs and SAPI-specific USE flags (cli SAPI is default on): |
176 |
IUSE="${IUSE} |
177 |
${SAPIS/cli/+cli} |
178 |
threads" |
179 |
|
180 |
IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk |
181 |
crypt +ctype curl curlwrappers db2 dbmaker debug doc empress |
182 |
empress-bcs enchant esoob exif frontbase +fileinfo +filter firebird |
183 |
flatfile ftp gd gd-external gdbm gmp +hash +iconv imap inifile |
184 |
interbase intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash |
185 |
mssql mysql mysqlnd mysqli nls oci8 |
186 |
oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm |
187 |
readline recode sapdb +session sharedext sharedmem |
188 |
+simplexml snmp soap sockets solid spell sqlite sqlite3 ssl |
189 |
sybase-ct sysvipc tidy +tokenizer truetype unicode wddx |
190 |
xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" |
191 |
|
192 |
# Enable suhosin if available |
193 |
[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" |
194 |
|
195 |
DEPEND="!dev-lang/php:5 |
196 |
>=app-admin/eselect-php-0.6.2 |
197 |
>=dev-libs/libpcre-7.9[unicode] |
198 |
adabas? ( >=dev-db/unixODBC-1.8.13 ) |
199 |
apache2? ( www-servers/apache[threads=] ) |
200 |
berkdb? ( =sys-libs/db-4* ) |
201 |
birdstep? ( >=dev-db/unixODBC-1.8.13 ) |
202 |
bzip2? ( app-arch/bzip2 ) |
203 |
cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) |
204 |
cjk? ( !gd? ( !gd-external? ( |
205 |
virtual/jpeg |
206 |
media-libs/libpng |
207 |
sys-libs/zlib |
208 |
) ) ) |
209 |
crypt? ( >=dev-libs/libmcrypt-2.4 ) |
210 |
curl? ( >=net-misc/curl-7.10.5 ) |
211 |
db2? ( >=dev-db/unixODBC-1.8.13 ) |
212 |
dbmaker? ( >=dev-db/unixODBC-1.8.13 ) |
213 |
empress? ( >=dev-db/unixODBC-1.8.13 ) |
214 |
empress-bcs? ( >=dev-db/unixODBC-1.8.13 ) |
215 |
enchant? ( app-text/enchant ) |
216 |
esoob? ( >=dev-db/unixODBC-1.8.13 ) |
217 |
exif? ( !gd? ( !gd-external? ( |
218 |
virtual/jpeg |
219 |
media-libs/libpng |
220 |
sys-libs/zlib |
221 |
) ) ) |
222 |
firebird? ( dev-db/firebird ) |
223 |
fpm? ( >=dev-libs/libevent-1.4.12 ) |
224 |
gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) |
225 |
gd-external? ( media-libs/gd ) |
226 |
gdbm? ( >=sys-libs/gdbm-1.8.0 ) |
227 |
gmp? ( >=dev-libs/gmp-4.1.2 ) |
228 |
iconv? ( virtual/libiconv ) |
229 |
imap? ( virtual/imap-c-client ) |
230 |
intl? ( dev-libs/icu ) |
231 |
iodbc? ( dev-db/libiodbc ) |
232 |
kerberos? ( virtual/krb5 ) |
233 |
kolab? ( >=net-libs/c-client-2004g-r1 ) |
234 |
ldap? ( !oci8? ( >=net-nds/openldap-1.2.11 ) ) |
235 |
ldap-sasl? ( !oci8? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) ) |
236 |
libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) |
237 |
mssql? ( dev-db/freetds[mssql] ) |
238 |
!mysqlnd? ( |
239 |
mysql? ( virtual/mysql ) |
240 |
mysqli? ( >=virtual/mysql-4.1 ) |
241 |
) |
242 |
nls? ( sys-devel/gettext ) |
243 |
oci8-instant-client? ( dev-db/oracle-instantclient-basic ) |
244 |
odbc? ( >=dev-db/unixODBC-1.8.13 ) |
245 |
postgres? ( dev-db/postgresql-base ) |
246 |
qdbm? ( dev-db/qdbm ) |
247 |
readline? ( sys-libs/readline ) |
248 |
recode? ( app-text/recode ) |
249 |
sapdb? ( >=dev-db/unixODBC-1.8.13 ) |
250 |
sharedmem? ( dev-libs/mm ) |
251 |
simplexml? ( >=dev-libs/libxml2-2.6.8 ) |
252 |
snmp? ( >=net-analyzer/net-snmp-5.2 ) |
253 |
soap? ( >=dev-libs/libxml2-2.6.8 ) |
254 |
solid? ( >=dev-db/unixODBC-1.8.13 ) |
255 |
spell? ( >=app-text/aspell-0.50 ) |
256 |
sqlite? ( =dev-db/sqlite-2* pdo? ( =dev-db/sqlite-3* ) ) |
257 |
sqlite3? ( =dev-db/sqlite-3* ) |
258 |
ssl? ( >=dev-libs/openssl-0.9.7 ) |
259 |
sybase-ct? ( dev-db/freetds ) |
260 |
tidy? ( app-text/htmltidy ) |
261 |
truetype? ( |
262 |
=media-libs/freetype-2* |
263 |
>=media-libs/t1lib-5.0.0 |
264 |
!gd? ( !gd-external? ( |
265 |
virtual/jpeg media-libs/libpng sys-libs/zlib ) ) |
266 |
) |
267 |
unicode? ( dev-libs/oniguruma ) |
268 |
wddx? ( >=dev-libs/libxml2-2.6.8 ) |
269 |
xml? ( >=dev-libs/libxml2-2.6.8 ) |
270 |
xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) |
271 |
xmlreader? ( >=dev-libs/libxml2-2.6.8 ) |
272 |
xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) |
273 |
xpm? ( |
274 |
x11-libs/libXpm |
275 |
virtual/jpeg |
276 |
media-libs/libpng sys-libs/zlib |
277 |
) |
278 |
xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) |
279 |
zip? ( sys-libs/zlib ) |
280 |
zlib? ( sys-libs/zlib ) |
281 |
virtual/mta |
282 |
" |
283 |
|
284 |
php="=${CATEGORY}/${PF}" |
285 |
RDEPEND="${DEPEND} |
286 |
truetype? ( || ( $php[gd] $php[gd-external] ) ) |
287 |
cjk? ( || ( $php[gd] $php[gd-external] ) ) |
288 |
exif? ( || ( $php[gd] $php[gd-external] ) ) |
289 |
|
290 |
xpm? ( $php[gd] ) |
291 |
gd? ( $php[zlib,-gd-external] ) |
292 |
gd-external? ( $php[-gd] ) |
293 |
simplexml? ( $php[xml] ) |
294 |
soap? ( $php[xml] ) |
295 |
wddx? ( $php[xml] ) |
296 |
xmlrpc? ( || ( $php[xml] $php[iconv] ) ) |
297 |
xmlreader? ( $php[xml] ) |
298 |
xsl? ( $php[xml] ) |
299 |
ldap-sasl? ( $php[ldap,-oci8] ) |
300 |
adabas? ( $php[odbc] ) |
301 |
birdstep? ( $php[odbc] ) |
302 |
dbmaker? ( $php[odbc] ) |
303 |
empress-bcs? ( $php[empress] ) |
304 |
empress? ( $php[odbc] ) |
305 |
esoob? ( $php[odbc] ) |
306 |
db2? ( $php[odbc] ) |
307 |
sapdb? ( $php[odbc] ) |
308 |
solid? ( $php[odbc] ) |
309 |
kolab? ( $php[imap] ) |
310 |
mhash? ( $php[hash] ) |
311 |
phar? ( $php[hash] ) |
312 |
mysqlnd? ( || ( |
313 |
$php[mysql] |
314 |
$php[mysqli] |
315 |
$php[pdo] |
316 |
) ) |
317 |
|
318 |
oci8? ( $php[-oci8-instant-client,-ldap-sasl] ) |
319 |
oci8-instant-client? ( $php[-oci8] ) |
320 |
|
321 |
qdbm? ( $php[-gdbm] ) |
322 |
readline? ( $php[-libedit] ) |
323 |
recode? ( $php[-imap,-mysql,-mysqli] ) |
324 |
firebird? ( $php[-interbase] ) |
325 |
sharedmem? ( $php[-threads] ) |
326 |
|
327 |
!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( $php[cli] ) ) ) ) ) |
328 |
|
329 |
enchant? ( !dev-php${PHP_MV}/pecl-enchant ) |
330 |
fileinfo? ( !<dev-php${PHP_MV}/pecl-fileinfo-1.0.4-r2 ) |
331 |
filter? ( !dev-php${PHP_MV}/pecl-filter ) |
332 |
json? ( !dev-php${PHP_MV}/pecl-json ) |
333 |
phar? ( !dev-php${PHP_MV}/pecl-phar ) |
334 |
zip? ( !dev-php${PHP_MV}/pecl-zip )" |
335 |
|
336 |
[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? ( |
337 |
=${CATEGORY}/${PN}-${SLOT}*[unicode] )" |
338 |
|
339 |
DEPEND="${DEPEND} |
340 |
sys-devel/flex |
341 |
>=sys-devel/m4-1.4.3 |
342 |
>=sys-devel/libtool-1.5.18" |
343 |
|
344 |
# They are in PDEPEND because we need PHP installed first! |
345 |
PDEPEND="doc? ( app-doc/php-docs )" |
346 |
|
347 |
[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )" |
348 |
|
349 |
# Portage doesn't support setting PROVIDE based on the USE flags that |
350 |
# have been enabled, so we have to PROVIDE everything for now and hope |
351 |
# for the best |
352 |
PROVIDE="virtual/php" |
353 |
|
354 |
# Allow users to install production version if they want to |
355 |
|
356 |
case "${PHP_INI_VERSION}" in |
357 |
production|development) |
358 |
;; |
359 |
*) |
360 |
PHP_INI_VERSION="development" |
361 |
;; |
362 |
esac |
363 |
|
364 |
PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}" |
365 |
PHP_INI_FILE="php.ini" |
366 |
|
367 |
want_apache |
368 |
|
369 |
# eblit-core |
370 |
# Usage: <function> [version] [eval] |
371 |
# Main eblit engine |
372 |
eblit-core() { |
373 |
[[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files" |
374 |
local e v func=$1 ver=$2 eval_=$3 |
375 |
for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do |
376 |
e="${FILESDIR}/eblits/${func}${v}.eblit" |
377 |
if [[ -e ${e} ]] ; then |
378 |
. "${e}" |
379 |
[[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }" |
380 |
return 0 |
381 |
fi |
382 |
done |
383 |
return 1 |
384 |
} |
385 |
|
386 |
# eblit-include |
387 |
# Usage: [--skip] <function> [version] |
388 |
# Includes an "eblit" -- a chunk of common code among ebuilds in a given |
389 |
# package so that its functions can be sourced and utilized within the |
390 |
# ebuild. |
391 |
eblit-include() { |
392 |
local skipable=false r=0 |
393 |
[[ $1 == "--skip" ]] && skipable=true && shift |
394 |
[[ $1 == pkg_* ]] && skipable=true |
395 |
|
396 |
[[ -z $1 ]] && die "Usage: eblit-include <function> [version]" |
397 |
eblit-core $1 $2 |
398 |
r="$?" |
399 |
${skipable} && return 0 |
400 |
[[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/" |
401 |
} |
402 |
|
403 |
# eblit-run-maybe |
404 |
# Usage: <function> |
405 |
# Runs a function if it is defined in an eblit |
406 |
eblit-run-maybe() { |
407 |
[[ $(type -t "$@") == "function" ]] && "$@" |
408 |
} |
409 |
|
410 |
# eblit-run |
411 |
# Usage: <function> [version] |
412 |
# Runs a function defined in an eblit |
413 |
eblit-run() { |
414 |
eblit-include --skip common "${*:2}" |
415 |
eblit-include "$@" |
416 |
eblit-run-maybe eblit-$1-pre |
417 |
eblit-${PN}-$1 |
418 |
eblit-run-maybe eblit-$1-post |
419 |
} |
420 |
|
421 |
# eblit-pkg |
422 |
# Usage: <phase> [version] |
423 |
# Includes the given functions AND evals them so they're included in the binpkgs |
424 |
eblit-pkg() { |
425 |
[[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]" |
426 |
eblit-core $1 $2 1 |
427 |
} |
428 |
|
429 |
eblit-pkg pkg_setup v2 |
430 |
|
431 |
src_prepare() { eblit-run src_prepare v2 ; } |
432 |
src_configure() { eblit-run src_configure v2 ; } |
433 |
src_compile() { eblit-run src_compile v1 ; } |
434 |
src_install() { eblit-run src_install v2 ; } |
435 |
src_test() { eblit-run src_test v1 ; } |
436 |
pkg_postinst() { eblit-run pkg_postinst v2 ; } |