From 34391115ad4f08b47b547688724e4e24cae1cd98 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 23 2016 14:56:48 +0000
Subject: import squid-3.3.8-26.el7_2.4


---

diff --git a/SOURCES/squid-3.3.8-conf-setrlimit.patch b/SOURCES/squid-3.3.8-conf-setrlimit.patch
new file mode 100644
index 0000000..95b79ad
--- /dev/null
+++ b/SOURCES/squid-3.3.8-conf-setrlimit.patch
@@ -0,0 +1,44 @@
+diff --git a/configure.ac b/configure.ac
+index 1d9df60..76ca114 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2705,6 +2705,7 @@ AC_ARG_WITH(maxfd,,
+   case ${withval} in
+     [[0-9]]*)
+       squid_filedescriptors_num=$withval
++      AC_MSG_NOTICE([forcing default of $squid_filedescriptors_num filedescriptors (user-forced)])
+       ;;
+     *)
+       AC_MSG_ERROR(--with-maxfd expects a numeric argument)
+@@ -2719,6 +2720,7 @@ AC_ARG_WITH(filedescriptors,
+   case ${withval} in
+     [[0-9]]*)
+       squid_filedescriptors_num=$withval
++      AC_MSG_NOTICE([forcing default of $squid_filedescriptors_num filedescriptors (user-forced)])
+       ;;
+     *)
+       AC_MSG_ERROR(--with-filedescriptors expects a numeric argument)
+@@ -2727,10 +2729,9 @@ AC_ARG_WITH(filedescriptors,
+ ])
+ 
+ SQUID_CHECK_DEFAULT_FD_SETSIZE
+-if test "x$squid_filedescriptors_num" = "x"; then
+-  SQUID_CHECK_MAXFD
+-else
+-  AC_MSG_NOTICE([forcing use of $squid_filedescriptors_num filedescriptors (user-forced)])
++SQUID_CHECK_MAXFD
++if test "x$squid_filedescriptors_num" != "x"; then
++  AC_MSG_NOTICE([Default number of fieldescriptors: $squid_filedescriptors_num])
+ fi
+ if test "$squid_filedescriptors_num" -lt 512 ; then
+     AC_MSG_WARN([$squid_filedescriptors_num may not be enough filedescriptors if your])
+--- a/configure
++++ b/configure
+@@ -29326,6 +29326,7 @@ for ac_func in \
+ 	setgroups \
+ 	setpgrp \
+ 	setsid \
++  setrlimit \
+ 	sigaction \
+ 	snprintf \
+ 	socketpair \
diff --git a/SPECS/squid.spec b/SPECS/squid.spec
index 703bc6f..ec19c32 100644
--- a/SPECS/squid.spec
+++ b/SPECS/squid.spec
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.3.8
-Release:  26%{?dist}.3
+Release:  26%{?dist}.4
 Summary:  The Squid proxy caching server
 Epoch:    7
 # See CREDITS for breakdown of non GPLv2+ code
@@ -58,6 +58,7 @@ Patch219: squid-CVE-2016-4553.patch
 Patch220: squid-CVE-2016-4554.patch
 Patch221: squid-CVE-2016-4555.patch
 Patch222: squid-CVE-2016-4556.patch
+Patch223: squid-3.3.8-conf-setrlimit.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: bash >= 2.0
@@ -142,6 +143,7 @@ The squid-sysvinit contains SysV initscritps support.
 %patch220 -p0 -b .CVE-2016-4054
 %patch221 -p0 -b .CVE-2016-4055
 %patch222 -p0 -b .CVE-2016-4056
+%patch223 -p1 -b .conf-setrlimit
 
 %build
 %ifarch sparcv9 sparc64 s390 s390x
@@ -364,6 +366,9 @@ fi
         /sbin/chkconfig --add squid >/dev/null 2>&1 || :
 
 %changelog
+* Thu Jun 09 2016 Luboš Uhliarik <luhliari@redhat.com> - 7:3.3.8-26.4
+- Resolves: #1344283 - max_filedescriptors in squid.conf is ignored
+
 * Mon May 09 2016 Luboš Uhliarik <luhliari@redhat.com> - 7:3.3.8-26.3
 - Related: #1330576 - CVE-2016-4553 squid: Cache poisoning issue in
   HTTP Request handling