From 4894d8701710c2d70639f7e5b797992e67e3a50f Mon Sep 17 00:00:00 2001 From: maniacikarus Date: Sat, 7 Feb 2009 14:41:28 +0100 Subject: [PATCH] Just a lot of things changed for squid --- config/etc/sysctl.conf | 1 - config/rootfiles/common/squid | 4 ++-- config/rootfiles/core/27/files | 19 +++++++++++++++++++ doc/packages-list.txt | 4 +--- html/cgi-bin/proxy.cgi | 2 +- lfs/squid | 9 +++++---- 6 files changed, 28 insertions(+), 11 deletions(-) diff --git a/config/etc/sysctl.conf b/config/etc/sysctl.conf index daf1872c17..f88ec5f7a3 100644 --- a/config/etc/sysctl.conf +++ b/config/etc/sysctl.conf @@ -23,4 +23,3 @@ net.ipv4.conf.all.log_martians = 1 kernel.printk = 1 4 1 7 vm.swappiness=0 -kern.maxfilesperproc=4096 diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid index bc47e72926..17f38f92df 100644 --- a/config/rootfiles/common/squid +++ b/config/rootfiles/common/squid @@ -11,10 +11,10 @@ srv/web/ipfire/html/proxy.pac srv/web/ipfire/html/wpad.dat #usr/bin/RunCache #usr/bin/cossdump -#usr/bin/squidclient +usr/bin/squidclient #usr/lib/squid usr/lib/squid/auth -#usr/lib/squid/cachemgr.cgi +usr/lib/squid/cachemgr.cgi usr/lib/squid/diskd-daemon #usr/lib/squid/errors #usr/lib/squid/errors.ipfire diff --git a/config/rootfiles/core/27/files b/config/rootfiles/core/27/files index 2c047ec96e..09e9b25db4 100644 --- a/config/rootfiles/core/27/files +++ b/config/rootfiles/core/27/files @@ -1 +1,20 @@ etc/sysctl.conf +etc/squid/errors +usr/bin/squidclient +usr/lib/squid/auth +usr/lib/squid/cachemgr.cgi +usr/lib/squid/diskd-daemon +usr/lib/squid/errors/English +usr/lib/squid/errors/German +usr/lib/squid/icons +usr/lib/squid/logfile-daemon +usr/lib/squid/mib.txt +usr/lib/squid/msnt_auth +usr/lib/squid/ncsa_auth +usr/lib/squid/ntlm_auth +usr/lib/squid/smb_auth +usr/lib/squid/smb_auth.pl +usr/lib/squid/smb_auth.sh +usr/lib/squid/squid_ldap_auth +usr/lib/squid/unlinkd +usr/sbin/squid \ No newline at end of file diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 0872b1acb3..de4cdf8636 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -109,7 +109,6 @@ * gd-2.0.33 * gdbm-1.8.3 * gettext-0.14.5 -* git-1.6.0 * git-1.6.1.2 * glib-2.16.5 * glibc-2.3.6 @@ -230,7 +229,6 @@ * openswan-2.6.18 * openswan-2.6.18-kmod-VER * openvpn-2.0.9 -* p7zip_4.58 * p7zip_4.61 * pam_mysql-0.7RC1 * patch-2.5.4 @@ -273,7 +271,7 @@ * splix-2.0.0-rc2 * sqlite-3.6.10 * squashfs3.4 -* squid-2.7.STABLE5 +* squid-2.7.STABLE6 * squidGuard-1.4 * squidclamav-3.9 * sshfs-fuse-2.2 diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index cc55a2e854..1a4453a777 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -3031,7 +3031,7 @@ cache_effective_group squid umask 022 pid_filename /var/run/squid.pid -max_filedescriptors 1024 +max_filedescriptors 4096 cache_mem $proxysettings{'CACHE_MEM'} MB END diff --git a/lfs/squid b/lfs/squid index 80e14f017f..db43652579 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 2.7.STABLE5 +VER = 2.7.STABLE6 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5d495d285b3b951a5859c660463e9832 +$(DL_FILE)_MD5 = 6de3a6a7a56a7ecae092f2d31a04f039 install : $(TARGET) @@ -75,8 +75,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --datadir=/usr/lib/squid \ --mandir=/usr/share/man --libexecdir=/usr/lib/squid \ --localstatedir=/var --sysconfdir=/etc/squid \ - --disable-poll --disable-snmp --disable-icmp --disable-wccp \ - --disable-http-violations --disable-ident-lookups \ + --disable-poll --disable-icmp --disable-wccp \ + --disable-ident-lookups \ --enable-storeio="aufs,coss,diskd,ufs,null" --enable-ssl \ --enable-underscores --enable-ntlm-fail-open --enable-arp-acl \ --enable-http-violations --enable-auth=basic,ntlm \ @@ -86,6 +86,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-ntlm-auth-helpers="SMB" \ --enable-useragent-log \ --enable-referer-log \ + --enable-snmp \ --with-pthreads --with-dl cd $(DIR_APP) && make $(MAKETUNING) -- 2.39.5