build: support for Linux 3.8

diff --git a/INSTALL b/INSTALL
index 7418c57b4592e1c70c63e930a8fd015b19184d41..49342b9a2183872cb1bdf6b66a6116ec052647d3 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -16,12 +16,13 @@ Supported configurations for this release
 
        * kernel-devel >= 3.7
          with prepared build/output directory
-         - CONFIG_NF_CONNTRACK or CONFIG_IP_NF_CONNTRACK
-         - CONFIG_NF_CONNTRACK_MARK or CONFIG_IP_NF_CONNTRACK_MARK
-           enabled =y or as module (=m)
+         - CONFIG_NF_CONNTRACK
+         - CONFIG_NF_CONNTRACK_MARK enabled =y or as module (=m)
          - CONFIG_CONNECTOR y/m if you wish to receive userspace
            notifications from pknock through netlink/connector
 
+(Use xtables-addons-1.x if you need support for Linux < 3.7.)
+
 
 Selecting extensions
 ====================

diff --git a/configure.ac b/configure.ac
index 2b716f4308c5d99d76f88e3a9b125141c4e4ec76..8e4dd402ab376a5f7e4e0fd7b0df405bc4c23d78 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -63,7 +63,7 @@ if test -n "$kbuilddir"; then
                echo "WARNING: Version detection did not succeed. Continue at own luck.";
        else
                echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir";
-               if test "$kmajor" -gt 3 -o "$kmajor" -eq 3 -a "$kminor" -gt 7; then
+               if test "$kmajor" -gt 3 -o "$kmajor" -eq 3 -a "$kminor" -gt 8; then
                        echo "WARNING: That kernel version is not officially supported.";
                elif test "$kmajor" -eq 3 -a "$kminor" -ge 7; then
                        :;

diff --git a/doc/changelog.txt b/doc/changelog.txt
index 7f652d9938ad337b5224fbd95b766e03a20df95b..b759fee45ca2aa840df4a8ba4b93d46036fba305 100644 (file)
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -3,6 +3,8 @@ HEAD
 ====
 Fixes:
 - DNETMAP: fix compile error with Linux 3.7
+Enhancements:
+- Support for Linux 3.8
 
 
 v2.0 (2012-11-12)

diff --git a/extensions/xt_SYSRQ.c b/extensions/xt_SYSRQ.c
index 7a15748ef3f3e0c1c2664db77c26fe6366e0361f..7964c16fc2554c13ce91b4a5249b2d4d756adb3f 100644 (file)
--- a/extensions/xt_SYSRQ.c
+++ b/extensions/xt_SYSRQ.c
@@ -1,6 +1,6 @@
 /*
  *     "SYSRQ" target extension for Xtables
- *     Copyright © Jan Engelhardt, 2008 - 2010
+ *     Copyright © Jan Engelhardt, 2008 - 2012
  *
  *     Based upon the ipt_SYSRQ idea by Marek Zalem <marek [at] terminus sk>
  *
@@ -24,6 +24,7 @@
 #include <linux/crypto.h>
 #include <linux/scatterlist.h>
 #include <net/ip.h>
+#include <net/ipv6.h>
 #include "compat_xtables.h"
 
 #if defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE)