Update to latest upstream version 3.2.8

Fixed: CVE-2013-1839
Removed: makefile-patch

.gitignore

@@ -45,3 +45,4 @@ squid-3.1-10021.patch
 /squid-3.2.5.tar.bz2
 /squid-3.2.7.tar.bz2
 /squid-3.2.8.tar.bz2
+/squid-3.2.9.tar.bz2

sources

@@ -1 +1 @@
-bb569ca29f0c6b2b7ade24498295b62b  squid-3.2.8.tar.bz2
+de02be3c1f72e0d818374438044261a6  squid-3.2.9.tar.bz2

squid-3.2.8.tar.bz2.asc

@@ -1,20 +0,0 @@
-File: squid-3.2.8.tar.bz2
-Date: Sat Mar  2 02:08:33 UTC 2013
-Size: 2896523
-MD5 : bb569ca29f0c6b2b7ade24498295b62b
-SHA1: 9525abf4aebe5c4830ac474441e5c93303ef84d6
-Key : 0xFF5CF463 <squid3@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)
-
-iQEcBAABAgAGBQJRMWAWAAoJELJo5wb/XPRjqB0H/3qdtijJb+qrEh9byDBxNd5G
-WffzqjvBdSThzfSqUU/W39tkBG3mxIZFJ6e+ewXE57eMbA4w/87HOF7JreSPRg10
-wWCCbUvCY8H12IY8AiLkwl81/rP/VZk2Ql0xHkXu08aD1F9rlFkZmRCjj+8MPihq
-XzGcJhue174vGAKPjqTA7wX29er70meKlFWz7L/vnUmyrG+a5lCMpkGDIyUE09D2
-4FVGpKjKocuXHSv18UVMnyUxpT//seplA7Rh2l5Pq/RcN4T7DnWHZo1/oGKZ7p19
-mMgBpVe1leRxTzvD2SkLkCfq/qqmCHTLvbuG1G3GC1jEPD37gnAYyjLYHSNTokE=
-=ezEq
------END PGP SIGNATURE-----

squid-makefile.patch

