Mailinglist Archive: opensuse-commit (554 mails)

< Previous Next >
commit php5
  • From: root@xxxxxxx (h_root)
  • Date: Thu, 7 Dec 2006 21:21:23 +0100 (CET)
  • Message-id: <20061207202123.8B02419AB19@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package php5
checked in at Thu Dec 7 21:21:23 CET 2006.

--------
--- php5/php5.changes 2006-11-08 15:18:57.000000000 +0100
+++ /mounts/work_src_done/STABLE/php5/php5.changes 2006-12-06 16:54:53.000000000 +0100
@@ -1,0 +2,21 @@
+Wed Dec 6 16:42:52 CET 2006 - anosek@xxxxxxx
+
+- synced with BuildService
+ * updated Suhosin patch to 0.9.6.2
+ * updated Suhosin extension to 0.9.16
+ * fixed php5-devel should provide PECL tool [#204006]
+ * use bundled sqlite in suse versions =< 10.1
+ (pdo_sqlite stopped working properly with older sqlite3 libs)
+ * do not use zend-multibyte anymore, please refer
+ to phpbug #36711 and associated links, no applications uses
+ this feature in the real world since it is disabled
+ in all other distributions/OS.seems to cause more problems
+ than solutions.
+ * change php.ini, back to short_open_tag =off (the default)
+ the package that depended on this setting no longer does.
+ Also explicitely set the upload_tmp_dir in php.ini to deal
+ with open_basedir recent changes (please refer
+ to phpbug #39123) for the details.
+ * suhosin.ini uses just the default recommended settings
+
+-------------------------------------------------------------------

Old:
----
suhosin-0.9.10.tar.bz2
suhosin-patch-5.2.0-0.9.6.1.patch.gz

New:
----
README.SUSE-pear
suhosin-0.9.16.tar.bz2
suhosin-patch-5.2.0-0.9.6.2.patch.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ php5.spec ++++++
--- /var/tmp/diff_new_pack.gUnkwu/_old 2006-12-07 21:20:43.000000000 +0100
+++ /var/tmp/diff_new_pack.gUnkwu/_new 2006-12-07 21:20:43.000000000 +0100
@@ -11,7 +11,9 @@
# norootforbuild

Name: php5
-%define suhosin_version 0.9.10
+%define suhosin_version 0.9.16
+%define suhosin_patch_version 0.9.6.2
+%define with_suhosin_patch 1
%define pkg_name php5
%define with_libedit 1
%define with_spell 1
@@ -21,7 +23,7 @@
%else
BuildRequires: krb5-devel
%endif
-BuildRequires: apache2-devel curl-devel db-devel gmp-devel gtk-devel imap imap-devel libmcrypt-devel libtidy-devel libtiff-devel libxslt-devel mhash-devel mm-devel mysql-devel net-snmp-devel openldap2 openldap2-devel orbit-devel pam-devel pkgconfig postfix postgresql-devel qt3-devel sqlite-devel sqlite2-devel tcpd-devel unixODBC-devel update-alternatives update-desktop-files zip
+BuildRequires: apache2-devel curl-devel db-devel gmp-devel gtk-devel imap imap-devel libmcrypt-devel libtidy-devel libtiff-devel libxslt-devel mhash-devel mm-devel mysql-devel net-snmp-devel openldap2 openldap2-devel orbit-devel pam-devel pkgconfig postfix postgresql-devel qt3-devel tcpd-devel unixODBC-devel update-alternatives update-desktop-files zip
%if %{with_spell}
BuildRequires: aspell-devel
%endif
@@ -41,9 +43,9 @@
%if %{with_libedit}
BuildRequires: libedit-devel
%endif
-# use system PCRE on 10.2 an up only, previous versions will not work.
+# use system PCRE and sqlite on 10.2 an up only, previous versions will not work.
%if 0%{?suse_version} > 1010
-BuildRequires: pcre-devel
+BuildRequires: pcre-devel sqlite-devel sqlite2-devel
%endif
%define extension_dir %{_libdir}/%{pkg_name}/extensions
%define peardir %{_datadir}/%{pkg_name}/PEAR
@@ -63,7 +65,7 @@
###
###
Version: 5.2.0
-Release: 4
+Release: 10
License: Other uncritical OpenSource License, Other License(s), see package
Group: Productivity/Networking/Web/Servers
Provides: php zend php-xml php-spl php-simplexml php-session php-pcre php-date php-reflection php-filter
@@ -77,6 +79,7 @@
Source1: php-suse-addons.tar.bz2
Source2: suhosin-%{suhosin_version}.tar.bz2
Source3: suhosin.ini
+Source4: README.SUSE-pear
#SUSE specific stuff
Patch1: php5-config.patch
Patch2: php5-phpize.patch
@@ -85,8 +88,10 @@
#home made hack to really build against libedit
Patch5: php5-really-with-libedit.patch
Patch6: php5-gcc.patch
-Patch7: suhosin-patch-5.2.0-0.9.6.1.patch.gz
+%if %{with_suhosin_patch}
+Patch7: suhosin-patch-5.2.0-%{suhosin_patch_version}.patch.gz
Patch8: suhosin-patch-fixes.patch
+%endif
URL: http://www.php.net
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Icon: php5.xpm
@@ -108,6 +113,7 @@
See http://www.php.net/credits.php for more details

%package devel
+Provides: php-devel pecl
Summary: Include files of PHP5
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
@@ -162,7 +168,7 @@
that, have a look at the example archive sites and some of the other
resources available in the links section.

-Please refer to /usr/share/doc/packages/php4/README.SuSE for
+Please refer to /usr/share/doc/packages/php5/README.SUSE for
information on how to load the module into the Apache webserver.


@@ -1037,14 +1043,17 @@
%setup -q -n php-%{version} -a 1
tar xf %{S:2} -C ext
mv ext/suhosin-%{suhosin_version} ext/suhosin
+cp %{S:4} pear/README.SUSE
%patch1
%patch2
%patch3 -p1
%patch4
%patch5
%patch6
+%if %{with_suhosin_patch}
%patch7 -p1
%patch8
+%endif
# we build three SAPI
mkdir -p build-apache2
mkdir -p build-fastcgi/sapi/cgi/libfcgi
@@ -1110,7 +1119,6 @@
--disable-debug \
--enable-memory-limit \
--enable-inline-optimization \
- --enable-zend-multibyte \
--disable-rpath \
"$@"
# Some modules are builtin, reasons:
@@ -1209,11 +1217,19 @@
--with-inifile \
--with-flatfile \
--enable-pdo=shared \
+%if 0%{?suse_version} > 1010
--with-pdo_sqlite=shared,%{_usr} \
+%else
+ --with-pdo_sqlite=shared \
+%endif
--with-pdo-mysql=shared,%{_usr} \
--with-pdo-pgsql=shared,%{_usr} \
--with-pdo-odbc=shared,unixODBC,%{_usr} \
+%if 0%{?suse_version} > 1010
--with-sqlite=shared,%{_usr} \
+%else
+ --with-sqlite=shared \
+%endif
--enable-sqlite-utf8 \
--enable-zip=shared \
--enable-suhosin=shared \
@@ -1223,7 +1239,6 @@
# --with-t1lib=%{_usr} \ (note: requires t1lib version 5 )
# extensions:
# --with-recode=shared \ error: recode extension can not be configured together with: imap mysql yaz
-
#disabled extensions
# --enable-embedded-mysqli \

@@ -1296,7 +1311,7 @@
# documentation
mv sapi/cli/README README.CLI
mv sapi/cgi/README.FastCGI README.FastCGI
-rm -rf $RPM_BUILD_ROOT/{.channels,.depdb*,.filemap,.lock,usr/bin/{peardev,pecl}}
+rm -rf $RPM_BUILD_ROOT/{.channels,.depdb*,.filemap,.lock,usr/bin/peardev}
install -d -m 0755 $RPM_BUILD_ROOT/%{peardir}/test

%post
@@ -1349,10 +1364,12 @@
%{_includedir}/%{pkg_name}
%{_bindir}/phpize
%{_bindir}/php-config
+%{_bindir}/pecl
%{_datadir}/%{pkg_name}/build

%files pear
%defattr(-, root, root)
+%doc pear/README.SUSE
%{_bindir}/pear5
%config(noreplace) %{php_sysconf}/cli/pear.conf
%{peardir}
@@ -1623,6 +1640,24 @@
%config(noreplace) %{php_sysconf}/conf.d/zlib.ini

%changelog -n php5
+* Wed Dec 06 2006 - anosek@xxxxxxx
+- synced with BuildService
+ * updated Suhosin patch to 0.9.6.2
+ * updated Suhosin extension to 0.9.16
+ * fixed php5-devel should provide PECL tool [#204006]
+ * use bundled sqlite in suse versions =< 10.1
+ (pdo_sqlite stopped working properly with older sqlite3 libs)
+ * do not use zend-multibyte anymore, please refer
+ to phpbug #36711 and associated links, no applications uses
+ this feature in the real world since it is disabled
+ in all other distributions/OS.seems to cause more problems
+ than solutions.
+ * change php.ini, back to short_open_tag =off (the default)
+ the package that depended on this setting no longer does.
+ Also explicitely set the upload_tmp_dir in php.ini to deal
+ with open_basedir recent changes (please refer
+ to phpbug #39123) for the details.
+ * suhosin.ini uses just the default recommended settings
* Wed Nov 08 2006 - anosek@xxxxxxx
- created symlinks /usr/bin/php and /usr/bin/pear [#216166]
* Tue Nov 07 2006 - mmarek@xxxxxxx

++++++ php5-config.patch ++++++
--- /var/tmp/diff_new_pack.gUnkwu/_old 2006-12-07 21:20:44.000000000 +0100
+++ /var/tmp/diff_new_pack.gUnkwu/_new 2006-12-07 21:20:44.000000000 +0100
@@ -1,20 +1,11 @@
Index: php.ini-recommended
===================================================================
RCS file: /repository/php-src/php.ini-recommended,v
-retrieving revision 1.179.2.11.2.8
-diff -u -r1.179.2.11.2.8 php.ini-recommended
---- php.ini-recommended 9 Sep 2006 21:56:58 -0000 1.179.2.11.2.8
-+++ php.ini-recommended 18 Sep 2006 22:41:08 -0000
-@@ -126,7 +126,7 @@
- ; 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
-@@ -388,7 +388,7 @@
+retrieving revision 1.179.2.11.2.12
+diff -u -r1.179.2.11.2.12 php.ini-recommended
+--- php.ini-recommended 14 Oct 2006 15:06:11 -0000 1.179.2.11.2.12
++++ php.ini-recommended 8 Nov 2006 04:34:06 -0000
+@@ -390,7 +390,7 @@

; Disable the inclusion of HTML tags in error messages.
; Note: Never use this feature for production boxes.
@@ -23,7 +14,7 @@

; If html_errors is set On PHP produces clickable error messages that direct
; to a page describing the error or function causing the error in detail.
-@@ -498,10 +498,7 @@
+@@ -500,10 +500,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;

; UNIX: "/path1:/path2"
@@ -35,7 +26,13 @@

; The root of the PHP pages, used only if nonempty.
; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
-@@ -520,7 +517,7 @@
+@@ -517,12 +514,12 @@
+ user_dir =
+
+ ; Directory in which the loadable extensions (modules) reside.
+-extension_dir = "./"
++extension_dir = @extdir@
+
; Whether or not to enable the dl() function. The dl() function does NOT work
; properly in multithreaded servers, such as IIS or Zeus, and is automatically
; disabled on them.
@@ -44,7 +41,16 @@

; cgi.force_redirect is necessary to provide security running PHP as a CGI under
; most web servers. Left undefined, PHP turns this on by default. You can
-@@ -579,6 +576,7 @@
+@@ -567,7 +564,7 @@
+
+ ; Temporary directory for HTTP uploaded files (will use system default if not
+ ; specified).
+-;upload_tmp_dir =
++upload_tmp_dir = "/tmp"
+
+ ; Maximum allowed size for uploaded files.
+ upload_max_filesize = 2M
+@@ -581,6 +578,7 @@
allow_url_fopen = On

; Whether to allow include/require to open URLs (like http:// or ftp://) as files.
@@ -52,7 +58,7 @@
allow_url_include = Off

; Define the anonymous ftp password (your email address)
-@@ -597,70 +595,6 @@
+@@ -599,70 +597,6 @@
; fgets() and file() will work regardless of the source of the file.
; auto_detect_line_endings = Off

@@ -123,7 +129,7 @@
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
;;;;;;;;;;;;;;;;;;;
-@@ -676,13 +610,6 @@
+@@ -704,13 +638,6 @@
define_syslog_variables = Off

[mail function]
@@ -137,7 +143,7 @@
; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
;sendmail_path =

-@@ -700,7 +627,7 @@
+@@ -728,7 +655,7 @@
;odbc.default_pw = Not yet implemented

; Allow or prevent persistent links.
@@ -146,7 +152,7 @@

; Check that a connection is still valid before reuse.
odbc.check_persistent = On
-@@ -722,7 +649,7 @@
+@@ -750,7 +677,7 @@

[MySQL]
; Allow or prevent persistent links.
@@ -155,7 +161,7 @@

; Maximum number of persistent links. -1 means no limit.
mysql.max_persistent = -1
-@@ -791,19 +718,9 @@
+@@ -819,19 +746,9 @@
; Allow or prevent reconnect
mysqli.reconnect = Off

@@ -176,7 +182,7 @@

; Detect broken persistent links always with pg_pconnect().
; Auto reset feature requires a little overheads.
-@@ -823,46 +740,6 @@
+@@ -851,46 +768,6 @@
; Unless pgsql.ignore_notice=0, module cannot log notice message.
pgsql.log_notice = 0

@@ -223,7 +229,7 @@

[bcmath]
; Number of decimal digits for all bcmath functions.
-@@ -871,42 +748,6 @@
+@@ -899,42 +776,6 @@
[browscap]
;browscap = extra/browscap.ini

@@ -266,7 +272,7 @@

[Session]
; Handler used to store/retrieve data.
-@@ -945,7 +786,7 @@
+@@ -975,7 +816,7 @@

; This option enables administrators to make their users invulnerable to
; attacks which involve passing session ids in URLs; defaults to 0.
@@ -275,7 +281,7 @@

; Name of the session (used as cookie name).
session.name = PHPSESSID
-@@ -963,7 +804,7 @@
+@@ -993,7 +834,7 @@
session.cookie_domain =

; Whether or not to add the httpOnly flag to the cookie, which makes it inaccessible to browser scripting languages such as JavaScript.
@@ -284,7 +290,7 @@

; Handler used to serialize data. php is the standard serializer of PHP.
session.serialize_handler = php
-@@ -1034,7 +875,7 @@
+@@ -1064,7 +905,7 @@
; Select a hash function
; 0: MD5 (128 bits)
; 1: SHA-1 (160 bits)
@@ -293,7 +299,7 @@

; Define how many bits are stored in each character when converting
; the binary hash data to something readable.
-@@ -1051,57 +892,6 @@
+@@ -1081,57 +922,6 @@
; Note that all valid entries require a "=", even if no value follows.
url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry"


++++++ php5-php-config.patch ++++++
--- /var/tmp/diff_new_pack.gUnkwu/_old 2006-12-07 21:20:44.000000000 +0100
+++ /var/tmp/diff_new_pack.gUnkwu/_new 2006-12-07 21:20:44.000000000 +0100
@@ -1,16 +1,5 @@
Index: scripts/php-config.in
================================================================================
---- php.ini-recommended
-+++ php.ini-recommended
-@@ -514,7 +514,7 @@
- user_dir =
-
- ; Directory in which the loadable extensions (modules) reside.
--extension_dir = "./"
-+extension_dir = @extdir@
-
- ; Whether or not to enable the dl() function. The dl() function does NOT work
- ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
--- scripts/php-config.in
+++ scripts/php-config.in
@@ -4,7 +4,7 @@


++++++ suhosin-0.9.10.tar.bz2 -> suhosin-0.9.16.tar.bz2 ++++++
++++ 23640 lines of diff (skipped)

++++++ suhosin-patch-5.2.0-0.9.6.1.patch.gz -> suhosin-patch-5.2.0-0.9.6.2.patch.gz ++++++
Binary files php5/suhosin-patch-5.2.0-0.9.6.1.patch.gz and /mounts/work_src_done/STABLE/php5/suhosin-patch-5.2.0-0.9.6.2.patch.gz differ

++++++ suhosin.ini ++++++
--- php5/suhosin.ini 2006-10-10 09:59:59.000000000 +0200
+++ /mounts/work_src_done/STABLE/php5/suhosin.ini 2006-12-06 16:54:53.000000000 +0100
@@ -1,5 +1,4 @@
extension = suhosin.so
-
;suhosin.log.syslog =
;suhosin.log.syslog.facility =
;suhosin.log.syslog.priority =
@@ -24,9 +23,10 @@
;suhosin.sql.bailout_on_error = 0
;suhosin.multiheader = 0
;suhosin.simulation = 0
+;suhosin.protectkey = 1
;suhosin.coredump = 0
;suhosin.apc_bug_workaround = 0
-suhosin.mail.protect = 1
+;suhosin.mail.protect = 0
;suhosin.memory_limit = 0
;suhosin.request.max_vars = 200
;suhosin.request.max_varname_length = 64
@@ -69,9 +69,13 @@
;suhosin.session.cryptua = 1
;suhosin.session.cryptdocroot = 1
;suhosin.session.cryptraddr = 0
+;suhosin.session.checkraddr = 0
;suhosin.session.max_id_length = 128
-;suhosin.cookie.encrypt = 1
+;suhosin.cookie.encrypt = 0
;suhosin.cookie.cryptkey =
;suhosin.cookie.cryptua = 1
;suhosin.cookie.cryptdocroot = 1
;suhosin.cookie.cryptraddr = 0
+;suhosin.cookie.checkraddr = 0
+;suhosin.cookie.cryptlist =
+;suhosin.cookie.plainlist =


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread