Fehlerbereinigung beim URL-Filter

Anfang für Bootsplash integriert

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@187 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index 10f8a8919c26e79b4965dfed2f6d65b4417728f4..48fcd08c3f77196b305ba8d08bb176d68df50952 100644 (file)
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -1,21 +1,21 @@
-timeout 5\r
-default saved\r
-foreground = 16064e\r
-background = ffffff\r
-splashimage (hd0,0)/grub/ipfire.xpm.gz\r
-title IPFire\r
-  root (hd0,0)\r
-  kernel /vmlinuz root=ROOT panic=10 acpi=off ro\r
-  savedefault\r
-title IPFire SMP\r
-  root (hd0,0)\r
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=off ro\r
-  savedefault\r
-title IPFire (ACPI enabled)\r
-  root (hd0,0)\r
-  kernel /vmlinuz root=ROOT panic=10 ro\r
-  savedefault\r
-title IPFire SMP (ACPI HT enabled)\r
-  root (hd0,0)\r
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht ro\r
-  savedefault\r
+timeout 5
+default saved
+foreground = 16064e
+background = ffffff
+splashimage (hd0,0)/grub/ipfire.xpm.gz
+title IPFire
+  root (hd0,0)
+  kernel /vmlinuz root=ROOT panic=10 acpi=off vga=0x317 ro
+  savedefault
+title IPFire SMP
+  root (hd0,0)
+  kernel /vmlinuz-smp root=ROOT panic=10 acpi=off vga=0x317 ro
+  savedefault
+title IPFire (ACPI enabled)
+  root (hd0,0)
+  kernel /vmlinuz root=ROOT panic=10 ro
+  savedefault
+title IPFire SMP (ACPI HT enabled)
+  root (hd0,0)
+  kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht ro
+  savedefault

diff --git a/config/grub/scsigrub.conf b/config/grub/scsigrub.conf
index bdceb5b47e4e80bafcbc3da4a3a35e1ae2dd7935..5f3c908419a48b56bb04c5c553959784a6b6934c 100644 (file)
--- a/config/grub/scsigrub.conf
+++ b/config/grub/scsigrub.conf
@@ -5,12 +5,12 @@ background = ffffff
 splashimage (hd0,0)/grub/ipfire.xpm.gz
 title IPFire
   root (hd0,0)
 splashimage (hd0,0)/grub/ipfire.xpm.gz
 title IPFire
   root (hd0,0)

-  kernel /vmlinuz root=ROOT panic=10 init=/linuxrc acpi=off rw
+  kernel /vmlinuz root=ROOT panic=10 init=/linuxrc acpi=off vga=0x317 rw

   initrd /ipcoprd.img
   savedefault
 title IPFire SMP
   root (hd0,0)
   initrd /ipcoprd.img
   savedefault
 title IPFire SMP
   root (hd0,0)

-  kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=off rw
+  kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=off vga=0x317 rw

   initrd /ipcoprd-smp.img
   savedefault
 title IPFire (ACPI enabled)
   initrd /ipcoprd-smp.img
   savedefault
 title IPFire (ACPI enabled)

diff --git a/config/kernel/kernel.config.i386 b/config/kernel/kernel.config.i386
index ae93f4de9a28389c4d80b121dca91187567af898..36c7dc97ca02da7f743174b9a8602a5384e53b70 100644 (file)
--- a/config/kernel/kernel.config.i386
+++ b/config/kernel/kernel.config.i386
@@ -1227,7 +1227,7 @@ CONFIG_SMB_UNIX=y
 #
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_MSDOS_PARTITION=y
 #
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_MSDOS_PARTITION=y

-# CONFIG_SMB_NLS is not set
+CONFIG_SMB_NLS=y

 CONFIG_NLS=y
 
 #
 CONFIG_NLS=y
 
 #


@@ -1282,7 +1282,56 @@ CONFIG_VIDEO_SELECT=y
 #
 # Frame-buffer support
 #
 #
 # Frame-buffer support
 #

