--- /dev/null
+--- php-5.3.1/ext/pcre/config0.m4 2009-11-27 08:19:08.836025192 +0000
++++ php-5.3.1/ext/pcre/config0.m4 2009-11-30 22:09:24.385647500 +0000
+@@ -11,7 +11,7 @@
+
+ if test "$PHP_PCRE_REGEX" != "yes" && test "$PHP_PCRE_REGEX" != "no"; then
+ AC_MSG_CHECKING([for PCRE headers location])
+- for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/include/pcre $PHP_PCRE_REGEX/local/include; do
++ for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/include/pcre $PHP_PCRE_REGEX/local/include /usr/include; do
+ test -f $i/pcre.h && PCRE_INCDIR=$i
+ done
+
+@@ -21,7 +21,7 @@
+ AC_MSG_RESULT([$PCRE_INCDIR])
+
+ AC_MSG_CHECKING([for PCRE library location])
+- for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR; do
++ for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR /usr/$PHP_LIBDIR; do
+ test -f $j/libpcre.a || test -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j
+ done
+
+@@ -43,12 +43,13 @@
+ AC_MSG_ERROR([The PCRE extension requires PCRE library version >= 6.6])
+ fi
+
+- PHP_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR)
++ PHP_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR, PCRE_SHARED_LIBADD)
+
+ AC_DEFINE(HAVE_PCRE, 1, [ ])
+ PHP_ADD_INCLUDE($PCRE_INCDIR)
+- PHP_NEW_EXTENSION(pcre, php_pcre.c, no)
++ PHP_NEW_EXTENSION(pcre, php_pcre.c, $ext_shared)
+ PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h])
++ EXTRA_LIBS="$EXTRA_LIBS -lpcre"
+ else
+ AC_MSG_CHECKING([for PCRE library to use])
+ AC_MSG_RESULT([bundled])
+@@ -59,7 +60,7 @@
+ pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c \
+ pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_valid_utf8.c \
+ pcrelib/pcre_version.c pcrelib/pcre_xclass.c"
+- PHP_NEW_EXTENSION(pcre, $pcrelib_sources php_pcre.c, no,,-I@ext_srcdir@/pcrelib)
++ PHP_NEW_EXTENSION(pcre, $pcrelib_sources php_pcre.c, $ext_shared,,-I@ext_srcdir@/pcrelib)
+ PHP_ADD_BUILD_DIR($ext_builddir/pcrelib)
+ PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h pcrelib/])
+ AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
+--- php-5.3.1/ext/pcre/php_pcre.h 2009-11-30 20:59:04.046581246 +0200
++++ php-5.3.1.pcre/ext/pcre/php_pcre.h 2009-11-30 21:38:06.435493243 +0000
+@@ -34,7 +34,12 @@
+ #endif
+
+ PHPAPI char *php_pcre_replace(char *regex, int regex_len, char *subject, int subject_len, zval *replace_val, int is_callable_replace, int *result_len, int limit, int *replace_count TSRMLS_DC);
++#if COMPILE_DL_PCRE
++#define pcre_get_compiled_regex pcre_get_compiled_regex_p
++extern PHPAPI pcre* (*pcre_get_compiled_regex)(char *regex, pcre_extra **extra, int *options TSRMLS_DC);
++#else
+ PHPAPI pcre* pcre_get_compiled_regex(char *regex, pcre_extra **extra, int *options TSRMLS_DC);
++#endif
+ PHPAPI pcre* pcre_get_compiled_regex_ex(char *regex, pcre_extra **extra, int *preg_options, int *coptions TSRMLS_DC);
+
+ extern zend_module_entry pcre_module_entry;
+--- php-5.3.1/ext/pcre/php_pcre.c 2009-11-30 21:10:01.370473754 +0200
++++ php-5.3.1.pcre/ext/pcre/php_pcre.c 2009-11-30 21:38:01.759684456 +0000
+@@ -27,6 +27,11 @@
+
+ #if HAVE_PCRE || HAVE_BUNDLED_PCRE
+
++#if COMPILE_DL_PCRE
++#undef pcre_get_compiled_regex
++PHPAPI pcre* pcre_get_compiled_regex(char *regex, pcre_extra **extra, int *preg_options TSRMLS_DC);
++#endif
++
+ #include "ext/standard/php_string.h"
+
+ #define PREG_PATTERN_ORDER 1
+@@ -153,6 +158,10 @@
+ REGISTER_LONG_CONSTANT("PREG_BAD_UTF8_OFFSET_ERROR", PHP_PCRE_BAD_UTF8_OFFSET_ERROR, CONST_CS | CONST_PERSISTENT);
+ REGISTER_STRING_CONSTANT("PCRE_VERSION", (char *)pcre_version(), CONST_CS | CONST_PERSISTENT);
+
++#if COMPILE_DL_PCRE
++ pcre_get_compiled_regex_p = pcre_get_compiled_regex;
++#endif
++
+ return SUCCESS;
+ }
+ /* }}} */
+@@ -429,6 +438,7 @@
+ }
+ /* }}} */
+
++
+ /* {{{ pcre_get_compiled_regex
+ */
+ PHPAPI pcre* pcre_get_compiled_regex(char *regex, pcre_extra **extra, int *preg_options TSRMLS_DC)
+--- php-5.3.1/ext/standard/browscap.c 2009-06-06 02:40:49.000000000 +0000
++++ php-5.3.1.pcre/ext/standard/browscap.c 2009-11-30 21:33:00.775241138 +0000
+@@ -31,6 +31,11 @@
+ static zval *current_section;
+ static char *current_section_name;
+
++#if COMPILE_DL_PCRE
++// will be visible in here
++PHPAPI pcre* (*pcre_get_compiled_regex_p)(char *regex, pcre_extra **extra, int *options TSRMLS_DC);
++#endif
++
+ #define DEFAULT_SECTION_NAME "Default Browser Capability Settings"
+
+ /* OBJECTS_FIXME: This whole extension needs going through. The use of objects looks pretty broken here */
# TODO
# - lost patches:
# +Patch11: %{name}-acam.patch
-# +Patch12: %{name}-threads-acfix.patch
# +Patch13: %{name}-tsrmlsfetchgcc2.patch
# +Patch16: %{name}-sybase-fix.patch
# +Patch26: %{name}-pear.patch
# +Patch44: %{name}-include_path.patch
# +Patch45: %{name}-imap-annotations.patch
# +Patch46: %{name}-imap-myrights.patch
-# +Patch51: spl-shared.patch
# - deal with modules removed from php and not moved to PECL, still not obsoleted anywhere
# - removed from php 5.0 (currently in php4):
# db, hyperwave, java, mcal, overload, qtdom
# - removed from php 5.3:
# dbase, mime_magic, ming, ncurses, sybase
# - make additional headers and checking added by mail patch configurable
-# - modularize session, standard (output from pure php -m)?
+# - modularize standard (output from pure php -m)?
# - lib64 patch obsolete by $PHP_LIBDIR ?
-# - move mysqlnd out of libphp-common.so?
+# - move mysqlnd out of libphp-common.so, or link again with mysql-devel?
# - WARNING: Phar: sha256/sha512 signature support disabled if ext/hash is
# built shared, also PHAR_HAVE_OPENSSL is false if openssl is built shared.
# make it runtime dep and add Suggests (or php warning messages)
#+ereg
# libxml
#+mysqlnd
-# pcre
# Reflection
-# session
#
# Conditional build:
%bcond_with fdf # with FDF (PDF forms) module (BR: proprietary lib)
%bcond_without mysqli # without mysqli support (Requires mysql > 4.1)
%bcond_without odbc # without ODBC extension module
%bcond_without openssl # without OpenSSL support and OpenSSL extension (module)
+%bcond_without pcre # without PCRE extension module
%bcond_without pgsql # without PostgreSQL extension module
%bcond_without phar # without phar extension module
%bcond_without pspell # without pspell extension module
ERROR: You need to select at least one Apache SAPI to build shared modules.
%endif
-%define rel 1
+# filter depends on pcre
+%if %{without pcre}
+%undefine with_filter
+%endif
+
+%define rel 1.10
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
Patch8: %{name}-config-file-scan-dir.patch
Patch9: %{name}-sh.patch
Patch10: %{name}-ini.patch
+%if %{with type_hints}
+Patch12: http://ilia.ws/patch/type_hint_53_v2.txt
+%endif
Patch14: %{name}-no_pear_install.patch
Patch15: %{name}-zlib.patch
Patch17: %{name}-readline.patch
Patch47: suhosin.patch
Patch49: %{name}-m4-divert.patch
Patch50: extension-shared-optional-dep.patch
-%if %{with type_hints}
-Patch52: http://ilia.ws/patch/type_hint_53_v2.txt
-%endif
+Patch51: spl-shared.patch
+Patch52: pcre-shared.patch
URL: http://www.php.net/
%{?with_interbase:%{!?with_interbase_inst:BuildRequires: Firebird-devel >= 1.0.2.908-2}}
%{?with_pspell:BuildRequires: aspell-devel >= 2:0.50.0}
%endif
%{?with_snmp:BuildRequires: net-snmp-devel >= 5.0.7}
BuildRequires: pam-devel
-BuildRequires: pcre-devel >= 6.6
+%{?with_pcre:BuildRequires: pcre-devel >= 6.6}
%{?with_pgsql:BuildRequires: postgresql-backend-devel >= 7.2}
%{?with_pgsql:BuildRequires: postgresql-devel}
BuildRequires: readline-devel
Provides: php(libxml)
Provides: php(modules_api) = %{php_api_version}
Provides: php(overload)
-Provides: php(pcre)
Provides: php(reflection)
-Provides: php(session)
-Provides: php(spl)
Provides: php(standard)
Provides: php(zend_extension_api) = %{zend_extension_api}
Provides: php(zend_module_api) = %{zend_module_api}
Provides: php5(debug) = %{php_debug}
Provides: php5(thread-safety) = %{zend_zts}
-Obsoletes: php-pcre < 4:5.2.0
Obsoletes: php-pecl-domxml
-Obsoletes: php-session < 3:4.2.1-2
Conflicts: php4-common < 3:4.4.4-8
Conflicts: rpm < 4.4.2-0.2
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: autoconf
Requires: automake
+%if "%{pld_release}" != "ac"
+Requires: libtool >= 2:2.2
+%else
Requires: libtool
-Requires: pcre-devel >= 6.6
+%endif
+%{?with_pcre:Requires: pcre-devel >= 6.6}
Requires: shtool
Obsoletes: php-pear-devel
Obsoletes: php4-devel
Group: Libraries
URL: http://www.php.net/manual/en/book.mysqli.php
Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: %{name}-spl = %{epoch}:%{version}-%{release}
Provides: php(mysqli)
%description mysqli
Moduł PHP umożliwiający tworzenie nowych procesów i kontrolę nad nimi.
Obsługuje funkcje takie jak fork(), waitpid(), signal() i podobne.
+%package pcre
+Summary: PCRE extension module for PHP
+Summary(pl.UTF-8): Moduł PCRE dla PHP
+Group: Libraries
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Provides: php(pcre)
+
+%description pcre
+This is a dynamic shared object (DSO) for PHP that will add Perl
+Compatible Regular Expression support.
+
+%description pcre -l pl.UTF-8
+Moduł PHP umożliwiający korzystanie z perlowych wyrażeń regularnych
+(Perl Compatible Regular Expressions)
+
%package pdo
Summary: PHP Data Objects (PDO)
Summary(pl.UTF-8): Obsługa PHP Data Objects (PDO)
Group: Libraries
URL: http://www.php.net/manual/en/book.pdo.php
Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: %{name}-spl = %{epoch}:%{version}-%{release}
Provides: php(pdo)
Obsoletes: php-pecl-PDO
Group: Libraries
URL: http://www.php.net/manual/en/book.phar.php
Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: %{name}-spl = %{epoch}:%{version}-%{release}
Provides: php(phar)
%description phar
Moduł PHP dodający możliwość konwersji kodowania plików (poprzez
bibliotekę recode).
+%package session
+Summary: session extension module for PHP
+Summary(pl.UTF-8): Moduł session dla PHP
+Group: Libraries
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Suggests: %{name}-hash = %{epoch}:%{version}-%{release}
+Provides: php(session)
+
+%description session
+This is a dynamic shared object (DSO) for PHP that will add session
+support.
+
+%description session -l pl.UTF-8
+Moduł PHP dodający obsługę sesji.
+
%package shmop
Summary: Shared Memory Operations extension module for PHP
Summary(pl.UTF-8): Moduł shmop dla PHP
%description sockets -l pl.UTF-8
Moduł PHP dodający obsługę gniazdek.
+%package spl
+Summary: Standard PHP Library module for PHP
+Summary(pl.UTF-8): Moduł SPL dla PHP
+Group: Libraries
+URL: http://php.net/manual/en/book.spl.php
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: %{name}-pcre = %{epoch}:%{version}-%{release}
+Requires: %{name}-simplexml = %{epoch}:%{version}-%{release}
+Provides: php(spl)
+
+%description spl
+This is a dynamic shared object (DSO) for PHP that will add Standard
+PHP Library support.
+
+%description spl -l pl.UTF-8
+Moduł PHP dodający obsługę gniazdek.
+
%package sqlite
Summary: SQLite extension module for PHP
Summary(pl.UTF-8): Moduł SQLite dla PHP
Group: Libraries
URL: http://www.php.net/manual/en/book.sqlite.php
Requires: %{name}-common = %{epoch}:%{version}-%{release}
-# sqlite ext extends spl and pdo
-Requires: %{name}-pdo = %{epoch}:%{version}-%{release}
+Suggests: %{name}-pdo = %{epoch}:%{version}-%{release}
+Suggests: %{name}-spl = %{epoch}:%{version}-%{release}
Provides: php(sqlite)
%description sqlite
Group: Libraries
URL: http://www.php.net/manual/en/book.wddx.php
Requires: %{name}-common = %{epoch}:%{version}-%{release}
-#Requires: %{name}-session = %{epoch}:%{version}-%{release}
+Requires: %{name}-session = %{epoch}:%{version}-%{release}
Requires: %{name}-xml = %{epoch}:%{version}-%{release}
Provides: php(wddx)
Group: Libraries
URL: http://www.php.net/manual/en/book.xmlreader.php
Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: %{name}-dom = %{epoch}:%{version}-%{release}
+Suggests: %{name}-dom = %{epoch}:%{version}-%{release}
Provides: php(xmlreader)
%description xmlreader
%prep
%setup -q
-
-# for suhosin patch
+# prep for suhosin patch
%{__sed} -i -e 's,\r$,,' Zend/Zend.dsp Zend/ZendTS.dsp
-
-%if %{with type_hints}
-%patch52 -p0
-%endif
-
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch9 -p1
cp php.ini-production php.ini
%patch10 -p1
+%if %{with type_hints}
+%patch12 -p0
+%endif
%patch14 -p1
%patch15 -p1
%patch17 -p1
%endif
%patch49 -p1
%patch50 -p1
+%patch51 -p1
+%patch52 -p1
# cleanup backups after patching
find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
--without-libexpat-dir \
--enable-mysqlnd-threading \
--enable-posix=shared \
- --enable-session \
--enable-shared \
+ --enable-session=shared \
--enable-shmop=shared \
--enable-simplexml=shared \
+ --enable-spl=shared \
--enable-sysvmsg=shared \
--enable-sysvsem=shared \
--enable-sysvshm=shared \
%{?with_oci8:--with-oci8=shared} \
%{?with_openssl:--with-openssl=shared} \
--with-kerberos \
- --with-pcre-regex=/usr \
+ %{!?with_pcre:--without-pcre-regex}%{?with_pcre:--with-pcre-regex=/usr} \
%{!?with_filter:--disable-filter}%{?with_filter:--enable-filter=shared} \
--with-pear=%{php_pear_dir} \
%{!?with_pgsql:--without-pgsql}%{?with_pgsql:--with-pgsql=shared,/usr} \
conf="%{_sysconfdir}/conf.d/$mod.ini"
# xml needs to be loaded before wddx
[ "$mod" = "wddx" ] && conf="%{_sysconfdir}/conf.d/xml_$mod.ini"
+ # pre needs to be loaded before SPL
+ [ "$mod" = "pcre" ] && conf="%{_sysconfdir}/conf.d/PCRE.ini"
+ # spl needs to be loaded before mysqli
+ [ "$mod" = "spl" ] && conf="%{_sysconfdir}/conf.d/SPL.ini"
echo "+ $conf"
cat > $RPM_BUILD_ROOT$conf <<-EOF
; Enable $mod extension module
%extension_scripts oci8
%extension_scripts odbc
%extension_scripts openssl
+%extension_scripts pcre
%extension_scripts pdo-dblib
%extension_scripts pdo-firebird
%extension_scripts pdo-mysql
%extension_scripts posix
%extension_scripts pspell
%extension_scripts recode
+%extension_scripts session
%extension_scripts shmop
%extension_scripts snmp
%extension_scripts soap
%extension_scripts sockets
+%extension_scripts spl
%extension_scripts sqlite
%extension_scripts sqlite3
%extension_scripts sybase-ct
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*pcntl\.so/d' %{_sysconfdir}/php-cli.ini
fi
+%triggerun pcre -- %{name}-pcre < 4:5.0.4-9.1
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*pcre\.so/d' %{_sysconfdir}/php.ini
+
%triggerun pgsql -- %{name}-pgsql < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*pgsql\.so/d' %{_sysconfdir}/php.ini
%triggerun recode -- %{name}-recode < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*recode\.so/d' %{_sysconfdir}/php.ini
+%triggerun session -- %{name}-session < 4:5.0.4-9.1
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*session\.so/d' %{_sysconfdir}/php.ini
+
%triggerun shmop -- %{name}-shmop < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*shmop\.so/d' %{_sysconfdir}/php.ini
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cli.d/pcntl.ini
%attr(755,root,root) %{php_extensiondir}/pcntl.so
+%if %{with pcre}
+%files pcre
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/PCRE.ini
+%attr(755,root,root) %{php_extensiondir}/pcre.so
+%endif
+
%files pdo
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pdo.ini
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/simplexml.ini
%attr(755,root,root) %{php_extensiondir}/simplexml.so
+%files session
+%defattr(644,root,root,755)
+%doc ext/session/mod_files.sh
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/session.ini
+%attr(755,root,root) %{php_extensiondir}/session.so
+
%files shmop
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/shmop.ini
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/sockets.ini
%attr(755,root,root) %{php_extensiondir}/sockets.so
+%files spl
+%defattr(644,root,root,755)
+%doc ext/spl/{CREDITS,README,TODO}
+%doc ext/spl/examples
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/SPL.ini
+%attr(755,root,root) %{php_extensiondir}/spl.so
+
%if %{with sqlite}
%files sqlite
%defattr(644,root,root,755)
projects / packages / php.git / commitdiff