devil-linux-commit Mailing List for Devil-Linux (Page 193)

Brought to you by: blubdog, friedl, small_fish, smiley73

devil-linux-commit — Mailing list for CVS commit messages.

You can subscribe to this list here.

2003	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (202)	Nov (201)	Dec (280)
2004	Jan (493)	Feb (106)	Mar (215)	Apr (163)	May (79)	Jun (193)	Jul (47)	Aug (71)	Sep (127)	Oct (41)	Nov (49)	Dec (120)
2005	Jan (147)	Feb (45)	Mar (26)	Apr (71)	May (52)	Jun (28)	Jul (92)	Aug (50)	Sep (35)	Oct (193)	Nov (106)	Dec (52)
2006	Jan (51)	Feb (38)	Mar (33)	Apr (79)	May (107)	Jun (67)	Jul (21)	Aug (65)	Sep (44)	Oct (87)	Nov (12)	Dec (56)
2007	Jan (48)	Feb (58)	Mar (63)	Apr (31)	May (25)	Jun (20)	Jul (72)	Aug (54)	Sep (30)	Oct (76)	Nov (74)	Dec (25)
2008	Jan (39)	Feb (39)	Mar (62)	Apr (64)	May (59)	Jun (31)	Jul (25)	Aug (25)	Sep (17)	Oct (24)	Nov	Dec (1)
2009	Jan (60)	Feb (39)	Mar (16)	Apr (30)	May (52)	Jun (35)	Jul (15)	Aug (15)	Sep (21)	Oct (32)	Nov (39)	Dec (52)
2010	Jan (42)	Feb (40)	Mar (23)	Apr (20)	May (27)	Jun (10)	Jul (30)	Aug (30)	Sep (66)	Oct (12)	Nov (35)	Dec (60)
2011	Jan (16)	Feb (1)	Mar (3)	Apr (28)	May (21)	Jun	Jul (12)	Aug (6)	Sep (10)	Oct (14)	Nov (40)	Dec (60)
2012	Jan (23)	Feb (17)	Mar (24)	Apr (18)	May (13)	Jun (1)	Jul	Aug (5)	Sep	Oct (5)	Nov (5)	Dec (15)
2013	Jan (2)	Feb (5)	Mar (1)	Apr (2)	May (2)	Jun (3)	Jul	Aug (3)	Sep (5)	Oct (3)	Nov (1)	Dec (1)
2014	Jan (3)	Feb (5)	Mar (8)	Apr (3)	May (1)	Jun (1)	Jul (2)	Aug	Sep (4)	Oct (10)	Nov	Dec (9)
2015	Jan (18)	Feb (17)	Mar (5)	Apr (2)	May	Jun (5)	Jul (1)	Aug (2)	Sep (1)	Oct (24)	Nov (20)	Dec (41)
2016	Jan (9)	Feb (3)	Mar (2)	Apr (7)	May (8)	Jun (1)	Jul (6)	Aug (5)	Sep (2)	Oct (6)	Nov (1)	Dec (6)
2017	Jan (6)	Feb (1)	Mar	Apr (4)	May (1)	Jun (1)	Jul (2)	Aug (2)	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 191 192 193 194 195 .. 253 > >> (Page 193 of 253)

[Devil-linux-commit] build/config/etc/sysconfig/nic ifcfg-eth5.sample,NONE,1.1

From: Friedrich L. <fr...@us...> - 2004-04-10 00:28:15

Update of /cvsroot/devil-linux/build/config/etc/sysconfig/nic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17603/config/etc/sysconfig/nic

Added Files:
	ifcfg-eth5.sample 
Log Message:
added IPv6 interface configuration support which was 
contributed to DL from Arnaud Gomes-do-Vale



--- NEW FILE: ifcfg-eth5.sample ---
#
# example for an interface with IPv6 ONLY
#
DEVICE=eth5
ONBOOT=yes
MODULE="e1000"
DHCP=no
#
# Our IPv6 addresses, separated by spaces
IPV6ADDR="fec0:0:0:1::42/64 fec0:0:0:2::42/64"
#
# IPv6 routes have the following format:
### IPV6ROUTE="address/mask|gateway"
#
# A route to some subnet:
IPV6ROUTE="fec0:0:0:3::/64|fec0:0:0:2::12"
#
# set the default route:
IPV6ROUTE="$IPV6ROUTE ::/0|fec0:0:0:1::12"

[Devil-linux-commit] build/config/etc/sysconfig config,1.21,1.22

From: Friedrich L. <fr...@us...> - 2004-04-10 00:28:15

Update of /cvsroot/devil-linux/build/config/etc/sysconfig
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17603/config/etc/sysconfig

Modified Files:
	config 
Log Message:
added IPv6 interface configuration support which was 
contributed to DL from Arnaud Gomes-do-Vale



Index: config
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/sysconfig/config,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- config	22 Mar 2004 17:08:22 -0000	1.21
+++ config	10 Apr 2004 00:14:49 -0000	1.22
@@ -12,10 +12,17 @@
 
 HOSTNAME=Devil
 DOMAIN=devil-linux.org
+#
+# IPv4/IPv6 default routes are set in the interface config 
+# files. See the examples files nic/ifcfg-eth*.sample 
+#
 
-# enable routing -> yes/no
+# enable IPv4 routing -> yes/no
 START_ROUTING=yes
 
+# enable IPv6 routing -> yes/no
+START_IPV6_ROUTING=yes
+
 # Start the firewall script -> yes/no
 START_FIREWALL=yes

[Devil-linux-commit] build/config/etc/init.d network,1.30,1.31

From: Friedrich L. <fr...@us...> - 2004-04-10 00:28:14

Update of /cvsroot/devil-linux/build/config/etc/init.d
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17603/config/etc/init.d

Modified Files:
	network 
Log Message:
added IPv6 interface configuration support which was 
contributed to DL from Arnaud Gomes-do-Vale



Index: network
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/network,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- network	21 Mar 2004 20:15:20 -0000	1.30
+++ network	10 Apr 2004 00:14:49 -0000	1.31
@@ -14,6 +14,7 @@
 #   Eric Laberge
 #   Friedrich Lobenstock <fl...@fl...>
 #   Thomas Eder <tho...@bu...>
+#   Arnaud Gomes-do-Vale <Arn...@ir...>
 #
 
 ### BEGIN INIT INFO
@@ -146,6 +147,10 @@
 	ROUTE=
 	BR_IF=
 
+	# IPv6 stuff
+	IPV6ADDR=
+	IPV6ROUTE=
+
 	WIRELESS=
 	ESSID=
 	NWID=
@@ -208,12 +213,25 @@
 			BCAST=""; test -n "$BROADCAST" && BCAST="broadcast $BROADCAST"
 			NMASK=""; test -n "$NETMASK" && NMASK="netmask $NETMASK"
 
-			echo -n "Starting interface $DEVICE"
+			echo -n "Starting interface $DEVICE"; ret=0
 			if [ -n "$IP" ]; then
