IPCop Firewall

Update of /cvsroot/ipcop/ipcop/lfs
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv17445/lfs

Modified Files:
      Tag: IPCOP_v1_4_0
	Config 
Log Message:
Fix LOAD macro broken by recent changes
It now load again
Be more specific when an error happen
Be more explicit on comments

I add a WGET macro as loading was needed at various place.
Not yet tested to use that macro on MD5 during build.
Probably that could be done.

I would too rework later how build.othersrc-list is made.
Actually we waste space on sourceforge to upload a big package with
parts that already come from Sourceforge.
That may not be the best way to go.



Index: Config
===================================================================
RCS file: /cvsroot/ipcop/ipcop/lfs/Config,v
retrieving revision 1.7.2.35
retrieving revision 1.7.2.36
diff -C2 -d -r1.7.2.35 -r1.7.2.36
*** Config	21 Nov 2007 07:51:58 -0000	1.7.2.35
--- Config	30 Nov 2007 07:32:27 -0000	1.7.2.36
***************
*** 118,139 ****
  endef
  
  define LOAD
  	@echo -e "$(MESSAGE)Download: $($(notdir $@))"
! 	# if a file was yet fully loaded on /tmp, but _MD5 was wrong and fixed later, next wget will fail
! 	# prevent that case
! 	# check md5 after download to detect page not found answer or download error
  	if [ -s $(DIR_TMP)/$(notdir $@) ]; then \
  		if [ "$($(notdir $@)_MD5)" = `md5sum $(DIR_TMP)/$(notdir $@) | awk '{ print $$1 }'` ]; then \
  			mv $(DIR_TMP)/$(notdir $@) $(DIR_DL); \
  		else \
! 			wget -T 120 -t 1 -c -nv $($(notdir $@)) -O $(DIR_TMP)/$(notdir $@); \
! 			if [ "$($(notdir $@)_MD5)" = `md5sum $(DIR_TMP)/$(notdir $@) | awk '{ print $$1 }'` ]; then \
! 				mv $(DIR_TMP)/$(notdir $@) $(DIR_DL); \
! 			else \
! 				echo "$(notdir $@) checksum is bad"; \
! 				echo "$(notdir $@) may need to be removed from /tmp or download has been interrupt"; \
! 				exit 1; \
! 			fi; \
  		fi; \
  	fi
  endef
--- 118,154 ----
  endef
  
+ # This macro has to be in one line (so without comment), as called inside if .. then .. else
+ # check md5 after download to detect various page not found answers or download error
+ define WGET
+ 	wget -T 120 -t 1 -c -nv $($(notdir $@)) -O $(DIR_TMP)/$(notdir $@); \
+ 	if [ "$$?" -ne 0 ]; then \
+ 		echo "URL is wrong or download has been interrupt"; \
+ 	else  \
+ 		if [ "$($(notdir $@)_MD5)" = `md5sum $(DIR_TMP)/$(notdir $@) | awk '{ print $$1 }'` ]; then \
+ 			mv $(DIR_TMP)/$(notdir $@) $(DIR_DL); \
+ 		else \
+ 			echo "$(notdir $@) checksum is wrong"; \
+ 			echo "Site answer with a custom error page or $(DIR_TMP)/$(notdir $@) content is corrupted"; \
+ 			exit 1; \
+ 		fi; \
+ 	fi
+ endef
+ 
  define LOAD
  	@echo -e "$(MESSAGE)Download: $($(notdir $@))"
! 	# if a file was yet fully loaded on /tmp, but _MD5 was wrong and fixed later,
! 	# next wget will fail because of -c, so test md5 before
! 	# if file is found on /tmp but md5 does not match, continue to load
! 	# if file is not found on /tmp, load it
  	if [ -s $(DIR_TMP)/$(notdir $@) ]; then \
  		if [ "$($(notdir $@)_MD5)" = `md5sum $(DIR_TMP)/$(notdir $@) | awk '{ print $$1 }'` ]; then \
+ 			echo "$(notdir $@) moved from $(DIR_TMP) to $(DIR_DL)"; \
  			mv $(DIR_TMP)/$(notdir $@) $(DIR_DL); \
  		else \
! 			echo "$(DIR_TMP)/$(notdir $@) was incomplete or wrong"; \
! 			$(WGET); \
  		fi; \
+ 	else \
+ 		$(WGET); \
  	fi
  endef
***************
*** 142,159 ****
  	# error mean file signature don't match the one in lfs script
  	# should be only the case when a md5 change but not the file name
! 	if [ "$($@_MD5)" = `md5sum $(DIR_DL)/$@ | awk '{ print $$1 }'` ]; then \
! 		echo "$@ checksum OK"; \
! 		echo "$@" >>$(DIR_INFO)/_build.othersrc-list.log; \
  	else \
! 		echo "A new md5 has been published for $@"; \
! 		echo "Previous file is loaded again"; \
! 		wget -T 120 -t 1 -nv $($(notdir $@)) -O $(DIR_TMP)/$(notdir $@); \
! 		if [ "$($(notdir $@)_MD5)" = `md5sum $(DIR_TMP)/$(notdir $@) | awk '{ print $$1 }'` ]; then \
! 			mv $(DIR_TMP)/$(notdir $@) $(DIR_DL); \
  			echo "$@ checksum OK"; \
  			echo "$@" >>$(DIR_INFO)/_build.othersrc-list.log; \
  		else \
! 			echo "$@ checksum still bad"; \
! 			exit 1; \
  		fi; \
  	fi
--- 157,178 ----
  	# error mean file signature don't match the one in lfs script
  	# should be only the case when a md5 change but not the file name
! 	if [ ! -f $(DIR_DL)/$@ ]; then \
! 		echo "$@ missing in $(DIR_DL)"; \
  	else \
! 		if [ "$($@_MD5)" = `md5sum $(DIR_DL)/$@ | awk '{ print $$1 }'` ]; then \
  			echo "$@ checksum OK"; \
  			echo "$@" >>$(DIR_INFO)/_build.othersrc-list.log; \
  		else \
! 			echo "A new md5 has been published for $@"; \
! 			echo "Previous file is loaded again"; \
! 			wget -T 120 -t 1 -nv $($(notdir $@)) -O $(DIR_TMP)/$(notdir $@); \
! 			if [ "$($(notdir $@)_MD5)" = `md5sum $(DIR_TMP)/$(notdir $@) | awk '{ print $$1 }'` ]; then \
! 				mv $(DIR_TMP)/$(notdir $@) $(DIR_DL); \
! 				echo "$@ checksum OK"; \
! 				echo "$@" >>$(DIR_INFO)/_build.othersrc-list.log; \
! 			else \
! 				echo "$@ checksum still bad"; \
! 				exit 1; \
! 			fi; \
  		fi; \
  	fi

Update of /cvsroot/ipcop/ipcop
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv7039

Modified Files:
	make.sh 
Log Message:
Hard warning that cvs should really no more be used on the main branch.

Use IPCOP_v1_4_0 branch for 1.4

Use svn for 1.9 version


Index: make.sh
===================================================================
RCS file: /cvsroot/ipcop/ipcop/make.sh,v
retrieving revision 1.300
retrieving revision 1.301
diff -C2 -d -r1.300 -r1.301
*** make.sh	7 Apr 2007 17:00:31 -0000	1.300
--- make.sh	28 Nov 2007 00:14:24 -0000	1.301
***************
*** 1,1779 ****
  #!/bin/bash
  #
