From 1be2c81a9cdcdf4d6706c80b7f97d7ae65e185f3e93e183ec2b9d16aced3f8be Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 9 Oct 2010 06:59:43 +0000
Subject: [PATCH 1/2] Deactivate TEE, CHECKSUM

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/xtables-addons?expand=0&rev=17
---
 xtables-addons.changes | 6 ++++++
 xtables-addons.spec    | 7 -------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/xtables-addons.changes b/xtables-addons.changes
index 04dbba9..cfd1d4b 100644
--- a/xtables-addons.changes
+++ b/xtables-addons.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Oct  9 06:59:07 UTC 2010 - jengelh@medozas.de
+
+- Do not build xt_TEE, xt_CHECKSUM; they are provided in newer
+  iptables and kernel versions already
+
 -------------------------------------------------------------------
 Sun Oct  3 08:17:43 UTC 2010 - jengelh@medozas.de
 
diff --git a/xtables-addons.spec b/xtables-addons.spec
index ffcda31..4994518 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -65,13 +65,6 @@ if [ ! -e configure ]; then
 	./autogen.sh;
 fi;
 
-%if 0%{?suse_version} <= 1130
-# xt_TEE not included prior to 2.6.35
-perl -i -pe 's{^build_TEE=.*}{build_TEE=m}' mconfig;
-# xt_CHECKSUM not included prior to 2.6.36
-perl -i -pe 's{^build_CHECKSUM=.*}{build_CHECKSUM=m}' mconfig;
-%endif
-
 %build
 pushd ../;
 for flavor in %flavors_to_build; do

From 8537522e617ff568ea10e9466d5a8d8aa55ea024fbbae3fbc5ade27438e62769 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Fri, 5 Nov 2010 18:51:37 +0000
Subject: [PATCH 2/2] Update to 1.31

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/xtables-addons?expand=0&rev=18
---
 xtables-addons-1.30.tar.xz     | 3 ---
 xtables-addons-1.30.tar.xz.asc | 7 -------
 xtables-addons-1.31.tar.xz     | 3 +++
 xtables-addons-1.31.tar.xz.asc | 7 +++++++
 xtables-addons.changes         | 8 ++++++++
 xtables-addons.spec            | 6 +++---
 6 files changed, 21 insertions(+), 13 deletions(-)
 delete mode 100644 xtables-addons-1.30.tar.xz
 delete mode 100644 xtables-addons-1.30.tar.xz.asc
 create mode 100644 xtables-addons-1.31.tar.xz
 create mode 100644 xtables-addons-1.31.tar.xz.asc

diff --git a/xtables-addons-1.30.tar.xz b/xtables-addons-1.30.tar.xz
deleted file mode 100644
index 02fa20f..0000000
--- a/xtables-addons-1.30.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:51ff5fda46acb3da55f338343fde53258b3604df6878e3da86506a58e5f8c831
-size 337148
diff --git a/xtables-addons-1.30.tar.xz.asc b/xtables-addons-1.30.tar.xz.asc
deleted file mode 100644
index 33234c5..0000000
--- a/xtables-addons-1.30.tar.xz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEABECAAYFAkymkcYACgkQ92gFgoRMQ2DoHgCePKegxbBmeN/b7tQ7eacgcZ5H
-5jIAn0TRqlHARft+hapbyPPr59DjDOls
-=Zx4F
------END PGP SIGNATURE-----
diff --git a/xtables-addons-1.31.tar.xz b/xtables-addons-1.31.tar.xz
new file mode 100644
index 0000000..19d90ba
--- /dev/null
+++ b/xtables-addons-1.31.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:030e16513775266c2832cbd96f3703d390e58b67892abe9ec72c3e1e16c9dd53
+size 338224
diff --git a/xtables-addons-1.31.tar.xz.asc b/xtables-addons-1.31.tar.xz.asc
new file mode 100644
index 0000000..4cc1a38
--- /dev/null
+++ b/xtables-addons-1.31.tar.xz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEABECAAYFAkzUUQ0ACgkQ92gFgoRMQ2C36QCcCGMNk6LgeyoIAecBy7QELE0b
+3gQAnA0MK5X9lBnaZf99nPPv8zG2CCOc
+=oora
+-----END PGP SIGNATURE-----
diff --git a/xtables-addons.changes b/xtables-addons.changes
index cfd1d4b..aa49796 100644
--- a/xtables-addons.changes
+++ b/xtables-addons.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Nov  5 18:50:05 UTC 2010 - jengelh@medozas.de
+
+- Update to new upstream release 1.31
+* LOGMARK: print remaining lifetime of ct entries
+* xt_iface: allow matching against incoming/outgoing interface
+* libxt_gradm: match packets based on status of grsecurity RBAC
+
 -------------------------------------------------------------------
 Sat Oct  9 06:59:07 UTC 2010 - jengelh@medozas.de
 
diff --git a/xtables-addons.spec b/xtables-addons.spec
index 4994518..a2fe491 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -18,7 +18,7 @@
 
 
 Name:           xtables-addons
-Version:        1.30
+Version:        1.31
 Release:        1
 Group:          Productivity/Networking/Security
 Summary:        IP Packet Filter Administration Extensions
@@ -61,11 +61,11 @@ main kernel/iptables packages.
 
 %prep
 %setup -q
+
+%build
 if [ ! -e configure ]; then
 	./autogen.sh;
 fi;
-
-%build
 pushd ../;
 for flavor in %flavors_to_build; do
 	cp -a "%name-%version" "%name-$flavor-%version";