Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (d459a4dc876739a515e5875051a7fcdd94f50675)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (d459a4dc876739a515e5875051a7fcdd94f50675)
  • Date: Sun, 24 Mar 2013 08:32:43 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

php-pear/fileinfo/CONFLICTS | 6 ++++++
php-pear/fileinfo/HISTORY | 3 +++
php-pear/php/CONFLICTS | 9 ++++++++-
php-pear/php/DEPENDS | 10 +++++-----
php-pear/php/DETAILS | 17 +++++++++--------
php-pear/php/HISTORY | 7 +++++++
6 files changed, 38 insertions(+), 14 deletions(-)

New commits:
commit d459a4dc876739a515e5875051a7fcdd94f50675
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

fileinfo: added conflicts with PHP >=5.3

commit 3f0db8c120b87f7adaff8cab21f5241c2c80cbef
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

php: added conflicts with fileinfo for PHP >=5.3

commit 886f2aba11a7c499daec9d3a6b36e63cb758e6b3
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

php: removed icu dependency for branches older than 5.3

commit af3ff9b0f2f97ea3070ff41d54e6c00e5c9179c4
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

php: updated backports+security patches for legacy branch to 20130320

commit 47f7c43c3551e2c0ea21a72893bc2d1deafbfb5d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

php: => 5.3.23 (previous), 5.4.13 (stable) [security]

diff --git a/php-pear/fileinfo/CONFLICTS b/php-pear/fileinfo/CONFLICTS
new file mode 100755
index 0000000..fc3ae33
--- /dev/null
+++ b/php-pear/fileinfo/CONFLICTS
@@ -0,0 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
+# PHP >=5.3 includes fileinfo
+if spell_ok php && is_version_less 5.2.9999 $(installed_version php); then
+ conflicts php y
+fi
diff --git a/php-pear/fileinfo/HISTORY b/php-pear/fileinfo/HISTORY
index a6fc993..9f9418a 100644
--- a/php-pear/fileinfo/HISTORY
+++ b/php-pear/fileinfo/HISTORY
@@ -1,2 +1,5 @@
+2013-03-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFLICTS: added, for conflicts with PHP >=5.3
+
2010-04-02 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, DEPENDS, PRE_BUILD, FINAL, TRIGGERS: spell created
diff --git a/php-pear/php/CONFLICTS b/php-pear/php/CONFLICTS
index a51827b..7703bf3 100755
--- a/php-pear/php/CONFLICTS
+++ b/php-pear/php/CONFLICTS
@@ -1,2 +1,9 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
conflicts php-dev &&
-conflicts php4
+conflicts php4 &&
+
+# PHP >=5.3 includes fileinfo
+if spell_ok fileinfo && is_version_less 5.2.9999 "${VERSION}"; then
+ conflicts fileinfo y
+fi
diff --git a/php-pear/php/DEPENDS b/php-pear/php/DEPENDS
index 50b6b7d..12b5f79 100755
--- a/php-pear/php/DEPENDS
+++ b/php-pear/php/DEPENDS
@@ -101,6 +101,11 @@ if is_version_less 5.2.9999 "${VERSION}"; then
"--with-enchant" "--without-enchant" \
"use enchant for spelling functions?" &&

+ optional_depends icu \
+ "--with-icu-dir=${INSTALL_ROOT}/usr" \
+ "--without-icu-dir" \
+ "for ICU unicode support" &&
+
optional_depends oniguruma \
"--with-onig=${INSTALL_ROOT}/usr" "--without-onig" \
"for external oniguruma"
@@ -136,11 +141,6 @@ optional_depends gettext \
"--with-gettext" "--without-gettext" \
"for GNU gettext support" &&

