[squid/f15] Resolve local patch conflict

[Henrik Nordström]

commit 9f4848fc9726e37b4fb3404a9fb6fa22def7195a
Author: Henrik Nordstrom <henrik at henriknordstrom.net>
Date:   Mon Aug 29 08:59:39 2011 +0200

    Resolve local patch conflict

 squid-3.0.STABLE7-from_manpg.patch |   98 ++++++++----------------------------
 1 files changed, 21 insertions(+), 77 deletions(-)
---
diff --git a/squid-3.0.STABLE7-from_manpg.patch b/squid-3.0.STABLE7-from_manpg.patch
index 368e634..dded2ec 100644
--- a/squid-3.0.STABLE7-from_manpg.patch
+++ b/squid-3.0.STABLE7-from_manpg.patch
@@ -1,80 +1,24 @@
-diff -up squid-3.0.STABLE7/helpers/basic_auth/NCSA/ncsa_auth.8.from_manpg squid-3.0.STABLE7/helpers/basic_auth/NCSA/ncsa_auth.8
---- squid-3.0.STABLE7/helpers/basic_auth/NCSA/ncsa_auth.8.from_manpg	2008-06-22 05:35:49.000000000 +0200
-+++ squid-3.0.STABLE7/helpers/basic_auth/NCSA/ncsa_auth.8	2007-06-06 18:25:30.000000000 +0200
-@@ -1,38 +1,38 @@
--.\" This file is distributed in the hope that it will be useful,
--.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
--.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
--.\" the GNU General Public License for more details.
--.\"
--.\" You should have received a copy of the GNU General Public License
--.\" along with this file; if not, write to the Free Software
--.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston,
--.\" MA 02111-1307 USA
--.\"
--.\" HISTORY:
--.\" 2006-05-16, created by Rodrigo Rubira Branco <rrbranco at br.ibm.com>
+diff -up squid-3.1.15/helpers/basic_auth/NCSA/ncsa_auth.8.from_manpg squid-3.1.15/helpers/basic_auth/NCSA/ncsa_auth.8
+--- squid-3.1.15/helpers/basic_auth/NCSA/ncsa_auth.8.from_manpg	2011-08-28 09:53:14.000000000 +0200
++++ squid-3.1.15/helpers/basic_auth/NCSA/ncsa_auth.8	2011-08-29 08:57:57.785083253 +0200
+@@ -10,7 +10,7 @@
+ .\"
+ .\" HISTORY:
+ .\" 2006-05-16, created by Rodrigo Rubira Branco <rrbranco at br.ibm.com>
 -.TH ncsa_auth 8 "May 16, 2006" "Squid NCSA Auth helper"
--.SH NAME
--ncsa_auth \- NCSA httpd-style password file authentication helper for Squid
--\fB
--.SH SYNOPSIS
--.nf
--.fam C
--\fBncsa_auth\fP \fIpasswdfile\fP 
--.fam T
--.fi
--.SH DESCRIPTION
++.TH ncsa_auth 8 "May 16, 2006" "User Manuals" "User Manuals"
+ .SH NAME
+ ncsa_auth \- NCSA httpd-style password file authentication helper for Squid
+ \fB
+@@ -21,9 +21,9 @@ ncsa_auth \- NCSA httpd-style password f
+ .fam T
+ .fi
+ .SH DESCRIPTION
 -\fBncsa_auth\fP allows Squid to read and authenticate user and password information from an NCSA/Apache httpd-style password file when using basic HTTP authentication.
--.PP
++\fBncsa_auth\fP allows Squid to read and authenticate user and password information from an NCSA httpd-style password file when using basic HTTP authentication.
+ .PP
 -The only parameter is the password file.  It must have permissions to be read by the user that Squid is running as (cache_effective_user in squid.conf).
--.PP
--This password file can be manipulated using htpasswd.
--.SH OPTIONS
--Only specify the password file name.
--.SH EXAMPLE
--\fBncsa_auth\fP /etc/squid/squid.pass
--.SH SECURITY
--\fBncsa_auth\fP must have access to the password file to be executed.
--.SH SEE ALSO
--\fBhtpasswd\fP(1), \fBsquid\fP(8)
--.SH AUTHOR
--Manpage written by Rodrigo Rubira Branco <rrbranco at br.ibm.com>
-+.\" This file is distributed in the hope that it will be useful,
-+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
-+.\" the GNU General Public License for more details.
-+.\"
-+.\" You should have received a copy of the GNU General Public License
-+.\" along with this file; if not, write to the Free Software
-+.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+.\" MA 02111-1307 USA
-+.\"
-+.\" HISTORY:
-+.\" 2006-05-16, created by Rodrigo Rubira Branco <rrbranco at br.ibm.com>
-+.TH ncsa_auth 8 "May 16, 2006" "User Manuals" "User Manuals"
-+.SH NAME
-+ncsa_auth \- NCSA httpd-style password file authentication helper for Squid
-+\fB
-+.SH SYNOPSIS
-+.nf
-+.fam C
-+\fBncsa_auth\fP \fIpasswdfile\fP 
-+.fam T
-+.fi
-+.SH DESCRIPTION
-+\fBncsa_auth\fP allows Squid to read and authenticate user and password information from an NCSA httpd-style password file when using basic HTTP authentication.
-+.PP
-+The only parameter is the password file.  It must have permissions to be read by the user that Squid is running as. By default this user is proxy. This can be changed using the cache_effective_user directive in the squid.conf file.
-+.PP
-+This password file can be manipulated using htpasswd.
-+.SH OPTIONS
-+Only specify the password file name.
-+.SH EXAMPLE
-+\fBncsa_auth\fP /etc/squid/squid.pass
-+.SH SECURITY
-+\fBncsa_auth\fP must have access to the password file to be executed.
-+.SH SEE ALSO
-+\fBhtpasswd\fP(1), \fBsquid\fP(8)
-+.SH AUTHOR
-+Manpage written by Rodrigo Rubira Branco <rrbranco at br.ibm.com>
++The only parameter is the password file.  It must have permissions to be read by the user that Squid is running as. By default this user is proxy. This can be changed using the cache_effective_user directive in the squid.conf file.
+ .PP
+ This password file can be manipulated using htpasswd.
+ .