@@ -1,95 +0,0 @@
---- ./tools/Makefile.in	2013-03-02 02:46:58.000000000 +0100
-+++ ./tools/Makefile.in	2013-03-08 14:20:11.289295856 +0100
-@@ -411,7 +411,8 @@
- 	$(top_builddir)/lib/libmiscutil.la \
- 	$(COMPAT_LIB) \
- 	$(KRB5LIBS) \
--	$(XTRA_LIBS)
-+	$(XTRA_LIBS) \
-+	$(DISK_OS_LIBS)
- 
- SUBSTITUTE = sed "\
- 	s%@DEFAULT_ERROR_DIR@%$(DEFAULT_ERROR_DIR)%g;\
---- ./src/ssl/Makefile.in	2013-03-02 02:46:57.000000000 +0100
-+++ ./src/ssl/Makefile.in	2013-03-08 14:21:57.073290173 +0100
-@@ -368,7 +368,7 @@
- 	crtd_message.h
- 
- @USE_SSL_CRTD_TRUE@ssl_crtd_SOURCES = ssl_crtd.cc certificate_db.cc certificate_db.h
--@USE_SSL_CRTD_TRUE@ssl_crtd_LDADD = libsslutil.la $(SSLLIB) $(COMPAT_LIB)
-+@USE_SSL_CRTD_TRUE@ssl_crtd_LDADD = libsslutil.la $(SSLLIB) $(COMPAT_LIB) $(DISK_OS_LIBS)
- all: all-am
- 
- .SUFFIXES:
---- ./src/ip/Makefile.in	2013-03-02 02:46:56.000000000 +0100
-+++ ./src/ip/Makefile.in	2013-03-08 14:50:22.294198573 +0100
-@@ -350,7 +350,8 @@
- 	$(XTRA_LIBS) \
- 	$(COMPAT_LIB) \
- 	$(SQUID_CPPUNIT_LA) \
--	$(SQUID_CPPUNIT_LIBS)
-+	$(SQUID_CPPUNIT_LIBS) \
-+	$(DISK_OS_LIBS)
- 
- testIpAddress_LDFLAGS = $(LIBADD_DL)
- all: all-am
---- ./src/icmp/Makefile.in	2013-03-02 02:46:55.000000000 +0100
-+++ ./src/icmp/Makefile.in	2013-03-08 15:27:36.889078536 +0100
-@@ -416,7 +416,8 @@
- 	libicmp-core.la \
- 	../ip/libip.la \
- 	$(COMPAT_LIB) \
--	$(XTRA_LIBS)
-+	$(XTRA_LIBS) \
-+	$(DISK_OS_LIBS)
- 
- testIcmp_DEPENDENCIES = $(SQUID_CPPUNIT_LA)
- all: all-am
---- ./src/Makefile.in	2013-03-02 02:46:51.000000000 +0100
-+++ ./src/Makefile.in	2013-03-08 15:44:34.768023858 +0100
-@@ -2757,7 +2757,8 @@
- 	$(SQUID_CPPUNIT_LA) \
- 	$(SSLLIB) \
- 	$(COMPAT_LIB) \
--	$(XTRA_LIBS)
-+	$(XTRA_LIBS) \
-+	$(DISK_OS_LIBS)
- 
- tests_testHttpReply_DEPENDENCIES = $(SQUID_CPPUNIT_LA)
- tests_testACLMaxUserIP_SOURCES = \
---- ./src/Makefile.in	2013-03-08 15:45:28.384020978 +0100
-+++ ./src/Makefile.in	2013-03-08 16:04:55.958958259 +0100
-@@ -2890,7 +2890,8 @@
- 	$(SQUID_CPPUNIT_LIBS) \
- 	$(SSLLIB) \
- 	$(COMPAT_LIB) \
--	$(XTRA_LIBS)
-+	$(XTRA_LIBS) \
-+	$(DISK_OS_LIBS)
- 
- tests_testBoilerplate_LDFLAGS = $(LIBADD_DL)
- tests_testBoilerplate_DEPENDENCIES = \
---- ./src/Makefile.in	2013-03-08 16:05:27.452956567 +0100
-+++ ./src/Makefile.in	2013-03-08 16:30:47.545874912 +0100
-@@ -3841,7 +3841,8 @@
- 	$(top_builddir)/lib/libmiscutil.la \
- 	$(SQUID_CPPUNIT_LIBS) \
- 	$(COMPAT_LIB) \
--	$(XTRA_LIBS)
-+	$(XTRA_LIBS) \
-+	$(DISK_OS_LIBS)
- 
- tests_testHttpParser_LDFLAGS = $(LIBADD_DL)
- tests_testHttpParser_DEPENDENCIES = \
---- ./src/Makefile.in	2013-03-08 16:31:39.830872103 +0100
-+++ ./src/Makefile.in	2013-03-08 16:47:47.870820102 +0100
-@@ -2497,7 +2497,8 @@
- 	$(EPOLL_LIBS) \
- 	$(MINGW_LIBS) \
- 	$(COMPAT_LIB) \
--	$(XTRA_LIBS)
-+	$(XTRA_LIBS) \
-+	$(DISK_OS_LIBS)
- 
- STUB_SOURCE = tests/STUB.h \
- 	tests/stub_CommIO.cc \

squid.spec

@@ -3,8 +3,8 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.2.8
+Version:  3.2.9
-Release:  3%{?dist}
+Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 # See CREDITS for breakdown of non GPLv2+ code
@@ -37,8 +37,7 @@ 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-makefile.patch
+Patch206: squid-NCSA_auth.patch
-Patch207: squid-NCSA_auth.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: bash >= 2.0
@@ -106,8 +105,7 @@ The squid-sysvinit contains SysV initscritps support.
 %patch203 -p1 -b .perlpath
 %patch204 -p1 -b .fpic
 %patch205 -p1 -b .ltdl
-%patch206 -p1 -b .makefile
+%patch206 -p1 -b .NCSA_auth
-%patch207 -p1 -b .NCSA_auth
 
 %build
 %ifarch sparcv9 sparc64 s390 s390x
@@ -167,7 +165,7 @@ make \
 	%{?_smp_mflags}
 
 %check
-
+make check
 	
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -311,7 +309,12 @@ fi
         /sbin/chkconfig --add squid >/dev/null 2>&1 || :
 
 %changelog
-* Mon Mar 11 2013 Michal Luscon <mluscon@redhat.com> 7:3.2.8-3
+* Tue Mar 19 2013 Michal Luscon <mluscon@redhat.com> - 7:3.2.9-1
+- Update to latest upstream version 3.2.8
+- Fixed: CVE-2013-1839
+- Removed: makefile-patch (+make check)
+
+* Mon Mar 11 2013 Michal Luscon <mluscon@redhat.com> - 7:3.2.8-3
 - Resolved: /usr move - squid service file
 
 * Sat Mar 09 2013 Michal Luscon <mluscon@redhat.com> - 7:3.2.8-2