squid: Apply patch for properly detect rlimit.
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 26 Nov 2013 10:43:11 +0000 (11:43 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 26 Nov 2013 10:43:11 +0000 (11:43 +0100)
https://bugzilla.ipfire.org/show_bug.cgi?id=10445

lfs/squid
src/patches/squid-3.3.10-set-rlimit-fds.patch [new file with mode: 0644]

index 1c17c0c..d3bff48 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -72,7 +72,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
 
        cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/squid-3.3.10-optional-ssl-options.patch
+       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/squid-3.3.10-set-rlimit-fds.patch
 
+       cd $(DIR_APP) && ./bootstrap.sh
        cd $(DIR_APP) && ./configure \
                --prefix=/usr \
                --sysconfdir=/etc/squid \
diff --git a/src/patches/squid-3.3.10-set-rlimit-fds.patch b/src/patches/squid-3.3.10-set-rlimit-fds.patch
new file mode 100644 (file)
index 0000000..a80ce73
--- /dev/null
@@ -0,0 +1,51 @@
+http://bazaar.launchpad.net/~squid/squid/3-trunk/revision/13144
+
+    Committer: Amos Jeffries
+    Date: 2013-11-23 01:28:52 UTC
+    Revision ID: squid3@treenet.co.nz-20131123012852-zpe8hamjrs5vy42w
+
+http://bugs.squid-cache.org/show_bug.cgi?id=3970
+Bug 3970: max_filedescriptors disabled due to missing setrlimit
+
+=== modified file 'configure.ac'
+--- configure.ac       2013-11-16 13:19:28 +0000
++++ configure.ac       2013-11-23 01:28:52 +0000
+@@ -2534,7 +2534,6 @@
+     ;;
+ esac
+-
+ dnl --with-maxfd present for compatibility with Squid-2.
+ dnl undocumented in ./configure --help  to encourage using the Squid-3 directive
+ AC_ARG_WITH(maxfd,,
+@@ -2542,6 +2541,7 @@
+   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)
+@@ -2556,6 +2556,7 @@
+   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)
+@@ -2564,10 +2565,9 @@
+ ])
+ 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])
+