update kernel 3.4.x, fix netfilter nat modules

28 files changed, 41 insertions, 14 deletions

diff --git a/Config.in b/Config.in
index e1436e1b6..bb3226c5c 100644
--- a/Config.in
+++ b/Config.in
@@ -110,8 +110,8 @@ config ADK_KERNEL_VERSION_3_9_9
 	prompt "3.9.9"
 	boolean
 
-config ADK_KERNEL_VERSION_3_4_51
-	prompt "3.4.51"
+config ADK_KERNEL_VERSION_3_4_52
+	prompt "3.4.52"
 	boolean
 
 endchoice
@@ -119,7 +119,7 @@ endchoice
 config ADK_KERNEL_VERSION
 	string
 	default "3.9.9" if ADK_KERNEL_VERSION_3_9_9
-	default "3.4.51" if ADK_KERNEL_VERSION_3_4_51
+	default "3.4.52" if ADK_KERNEL_VERSION_3_4_52
 	help
 
 config ADK_KERNEL_COMP_GZIP_RASPBERRY_PI
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index e80460f9c..157dcd059 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -10,9 +10,9 @@ KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		70504d1685140e3ee355b9f860284d85
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_4_51),y)
-KERNEL_VERSION:=	3.4.51
+ifeq ($(ADK_KERNEL_VERSION_3_4_52),y)
+KERNEL_VERSION:=	3.4.52
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		f028dc67e2e8a782debc3207d47b33a0
+KERNEL_MD5SUM:=		97411d754781f6bae5c0a6e48849b3c9
 endif
