[Devil-linux-commit] build/scripts/configuration linux.config,1.10,1.10.2.1 patch-o-matic.config,1.5,1.5.2.1

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts/configuration
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18302/scripts/configuration

Modified Files:
      Tag: rel-1-2-patches
	linux.config patch-o-matic.config 
Log Message:
- updated rsync to v2.6.2
- updated openldap to v2.2.15
- replace patch-o-matic with patch-o-matic-ng 20040823
- updated iptables to v1.2.11
- added missing squid configuration files
- removed support for updating the Philips Webcam driver (development is now
discontinued)
- updated RFC2385 patch to correctly apply under kernel 2.4.27
- updated ebtables patch to v7
- updated gradm to v2.0.1
- updated grsecurity-2.0.1 to v2.4.27
- updated linux to v2.4.27


Index: patch-o-matic.config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/configuration/patch-o-matic.config,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- patch-o-matic.config	14 Apr 2004 02:39:38 -0000	1.5
+++ patch-o-matic.config	4 Sep 2004 15:00:26 -0000	1.5.2.1
@@ -5,20 +5,18 @@
 #
 # http://www.devil-linux.org
 
-[ "$CONFIG_LINUX_VERSION" = "2.4" ] && 
+#[ "$CONFIG_LINUX_VERSION" = "2.4" ] && 
 	menu_add "Networking|Firewall" bool "Netfilter patches" CONFIG_NF_PATCHES
 
 if [ "$CONFIG_NF_PATCHES" = "y" ]; then
-	menu_add "Networking|Firewall" bool "Netfilter submitted patches" CONFIG_NF_SUBMITTED
-
-	[ "$CONFIG_NF_SUBMITTED" = "y" ] && 
-		menu_add "Networking|Firewall" bool "Netfilter pending patches" CONFIG_NF_PENDING
+	menu_add "Networking|Firewall" bool "Netfilter 'updates' patches" CONFIG_NF_UPDATES
 
-	if [ "$CONFIG_NF_SUBMITTED" = "y" ] && [ "$CONFIG_NF_PENDING" = "y" ]; then
-		menu_add "Networking|Firewall" bool "Netfilter base patches" CONFIG_NF_BASE
+	[ "$CONFIG_NF_UPDATES" = "y" ] && 
+		menu_add "Networking|Firewall" bool "Netfilter 'pending' patches" CONFIG_NF_PENDING
 
-		menu_add "Networking|Firewall" bool "Netfilter optimization patches (causes problems)" CONFIG_NF_OPTIMIZATION
+	if [ "$CONFIG_NF_UPDATES" = "y" ] && [ "$CONFIG_NF_PENDING" = "y" ]; then
+		menu_add "Networking|Firewall" bool "Netfilter 'base' patches" CONFIG_NF_BASE
 
-		menu_add "Networking|Firewall" bool "Netfilter extra patches" CONFIG_NF_EXTRA
+		menu_add "Networking|Firewall" bool "Netfilter 'extra' patches" CONFIG_NF_EXTRA
 	fi
 fi

Index: linux.config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/configuration/linux.config,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- linux.config	11 Jan 2004 14:43:05 -0000	1.10
+++ linux.config	4 Sep 2004 15:00:18 -0000	1.10.2.1
@@ -10,4 +10,3 @@
 menu_add "Build Configuration|Processor and Memory" bool "Symmetric multi-processing support" CONFIG_LINUX_SMP
 menu_add "Build Configuration|Processor and Memory" list "Maximum number of CPUs" CONFIG_LINUX_NR_CPUS 2 4 8 16 32
 menu_add "Build Configuration" list "Kernel Version" CONFIG_LINUX_VERSION 2.4 2.6
-test "$CONFIG_LINUX_VERSION" = "2.4" &&  menu_add "System|Hardware Support" bool "Update Philips USB Webcam Kernel Driver (pwc) EXPERIMENTAL" CONFIG_LINUX_UPDATE_PWC