-				ifconfig $DEVICE $IP $BCAST $NMASK up
+				# configure IPv4 address
+				echo -n " [IPv4]"
+				ifconfig $DEVICE $IP $BCAST $NMASK up; let ret=$ret+$?
 			else
-				ifconfig $DEVICE up
+				ifconfig $DEVICE up; let ret=$ret+$?
 			fi
+
+			if [ -n "$IPV6ADDR" ]; then
+				# configure IPv6 address(es)
+				echo -n " [IPv6]"
+				for v6addr in $IPV6ADDR; do
+					ifconfig $DEVICE inet6 add $v6addr; let ret=$ret+$?
+				done
+			fi
+
+			# evaluate combined result
+			test $ret -eq 0
 			evaluate_retval
 		fi
 
@@ -254,6 +272,22 @@
 				fi
 			done
 		fi
+
+		# IPv6 routing can be done with link-local addresses even without explicit address configuration
+		if [ -n "$IPV6ROUTE" ]; then
+			for route_info in ${IPV6ROUTE} ; do
+				destination=$(echo $route_info | cut -f1 -d\|)
+				gateway=$(echo $route_info | cut -f2 -d\|)
+
+				# filter bogus records
+				test -z "$destination" && continue
+
+				# add the route
+				echo "   adding route to $destination ${gateway:+ via gateway $gateway} on $DEVICE"
+				ip -f inet6 route add $destination ${gateway:+via $gateway} dev $DEVICE
+			done
+		fi
+
 	fi
 }
 
@@ -376,10 +410,24 @@
 			echo "please set it in the interface configuration file"
 		fi
 
-		# enable IP Routing
-		if [ "$START_ROUTING" = "yes" ]; then
-			echo -n "Enable Routing"
-			echo "1" > /proc/sys/net/ipv4/ip_forward
+		# enable IPv4 and/or IPv6 Routing
+		if [ "$START_ROUTING" = "yes" -o "$START_IPV6_ROUTING" = "yes" ]; then
+			echo -n "Enabling Routing"
+
+			if [ "$START_ROUTING" = "yes" ]; then
+				echo -n " [IPv4]"
+				echo "1" > /proc/sys/net/ipv4/ip_forward
+			fi
+
+			if [ "$START_IPV6_ROUTING" = "yes" ]; then
+				echo -n " [IPv6]"
+				# when routing IPv6 with link-local addresses only, we 
+				# have to explicitely load the ipv6 module before enabling
+                                # routing
+				modprobe ipv6
+				echo "1" > /proc/sys/net/ipv6/conf/all/forwarding
+			fi
+
 			print_status success
 		fi

[Devil-linux-commit] build CHANGES,1.757,1.758

From: Friedrich L. <fr...@us...> - 2004-04-10 00:28:14

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

Modified Files:
	CHANGES 
Log Message:
added IPv6 interface configuration support which was 
contributed to DL from Arnaud Gomes-do-Vale



Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.757
retrieving revision 1.758
diff -u -d -r1.757 -r1.758
--- CHANGES	9 Apr 2004 22:21:22 -0000	1.757
+++ CHANGES	10 Apr 2004 00:14:48 -0000	1.758
@@ -22,6 +22,7 @@
 #
 
 1.1.3
+- added IPv6 interface configuration support (fl + Arnaud Gomes-do-Vale)
 - fixed the case that netfilter patch-o-matic did fail with 
   certain submitted and/or pending patches (fl)
 - added boot parameter 'config=<device>:<filename>' which is given

[Devil-linux-commit] build/config/etc/initrd linuxrc,1.67,1.68

From: Heiko Z. <smi...@us...> - 2004-04-09 22:34:52

Update of /cvsroot/devil-linux/build/config/etc/initrd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31391/config/etc/initrd

Modified Files:
	linuxrc 
Log Message:
undo last change


Index: linuxrc
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/linuxrc,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- linuxrc	9 Apr 2004 00:47:35 -0000	1.67
+++ linuxrc	9 Apr 2004 22:21:29 -0000	1.68
@@ -98,10 +98,8 @@
 # get rid of modprobe warnings
 mkdir -p /shm/etc
 
-if [ `lsmod | grep -c "^usb-storage.*(unused)$"` != 0 ]; then
-	echo "waiting until usb-storage driver has initialized all devices ..."
-	sleep 15
-fi
+echo "waiting until usb-storage driver has initialized all devices ..."
+sleep 15
 
 echo -e "Loading loop-AES module";
 modprobe loop 2> /dev/null

[Devil-linux-commit] build CHANGES,1.756,1.757

From: Heiko Z. <smi...@us...> - 2004-04-09 22:34:52

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

Modified Files:
	CHANGES 
Log Message:
undo last change


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.756
retrieving revision 1.757
diff -u -d -r1.756 -r1.757
--- CHANGES	9 Apr 2004 01:18:57 -0000	1.756
+++ CHANGES	9 Apr 2004 22:21:22 -0000	1.757
@@ -24,7 +24,6 @@
 1.1.3
 - fixed the case that netfilter patch-o-matic did fail with 
   certain submitted and/or pending patches (fl)
-- don't wait for usb-storage driver if no devices are present (Roland Pabel)
 - added boot parameter 'config=<device>:<filename>' which is given
   priority in search for configuration archive (Roland Pabel)
 - updated rrdtool v1.0.47

[Devil-linux-commit] build/scripts patch-o-matic,1.14,1.15

From: Friedrich L. <fr...@us...> - 2004-04-09 22:01:04

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

Modified Files:
	patch-o-matic 
Log Message:
base/connlimit creates troubles, therefore we move it away
hopefully the kernel compiles now



Index: patch-o-matic
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/patch-o-matic,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- patch-o-matic	9 Apr 2004 01:18:57 -0000	1.14
+++ patch-o-matic	9 Apr 2004 21:47:40 -0000	1.15
@@ -34,7 +34,9 @@
 		# move troublesome patches away
 		mkdir -p submitted/tmp
 		mkdir -p pending/tmp
+		mkdir -p base/tmp
 		mv -f submitted/61_nulldev_alignment* submitted/tmp &> /dev/null
+		mv -f base/connlimit* base/tmp &> /dev/null
 		#mv -f pending/XXXXX* pending/tmp &> /dev/null
 
 		PATCHES="";

[Devil-linux-commit] build/scripts/config config-netfilter-extra,1.3,1.4

From: Friedrich L. <fr...@us...> - 2004-04-09 01:32:10

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

Modified Files:
	config-netfilter-extra 
Log Message:
fixed the case that netfilter patch-o-matic did fail with
certain submitted and/or pending patches (fl)



Index: config-netfilter-extra
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/config/config-netfilter-extra,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- config-netfilter-extra	17 Dec 2003 14:55:47 -0000	1.3
+++ config-netfilter-extra	9 Apr 2004 01:18:57 -0000	1.4
@@ -1,42 +1,44 @@
 # NETFILTER extra patches to apply to the kernel
 # see http://www.netfilter.org/documentation/pomlist/pom-extra.html
 #
