Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 292132
Collapse All | Expand All

(-)php-5.2.11.ebuild.old (-1 / +4 lines)
Lines 18-25 Link Here
18
MY_PHP_PV="${PV}"
18
MY_PHP_PV="${PV}"
19
MY_PHP_P="php-${MY_PHP_PV}"
19
MY_PHP_P="php-${MY_PHP_PV}"
20
PHP_PACKAGE="1"
20
PHP_PACKAGE="1"
21
22
# php patch settings, general
21
# php patch settings, general
22
PHP_PATCHSET_URI="http://dev.gentoo.org/~cla/distfiles/php-patchset-${PVR}.tar.bz2"
23
PHP_PATCHSET_REV="${PR/r/}"
23
PHP_PATCHSET_REV="${PR/r/}"
24
PHP_PATCHSET_REV="${PHP_PATCHSET_REV/2/1}"
24
PHP_PATCHSET_REV="${PHP_PATCHSET_REV/2/1}"
25
SUHOSIN_PATCH="suhosin-patch-${MY_PHP_PV}-0.9.7.patch.gz"
25
SUHOSIN_PATCH="suhosin-patch-${MY_PHP_PV}-0.9.7.patch.gz"
Lines 161-166 Link Here
161
		use kolab && epatch "${WORKDIR}/${KOLAB_PATCH}"
161
		use kolab && epatch "${WORKDIR}/${KOLAB_PATCH}"
162
	fi
162
	fi
163
163
164
	# Security bug #292132
165
	epatch "${WORKDIR}"/${MY_PHP_PV}/gd-maxcolors.patch
166
164
	# pretend to not have flex, bug 221357
167
	# pretend to not have flex, bug 221357
165
	sed -re 's:( +)PHP_SUBST\(LEX\):\1LEX="exit 0;"\n\0:' -i acinclude.m4
168
	sed -re 's:( +)PHP_SUBST\(LEX\):\1LEX="exit 0;"\n\0:' -i acinclude.m4
166
169
(-)../../eclass/php5_2-sapi.eclass (-1 / +5 lines)
Lines 147-153 Link Here
147
# @ECLASS-VARIABLE: PHP_PATCHSET_REV
147
# @ECLASS-VARIABLE: PHP_PATCHSET_REV
148
# @DESCRIPTION:
148
# @DESCRIPTION:
149
# Provides PHP patchsets support.
149
# Provides PHP patchsets support.
150
SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-patchset-${MY_PHP_PV}-r${PHP_PATCHSET_REV}.tar.bz2"
150
if [[ ! -n ${PHP_PATCHSET_URI} ]]; then
151
	SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-patchset-${MY_PHP_PV}-r${PHP_PATCHSET_REV}.tar.bz2"
152
else
153
	SRC_URI="${SRC_URI} ${PHP_PATCHSET_URI}"
154
fi
151
155
152
# @ECLASS-VARIABLE: SUHOSIN_PATCH
156
# @ECLASS-VARIABLE: SUHOSIN_PATCH
153
# @DESCRIPTION:
157
# @DESCRIPTION:

Return to bug 292132