Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (657dbc88b12e6b544b5b34f640f04c74a0cd0acf)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Elisamuel Resto (657dbc88b12e6b544b5b34f640f04c74a0cd0acf)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Elisamuel Resto <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (657dbc88b12e6b544b5b34f640f04c74a0cd0acf)
  • Date: Sat, 5 Jan 2008 09:09:39 -0600
GIT changes to master grimoire by Elisamuel Resto <ryuji AT sourcemage.org>:

php-pear/php-dev/BUILD | 13 ++++++++-----
php-pear/php-dev/DEPENDS | 5 +++++
php-pear/php-dev/HISTORY | 4 ++++
php-pear/php/BUILD | 13 ++++++++-----
php-pear/php/DEPENDS | 9 +++++++--
php-pear/php/HISTORY | 4 ++++
php-pear/php4/BUILD | 12 ++++++++----
php-pear/php4/DETAILS | 6 +++---
php-pear/php4/HISTORY | 4 ++++
9 files changed, 51 insertions(+), 19 deletions(-)

New commits:
commit 657dbc88b12e6b544b5b34f640f04c74a0cd0acf
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

php-pear/php4: added suggestion by Andrew from bug #9172

commit 96b9d090605fe7f810b9bc0702ceb04d93628b29
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

php-pear/php4: updated VERSION to 4.4.8; SECURITY_PATCH++

commit 38698c8f728ed44774d73fde10f339164f104453
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

php-pear/php-dev: added suggestion by Andrew on bug #9172

commit 4e1ba9062820681f60fd599fb6c67df0bd9c0b5b
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

php-pear/php-dev: added optional dependency on re2c for parser
regeneration

commit 932220538155955de5251fab86d747cb87a8f892
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

php-pear/php: change in BUILD with Andrew's suggestion on bug #9172

commit 5b2aadd87de92ba8996a93195cf3b685abdf18f3
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

php-pear/php: added optional dependency on re2c for parser regeneration

diff --git a/php-pear/php-dev/BUILD b/php-pear/php-dev/BUILD
index 17456be..bb4aaa3 100755
--- a/php-pear/php-dev/BUILD
+++ b/php-pear/php-dev/BUILD
@@ -78,8 +78,11 @@ fi &&
make &&

# safety precaution against earlier PHP installations removing httpd.conf
-# we can remove this sedit after a couple of ISOs (today's 2003-11-05)
-if [ -f $INSTALL_LOGS/$SPELL-* ]
- then sedit 's|.*/httpd\.conf.*||g' $INSTALL_LOGS/$SPELL-*
-fi
-
+pushd "$INSTALL_LOGS" &>/dev/null
+local each
+for each in $SPELL-*; do
+ if test -f "$each"; then
+ sedit 's|.*/httpd\.conf.*||g' "$each"
+ fi
+done
+popd &>/dev/null
diff --git a/php-pear/php-dev/DEPENDS b/php-pear/php-dev/DEPENDS
index f19710e..25cf400 100755
--- a/php-pear/php-dev/DEPENDS
+++ b/php-pear/php-dev/DEPENDS
@@ -150,6 +150,11 @@ optional_depends libpng
\
"--without-png-dir" \
"for PNG support (also required for GD)" &&

+optional_depends re2c \
+ "" \
+ "" \
+ "to regenerate PHP parsers" &&
+
if [ "$PHP5_GD" != "none" ]; then
optional_depends freetype2 \
"--with-freetype-dir=/usr" \
diff --git a/php-pear/php-dev/HISTORY b/php-pear/php-dev/HISTORY
index 27ff011..a375257 100644
--- a/php-pear/php-dev/HISTORY
+++ b/php-pear/php-dev/HISTORY
@@ -1,3 +1,7 @@
+2008-01-05 Elisamuel Resto <ryuji AT sourcemage.org>
+ * DEPENDS: added optional re2c dependency for parser regeneration
+ * BUILD: added suggestion by Andrew on bug #9172
+
2007-06-10 George Sherwood <george AT beernabeer.com>
* DEPENDS: Added from php spell. Added depends icu.
* DETAILS: Updated to version 6. Added autoupdate.
diff --git a/php-pear/php/BUILD b/php-pear/php/BUILD
index b20da77..3a71a5f 100755
--- a/php-pear/php/BUILD
+++ b/php-pear/php/BUILD
@@ -79,8 +79,11 @@ fi &&
make &&