-# possible options (as of 07.12.2003):
+# possible options (as of 09.04.2004):
 #
-#extra/CLASSIFY.patch
-#extra/CONNMARK.patch
-#extra/IPMARK.patch
-#extra/ROUTE.patch
-#extra/TCPLAG.patch
-#extra/TRACE.patch
-#extra/XOR.patch
-#extra/addrtype.patch
-#extra/condition.patch
-#extra/connbytes.patch
-#extra/conntrack-seqfile.patch
-#extra/conntrack_arefcount.patch
-#extra/conntrack_locking.patch
-#extra/conntrack_nonat.patch
-#extra/ctstat.patch
-#extra/cuseeme-nat.patch
-#extra/eggdrop-conntrack.patch
-#extra/h323-conntrack-nat.patch
-#extra/ipt_TARPIT.patch
-#extra/iptables-loopcheck-speedup.patch
-#extra/mms-conntrack-nat.patch
-#extra/netfilter-docbook.patch
-#extra/nfnetlink-ctnetlink-0.13.patch
-#extra/owner-socketlookup.patch
-#extra/owner-supgids.patch
-#extra/pptp-conntrack-nat.patch
-#extra/quake3-conntrack.patch
-#extra/rsh.patch
-#extra/rtsp-conntrack.patch
-#extra/string.patch
-#extra/talk-conntrack-nat.patch
-#extra/tcp-window-tracking.patch
-
+#   extra/CLASSIFY.patch
+#   extra/CONNMARK.patch
+#   extra/IPMARK.patch
+#   extra/ROUTE.patch
+#   extra/TCPLAG.patch
+#   extra/TRACE.patch
+#   extra/XOR.patch
+#   extra/addrtype.patch
+#   extra/condition.patch
+#   extra/connbytes.patch
+#   extra/conntrack-seqfile.patch
+#   extra/conntrack_arefcount.patch
+#   extra/conntrack_locking.patch
+#   extra/conntrack_nonat.patch
+#   extra/ctstat.patch
+#   extra/cuseeme-nat.patch
+#   extra/eggdrop-conntrack.patch
+#   extra/h323-conntrack-nat.patch
+#   extra/ipt_TARPIT.patch
+#   extra/iptables-loopcheck-speedup.patch
+#   extra/mms-conntrack-nat.patch
+#   extra/netfilter-docbook.patch
+#   extra/nfnetlink-ctnetlink-0.13.patch
+#   extra/owner-socketlookup.patch
+#   extra/owner-supgids.patch
+#   extra/pptp-conntrack-nat.patch
+#   extra/quake3-conntrack.patch
+#   extra/rpc.patch
+#   extra/rsh.patch
+#   extra/rtsp-conntrack.patch
+#   extra/string.patch
+#   extra/talk-conntrack-nat.patch
+#   extra/tcp-window-tracking.patch
+#   
 
+extra/CLASSIFY.patch
 extra/CONNMARK.patch
 extra/addrtype.patch
 extra/condition.patch

[Devil-linux-commit] build/scripts patch-o-matic,1.13,1.14

From: Friedrich L. <fr...@us...> - 2004-04-09 01:32:10

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

Modified Files:
	patch-o-matic 
Log Message:
fixed the case that netfilter patch-o-matic did fail with
certain submitted and/or pending patches (fl)



Index: patch-o-matic
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/patch-o-matic,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- patch-o-matic	25 Feb 2004 20:10:09 -0000	1.13
+++ patch-o-matic	9 Apr 2004 01:18:57 -0000	1.14
@@ -30,15 +30,26 @@
 		export KERNEL_DIR=$KERNELDIR
 		NETFILTERDIR=$(find_src_dir iptables)
 		export NETFILTERDIR
