Author: glen Date: Thu Mar 23 18:44:26 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- tmpwatch and common dirs moved to php-dirs package, rel 7
---- Files affected:
SPECS:
php.spec (1.558 -> 1.559)
---- Diffs:
================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.558 SPECS/php.spec:1.559
--- SPECS/php.spec:1.558 Thu Mar 23 00:56:44 2006
+++ SPECS/php.spec Thu Mar 23 19:44:21 2006
@@ -22,7 +22,6 @@
%bcond_with hwapi # with Hw API support (BR:
proprietary libs)
%bcond_with interbase_inst # use InterBase install., not Firebird (BR:
proprietary libs)
%bcond_with oci8 # with Oracle oci8 extension module (BR:
proprietary libs)
-%bcond_without curl # without CURL extension module
%bcond_without imap # without IMAP extension module
%bcond_without interbase # with InterBase extension module
%bcond_without ldap # without LDAP extension module
@@ -49,6 +48,7 @@
%bcond_without apache2 # disable building apache 2.x module
%bcond_without fcgi # disable building FCGI SAPI
%bcond_without zts # disable experimental-zts
+%bcond_without curl # without CURL extension module
%bcond_without mysqli # with mysqli support (Requires mysql > 4.1)
%define apxs1 /usr/sbin/apxs1
@@ -80,7 +80,7 @@
Summary(uk): PHP ÷ĹŇÓŚ§ 5 - ÍĎ×Á ĐŇĹĐŇĎĂĹÓŐ×ÁÎÎŃ HTML-ĆÁĘĚŚ×, ×ÉËĎÎŐ×ÁÎÁ ÎÁ
ÓĹŇ×ĹŇŚ
Name: php
Version: 5.1.2
-%define _rel 6
+%define _rel 7
Release: %{_rel}%{?with_hardening:hardened}
Epoch: 4
License: PHP
@@ -373,6 +373,7 @@
Group: Libraries
# because of dlclose() bugs in glibc <= 2.3.4 causing SEGVs on exit
Requires: glibc >= 6:2.3.5
+Requires: php-dirs
Requires: sed >= 4.0
Provides: %{name}-libxml = %{epoch}:%{version}-%{release}
Provides: %{name}-session = %{epoch}:%{version}-%{release}
@@ -1465,9 +1466,9 @@
Summary: XML Reader extension module for PHP
Summary(pl): Moduł XML Reader dla PHP
Group: Libraries
-Requires: php-dom
Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: php-dom
%description xmlreader
This is a dynamic shared object (DSO) for PHP that will add XML Reader
@@ -1825,8 +1826,7 @@
install -d
$RPM_BUILD_ROOT{%{_libdir}/{php,apache{,1}},%{_sysconfdir}/{apache,cgi},%{_phpsharedir}}
\
$RPM_BUILD_ROOT/home/services/{httpd,apache}/icons \
$RPM_BUILD_ROOT{%{_sbindir},%{_bindir}} \
- $RPM_BUILD_ROOT/var/run/php \
- $RPM_BUILD_ROOT/etc/{apache/conf.d,httpd/httpd.conf,tmpwatch} \
+ $RPM_BUILD_ROOT/etc/{apache/conf.d,httpd/httpd.conf} \
$RPM_BUILD_ROOT%{_mandir}/man1 \
# install apache1 DSO module
@@ -1905,8 +1905,6 @@
EOF
done
-echo "/var/run/php 720" > $RPM_BUILD_ROOT/etc/tmpwatch/php.conf
-
# Not in all SAPI, so don't need the .ini fragments.
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/{ncurses,pcntl,readline}.ini
@@ -2651,8 +2649,6 @@
%dir %{_sysconfdir}
%dir %{_sysconfdir}/conf.d
%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/php.ini
-%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/tmpwatch/php.conf
-%attr(770,root,http) %dir %verify(not group mode) /var/run/php
%attr(755,root,root) %{_sbindir}/php-module-install
%attr(755,root,root) %{_libdir}/libphp_common-*.so
%dir %{extensionsdir}
@@ -3083,6 +3079,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.559 2006/03/23 18:44:21 glen
+- tmpwatch and common dirs moved to php-dirs package, rel 7
+
Revision 1.558 2006/03/22 23:56:44 glen
- 5.1.2 resolves CVE-2006-0207, CVE-2006-0208
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/php.spec?r1=1.558&r2=1.559&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
