LinHES 6.01.00

4 files changed, 63 insertions, 79 deletions

diff --git a/abs/core/php/PKGBUILD b/abs/core/php/PKGBUILD
index 68ece33..975716a 100644
--- a/abs/core/php/PKGBUILD
+++ b/abs/core/php/PKGBUILD
@@ -1,9 +1,6 @@
-# $Id: PKGBUILD 4664 2008-07-08 13:58:05Z allan $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
 pkgname=php
 pkgver=5.2.6
-pkgrel=4
+pkgrel=23
 _suhosinver=0.9.6.2
 pkgdesc='A high-level scripting language'
 arch=('i686' 'x86_64')
@@ -12,10 +9,15 @@ url='http://www.php.net'
 backup=('etc/php/php.ini')
 install=php.install
 depends=('glibc' 'readline' 'ncurses' 'libxml2' 'pcre')
-makedepends=('apache' 'imap' 'postgresql-libs' 'mysql' 'libldap' \
-             'libpng' 'libjpeg' 'sqlite3' 'unixodbc' 'net-snmp' \
-             'libmcrypt' 'tidyhtml' 'aspell' 'libtool' 'freetype2' 'libjpeg' \
+#makedepends=('apache' 'imap' 'postgresql-libs' 'mysql' 'libldap' \
+#             'libpng' 'libjpeg' 'sqlite3' 'unixodbc' 'net-snmp' \
+#       	'libmcrypt' 'tidyhtml' 'aspell' 'libtool' 'freetype2' 'libjpeg' \
+#             'curl' 'libxslt' 'pam' 'openssl' 'bzip2' 'gdbm' 'db>=4.7')
+
+makedepends=('mysql' 'libpng' 'libjpeg' 'sqlite3' \
+       	'libmcrypt' 'libtool' 'freetype2' 'libjpeg' \
              'curl' 'libxslt' 'pam' 'openssl' 'bzip2' 'gdbm' 'db>=4.7')
+
 optdepends=('bzip2: bz2' \
             'curl: curl' \
             'gdbm: dba' \
@@ -37,12 +39,12 @@ optdepends=('bzip2: bz2' \
             'libxslt: xsl' \
             )
 options=('emptydirs')
-source=("http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2" \
+source=("http://museum.php.net/php5/${pkgname}-${pkgver}.tar.bz2" \
         "http://download.suhosin.org/suhosin-patch-${pkgver}-${_suhosinver}.patch.gz" \
         'php.ini' 'apache.conf' 'db-configure.patch')
 md5sums=('7380ffecebd95c6edb317ef861229ebd'
          'f2ec986341a314c271259dbe4d940858'
-         '0ee1dad48f7d67af3d2c78ca6eed68ba'
+         'fda535c2b333297972aad48ee9285b45'
          '96ca078be6729b665be8a865535a97bf'
          '74e5ce5a02488ec91b1c59f539e42936')
 
@@ -78,9 +80,9 @@ build() {
 	--with-jpeg-dir=shared,/usr \
 	--with-png-dir=shared,/usr \
 	--with-gettext=shared \
-	--with-imap=shared \
-	--with-imap-ssl=shared \
-	--with-ldap=shared \
+	--without-imap \
+	--without-imap-ssl \
+	--without-ldap \
 	--enable-mbstring=shared \
 	--with-mcrypt=shared \
 	--with-mysql=shared \
@@ -88,22 +90,22 @@ build() {
 	--with-mysql=shared \
 	--with-mysqli=shared \
 	--with-ncurses=shared \
-	--with-unixODBC=shared,/usr \
+	--without-unixODBC \
 	--enable-pdo=shared \
 	--with-pdo-mysql=shared \
 	--with-pdo-sqlite=shared \
-	--with-pdo-odbc=shared,unixODBC,/usr \
-	--with-pdo-pgsql=shared \
+	--without-pdo-odbc \
+	--without-pdo-pgsql \
 	--with-sqlite=shared \
-	--with-pgsql=shared \
+	--without-pgsql \
 	--enable-shmop=shared \
-	--with-snmp=shared \
+	--without-snmp \
 	--enable-soap=shared \
 	--enable-sqlite-utf8=shared \
 	--enable-sysvmsg=shared \
 	--enable-sysvsem=shared \
 	--enable-sysvshm=shared \
-	--with-tidy=shared \
+	--without-tidy \
 	--with-xsl=shared \
 	--enable-zip=shared \
 	--enable-posix=shared \
@@ -118,7 +120,7 @@ build() {
 	--enable-json=shared \
 	--with-iconv=shared \
 	--with-xmlrpc=shared \
-	--with-pspell=shared \
+	--without-pspell \
 	--with-freetype-dir=shared,/usr \
 	--with-mime-magic=shared \
 	"
@@ -164,11 +166,11 @@ build() {
 	install -D -m755 sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi || return 1
 
 	# mod_php
-	./configure ${phpconfig} \
-		--with-apxs2 \
-		--disable-cli \
-		${phpextensions} || return 1
-	make || return 1
-	install -D -m644 libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so || return 1
-	install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/php5_module.conf || return 1
+#	./configure ${phpconfig} \
+#		--with-apxs2 \
+#		--disable-cli \
+#		${phpextensions} || return 1
+#	make || return 1
+#	install -D -m644 libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so || return 1
+#	install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/php5_module.conf || return 1
 }
diff --git a/abs/core/php/__changelog b/abs/core/php/__changelog
new file mode 100644
index 0000000..aac14ba
--- /dev/null
+++ b/abs/core/php/__changelog
@@ -0,0 +1,6 @@
+modified php.ini
+set base dir to /data/srv/httpd/htdocs
+added /data/srv/tmp to basedir
+added /usr/share/mythtv/mythweather/scripts/
+send errors to stderr 
+change .install file, timezone is modified on install
diff --git a/abs/core/php/php.ini b/abs/core/php/php.ini
index 7f78d4a..8cbcd56 100644
--- a/abs/core/php/php.ini
+++ b/abs/core/php/php.ini
@@ -127,7 +127,7 @@ zend.ze1_compatibility_mode = Off
 ; servers which are not under your control, because short tags may not
 ; be supported on the target server. For portable, redistributable code,
 ; be sure not to use short tags.
-short_open_tag = Off
+short_open_tag = On
 
 ; Allow ASP-style <% %> tags.
 asp_tags = Off
@@ -249,7 +249,7 @@ safe_mode_protected_env_vars = LD_LIBRARY_PATH
 ; and below.  This directive makes most sense if used in a per-directory
 ; or per-virtualhost web server configuration file. This directive is
 ; *NOT* affected by whether Safe Mode is turned On or Off.
-open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/
+open_basedir = /data/srv/httpd/htdocs/:/home/:/tmp/:/usr/share/pear/:/data/srv/tmp:/usr/share/mythtv/mythweather/scripts/:/data/srv/httpd/htdocs/mythweb/data/video:/myth/ipodfeed:/data/srv/httpd/htdocs/archive:/etc
 
 ; This directive allows you to disable certain functions for security reasons.
 ; It receives a comma-delimited list of function names. This directive is
@@ -302,7 +302,7 @@ expose_php = Off
 max_execution_time = 30     ; Maximum execution time of each script, in seconds
 max_input_time = 60	; Maximum amount of time each script may spend parsing request data
 ;max_input_nesting_level = 64 ; Maximum input variable nesting level
-memory_limit = 32M      ; Maximum amount of memory a script may consume (32MB)
+memory_limit = 64M      ; Maximum amount of memory a script may consume (32MB)
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -337,7 +337,7 @@ memory_limit = 32M      ; Maximum amount of memory a script may consume (32MB)
 ;
 ;   - Show all errors, except for notices and coding standards warnings
 ;
-;error_reporting = E_ALL & ~E_NOTICE
+error_reporting = E_ALL & ~E_NOTICE
 ;
 ;   - Show all errors, except for notices
 ;
@@ -364,11 +364,11 @@ error_reporting  =  E_ALL
 ; On or stdout - Display errors to STDOUT (default)
 ;
 ; To output errors to STDERR with CGI/CLI:
-;display_errors = "stderr"
+display_errors = "stderr"
 ;
 ; Default
 ;
-display_errors = Off
+;display_errors = on
 
 ; Even when display_errors is on, errors that occur during PHP's startup
 ; sequence are not displayed.  It's strongly recommended to keep
@@ -598,10 +598,10 @@ upload_max_filesize = 2M
 ;;;;;;;;;;;;;;;;;;
 
 ; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
-allow_url_fopen = Off
+allow_url_fopen = on
 
 ; Whether to allow include/require to open URLs (like http:// or ftp://) as files.
-allow_url_include = Off
+allow_url_include = on
 
 ; Define the anonymous ftp password (your email address)
 ;from="john@doe.com"
@@ -1270,7 +1270,7 @@ extension=gettext.so
 ;extension=ldap.so
 ;extension=mcrypt.so
 ;extension=mime_magic.so
-;extension=mysql.so
+extension=mysql.so
 ;extension=mysqli.so
 ;extension=ncurses.so
 ;extension=odbc.so
@@ -1281,7 +1281,7 @@ extension=gettext.so
 ;extension=pdo_pgsql.so
 ;extension=pdo_sqlite.so
 ;extension=pgsql.so
-;extension=posix.so
+extension=posix.so
 ;extension=pspell.so
 extension=session.so
 ;extension=shmop.so
diff --git a/abs/core/php/php.install b/abs/core/php/php.install
index 0c7e289..469db4a 100644
--- a/abs/core/php/php.install
+++ b/abs/core/php/php.install
@@ -1,44 +1,12 @@
 post_install() {
-  echo '
-    ==> PHP modules
-
-    PHP has been built with optional modules. To enable these modules,
-    uncomment the modules from php.ini
-
-    Some of them require extra packages to be installed:
-
-        * bz2                : bzip2
-        * curl               : curl
-        * dba                : gdbm
-        * gd                 : libpng, libjpeg, freetype2
-        * imap               : pam
-        * ldap               : libldap
-        * mcrypt             : mcrypt, libtool
-        * mysql/mysqli       : libmysqlclient
-        * odbc/pdo_odbc      : unixodbc
-        * openssl            : openssl
-        * pgsql/pdo_pgsql    : postgresql-libs
-        * pspell             : aspell
-        * snmp               : net-snmp
-        * sqlite             : sqlite3
-        * tidy               : tidyhtml
-        * xsl                : libxslt
-
-    ==> PHP-CGI and FCGI
-
-    There are several cgi relevant settings in your php.ini. Make sure to
-    adjust them according to your needs. At least you should activate the
-    cgi.fix_pathinfo directive in php.ini by uncommenting it.
-
-    ==> PHP and Apache HTTPD
-
-    To use mod_php with the Apache webserver, add this to your httpd.conf:
-
-        LoadModule php5_module modules/libphp5.so
-        [..]
-        Include conf/extra/php5_module.conf
-
-    '
+	if [ -f /etc/systemconfig ]
+	then
+		. /etc/systemconfig
+		if [ -f /etc/php/php.ini ]
+		then
+	       	    sed -i 's/^.*date.timezone.*$/date.timezone='${timezone}'/' /etc/php/php.ini
+		fi
+	fi
 }
 
 pre_upgrade() {
@@ -67,8 +35,16 @@ post_upgrade() {
     echo 'Restoring old php.ini...'
     mv /etc/php/php.ini /etc/php/php.ini.pacnew
     mv /etc/php.ini.pacsave.tmp /etc/php/php.ini
+    if [ -f /etc/systemconfig ]
+	then
+		. /etc/systemconfig
+		if [ -f /etc/php/php.ini ]
+		then
+	       	    sed -i 's/^.*date.timezone.*$/date.timezone='${timezone}'/' /etc/php/php.ini
+		fi
+	fi
     echo 'Updating extension dir...'
-    sed -i -e 's#extension_dir = "/usr/lib/php/extensions/php/"#extension_dir = "/usr/lib/php/20060613/"#g' /etc/php/php.ini
+    sed -i -e 's/#extension_dir = "/usr/lib/php/extensions/php/"/#extension_dir = "/usr/lib/php/20060613/"#g' /etc/php/php.ini
     echo '
     ==> Location of php.ini has changed
 
@@ -88,10 +64,10 @@ post_upgrade() {
   # can be removed later
   if [ $(vercmp '5.2.4-3' $2) -eq 0 ]; then
     echo 'Updating extension dir...'
-    sed -i -e 's#extension_dir = "/usr/lib/php/extensions/"#extension_dir = "/usr/lib/php/20060613/"#g' /etc/php/php.ini
+    sed -i -e 's/#extension_dir = "/usr/lib/php/extensions/"/#extension_dir = "/usr/lib/php/20060613/"#g' /etc/php/php.ini
   fi
 }
 
 op=$1
 shift
-[ "$(type -t "$op")" = "function" ] && $op "$@"
\ No newline at end of file
+[ "$(type -t "$op")" = "function" ] && $op "$@"