-		./runme --batch submitted
-		./runme --batch pending
-		./runme --batch optimizations
-		if [ "$CONFIG_NF_BASE" = "y" ]; then
-			./runme --batch base
-		fi
-		if [ "$CONFIG_NF_EXTRA" = "y" ]; then
-			./runme --batch $(sed -e "/^$/d" -e "/^ \+$/d" -e "/^	\+$/d" -e "/^#/d" $MYDIR/config/config-netfilter-extra)
-		fi
+
+		# move troublesome patches away
+		mkdir -p submitted/tmp
+		mkdir -p pending/tmp
+		mv -f submitted/61_nulldev_alignment* submitted/tmp &> /dev/null
+		#mv -f pending/XXXXX* pending/tmp &> /dev/null
+
+		PATCHES=""; 
+		[ "$CONFIG_NF_BASE" = "y" ] && \
+			PATCHES="$PATCHES base";
+		[ "$CONFIG_NF_EXTRA" = "y" ] && \
+			PATCHES="$PATCHES $(sed -e "/^$/d" -e "/^ \+$/d" -e "/^	\+$/d" -e "/^#/d" $MYDIR/config/config-netfilter-extra)"
+
+		# now apply all patches at once
+		./runme --batch \
+			submitted \
+			pending \
+			optimizations \
+			$PATCHES
+
 		for CFG in $(  grep tristate $KERNELDIR/net/ipv4/netfilter/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do
 			set_kernel_option $CFG m
 		done
@@ -54,6 +65,7 @@
 
 		# settings didn't get applied, so let's do it here
 		set_kernel_option CONFIG_IP_NF_RAW m 
+		set_kernel_option CONFIG_IP_NF_SET_MAX 256
 
 		echo "**** IPv4 ****" > $WORKDIR/netfilter.patches.lst
 		grep tristate $KERNELDIR/net/ipv4/netfilter/Config.in | cut -d "'" -f 2 >> $WORKDIR/netfilter.patches.lst

[Devil-linux-commit] build CHANGES,1.755,1.756

From: Friedrich L. <fr...@us...> - 2004-04-09 01:32:10

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

Modified Files:
	CHANGES 
Log Message:
fixed the case that netfilter patch-o-matic did fail with
certain submitted and/or pending patches (fl)



Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.755
retrieving revision 1.756
diff -u -d -r1.755 -r1.756
--- CHANGES	9 Apr 2004 00:47:35 -0000	1.755
+++ CHANGES	9 Apr 2004 01:18:57 -0000	1.756
@@ -22,6 +22,8 @@
 #
 
 1.1.3
+- fixed the case that netfilter patch-o-matic did fail with 
+  certain submitted and/or pending patches (fl)
 - don't wait for usb-storage driver if no devices are present (Roland Pabel)
 - added boot parameter 'config=<device>:<filename>' which is given
   priority in search for configuration archive (Roland Pabel)

[Devil-linux-commit] build/scripts build-iso,1.63,1.64

From: Heiko Z. <smi...@us...> - 2004-04-09 01:01:36

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

Modified Files:
	build-iso 
Log Message:
- don't wait for usb-storage driver if no devices are present (Roland Pabel)
- added boot parameter 'config=<device>:<filename>' which is given
  priority in search for configuration archive (Roland Pabel)


Index: build-iso
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build-iso,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- build-iso	16 Mar 2004 15:07:24 -0000	1.63
+++ build-iso	9 Apr 2004 00:47:36 -0000	1.64
@@ -294,6 +294,7 @@
 		fi
 		echo "F1 /boot/f1.txt" >> $CDDIR/isolinux.cfg
 		echo "F2 /boot/f2.txt" >> $CDDIR/isolinux.cfg
+		echo "F3 /boot/f3.txt" >> $CDDIR/isolinux.cfg
 		echo "F10 /boot/message" >> $CDDIR/isolinux.cfg
 
 		# Help Overview - F1
@@ -301,18 +302,30 @@
 		echo -n -e "\01702Help Overview\r\n\r\n" >> $CDDIR/boot/f1.txt
 		echo -n -e "\01704KEY      TOPIC\r\n\r\n" >> $CDDIR/boot/f1.txt
 		echo -n -e "\0170fF1       This help screen\r\n" >> $CDDIR/boot/f1.txt
-		echo -n -e "\0170fF2       Boot Options\r\n" >> $CDDIR/boot/f1.txt
+		echo -n -e "\0170fF2       Common Boot Options\r\n" >> $CDDIR/boot/f1.txt
+		echo -n -e "\0170fF3       Devil-Linux Configuration Options\r\n" >> $CDDIR/boot/f1.txt
 		echo -n -e "\0170fF10      Return to standard screen\r\n\r\n" >> $CDDIR/boot/f1.txt
 
 		# Boot Options - F2
 		echo -n -e "\030/boot/logo.lss\n\r\n" > $CDDIR/boot/f2.txt		
-		echo -n -e "\01702Boot Options\r\n\r\n" >> $CDDIR/boot/f2.txt
+		echo -n -e "\01702Common Boot Options\r\n\r\n" >> $CDDIR/boot/f2.txt
 		echo -n -e "\0170f   Devil-Linux will boot with these default options:\r\n" >> $CDDIR/boot/f2.txt
 		echo -n -e "\01704     $BOOT_OPTIONS_DL\r\n" >> $CDDIR/boot/f2.txt
 		echo -n -e "\0170f   You can add your own options by appending them on the command line.\r\n" >> $CDDIR/boot/f2.txt
 		echo -n -e "\01704   Don't override any of the above options unless you know what you are doing!\r\n\r\n" >> $CDDIR/boot/f2.txt
 		echo -n -e "\0170f   For booting into Single-User mode append \"S\", e.g. \"$BOOT_OPTION_DEFAULT S\".\r\n\r\n" >> $CDDIR/boot/f2.txt
 		
+		# Configuration Options - F3
+		echo -n -e "\030/boot/logo.lss\n\r\n" > $CDDIR/boot/f3.txt		
+		echo -n -e "\01702Devil-Linux Configuration Options\r\n\r\n" >> $CDDIR/boot/f3.txt
+		echo -n -e "\0170f   Devil-Linux will search for a configuration archive called etc.tar.bz2 on\r\n" >> $CDDIR/boot/f3.txt
+		echo -n -e "\0170f   any IDE/SCSI/Floopy device accessible.\r\n" >> $CDDIR/boot/f3.txt
+		echo -n -e "\0170f   You can override this behavious by specifying this parameter:\r\n\r\n" >> $CDDIR/boot/f3.txt
+		echo -n -e "\01704   config=<device>:<filename>, i.e. config=/dev/floopy/0:backup.tar.bz2\r\n\r\n" >> $CDDIR/boot/f3.txt
+		echo -n -e "\0170f   You can omit either \01704device\0170f or \01704filename\0170f thus giving priority to a device or\r\n" >> $CDDIR/boot/f3.txt
+		echo -n -e "\0170f   a special file. Devil-Linux will try to make use of your desired config\r\n" >> $CDDIR/boot/f3.txt
+		echo -n -e "\0170f   first, but if it can't find your file, it will load the first one available.\r\n\r\n" >> $CDDIR/boot/f3.txt		
+		
 		# convert the logo into the syslinux format
 		ppmtolss16 < $DL_DIR/other/devil-linux.pnm >$CDDIR/boot/logo.lss || exit 1

[Devil-linux-commit] build CHANGES,1.754,1.755

From: Heiko Z. <smi...@us...> - 2004-04-09 01:01:19

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

Modified Files:
	CHANGES 
Log Message:
- don't wait for usb-storage driver if no devices are present (Roland Pabel)
- added boot parameter 'config=<device>:<filename>' which is given
  priority in search for configuration archive (Roland Pabel)


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.754
retrieving revision 1.755
diff -u -d -r1.754 -r1.755
--- CHANGES	8 Apr 2004 11:24:13 -0000	1.754
+++ CHANGES	9 Apr 2004 00:47:35 -0000	1.755
@@ -22,6 +22,9 @@
 #
 
 1.1.3
+- don't wait for usb-storage driver if no devices are present (Roland Pabel)
+- added boot parameter 'config=<device>:<filename>' which is given
+  priority in search for configuration archive (Roland Pabel)
 - updated rrdtool v1.0.47
 - updated lm_sensors to v2.6.8
 - updated libtool to v1.5.4

[Devil-linux-commit] build/config/etc/initrd linuxrc,1.66,1.67

From: Heiko Z. <smi...@us...> - 2004-04-09 01:01:19

Update of /cvsroot/devil-linux/build/config/etc/initrd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22540/config/etc/initrd

Modified Files:
	linuxrc 
Log Message:
- don't wait for usb-storage driver if no devices are present (Roland Pabel)
- added boot parameter 'config=<device>:<filename>' which is given
  priority in search for configuration archive (Roland Pabel)


Index: linuxrc
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/linuxrc,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- linuxrc	27 Mar 2004 00:12:54 -0000	1.66
+++ linuxrc	9 Apr 2004 00:47:35 -0000	1.67
@@ -35,6 +35,34 @@
 
 export PATH=$PATH:/sbin:/usr/sbin
 
+scan_device_for_config() {
+	# $1 = device
+	# $2 = filename
+	SRC=$1
+	FILE=$2
+	echo -n "Checking for \"$FILE\" on \"$SRC\" ... "
+	if mount -n -t auto $SRC /floppy >/dev/null 2>&1  ; then
+		if [ -e /floppy/$FILE ] ; then
+			$GREEN
+			echo "success!"
+			$NORMAL
+			DL_CONFIG_SOURCE=$SRC
+			DL_CONFIG_FILE=$FILE
+			return 0
+		else
+			$YELLOW
+			echo "file not found."
+			$NORMAL
+			umount /floppy # in case user swaps floppy when we are accepting input
+		fi
+	else
+		$RED
+		echo "mount failed."
+		$NORMAL
+	fi
+	return 1
+}
+
 mod_config() {
 	[ ! -e /etc/sysconfig/config.org ] && cp /etc/sysconfig/config /etc/sysconfig/config.org
 	rm -f /etc/sysconfig/config.tmp
@@ -70,8 +98,75 @@
 # get rid of modprobe warnings
 mkdir -p /shm/etc
 
-echo "waiting until usb-storage driver has initialized all devices ..."
-sleep 15
+if [ `lsmod | grep -c "^usb-storage.*(unused)$"` != 0 ]; then
+	echo "waiting until usb-storage driver has initialized all devices ..."
+	sleep 15
+fi
+
+echo -e "Loading loop-AES module";
+modprobe loop 2> /dev/null
+
+# save loaded config
+DL_CONFIG_SOURCE=""
+DL_CONFIG_FILE=""
+
+$GREEN
+echo "Searching for configuration media"
+$NORMAL
+
+# parse user config
+CONFIG_USER=`awk -v RS=' ' -v FS='=' '/^config=/ { print $2 }' /proc/cmdline`
+CONFIG_USER_SRC=""
+CONFIG_USER_FILE=""
+if [ "$CONFIG_USER" != "" ]; then
+        CONFIG_USER_ERROR=0
+	case `echo $CONFIG_USER | awk -v FS=: '{ print NF-1 }'` in
+		0 )
+			CONFIG_USER_SRC=`echo $CONFIG_USER | grep "/dev/"`
+			CONFIG_USER_FILE=`echo $CONFIG_USER | grep -v "/dev/"`
+			;;
+		1 )
+			CONFIG_USER_SRC=`echo ${CONFIG_USER%:*}"`
+			CONFIG_USER_FILE=`echo ${CONFIG_USER#*:}"`    
+			;;
+		* )
+			CONFIG_USER_ERROR=1
+			;;
+	esac
+	# sanity checks
+	[ "$CONFIG_USER_SRC" != "" ] && CONFIG_USER_ERROR=`echo $CONFIG_USER_SRC | grep -c -v "^/dev/"`
+	[ "$CONFIG_USER_FILE" != "" ] && CONFIG_USER_ERROR=`echo $CONFIG_USER_FILE | grep -c "/dev/"`
+	[ "$CONFIG_USER" = ":" ] && CONFIG_USER_ERROR=1 # just in case...
+	case $CONFIG_USER_ERROR in
+		0 )
+			$BLUE
+			echo -n "Trying to load configuration "
+			if [ "$CONFIG_USER_FILE" != "" ]; then
+				$GREEN
+				echo -n "\"$CONFIG_USER_FILE\" "
+				$NORMAL
+			fi
+			if [ "$CONFIG_USER_SRC" != "" ]; then
+				$BLUE
+    				echo -n "from device "
+				$GREEN
+				echo -n "\"$CONFIG_USER_SRC\" "
+				$NORMAL
+			fi
+			$BLUE
+			echo "first."
+			$NORMAL
+			;;
+		* )
+			$RED
+			echo -n "Improper config parameter : \"$CONFIG_USER\". Ignored."
+			beep; sleep 1; echo -n "."; sleep 1; beep; echo "."
+			$NORMAL
+			CONFIG_USER_SRC=""
+			CONFIG_USER_FILE=""
+			;;
+	esac
+fi
 
 # generate the device list we need to search for the configuration information
 CDROM_IDE=`find /dev/ide/ -name "cd*" 2> /dev/null`
