squid: Actually make --with-filedescriptors work

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/core/97/filelists/squid b/config/rootfiles/core/97/filelists/squid
new file mode 120000 (symlink)
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/core/97/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file

diff --git a/config/rootfiles/core/97/update.sh b/config/rootfiles/core/97/update.sh
index 4cd6abe368b35985aba7411d74082486e14cf88a..541c5f8e65aaa0cc282da4a60f1dc2105a232126 100644 (file)
--- a/config/rootfiles/core/97/update.sh
+++ b/config/rootfiles/core/97/update.sh
@@ -32,6 +32,7 @@ do
 done
 
 # Stop services
+/etc/init.d/squid stop
 /etc/init.d/dnsmasq stop
 
 # Extract files
@@ -46,6 +47,7 @@ paxctl -mpexs /usr/bin/grub-script-check
 # Start services
 /etc/init.d/dnsmasq start
 /etc/init.d/sshd restart
+/etc/init.d/squid start
 
 # Delete old QoS enabled indicator
 rm -f /var/ipfire/qos/enable

diff --git a/lfs/squid b/lfs/squid
index de6c87d46e0aa45394e99d2c09a566ef472984f0..c2b39357903f10fa03efed70b914950eac444572 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -71,6 +71,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13228.patch
+       cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4.14-fix-max-file-descriptors.patch
+       cd $(DIR_APP) && autoreconf -vfi
+       cd $(DIR_APP)/libltdl && autoreconf -vfi
+
        cd $(DIR_APP) && ./configure \
                --prefix=/usr \
                --sysconfdir=/etc/squid \

diff --git a/src/patches/squid-3.4.14-fix-max-file-descriptors.patch b/src/patches/squid-3.4.14-fix-max-file-descriptors.patch
new file mode 100644 (file)
index 0000000..54275b8
--- /dev/null
+++ b/src/patches/squid-3.4.14-fix-max-file-descriptors.patch
@@ -0,0 +1,21 @@
+--- configure.ac~      2016-01-23 01:27:44.078013879 +0000
++++ configure.ac       2016-01-23 01:28:19.422179243 +0000
+@@ -2573,6 +2573,9 @@
+     ;;
+ esac
+ 
++SQUID_CHECK_DEFAULT_FD_SETSIZE
++SQUID_CHECK_MAXFD
++
+ 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,,
+@@ -2603,8 +2606,6 @@
+     esac
+ ])
+ 
+-SQUID_CHECK_DEFAULT_FD_SETSIZE
+-SQUID_CHECK_MAXFD
+ if test "x$squid_filedescriptors_num" != "x"; then
+   AC_MSG_NOTICE([Default number of fieldescriptors: $squid_filedescriptors_num])
+ fi