summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES6
-rw-r--r--package/php/php.mk2
2 files changed, 4 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index 311d90669..8f37e501d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,9 +9,9 @@
e2fsprogs, gstreamer, gperf, gst-plugins-bad, gvfs, flex, hal,
iptables, iw, jpeg, kismet, libfuse, libglib2, libpcap, libungif,
libxml2, libxslt, lighttpd, mesa, mpg123, mtd-utils, neon,
- netstat-nat, openvpn, pcre, qt, readline, rpm, sawman, sdl, sdl_ttf,
- ser2net, sqlite, sshfs, tremor, u-boot, usb_modeswitch, usbutils,
- webkit, wpa_supplicant, xfsprogs, zlib
+ netstat-nat, openvpn, pcre, php, qt, readline, rpm, sawman, sdl,
+ sdl_ttf, ser2net, sqlite, sshfs, tremor, u-boot, usb_modeswitch,
+ usbutils, webkit, wpa_supplicant, xfsprogs, zlib
Issues resolved (http://bugs.uclibc.org):
diff --git a/package/php/php.mk b/package/php/php.mk
index eaf39c36a..0747498f8 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -4,7 +4,7 @@
#
#############################################################
-PHP_VERSION = 5.2.11
+PHP_VERSION = 5.2.12
PHP_SOURCE = php-$(PHP_VERSION).tar.bz2
PHP_SITE = http://www.php.net/distributions
PHP_INSTALL_STAGING = YES