2067da
From c940aab7895fa4cb109e7790ae14080090b04959 Mon Sep 17 00:00:00 2001
2067da
From: Remi Collet <remi@php.net>
2067da
Date: Tue, 2 Jul 2013 10:42:47 +0200
2067da
Subject: [PATCH] Fixed Bug #65143 Missing php-cgi man page
2067da
2067da
Currently php-cgi man page is a simple redirect to
2067da
php (CLI) man page.
2067da
2067da
Could be splited / improved in the future.
2067da
---
2067da
 sapi/cgi/Makefile.frag | 3 +++
2067da
 sapi/cgi/config9.m4    | 2 ++
2067da
 sapi/cgi/php-cgi.1.in  | 1 +
2067da
 sapi/cli/php.1.in      | 2 ++
2067da
 4 files changed, 8 insertions(+)
2067da
 create mode 100644 sapi/cgi/php-cgi.1.in
2067da
2067da
diff --git a/sapi/cgi/Makefile.frag b/sapi/cgi/Makefile.frag
2067da
index 505119e..d54dd40 100644
2067da
--- a/sapi/cgi/Makefile.frag
2067da
+++ b/sapi/cgi/Makefile.frag
2067da
@@ -6,4 +6,7 @@ $(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CGI_OBJS)
2067da
 install-cgi: $(SAPI_CGI_PATH)
2067da
 	@echo "Installing PHP CGI binary:        $(INSTALL_ROOT)$(bindir)/"
2067da
 	@$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT)
2067da
+	@echo "Installing PHP CGI man page:      $(INSTALL_ROOT)$(mandir)/man1/"
2067da
+	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
2067da
+	@$(INSTALL_DATA) sapi/cgi/php-cgi.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php-cgi$(program_suffix).1
2067da
 
2067da
diff --git a/sapi/cgi/config9.m4 b/sapi/cgi/config9.m4
2067da
index 67251ae..49e61c8 100644
2067da
--- a/sapi/cgi/config9.m4
2067da
+++ b/sapi/cgi/config9.m4
2067da
@@ -71,6 +71,8 @@ if test "$PHP_CGI" != "no"; then
2067da
     dnl Expose to Makefile
2067da
     PHP_SUBST(SAPI_CGI_PATH)
2067da
     PHP_SUBST(BUILD_CGI)
2067da
+
2067da
+    PHP_OUTPUT(sapi/cgi/php-cgi.1)
2067da
 else
2067da
   AC_MSG_RESULT(yes)
2067da
 fi
2067da
diff --git a/sapi/cgi/php-cgi.1.in b/sapi/cgi/php-cgi.1.in
2067da
new file mode 100644
2067da
index 0000000..340e6c5
2067da
--- /dev/null
2067da
+++ b/sapi/cgi/php-cgi.1.in
2067da
@@ -0,0 +1 @@
2067da
+.so man1/php.1
2067da
diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in
2067da
index 0e9d07a..6f0266d 100644
2067da
--- a/sapi/cli/php.1.in
2067da
+++ b/sapi/cli/php.1.in
2067da
@@ -1,6 +1,8 @@
2067da
 .TH PHP 1 "2013" "The PHP Group" "Scripting Language"
2067da
 .SH NAME
2067da
 php \- PHP Command Line Interface 'CLI'
2067da
+.P
2067da
+php-cgi \- PHP Command Gateway Interface 'CGI'
2067da
 .SH SYNOPSIS
2067da
 .B php