-# CONFIG_FB is not set
+CONFIG_FB=y
+CONFIG_DUMMY_CONSOLE=y
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_CLGEN is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_CYBER2000 is not set
+CONFIG_FB_VESA=y
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_HGA is not set
+CONFIG_VIDEO_SELECT=y
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_INTEL is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_IT8181 is not set
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FBCON_SPLASHSCREEN=y
+CONFIG_FBCON_CFB16=y
+CONFIG_FBCON_ADVANCED=y
+# CONFIG_FBCON_MFB is not set
+# CONFIG_FBCON_CFB2 is not set
+# CONFIG_FBCON_CFB4 is not set
+CONFIG_FBCON_CFB8=y
+CONFIG_FBCON_CFB24=y
+CONFIG_FBCON_CFB32=y
+# CONFIG_FBCON_AFB is not set
+# CONFIG_FBCON_ILBM is not set
+# CONFIG_FBCON_IPLAN2P2 is not set
+# CONFIG_FBCON_IPLAN2P4 is not set
+# CONFIG_FBCON_IPLAN2P8 is not set
+# CONFIG_FBCON_MAC is not set
+# CONFIG_FBCON_VGA_PLANES is not set
+# CONFIG_FBCON_VGA is not set
+# CONFIG_FBCON_HGA is not set
+# CONFIG_FBCON_FONTWIDTH8_ONLY is not set
+CONFIG_FBCON_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set

 
 #
 # Sound
 
 #
 # Sound

diff --git a/config/kernel/kernel.config.i386.smp b/config/kernel/kernel.config.i386.smp
index b3ca856f1df3bb32f621dd4be420799d5e7eab85..0bdd21c10549a28c352377cd8e824edee39250b9 100644 (file)
--- a/config/kernel/kernel.config.i386.smp
+++ b/config/kernel/kernel.config.i386.smp
@@ -1,5 +1,5 @@
 #
 #

-# Automatically generated make config: don't edit
+# Automatically generated by make menuconfig: don't edit

 #
 CONFIG_X86=y
 # CONFIG_SBUS is not set
 #
 CONFIG_X86=y
 # CONFIG_SBUS is not set


@@ -97,13 +97,12 @@ CONFIG_I82365=y
 # CONFIG_HOTPLUG_PCI is not set
 # CONFIG_HOTPLUG_PCI_COMPAQ is not set
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
 # CONFIG_HOTPLUG_PCI is not set
 # CONFIG_HOTPLUG_PCI_COMPAQ is not set
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set

+# CONFIG_HOTPLUG_PCI_IBM is not set
+# CONFIG_HOTPLUG_PCI_ACPI is not set

 # CONFIG_HOTPLUG_PCI_SHPC is not set
 # CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set
 # CONFIG_HOTPLUG_PCI_SHPC is not set
 # CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set

-# CONFIG_HOTPLUG_PCI_SHPC_PHPRM_LEGACY is not set

 # CONFIG_HOTPLUG_PCI_PCIE is not set
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
 # CONFIG_HOTPLUG_PCI_PCIE is not set
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set

-# CONFIG_HOTPLUG_PCI_IBM is not set
-# CONFIG_HOTPLUG_PCI_ACPI is not set

 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y


@@ -171,8 +170,8 @@ CONFIG_BLK_DEV_PS2=y
 # CONFIG_PARIDE is not set
 CONFIG_BLK_CPQ_DA=m
 CONFIG_BLK_CPQ_CISS_DA=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_CPQ_DA=m
 CONFIG_BLK_CPQ_CISS_DA=m

-CONFIG_CISS_SCSI_TAPE=n
-CONFIG_CISS_MONITOR_THREAD=n
+# CONFIG_CISS_SCSI_TAPE is not set
+# CONFIG_CISS_MONITOR_THREAD is not set

 CONFIG_BLK_DEV_DAC960=m
 # CONFIG_BLK_DEV_UMEM is not set
 CONFIG_BLK_DEV_SX8=m
 CONFIG_BLK_DEV_DAC960=m
 # CONFIG_BLK_DEV_UMEM is not set
 CONFIG_BLK_DEV_SX8=m


@@ -241,9 +240,6 @@ CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_LIMIT=m
 CONFIG_IP_NF_MATCH_IPP2P=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_LIMIT=m
 CONFIG_IP_NF_MATCH_IPP2P=m

-CONFIG_IP_NF_MATCH_COMMENT=m
-CONFIG_IP_NF_MATCH_LAYER7=m
-# CONFIG_IP_NF_MATCH_LAYER7_DEBUG is not set

 CONFIG_IP_NF_SET=m
 CONFIG_IP_NF_SET_MAX=256
 CONFIG_IP_NF_SET_HASHSIZE=1024
 CONFIG_IP_NF_SET=m
 CONFIG_IP_NF_SET_MAX=256
 CONFIG_IP_NF_SET_HASHSIZE=1024


