[squid] Rebase to latest upstream version 3.3.4

[mluscon]

commit c13b2cc186d3532a55864aa44f13665086cde889
Author: Michal Luscon <mluscon at redhat.com>
Date:   Fri May 3 11:21:35 2013 +0200

    Rebase to latest upstream version 3.3.4

 .gitignore                 |    1 +
 sources                    |    2 +-
 squid-3.1.0.9-config.patch |   17 ++++++++---------
 squid-3.2.9.tar.bz2.asc    |   20 --------------------
 squid-3.3.4.tar.bz2.asc    |   20 ++++++++++++++++++++
 squid-NCSA_auth.patch      |   23 -----------------------
 squid.spec                 |   11 +++++------
 squidclient-man.patch      |   23 -----------------------
 8 files changed, 35 insertions(+), 82 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bd25b2d..f983003 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,4 @@ squid-3.1-10021.patch
 /squid-3.2.7.tar.bz2
 /squid-3.2.8.tar.bz2
 /squid-3.2.9.tar.bz2
+/squid-3.3.4.tar.bz2
diff --git a/sources b/sources
index ef0f251..bd034d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-de02be3c1f72e0d818374438044261a6  squid-3.2.9.tar.bz2
+0ef8e63a980389c62130fa639079fb54  squid-3.3.4.tar.bz2
diff --git a/squid-3.1.0.9-config.patch b/squid-3.1.0.9-config.patch
index 09d7a15..a9cb3a5 100644
--- a/squid-3.1.0.9-config.patch
+++ b/squid-3.1.0.9-config.patch
@@ -1,26 +1,25 @@
-diff -up squid-3.0.STABLE9/src/cf.data.pre.config squid-3.0.STABLE9/src/cf.data.pre
---- squid-3.0.STABLE9/src/cf.data.pre.config	2008-09-09 18:06:44.000000000 +0200
-+++ squid-3.0.STABLE9/src/cf.data.pre	2008-10-19 23:34:17.000000000 +0200
-@@ -2135,7 +2136,7 @@ DOC_END
+--- ./src/cf.data.pre	2013-04-27 05:34:48.000000000 +0200
++++ ./src/cf.data.pre	2013-05-03 10:13:16.007067356 +0200
+@@ -3876,7 +3876,7 @@
  
  NAME: logfile_rotate
  TYPE: int
 -DEFAULT: 10
-+DEFAULT: 0 
++DEFAULT: 0
  LOC: Config.Log.rotateNumber
  DOC_START
  	Specifies the number of logfile rotations to make when you
-@@ -3254,11 +3256,11 @@ COMMENT_END
+@@ -5300,11 +5300,11 @@
  
  NAME: cache_mgr
  TYPE: string
 -DEFAULT: webmaster
-+DEFAULT: root 
++DEFAULT: root
  LOC: Config.adminEmail
  DOC_START
  	Email-address of local cache manager who will receive
--	mail if the cache dies.  The default is "webmaster."
-+	mail if the cache dies.  The default is "root."
+-	mail if the cache dies.  The default is "webmaster".
++	mail if the cache dies.  The default is "root".
  DOC_END
  
  NAME: mail_from
diff --git a/squid-3.3.4.tar.bz2.asc b/squid-3.3.4.tar.bz2.asc
new file mode 100644
index 0000000..245a8cc
--- /dev/null
+++ b/squid-3.3.4.tar.bz2.asc
@@ -0,0 +1,20 @@
+File: squid-3.3.4.tar.bz2
+Date: Sat Apr 27 04:00:16 UTC 2013
+Size: 2987756
+MD5 : 0ef8e63a980389c62130fa639079fb54
+SHA1: fdbdcafb7ab2a4aabf5fb0d7ccb700f7b7b9e4c0
+Key : 0xFF5CF463 <squid3 at treenet.co.nz>
+      fingerprint = EA31 CC5E 9488 E516 8D2D  CC5E B268 E706 FF5C F463
+      keyring = http://www.squid-cache.org/pgp.asc
+      keyserver = subkeys.pgp.net
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iQEcBAABAgAGBQJRe05JAAoJELJo5wb/XPRjrWIIANBTcue7r2h4Ra/KNKXSUSEG
+ZjTKLRhDYdMEreCrhy4XrMXDtZXR3UHknzJVeeu9d7toBL5D6FR2wWcEzehoVBtx
+JL9DCOHFty3oaSXP8cLNKQ7yVmTGQs7WBNOvUllNb9mAyITpJ9Ruk2U3c6YYeTUo
+G0Yf+OyZsQCH5Vyn8cKHZ56Nmv1yOC9/ed0PBC+pDc9f44aTKgUKB3NN+5aA//7w
+rIi3Au2IFsEiVJhzpZk+HmgF4qh2kNh/qzR+Vx5FX61BonzpjP/UdJQWFwrEjSXG
+e6AxHylaoKLI1/OQ7WFZrxFEHPwQpXoOGR9zIsifKdxRUrtyHxwm511IvSVSHAM=
+=S0PM
+-----END PGP SIGNATURE-----
diff --git a/squid.spec b/squid.spec
index f0181c7..b8f88c5 100644
--- a/squid.spec
+++ b/squid.spec
@@ -3,8 +3,8 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.2.9
-Release:  3%{?dist}
+Version:  3.3.4
+Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 # See CREDITS for breakdown of non GPLv2+ code
@@ -37,8 +37,6 @@ Patch202: squid-3.1.0.9-location.patch
 Patch203: squid-3.0.STABLE1-perlpath.patch
 Patch204: squid-3.2.0.9-fpic.patch
 Patch205: squid-3.1.9-ltdl.patch
-Patch206: squid-NCSA_auth.patch
-Patch207: squidclient-man.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: bash >= 2.0
@@ -106,8 +104,6 @@ The squid-sysvinit contains SysV initscritps support.
 %patch203 -p1 -b .perlpath
 %patch204 -p1 -b .fpic
 %patch205 -p1 -b .ltdl
-%patch206 -p1 -b .NCSA_auth
-%patch207 -p1 -b .squidclient-man
 
 %build
 %ifarch sparcv9 sparc64 s390 s390x
@@ -311,6 +307,9 @@ fi
         /sbin/chkconfig --add squid >/dev/null 2>&1 || :
 
 %changelog
+* Fri May 3 2013 Michal Luscon <nluscon at redhat.com> - 7:3.3.4-1
+- Rebase to latest upstream version 3.3.4
+
 * Tue Apr 23 2013 Michal Luscon <mluscon at redhat.com> - 7:3.2.9-3
 - Option '-k' is not stated in squidclient man
 - Remove pid from service file(#913262)