@@ -81,34 +176,32 @@
 DISCS_SCSI=`find /dev/scsi/ -name "disc" 2> /dev/null`
 FLOPPIES=`find /dev/floppy/ -name "?" 2> /dev/null`
 CONFIG_SRC_LIST="$PARTITIONS_SCSI $PARTITIONS_IDE $DISCS_SCSI $CDROM_IDE $CDROM_SCSI $FLOPPIES"
-DL_CONFIG_SOURCE=""
-
-echo -e "Loading loop-AES module";
-modprobe loop 2> /dev/null
+CONFIG_FILE_LIST="etc.tar.bz2"
 
-$GREEN
-echo -e "searching for configuration media"
-$NORMAL
+if [ "$CONFIG_USER_SRC" != "" ] && [ "$CONFIG_USER_FILE" != "" ]; then
+	# search for most specific config first
+	scan_device_for_config $CONFIG_USER_SRC $CONFIG_USER_FILE
+	if [ $? = 1 ]; then
+		$YELLOW
+		echo "Sorry, could not load your configuration. Continuing searching..."
+		$NORMAL
+	fi
+else
+	# if no specific config is given, prepend to lists
+	CONFIG_SRC_LIST="$CONFIG_USER_SRC $CONFIG_SRC_LIST"
+	CONFIG_FILE_LIST="$CONFIG_USER_FILE $CONFIG_FILE_LIST"	
+fi
 
-until [ -e /floppy/etc.tar.bz2 ] ; do
-	for CFG_SRC in $CONFIG_SRC_LIST
+# if no configuration has been found yet, create one
+until [ "$DL_CONFIG_SOURCE" != "" ] ; do
+	for CFG_FILE in $CONFIG_FILE_LIST
 	do
-		echo -e "Checking for configuration on $CFG_SRC"
-		if mount -n -t auto $CFG_SRC /floppy >/dev/null 2>&1  ; then
-
-			if [ -e /floppy/etc.tar.bz2 ] ; then
-				$YELLOW
-				echo -e "Found configuration on $CFG_SRC"
-				$NORMAL
-				DL_CONFIG_SOURCE=$CFG_SRC
-				continue 2
-			else
-				umount /floppy # in case user swaps floppy when we are accepting input
-			fi
-		fi
+		for CFG_SRC in $CONFIG_SRC_LIST
+		do
+			scan_device_for_config $CFG_SRC $CFG_FILE && continue 3
+		done
 	done
 
-	# first pass looks for existing configuration, 2nd pass will create if none found
 	for CFG_SRC in $CONFIG_SRC_LIST
 	do
 		echo -e "Looking for empty configuation media on $CFG_SRC"
@@ -137,6 +230,7 @@
 					umount /cdrom
 					sync
 					DL_CONFIG_SOURCE=$CFG_SRC
+					DL_CONFIG_FILE="etc.tar.bz2"
 					continue 2
 				fi
 			fi
@@ -153,11 +247,12 @@
 unset ANS RET
 
 export DL_CONFIG_SOURCE
+export DL_CONFIG_FILE
 
 mkdir -p /shm/root
 
 echo "loading configuration"
-tar -C /shm -xjf /floppy/etc.tar.bz2
+tar -C /shm -xjf /floppy/$DL_CONFIG_FILE
 
 # create mtab for mount
 cat /proc/mounts > /etc/mtab
@@ -178,7 +273,7 @@
 	$YELLOW
 	echo "checking PGP signature of configuration"
 	$NORMAL
-	if ! /bin/gpgv --homedir /cdrom/config --keyring /cdrom/config/pubring.gpg --ignore-time-conflict -q /floppy/etc.tar.bz2.sig ;then
+	if ! /bin/gpgv --homedir /cdrom/config --keyring /cdrom/config/pubring.gpg --ignore-time-conflict -q /floppy/$DL_CONFIG_FILE.sig ;then
 		$RED
 		echo
 		echo "********************************************************************************"
