2009/stable/programming/language/php - Split cli and mod_php config file locations
Erdem Bayer
paketler-commits at pardus.org.tr
Tue Nov 30 12:35:20 EET 2010
Author: ebayer
Date: Tue Nov 30 12:35:20 2010
New Revision: 106130
Modified:
2009/stable/programming/language/php/php-gtk/actions.py
2009/stable/programming/language/php/php-gtk/pspec.xml
2009/stable/programming/language/php/php/actions.py
2009/stable/programming/language/php/php/pspec.xml
Log:
Split cli and mod_php config file locations
BUG:FIXED:13021
---
php-gtk/actions.py | 1 +
php-gtk/pspec.xml | 9 ++++++++-
php/actions.py | 14 +++++++++-----
php/pspec.xml | 17 ++++++++++++-----
4 files changed, 30 insertions(+), 11 deletions(-)
Modified: 2009/stable/programming/language/php/php-gtk/actions.py
=================================================================
--- 2009/stable/programming/language/php/php-gtk/actions.py (original)
+++ 2009/stable/programming/language/php/php-gtk/actions.py Tue Nov 30 12:35:20 2010
@@ -41,4 +41,5 @@
def install():
autotools.rawInstall("INSTALL_ROOT=%s" % get.installDIR())
+ pisitools.dosym("../../ext/60-php-gtk.ini", "/etc/php/cli/ext/60-php-gtk.ini")
pisitools.dodoc("AUTHORS", "COPYING.LIB", "NEWS", "README*", "TODO2")
Modified: 2009/stable/programming/language/php/php-gtk/pspec.xml
=================================================================
--- 2009/stable/programming/language/php/php-gtk/pspec.xml (original)
+++ 2009/stable/programming/language/php/php-gtk/pspec.xml Tue Nov 30 12:35:20 2010
@@ -45,7 +45,7 @@
<Dependency releaseFrom="27">xulrunner</Dependency>
</RuntimeDependencies>
<Files>
- <Path fileType="config">/etc</Path>
+ <Path fileType="config">/etc/php</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
@@ -55,6 +55,13 @@
</Package>
<History>
+ <Update release="2">
+ <Date>2010-10-31</Date>
+ <Version>2.0.1</Version>
+ <Comment>Make config file gets loaded only on cli</Comment>
+ <Name>Erdem Bayer</Name>
+ <Email>ebayer at bayer.gen.tr</Email>
+ </Update>
<Update release="1">
<Date>2010-02-11</Date>
<Version>2.0.1</Version>
Modified: 2009/stable/programming/language/php/php/actions.py
=================================================================
--- 2009/stable/programming/language/php/php/actions.py (original)
+++ 2009/stable/programming/language/php/php/actions.py Tue Nov 30 12:35:20 2010
@@ -40,8 +40,6 @@
common_options = "--sysconfdir=/etc \
--cache-file=./config.cache \
- --with-config-file-path=/etc/php \
- --with-config-file-scan-dir=/etc/php/ext \
--with-zlib-dir=/usr/lib \
--with-libxml-dir=/usr/lib \
--with-jpeg-dir=/usr/lib/ \
@@ -59,6 +57,8 @@
shelltools.cd("fcgi")
autotools.configure("--enable-fastcgi \
--enable-force-cgi-redirect \
+ --with-config-file-path=/etc/php/cli \
+ --with-config-file-scan-dir=/etc/php/cli/ext \
%s \
%s" % (common_options, extensions()))
@@ -66,6 +66,8 @@
shelltools.cd("../apache")
autotools.configure("--with-apxs2=/usr/sbin/apxs \
--disable-cli \
+ --with-config-file-path=/etc/php/apache2 \
+ --with-config-file-scan-dir=/etc/php/apache2/ext \
%s \
%s" % (common_options, extensions()))
@@ -90,11 +92,13 @@
shelltools.cd("..")
- pisitools.insinto("/etc/php/", "php.ini-dist", "php.ini")
+ pisitools.insinto("/etc/php/apache2/", "php.ini-dist", "php.ini")
+ pisitools.insinto("/etc/php/cli/", "php.ini-dist", "php.ini")
- pisitools.dosed("%s/etc/php/php.ini" % get.installDIR(), "(extension_dir = .*)", ";\\1")
- pisitools.dosed("%s/etc/php/php.ini" % get.installDIR(), r";include_path = \".:/php/includes\"",
+ pisitools.dosed("%s/etc/php/*/php.ini" % get.installDIR(), "(extension_dir = .*)", ";\\1")
+ pisitools.dosed("%s/etc/php/*/php.ini" % get.installDIR(), r";include_path = \".:/php/includes\"",
"include_path = \".:/usr/share/php5/PEAR\"")
+
def extensions():
configure_disabled = []
Modified: 2009/stable/programming/language/php/php/pspec.xml
=================================================================
--- 2009/stable/programming/language/php/php/pspec.xml (original)
+++ 2009/stable/programming/language/php/php/pspec.xml Tue Nov 30 12:35:20 2010
@@ -39,7 +39,9 @@
<Name>php-common</Name>
<Summary>Common config files for PHP</Summary>
<Files>
- <Path fileType="config">/etc/php</Path>
+ <Path fileType="library">/usr/lib/php</Path>
+ <Path fileType="header">/usr/include</Path>
+ <Path fileType="data">/usr/share/php5</Path>
</Files>
</Package>
@@ -56,12 +58,9 @@
<Dependency>libmcrypt</Dependency>
</RuntimeDependencies>
<Files>
+ <Path fileType="config">/etc/php/cli</Path>
<Path fileType="executable">/usr/bin</Path>
- <Path fileType="library">/usr/lib</Path>
- <Path fileType="header">/usr/include</Path>
- <Path fileType="config">/etc</Path>
<Path fileType="man">/usr/share/man</Path>
- <Path fileType="data">/usr/share/php5</Path>
</Files>
<AdditionalFiles>
<AdditionalFile target="/usr/bin/go-pear" permission="0755" owner="root">go-pear</AdditionalFile>
@@ -90,6 +89,7 @@
<Files>
<Path fileType="library">/usr/lib/apache2/modules/libphp5.so</Path>
<Path fileType="config">/etc/apache2</Path>
+ <Path fileType="config">/etc/php/apache2</Path>
</Files>
<AdditionalFiles>
<AdditionalFile target="/etc/apache2/modules.d/70_mod_php5.conf" permission="0644" owner="root">70_mod_php5.conf</AdditionalFile>
@@ -100,6 +100,13 @@
</Package>
<History>
+ <Update release="80">
+ <Date>2010-10-31</Date>
+ <Version>5.2.14</Version>
+ <Comment>Split cli and apache config file locations</Comment>
+ <Name>Erdem Bayer</Name>
+ <Email>ebayer at bayer.gen.tr</Email>
+ </Update>
<Update release="79" type="security">
<Date>2010-08-03</Date>
<Version>5.2.14</Version>
More information about the paketler-commits
mailing list