@@ -257,15 +253,11 @@ CONFIG_IP_NF_SET_NETHASH=m
 CONFIG_IP_NF_SET_IPPORTHASH=m
 CONFIG_IP_NF_SET_IPTREE=m
 CONFIG_IP_NF_MATCH_QUOTA=m
 CONFIG_IP_NF_SET_IPPORTHASH=m
 CONFIG_IP_NF_SET_IPTREE=m
 CONFIG_IP_NF_MATCH_QUOTA=m

-CONFIG_IP_NF_POOL=m
-CONFIG_IP_POOL_STATISTICS=y

 CONFIG_IP_NF_MATCH_IPRANGE=m
 CONFIG_IP_NF_MATCH_IPRANGE=m

-CONFIG_IP_NF_MATCH_DSTLIMIT=m

 CONFIG_IP_NF_MATCH_MAC=m
 CONFIG_IP_NF_MATCH_PKTTYPE=m
 CONFIG_IP_NF_MATCH_MARK=m
 CONFIG_IP_NF_MATCH_MULTIPORT=m
 CONFIG_IP_NF_MATCH_MAC=m
 CONFIG_IP_NF_MATCH_PKTTYPE=m
 CONFIG_IP_NF_MATCH_MARK=m
 CONFIG_IP_NF_MATCH_MULTIPORT=m

-CONFIG_IP_NF_MATCH_MPORT=m

 CONFIG_IP_NF_MATCH_TOS=m
 CONFIG_IP_NF_MATCH_TIME=m
 CONFIG_IP_NF_MATCH_RANDOM=m
 CONFIG_IP_NF_MATCH_TOS=m
 CONFIG_IP_NF_MATCH_TIME=m
 CONFIG_IP_NF_MATCH_RANDOM=m


@@ -282,30 +274,29 @@ CONFIG_IP_NF_MATCH_LENGTH=m
 CONFIG_IP_NF_MATCH_U32=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_MATCH_TCPMSS=m
 CONFIG_IP_NF_MATCH_U32=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_MATCH_TCPMSS=m

-CONFIG_IP_NF_MATCH_REALM=m
+CONFIG_IP_NF_MATCH_COMMENT=m

 CONFIG_IP_NF_MATCH_HELPER=m
 CONFIG_IP_NF_MATCH_STATE=m
 CONFIG_IP_NF_MATCH_CONNLIMIT=m
 CONFIG_IP_NF_MATCH_CONNTRACK=m
 CONFIG_IP_NF_MATCH_UNCLEAN=m
 CONFIG_IP_NF_MATCH_HELPER=m
 CONFIG_IP_NF_MATCH_STATE=m
 CONFIG_IP_NF_MATCH_CONNLIMIT=m
 CONFIG_IP_NF_MATCH_CONNTRACK=m
 CONFIG_IP_NF_MATCH_UNCLEAN=m

-CONFIG_IP_NF_MATCH_STRING=m

 CONFIG_IP_NF_MATCH_OWNER=m
 CONFIG_IP_NF_MATCH_OWNER=m

+CONFIG_IP_NF_MATCH_LAYER7=m
+# CONFIG_IP_NF_MATCH_LAYER7_DEBUG is not set

 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_NETLINK=m
 CONFIG_IP_NF_TARGET_IPV4OPTSSTRIP=m
 CONFIG_IP_NF_TARGET_MIRROR=m
 CONFIG_IP_NF_TARGET_TARPIT=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_NETLINK=m
 CONFIG_IP_NF_TARGET_IPV4OPTSSTRIP=m
 CONFIG_IP_NF_TARGET_MIRROR=m
 CONFIG_IP_NF_TARGET_TARPIT=m

-CONFIG_IP_NF_TARGET_IMQ=m

 CONFIG_IP_NF_NAT=m
 CONFIG_IP_NF_NAT_NEEDED=y
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_NF_NAT=m
 CONFIG_IP_NF_NAT_NEEDED=y
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_REDIRECT=m

-CONFIG_IP_NF_NAT_H323=m
-CONFIG_IP_NF_TARGET_SAME=m
-CONFIG_IP_NF_TARGET_NETMAP=m

 CONFIG_IP_NF_NAT_PPTP=m
 CONFIG_IP_NF_NAT_PROTO_GRE=m
 CONFIG_IP_NF_NAT_PPTP=m
 CONFIG_IP_NF_NAT_PROTO_GRE=m