! ############################################################################
! #                                                                          #
! # This file is part of the IPCop Firewall.                                 #
! #                                                                          #
! # IPCop is free software; you can redistribute it and/or modify            #
! # it under the terms of the GNU General Public License as published by     #
! # the Free Software Foundation; either version 2 of the License, or        #
! # (at your option) any later version.                                      #
[...1764 lines suppressed...]
! 	echo "Usage: $0 {build|changelog|check|checkclean|clean|configure|dist|getothersrc|gettoolchain|othersrc|prefetch|shell|toolchain}"
! 	cat doc/make.sh-usage
! 	exit 1
! 	;;
! esac
--- 1,14 ----
  #!/bin/bash
  #
! echo "You probably load this tree by mistake"
! echo
! echo "cvs is no more used for the development of the new version"
! echo "check out svn for the new version"
! echo
! echo "v1.4 maintenance is still on cvs but in IPCOP_v1_4_0 branch"
! echo "anonymous acces to v1.4 branch require"
! echo "cvs -z3 -d:pserver:anonymous@... co -r IPCOP_v1_4_0 ipcop"
! echo
! echo "developer acces to v1.4 branch require"
! echo "export CVS_RSH=ssh"
! echo "cvs -z3 -d:pserver:<developername>@ipcop.cvs.sourceforge.net:/cvsroot/ipcop co -r IPCOP_v1_4_0 ipcop"

Update of /cvsroot/ipcop/ipcop/updates/1.4.17
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv386/updates/1.4.17

Modified Files:
      Tag: IPCOP_v1_4_0
	ROOTFILES.alpha-1.4.17 ROOTFILES.i386-1.4.17 
Log Message:
Fix credits page inclusion on update


Index: ROOTFILES.i386-1.4.17
===================================================================
RCS file: /cvsroot/ipcop/ipcop/updates/1.4.17/Attic/ROOTFILES.i386-1.4.17,v
retrieving revision 1.1.2.70
retrieving revision 1.1.2.71
diff -C2 -d -r1.1.2.70 -r1.1.2.71
*** ROOTFILES.i386-1.4.17	24 Nov 2007 21:38:17 -0000	1.1.2.70
--- ROOTFILES.i386-1.4.17	25 Nov 2007 00:46:31 -0000	1.1.2.71
***************
*** 4,8 ****
  etc/rc.d/rc.updatered
  home/httpd/cgi-bin/changepw.cgi
! home/httpd/cgi-bin/credit.cgi
  home/httpd/cgi-bin/ddns.cgi
  home/httpd/cgi-bin/dhcp.cgi
--- 4,8 ----
  etc/rc.d/rc.updatered
  home/httpd/cgi-bin/changepw.cgi
! home/httpd/cgi-bin/credits.cgi
  home/httpd/cgi-bin/ddns.cgi
  home/httpd/cgi-bin/dhcp.cgi

Index: ROOTFILES.alpha-1.4.17
===================================================================
RCS file: /cvsroot/ipcop/ipcop/updates/1.4.17/Attic/ROOTFILES.alpha-1.4.17,v
retrieving revision 1.1.2.70
retrieving revision 1.1.2.71
diff -C2 -d -r1.1.2.70 -r1.1.2.71
*** ROOTFILES.alpha-1.4.17	24 Nov 2007 21:38:17 -0000	1.1.2.70
--- ROOTFILES.alpha-1.4.17	25 Nov 2007 00:46:31 -0000	1.1.2.71
***************
*** 4,8 ****
  etc/rc.d/rc.updatered
  home/httpd/cgi-bin/changepw.cgi
! home/httpd/cgi-bin/credit.cgi
  home/httpd/cgi-bin/ddns.cgi
  home/httpd/cgi-bin/dhcp.cgi
--- 4,8 ----
  etc/rc.d/rc.updatered
  home/httpd/cgi-bin/changepw.cgi
! home/httpd/cgi-bin/credits.cgi
  home/httpd/cgi-bin/ddns.cgi
  home/httpd/cgi-bin/dhcp.cgi

Update of /cvsroot/ipcop/ipcop/doc
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14073/doc

Modified Files:
      Tag: IPCOP_v1_4_0
	ChangeLog 
Log Message:
Update Changelog


Index: ChangeLog
===================================================================
RCS file: /cvsroot/ipcop/ipcop/doc/ChangeLog,v
retrieving revision 1.1.2.38
retrieving revision 1.1.2.39
diff -C2 -d -r1.1.2.38 -r1.1.2.39
*** ChangeLog	22 Nov 2007 07:11:17 -0000	1.1.2.38
--- ChangeLog	24 Nov 2007 22:36:53 -0000	1.1.2.39
***************
*** 1,2 ****
--- 1,52 ----
+ 2007-11-24 22:31  gespinasse
+ 
+ 	* langs/: de/cgi-bin/de.pl, it/cgi-bin/it.pl, sk/cgi-bin/sk.pl,
+ 	  zh/cgi-bin/zh.pl, zt/cgi-bin/zt.pl: Update from translation
+ 	  database
+ 
+ 2007-11-24 21:38  gespinasse
+ 
+ 	* updates/1.4.17/: ROOTFILES.alpha-1.4.17, ROOTFILES.i386-1.4.17:
+ 	  Add credit page to update
+ 
+ 2007-11-24 21:31  gespinasse
+ 
+ 	* html/cgi-bin/credits.cgi: Add credit to Salma and Ghalia for
+ 	  Arabic translation
+ 
+ 	  Make me 'Release coordinator'
+ 
+ 2007-11-24 21:01  gespinasse
+ 
+ 	* html/cgi-bin/updates.cgi: Add display of the running kernel
+ 	  version
+ 
+ 2007-11-24 20:40  gespinasse
+ 
+ 	* updates/: 1.4.17/information, 1.4.18/information: Shift the
+ 	  release date to 1 december.  Fix an unproperly closed <br />
+ 
+ 2007-11-24 20:37  gespinasse
+ 
+ 	* html/cgi-bin/updates.cgi: Fix the red alert : - replace le with
+ 	  <= as spotted by Olaf - use df -B M instead of df -h so there is
+ 	  no more GB displayed
+ 
+ 	  Borrow some parts the code to status.cgi.  Now the alert is
+ 	  displayed in the exact 'Free' column where it matter.
+ 
+ 	  It try to display 'disk usage' and 'kernel type selection' in two
+ 	  separate tables. But as buttons are a bit higher than a standard
+ 	  line, the result was not better so I go back to one table.
+ 
+ 2007-11-23 22:53  gespinasse
+ 
+ 	* lfs/configroot, src/ROOTFILES.alpha, src/ROOTFILES.i386: Fix
+ 	  missing new kernelsettings on fresh install
+ 
+ 2007-11-22 07:11  gespinasse
+ 
+ 	* doc/ChangeLog: update Changelog
+ 
  2007-11-22 01:27  gespinasse

Update of /cvsroot/ipcop/ipcop/langs/de/cgi-bin
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12016/langs/de/cgi-bin

Modified Files:
      Tag: IPCOP_v1_4_0
	de.pl 
Log Message:
Update from translation database


Index: de.pl
===================================================================
RCS file: /cvsroot/ipcop/ipcop/langs/de/cgi-bin/de.pl,v
retrieving revision 1.9.2.80
retrieving revision 1.9.2.81
diff -C2 -d -r1.9.2.80 -r1.9.2.81
*** de.pl	19 Nov 2007 20:18:56 -0000	1.9.2.80
--- de.pl	24 Nov 2007 22:31:58 -0000	1.9.2.81
***************
*** 734,737 ****
--- 734,738 ----
  'reboot' => 'Neustart', 
  'reboot schedule' => 'Zeitsteuerung für IPCop Neustarts', 
