Commit 188c120b authored by Matt Smith's avatar Matt Smith Committed by Natanael Copa
Browse files

main/php: updated to 5.3.5 and made cosmetic changes to APKBUILD

See the PHP 5.3.5 release announcement for more information:
http://www.php.net/archive/2011.php#id2011-01-06-1

Also, there is not a newer Suhosin patch available at this time, however,
the current suhosin-patch-5.3.4-0.9.10.patch appears to be working fine.
parent 264c8486
# Contributor: Carlo Landmeter <clandmeter at gmail>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=php
pkgver=5.3.4
pkgver=5.3.5
_suhosinver=5.3.4-0.9.10
pkgrel=2
pkgrel=0
pkgdesc="The PHP language runtime engine"
url="http://www.php.net/"
arch="x86 x86_64"
......@@ -17,9 +17,8 @@ makedepends="pcre-dev libxml2-dev libiconv-dev openssl-dev zlib-dev bzip2-dev
net-snmp-dev libxslt-dev cyrus-sasl-dev openldap-dev pkgconfig
libgcrypt-dev apache2-dev apr-dev apr-util-dev libevent-dev
readline-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-cgi $pkgname-fpm $pkgname-embed
$pkgname-pear
$pkgname-apache2
subpackages="$pkgname-dev $pkgname-doc $pkgname-cgi $pkgname-fpm
$pkgname-apache2 $pkgname-embed $pkgname-pear
$pkgname-bcmath
$pkgname-bz2
$pkgname-calendar
......@@ -191,22 +190,22 @@ build() {
sed -ri "s/^(EXTRA_LDFLAGS[ ]*\=.*)/\1 -lpthread/" Makefile # see #183
make || return 1
# apache
cp -a "$srcdir"/$pkgname-$pkgver "$srcdir"/$pkgname-apache2
cd "$srcdir"/$pkgname-apache2
# fpm
cp -a "$srcdir"/$pkgname-$pkgver "$srcdir"/$pkgname-fpm
cd "$srcdir"/$pkgname-fpm
./configure ${_phpconfig} \
--disable-cli \
--with-apxs2 \
--enable-fpm \
${_phpextensions}
sed -ri "s/^(EXTRA_LDFLAGS[ ]*\=.*)/\1 -lpthread/" Makefile # see #183
make || return 1
# fpm
cp -a "$srcdir"/$pkgname-$pkgver "$srcdir"/$pkgname-fpm
cd "$srcdir"/$pkgname-fpm
# apache2
cp -a "$srcdir"/$pkgname-$pkgver "$srcdir"/$pkgname-apache2
cd "$srcdir"/$pkgname-apache2
./configure ${_phpconfig} \
--disable-cli \
--enable-fpm \
--with-apxs2 \
${_phpextensions}
sed -ri "s/^(EXTRA_LDFLAGS[ ]*\=.*)/\1 -lpthread/" Makefile # see #183
make || return 1
......@@ -232,58 +231,6 @@ build() {
${_phpextensions}
sed -ri "s/^(EXTRA_LDFLAGS[ ]*\=.*)/\1 -lpthread/" Makefile # see #183
make || return 1
# php-cgi, php-cli, php-pear
# (both cgi and cli are enabled by default)
#./configure --build=${CHOST:-i486-alpine-linux-uclibc} \
# --prefix=/usr \
# --sysconfdir=/etc/php \
# --with-layout=GNU \
# --with-config-file-path=/etc/php \
# --with-config-file-scan-dir=/etc/php/conf.d \
# --enable-inline-optimization \
# --disable-debug \
# --disable-rpath \
# --disable-static \
# --enable-shared \
# --mandir=/usr/share/man \
# --with-pic \
# --with-pear \
# ${_phpextensions}
# see #183
#sed -ri "s/^(EXTRA_LDFLAGS[ ]*\=.*)/\1 -lpthread/" Makefile
#make || return 1
# php-apache2
# (it's best to compile php-apache2 in it's own directory)
#mkdir -p "$srcdir"/php-apache2
#cp -R "$srcdir"/$pkgname-$pkgver/* "$srcdir"/php-apache2
#cd "$srcdir"/php-apache2
#make clean
#./configure --build=${CHOST:-i486-alpine-linux-uclibc} \
# --prefix=/usr \
# --sysconfdir=/etc/php \
# --with-layout=GNU \
# --with-config-file-path=/etc/php \
# --with-config-file-scan-dir=/etc/php/conf.d \
# --enable-inline-optimization \
# --disable-debug \
# --disable-rpath \
# --disable-static \
# --enable-shared \
# --mandir=/usr/share/man \
# --with-pic \
# --disable-cgi \
# --disable-cli \
# --with-apxs2 \
# ${_phpextensionsapache2}
# see #183
#sed -ri "s/^(EXTRA_LDFLAGS[ ]*\=.*)/\1 -lpthread/" Makefile
#make || return 1
}
package() {
......@@ -295,10 +242,18 @@ package() {
rm -rf "$pkgdir"/usr/share/man
}
apache2() {
pkgdesc="PHP Module for Apache2"
install -D -m755 "$srcdir"/$pkgname-apache2/libs/libphp5.so "$subpkgdir"/usr/lib/apache2/libphp5.so
install -D -m644 "$srcdir"/php5-module.conf "$subpkgdir"/etc/apache2/conf.d/php5-module.conf
dev() {
default_dev
mkdir -p "$subpkgdir"/usr/lib/php/ "$subpkgdir"/usr/bin/
mv "$pkgdir"/usr/lib/php/build "$subpkgdir"/usr/lib/php/
mv "$pkgdir"/usr/bin/phpize "$subpkgdir"/usr/bin/
}
doc() {
install -D -m644 "$srcdir"/$pkgname-$pkgver/sapi/cli/php.1 "$subpkgdir"/usr/share/man/man1/php.1
install -D -m644 "$srcdir"/$pkgname-$pkgver/scripts/man1/phpize.1 "$subpkgdir"/usr/share/man/man1/phpize.1
install -D -m644 "$srcdir"/$pkgname-$pkgver/scripts/man1/php-config.1 "$subpkgdir"/usr/share/man/man1/php-config.1
install -D -m644 "$srcdir"/$pkgname-fpm/sapi/fpm/php-fpm.8 "$subpkgdir"/usr/share/man/man8/php-fpm.8
}
cgi() {
......@@ -307,7 +262,7 @@ cgi() {
}
fpm() {
pkgdesc="PHP Fast Process Manager (FPM) Interface"
pkgdesc="PHP FastCGI Process Manager (FPM)"
install -D -m755 "$srcdir"/$pkgname-fpm/sapi/fpm/php-fpm "$subpkgdir"/usr/bin/php-fpm
install -D -m644 "$srcdir"/$pkgname-fpm/sapi/fpm/php-fpm.conf "$subpkgdir"/etc/php/php-fpm.conf
install -D -m755 "$srcdir"/php-fpm.init "$subpkgdir"/etc/init.d/php-fpm
......@@ -319,6 +274,12 @@ fpm() {
sed -ri "s/^;(pm.max_spare_servers)/\1/" "$subpkgdir"/etc/php/php-fpm.conf
}
apache2() {
pkgdesc="PHP Module for Apache2"
install -D -m755 "$srcdir"/$pkgname-apache2/libs/libphp5.so "$subpkgdir"/usr/lib/apache2/libphp5.so
install -D -m644 "$srcdir"/php5-module.conf "$subpkgdir"/etc/apache2/conf.d/php5-module.conf
}
embed() {
pkgdesc="PHP Embed Library"
install -D -m755 "$srcdir"/$pkgname-embed/libs/libphp5.so "$subpkgdir"/usr/lib/libphp5.so
......@@ -335,13 +296,6 @@ pear() {
done
}
doc() {
install -D -m644 "$srcdir"/$pkgname-$pkgver/sapi/cli/php.1 "$subpkgdir"/usr/share/man/man1/php.1
install -D -m644 "$srcdir"/$pkgname-$pkgver/scripts/man1/phpize.1 "$subpkgdir"/usr/share/man/man1/phpize.1
install -D -m644 "$srcdir"/$pkgname-$pkgver/scripts/man1/php-config.1 "$subpkgdir"/usr/share/man/man1/php-config.1
install -D -m644 "$srcdir"/$pkgname-fpm/sapi/fpm/php-fpm.8 "$subpkgdir"/usr/share/man/man8/php-fpm.8
}
_mv_mod() {
pkgdesc="$1 php extension"
mkdir -p "$subpkgdir"/$_extdir
......@@ -397,15 +351,7 @@ xsl() { _mv_mod xsl; }
zip() { _mv_mod zip; }
zlib() { _mv_mod zlib; }
# devleoper package
dev() {
default_dev
mkdir -p "$subpkgdir"/usr/lib/php/ "$subpkgdir"/usr/bin/
mv "$pkgdir"/usr/lib/php/build "$subpkgdir"/usr/lib/php/
mv "$pkgdir"/usr/bin/phpize "$subpkgdir"/usr/bin/
}
md5sums="2c069d8f690933e3bf6a8741ed818150 php-5.3.4.tar.bz2
md5sums="8aaf20c95e91f25c5b6a591e5d6d61b9 php-5.3.5.tar.bz2
5111e3be06d391f8772587c675240fab php-install-pear-xml.patch
26adfe0e744ec05fa9e368bbdee83176 php-uclibc.patch
289ca647771170f096985951047174e7 suhosin-patch-5.3.4-0.9.10.patch
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment