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