This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via d8158ca68c4d48eb7fafe1b3a1fab2468381979a (commit)
via cd406833e24ccb5469ae38635da50f866a4c0564 (commit)
via d3fac55c619b200705155d3b4dd3cc8f148a5ff0 (commit)
from d91d82638972130e20f998c2b97795a9fdf5287e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d8158ca68c4d48eb7fafe1b3a1fab2468381979a
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Dec 30 16:28:19 2010 +0100
Firewall: better loopback badtcp skipping.
commit cd406833e24ccb5469ae38635da50f866a4c0564
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Dec 30 15:54:41 2010 +0100
Updater: doesn't show gpl after update.
commit d3fac55c619b200705155d3b4dd3cc8f148a5ff0
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Dec 30 15:50:53 2010 +0100
xen-kernel: enable timer debugging also for xen-kernel.
-----------------------------------------------------------------------
Summary of changes:
config/kernel/kernel.config.i586-ipfire-xen | 58 +++++++++++++++++++++++++--
config/rootfiles/core/44/update.sh | 4 ++
src/initscripts/init.d/firewall | 5 ++-
3 files changed, 62 insertions(+), 5 deletions(-)
mode change 100755 => 100644 src/initscripts/init.d/fireinfo
Difference in files:
diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen
index cd0e77a..a928c83 100644
--- a/config/kernel/kernel.config.i586-ipfire-xen
+++ b/config/kernel/kernel.config.i586-ipfire-xen
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.32.26-ipfire-xen
-# Wed Dec 8 23:17:06 2010
+# Linux kernel version: 2.6.32.27-ipfire-xen
+# Thu Dec 30 14:49:34 2010
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -112,6 +112,7 @@ CONFIG_ANON_INODES=y
CONFIG_UID16=y
CONFIG_SYSCTL_SYSCALL=y
CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
# CONFIG_KALLSYMS_EXTRA_PASS is not set
CONFIG_HOTPLUG=y
CONFIG_PRINTK=y
@@ -289,7 +290,7 @@ CONFIG_SECCOMP=y
CONFIG_HZ_300=y
# CONFIG_HZ_1000 is not set
CONFIG_HZ=300
-CONFIG_SCHED_HRTICK=y
+# CONFIG_SCHED_HRTICK is not set
# CONFIG_KEXEC is not set
CONFIG_PHYSICAL_START=0x100000
CONFIG_PHYSICAL_ALIGN=0x2000
@@ -362,6 +363,7 @@ CONFIG_PCIEAER=y
CONFIG_ARCH_SUPPORTS_MSI=y
CONFIG_PCI_MSI=y
CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_DEBUG is not set
CONFIG_PCI_GUESTDEV=y
CONFIG_PCI_IOMULTI=y
CONFIG_PCI_RESERVE=y
@@ -912,6 +914,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_FW_LOADER=y
# CONFIG_FIRMWARE_IN_KERNEL is not set
CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
CONFIG_SYS_HYPERVISOR=y
CONFIG_CONNECTOR=m
CONFIG_MTD=m
@@ -3568,16 +3572,54 @@ CONFIG_STRIP_ASM_SYMS=y
# CONFIG_UNUSED_SYMBOLS is not set
# CONFIG_DEBUG_FS is not set
# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_KERNEL is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+CONFIG_TIMER_STATS=y
+# CONFIG_DEBUG_OBJECTS is not set
# CONFIG_SLUB_DEBUG_ON is not set
# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_HIGHMEM is not set
CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
CONFIG_ARCH_WANT_FRAME_POINTERS=y
# CONFIG_FRAME_POINTER is not set
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# CONFIG_FAULT_INJECTION is not set
# CONFIG_LATENCYTOP is not set
# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_USER_STACKTRACE_SUPPORT=y
CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -3596,6 +3638,13 @@ CONFIG_HAVE_ARCH_KMEMCHECK=y
# CONFIG_STRICT_DEVMEM is not set
CONFIG_EARLY_PRINTK=y
# CONFIG_EARLY_PRINTK_DBGP is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_X86_PTDUMP is not set
+CONFIG_DEBUG_RODATA=y
+CONFIG_DEBUG_RODATA_TEST=y
+# CONFIG_DEBUG_NX_TEST is not set
# CONFIG_4KSTACKS is not set
# CONFIG_IOMMU_STRESS is not set
CONFIG_IO_DELAY_TYPE_0X80=0
@@ -3607,6 +3656,7 @@ CONFIG_IO_DELAY_0X80=y
# CONFIG_IO_DELAY_UDELAY is not set
# CONFIG_IO_DELAY_NONE is not set
CONFIG_DEFAULT_IO_DELAY_TYPE=0
+# CONFIG_CPA_DEBUG is not set
# CONFIG_OPTIMIZE_INLINING is not set
#
diff --git a/config/rootfiles/core/44/update.sh b/config/rootfiles/core/44/update.sh
index 1096440..11ea8ac 100644
--- a/config/rootfiles/core/44/update.sh
+++ b/config/rootfiles/core/44/update.sh
@@ -247,6 +247,10 @@ if [ "${ROOT:0:7}" == "/dev/hd" ];then
sed -i -e "s|${ROOT:0:8}|/dev/sda|g" /etc/fstab
fi
#
+# Don't show gpl on updated systens
+#
+touch /var/ipfire/main/gpl_accepted
+#
# ReInstall grub
#
grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck
diff --git a/src/initscripts/init.d/fireinfo b/src/initscripts/init.d/fireinfo
old mode 100755
new mode 100644
diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index 9a4e5eb..f1330f0 100644
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -53,6 +53,9 @@ iptables_init() {
# Chain to contain all the rules relating to bad TCP flags
/sbin/iptables -N BADTCP
+ #Don't check loopback
+ /sbin/iptables -A INPUT -i lo -j RETURN
+
# Disallow packets frequently used by port-scanners
# nmap xmas
/sbin/iptables -A BADTCP -p tcp --tcp-flags ALL FIN,URG,PSH -j PSCAN
@@ -188,7 +191,7 @@ case "$1" in
/sbin/iptables -A FORWARD -j OUTGOINGFW
# localhost and ethernet.
- /sbin/iptables -I INPUT 1 -i lo -m state --state NEW -j ACCEPT
+ /sbin/iptables -A INPUT -i lo -m state --state NEW -j ACCEPT
/sbin/iptables -A INPUT -s 127.0.0.0/8 -m state --state NEW -j DROP # Loopback not on lo
/sbin/iptables -A INPUT -d 127.0.0.0/8 -m state --state NEW -j DROP
/sbin/iptables -A FORWARD -i lo -m state --state NEW -j ACCEPT
hooks/post-receive
--
IPFire 2.x development tree