New commits:
commit 90b39e53450a102d7bf07b640616688c53166f4a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
qt4 - fix typo
Conflicts:
x11-toolkits/qt4/PRE_BUILD
commit 1805b1496a677e86f6bb94edd055b18b90324595
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
qt4 - fix bug #13762
(cherry picked from commit 7b8dfb93b3af367207f65c75bf404e2065729467)
commit 6e5cafb78a340112d180984dd3be5de12e0bb42d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
qt-x11 - fix bug #13762
(cherry picked from commit 88d98d6cecb40444660f4b91cf9072f69be6555c)
Conflicts:
x11-toolkits/qt-x11/HISTORY
commit 5d4493b7a27b50ec660c54a37f1a32343cb0f288
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
php4: Updated to version 4.4.7. SECURITY_PATCH++ Bug #13758
(cherry picked from commit 2ae465e32e46138cd5171a06aca22874e216cb7e)
commit c7d56a80eb37e3045ca18a0ebff5df29d5846374
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
php: Updated to version 5.2.2. SECURITY_PATCH++. Bug #13759
(cherry picked from commit 670d07f3b43beaccfff3b882e0505905fb8fb1c7)
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index 36726c5..e51bc78 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -1,12 +1,12 @@
SPELL=php
if [[ "$PHP_RC" == y ]]; then
- VERSION=5.2.1 # last was 5.1.0RC6
-
SOURCE_HASH=sha512:5cf13ea4d610ca1c1f05f56433aa86e90b0833a715d40d1f4bbb199d941bf27ae7e0cc43fabc69d1f31576083ed381467db8bfb1788ecb3b42818bf6d3d71bbd
+ VERSION=5.2.2 # last was 5.1.0RC6
+
SOURCE_HASH=sha512:19b50467ce363fdaed9ec3ce69e560de969a9edd1b4ba6c55cfacd1b5bbc9ff83627f3c54d4f74846f583646bb593dccb02d04c26a6ed9a90da1d02a4dd8d907
else
- VERSION=5.2.1
-
SOURCE_HASH=sha512:5cf13ea4d610ca1c1f05f56433aa86e90b0833a715d40d1f4bbb199d941bf27ae7e0cc43fabc69d1f31576083ed381467db8bfb1788ecb3b42818bf6d3d71bbd
+ VERSION=5.2.2
+
SOURCE_HASH=sha512:19b50467ce363fdaed9ec3ce69e560de969a9edd1b4ba6c55cfacd1b5bbc9ff83627f3c54d4f74846f583646bb593dccb02d04c26a6ed9a90da1d02a4dd8d907
fi
- SECURITY_PATCH=2
+ SECURITY_PATCH=3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 48b02db..67cd426 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,7 @@
+2007-05-05 George Sherwood <george AT beernabeer.com>
+ * DETAILS: updated to version 5.2.2
+ SECURITY_PATCH++. Bug #13759
+
2007-02-09 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 5.2.1. SECURITY_PATCH++
* PRE_BUILD: Removed.
diff --git a/php-pear/php4/DETAILS b/php-pear/php4/DETAILS
index aa8c8c2..f9d1cd2 100755
--- a/php-pear/php4/DETAILS
+++ b/php-pear/php4/DETAILS
@@ -1,6 +1,6 @@
SPELL=php4
- VERSION=4.4.6
-
SOURCE_HASH=sha512:952c1ec18edade5719c4608df69d0f3e73da8fb46eb0e04a47e7800def2cae417c97594a3b6cbde63ba839ab9f5f45aaafa630e703c74df852c7759b1bd03050
+ VERSION=4.4.7
+
SOURCE_HASH=sha512:0702884fd398dbbcef466fe4cdf83b0c63356c45403e410570bc3a748cdd900141087dc318e958dbf5982d72e80b8a3f6570a462b96883b37873cc2cea066e88
SOURCE=php-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/php-$VERSION
if [ "${VERSION//RC/}" == "$VERSION" ]; then
@@ -10,7 +10,7 @@ else
fi
WEB_SITE=http://www.php.net/
ENTERED=20011024
- SECURITY_PATCH=3
+ SECURITY_PATCH=4
LICENSE[0]=http://www.php.net/license/3_0.txt
KEYWORDS="php"
SHORT="Hypertext Preprocessor (PHP) scripting language"
diff --git a/php-pear/php4/HISTORY b/php-pear/php4/HISTORY
index f524446..a45a460 100644
--- a/php-pear/php4/HISTORY
+++ b/php-pear/php4/HISTORY
@@ -1,3 +1,7 @@
+2007-05-05 George Sherwood <george AT beernabeer.com>
+ * DETAILS: updated spell to 4.4.7
+ SECURITY_PATCH++. Bug #13758
+
2007-03-21 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to 4.4.6. SECURITY_PATCH++ Bug 13639.