+ 'reboot to select boot option again' => 'Starten Sie neu, um die Boot Option im Menu neu zu wählen', 
  'rebooting' => 'Starte neu ...', 
  'rebooting ipcop' => 'Starte IPCop neu',

Update of /cvsroot/ipcop/ipcop/langs/zh/cgi-bin
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12016/langs/zh/cgi-bin

Modified Files:
      Tag: IPCOP_v1_4_0
	zh.pl 
Log Message:
Update from translation database


Index: zh.pl
===================================================================
RCS file: /cvsroot/ipcop/ipcop/langs/zh/cgi-bin/zh.pl,v
retrieving revision 1.7.2.26
retrieving revision 1.7.2.27
diff -C2 -d -r1.7.2.26 -r1.7.2.27
*** zh.pl	3 Aug 2007 10:53:30 -0000	1.7.2.26
--- zh.pl	24 Nov 2007 22:31:59 -0000	1.7.2.27
***************
*** 956,960 ****
  'vpn delayed start' => '启动VPN前延迟的时间(秒)', 
  'vpn delayed start help' => '如果需要,延时可以用来正确地升级动态DNS. 当RED使用的是动态IP地质时,60是通用设置.', 
! 'vpn incompatible use of defaultroute' => 'hostname=Þfaultroute 不被允许', 
  'vpn local id' => '本地ID', 
  'vpn missing remote id' => '在认证必须指定识别名(DN).', 
--- 956,960 ----
  'vpn delayed start' => '启动VPN前延迟的时间(秒)', 
  'vpn delayed start help' => '如果需要,延时可以用来正确地升级动态DNS. 当RED使用的是动态IP地质时,60是通用设置.', 
! 'vpn incompatible use of defaultroute' => 'hostname=Defaultroute 不被允许', 
  'vpn local id' => '本地ID', 
  'vpn missing remote id' => '在认证必须指定识别名(DN).',

Update of /cvsroot/ipcop/ipcop/langs/zt/cgi-bin
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12016/langs/zt/cgi-bin

Modified Files:
      Tag: IPCOP_v1_4_0
	zt.pl 
Log Message:
Update from translation database


Index: zt.pl
===================================================================
RCS file: /cvsroot/ipcop/ipcop/langs/zt/cgi-bin/Attic/zt.pl,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** zt.pl	3 Aug 2007 10:53:31 -0000	1.1.2.6
--- zt.pl	24 Nov 2007 22:31:59 -0000	1.1.2.7
***************
*** 956,960 ****
  'vpn delayed start' => '啓動VPN前延遲的時間(秒)', 
  'vpn delayed start help' => '如果需要,延時可以用來正確地升級動態DNS. 當RED使用的是動態IP地質時,60是通用設置.', 
! 'vpn incompatible use of defaultroute' => 'hostname=Þfaultroute 不被允許', 
  'vpn local id' => '本地ID', 
  'vpn missing remote id' => '在認證必須指定識別名(DN).', 
--- 956,960 ----
  'vpn delayed start' => '啓動VPN前延遲的時間(秒)', 
  'vpn delayed start help' => '如果需要,延時可以用來正確地升級動態DNS. 當RED使用的是動態IP地質時,60是通用設置.', 
! 'vpn incompatible use of defaultroute' => 'hostname=Defaultroute 不被允許', 
  'vpn local id' => '本地ID', 
  'vpn missing remote id' => '在認證必須指定識別名(DN).',

Update of /cvsroot/ipcop/ipcop/langs/it/cgi-bin
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12016/langs/it/cgi-bin

Modified Files:
      Tag: IPCOP_v1_4_0
	it.pl 
Log Message:
Update from translation database


Index: it.pl
===================================================================
RCS file: /cvsroot/ipcop/ipcop/langs/it/cgi-bin/it.pl,v
retrieving revision 1.3.2.40
retrieving revision 1.3.2.41
diff -C2 -d -r1.3.2.40 -r1.3.2.41
*** it.pl	19 Nov 2007 20:18:56 -0000	1.3.2.40
--- it.pl	24 Nov 2007 22:31:58 -0000	1.3.2.41
***************
*** 732,735 ****
--- 732,736 ----
  'reboot' => 'Riavvio', 
  'reboot schedule' => 'Programma il reboot di IPCop', 
+ 'reboot to select boot option again' => 'Riavviare per selezionare l\'opzione di boot nel menu', 
  'rebooting' => 'Riavvio', 
  'rebooting ipcop' => 'Riavvio IPCop', 
***************
*** 1000,1003 ****
--- 1001,1005 ----
  'week' => 'Settimana', 
  'weeks' => 'settimane', 
+ 'what should remain' => 'Cosa deve restare?', 
  'wildcards' => 'Wildcard', 
  'wireless' => 'Wireless',

Update of /cvsroot/ipcop/ipcop/langs/sk/cgi-bin
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12016/langs/sk/cgi-bin

Modified Files:
      Tag: IPCOP_v1_4_0
	sk.pl 
Log Message:
Update from translation database


Index: sk.pl
===================================================================
RCS file: /cvsroot/ipcop/ipcop/langs/sk/cgi-bin/Attic/sk.pl,v
retrieving revision 1.1.2.41
retrieving revision 1.1.2.42
diff -C2 -d -r1.1.2.41 -r1.1.2.42
*** sk.pl	19 Nov 2007 20:18:57 -0000	1.1.2.41
--- sk.pl	24 Nov 2007 22:31:58 -0000	1.1.2.42
***************
*** 731,734 ****
--- 731,735 ----
  'reboot' => 'Reštartovať', 
  'reboot schedule' => 'Plánované reštarty', 
+ 'reboot to select boot option again' => 'Reštartovať pre zvolenie štartovacej voľby z menu', 
  'rebooting' => 'Reštartujem', 
  'rebooting ipcop' => 'Reštartujem IPCop',

Update of /cvsroot/ipcop/ipcop/updates/1.4.17
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv23238/updates/1.4.17

Modified Files:
      Tag: IPCOP_v1_4_0
	ROOTFILES.i386-1.4.17 ROOTFILES.alpha-1.4.17 
Log Message:
Add credit page to update


Index: ROOTFILES.i386-1.4.17
===================================================================
RCS file: /cvsroot/ipcop/ipcop/updates/1.4.17/Attic/ROOTFILES.i386-1.4.17,v
retrieving revision 1.1.2.69
retrieving revision 1.1.2.70
diff -C2 -d -r1.1.2.69 -r1.1.2.70
*** ROOTFILES.i386-1.4.17	21 Nov 2007 00:36:01 -0000	1.1.2.69
--- ROOTFILES.i386-1.4.17	24 Nov 2007 21:38:17 -0000	1.1.2.70
***************
*** 4,7 ****
--- 4,8 ----
  etc/rc.d/rc.updatered
  home/httpd/cgi-bin/changepw.cgi
+ home/httpd/cgi-bin/credit.cgi
  home/httpd/cgi-bin/ddns.cgi
  home/httpd/cgi-bin/dhcp.cgi

Index: ROOTFILES.alpha-1.4.17
===================================================================
RCS file: /cvsroot/ipcop/ipcop/updates/1.4.17/Attic/ROOTFILES.alpha-1.4.17,v
retrieving revision 1.1.2.69
retrieving revision 1.1.2.70
diff -C2 -d -r1.1.2.69 -r1.1.2.70
*** ROOTFILES.alpha-1.4.17	21 Nov 2007 00:36:01 -0000	1.1.2.69
--- ROOTFILES.alpha-1.4.17	24 Nov 2007 21:38:17 -0000	1.1.2.70
***************
*** 4,7 ****
--- 4,8 ----
  etc/rc.d/rc.updatered
  home/httpd/cgi-bin/changepw.cgi