+CONFIG_IP_NF_NAT_H323=m
+CONFIG_IP_NF_TARGET_NETMAP=m

 # CONFIG_IP_NF_NAT_SNMP_BASIC is not set
 CONFIG_IP_NF_NAT_RTSP=m
 CONFIG_IP_NF_NAT_IRC=m
 # CONFIG_IP_NF_NAT_SNMP_BASIC is not set
 CONFIG_IP_NF_NAT_RTSP=m
 CONFIG_IP_NF_NAT_IRC=m


@@ -319,12 +310,10 @@ CONFIG_IP_NF_TARGET_TOS=m
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_DSCP=m
 CONFIG_IP_NF_TARGET_MARK=m
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_DSCP=m
 CONFIG_IP_NF_TARGET_MARK=m

+CONFIG_IP_NF_TARGET_IMQ=m

 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_LOG=m

-CONFIG_IP_NF_TARGET_TTL=m

 CONFIG_IP_NF_TARGET_ULOG=m
 CONFIG_IP_NF_TARGET_TCPMSS=m
 CONFIG_IP_NF_TARGET_ULOG=m
 CONFIG_IP_NF_TARGET_TCPMSS=m

-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_TARGET_NOTRACK=m

 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m


@@ -349,17 +338,8 @@ CONFIG_ATM_CLIP_NO_ICMP=y
 CONFIG_ATM_BR2684=m
 # CONFIG_ATM_BR2684_IPFILTER is not set
 CONFIG_VLAN_8021Q=m
 CONFIG_ATM_BR2684=m
 # CONFIG_ATM_BR2684_IPFILTER is not set
 CONFIG_VLAN_8021Q=m

-
-#
-#  
-#

 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set

-
-#
-# Appletalk devices
-#
-# CONFIG_DEV_APPLETALK is not set

 # CONFIG_DECNET is not set
 CONFIG_BRIDGE=m
 # CONFIG_X25 is not set
 # CONFIG_DECNET is not set
 CONFIG_BRIDGE=m
 # CONFIG_X25 is not set


@@ -406,10 +386,6 @@ CONFIG_NET_CLS_POLICE=y
 #
 # CONFIG_NET_PKTGEN is not set
 CONFIG_IPSEC=m
 #
 # CONFIG_NET_PKTGEN is not set
 CONFIG_IPSEC=m

-
-#
-# IPSec options (FreeS/WAN)
-#

 CONFIG_IPSEC_IPIP=y
 CONFIG_IPSEC_AH=y
 CONFIG_IPSEC_AUTH_HMAC_MD5=y
 CONFIG_IPSEC_IPIP=y
 CONFIG_IPSEC_AH=y
 CONFIG_IPSEC_AUTH_HMAC_MD5=y


@@ -449,10 +425,6 @@ CONFIG_IDE=y
 # IDE, ATA and ATAPI Block devices
 #
 CONFIG_BLK_DEV_IDE=y
 # IDE, ATA and ATAPI Block devices
 #
 CONFIG_BLK_DEV_IDE=y

-
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#

 # CONFIG_BLK_DEV_HD_IDE is not set
 # CONFIG_BLK_DEV_HD is not set
 # CONFIG_BLK_DEV_IDE_SATA is not set
 # CONFIG_BLK_DEV_HD_IDE is not set
 # CONFIG_BLK_DEV_HD is not set
 # CONFIG_BLK_DEV_IDE_SATA is not set


@@ -466,10 +438,6 @@ CONFIG_BLK_DEV_IDECD=y
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
 # CONFIG_IDE_TASK_IOCTL is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
 # CONFIG_IDE_TASK_IOCTL is not set

-
-#
-# IDE chipset support/bugfixes
-#

 CONFIG_BLK_DEV_CMD640=y
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
 # CONFIG_BLK_DEV_ISAPNP is not set
 CONFIG_BLK_DEV_CMD640=y
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
 # CONFIG_BLK_DEV_ISAPNP is not set


@@ -527,10 +495,6 @@ CONFIG_BLK_DEV_ATARAID_SII=m
 # SCSI support
 #
 CONFIG_SCSI=m
 # SCSI support
 #
 CONFIG_SCSI=m

-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#

 CONFIG_BLK_DEV_SD=m
 CONFIG_SD_EXTRA_DEVS=8
 # CONFIG_CHR_DEV_ST is not set
 CONFIG_BLK_DEV_SD=m
 CONFIG_SD_EXTRA_DEVS=8
 # CONFIG_CHR_DEV_ST is not set