@@ -235,7 +330,7 @@
 
 #change to new root and start up the real system
 pivot_root . initrd
-exec /bin/chroot . /sbin/pre_init $DL_CONFIG_SOURCE $@ <dev/console >dev/console 2>&1
+exec /bin/chroot . /sbin/pre_init $DL_CONFIG_SOURCE $DL_CONFIG_FILE $@ <dev/console >dev/console 2>&1
 
 # something went wrong
 echo

[Devil-linux-commit] build/scripts/scripts pre_init,1.17,1.18

From: Heiko Z. <smi...@us...> - 2004-04-09 01:01:07

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

Modified Files:
	pre_init 
Log Message:
- don't wait for usb-storage driver if no devices are present (Roland Pabel)
- added boot parameter 'config=<device>:<filename>' which is given
  priority in search for configuration archive (Roland Pabel)


Index: pre_init
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/pre_init,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- pre_init	7 Mar 2004 22:05:47 -0000	1.17
+++ pre_init	9 Apr 2004 00:47:37 -0000	1.18
@@ -127,5 +127,5 @@
 /sbin/devfsd /dev
 
 # now start the real init program
-shift
+shift 2 # get rid of DL_CONFIG_SRC, DL_CONFIG_FILE
 exec /sbin/init $@

[Devil-linux-commit] build/scripts/scripts apcupsd_apache2.config,NONE,1.1

From: Heiko Z. <smi...@us...> - 2004-04-08 23:45:44

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

Added Files:
	apcupsd_apache2.config 
Log Message:
added missing config file for apcupsd


--- NEW FILE: apcupsd_apache2.config ---
ScriptAlias /apcupsd/ "/etc/apcupsd/cgi/"
Alias /css/ "/etc/apcupsd/css/"

<Directory "/etc/apcupsd/cgi">
    AllowOverride None
    Options None
    Order Allow,Deny
    Allow from localhost
</Directory>

<Directory "/etc/apcupsd/css">
    AllowOverride None
    Options None
    Order Allow,Deny
    Allow from localhost
</Directory>

[Devil-linux-commit] build/scripts apcupsd,1.3,1.4

From: Heiko Z. <smi...@us...> - 2004-04-08 23:45:43

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

Modified Files:
	apcupsd 
Log Message:
added missing config file for apcupsd


Index: apcupsd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/apcupsd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- apcupsd	8 Apr 2004 12:39:29 -0000	1.3
+++ apcupsd	8 Apr 2004 23:32:31 -0000	1.4
@@ -70,8 +70,8 @@
 			rm -rf $WORKDIR/tmp || exit 1
 
 			cp -dp $MYDIR/scripts/apcupsd $ETCDIR/etc/init.d/ || exit 1
-#			cp -dp $MYDIR/scripts/apcupsd_apache2.config $ETCDIR/etc/apcupsd/ || exit 1
-			
+			cp -dp $MYDIR/scripts/apcupsd_apache2.config $ETCDIR/etc/apcupsd/ || exit 1
+
 			ln -sf /usr/share/apcupsd/cgi $ETCDIR/etc/apcupsd/cgi || exit 1
 			ln -sf /usr/share/apcupsd/css $ETCDIR/etc/apcupsd/css || exit 1

[Devil-linux-commit] build update_src,1.31,1.32

From: Friedrich L. <fr...@us...> - 2004-04-08 22:40:05

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

Modified Files:
	update_src 
Log Message:
added generic internal mirror


Index: update_src
===================================================================
RCS file: /cvsroot/devil-linux/build/update_src,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- update_src	14 Mar 2004 17:19:41 -0000	1.31
+++ update_src	8 Apr 2004 22:26:51 -0000	1.32
@@ -47,6 +47,10 @@
 
 # the internal mirrors (mostly used by specific developers)
 
+menu[96]="generic internal mirror"
+ftps[96]="ftp-internal"
+ftpd[96]="/pub/mirror/devil-linux/devel/sources/$VERSION/"
+
 menu[97]="University of Technology     Graz/Austria"
 ftps[97]="ftp.vc-graz.ac.at"
 ftpd[97]="/pub/mirror/devil-linux/devel/sources/$VERSION/"

[Devil-linux-commit] build/scripts/config VERSION,1.9.2.10,1.9.2.11

From: Friedrich L. <fr...@us...> - 2004-04-08 20:33:17

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

Modified Files:
      Tag: rel-1-0-patches
	VERSION 
Log Message:
document changes
increased version to 1.0.6beta



Index: VERSION
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/config/VERSION,v
retrieving revision 1.9.2.10
retrieving revision 1.9.2.11
diff -u -d -r1.9.2.10 -r1.9.2.11
--- VERSION	20 Mar 2004 15:14:49 -0000	1.9.2.10
+++ VERSION	8 Apr 2004 20:20:05 -0000	1.9.2.11
@@ -1 +1 @@
-1.0.5a
+1.0.6beta

[Devil-linux-commit] build CHANGES,1.510.2.58,1.510.2.59

From: Friedrich L. <fr...@us...> - 2004-04-08 20:33:17

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

Modified Files:
      Tag: rel-1-0-patches
	CHANGES 
Log Message:
document changes
increased version to 1.0.6beta



Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.510.2.58
retrieving revision 1.510.2.59
diff -u -d -r1.510.2.58 -r1.510.2.59
--- CHANGES	20 Mar 2004 15:14:49 -0000	1.510.2.58
+++ CHANGES	8 Apr 2004 20:20:05 -0000	1.510.2.59
@@ -22,6 +22,10 @@
 #
 #
 
+1.0.6
+- fixed a long standing problem in that the netfilter patches
+  did not get applied (fl)
+
 1.0.5a
 - updated openssl to v0.9.7d

[Devil-linux-commit] build update_src,1.16.2.5,1.16.2.6

From: Friedrich L. <fr...@us...> - 2004-04-08 20:00:58

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

Modified Files:
      Tag: rel-1-0-patches
	update_src 
Log Message:
added a generic internal mirror



Index: update_src
===================================================================
RCS file: /cvsroot/devil-linux/build/update_src,v
retrieving revision 1.16.2.5
retrieving revision 1.16.2.6
diff -u -d -r1.16.2.5 -r1.16.2.6
--- update_src	29 Feb 2004 16:01:57 -0000	1.16.2.5
+++ update_src	8 Apr 2004 19:47:46 -0000	1.16.2.6
@@ -46,6 +46,10 @@
 
 # the internal mirrors (mostly used by specific developers)
 
+menu[96]="generic internal mirror"
+ftps[96]="ftp-internal"
+ftpd[96]="/pub/mirror/devil-linux/devel/sources/$VERSION/"
+
 menu[97]="University of Technology     Graz/Austria"
 ftps[97]="ftp.vc-graz.ac.at"
 ftpd[97]="/pub/mirror/devil-linux/devel/sources/$VERSION/"

[Devil-linux-commit] build/scripts apcupsd,1.2,1.3