+ home/httpd/cgi-bin/credit.cgi
  home/httpd/cgi-bin/ddns.cgi
  home/httpd/cgi-bin/dhcp.cgi

Update of /cvsroot/ipcop/ipcop/html/cgi-bin
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv20047/html/cgi-bin

Modified Files:
      Tag: IPCOP_v1_4_0
	credits.cgi 
Log Message:
Add credit to Salma and Ghalia for Arabic translation

Make me 'Release coordinator'


Index: credits.cgi
===================================================================
RCS file: /cvsroot/ipcop/ipcop/html/cgi-bin/credits.cgi,v
retrieving revision 1.11.2.38
retrieving revision 1.11.2.39
diff -C2 -d -r1.11.2.38 -r1.11.2.39
*** credits.cgi	30 Oct 2006 20:28:44 -0000	1.11.2.38
--- credits.cgi	24 Nov 2007 21:31:03 -0000	1.11.2.39
***************
*** 44,48 ****
  Developer - Alan Hourihane
  (<a href='mailto:alanh\@fairlite.demon.co.uk'>alanh\@fairlite.demon.co.uk</a>)<br />
! ADSL Developer - Gilles Espinasse
  (<a href='mailto:g.esp.ipcop\@free.fr'>g.esp.ipcop\@free.fr</a>)<br />
  Perl Developer - Franck Bourdonnec
--- 44,48 ----
  Developer - Alan Hourihane
  (<a href='mailto:alanh\@fairlite.demon.co.uk'>alanh\@fairlite.demon.co.uk</a>)<br />
! Release coordinator - Gilles Espinasse
  (<a href='mailto:g.esp.ipcop\@free.fr'>g.esp.ipcop\@free.fr</a>)<br />
  Perl Developer - Franck Bourdonnec
***************
*** 79,82 ****
--- 79,87 ----
  Afrikaans:<br />
  &nbsp; Johann du Preez<br />
+ Arabic:<br />
+ &nbsp; Ghalia Saleh Shariha
+ (<a href='mailto:ghalia2050\@yahoo.com'>ghalia2050\@yahoo.com</a>)<br />
+ &nbsp; Salma Mahmod Ashour
+ (<a href='mailto:salma1100\@yahoo.com'>salma1100\@yahoo.com</a>)<br />
  Bulgarian<br />
  &nbsp; Alexander Dimitrov

Update of /cvsroot/ipcop/ipcop/html/cgi-bin
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv10366/html/cgi-bin

Modified Files:
      Tag: IPCOP_v1_4_0
	updates.cgi 
Log Message:
Add display of the running kernel version


Index: updates.cgi
===================================================================
RCS file: /cvsroot/ipcop/ipcop/html/cgi-bin/updates.cgi,v
retrieving revision 1.9.2.35
retrieving revision 1.9.2.36
diff -C2 -d -r1.9.2.35 -r1.9.2.36
*** updates.cgi	24 Nov 2007 20:37:46 -0000	1.9.2.35
--- updates.cgi	24 Nov 2007 21:01:20 -0000	1.9.2.36
***************
*** 50,55 ****
  
  my %uploadsettings=();
  my $kernelused=$Lang::tr{'monoprocessor'};
! $kernelused=$Lang::tr{'smp'} if ((POSIX::uname())[2] =~ /smp/);
  
  $uploadsettings{'KERNEL'} = '';
--- 50,56 ----
  
  my %uploadsettings=();
+ my $kernelrelease=(POSIX::uname())[2];
  my $kernelused=$Lang::tr{'monoprocessor'};
! $kernelused=$Lang::tr{'smp'} if ($kernelrelease =~ /smp/);
  
  $uploadsettings{'KERNEL'} = '';
***************
*** 173,177 ****
  	<td>$Lang::tr{'kernel explanation'}<br /></td>
  </tr><tr>
! 	<td>$Lang::tr{'kernel message'} :$kernelused</td>
  </tr><tr>
  	<td>$Lang::tr{'what should remain'}
--- 174,178 ----
  	<td>$Lang::tr{'kernel explanation'}<br /></td>
  </tr><tr>
! 	<td>$Lang::tr{'kernel message'} :$kernelused, linux-$kernelrelease</td>
  </tr><tr>
  	<td>$Lang::tr{'what should remain'}
***************
*** 333,337 ****
  <tr>
  	<td colspan='7'><b>$Lang::tr{'disk usage'}</b></td>
! 	<td colspan='2'><b>$Lang::tr{'kernel selection'}:</b></td>
  </tr><tr>
  	<td align='left' class='boldbase'><b>$Lang::tr{'device'}</b></td>
--- 334,339 ----
  <tr>
  	<td colspan='7'><b>$Lang::tr{'disk usage'}</b></td>
! 	<td><b>$Lang::tr{'kernel selection'}:</b></td>
! 	<td>linux-$kernelrelease</td>
  </tr><tr>
  	<td align='left' class='boldbase'><b>$Lang::tr{'device'}</b></td>

Update of /cvsroot/ipcop/ipcop/updates/1.4.18
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv1485/updates/1.4.18

Modified Files:
      Tag: IPCOP_v1_4_0
	information 
Log Message:
Shift the release date to 1 december.
Fix an unproperly closed <br />


Index: information
===================================================================
RCS file: /cvsroot/ipcop/ipcop/updates/1.4.18/Attic/information,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** information	18 Nov 2007 23:25:22 -0000	1.1.2.3
--- information	24 Nov 2007 20:40:52 -0000	1.1.2.4
***************
*** 1 ****
! 018|1.4.18 update|Fix cve2007-5135 (openssl-0.9.7m). Update to apache-1.3.39, dhcp-3.0.6 (server), eciadsl-0.12, ntp-4.2.4p4, ssh-4.6p1, Sangoma wanpipe-2.4.3-13|2007-11-25
--- 1 ----
! 018|1.4.18 update|Fix cve2007-5135 (openssl-0.9.7m). Update to apache-1.3.39, dhcp-3.0.6 (server), eciadsl-0.12, ntp-4.2.4p4, ssh-4.6p1, Sangoma wanpipe-2.4.3-13|2007-12-01

Update of /cvsroot/ipcop/ipcop/updates/1.4.17
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv1485/updates/1.4.17

Modified Files:
      Tag: IPCOP_v1_4_0
	information 
Log Message:
Shift the release date to 1 december.
Fix an unproperly closed <br />