@@ -539,10 +503,6 @@ CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_SR_EXTRA_DEVS=2
 CONFIG_CHR_DEV_SG=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_SR_EXTRA_DEVS=2
 CONFIG_CHR_DEV_SG=m

-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#

 # CONFIG_SCSI_DEBUG_QUEUES is not set
 CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_DEBUG_QUEUES is not set
 CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set


@@ -849,17 +809,9 @@ CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
 CONFIG_TMD_HERMES=m
 CONFIG_PCI_HERMES=m
 CONFIG_PLX_HERMES=m
 CONFIG_TMD_HERMES=m
 CONFIG_PCI_HERMES=m

-
-#
-# Wireless Pcmcia cards support
-#

 CONFIG_PCMCIA_HERMES=m
 CONFIG_AIRO_CS=m
 # CONFIG_PCMCIA_ATMEL is not set
 CONFIG_PCMCIA_HERMES=m
 CONFIG_AIRO_CS=m
 # CONFIG_PCMCIA_ATMEL is not set

-
-#
-# Prism54 PCI/PCMCIA GT/Duette Driver - 802.11(a/b/g)
-#

 CONFIG_PRISM54=m
 CONFIG_FW_LOADER=m
 CONFIG_NET_WIRELESS=y
 CONFIG_PRISM54=m
 CONFIG_FW_LOADER=m
 CONFIG_NET_WIRELESS=y


@@ -945,19 +897,11 @@ CONFIG_ISDN_AUDIO=y
 # CONFIG_ISDN_DRV_LOOP is not set
 # CONFIG_ISDN_DIVERSION is not set
 
 # CONFIG_ISDN_DRV_LOOP is not set
 # CONFIG_ISDN_DIVERSION is not set
 

-#
-# low-level hardware drivers
-#
-

 #
 # Passive ISDN cards
 #
 CONFIG_ISDN_DRV_HISAX=m
 CONFIG_ISDN_HISAX=y
 #
 # Passive ISDN cards
 #
 CONFIG_ISDN_DRV_HISAX=m
 CONFIG_ISDN_HISAX=y

-
-#
-#   D-channel protocol features
-#

 CONFIG_HISAX_EURO=y
 CONFIG_DE_AOC=y
 CONFIG_HISAX_NO_SENDCOMPLETE=y
 CONFIG_HISAX_EURO=y
 CONFIG_DE_AOC=y
 CONFIG_HISAX_NO_SENDCOMPLETE=y


@@ -966,10 +910,6 @@ CONFIG_HISAX_NO_KEYPAD=y
 CONFIG_HISAX_1TR6=y
 CONFIG_HISAX_NI1=y
 CONFIG_HISAX_MAX_CARDS=8
 CONFIG_HISAX_1TR6=y
 CONFIG_HISAX_NI1=y
 CONFIG_HISAX_MAX_CARDS=8

-
-#
-#   HiSax supported cards
-#

 CONFIG_HISAX_16_0=y
 CONFIG_HISAX_16_3=y
 CONFIG_HISAX_AVM_A1=y
 CONFIG_HISAX_16_0=y
 CONFIG_HISAX_16_3=y
 CONFIG_HISAX_AVM_A1=y


@@ -1053,9 +993,9 @@ CONFIG_INPUT_KEYBDEV=m
 #
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 #
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y

-CONFIG_FRANDOM=y

 CONFIG_SERIAL=y
 CONFIG_SERIAL_CONSOLE=y
 CONFIG_SERIAL=y
 CONFIG_SERIAL_CONSOLE=y

+CONFIG_FRANDOM=y

 CONFIG_SERIAL_EXTENDED=y
 CONFIG_SERIAL_MANY_PORTS=y
 CONFIG_SERIAL_SHARE_IRQ=y
 CONFIG_SERIAL_EXTENDED=y
 CONFIG_SERIAL_MANY_PORTS=y
 CONFIG_SERIAL_SHARE_IRQ=y


@@ -1105,10 +1045,6 @@ CONFIG_UNIX98_PTY_COUNT=256
 # CONFIG_INPUT_EMU10K1 is not set
 # CONFIG_INPUT_SERIO is not set
 # CONFIG_INPUT_SERPORT is not set
 # CONFIG_INPUT_EMU10K1 is not set
 # CONFIG_INPUT_SERIO is not set
 # CONFIG_INPUT_SERPORT is not set