-optional_depends icu \
- "--with-icu-dir=${INSTALL_ROOT}/usr" \
- "--without-icu-dir" \
- "for ICU unicode support" &&
-
# new database madness
# DB_DRIVERS="mysql mysqli pgsql sqlite sqlite3 firebird unixODBC iODBC"
# PDO_DRIVERS="mysql pgsql firebird unixODBC iODBC"
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index 609fae9..26b703f 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -1,13 +1,14 @@
SPELL=php
if [[ $PHP5_BRANCH == stable ]]; then
- VERSION=5.4.12
+ VERSION=5.4.13
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
-
SOURCE_HASH=sha512:c4e87ff0d9457114f8428479e41cb69ffc4f4cc98a92fb0359e6130edb09b0af17ff344b3409f2f7850177591f288658f9a2797eac9962c9fb4f9eb58be64c21
+
SOURCE_HASH=sha512:477adf82fcd0ef8c4911e811da25e7d091753289f7887ee76c7f790394497bb71d5e84172d4711888f0194960b3bafc2bcbfb252842cfc4059eb0692e382d6b1
elif [[ $PHP5_BRANCH == previous ]]; then
- VERSION=5.3.22
- SECURITY_PATCH=19
-
SOURCE_HASH=sha512:ab6fbb7cd2c9c0bff2dcc4198622f63c88c5047f7931b367ceb99e030204128fb2f7b3d2eb3578d2f4b6d5b11167976a66fc4d73db442e0e64a2a6376586f9d7
+ VERSION=5.3.23
+ SECURITY_PATCH=20
+
SOURCE_HASH=sha512:6d6579c0c67d75cd3cbc182609fb231cbda486722f47e01b78d50d93072720f37ee74eba8d8cc42308c297009fb3af31f9d2092869a4e78bbd957504cbb4858b
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
# if [[ $PHP5_SUHOSIN == y ]]; then
@@ -27,7 +28,7 @@ elif [[ $PHP5_BRANCH == alpha ]]; then

SOURCE_HASH=sha512:647a60adc47392bfa35b73a26873f6ac68a555ba146201b47a7fae7e76c078d6bf41a93f5f7e60b38c005c81ec74979ef5625673695934ebb01069ea465a9b79
elif [[ $PHP5_BRANCH == legacy ]]; then
VERSION=5.2.17
- SECURITY_PATCH=21
+ SECURITY_PATCH=22

SOURCE_HASH=sha512:baf3b5038468c9fa7c1a9e0506ed23559c21ba8df29380498a24e8d31c4c5f3633f29b1bc2faa3e59c6e5336536c09e19a5462b0a9d5916181c08f1f19abbca8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
@@ -41,9 +42,9 @@ elif [[ $PHP5_BRANCH == legacy ]]; then
SOURCE3_URL="http://download.suhosin.org/$SOURCE3";
SOURCE2_GPG="suhosin.gpg:$SOURCE3:UPSTREAM_KEY"
fi
- SOURCE4=php52-backports-20121114.patch
+ SOURCE4=php52-backports-20130320.patch
SOURCE4_URL=http://php52-backports.googlecode.com/files/$SOURCE4
-
SOURCE4_HASH=sha512:cce9b47afd100ff0b650972fa6c7b0ed1c255da95bb8427238d336fee05fc7125cf9aacf5b9503986c3c45d57ca075e5b805dd0a2eb857917281ae4c4d715fad
+
SOURCE4_HASH=sha512:5d9bce0f5975c524b5f26a42e9fd77c16e9d92b30846baf44bf7a2679261d7239903c155b53e7f7790f252111c33d50538e093e2278415cd4e109a1faa5d04f9
else
# rc branch
VERSION=5.3.17
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 8c17d2c..3e78556 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,10 @@
+2013-03-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.3.23 (previous), 5.4.13 (stable);
+ SECURITY_PATCH++ (CVE-2013-1643 and CVE-2013-1635); updated
+ backports+security patches for legacy branch to 20130320
+ * DEPENDS: icu is available only since 5.3
+ * CONFLICTS: added conflicts with fileinfo for PHP >=5.3
+
2013-02-27 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: switched stable to 5.4 (5.4.12); updated spell to 5.3.22
(previous), 5.5.0alpha5 (alpha)



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (d459a4dc876739a515e5875051a7fcdd94f50675), Vlad Glagolev, 03/24/2013

Archive powered by MHonArc 2.6.24.

Top of Page