Index: information
===================================================================
RCS file: /cvsroot/ipcop/ipcop/updates/1.4.17/Attic/information,v
retrieving revision 1.1.2.24
retrieving revision 1.1.2.25
diff -C2 -d -r1.1.2.24 -r1.1.2.25
*** information	22 Nov 2007 01:27:53 -0000	1.1.2.24
--- information	24 Nov 2007 20:40:52 -0000	1.1.2.25
***************
*** 1 ****
! 017|1.4.17 update|Snort : fix web-misc.rules right,use 2.6 branch for rule update, fix restart on orange.<br />Fix linux-2.4.34 atm module (CVE2007-5087).<br > Update to pcre-7.4 (CVE-2007-16{59,60,61,62} CVE-2007-47{66,67,68}), e1000-7.6.12, ethtool-6, r1000-1.07, squid-2.6.STABLE16, tcpdump-3.9.7/libpcap-0.9.7 (CVE-2007-3798).<br />More secure and better space management during update:<br />- direct update download into IPCop (use Download button) possible once the update is officially released<br />-selection of which kernel type (monoprocessor/smp) remains installed.<br />Add usbserial, dyndns providers (editdns.net, strato.com) and 3w-9xxx drivers.<br />Fix dhcp server self defined options not recognized.<br />Fix VPN configuration WebGUI. If you have a <i>Bad configline</i> error on VPN start, you have to edit/save (no need to change something) the [advanced] config of the broken connection via the WebGUI.<br />Fix vnp-watch. Better workaround for dhcp client against down finishing after up or new. Add Arabic to WebGUI. <b>Apply this update and refresh the page</b>. If you see a red section on disk usage, you need to use <i>Kernel type selection</i> and <b>reboot to select the boot option again</b>. Then apply 1.4.18|2007-11-25
--- 1 ----
! 017|1.4.17 update|Snort : fix web-misc.rules right,use 2.6 branch for rule update, fix restart on orange.<br />Fix linux-2.4.34 atm module (CVE2007-5087).<br /> Update to pcre-7.4 (CVE-2007-16{59,60,61,62} CVE-2007-47{66,67,68}), e1000-7.6.12, ethtool-6, r1000-1.07, squid-2.6.STABLE16, tcpdump-3.9.7/libpcap-0.9.7 (CVE-2007-3798).<br />More secure and better space management during update:<br />- direct update download into IPCop (use Download button) possible once the update is officially released<br />-selection of which kernel type (monoprocessor/smp) remains installed.<br />Add usbserial, dyndns providers (editdns.net, strato.com) and 3w-9xxx drivers.<br />Fix dhcp server self defined options not recognized.<br />Fix VPN configuration WebGUI. If you have a <i>Bad configline</i> error on VPN start, you have to edit/save (no need to change something) the [advanced] config of the broken connection via the WebGUI.<br />Fix vnp-watch. Better workaround for dhcp client against down finishing after up or new. Add Arabic to WebGUI. <b>Apply this update and refresh the page</b>. If you see a red section on disk usage, you need to use <i>Kernel type selection</i> and <b>reboot to select the boot option again</b>. Then apply 1.4.18 update|2007-12-01

Update of /cvsroot/ipcop/ipcop/html/cgi-bin
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv31194/html/cgi-bin

Modified Files:
      Tag: IPCOP_v1_4_0
	updates.cgi 
Log Message:
Fix the red alert :
- replace le with <= as spotted by Olaf
- use df -B M instead of df -h so there is no more GB displayed

Borrow some parts the code to status.cgi.
Now the alert is displayed in the exact 'Free' column where it matter.

It try to display 'disk usage' and 'kernel type selection' in two separate
tables. But as buttons are a bit higher than a standard line, the result
was not better so I go back to one table.


Index: updates.cgi
===================================================================
RCS file: /cvsroot/ipcop/ipcop/html/cgi-bin/updates.cgi,v
retrieving revision 1.9.2.34
retrieving revision 1.9.2.35
diff -C2 -d -r1.9.2.34 -r1.9.2.35
*** updates.cgi	22 Nov 2007 00:43:46 -0000	1.9.2.34
--- updates.cgi	24 Nov 2007 20:37:46 -0000	1.9.2.35
***************
*** 315,336 ****
  
  # To show free space on hard disk
! open (XX,'/bin/df -h / /boot /var/log|');
  my @df=<XX>;
  close (XX);
  # discount possible patch.tgz.gpg size, (stat())[7] is size
  my $patchsize=0;
  $patchsize=(stat('/var/patches/patch.tgz.gpg'))[7]/1024/1024 if (-e '/var/patches/patch.tgz.gpg');
! my $rootfs_style='';
! my $tmp=((@df))[1];
! $tmp =~ / (\d+\.?\d)M\s+(\d+\.?\d)M\s+(\d+\.?\d?)M?/; # no M unit when available is 0
!  # alarm on rootfs available < 20MB
! $rootfs_style="style='background-color: #FF0000;'" if ($3 le (20-$patchsize));
! my $boot_style='';
! $tmp=((@df))[2];
! $tmp =~ / (\d+\.?\d)M\s+(\d+\.?\d)M\s+(\d+\.?\d?)M?/;
!  # alarm on /boot available < 1MB
! $boot_style="style='background-color: #FF0000;'" if ($3 le 1);
! # space on 'Mounted on' add one column
! map ( $_ =~ s/ +/<\/td><td>/g, @df);	# tablify each line!
  my $kernelselected=&get_kernel_text();
  print<<END
--- 315,330 ----
  
  # To show free space on hard disk
! open (XX,'/bin/df -B M -x rootfs|');
  my @df=<XX>;
  close (XX);
+ # skip first line:
+ # Filesystem            Size  Used Avail Use% Mounted on
+ shift(@df);
+ chomp(@df);
  # discount possible patch.tgz.gpg size, (stat())[7] is size
  my $patchsize=0;
  $patchsize=(stat('/var/patches/patch.tgz.gpg'))[7]/1024/1024 if (-e '/var/patches/patch.tgz.gpg');
!  # alert on rootfs available < 20MB, on boot 1MB, on /var/log 1MB
! my @alert=(20-$patchsize, 1, 1);
  my $kernelselected=&get_kernel_text();
  print<<END
***************
*** 341,361 ****
  	<td colspan='2'><b>$Lang::tr{'kernel selection'}:</b></td>
  </tr><tr>
! 	<td>$df[0]</td>
  	<td><input type='submit' name='ACTION' value="$Lang::tr{'kernel selection'}" /></td>
  	<td>$kernelselected</td>
- 
- </tr><tr>
- 	<td $rootfs_style>$df[1]</td>
- 	<td width='10%'>&nbsp;</td>
- 	<td colspan='2'>$Lang::tr{'kernel advice rootfs'}</td>
- </tr><tr>
- 	<td $boot_style>$df[2]</td>
- 	<td width='10%'>&nbsp;</td>
- 	<td colspan='2'>$Lang::tr{'kernel advice boot partition'}</td>
- </tr><tr>
- 	<td>$df[3]</td>
- 	<td width='10%'>&nbsp;</td>
- 	<td colspan='2'><input type='submit' name='ACTION' value='$Lang::tr{'clear cache'} (squid)' /></td>
  </tr>
  </table>
  <hr />
--- 335,374 ----
  	<td colspan='2'><b>$Lang::tr{'kernel selection'}:</b></td>
  </tr><tr>
! 	<td align='left' class='boldbase'><b>$Lang::tr{'device'}</b></td>
! 	<td align='left' class='boldbase'><b>$Lang::tr{'mounted on'}</b></td>
! 	<td align='center' class='boldbase'><b>$Lang::tr{'size'}</b></td>
! 	<td align='center' class='boldbase'><b>$Lang::tr{'used'}</b></td>
! 	<td align='center' class='boldbase'><b>$Lang::tr{'free'}</b></td>
! 	<td align='left' class='boldbase'><b>$Lang::tr{'percentage'}</b></td>
! 	<td>&nbsp;</td>
  	<td><input type='submit' name='ACTION' value="$Lang::tr{'kernel selection'}" /></td>
  	<td>$kernelselected</td>
  </tr>
