squid: Fix two security issues.

[people/teissler/ipfire-2.x.git] / lfs / squid

diff --git a/lfs/squid b/lfs/squid
index ef676a2a5f7ce69ada12598b89654c9c1e028ba9..81118c2c39663bb2cdf5280b316a3c47ead22124 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.1.13
+VER        = 3.1.23
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 78e756135c2bd6bbaf52eb5520f8b934
+$(DL_FILE)_MD5 = e15fdb8c615cf1f9525be0a2b75c60a7
 
 install : $(TARGET)
 
@@ -71,6 +71,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE)
 
+       cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.1-10486.patch
+       cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.1-10487.patch
+
        cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls \
           --datadir=/usr/lib/squid \
           --mandir=/usr/share/man --libexecdir=/usr/lib/squid \
@@ -87,8 +90,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
           --enable-referer-log \
              --enable-snmp \
           --with-pthreads --with-dl \
-          --with-maxfd="16384" \
-          --with-filedescriptors=16384 \
+          --with-maxfd="65536" \
+          --with-filedescriptors=65536 \
           --with-large-files \
           --with-aio \
           --enable-async-io=8 \
@@ -99,13 +102,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
           --enable-epoll \
           --disable-kqueue \
           --enable-select \
-          --disable-cache-digests \
+          --enable-cache-digests \
           --enable-forw-via-db \
           --enable-htcp \
           --enable-ipf-transparent \
           --enable-kill-parent-hack \
           --disable-wccpv2 \
-          --disable-icap-client \
+          --enable-icap-client \
           --disable-esi
 
        cd $(DIR_APP) && make $(MAKETUNING)