[Lunar-commits] <crater> php5-suhosin: sync it with moonbase.
Florin Braescu
florin at lunar-linux.org
Wed Jan 11 18:09:54 CET 2012
commit 2865db0900b7d402bc016444507cf3c393f2ec69
Author: Florin Braescu <florin at lunar-linux.org>
Date: Wed Jan 11 18:09:54 2012 +0100
php5-suhosin: sync it with moonbase.
---
compilers/php5-suhosin/BUILD | 14 +++++++++-----
compilers/php5-suhosin/CONFIGURE | 2 ++
compilers/php5-suhosin/DEPENDS | 4 ++--
compilers/php5-suhosin/DETAILS | 38 +++++++++++++++++++-------------------
compilers/php5-suhosin/PRE_BUILD | 9 ++++-----
5 files changed, 36 insertions(+), 31 deletions(-)
diff --git a/compilers/php5-suhosin/BUILD b/compilers/php5-suhosin/BUILD
index a63d1ac..fecdb24 100644
--- a/compilers/php5-suhosin/BUILD
+++ b/compilers/php5-suhosin/BUILD
@@ -1,19 +1,22 @@
(
+# So it does not bomb on gmp stuff if you say yes to gmp. Revisit on next bump.
+ sedit "s: __GMP_BITS_PER_MP_LIMB:GMP_LIMB_BITS:g" ext/gmp/gmp.c &&
+
if [ "$USE_PATCH" == "y" ]; then
patch_it $SOURCE3 1
fi &&
- ./buildconf --force &&
+# ./buildconf --force &&
if [ "$USE_REGGLOBALS" == "y" ]; then
- OPTS="$OPTS "
+ OPTS+=" "
fi &&
if module_installed apache || module_installed apache-mod_ssl ; then
- OPTS="$OPTS --with-apxs=/usr/sbin/apxs"
+ OPTS+=" --with-apxs=/usr/sbin/apxs"
elif module_installed apache2 ; then
- OPTS="$OPTS --with-apxs2=/usr/sbin/apxs"
+ OPTS+=" --with-apxs2=/usr/sbin/apxs"
fi &&
if [ -s /etc/httpsd/httpd.conf ] ; then
@@ -39,6 +42,7 @@
--enable-force-cgi-redirect \
--enable-discard-path \
$OPTS &&
- default_make
+
+ default_make
) > $C_FIFO 2>&1
diff --git a/compilers/php5-suhosin/CONFIGURE b/compilers/php5-suhosin/CONFIGURE
index 5fcbb0c..0224735 100644
--- a/compilers/php5-suhosin/CONFIGURE
+++ b/compilers/php5-suhosin/CONFIGURE
@@ -7,3 +7,5 @@ mquery USE_SOCKETS "Enable sockets support (experimental)?" y "--enable-sockets"
mquery USE_NCURSES "Enable ncurses support (experimental)?" y "--with-ncurses" ""
mquery USE_MBYTESTR "Enable multibyte string support?" n "--enable-mbstring --enable-zend-multibyte" ""
mquery USE_MBYTEREGEX "Enable multibyte regular expression functions?" n "" "--disable-mbregex"
+mquery USE_INTERNAL_GD "Enable built-in gd" y "--with-jpeg-dir --with-gd" ""
+mquery USE_EXIF "Enable exif" y "--enable-exif" ""
diff --git a/compilers/php5-suhosin/DEPENDS b/compilers/php5-suhosin/DEPENDS
index 5b5d96e..819be78 100644
--- a/compilers/php5-suhosin/DEPENDS
+++ b/compilers/php5-suhosin/DEPENDS
@@ -71,7 +71,7 @@ optional_depends "freetype2" \
"" \
"for freetype2 support"
-optional_depends "pdflib" \
+optional_depends "PDFlib-Lite" \
"--with-pdflib" \
"" \
"for pdflib support"
@@ -82,7 +82,7 @@ optional_depends "gd" \
--with-jpeg-dir=/usr \
--with-png-dir=/usr" \
"" \
- "for on the fly graphics"
+ "external gd for on the fly graphics (deprecated)"
optional_depends "curl" \
"--with-curl" \
diff --git a/compilers/php5-suhosin/DETAILS b/compilers/php5-suhosin/DETAILS
index 2429eaf..25a1129 100644
--- a/compilers/php5-suhosin/DETAILS
+++ b/compilers/php5-suhosin/DETAILS
@@ -1,28 +1,28 @@
MODULE=php5-suhosin
- PHP_VERSION=5.2.3
- SUHOSIN_VER=0.9.20
- SUHOSIN_PVER=0.9.6.2
+ PHP_VERSION=5.2.17
+ SUHOSIN_VER=0.9.32.1
+ SUHOSIN_PVER=0.9.7
VERSION=$PHP_VERSION-$SUHOSIN_VER
SOURCE_DIRECTORY=$BUILD_DIRECTORY/php-$PHP_VERSION
SOURCE=php-$PHP_VERSION.tar.bz2
- SOURCE_URL[0]=http://www.php.net/distributions/
- SOURCE_URL[1]=http://uk2.php.net/distributions/
- SOURCE_URL[2]=http://us2.php.net/distributions/
- SOURCE_URL[3]=http://uk.php.net/distributions/
- SOURCE_URL[4]=http://nl.php.net/distributions/
- SOURCE_URL[5]=http://de.php.net/distributions/
- SOURCE_URL[6]=http://fr.php.net/distributions/
- SOURCE2=suhosin-$SUHOSIN_VER.tgz
- SOURCE3=suhosin-patch-$PHP_VERSION-$SUHOSIN_PVER.patch.gz
- SOURCE2_URL=http://www.hardened-php.net/suhosin/_media/
- SOURCE3_URL=http://www.hardened-php.net/suhosin/_media/
- SOURCE_VFY=sha1:0a02e05e1c663c0d4ee0b253917c0e140e606261
- SOURCE2_VFY=sha1:c55c0b205de7974875d01e6c116a86c3a9f458a9
- SOURCE3_VFY=sha1:9f4ee79b049df097efc634eb9d60249320441df3
+ SOURCE_URL[0]=http://www.php.net/distributions
+ SOURCE_URL[1]=http://uk2.php.net/distributions
+ SOURCE_URL[2]=http://us2.php.net/distributions
+ SOURCE_URL[3]=http://uk.php.net/distributions
+ SOURCE_URL[4]=http://nl.php.net/distributions
+ SOURCE_URL[5]=http://de.php.net/distributions
+ SOURCE_URL[6]=http://fr.php.net/distributions
+ SOURCE2=suhosin-$SUHOSIN_VER.tar.gz
+ SOURCE3=suhosin-patch-5.2.16-$SUHOSIN_PVER.patch.gz
+ SOURCE2_URL=http://download.suhosin.org
+ SOURCE3_URL=http://download.suhosin.org
+ SOURCE_VFY=sha1:d68f3b09f766990d815a3c4c63c157db8dab8095
+ SOURCE2_VFY=sha1:93fcb1d5f96691c4c50808a14dd3d6d4bbfea451
+ SOURCE3_VFY=sha1:fec10b2b81582d06bb0d0a96ea55c525afc8ab29
WEB_SITE=http://www.hardened-php.net/suhosin/index.html
- MAINTAINER="striker at lunar-linux.org"
+ MAINTAINER=striker at lunar-linux.org
ENTERED=20061219
- UPDATED=20070602
+ UPDATED=20110113
SHORT="Suhosin is an advanced protection system for PHP"
cat << EOF
diff --git a/compilers/php5-suhosin/PRE_BUILD b/compilers/php5-suhosin/PRE_BUILD
index 417bce0..9ee596d 100644
--- a/compilers/php5-suhosin/PRE_BUILD
+++ b/compilers/php5-suhosin/PRE_BUILD
@@ -1,10 +1,9 @@
(
- default_pre_build &&
- cd $SOURCE_DIRECTORY/ext &&
- unpack $SOURCE2 &&
- mv suhosin-$SUHOSIN_VER suhosin &&
- mv package.xml suhosin
+ default_pre_build &&
+ cd $SOURCE_DIRECTORY/ext &&
+ unpack $SOURCE2 &&
+ mv suhosin-$SUHOSIN_VER suhosin
)
More information about the Lunar-commits
mailing list