+ END
+ ;
+ my @kernelmsg=("$Lang::tr{'kernel advice rootfs'}",
+ 		"$Lang::tr{'kernel advice boot partition'}",
+ 		"<input type='submit' name='ACTION' value='$Lang::tr{'clear cache'} (squid)' />");
+ for (my $count = 0; $count<=$#df; $count++) {
+ 	my $tmp=((@df))[$count];
+ 	$tmp =~ /([\w\/]+)\s+(\d+)M\s+(\d+)M\s+(\d+)M\s+(\d+)%\s+([\w\/]+)/;
+ 	my ($dev,$mount,$size,$used,$free,$percent)=($1,$6,$2,$3,$4,$5);
+ 	my $alertstyle="";
+ 	$alertstyle="style='background-color: #FF0000;'" if ($4 <= $alert[$count]);
+ print<<END
+ <tr>
+ 	<td>$dev</td>
+ 	<td>$mount</td>
+ 	<td align='right'>$size</td>
+ 	<td align='right'>$used</td>
+ 	<td align='right' $alertstyle>$free</td>
+ 	<td align='right'>$percent%</td>
+ 	<td>&nbsp;</td>
+ 	<td colspan='2'>$kernelmsg[$count]</td>
+ </tr>
+ END
+ 	;
+ }
+ print<<END
  </table>
  <hr />

Update of /cvsroot/ipcop/ipcop/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6963/src

Modified Files:
      Tag: IPCOP_v1_4_0
	ROOTFILES.alpha ROOTFILES.i386 
Log Message:
Fix missing new kernelsettings on fresh install


Index: ROOTFILES.alpha
===================================================================
RCS file: /cvsroot/ipcop/ipcop/src/Attic/ROOTFILES.alpha,v
retrieving revision 1.12.2.233
retrieving revision 1.12.2.234
diff -C2 -d -r1.12.2.233 -r1.12.2.234
*** ROOTFILES.alpha	21 Nov 2007 00:35:57 -0000	1.12.2.233
--- ROOTFILES.alpha	23 Nov 2007 22:53:16 -0000	1.12.2.234
***************
*** 23675,23678 ****
--- 23675,23679 ----
  #var/ipcop/main
  #var/ipcop/main/hosts
+ #var/ipcop/main/kernelsettings
  #var/ipcop/main/settings
  #var/ipcop/modem

Index: ROOTFILES.i386
===================================================================
RCS file: /cvsroot/ipcop/ipcop/src/Attic/ROOTFILES.i386,v
retrieving revision 1.23.2.263
retrieving revision 1.23.2.264
diff -C2 -d -r1.23.2.263 -r1.23.2.264
*** ROOTFILES.i386	21 Nov 2007 00:35:57 -0000	1.23.2.263
--- ROOTFILES.i386	23 Nov 2007 22:53:16 -0000	1.23.2.264
***************
*** 24441,24444 ****
--- 24441,24445 ----
  #var/ipcop/main
  #var/ipcop/main/hosts
+ #var/ipcop/main/kernelsettings
  #var/ipcop/main/settings
  #var/ipcop/modem

Update of /cvsroot/ipcop/ipcop/lfs
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6963/lfs

Modified Files:
      Tag: IPCOP_v1_4_0
	configroot 
Log Message:
Fix missing new kernelsettings on fresh install


Index: configroot
===================================================================
RCS file: /cvsroot/ipcop/ipcop/lfs/configroot,v
retrieving revision 1.9.2.31
retrieving revision 1.9.2.32
diff -C2 -d -r1.9.2.31 -r1.9.2.32
*** configroot	7 Aug 2007 18:37:36 -0000	1.9.2.31
--- configroot	23 Nov 2007 22:53:15 -0000	1.9.2.32
***************
*** 67,71 ****
  	    certs/index.txt ddns/config ddns/noipsettings ddns/settings dhcp/settings \
  	    dhcp/fixleases dhcp/advoptions dmzholes/config ethernet/aliases ethernet/settings \
! 	    isdn/settings main/hosts main/settings optionsfw/settings patches/available patches/installed \
  	    portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
  	    ppp/settings-5 ppp/settings proxy/settings remote/settings shaping/settings \
--- 67,71 ----
  	    certs/index.txt ddns/config ddns/noipsettings ddns/settings dhcp/settings \
  	    dhcp/fixleases dhcp/advoptions dmzholes/config ethernet/aliases ethernet/settings \
! 	    isdn/settings main/{hosts,kernelsettings,settings} optionsfw/settings patches/available patches/installed \
  	    portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
  	    ppp/settings-5 ppp/settings proxy/settings remote/settings shaping/settings \

Update of /cvsroot/ipcop/ipcop/doc
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv27982/doc

Modified Files:
      Tag: IPCOP_v1_4_0
	ChangeLog 
Log Message:
update Changelog


Index: ChangeLog
===================================================================
RCS file: /cvsroot/ipcop/ipcop/doc/ChangeLog,v
retrieving revision 1.1.2.37
retrieving revision 1.1.2.38
diff -C2 -d -r1.1.2.37 -r1.1.2.38
*** ChangeLog	17 Jul 2007 08:23:46 -0000	1.1.2.37
--- ChangeLog	22 Nov 2007 07:11:17 -0000	1.1.2.38
***************
*** 1,2 ****
--- 1,1591 ----
+ 2007-11-22 01:27  gespinasse
+ 
+ 	* updates/1.4.17/information: Reorder information and add the
+ 	  warning on the needed reboot if using 'kernel type' selection.
+ 
+ 2007-11-22 01:24  gespinasse
+ 
+ 	* lfs/linux: Fix URL for patch-o-matic.  Because I was not able to
+ 	  find a source on the web, I copy them on sourceforge
[...1666 lines suppressed...]
+ 
+ 	* lfs/avmdrv: Include ipcop name before. When I remove ipcop from
+ 	  the lfs name, I loose the prefix on THISAPP.
+ 
+ 2006-04-30 23:15  chepati
+ 
+ 	* lfs/avmdrv: Added PKG_NAME to every script.  This will make it
+ 	  easier to identify scripts from other files.	This will also be
+ 	  useful for the dependencies
+ 
+ 2006-04-30 22:20  chepati
+ 
+ 	* lfs/avmdrv: removed dos carriage ruturns
+ 
+ 2006-04-30 19:45  gespinasse
+ 
+ 	* lfs/avmdrv: Change lfs script name from ipcop-avmdrv to avmdrv
+ 
  2006-04-30 15:45  eoberlander

Update of /cvsroot/ipcop/ipcop/updates/1.4.17
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv16397/updates/1.4.17

Modified Files:
      Tag: IPCOP_v1_4_0
	information 
Log Message:
Reorder information and add the warning on the needed reboot if using
'kernel type' selection.