-
-#
-# Joysticks
-#

 # CONFIG_INPUT_ANALOG is not set
 # CONFIG_INPUT_A3D is not set
 # CONFIG_INPUT_ADI is not set
 # CONFIG_INPUT_ANALOG is not set
 # CONFIG_INPUT_A3D is not set
 # CONFIG_INPUT_ADI is not set


@@ -1272,7 +1208,7 @@ CONFIG_SMB_UNIX=y
 #
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_MSDOS_PARTITION=y
 #
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_MSDOS_PARTITION=y

-# CONFIG_SMB_NLS is not set
+CONFIG_SMB_NLS=y

 CONFIG_NLS=y
 
 #
 CONFIG_NLS=y
 
 #


@@ -1327,7 +1263,56 @@ CONFIG_VIDEO_SELECT=y
 #
 # Frame-buffer support
 #
 #
 # Frame-buffer support
 #

-# CONFIG_FB is not set
+CONFIG_FB=y
+CONFIG_DUMMY_CONSOLE=y
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_CLGEN is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_CYBER2000 is not set
+CONFIG_FB_VESA=y
+# CONFIG_FB_VGA16 is not set
+CONFIG_FB_HGA=m
+CONFIG_VIDEO_SELECT=y
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_INTEL is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_IT8181 is not set
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FBCON_SPLASHSCREEN=y
+CONFIG_FBCON_CFB16=y
+CONFIG_FBCON_ADVANCED=y
+# CONFIG_FBCON_MFB is not set
+# CONFIG_FBCON_CFB2 is not set
+# CONFIG_FBCON_CFB4 is not set
+CONFIG_FBCON_CFB8=y
+CONFIG_FBCON_CFB24=y
+CONFIG_FBCON_CFB32=y
+# CONFIG_FBCON_AFB is not set
+# CONFIG_FBCON_ILBM is not set
+# CONFIG_FBCON_IPLAN2P2 is not set
+# CONFIG_FBCON_IPLAN2P4 is not set
+# CONFIG_FBCON_IPLAN2P8 is not set
+# CONFIG_FBCON_MAC is not set
+# CONFIG_FBCON_VGA_PLANES is not set
+# CONFIG_FBCON_VGA is not set
+# CONFIG_FBCON_HGA is not set
+# CONFIG_FBCON_FONTWIDTH8_ONLY is not set
+CONFIG_FBCON_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set

 
 #
 # Sound
 
 #
 # Sound


@@ -1339,26 +1324,14 @@ CONFIG_VIDEO_SELECT=y
 #
 CONFIG_USB=m
 # CONFIG_USB_DEBUG is not set
 #
 CONFIG_USB=m
 # CONFIG_USB_DEBUG is not set

-
-#
-# Miscellaneous USB options
-#

 CONFIG_USB_DEVICEFS=y
 # CONFIG_USB_BANDWIDTH is not set
 CONFIG_USB_DEVICEFS=y
 # CONFIG_USB_BANDWIDTH is not set

-
-#
-# USB Host Controller Drivers
-#

 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_UHCI=m
 CONFIG_USB_UHCI_ALT=m
 CONFIG_USB_OHCI=m
 # CONFIG_USB_SL811HS_ALT is not set
 # CONFIG_USB_SL811HS is not set
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_UHCI=m
 CONFIG_USB_UHCI_ALT=m
 CONFIG_USB_OHCI=m
 # CONFIG_USB_SL811HS_ALT is not set
 # CONFIG_USB_SL811HS is not set

-
-#
-# USB Device Class drivers
-#

 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_EMI26 is not set
 # CONFIG_USB_BLUETOOTH is not set
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_EMI26 is not set
 # CONFIG_USB_BLUETOOTH is not set


@@ -1375,10 +1348,6 @@ CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_JUMPSHOT is not set
 CONFIG_USB_ACM=m
 # CONFIG_USB_PRINTER is not set
 # CONFIG_USB_STORAGE_JUMPSHOT is not set
 CONFIG_USB_ACM=m
 # CONFIG_USB_PRINTER is not set

-
-#
-# USB Human Interface Devices (HID)
-#

 CONFIG_USB_HID=m
 CONFIG_USB_HIDINPUT=y
 CONFIG_USB_HIDDEV=y
 CONFIG_USB_HID=m
 CONFIG_USB_HIDINPUT=y
 CONFIG_USB_HIDDEV=y


