[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 02a60a9b9e99f1a8aa20b1deefa2b622ba99a5c6

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 3820 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  02a60a9b9e99f1a8aa20b1deefa2b622ba99a5c6 (commit)
      from  cf82da6b376e4c7456a0690968ad2e879029a70c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 02a60a9b9e99f1a8aa20b1deefa2b622ba99a5c6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Jan 23 01:46:42 2016 +0000

    squid: Actually make --with-filedescriptors work
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 .../{oldcore/94 => core/97}/filelists/squid         |  0
 config/rootfiles/core/97/update.sh                  |  2 ++
 lfs/squid                                           |  4 ++++
 .../squid-3.4.14-fix-max-file-descriptors.patch     | 21 +++++++++++++++++++++
 4 files changed, 27 insertions(+)
 copy config/rootfiles/{oldcore/94 => core/97}/filelists/squid (100%)
 create mode 100644 src/patches/squid-3.4.14-fix-max-file-descriptors.patch

Difference in files:
diff --git a/config/rootfiles/core/97/filelists/squid b/config/rootfiles/core/97/filelists/squid
new file mode 120000
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 4cd6abe..541c5f8 100644
--- 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 de6c87d..c2b3935 100644
--- 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
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


hooks/post-receive
--
IPFire 2.x development tree