Index: information
===================================================================
RCS file: /cvsroot/ipcop/ipcop/updates/1.4.17/Attic/information,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -C2 -d -r1.1.2.23 -r1.1.2.24
*** information	21 Nov 2007 00:36:01 -0000	1.1.2.23
--- information	22 Nov 2007 01:27:53 -0000	1.1.2.24
***************
*** 1 ****
! 017|1.4.17 update|Fix linux-2.4.34 atm module (CVE2007-5087). Update to pcre-7.4 (CVE-2007-16{59,60,61,62} CVE-2007-47{66,67,68}), e1000-7.6.12, ethtool-6, squid-2.6.STABLE16, tcpdump-3.9.7/libpcap-0.9.7 (security fix).<br />Fix snort rules update right and branch.<br />More secure and better space management during update.<br />Possibility of a direct update download into IPCop (use Download button).<br />Possibility of selecting which kernel type (monoprocessor/smp) remains installed.<br />Update to r1000-1.07 <br />Added usbserial, dyndns providers (editdns.net, strato.com) and 3w-9xxx drivers.<br />Fix dhcp server self defined options not recognized.<br />Fix VPN configuration WebGUI. If you have a <i>Bad configline</i> error on VPN start, you have to edit/save (no need to change something) the [advanced] config of the broken connection via the WebGUI.<br />Better fix for dhcp client down finishing after up or new. Add Arabic to WebGUI. Apply this update and refresh the page. If you see a red section on disk usage, you need to use <i>Kernel selection</i>.Then apply 1.4.18|2007-11-25
--- 1 ----
! 017|1.4.17 update|Snort : fix web-misc.rules right,use 2.6 branch for rule update, fix restart on orange.<br />Fix linux-2.4.34 atm module (CVE2007-5087).<br > Update to pcre-7.4 (CVE-2007-16{59,60,61,62} CVE-2007-47{66,67,68}), e1000-7.6.12, ethtool-6, r1000-1.07, squid-2.6.STABLE16, tcpdump-3.9.7/libpcap-0.9.7 (CVE-2007-3798).<br />More secure and better space management during update:<br />- direct update download into IPCop (use Download button) possible once the update is officially released<br />-selection of which kernel type (monoprocessor/smp) remains installed.<br />Add usbserial, dyndns providers (editdns.net, strato.com) and 3w-9xxx drivers.<br />Fix dhcp server self defined options not recognized.<br />Fix VPN configuration WebGUI. If you have a <i>Bad configline</i> error on VPN start, you have to edit/save (no need to change something) the [advanced] config of the broken connection via the WebGUI.<br />Fix vnp-watch. Better workaround for dhcp client against down finishing after up or new. Add Arabic to WebGUI. <b>Apply this update and refresh the page</b>. If you see a red section on disk usage, you need to use <i>Kernel type selection</i> and <b>reboot to select the boot option again</b>. Then apply 1.4.18|2007-11-25

Update of /cvsroot/ipcop/ipcop/lfs
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14554/lfs

Modified Files:
      Tag: IPCOP_v1_4_0
	linux 
Log Message:
Fix URL for patch-o-matic.
Because I was not able to find a source on the web, I copy them on sourceforge


Index: linux
===================================================================
RCS file: /cvsroot/ipcop/ipcop/lfs/linux,v
retrieving revision 1.42.2.83
retrieving revision 1.42.2.84
diff -C2 -d -r1.42.2.83 -r1.42.2.84
*** linux	12 Oct 2007 06:00:56 -0000	1.42.2.83
--- linux	22 Nov 2007 01:24:41 -0000	1.42.2.84
***************
*** 82,87 ****
  openswan-1.0.10.tar.gz			= http://www.openswan.org/download/openswan-1.0.10.tar.gz
  iptables-1.3.5.tar.bz2			= http://www.netfilter.org/projects/iptables/files/iptables-1.3.5.tar.bz2
! patch-o-matic-ng-20050918.tar.bz2	= http://www.gotroot.com/downloads/ftp/security/netfilter/patch-o-matic-ng/snapshot/patch-o-matic-ng-20050918.tar.bz2
! patch-o-matic-ng-20051229.tar.bz2	= http://www.gotroot.com/downloads/ftp/security/netfilter/patch-o-matic-ng/snapshot/patch-o-matic-ng-20051229.tar.bz2
  iw249_we17-13.diff			= http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/iw249_we17-13.diff
  iw240_we18-5.diff			= http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/iw240_we18-5.diff
--- 82,87 ----
  openswan-1.0.10.tar.gz			= http://www.openswan.org/download/openswan-1.0.10.tar.gz
  iptables-1.3.5.tar.bz2			= http://www.netfilter.org/projects/iptables/files/iptables-1.3.5.tar.bz2
! patch-o-matic-ng-20050918.tar.bz2	= $(URL_SFNET)/ipcop/patch-o-matic-ng-20050918.tar.bz2
! patch-o-matic-ng-20051229.tar.bz2	= $(URL_SFNET)/ipcop/patch-o-matic-ng-20051229.tar.bz2
  iw249_we17-13.diff			= http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/iw249_we17-13.diff
  iw240_we18-5.diff			= http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/iw240_we18-5.diff

Update of /cvsroot/ipcop/ipcop/langs/fr/cgi-bin
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv1565/langs/fr/cgi-bin

Modified Files:
      Tag: IPCOP_v1_4_0
	fr.pl 
Log Message:
Sorry for other langs but not some much time to give to translators again.
Insert the warning that selecting again the boot entry is needed


Index: fr.pl
===================================================================
RCS file: /cvsroot/ipcop/ipcop/langs/fr/cgi-bin/fr.pl,v
retrieving revision 1.6.2.100
retrieving revision 1.6.2.101
diff -C2 -d -r1.6.2.100 -r1.6.2.101
*** fr.pl	18 Nov 2007 10:14:43 -0000	1.6.2.100
--- fr.pl	22 Nov 2007 00:52:18 -0000	1.6.2.101
***************
*** 735,738 ****
--- 735,739 ----
  'reboot' => 'Redémarrer', 
  'reboot schedule' => 'Programmation des redémarrages d\'IPCop', 
+ 'reboot to select boot option again' => 'Redémarrer la machine pour sélectionner à nouveau l\'option de démarrage dans le menu', 
  'rebooting' => 'Redémarrage en cours', 
  'rebooting ipcop' => 'Redémarrage d\'IPCop',

Update of /cvsroot/ipcop/ipcop/langs/en/cgi-bin
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv1565/langs/en/cgi-bin

Modified Files:
      Tag: IPCOP_v1_4_0
	en.pl 
Log Message:
Sorry for other langs but not some much time to give to translators again.
Insert the warning that selecting again the boot entry is needed


Index: en.pl
===================================================================
RCS file: /cvsroot/ipcop/ipcop/langs/en/cgi-bin/en.pl,v
retrieving revision 1.22.2.146
retrieving revision 1.22.2.147
diff -C2 -d -r1.22.2.146 -r1.22.2.147
*** en.pl	18 Nov 2007 10:14:42 -0000	1.22.2.146
--- en.pl	22 Nov 2007 00:52:18 -0000	1.22.2.147
***************
*** 730,733 ****
--- 730,734 ----
  'reboot' => 'Reboot', 
  'reboot schedule' => 'Schedule IPCop reboots', 
+ 'reboot to select boot option again' => 'Reboot to select boot option again on the menu', 
  'rebooting' => 'Rebooting', 
  'rebooting ipcop' => 'Rebooting IPCop',

Update of /cvsroot/ipcop/ipcop/html/cgi-bin
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv30058/html/cgi-bin

Modified Files:
      Tag: IPCOP_v1_4_0
	updates.cgi 
Log Message:
Fix the kernel preselection because of = used instead of eq

Add a new sentence to warn that it is needed to select again the boot
option on the menu when selecting 'kernel type'.
Since we erase half of the entries, selection change if it is not the first one.