diff --git a/mk/modules.mk b/mk/modules.mk
index 4e247d98d..e3f8b1289 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -443,11 +443,22 @@ $(eval $(call KMOD_template,NF_CONNTRACK_IPV4,nf-conntrack-ipv4,\
 	$(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_conntrack_ipv4 \
 ,50))
 
-$(eval $(call KMOD_template,NF_NAT_IPV4,nf-nat-ipv4,\
+NAT:=NF_NAT_IPV4
+ifeq ($(KERNEL_BASE),3)
+ifeq ($(KERNEL_MAJ),4)
+NAT:=NF_NAT
+$(eval $(call KMOD_template,$(NAT),full-nat,\
+	$(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat \
+	$(MODULES_DIR)/kernel/net/ipv4/netfilter/iptable_nat \
+,50))
+else
+$(eval $(call KMOD_template,$(NAT),full-nat,\
 	$(MODULES_DIR)/kernel/net/netfilter/nf_nat \
 	$(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat_ipv4 \
 	$(MODULES_DIR)/kernel/net/ipv4/netfilter/iptable_nat \
 ,50))
+endif
+endif
 
 $(eval $(call KMOD_template,NF_CONNTRACK_FTP,nf-conntrack-ftp,\
 	$(MODULES_DIR)/kernel/net/netfilter/nf_conntrack_ftp \
diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index c6e57b460..2e50073f8 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -14,6 +14,7 @@ PKG_VER:=		2.16
 PKG_SECTION:=		base
 PKG_OPTS:=		noremove
 PKG_SUBPKGS:=		GLIBC GLIBC_DEV GLIBC_STATIC
+PKG_DEPENDS:=		tzdata
 
 NO_DISTFILES:=		1
 
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 82a17f36b..105a5d801 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		6dd40c12fb8f4c4312a0f8434369fbcd
 PKG_DESCR:=		The netfilter firewalling software
 PKG_SECTION:=		firewall
 PKG_DEPENDS:=		kmod-ip-nf-iptables kmod-nf-conntrack
-PKG_DEPENDS+=		kmod-nf-conntrack-ipv4 kmod-nf-nat-ipv4
+PKG_DEPENDS+=		kmod-nf-conntrack-ipv4 kmod-full-nat
 PKG_DEPENDS+=		kmod-ip-nf-target-masquerade kmod-ip-nf-target-reject
 PKG_DEPENDS+=		kmod-ip-nf-filter kmod-ip-nf-match-state
 PKG_DEPENDS+=		kmod-netfilter-xt-target-tcpmss
diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4
index e960a22ac..89d070c23 100644
--- a/target/linux/config/Config.in.netfilter.ip4
+++ b/target/linux/config/Config.in.netfilter.ip4
@@ -34,9 +34,24 @@ config ADK_KPACKAGE_KMOD_IP_NF_FILTER
 	  rules for simple packet filtering at local input, forwarding and
 	  local output.  See the man page for iptables(8).
 
+config ADK_KPACKAGE_KMOD_FULL_NAT
+	tristate "Meta package for Full NAT"
+	select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_52
+	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_9_9
+
+config ADK_KPACKAGE_KMOD_NF_NAT
+	tristate 'Full NAT'
+	depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
+	depends on ADK_KERNEL_VERSION_3_4_52
+	help
+	  The Full NAT option allows masquerading, port forwarding and other
+	  forms of full Network Address Port Translation.  It is controlled by
+	  the `nat' table in iptables: see the man page for iptables(8).
+
 config ADK_KPACKAGE_KMOD_NF_NAT_IPV4
 	tristate 'Full NAT'
 	depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
+	depends on ADK_KERNEL_VERSION_3_9_9
 	help
 	  The Full NAT option allows masquerading, port forwarding and other
 	  forms of full Network Address Port Translation.  It is controlled by
@@ -44,7 +59,7 @@ config ADK_KPACKAGE_KMOD_NF_NAT_IPV4
 
 config ADK_KPACKAGE_KMOD_IP_NF_TARGET_MASQUERADE
 	tristate 'MASQUERADE target support'
-	depends on ADK_KPACKAGE_KMOD_NF_NAT_IPV4
+	depends on ADK_KPACKAGE_KMOD_FULL_NAT
 	help
 	  Masquerading is a special case of NAT: all outgoing connections are
 	  changed to seem to come from a particular interface's address, and
@@ -78,7 +93,7 @@ config ADK_KPACKAGE_KMOD_IP_NF_TARGET_ULOG
 
 config ADK_KPACKAGE_KMOD_IP_NF_TARGET_REDIRECT
 	tristate 'REDIRECT target support'
-	depends on ADK_KPACKAGE_KMOD_NF_NAT_IPV4
+	depends on ADK_KPACKAGE_KMOD_FULL_NAT
 	help
 	  REDIRECT is a special case of NAT: all incoming connections are
 	  mapped onto the incoming interface's address, causing the packets to
@@ -87,7 +102,7 @@ config ADK_KPACKAGE_KMOD_IP_NF_TARGET_REDIRECT
 
 config ADK_KPACKAGE_KMOD_IP_NF_TARGET_NETMAP
 	tristate 'NETMAP target support'
-	depends on ADK_KPACKAGE_KMOD_NF_NAT_IPV4
+	depends on ADK_KPACKAGE_KMOD_FULL_NAT
 	help
 	  NETMAP is an implementation of static 1:1 NAT mapping of network
 	  addresses. It maps the network address part, while keeping the host
@@ -96,7 +111,7 @@ config ADK_KPACKAGE_KMOD_IP_NF_TARGET_NETMAP
 
 config ADK_KPACKAGE_KMOD_IP_NF_MANGLE
 	tristate 'Packet mangling'
-	depends on ADK_KPACKAGE_KMOD_NF_NAT_IPV4
+	depends on ADK_KPACKAGE_KMOD_FULL_NAT
 	help
 	  This option adds a `mangle' table to iptables: see the man page for
 	  iptables(8).  This table is used for various packet alterations
diff --git a/target/linux/patches/3.4.51/bsd-compatibility.patch b/target/linux/patches/3.4.52/bsd-compatibility.patch
index 9e91a62de..9e91a62de 100644
--- a/target/linux/patches/3.4.51/bsd-compatibility.patch
+++ b/target/linux/patches/3.4.52/bsd-compatibility.patch
diff --git a/target/linux/patches/3.4.51/cris-etrax.patch b/target/linux/patches/3.4.52/cris-etrax.patch
index a80d9a8b8..a80d9a8b8 100644
--- a/target/linux/patches/3.4.51/cris-etrax.patch
+++ b/target/linux/patches/3.4.52/cris-etrax.patch
diff --git a/target/linux/patches/3.4.51/defaults.patch b/target/linux/patches/3.4.52/defaults.patch
index 58aae610b..58aae610b 100644
--- a/target/linux/patches/3.4.51/defaults.patch
+++ b/target/linux/patches/3.4.52/defaults.patch
diff --git a/target/linux/patches/3.4.51/gemalto.patch b/target/linux/patches/3.4.52/gemalto.patch
index 65f7af1d7..65f7af1d7 100644
--- a/target/linux/patches/3.4.51/gemalto.patch
+++ b/target/linux/patches/3.4.52/gemalto.patch
diff --git a/target/linux/patches/3.4.51/lemote-rfkill.patch b/target/linux/patches/3.4.52/lemote-rfkill.patch
index a61488434..a61488434 100644
--- a/target/linux/patches/3.4.51/lemote-rfkill.patch
+++ b/target/linux/patches/3.4.52/lemote-rfkill.patch
diff --git a/target/linux/patches/3.4.51/module-alloc-size-check.patch b/target/linux/patches/3.4.52/module-alloc-size-check.patch
index a792ac60a..a792ac60a 100644
--- a/target/linux/patches/3.4.51/module-alloc-size-check.patch
+++ b/target/linux/patches/3.4.52/module-alloc-size-check.patch
diff --git a/target/linux/patches/3.4.51/non-static.patch b/target/linux/patches/3.4.52/non-static.patch
index a967703d0..a967703d0 100644
--- a/target/linux/patches/3.4.51/non-static.patch
+++ b/target/linux/patches/3.4.52/non-static.patch
diff --git a/target/linux/patches/3.4.51/sparc-include.patch b/target/linux/patches/3.4.52/sparc-include.patch
index 2f8ffd061..2f8ffd061 100644
--- a/target/linux/patches/3.4.51/sparc-include.patch
+++ b/target/linux/patches/3.4.52/sparc-include.patch
diff --git a/target/linux/patches/3.4.51/startup.patch b/target/linux/patches/3.4.52/startup.patch
index 68e8987b0..68e8987b0 100644
--- a/target/linux/patches/3.4.51/startup.patch
+++ b/target/linux/patches/3.4.52/startup.patch
diff --git a/target/linux/patches/3.4.51/usb-defaults-off.patch b/target/linux/patches/3.4.52/usb-defaults-off.patch
index 31367108a..31367108a 100644
--- a/target/linux/patches/3.4.51/usb-defaults-off.patch
+++ b/target/linux/patches/3.4.52/usb-defaults-off.patch
diff --git a/target/linux/patches/3.4.51/uuid.patch b/target/linux/patches/3.4.52/uuid.patch
index ca23accdf..ca23accdf 100644
--- a/target/linux/patches/3.4.51/uuid.patch
+++ b/target/linux/patches/3.4.52/uuid.patch
diff --git a/target/linux/patches/3.4.51/vga-cons-default-off.patch b/target/linux/patches/3.4.52/vga-cons-default-off.patch
index 178aeeeb9..178aeeeb9 100644
--- a/target/linux/patches/3.4.51/vga-cons-default-off.patch
+++ b/target/linux/patches/3.4.52/vga-cons-default-off.patch
diff --git a/target/linux/patches/3.4.51/wlan-cf.patch b/target/linux/patches/3.4.52/wlan-cf.patch
index fc20759e2..fc20759e2 100644
--- a/target/linux/patches/3.4.51/wlan-cf.patch
+++ b/target/linux/patches/3.4.52/wlan-cf.patch
diff --git a/target/linux/patches/3.4.51/zlib-inflate.patch b/target/linux/patches/3.4.52/zlib-inflate.patch
index 58e1f6d21..58e1f6d21 100644
--- a/target/linux/patches/3.4.51/zlib-inflate.patch
+++ b/target/linux/patches/3.4.52/zlib-inflate.patch
diff --git a/target/mips/Makefile b/target/mips/Makefile
index a378db4c7..eab6be597 100644
--- a/target/mips/Makefile
+++ b/target/mips/Makefile
@@ -110,10 +110,10 @@ imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSTARBALL)
 endif
 ifeq ($(ADK_TARGET_FS),archive)
 imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
-	@cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
-	@echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
 	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
 ifneq ($(ADK_HARDWARE_QEMU),)
+	@cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
+	@echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
 	@echo "Use following command to create a QEMU Image:"
 	@echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
 	@echo "Start qemu with following options:"
diff --git a/toolchain/kernel-headers/patches/3.4.51/aufs2.patch b/toolchain/kernel-headers/patches/3.4.52/aufs2.patch
index d40c9a3fe..d40c9a3fe 100644
--- a/toolchain/kernel-headers/patches/3.4.51/aufs2.patch
+++ b/toolchain/kernel-headers/patches/3.4.52/aufs2.patch
diff --git a/toolchain/kernel-headers/patches/3.4.51/cleankernel.patch b/toolchain/kernel-headers/patches/3.4.52/cleankernel.patch
index f8d5448ee..f8d5448ee 100644
--- a/toolchain/kernel-headers/patches/3.4.51/cleankernel.patch
+++ b/toolchain/kernel-headers/patches/3.4.52/cleankernel.patch
diff --git a/toolchain/kernel-headers/patches/3.4.51/etrax-header.patch b/toolchain/kernel-headers/patches/3.4.52/etrax-header.patch
index 559c0f322..559c0f322 100644
--- a/toolchain/kernel-headers/patches/3.4.51/etrax-header.patch
+++ b/toolchain/kernel-headers/patches/3.4.52/etrax-header.patch
diff --git a/toolchain/kernel-headers/patches/3.4.51/linux-gcc-check.patch b/toolchain/kernel-headers/patches/3.4.52/linux-gcc-check.patch
index 7cc381845..7cc381845 100644
--- a/toolchain/kernel-headers/patches/3.4.51/linux-gcc-check.patch
+++ b/toolchain/kernel-headers/patches/3.4.52/linux-gcc-check.patch
diff --git a/toolchain/kernel-headers/patches/3.4.51/microperl.patch b/toolchain/kernel-headers/patches/3.4.52/microperl.patch
index 44c39f6e8..44c39f6e8 100644
--- a/toolchain/kernel-headers/patches/3.4.51/microperl.patch
+++ b/toolchain/kernel-headers/patches/3.4.52/microperl.patch
diff --git a/toolchain/kernel-headers/patches/3.4.51/mkpiggy.patch b/toolchain/kernel-headers/patches/3.4.52/mkpiggy.patch
index d4e815cd2..d4e815cd2 100644
--- a/toolchain/kernel-headers/patches/3.4.51/mkpiggy.patch
+++ b/toolchain/kernel-headers/patches/3.4.52/mkpiggy.patch
diff --git a/toolchain/kernel-headers/patches/3.4.51/relocs.patch b/toolchain/kernel-headers/patches/3.4.52/relocs.patch
index 43c5bb580..43c5bb580 100644
--- a/toolchain/kernel-headers/patches/3.4.51/relocs.patch
+++ b/toolchain/kernel-headers/patches/3.4.52/relocs.patch