2067da
 [options] [
2067da
-- 
2067da
1.7.11.5
2067da
2067da
From f4ce5e7fb65ce215ea5fd182a90aaa4d634f6023 Mon Sep 17 00:00:00 2001
2067da
From: Remi Collet <remi@php.net>
2067da
Date: Tue, 2 Jul 2013 10:46:50 +0200
2067da
Subject: [PATCH] Fixed Bug #65142 Missing phar man page
2067da
2067da
Simple man page from phar help output.
2067da
---
2067da
 NEWS                    |   3 +
2067da
 ext/phar/Makefile.frag  |   4 +
2067da
 ext/phar/config.m4      |   2 +
2067da
 ext/phar/phar.1.in      | 523 ++++++++++++++++++++++++++++++++++++++++++++++++
2067da
 ext/phar/phar.phar.1.in |   1 +
2067da
 5 files changed, 533 insertions(+)
2067da
 create mode 100644 ext/phar/phar.1.in
2067da
 create mode 100644 ext/phar/phar.phar.1.in
2067da
2067da
diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag
2067da
index b1c820f..ed6de9f 100644
2067da
--- a/ext/phar/Makefile.frag
2067da
+++ b/ext/phar/Makefile.frag
2067da
@@ -40,3 +40,7 @@ install-pharcmd: pharcmd
2067da
 	$(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)
2067da
 	-@rm -f $(INSTALL_ROOT)$(bindir)/phar
2067da
 	$(LN_S) -f $(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar
2067da
+	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
2067da
+	@$(INSTALL_DATA) $(builddir)/phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.1
2067da
+	@$(INSTALL_DATA) $(builddir)/phar.phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.phar.1
2067da
+
2067da
diff --git a/ext/phar/config.m4 b/ext/phar/config.m4
2067da
index 2ac7f3d..d424060 100644
2067da
--- a/ext/phar/config.m4
2067da
+++ b/ext/phar/config.m4
2067da
@@ -27,4 +27,6 @@ if test "$PHP_PHAR" != "no"; then
2067da
   PHP_ADD_EXTENSION_DEP(phar, hash, true)
2067da
   PHP_ADD_EXTENSION_DEP(phar, spl, true)
2067da
   PHP_ADD_MAKEFILE_FRAGMENT
2067da
+
2067da
+  PHP_OUTPUT(ext/phar/phar.1 ext/phar/phar.phar.1)
2067da
 fi
2067da
diff --git a/ext/phar/phar.1.in b/ext/phar/phar.1.in
2067da
new file mode 100644
2067da
index 0000000..259a2ba
2067da
--- /dev/null
2067da
+++ b/ext/phar/phar.1.in
2067da
@@ -0,0 +1,523 @@
2067da
+.TH PHAR 1 "2013" "The PHP Group" "User Commands"
2067da
+.SH NAME
2067da
+phar, phar.phar \- PHAR (PHP archive) command line tool
2067da
+.SH SYNOPSIS
2067da
+.B phar
2067da
+<command> [options] ...
2067da
+.LP
2067da
+.SH DESCRIPTION
2067da
+The \fBPHAR\fP file format provides a way to put entire PHP applications into a single
2067da
+file called a "phar" (PHP Archive) for easy distribution and installation.
2067da
+.P
2067da
+With the \fBphar\fP command you can create, update or extract PHP archives.
2067da
+.P
2067da
+Commands: 
2067da
+add compress delete extract help help-list info list meta-del
2067da
+meta-get meta-set pack sign stub-get stub-set tree version
2067da
+
2067da
+.SH add command
2067da
+Add entries to a PHAR package.
2067da
+.P
2067da
+Required arguments:
2067da
+.TP 15
2067da
+.PD
2067da
+.B -f \fIfile\fP
2067da
+Specifies the phar \fIfile\fP to work on.
2067da
+.TP
2067da
+.PD
2067da
+.B ...
2067da
+Any number of input files and directories. If -i is in
2067da
+use then ONLY files and matching the given regular
2067da
+expression are being packed. If -x is given then files
2067da
+matching that regular expression are NOT being packed.
2067da
+.P
2067da
+Optional arguments:
2067da
+.TP 15
2067da
+.PD
2067da
+.B \-a \fIalias\fP
2067da
+Provide an \fIalias\fP name for the phar file.
2067da
+.TP
2067da
+.PD
2067da
+.B \-c \fIalgo\fP
2067da
+Compression algorithm (see 
2067da
+.SM
2067da
+.B COMPRESSION
2067da
+)
2067da
+.TP
2067da
+.PD
2067da
+.B \-i \fIregex\fP
2067da
+Specifies a regular expression for input files.
2067da
+.TP
2067da
+.PD
2067da
+.B \-l \fIlevel\fP
2067da
+Number of preceding subdirectories to strip from file entries
2067da
+.TP
2067da
+.PD
2067da
+.B \-x \fIregex\fP
2067da
+Regular expression for input files to exclude.
2067da
+
2067da
+.SH compress command
2067da
+Compress or uncompress all files or a selected entry.
2067da
+.P
2067da
+Required arguments:
2067da
+.TP 15
2067da
+.PD
2067da
+.B \-c \fIalgo\fP
2067da
+Compression algorithm (see 
2067da
+.SM
2067da
+.B COMPRESSION
2067da
+)
2067da
+.TP
2067da
+.PD
2067da
+.B -f \fIfile\fP
2067da
+Specifies the phar \fIfile\fP to work on.
2067da
+.P
2067da
+Optional arguments:
2067da
+.TP 15
2067da
+.PD
2067da
+.B -e \fIentry\fP
2067da
+Name of \fIentry\fP to work on (must include PHAR internal
2067da
+directory name if any).
2067da
+
2067da
+.SH delete command
2067da
+Delete entry from a PHAR archive
2067da
+.P
2067da
+Required arguments:
2067da
+.TP 15
2067da
+.PD
2067da
+.B \-e \fIentry\fP
2067da
+Name of \fIentry\fP to work on (must include PHAR internal
2067da
+directory name if any).
2067da
+.TP
2067da
+.PD
2067da
+.B -f \fIfile\fP
2067da
+Specifies the phar \fIfile\fP to work on.
2067da
+
2067da
+.SH extract command
2067da
+Extract a PHAR package to a directory.
2067da
+.P
2067da
+Required arguments:
2067da
+.TP 15
2067da
+.PD
2067da
+.B -f \fIfile\fP
2067da
+Specifies the phar \fIfile\fP to work on.
2067da
+.P
2067da
+Optional arguments:
2067da
+.TP 15
2067da
+.PD
2067da
+.B -i \fIregex\fP
2067da
+Specifies a regular expression for input files.
2067da
+.TP
2067da
+.PD
2067da
+.B -x \fIregex\fP
2067da
+Regular expression for input files to exclude.
2067da
+.TP
2067da
+.PD
2067da
+.B ...
2067da
+Directory to extract to (defaults to '.').
2067da
+
2067da
+
2067da
+.SH help command
2067da
+This help or help for a selected command.
2067da
+.P
2067da
+Optional arguments:
2067da
+.TP 15
2067da
+.PD
2067da
+.B ...
2067da
+Optional command to retrieve help for.
2067da
+
2067da
+.SH help-list command
2067da
+Lists available commands.
2067da
+
2067da
+.SH info command
2067da
+Get information about a PHAR package.
2067da
+.P
2067da
+By using -k it is possible to return a single value.
2067da
+.P
2067da
+Required arguments:
2067da
+.TP 15
2067da
+.PD
2067da
+.B -f \fIfile\fP
2067da
+Specifies the phar \fIfile\fP to work on.
2067da
+.P
2067da
+Optional arguments:
2067da
+.TP 15
2067da
+.PD
2067da
+.B -k \fIindex\fP
2067da
+Subscription \fIindex\fP to work on.
2067da
+
2067da
+.SH list command
2067da
+List contents of a PHAR archive.
2067da
+.P
2067da
+Required arguments:
2067da
+.TP 15
2067da
+.PD
2067da
+.B -f \fIfile\fP
2067da
+Specifies the phar \fIfile\fP to work on.
2067da
+.P
2067da
+Optional arguments:
2067da
+.TP 15
2067da
+.PD
2067da
+.B -i \fIregex\fP
2067da
+Specifies a regular expression for input files.
2067da
+.TP
2067da
+.PD
2067da
+.B -x \fIregex\fP
2067da
+Regular expression for input files to exclude.
2067da
+
2067da
+
2067da
+.SH meta-del command
2067da
+Delete meta information of a PHAR entry or a PHAR package.
2067da
+.P
2067da
+If -k is given then the metadata is expected to be an array and the
2067da
+given index is being deleted.
2067da
+.P
2067da
+If something was deleted the return value is 0 otherwise it is 1.
2067da
+.P
2067da
+Required arguments:
2067da
+.TP 15
2067da
+.PD
2067da
+.B -f \fIfile\fP
2067da
+Specifies the phar \fIfile\fP to work on.
2067da
+.P
2067da
+Optional arguments:
2067da
+.TP 15
2067da
+.PD
2067da
+.B -e \fIentry\fP
2067da
+Name of \fIentry\fP to work on (must include PHAR internal
2067da
+directory name if any).
2067da
+.TP
2067da
+.PD
2067da
+.B -k \fIindex\fP
2067da
+Subscription \fIindex\fP to work on.
2067da
+
2067da
+.SH meta-get command
2067da
+Get meta information of a PHAR entry or a PHAR package in serialized from. If
2067da
+no output file is specified for meta data then stdout is being used.
2067da
+You can also specify a particular index using -k. In that case the
2067da
+metadata is expected to be an array and the value of the given index
2067da
+is returned using echo rather than using serialize. If that index does
2067da
+not exist or no meta data is present then the return value is 1.
2067da
+.P
2067da
+Required arguments:
2067da
+.TP 15
2067da
+.PD
2067da
+.B -f \fIfile\fP
2067da
+Specifies the phar \fIfile\fP to work on.
2067da
+.P
2067da
+Optional arguments:
2067da
+.TP 15
2067da
+.PD
2067da
+.B -e \fIentry\fP
2067da
+Name of \fIentry\fP to work on (must include PHAR internal
2067da
+directory name if any).
2067da
+.TP
2067da
+.PD
2067da
+.B -k \fIindex\fP
2067da
+Subscription \fIindex\fP to work on.
2067da
+
2067da
+.SH meta-set command
2067da
+Set meta data of a PHAR entry or a PHAR package using serialized input. If no
2067da
+input file is specified for meta data then stdin is being used. You can
2067da
+also specify a particular index using -k. In that case the metadata is
2067da
+expected to be an array and the value of the given index is being set.
2067da
+If the metadata is not present or empty a new array will be created.
2067da
+If the metadata is present and a flat value then the return value is
2067da
+1. Also using -k the input is been taken directly rather then being
2067da
+serialized.
2067da
+.P
2067da
+Required arguments:
2067da
+.TP 15
2067da
+.PD
2067da
+.B -f \fIfile\fP
2067da
+Specifies the phar \fIfile\fP to work on.
2067da
+.TP
2067da
+.PD
2067da
+.B -m \fImeta\fP
2067da
+Meta data to store with entry (serialized php data).
2067da
+.P
2067da
+Optional arguments:
2067da
+.TP 15
2067da
+.PD
2067da
+.B -e \fIentry\fP
2067da
+Name of \fIentry\fP to work on (must include PHAR internal
2067da
+directory name if any).
2067da
+.TP
2067da
+.PD
2067da
+.B -k \fIindex\fP
2067da
+Subscription \fIindex\fP to work on.
2067da
+
2067da
+.SH pack command
2067da
+Pack files into a PHAR archive.
2067da
+.P
2067da
+When using -s <stub>, then the stub file is being excluded from the
2067da
+list of input files/dirs.To create an archive that contains PEAR class
2067da
+PHP_Archive then point -p argument to PHP/Archive.php.
2067da
+.P
2067da
+Required arguments:
2067da
+.TP 15
2067da
+.PD
2067da
+.B -f \fIfile\fP
2067da
+Specifies the phar \fIfile\fP to work on.
2067da
+.TP
2067da
+.PD
2067da
+.B ...
2067da
+Any number of input files and directories. If -i is in
2067da
+use then ONLY files and matching the given regular
2067da
+expression are being packed. If -x is given then files
2067da
+matching that regular expression are NOT being packed.
2067da
+.P
2067da
+Optional arguments:
2067da
+.TP 15
2067da
+.PD
2067da
+.B \-a \fIalias\fP
2067da
+Provide an \fIalias\fP name for the phar file.
2067da
+.TP
2067da
+.PD
2067da
+.B \-b \fIbang\fP
2067da
+Hash-bang line to start the archive (e.g. #!/usr/bin/php).
2067da
+The hash mark itself '#!' and the newline character are optional.
2067da
+.TP
2067da
+.PD
2067da
+.B \-c \fIalgo\fP
2067da
+Compression algorithm (see 
2067da
+.SM
2067da
+.B COMPRESSION
2067da
+)
2067da
+.TP
2067da
+.PD
2067da
+.B \-h \fIhash\fP
2067da
+Selects the \fIhash\fP algorithm (see 
2067da
+.SM
2067da
+.B HASH
2067da
+)
2067da
+.TP
2067da
+.PD
2067da
+.B \-i \fIregex\fP
2067da
+Specifies a regular expression for input files.
2067da
+.TP
2067da
+.PD
2067da
+.B \-l \fIlevel\fP
2067da
+Number of preceding subdirectories to strip from file entries
2067da
+.TP
2067da
+.PD
2067da
+.B \-p \fIloader\fP
2067da
+Location of PHP_Archive class file (pear list-files
2067da
+PHP_Archive).You can use '0' or '1' to locate it
2067da
+automatically using the mentioned pear command. When
2067da
+using '0' the command does not error out when the class
2067da
+file cannot be located. This switch also adds some code
2067da
+around the stub so that class PHP_Archive gets
2067da
+registered as phar:// stream wrapper if necessary. And
2067da
+finally this switch will add the file phar.inc from
2067da
+this package and load it to ensure class Phar is
2067da
+present.
2067da
+.TP
2067da
+.PD
2067da
+.B \-s \fIstub\fP
2067da
+Select the \fIstub\fP file.
2067da
+.TP
2067da
+.PD
2067da
+.B \-x \fIregex\fP
2067da
+Regular expression for input files to exclude.
2067da
+.TP
2067da
+.PD
2067da
+.B \-y \fIkey\fP
2067da
+Private \fIkey\fP for OpenSSL signing.
2067da
+
2067da
+.SH sign command
2067da
+Set signature hash algorithm.
2067da
+.P
2067da
+Required arguments:
2067da
+.TP 15
2067da
+.PD
2067da
+.B -f \fIfile\fP
2067da
+Specifies the phar \fIfile\fP to work on.
2067da
+.TP
2067da
+.PD
2067da
+.B \-h \fIhash\fP
2067da
+Selects the \fIhash\fP algorithm (see 
2067da
+.SM
2067da
+.B HASH
2067da
+)
2067da
+.P
2067da
+Optional arguments:
2067da
+.TP 15
2067da
+.PD
2067da
+.B \-y \fIkey\fP
2067da
+Private \fIkey\fP for OpenSSL signing.
2067da
+
2067da
+.SH stub-get command
2067da
+Get the stub of a PHAR file. If no output file is specified as stub then stdout
2067da
+is being used.
2067da
+.P
2067da
+Required arguments:
2067da
+.TP 15
2067da
+.PD
2067da
+.B -f \fIfile\fP
2067da
+Specifies the phar \fIfile\fP to work on.
2067da
+.P
2067da
+Optional arguments:
2067da
+.TP 15
2067da
+.PD
2067da
+.B \-s \fIstub\fP
2067da
+Select the \fIstub\fP file.
2067da
+
2067da
+.SH stub-set command
2067da
+Set the stub of a PHAR file. If no input file is specified as stub then stdin
2067da
+is being used.
2067da
+.P
2067da
+Required arguments:
2067da
+.TP 15
2067da
+.PD
2067da
+.B -f \fIfile\fP
2067da
+Specifies the phar \fIfile\fP to work on.
2067da
+.P
2067da
+Optional arguments:
2067da
+.TP 15
2067da
+.PD
2067da
+.B \-b \fIbang\fP
2067da
+Hash-bang line to start the archive (e.g. #!/usr/bin/php).
2067da
+The hash mark itself '#!' and the newline character are optional.
2067da
+.TP
2067da
+.PD
2067da
+.B \-p \fIloader\fP
2067da
+Location of PHP_Archive class file (pear list-files
2067da
+PHP_Archive).You can use '0' or '1' to locate it
2067da
+automatically using the mentioned pear command. When
2067da
+using '0' the command does not error out when the class
2067da
+file cannot be located. This switch also adds some code
2067da
+around the stub so that class PHP_Archive gets
2067da
+registered as phar:// stream wrapper if necessary. And
2067da
+finally this switch will add the file phar.inc from
2067da
+this package and load it to ensure class Phar is
2067da
+present.
2067da
+.TP
2067da
+.PD
2067da
+.B \-s \fIstub\fP
2067da
+Select the \fIstub\fP file.
2067da
+
2067da
+
2067da
+.SH tree command
2067da
+Get a directory tree for a PHAR archive.
2067da
+.P
2067da
+Required arguments:
2067da
+.TP 15
2067da
+.PD
2067da
+.B -f \fIfile\fP
2067da
+Specifies the phar \fIfile\fP to work on.
2067da
+.P
2067da
+Optional arguments:
2067da
+.TP 15
2067da
+.PD
2067da
+.B \-i \fIregex\fP
2067da
+Specifies a regular expression for input files.
2067da
+.TP
2067da
+.PD
2067da
+.B \-x \fIregex\fP
2067da
+Regular expression for input files to exclude.
2067da
+
2067da
+.SH version command
2067da
+Get information about the PHAR environment and the tool version.
2067da
+
2067da
+
2067da
+.SH COMPRESSION
2067da
+Algorithms:
2067da
+.TP 15
2067da
+.PD
2067da
+.B 0
2067da
+No compression
2067da
+.TP
2067da
+.PD
2067da
+.B none
2067da
+No compression
2067da
+.TP
2067da
+.PD
2067da
+.B auto
2067da
+Automatically select compression algorithm
2067da
+.TP
2067da
+.PD
2067da
+.B gz
2067da
+GZip compression
2067da
+.TP
2067da
+.PD
2067da
+.B gzip
2067da
+GZip compression
2067da
+.TP
2067da
+.PD
2067da
+.B bz2
2067da
+BZip2 compression
2067da
+.TP
2067da
+.PD
2067da
+.B bzip2
2067da
+BZip2 compression
2067da
+
2067da
+.SH HASH
2067da
+Algorithms:
2067da
+.TP 15
2067da
+.PD
2067da
+.TP
2067da
+.PD
2067da
+.B md5
2067da
+MD5
2067da
+.TP
2067da
+.PD
2067da
+.B sha1
2067da
+SHA1
2067da
+.TP
2067da
+.PD
2067da
+.B sha256
2067da
+SHA256
2067da
+.TP
2067da
+.PD
2067da
+.B sha512
2067da
+SHA512
2067da
+.TP
2067da
+.PD
2067da
+.B openssl
2067da
+OpenSSL
2067da
+
2067da
+.SH SEE ALSO
2067da
+For a more or less complete description of PHAR look here:
2067da
+.PD 0
2067da
+.P
2067da
+.B http://php.net/phar
2067da
+.PD 1
2067da
+.P
2067da
+.SH BUGS
2067da
+You can view the list of known bugs or report any new bug you
2067da
+found at:
2067da
+.PD 0
2067da
+.P
2067da
+.B http://bugs.php.net
2067da
+.PD 1
2067da
+.SH AUTHORS
2067da
+The PHP Group: Thies C. Arntzen, Stig Bakken, Andi Gutmans, Rasmus Lerdorf, Sam Ruby, Sascha Schumann, Zeev Suraski, Jim Winstead, Andrei Zmievski.
2067da
+.P
2067da
+Work for the PHP archive was done by Gregory Beaver, Marcus Boerger.
2067da
+.P
2067da
+A List of active developers can be found here:
2067da
+.PD 0
2067da
+.P
2067da
+.B http://www.php.net/credits.php
2067da
+.PD 1
2067da
+.P
2067da
+And last but not least PHP was developed with the help of a huge amount of 
2067da
+contributors all around the world.
2067da
+.SH VERSION INFORMATION
2067da
+This manpage describes \fBphar\fP, version @PHP_VERSION@.
2067da
+.SH COPYRIGHT
2067da
+Copyright \(co 1997\-2013 The PHP Group
2067da
+.LP
2067da
+This source file is subject to version 3.01 of the PHP license,
2067da
+that is bundled with this package in the file LICENSE, and is
2067da
+available through the world-wide-web at the following url:
2067da
+.PD 0
2067da
+.P
2067da
+.B http://www.php.net/license/3_01.txt
2067da
+.PD 1
2067da
+.P
2067da
+If you did not receive a copy of the PHP license and are unable to
2067da
+obtain it through the world-wide-web, please send a note to
2067da
+.B license@php.net
2067da
+so we can mail you a copy immediately.
2067da
diff --git a/ext/phar/phar.phar.1.in b/ext/phar/phar.phar.1.in
2067da
new file mode 100644
2067da
index 0000000..b5eecbf
2067da
--- /dev/null
2067da
+++ b/ext/phar/phar.phar.1.in
2067da
@@ -0,0 +1 @@
2067da
+.so man1/phar.1
2067da
-- 
2067da
1.7.11.5
2067da
2067da
From 67817a199ca4c8bcff163cb005287c0087db6bf3 Mon Sep 17 00:00:00 2001
2067da
From: Remi Collet <remi@php.net>
2067da
Date: Tue, 2 Jul 2013 12:19:09 +0200
2067da
Subject: [PATCH] fix typo in php man page
2067da
2067da
---
2067da
 sapi/cli/php.1.in | 2 +-
2067da
 1 file changed, 1 insertion(+), 1 deletion(-)
2067da
2067da
diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in
2067da
index 6f0266d..749baa8 100644
2067da
--- a/sapi/cli/php.1.in
2067da
+++ b/sapi/cli/php.1.in
2067da
@@ -2,7 +2,7 @@
2067da
 .SH NAME
2067da
 php \- PHP Command Line Interface 'CLI'
2067da
 .P
2067da
-php-cgi \- PHP Command Gateway Interface 'CGI'
2067da
+php-cgi \- PHP Common Gateway Interface 'CGI' command
2067da
 .SH SYNOPSIS
2067da
 .B php
2067da
 [options] [
2067da
-- 
2067da
1.7.11.5
2067da