@@ -1388,47 +1357,23 @@ CONFIG_USB_HIDDEV=y
 # CONFIG_USB_WACOM is not set
 # CONFIG_USB_KBTAB is not set
 # CONFIG_USB_POWERMATE is not set
 # CONFIG_USB_WACOM is not set
 # CONFIG_USB_KBTAB is not set
 # CONFIG_USB_POWERMATE is not set

-
-#
-# USB Imaging devices
-#

 # CONFIG_USB_DC2XX is not set
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_SCANNER is not set
 # CONFIG_USB_MICROTEK is not set
 # CONFIG_USB_HPUSBSCSI is not set
 # CONFIG_USB_DC2XX is not set
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_SCANNER is not set
 # CONFIG_USB_MICROTEK is not set
 # CONFIG_USB_HPUSBSCSI is not set

-
-#
-# USB Multimedia devices
-#
-
-#
-#   Video4Linux support is needed for USB Multimedia device support
-#
-
-#
-# USB Network adaptors
-#

 CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_KAWETH=m
 CONFIG_USB_CATC=m
 CONFIG_USB_CDCETHER=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_KAWETH=m
 CONFIG_USB_CATC=m
 CONFIG_USB_CDCETHER=m
 CONFIG_USB_USBNET=m

-
-#
-# USB port drivers
-#

 # CONFIG_USB_USS720 is not set
 
 #
 # USB Serial Converter support
 #
 # CONFIG_USB_SERIAL is not set
 # CONFIG_USB_USS720 is not set
 
 #
 # USB Serial Converter support
 #
 # CONFIG_USB_SERIAL is not set

-
-#
-# USB Miscellaneous drivers
-#

 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_AUERSWALD is not set
 # CONFIG_USB_TIGL is not set
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_AUERSWALD is not set
 # CONFIG_USB_TIGL is not set

diff --git a/config/urlfilter/makeconf.pl b/config/urlfilter/makeconf.pl
index 8a2e5428d52930c53459f90ee167b01756634c0c..91446116736bb1f71f40b846c8436815fd9c1a4e 100644 (file)
--- a/config/urlfilter/makeconf.pl
+++ b/config/urlfilter/makeconf.pl
@@ -51,109 +51,3 @@ system("touch $dbdir/custom/blocked/urls");
 print "\n";
 
 exit
 print "\n";
 
 exit

