update kernel 3.4.x, fix netfilter nat modules

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

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

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 \

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
 

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

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

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:"