Merge branch 'next' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x into next

Conflicts:
	doc/packages-list.txt
This commit is contained in:
Arne Fitzenreiter
2010-02-18 08:37:47 +01:00
24 changed files with 628 additions and 179 deletions

View File

@@ -132,7 +132,7 @@ case "$1" in
# original do nothing line
#/sbin/iptables -A INPUT -p tcp -m tcp --tcp-flags SYN,RST,ACK SYN -m limit --limit 10/sec
# the correct one, but the negative '!' do nothing...
#/sbin/iptables -A INPUT -p tcp -m tcp --tcp-flags SYN,RST,ACK SYN -m limit ! --limit 10/sec -j DROP
#/sbin/iptables -A INPUT -p tcp -m tcp --tcp-flags SYN,RST,ACK SYN ! -m limit --limit 10/sec -j DROP
# Fix for braindead ISP's
/sbin/iptables -A FORWARD -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu

View File

@@ -17,10 +17,13 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
# Copyright (C) 2010 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
./uninstall.sh
./install.sh
extract_files
# Restoring the backup has to be excluded because config file changed
# restore_backup ${NAME}
/etc/init.d/squid restart