Mageia Bugzilla – Attachment 9782 Details for
Bug 21916
PHP 7 for Mageia 7
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
remove suhosin, setting to conflicts instead of suggested
php7-1.patch (text/plain), 5.68 KB, created by
Marc Krämer
on 2017-11-11 14:59:40 CET
(
hide
)
Description:
remove suhosin, setting to conflicts instead of suggested
Filename:
MIME Type:
Creator:
Marc Krämer
Created:
2017-11-11 14:59:40 CET
Size:
5.68 KB
patch
obsolete
>Index: SOURCES/php-libtool.diff >=================================================================== >--- SOURCES/php-libtool.diff (Revision 1176951) >+++ SOURCES/php-libtool.diff (nicht existent) >@@ -1,38 +0,0 @@ >-diff -Naurp php-7.0.2RC1/aclocal.m4 php-7.0.2RC1.oden/aclocal.m4 >---- php-7.0.2RC1/aclocal.m4 2015-12-22 16:19:19.000000000 +0100 >-+++ php-7.0.2RC1.oden/aclocal.m4 2015-12-26 07:30:41.619216689 +0100 >-@@ -3776,6 +3776,20 @@ s390*-*linux*|sparc*-*linux*) >- rm -rf conftest* >- ;; >- >-+*-*-linux*) >-+ # Test if the compiler is 64bit >-+ echo 'int i;' > conftest.$ac_ext >-+ lt_cv_cc_64bit_output=no >-+ if AC_TRY_EVAL(ac_compile); then >-+ case `/usr/bin/file conftest.$ac_objext` in >-+ *"ELF 64"*) >-+ lt_cv_cc_64bit_output=yes >-+ ;; >-+ esac >-+ fi >-+ rm -rf conftest* >-+ ;; >-+ >- *-*-sco3.2v5*) >- # On SCO OpenServer 5, we need -belf to get full-featured binaries. >- SAVE_CFLAGS="$CFLAGS" >-@@ -4819,6 +4833,13 @@ linux* | k*bsd*-gnu) >- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" >- fi >- >-+ case $host_cpu:$lt_cv_cc_64bit_output in >-+ powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes) >-+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /usr/X11R6/lib64" >-+ sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64 /usr/X11R6/lib64" >-+ ;; >-+ esac >-+ >- # We used to test for /lib/ld.so.1 and disable shared libraries on >- # powerpc, because MkLinux only supported shared libraries with the >- # GNU dynamic linker. Since this was broken with cross compilers, >Index: SOURCES/sha1.lst >=================================================================== >--- SOURCES/sha1.lst (Revision 1176951) >+++ SOURCES/sha1.lst (Arbeitskopie) >@@ -1,2 +1 @@ >-288cd2055f1e99c6645bb88b2257a6772c176021 php-7.0.2.tar.xz > 15bd37cf6e72a873d71b0ec133eda53aeff9e8cf php-7.1.11.tar.xz >Index: SPECS/php.spec >=================================================================== >--- SPECS/php.spec (Revision 1176951) >+++ SPECS/php.spec (Arbeitskopie) >@@ -25,7 +25,7 @@ > Summary: The PHP scripting language > Name: php > Version: 7.1.11 >-Release: %mkrel 1 >+Release: %mkrel 2 > Source0: http://fr2.php.net/distributions/php-%{version}.tar.xz > Group: Development/PHP > License: PHP License >@@ -172,7 +172,7 @@ > Requires: php-pcre >= %{epoch}:%{version} > Requires: php-posix >= %{epoch}:%{version} > Requires: php-session >= %{epoch}:%{version} >-Recommends: php-suhosin >= 0.9.33 >+#Recommends: php-suhosin >= 0.9.33 > Requires: php-sysvsem >= %{epoch}:%{version} > Requires: php-sysvshm >= %{epoch}:%{version} > Requires: php-tokenizer >= %{epoch}:%{version} >@@ -181,6 +181,7 @@ > Requires: php-zlib >= %{epoch}:%{version} > Requires: php-xml >= %{epoch}:%{version} > Requires: php-timezonedb >= 3:2012.3 >+Conflicts: php-suhosin < 0.9.39 > # php is not fully thread safe > # http://www.php.net/manual/en/faq.installation.php#faq.installation.apache2 > # http://stackoverflow.com/questions/681081/is-php-thread-safe >@@ -210,7 +211,7 @@ > Requires: php-pcre >= %{epoch}:%{version} > Requires: php-posix >= %{epoch}:%{version} > Requires: php-session >= %{epoch}:%{version} >-Recommends: php-suhosin >= 0.9.33 >+#Recommends: php-suhosin >= 0.9.33 > Requires: php-sysvsem >= %{epoch}:%{version} > Requires: php-sysvshm >= %{epoch}:%{version} > Requires: php-timezonedb >= 3:2012.3 >@@ -221,6 +222,7 @@ > Requires: php-xml >= %{epoch}:%{version} > Provides: php = %{epoch}:%{version} > Provides: /usr/bin/php >+Conflicts: php-suhosin < 0.9.39 > > %description cli > PHP is an HTML-embeddable scripting language. PHP offers built-in database >@@ -247,7 +249,7 @@ > Requires: php-pcre >= %{epoch}:%{version} > Requires: php-posix >= %{epoch}:%{version} > Requires: php-session >= %{epoch}:%{version} >-Recommends: php-suhosin >= 0.9.33 >+#Recommends: php-suhosin >= 0.9.33 > Requires: php-sysvsem >= %{epoch}:%{version} > Requires: php-sysvshm >= %{epoch}:%{version} > Requires: php-timezonedb >= 3:2012.3 >@@ -260,6 +262,7 @@ > Provides: php-fcgi = %{epoch}:%{version}-%{release} > # because of a added compat softlink > Conflicts: php-fcgi < %{epoch}:%{version}-%{release} >+Conflicts: php-suhosin < 0.9.39 > > %description cgi > PHP is an HTML-embeddable scripting language. PHP offers built-in database >@@ -514,7 +517,7 @@ > http://www.faqs.org/rfcs/rfc959. This extension is meant for detailed access to > an FTP server providing a wide range of control to the executing script. If you > only wish to read from or write to a file on an FTP server, consider using the >-ftp:// wrapper with the filesystem functions which provide a simpler and more >+ftp:// wrapper with the filesystem functions which provide a simpler and more > intuitive interface. > > %package gd >@@ -792,7 +795,7 @@ > Summary: Sybase Interface driver for PDO > Group: Development/PHP > URL: http://www.php.net/pdo_dblib >-Requires: freetds >= 0.63 >+Requires: freetds >= 0.63 > Requires: php-pdo >= %{epoch}:%{version} > Requires: %{libname} >= %{epoch}:%{version} > >@@ -846,7 +849,7 @@ > > o ibm-db2 - Supports access to IBM DB2 Universal Database, Cloudscape, and > Apache Derby servers through the free DB2 client. ibm-db2 is not >- supported in Mageia. >+ supported in Mageia. > > o unixODBC - Supports access to database servers through the unixODBC driver > manager and the database's own ODBC drivers. >@@ -1231,6 +1234,7 @@ > Requires: php-xml >= %{epoch}:%{version} > Requires: webserver-base > Provides: php = %{epoch}:%{version} >+Conflicts: php-suhosin < 0.9.39 > > %description fpm > PHP is an HTML-embeddable scripting language. PHP offers built-in database >@@ -1795,7 +1799,7 @@ > > %files devel > %doc SELF-CONTAINED-EXTENSIONS CODING_STANDARDS README.* EXTENSIONS >-%doc Zend/ZEND_* README.TESTING* >+%doc Zend/ZEND_* > %{_bindir}/php-config > %{_bindir}/phpize > %{_libdir}/libphp%{php_common_major}_common.so >
Index: SOURCES/php-libtool.diff =================================================================== --- SOURCES/php-libtool.diff (Revision 1176951) +++ SOURCES/php-libtool.diff (nicht existent) @@ -1,38 +0,0 @@ -diff -Naurp php-7.0.2RC1/aclocal.m4 php-7.0.2RC1.oden/aclocal.m4 ---- php-7.0.2RC1/aclocal.m4 2015-12-22 16:19:19.000000000 +0100 -+++ php-7.0.2RC1.oden/aclocal.m4 2015-12-26 07:30:41.619216689 +0100 -@@ -3776,6 +3776,20 @@ s390*-*linux*|sparc*-*linux*) - rm -rf conftest* - ;; - -+*-*-linux*) -+ # Test if the compiler is 64bit -+ echo 'int i;' > conftest.$ac_ext -+ lt_cv_cc_64bit_output=no -+ if AC_TRY_EVAL(ac_compile); then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *"ELF 64"*) -+ lt_cv_cc_64bit_output=yes -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ - *-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" -@@ -4819,6 +4833,13 @@ linux* | k*bsd*-gnu) - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - -+ case $host_cpu:$lt_cv_cc_64bit_output in -+ powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes) -+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /usr/X11R6/lib64" -+ sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64 /usr/X11R6/lib64" -+ ;; -+ esac -+ - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, Index: SOURCES/sha1.lst =================================================================== --- SOURCES/sha1.lst (Revision 1176951) +++ SOURCES/sha1.lst (Arbeitskopie) @@ -1,2 +1 @@ -288cd2055f1e99c6645bb88b2257a6772c176021 php-7.0.2.tar.xz 15bd37cf6e72a873d71b0ec133eda53aeff9e8cf php-7.1.11.tar.xz Index: SPECS/php.spec =================================================================== --- SPECS/php.spec (Revision 1176951) +++ SPECS/php.spec (Arbeitskopie) @@ -25,7 +25,7 @@ Summary: The PHP scripting language Name: php Version: 7.1.11 -Release: %mkrel 1 +Release: %mkrel 2 Source0: http://fr2.php.net/distributions/php-%{version}.tar.xz Group: Development/PHP License: PHP License @@ -172,7 +172,7 @@ Requires: php-pcre >= %{epoch}:%{version} Requires: php-posix >= %{epoch}:%{version} Requires: php-session >= %{epoch}:%{version} -Recommends: php-suhosin >= 0.9.33 +#Recommends: php-suhosin >= 0.9.33 Requires: php-sysvsem >= %{epoch}:%{version} Requires: php-sysvshm >= %{epoch}:%{version} Requires: php-tokenizer >= %{epoch}:%{version} @@ -181,6 +181,7 @@ Requires: php-zlib >= %{epoch}:%{version} Requires: php-xml >= %{epoch}:%{version} Requires: php-timezonedb >= 3:2012.3 +Conflicts: php-suhosin < 0.9.39 # php is not fully thread safe # http://www.php.net/manual/en/faq.installation.php#faq.installation.apache2 # http://stackoverflow.com/questions/681081/is-php-thread-safe @@ -210,7 +211,7 @@ Requires: php-pcre >= %{epoch}:%{version} Requires: php-posix >= %{epoch}:%{version} Requires: php-session >= %{epoch}:%{version} -Recommends: php-suhosin >= 0.9.33 +#Recommends: php-suhosin >= 0.9.33 Requires: php-sysvsem >= %{epoch}:%{version} Requires: php-sysvshm >= %{epoch}:%{version} Requires: php-timezonedb >= 3:2012.3 @@ -221,6 +222,7 @@ Requires: php-xml >= %{epoch}:%{version} Provides: php = %{epoch}:%{version} Provides: /usr/bin/php +Conflicts: php-suhosin < 0.9.39 %description cli PHP is an HTML-embeddable scripting language. PHP offers built-in database @@ -247,7 +249,7 @@ Requires: php-pcre >= %{epoch}:%{version} Requires: php-posix >= %{epoch}:%{version} Requires: php-session >= %{epoch}:%{version} -Recommends: php-suhosin >= 0.9.33 +#Recommends: php-suhosin >= 0.9.33 Requires: php-sysvsem >= %{epoch}:%{version} Requires: php-sysvshm >= %{epoch}:%{version} Requires: php-timezonedb >= 3:2012.3 @@ -260,6 +262,7 @@ Provides: php-fcgi = %{epoch}:%{version}-%{release} # because of a added compat softlink Conflicts: php-fcgi < %{epoch}:%{version}-%{release} +Conflicts: php-suhosin < 0.9.39 %description cgi PHP is an HTML-embeddable scripting language. PHP offers built-in database @@ -514,7 +517,7 @@ http://www.faqs.org/rfcs/rfc959. This extension is meant for detailed access to an FTP server providing a wide range of control to the executing script. If you only wish to read from or write to a file on an FTP server, consider using the -ftp:// wrapper with the filesystem functions which provide a simpler and more +ftp:// wrapper with the filesystem functions which provide a simpler and more intuitive interface. %package gd @@ -792,7 +795,7 @@ Summary: Sybase Interface driver for PDO Group: Development/PHP URL: http://www.php.net/pdo_dblib -Requires: freetds >= 0.63 +Requires: freetds >= 0.63 Requires: php-pdo >= %{epoch}:%{version} Requires: %{libname} >= %{epoch}:%{version} @@ -846,7 +849,7 @@ o ibm-db2 - Supports access to IBM DB2 Universal Database, Cloudscape, and Apache Derby servers through the free DB2 client. ibm-db2 is not - supported in Mageia. + supported in Mageia. o unixODBC - Supports access to database servers through the unixODBC driver manager and the database's own ODBC drivers. @@ -1231,6 +1234,7 @@ Requires: php-xml >= %{epoch}:%{version} Requires: webserver-base Provides: php = %{epoch}:%{version} +Conflicts: php-suhosin < 0.9.39 %description fpm PHP is an HTML-embeddable scripting language. PHP offers built-in database @@ -1795,7 +1799,7 @@ %files devel %doc SELF-CONTAINED-EXTENSIONS CODING_STANDARDS README.* EXTENSIONS -%doc Zend/ZEND_* README.TESTING* +%doc Zend/ZEND_* %{_bindir}/php-config %{_bindir}/phpize %{_libdir}/libphp%{php_common_major}_common.so
View Attachment As Raw
Actions:
View
Attachments on
bug 21916
:
9767
| 9782