[php] - PHP 5.6.0 is GA http://php.net/releases/5_6_0.php - fix ZTS man pages, upstream patch for 67878 -
Remi Collet
remi at fedoraproject.org
Thu Aug 28 10:59:41 UTC 2014
commit c82a06c4a3d23ae89d00e473c83d08d59eee78df
Author: Remi Collet <remi at fedoraproject.org>
Date: Thu Aug 28 12:59:40 2014 +0200
- PHP 5.6.0 is GA http://php.net/releases/5_6_0.php
- fix ZTS man pages, upstream patch for 67878
- provides php(httpd)
.gitignore | 1 +
php-bug67878.patch | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++
php.spec | 17 ++++-
sources | 2 +-
4 files changed, 216 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e765ce2..9556a05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ php-5.5.*.xz
/php-5.6.0RC2-strip.tar.xz
/php-5.6.0RC3-strip.tar.xz
/php-5.6.0RC4-strip.tar.xz
+/php-5.6.0-strip.tar.xz
diff --git a/php-bug67878.patch b/php-bug67878.patch
new file mode 100644
index 0000000..c2669cf
--- /dev/null
+++ b/php-bug67878.patch
@@ -0,0 +1,201 @@
+From e02616866fe2461836dc8f7f6e369b3b25644cc4 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi at php.net>
+Date: Thu, 21 Aug 2014 09:09:21 +0200
+Subject: [PATCH] Fix bug #67878 program_prefix not honoured in man pages
+
+- add @program_prefix@ in php, phpize and php-config man pages
+- set date to 2014
+- fix "SEE ALSO" alignment
+---
+ sapi/cli/php.1.in | 34 +++++++++++++++++-----------------
+ scripts/man1/php-config.1.in | 14 +++++++-------
+ scripts/man1/phpize.1.in | 14 +++++++-------
+ 3 files changed, 31 insertions(+), 31 deletions(-)
+
+diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in
+index 4d536df..c062f3d 100644
+--- a/sapi/cli/php.1.in
++++ b/sapi/cli/php.1.in
+@@ -1,24 +1,24 @@
+-.TH PHP 1 "2014" "The PHP Group" "Scripting Language"
++.TH @program_prefix at php 1 "2014" "The PHP Group" "Scripting Language"
+ .SH NAME
+-php \- PHP Command Line Interface 'CLI'
++ at program_prefix@php \- PHP Command Line Interface 'CLI'
+ .P
+-php-cgi \- PHP Common Gateway Interface 'CGI' command
++ at program_prefix@php-cgi \- PHP Common Gateway Interface 'CGI' command
+ .SH SYNOPSIS
+-.B php
++.B @program_prefix at php
+ [options] [
+ .B \-f\fP ]
+ .IR file
+ [[\-\-]
+ .IR args.\|.\|. ]
+ .LP
+-.B php
++.B @program_prefix at php
+ [options]
+ .B \-r
+ .IR code
+ [[\-\-]
+ .IR args.\|.\|. ]
+ .LP
+-.B php
++.B @program_prefix at php
+ [options] [\-B
+ .IR begin_code ]
+ .B \-R
+@@ -28,7 +28,7 @@ php-cgi \- PHP Common Gateway Interface 'CGI' command
+ [[\-\-]
+ .IR args.\|.\|. ]
+ .LP
+-.B php
++.B @program_prefix at php
+ [options] [\-B
+ .IR begin_code ]
+ .B \-F
+@@ -38,13 +38,13 @@ php-cgi \- PHP Common Gateway Interface 'CGI' command
+ [[\-\-]
+ .IR args.\|.\|. ]
+ .LP
+-.B php
++.B @program_prefix at php
+ [options] \-\- [
+ .IR args.\|.\|. ]
+ .LP
+-\fBphp \fP[options] \fB\-a\fP
++\fB at program_prefix@php \fP[options] \fB\-a\fP
+ .LP
+-.B php
++.B @program_prefix at php
+ [options] \-S
+ .IR addr:port
+ [\-t
+@@ -374,35 +374,35 @@ The standard configuration file will only be used when
+ cannot be found.
+ .SH EXAMPLES
+ .TP 5
+-\fIphp \-r 'echo "Hello World\\n";'\fP
++\fI at program_prefix@php \-r 'echo "Hello World\\n";'\fP
+ This command simply writes the text "Hello World" to standard out.
+ .TP
+-\fIphp \-r 'print_r(gd_info());'\fP
++\fI at program_prefix@php \-r 'print_r(gd_info());'\fP
+ This shows the configuration of your gd extension. You can use this
+ to easily check which image formats you can use. If you have any
+ dynamic modules you may want to use the same ini file that php uses
+ when executed from your webserver. There are more extensions which
+ have such a function. For dba use:
+ .RS
+-\fIphp \-r 'print_r(dba_handlers(1));'\fP
++\fI at program_prefix@php \-r 'print_r(dba_handlers(1));'\fP
+ .RE
+ .TP
+-\fIphp \-R 'echo strip_tags($argn)."\\n";'\fP
++\fI at program_prefix@php \-R 'echo strip_tags($argn)."\\n";'\fP
+ This PHP command strips off the HTML tags line by line and outputs the
+ result. To see how it works you can first look at the following PHP command
+ \'\fIphp \-d html_errors=1 \-i\fP\' which uses PHP to output HTML formatted
+ configuration information. If you then combine those two
+ \'\fIphp \.\.\.|php \.\.\.\fP\' you'll see what happens.
+ .TP
+-\fIphp \-E 'echo "Lines: $argi\\n";'\fP
++\fI at program_prefix@php \-E 'echo "Lines: $argi\\n";'\fP
+ Using this PHP command you can count the lines being input.
+ .TP
+-\fIphp \-R '@$l+=count(file($argn));' \-E 'echo "Lines:$l\\n";'\fP
++\fI at program_prefix@php \-R '@$l+=count(file($argn));' \-E 'echo "Lines:$l\\n";'\fP
+ In this example PHP expects each input line being a file. It counts all lines
+ of the files specified by each input line and shows the summarized result.
+ You may combine this with tools like find and change the php scriptlet.
+ .TP
+-\fIphp \-R 'echo "$argn\\n"; fgets(STDIN);'\fP
++\fI at program_prefix@php \-R 'echo "$argn\\n"; fgets(STDIN);'\fP
+ Since you have access to STDIN from within \-B \-R \-F and \-E you can skip
+ certain input lines with your code. But note that in such cases $argi only
+ counts the lines being processed by php itself. Having read this you will
+diff --git a/scripts/man1/php-config.1.in b/scripts/man1/php-config.1.in
+index 5c60408..ae2ee56 100644
+--- a/scripts/man1/php-config.1.in
++++ b/scripts/man1/php-config.1.in
+@@ -1,12 +1,12 @@
+-.TH php\-config 1 "2010" "The PHP Group" "Scripting Language"
++.TH @program_prefix at php\-config 1 "2014" "The PHP Group" "Scripting Language"
+ .SH NAME
+-php\-config \- get information about PHP configuration and compile options
++ at program_prefix@php\-config \- get information about PHP configuration and compile options
+ .SH SYNOPSIS
+-.B php\-config
++.B @program_prefix at php\-config
+ [options]
+ .LP
+ .SH DESCRIPTION
+-.B php\-config
++.B @program_prefix at php\-config
+ is a simple shell script for obtaining information about installed PHP configuration.
+ .SH OPTIONS
+ .TP 15
+@@ -57,15 +57,15 @@ PHP version
+ .PD 0
+ .B \-\-vernum
+ PHP version as integer
+-.TP
++.RS
+ .PD 1
+ .P
+ .SH SEE ALSO
+-.BR php (1)
++.BR @program_prefix at php (1)
+ .SH VERSION INFORMATION
+ This manpage describes \fBphp\fP, version @PHP_VERSION at .
+ .SH COPYRIGHT
+-Copyright \(co 1997\-2010 The PHP Group
++Copyright \(co 1997\-2014 The PHP Group
+ .LP
+ This source file is subject to version 3.01 of the PHP license,
+ that is bundled with this package in the file LICENSE, and is
+diff --git a/scripts/man1/phpize.1.in b/scripts/man1/phpize.1.in
+index 8f62f86..e49adb1 100644
+--- a/scripts/man1/phpize.1.in
++++ b/scripts/man1/phpize.1.in
+@@ -1,12 +1,12 @@
+-.TH phpize 1 "2010" "The PHP Group" "Scripting Language"
++.TH @program_prefix at phpize 1 "2014" "The PHP Group" "Scripting Language"
+ .SH NAME
+-phpize \- prepare a PHP extension for compiling
++ at program_prefix@phpize \- prepare a PHP extension for compiling
+ .SH SYNOPSIS
+-.B phpize
++.B @program_prefix at phpize
+ [options]
+ .LP
+ .SH DESCRIPTION
+-.B phpize
++.B @program_prefix at phpize
+ is a shell script to prepare PHP extension for compiling.
+ .SH OPTIONS
+ .TP 15
+@@ -24,15 +24,15 @@ Prints usage information
+ .PD 1
+ .B \-v
+ Prints API version information
+-.TP
++.RS
+ .PD 1
+ .P
+ .SH SEE ALSO
+-.BR php (1)
++.BR @program_prefix at php (1)
+ .SH VERSION INFORMATION
+ This manpage describes \fBphp\fP, version @PHP_VERSION at .
+ .SH COPYRIGHT
+-Copyright \(co 1997\-2010 The PHP Group
++Copyright \(co 1997\-2014 The PHP Group
+ .LP
+ This source file is subject to version 3.01 of the PHP license,
+ that is bundled with this package in the file LICENSE, and is
+--
+1.9.2
+
diff --git a/php.spec b/php.spec
index 0ccb32e..d4477f2 100644
--- a/php.spec
+++ b/php.spec
@@ -57,12 +57,12 @@
%global db_devel libdb-devel
%endif
-%global rcver RC4
+#global rcver RC4
Summary: PHP scripting language for creating dynamic web sites
Name: php
Version: 5.6.0
-Release: 0.8.%{rcver}%{?dist}
+Release: 1%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -112,6 +112,7 @@ Patch46: php-5.4.9-fixheader.patch
Patch47: php-5.4.9-phpinfo.patch
# Upstream fixes (100+)
+Patch100: php-bug67878.patch
# Security fixes (200+)
@@ -152,6 +153,8 @@ Requires: php-common%{?_isa} = %{version}-%{release}
Requires: php-cli%{?_isa} = %{version}-%{release}
# To ensure correct /var/lib/php/session ownership:
Requires(pre): httpd-filesystem
+# php engine for Apache httpd webserver
+Provides: php(httpd)
%description
@@ -207,6 +210,8 @@ Requires(pre): httpd-filesystem
# For php.conf in /etc/httpd/conf.d
# and version 2.4.10 for proxy support in SetHandler
Requires: httpd-filesystem >= 2.4.10
+# php engine for Apache httpd webserver
+Provides: php(httpd)
%description fpm
PHP-FPM (FastCGI Process Manager) is an alternative PHP FastCGI
@@ -708,6 +713,7 @@ httpd -V | grep -q 'threaded:.*yes' && exit 1
%patch47 -p1 -b .phpinfo
# upstream patches
+%patch100 -p1 -b .b67878
# security patches
@@ -1466,8 +1472,11 @@ rm -f README.{Zeus,QNX,CVS-RULES}
%changelog
-* Tue Aug 26 2014 David Tardon <dtardon at redhat.com> - 5.6.0-0.8.RC4
-- rebuild for ICU 53.1
+* Thu Aug 28 2014 Remi Collet <remi at fedoraproject.org> 5.6.0-1
+- PHP 5.6.0 is GA
+ http://php.net/releases/5_6_0.php
+- fix ZTS man pages, upstream patch for 67878
+- provides php(httpd)
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.6.0-0.7.RC4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index 490191d..914ae1c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5d344cf13b466494583714059d3890ca php-5.6.0RC4-strip.tar.xz
+ac14aba0fb07f390809f03d388b68d72 php-5.6.0-strip.tar.xz
More information about the scm-commits
mailing list