Index: updates.cgi
===================================================================
RCS file: /cvsroot/ipcop/ipcop/html/cgi-bin/updates.cgi,v
retrieving revision 1.9.2.33
retrieving revision 1.9.2.34
diff -C2 -d -r1.9.2.33 -r1.9.2.34
*** updates.cgi	18 Nov 2007 10:14:41 -0000	1.9.2.33
--- updates.cgi	22 Nov 2007 00:43:46 -0000	1.9.2.34
***************
*** 155,160 ****
  } elsif ($uploadsettings{'ACTION'} eq "$Lang::tr{'kernel selection'}") {
  	if ($uploadsettings{'KERNEL'} eq '') {
! 		$uploadsettings{'KERNEL'}='MONO' if ($kernelused=$Lang::tr{'monoprocessor'});
! 		$uploadsettings{'KERNEL'}='SMP' if ($kernelused=$Lang::tr{'smp'});
  	}
  	# for option box
--- 155,160 ----
  } elsif ($uploadsettings{'ACTION'} eq "$Lang::tr{'kernel selection'}") {
  	if ($uploadsettings{'KERNEL'} eq '') {
! 		$uploadsettings{'KERNEL'}='MONO' if ($kernelused eq $Lang::tr{'monoprocessor'});
! 		$uploadsettings{'KERNEL'}='SMP' if ($kernelused eq $Lang::tr{'smp'});
  	}
  	# for option box
***************
*** 185,188 ****
--- 185,191 ----
  		<input type='submit' name='ACTION' value='$Lang::tr{'cancel'}' /></td>
  </tr>
+ </tr><tr>
+ 	<td>$Lang::tr{'reboot to select boot option again'}</td>
+ </tr>
  </table>
  </form>

Update of /cvsroot/ipcop/ipcop/lfs
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv20549/lfs

Modified Files:
      Tag: IPCOP_v1_4_0
	Config 
Log Message:
Fix some problems with download and md5 targets

A makefile fail when the last command run return an error
If we run md5sum, it never fail if the file is present
So we need to exit if md5 test is wrong

Prevent the case where download was goog but you forgot to update _MD5.
File is already loaded and remain on /tmp, wget can't load more and will
return a failure.
So check md5 if file is already present on /tmp before wget

Be more explicit in case of error


Index: Config
===================================================================
RCS file: /cvsroot/ipcop/ipcop/lfs/Config,v
retrieving revision 1.7.2.34
retrieving revision 1.7.2.35
diff -C2 -d -r1.7.2.34 -r1.7.2.35
*** Config	7 Jul 2007 15:32:05 -0000	1.7.2.34
--- Config	21 Nov 2007 07:51:58 -0000	1.7.2.35
***************
*** 120,126 ****
  define LOAD
  	@echo -e "$(MESSAGE)Download: $($(notdir $@))"
! 	wget -T 120 -t 1 -c -nv $($(notdir $@)) -O $(DIR_TMP)/$(notdir $@)
! 	[ "$($(notdir $@)_MD5)" = `md5sum $(DIR_TMP)/$(notdir $@) | awk '{ print $$1 }'` ] # detect page not found answer
! 	mv $(DIR_TMP)/$(notdir $@) $(DIR_DL)
  endef
  
--- 120,140 ----
  define LOAD
  	@echo -e "$(MESSAGE)Download: $($(notdir $@))"
! 	# if a file was yet fully loaded on /tmp, but _MD5 was wrong and fixed later, next wget will fail
! 	# prevent that case
! 	# check md5 after download to detect page not found answer or download error
! 	if [ -s $(DIR_TMP)/$(notdir $@) ]; then \
! 		if [ "$($(notdir $@)_MD5)" = `md5sum $(DIR_TMP)/$(notdir $@) | awk '{ print $$1 }'` ]; then \
! 			mv $(DIR_TMP)/$(notdir $@) $(DIR_DL); \
! 		else \
! 			wget -T 120 -t 1 -c -nv $($(notdir $@)) -O $(DIR_TMP)/$(notdir $@); \
! 			if [ "$($(notdir $@)_MD5)" = `md5sum $(DIR_TMP)/$(notdir $@) | awk '{ print $$1 }'` ]; then \
! 				mv $(DIR_TMP)/$(notdir $@) $(DIR_DL); \
! 			else \
! 				echo "$(notdir $@) checksum is bad"; \
! 				echo "$(notdir $@) may need to be removed from /tmp or download has been interrupt"; \
! 				exit 1; \
! 			fi; \
! 		fi; \
! 	fi
  endef
  
***************
*** 135,142 ****
  		echo "Previous file is loaded again"; \
  		wget -T 120 -t 1 -nv $($(notdir $@)) -O $(DIR_TMP)/$(notdir $@); \
! 		[ "$($(notdir $@)_MD5)" = `md5sum $(DIR_TMP)/$(notdir $@) | awk '{ print $$1 }'` ]; \
! 		mv $(DIR_TMP)/$(notdir $@) $(DIR_DL); \
! 		echo "$@ checksum OK"; \
! 		echo "$@" >>$(DIR_INFO)/_build.othersrc-list.log; \
  	fi
  endef
--- 149,160 ----
  		echo "Previous file is loaded again"; \
  		wget -T 120 -t 1 -nv $($(notdir $@)) -O $(DIR_TMP)/$(notdir $@); \
! 		if [ "$($(notdir $@)_MD5)" = `md5sum $(DIR_TMP)/$(notdir $@) | awk '{ print $$1 }'` ]; then \
! 			mv $(DIR_TMP)/$(notdir $@) $(DIR_DL); \
! 			echo "$@ checksum OK"; \
! 			echo "$@" >>$(DIR_INFO)/_build.othersrc-list.log; \
! 		else \
! 			echo "$@ checksum still bad"; \
! 			exit 1; \
! 		fi; \
  	fi
  endef

Update of /cvsroot/ipcop/ipcop/lfs
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv13434/lfs

Modified Files:
      Tag: IPCOP_v1_4_0
	e1000 
Log Message:
Upgrade e1000 to 7.6.12

Slightly rework 1.4.17 information (add progname before CVE), add e1000


Index: e1000
===================================================================
RCS file: /cvsroot/ipcop/ipcop/lfs/Attic/e1000,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** e1000	1 Jan 2007 00:59:38 -0000	1.1.2.3
--- e1000	21 Nov 2007 00:35:56 -0000	1.1.2.4
***************
*** 33,37 ****
  include Config
  
! VER        = 7.3.15
  
  THISAPP    = e1000-$(VER)
--- 33,37 ----
  include Config
  
! VER        = 7.6.12
  
  THISAPP    = e1000-$(VER)
***************
*** 49,59 ****
  ###############################################################################
  
! objects = $(DL_FILE) e1000-7.3.15-fix-mii.patch
  
  $(DL_FILE)			= $(DL_FROM)/$(DL_FILE)
- e1000-7.3.15-fix-mii.patch	= http://linux.1wt.eu/kernel/2.4-wt/2.4.33-wt4/patches-2.4.33-wt4/pool/2.4.33-e1000-7.3.15-fix-mii-interface.diff
  
! $(DL_FILE)_MD5			= a0e87284de77c4c1ba169f56b8af0326
! e1000-7.3.15-fix-mii.patch_MD5	= f9b787e09b933b23a74cb82251d966ee
  
  install : $(TARGET)
--- 49,58 ----
  ###############################################################################
  
! objects = $(DL_FILE)
  
  $(DL_FILE)			= $(DL_FROM)/$(DL_FILE)
  
! $(DL_FILE)_MD5			= e3a54d3a2862b378eeddfa2ce6298cae
! 
  
  install : $(TARGET)
***************
*** 85,90 ****
  	@$(PREBUILD)
  	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- 	# ethtool was working but not mii-tool, hope it does not break ethtool
- 	cd $(DIR_APP)/src && patch -Np4 < $(DIR_DL)/e1000-7.3.15-fix-mii.patch
  ifeq "$(SMP)" ""
  	# force 2.4 kernel rules, UP/SMP, just build as we don't want time consuming depmod
--- 84,87 ----