summaryrefslogtreecommitdiffstats
path: root/package/php/php-no-iconv-search.patch
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2012-05-21 01:17:54 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2012-05-21 13:30:52 +0200
commitaeb9350cfbd2f4675f0d095394660cc0c2cc0d7b (patch)
tree48a3dca4d60ecf863fb04e5eb322af8f6f216451 /package/php/php-no-iconv-search.patch
parent360f0e40f0725bb1b195737a3f7b0b56ba3087b3 (diff)
downloadbuildroot-novena-aeb9350cfbd2f4675f0d095394660cc0c2cc0d7b.tar.gz
buildroot-novena-aeb9350cfbd2f4675f0d095394660cc0c2cc0d7b.zip
php: security bump to version 5.3.13 and enhance
Bump php to version 5.3.13 to solve multiple CVEs. The 5.2 series is no longer maintained. The PCRE and SPL extensions are no longer optional. Reflection is no longer optional either. Ncurses was spun out to PECL. Add a ton of new extensions and give more granular options on others (like the libxml2-based ones). The FastCGI option no longer exists, it's always on as long as CGI is. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/php/php-no-iconv-search.patch')
-rw-r--r--package/php/php-no-iconv-search.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/package/php/php-no-iconv-search.patch b/package/php/php-no-iconv-search.patch
new file mode 100644
index 000000000..d1e924b1a
--- /dev/null
+++ b/package/php/php-no-iconv-search.patch
@@ -0,0 +1,21 @@
+Don't push LDFLAGS/CFLAGS for iconv.
+Just assume they're covered somewhere else.
+Otherwise we get -L/usr/lib and -I/usr/include search paths with uClibc
+internal iconv support, which breaks things.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura php-5.3.13/configure php-5.3.13-iconv/configure
+--- php-5.3.13/configure 2012-05-08 06:41:23.000000000 -0300
++++ php-5.3.13-iconv/configure 2012-05-18 22:18:21.313975849 -0300
+@@ -47885,8 +47885,8 @@
+ PHP_ICONV_PREFIX="$ICONV_DIR"
+ fi
+
+- CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS"
+- LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS"
++ #CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS"
++ #LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS"
+
+ if test -r "$PHP_ICONV_PREFIX/include/giconv.h"; then
+ PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h"