Imported Debian patch 5.3.3-1debian/5.3.3-1

1 files changed, 46 insertions, 0 deletions

diff --git a/debian/patches/php-fpm-man-section-and-cleanup.patch b/debian/patches/php-fpm-man-section-and-cleanup.patch
new file mode 100644
index 000000000..ba2b2b9a5
--- /dev/null
+++ b/debian/patches/php-fpm-man-section-and-cleanup.patch
@@ -0,0 +1,46 @@
+Description: Fix php-fpm's manpage section to match location of binary
+ (/usr/sbin,) additionally, remove some stuff that is useless or
+ doesn't apply to Debian.
+Origin: vendor
+Forwarded: http://bugs.php.net/52476
+Last-Update: 2010-07-29
+
+Index: php-5.3.3/sapi/fpm/php-fpm.1.in
+===================================================================
+--- php-5.3.3.orig/sapi/fpm/php-fpm.1.in
++++ php-5.3.3/sapi/fpm/php-fpm.1.in
+@@ -1,4 +1,4 @@
+-.TH PHP-FPM 1 "2009" "The PHP Group" "Scripting Language"
++.TH PHP-FPM 8 "2009" "The PHP Group" "Scripting Language"
+ .SH NAME
+ .TP 15
+ php-fpm \- PHP FastCGI Process Manager 'PHP-FPM'
+@@ -99,15 +99,8 @@ The configuration file for the php-fpm d
+ .TP
+ .B php.ini
+ The standard php configuration file.
+-.SH EXAMPLES
+-You should use the init script provided to start and stop the php-fpm daemon. This situation applies for any unix systems which use init.d for their main process manager.
+-.P
+-.PD 1
+-.RS
+-sudo /etc/init.d/php-fpm start
+-.RE
+-.TP
+-If your installation has no appropriate init script, launch php-fpm with no arguments. It will launch as a daemon (background process) by default. The file @php_fpm_localstatedir@/run/php-fpm.pid determines whether php-fpm is already up and running. Once started, php-fpm then responds to several POSIX signals:
++.SH SIGNALS
++Once started, php-fpm then responds to several POSIX signals:
+ .P
+ .PD 0
+ .RS
+@@ -121,10 +114,6 @@ If your installation has no appropriate
+ .RE
+ .PD 1
+ .P
+-.SH TIPS
+-The PHP-FPM CGI daemon will work well with most popular webservers, including Apache2, lighttpd and nginx.
+-.PD 1
+-.P
+ .SH SEE ALSO
+ The PHP-FPM website:
+ .PD 0