# safety precaution against earlier PHP installations removing httpd.conf
-# we can remove this sedit after a couple of ISOs (today's 2003-11-05)
-if [ -f $INSTALL_LOGS/$SPELL-* ]
- then sedit 's|.*/httpd\.conf.*||g' $INSTALL_LOGS/$SPELL-*
-fi
-
+pushd "$INSTALL_LOGS" &>/dev/null
+local each
+for each in $SPELL-*; do
+ if test -f "$each"; then
+ sedit 's|.*/httpd\.conf.*||g' "$each"
+ fi
+done
+popd &>/dev/null
diff --git a/php-pear/php/DEPENDS b/php-pear/php/DEPENDS
index c905613..dcbafab 100755
--- a/php-pear/php/DEPENDS
+++ b/php-pear/php/DEPENDS
@@ -147,9 +147,14 @@ optional_depends libpng
\
"--without-png-dir" \
"for PNG support (also required for GD)" &&

+optional_depends re2c \
+ "" \
+ "" \
+ "to regenerate PHP parsers" &&
+
if [ "$PHP5_GD" != "none" ]; then
optional_depends freetype2 \
- "--with-freetype-dir=/usr" \
- "--without-freetype-dir" \
+ "--with-freetype-dir=/usr" \
+ "--without-freetype-dir" \
"for freetype2 support"
fi
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 804ca9c..8e64fb7 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,7 @@
+2008-01-05 Elisamuel Resto <ryuji AT sourcemage.org>
+ * DEPENDS: added optional dependency on re2c for parser regeneration
+ * BUILD: added proposed change by Andrew on bug #9172
+
2007-12-16 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* PRE_BUILD: minor mistake

diff --git a/php-pear/php4/BUILD b/php-pear/php4/BUILD
index bdf6fea..cdce775 100755
--- a/php-pear/php4/BUILD
+++ b/php-pear/php4/BUILD
@@ -79,7 +79,11 @@ fi &&
make &&

# safety precaution against earlier PHP installations removing httpd.conf
-# we can remove this sedit after a couple of ISOs (today's 2003-11-05)
-if [ -f $INSTALL_LOGS/$SPELL-* ]
- then sedit 's|.*/httpd\.conf.*||g' $INSTALL_LOGS/$SPELL-*
-fi
+pushd "$INSTALL_LOGS" &>/dev/null
+local each
+for each in $SPELL-*; do
+ if test -f "$each"; then
+ sedit 's|.*/httpd\.conf.*||g' "$each"
+ fi
+done
+popd &>/dev/null
diff --git a/php-pear/php4/DETAILS b/php-pear/php4/DETAILS
index f9d1cd2..5057b0d 100755
--- a/php-pear/php4/DETAILS
+++ b/php-pear/php4/DETAILS
@@ -1,6 +1,6 @@
SPELL=php4
- VERSION=4.4.7
-
SOURCE_HASH=sha512:0702884fd398dbbcef466fe4cdf83b0c63356c45403e410570bc3a748cdd900141087dc318e958dbf5982d72e80b8a3f6570a462b96883b37873cc2cea066e88
+ VERSION=4.4.8
+
SOURCE_HASH=sha512:eaace9328f0309e6d947fa8416d4733b1bf4649b69832b64e5b3e61b685bd2f66387f248fed2b26aa64b979493378aa65c0b07a4450ab9b574f1c15aba071370
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=4
+ SECURITY_PATCH=5
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 a45a460..a2cf44e 100644
--- a/php-pear/php4/HISTORY
+++ b/php-pear/php4/HISTORY
@@ -1,3 +1,7 @@
+2008-01-05 Elisamuel Resto <ryuji AT sourcemage.org>
+ * DETAILS: updated VERSION to 4.4.8; SECURITY_PATCH++
+ * BUILD: added suggestion by Andrew on bug #9172
+
2007-05-05 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 4.4.7
SECURITY_PATCH++. Bug #13758


Archive powered by MHonArc 2.6.24.

Top of Page