[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 02d0735a396e76a3217f64b27ea7611a11ca48b6

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 02d0735a396e76a3217f64b27ea7611a11ca48b6

[git]

[-- Attachment #1: Type: text/plain, Size: 2119 bytes --]

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 3.x development tree".

The branch, master has been updated
       via  02d0735a396e76a3217f64b27ea7611a11ca48b6 (commit)
      from  6fba020e47df686e32a65d715753cca2b80fca7b (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 02d0735a396e76a3217f64b27ea7611a11ca48b6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Jul 18 14:08:30 2012 +0200

    kernel: Compile in IPv6 and conntrack support.
    
    These have been modules, but as we need them anyway, we should
    compile them in.

-----------------------------------------------------------------------

Summary of changes:
 kernel/config-generic |    4 ++--
 kernel/kernel.nm      |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/kernel/config-generic b/kernel/config-generic
index 201c0b0..044a46c 100644
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -374,7 +374,7 @@ CONFIG_DEFAULT_CUBIC=y
 # CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_TCP_MD5SIG=y
-CONFIG_IPV6=m
+CONFIG_IPV6=y
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
@@ -413,7 +413,7 @@ CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_ACCT=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK=y
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_ZONES=y
diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index d81d988..c2e98d5 100644
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
 
 name       = kernel
 version    = 3.4.4
-release    = 2
+release    = 3
 thisapp    = linux-%{version}
 
 maintainer = Michael Tremer <michael.tremer(a)ipfire.org>


hooks/post-receive
--
IPFire 3.x development tree