From: Bruce S. <bl...@us...> - 2004-04-08 12:52:37

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

Modified Files:
	apcupsd 
Log Message:
Temp fix for install abort caused by missing config file.


Index: apcupsd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/apcupsd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- apcupsd	1 Apr 2004 01:56:20 -0000	1.2
+++ apcupsd	8 Apr 2004 12:39:29 -0000	1.3
@@ -70,7 +70,7 @@
 			rm -rf $WORKDIR/tmp || exit 1
 
 			cp -dp $MYDIR/scripts/apcupsd $ETCDIR/etc/init.d/ || exit 1
-			cp -dp $MYDIR/scripts/apcupsd_apache2.config $ETCDIR/etc/apcupsd/ || exit 1
+#			cp -dp $MYDIR/scripts/apcupsd_apache2.config $ETCDIR/etc/apcupsd/ || exit 1
 			
 			ln -sf /usr/share/apcupsd/cgi $ETCDIR/etc/apcupsd/cgi || exit 1
 			ln -sf /usr/share/apcupsd/css $ETCDIR/etc/apcupsd/css || exit 1

[Devil-linux-commit] build/scripts/config config_busybox,1.17,1.18

From: Heiko Z. <smi...@us...> - 2004-04-08 11:37:24

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

Modified Files:
	config_busybox 
Log Message:
updated a bunch of programs


Index: config_busybox
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/config/config_busybox,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- config_busybox	1 Feb 2004 19:35:10 -0000	1.17
+++ config_busybox	8 Apr 2004 11:24:14 -0000	1.18
@@ -350,6 +350,7 @@
 CONFIG_ASH_CMDCMD=y
 CONFIG_ASH_MAIL=y
 CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+CONFIG_ASH_RANDOM_SUPPORT=y
 # CONFIG_HUSH is not set
 # CONFIG_LASH is not set
 # CONFIG_MSH is not set
@@ -359,7 +360,6 @@
 #
 # CONFIG_FEATURE_SH_EXTRA_QUIET is not set
 CONFIG_FEATURE_SH_STANDALONE_SHELL=y
-# CONFIG_FEATURE_SH_APPLETS_ALWAYS_WIN is not set
 CONFIG_FEATURE_COMMAND_EDITING=y
 CONFIG_FEATURE_COMMAND_HISTORY=15
 CONFIG_FEATURE_COMMAND_SAVEHISTORY=y

[Devil-linux-commit] build CHANGES,1.753,1.754 md5sum.lst,1.64,1.65

From: Heiko Z. <smi...@us...> - 2004-04-08 11:37:22

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

Modified Files:
	CHANGES md5sum.lst 
Log Message:
updated a bunch of programs


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.753
retrieving revision 1.754
diff -u -d -r1.753 -r1.754
--- CHANGES	1 Apr 2004 01:51:48 -0000	1.753
+++ CHANGES	8 Apr 2004 11:24:13 -0000	1.754
@@ -22,6 +22,11 @@
 #
 
 1.1.3
+- updated rrdtool v1.0.47
+- updated lm_sensors to v2.6.8
+- updated libtool to v1.5.4
+- updated bridge-utils to v0.9.7
+- updated busybox to v1.00-pre9
 - updated moxio smartio driver to v1.75
 - updated openldap to v2.2.8
 - updated util-linux to v2.12a

Index: md5sum.lst
===================================================================
RCS file: /cvsroot/devil-linux/build/md5sum.lst,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- md5sum.lst	1 Apr 2004 01:51:48 -0000	1.64
+++ md5sum.lst	8 Apr 2004 11:24:14 -0000	1.65
@@ -24,8 +24,8 @@
 3e28792a585e14b57838cd24130a24dd  src/binutils-2.14.90.0.8.tar.bz2
 42c3a33b645f40197e8f7aca7bd1e913  src/bison-1.875.patch1-bs.bz2
 b7f8027b249ebd4dd0cc948943a71af0  src/bison-1.875.tar.bz2
-c45ede7ebd2fa762b4093f62ff582fd0  src/bridge-utils-0.9.6.tar.gz
-13afe6912c89eb2709b0049e45d2d139  src/busybox-1.00-pre8.tar.bz2
+2570f45a4047ce5c8ee9765f32df7701  src/bridge-utils-0.9.7.tar.bz2
+aa1bee1854d2fe0f2732d21c656f4c5d  src/busybox-1.00-pre9.tar.bz2
 5b8773b4965618279277b05cd811e7b3  src/bzip2-1.0.2.tar.bz2
 ffd824f13f99011984399fc3b7526c71  src/camsource-0.7.0.tar.bz2
 560e49f5728797d8bbfb6eed963c6de1  src/cdrtools-2.0-kernel-26-patch.bz2
@@ -165,7 +165,7 @@
 3fc28af730f12ace49b14568de4ad934  src/libpng-1.2.5.tar.bz2
 6b7b6e6df84d4afb469ccc66d04fc24d  src/libsafe-2.0-16.tgz
 3c37ef02a3aa248e30f4bf1613e3f597  src/libstdc++-compat.tar.bz2
-db66ba05502f533ad0cfd84dc0e03bd5  src/libtool-1.5.2.tar.gz
+5d7bcad7ca3af1ac2f344ec554fe70ec  src/libtool-1.5.4.tar.gz
 75655870fb7bb661e6fbd57cbfe81bb2  src/libusb-0.1.8.tar.gz
 4a0fcb4d36252d9bf09839f28ebaaf05  src/libxml2-2.6.8.tar.gz
 37625f01452884aac4bdef79a1dae1a6  src/libxslt-1.1.5.tar.gz
@@ -175,7 +175,7 @@
 0e6a19072c9b193b71aaac3668fdb09b  src/linux-2.6.3-protector-1.patch.bz2
 6063a7e424355ec52e0cb559fb99034d  src/linux-2.6.3.tar.bz2
 0672ccd871def6842814c2d9d8c0689a  src/linux-wlan-ng-0.2.1-pre16.tar.gz
-1f952f0e30a10f20c8393424cf960a21  src/lm_sensors-2.8.5.tar.gz
+baa836e7b31eeb991b105008ab7458a4  src/lm_sensors-2.8.6.tar.gz
 9ec24a9f2cf588b348adf1a1381af8a4  src/loadlin16c-devil.tar.bz2
 85e61b2b5774cd836ff03c3341e96ea4  src/logrotate-3.6.6-conf.dif.bz2
 6ee90bd5e8979c058ed0587fc1892caf  src/logrotate-3.6.6-dateext.dif.bz2
@@ -204,7 +204,7 @@
 da4d0b4a79902d5a8cc38a0bdff943ed  src/motion-3.0.7-1.tar.gz
 6928ab4d6958118cde2060aee130b9e2  src/mtools-3.9.9.tar.bz2
 7f7ecb50fc37fedb13135a5ef80fda7d  src/mtr-0.54.tar.gz