-#!/usr/bin/perl
-
-$swroot="/var/ipfire";
-$logdir="/var/log/squidGuard";
-$dbdir="/var/ipfire/urlfilter/blacklists";
-
-print "Creating configuration file ";
-foreach $blacklist (<$dbdir/*>)
-{
-       if (-d $blacklist)
-       {
-               $lastslashpos = rindex($blacklist,"/");
-               $section = substr($blacklist,$lastslashpos+1);
-               push(@categories,$section);
-       }
-}
-open(FILE, ">$swroot/urlfilter/squidGuard.conf");
-print FILE "logdir $logdir\n";
-print FILE "dbhome $dbdir\n\n";
-foreach $category (@categories)
-{
-       print FILE "dest $category {\n";
-       if (-e "$dbdir/$category/domains") {
-               print FILE "    domainlist     $category\/domains\n";
-       }
-       if (-e "$dbdir/$category/urls") {
-               print FILE "    urllist        $category\/urls\n";
-       }
-       print FILE "}\n\n";
-}
-print FILE "acl {\n";
-print FILE "    default {\n";
-print FILE "        pass all\n";
-print FILE "    }\n";
-print FILE "}\n";
-close FILE;
-print "\n";
-
-print "Building blacklist databases ";
-system("$swroot/urlfilter/bin/prebuild.pl");
-print "\n";
-
-print "Creating custom directories ";
-mkdir("$dbdir/custom");
-mkdir("$dbdir/custom/allowed");
-mkdir("$dbdir/custom/blocked");
-system("touch $dbdir/custom/allowed/domains");
-system("touch $dbdir/custom/allowed/urls");
-system("touch $dbdir/custom/blocked/domains");
-system("touch $dbdir/custom/blocked/urls");
-print "\n";
-
-exit
-#!/usr/bin/perl
-
-$swroot="/var/ipfire";
-$logdir="/var/log/squidGuard";
-$dbdir="/var/ipfire/urlfilter/blacklists";
-
-print "Creating configuration file ";
-foreach $blacklist (<$dbdir/*>)
-{
-       if (-d $blacklist)
-       {
-               $lastslashpos = rindex($blacklist,"/");
-               $section = substr($blacklist,$lastslashpos+1);
-               push(@categories,$section);
-       }
-}
-open(FILE, ">$swroot/urlfilter/squidGuard.conf");
-print FILE "logdir $logdir\n";
-print FILE "dbhome $dbdir\n\n";
-foreach $category (@categories)
-{
-       print FILE "dest $category {\n";
-       if (-e "$dbdir/$category/domains") {
-               print FILE "    domainlist     $category\/domains\n";
-       }
-       if (-e "$dbdir/$category/urls") {
-               print FILE "    urllist        $category\/urls\n";
-       }
-       print FILE "}\n\n";
-}
-print FILE "acl {\n";
-print FILE "    default {\n";
-print FILE "        pass all\n";
-print FILE "    }\n";
-print FILE "}\n";
-close FILE;
-print "\n";
-
-print "Building blacklist databases ";
-system("$swroot/urlfilter/bin/prebuild.pl");
-print "\n";
-
-print "Creating custom directories ";
-mkdir("$dbdir/custom");
-mkdir("$dbdir/custom/allowed");
-mkdir("$dbdir/custom/blocked");
-system("touch $dbdir/custom/allowed/domains");
-system("touch $dbdir/custom/allowed/urls");
-system("touch $dbdir/custom/blocked/domains");
-system("touch $dbdir/custom/blocked/urls");
-print "\n";
-
-exit

diff --git a/lfs/squid b/lfs/squid
index 82f7e6cbb30cf74a229b43b8dcb6c20593745cf1..609a41977c05705601ab9030f6c8246fe37dc048 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -122,6 +122,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        chown -R nobody:nobody /var/ipfire/urlfilter
        chown -R nobody:nobody /home/httpd/html/images/urlfilter
        chown -R nobody:nobody /home/httpd/html/repository
        chown -R nobody:nobody /var/ipfire/urlfilter
        chown -R nobody:nobody /home/httpd/html/images/urlfilter
        chown -R nobody:nobody /home/httpd/html/repository

+       touch /var/log/squidGuard

        chown -R squid:squid /var/log/squidGuard
 
        @rm -rf $(DIR_APP)
        chown -R squid:squid /var/log/squidGuard
 
        @rm -rf $(DIR_APP)

diff --git a/make.sh b/make.sh
index 9dbea0d9d3cb98a960a5736b8c6178411b49b3b4..5fe00355c7d83d5ef4b0f3d9d6bb4de3ffd580dd 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -55,6 +55,7 @@
   mkdir $BASEDIR/log/ 2>/dev/null
 
   if [ 'x86_64' = $MACHINE -o 'i686' = $MACHINE -o 'i586' = $MACHINE -o 'i486' = $MACHINE -o 'i386' = $MACHINE ]; then
   mkdir $BASEDIR/log/ 2>/dev/null
 
   if [ 'x86_64' = $MACHINE -o 'i686' = $MACHINE -o 'i586' = $MACHINE -o 'i486' = $MACHINE -o 'i386' = $MACHINE ]; then

+

        echo "`date -u '+%b %e %T'`: Machine is ix86 (or equivalent)" | tee -a $LOGFILE
        MACHINE=i386
        BUILDTARGET=i386-pc-linux-gnu
        echo "`date -u '+%b %e %T'`: Machine is ix86 (or equivalent)" | tee -a $LOGFILE
        MACHINE=i386
        BUILDTARGET=i386-pc-linux-gnu


@@ -894,8 +895,17 @@ build)
                echo "`date -u '+%b %e %T'`: Using installed toolchain" | tee -a $LOGFILE
                prepareenv
        fi
                echo "`date -u '+%b %e %T'`: Using installed toolchain" | tee -a $LOGFILE
                prepareenv
        fi

+

        buildbase
        buildipcop
        buildbase
        buildipcop

+
+       # Setzen des IPFire Builds
+       if [ -e ./.svn ]; then
+               cat .svn/entries |sed -n 's/^[ \t]*revision=\"// p' | sed -n 's/\".*$// p' > $LFS/home/httpd/html/firebuild
+       else
+               echo "_(OvO)_" > $LFS/home/httpd/html/firebuild
+       fi
+

        buildinstaller
        buildpackages
        ;;
        buildinstaller
        buildpackages
        ;;