-7c436a4a2f232c3027d2bc716e978221  src/mxser.tgz
+6f8c59cc214dbffd555085b1db7272c1  src/mxser.tgz
 141511e1b7cab3a886fb68bbb507a1ab  src/mysql-4.0.17.tar.gz
 a361b4ab34ce04e0a15ea4fbc8e4a414  src/nail-10.7.tar.bz2
 fc70be5daee7f712675ac76690f71d50  src/nano-1.2.3.tar.gz
@@ -273,7 +273,7 @@
 f587c888de663603d4f6fa6cfdd82741  src/reiserfsprogs-3.6.11.tar.gz
 97972f8f8f6a3ab9b7070333a6a29c4b  src/rp-pppoe-3.5.tar.gz
 b0c3093d2f0d850760e59ac1db9bf152  src/rpm-4.0.4.tar.gz
-718676770c06b25d1471cec1e4f0bbdc  src/rrdtool-1.0.46.tar.gz
+19fec533ad125b2538f5e27b3be6dfd6  src/rrdtool-1.0.47.tar.gz
 013d0387c93bf4db7d06f72e243c6d24  src/rrlogind-sv-1.3.3.tar.gz
 3f24bf31aec0a657eb3b6844c3f09f21  src/rsync-2.6.0.tar.gz
 6efab0d692023a3a0396d1aa75deaef8  src/sagator-0.4.3.tar.bz2

[Devil-linux-commit] build/scripts/config config-netfilter-extra,1.2,1.2.2.1

From: Friedrich L. <fr...@us...> - 2004-04-07 00:33:55

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

Modified Files:
      Tag: rel-1-0-patches
	config-netfilter-extra 
Log Message:
Almost forgot, the patched patch-o-matic compile script also needs an
updated config file.



Index: config-netfilter-extra
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/config/config-netfilter-extra,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- config-netfilter-extra	30 May 2003 23:21:46 -0000	1.2
+++ config-netfilter-extra	7 Apr 2004 00:21:01 -0000	1.2.2.1
@@ -1,13 +1,17 @@
 # NETFILTER extra patches to apply to the kernel
 # see http://www.netfilter.org/documentation/pomlist/pom-extra.html
 #
-# possible options (as of 30.05.2003):  
+# possible options (as of 07.04.2004):  
 #
 #   extra/CLASSIFY.patch
 #   extra/CONNMARK.patch
+#   extra/IPMARK.patch
 #   extra/ROUTE.patch
+#   extra/TCPLAG.patch
+#   extra/XOR.patch
 #   extra/addrtype.patch
 #   extra/condition.patch
+#   extra/connbytes.patch
 #   extra/cuseeme-nat.patch
 #   extra/eggdrop-conntrack.patch
 #   extra/h323-conntrack-nat.patch
@@ -17,9 +21,9 @@
 #   extra/netfilter-docbook.patch
 #   extra/nfnetlink-ctnetlink-0.11.patch
 #   extra/owner-socketlookup.patch
+#   extra/owner-supgids.patch
 #   extra/pptp-conntrack-nat.patch
 #   extra/quake3-conntrack.patch
-#   extra/recent.patch
 #   extra/rpc.patch
 #   extra/rsh.patch
 #   extra/string.patch
@@ -27,12 +31,11 @@
 #   extra/tcp-window-tracking.patch
 #
 
+extra/CLASSIFY.patch
 extra/CONNMARK.patch
-extra/amanda-conntrack-nat.patch
+extra/addrtype.patch
 extra/condition.patch
 extra/h323-conntrack-nat.patch
-extra/ip_conntrack-timeouts.patch
-extra/ip_tables-proc.patch
 extra/mms-conntrack-nat.patch
 extra/pptp-conntrack-nat.patch
 extra/quake3-conntrack.patch

[Devil-linux-commit] build/scripts patch-o-matic,1.8,1.8.2.1

From: Friedrich L. <fr...@us...> - 2004-04-06 23:46:52

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

Modified Files:
      Tag: rel-1-0-patches
	patch-o-matic 
Log Message:
While searching why the pptp netfilter connection tracking modul disappeared
somewhere in the 1.0.x series, I discovered that the netfilter patch-o-matic
patches fail already pretty soon in their patch process. 

This is now corrected. Hopefully we are not introducing some problems 
because certain netfilter modules that should have been there, are now
really there.

In case there are troubles mail fl...@fl...



Index: patch-o-matic
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/patch-o-matic,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -d -r1.8 -r1.8.2.1
--- patch-o-matic	20 Aug 2003 20:02:48 -0000	1.8
+++ patch-o-matic	6 Apr 2004 23:33:59 -0000	1.8.2.1
@@ -19,15 +19,26 @@
 	echo "no extra patches" > $WORKDIR/netfilter.patches.lst
 	if [ "$CONFIG_NF_PENDING" = "y" ]; then
 		export KERNEL_DIR=$KERNELDIR
-		yes "n" | ./runme --batch submitted
-		yes "n" | ./runme --batch pending
-		yes "n" | ./runme --batch optimizations
-		if [ "$CONFIG_NF_BASE" = "y" ]; then
-			yes "n" | ./runme --batch base
-		fi
-		if [ "$CONFIG_NF_EXTRA" = "y" ]; then
-			yes "n" | ./runme --batch $(sed -e "/^$/d" -e "/^ \+$/d" -e "/^	\+$/d" -e "/^#/d" $MYDIR/config/config-netfilter-extra)
-		fi
+
+		# move troublesome patches away
+		mkdir -p submitted/tmp
+		mkdir -p pending/tmp
+		mv -f submitted/45_masq_routing_check* submitted/73_ipt_MASQUERADE-oif* submitted/tmp &> /dev/null
+		mv -f pending/40_nf-log* pending/tmp &> /dev/null
+
+		PATCHES=""; 
+		[ "$CONFIG_NF_BASE" = "y" ] && \
+			PATCHES="$PATCHES base";
+		[ "$CONFIG_NF_EXTRA" = "y" ] && \
+			PATCHES="$PATCHES $(sed -e "/^$/d" -e "/^ \+$/d" -e "/^	\+$/d" -e "/^#/d" $MYDIR/config/config-netfilter-extra)"
+
+		# now apply all patches at once
+		./runme --batch \
+			submitted \
+			pending \
+			optimizations \
+			$PATCHES
+
 		for CFG in $(  grep dep_tristate $KERNELDIR/net/ipv4/netfilter/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do
 			echo "$CFG=m" >> $KERNELDIR/.config
 		done
@@ -40,6 +51,7 @@
 		for CFG in $(  grep bool $KERNELDIR/net/ipv6/netfilter/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do
 			echo "$CFG=y" >> $KERNELDIR/.config
 		done
+
 		echo "**** IPv4 ****" > $WORKDIR/netfilter.patches.lst
 		grep dep_tristate $KERNELDIR/net/ipv4/netfilter/Config.in | cut -d "'" -f 2 >> $WORKDIR/netfilter.patches.lst
 		pushd $KERNEL_DIR > /dev/null

2 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 191 192 193 194 195 .. 253 > >> (Page 193 of 253)