From fa7788330275337e3e5d8871031ff61ed4b9514d28015190c17fc0bd2fe30f4d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 27 Dec 2012 07:31:02 +0000 Subject: [PATCH] xtables-addons-2.1 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/xtables-addons?expand=0&rev=70 --- ...MAP-fix-compile-error-with-Linux-3.7.patch | 56 ------------------- xtables-addons-2.0.tar.xz | 3 - xtables-addons-2.0.tar.xz.asc | 7 --- xtables-addons-2.1.tar.xz | 3 + xtables-addons-2.1.tar.xz.asc | 7 +++ xtables-addons.changes | 7 +++ xtables-addons.spec | 8 +-- 7 files changed, 20 insertions(+), 71 deletions(-) delete mode 100644 0001-xt_DNETMAP-fix-compile-error-with-Linux-3.7.patch delete mode 100644 xtables-addons-2.0.tar.xz delete mode 100644 xtables-addons-2.0.tar.xz.asc create mode 100644 xtables-addons-2.1.tar.xz create mode 100644 xtables-addons-2.1.tar.xz.asc diff --git a/0001-xt_DNETMAP-fix-compile-error-with-Linux-3.7.patch b/0001-xt_DNETMAP-fix-compile-error-with-Linux-3.7.patch deleted file mode 100644 index 76d050f..0000000 --- a/0001-xt_DNETMAP-fix-compile-error-with-Linux-3.7.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 29141b6e954a027954dcad82d175cff9d743c4df Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Fri, 21 Dec 2012 05:45:15 +0100 -Subject: [PATCH] xt_DNETMAP: fix compile error with Linux 3.7 - ---- - doc/changelog.txt | 2 ++ - extensions/xt_DNETMAP.c | 3 +-- - mconfig | 2 +- - 3 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/doc/changelog.txt b/doc/changelog.txt -index 1f525c1..7f652d9 100644 ---- a/doc/changelog.txt -+++ b/doc/changelog.txt -@@ -1,6 +1,8 @@ - - HEAD - ==== -+Fixes: -+- DNETMAP: fix compile error with Linux 3.7 - - - v2.0 (2012-11-12) -diff --git a/extensions/xt_DNETMAP.c b/extensions/xt_DNETMAP.c -index 62ad9cd..18d48de 100644 ---- a/extensions/xt_DNETMAP.c -+++ b/extensions/xt_DNETMAP.c -@@ -27,10 +27,9 @@ - #include - #include - #include --#include - #include - #include --#include -+#include - #include "compat_xtables.h" - #include "xt_DNETMAP.h" - -diff --git a/mconfig b/mconfig -index 6386498..6418bb4 100644 ---- a/mconfig -+++ b/mconfig -@@ -4,7 +4,7 @@ build_ACCOUNT=m - build_CHAOS=m - build_DELUDE=m - build_DHCPMAC=m --build_DNETMAP= -+build_DNETMAP=m - build_ECHO=m - build_IPMARK=m - build_LOGMARK=m --- -1.7.10.4 - diff --git a/xtables-addons-2.0.tar.xz b/xtables-addons-2.0.tar.xz deleted file mode 100644 index d7b95af..0000000 --- a/xtables-addons-2.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eae448d9e6d2c8276929998fb830381a5da41175a7dd55b6b2aab65a53d6da90 -size 316212 diff --git a/xtables-addons-2.0.tar.xz.asc b/xtables-addons-2.0.tar.xz.asc deleted file mode 100644 index 7c14250..0000000 --- a/xtables-addons-2.0.tar.xz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iF4EABEIAAYFAlChXqcACgkQkb3j62iiDkXKEwD/WBbQk+1I/Ug1WRFQvY3kwEhL -VVKkxoEFebCwdFr9HqQA/iNKa7PK1HKLry6VimNPlTx8VfohjLuTETNpMn82tZw6 -=jAXl ------END PGP SIGNATURE----- diff --git a/xtables-addons-2.1.tar.xz b/xtables-addons-2.1.tar.xz new file mode 100644 index 0000000..5ad9933 --- /dev/null +++ b/xtables-addons-2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d788bf647d96cfbcc2e61c3a32702cfdde40fea857407d2674731b41ac3ae79 +size 316412 diff --git a/xtables-addons-2.1.tar.xz.asc b/xtables-addons-2.1.tar.xz.asc new file mode 100644 index 0000000..a6a55aa --- /dev/null +++ b/xtables-addons-2.1.tar.xz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iF4EABEIAAYFAlDb8rQACgkQkb3j62iiDkXpAgD7BDs0M3M+Gx4NYTG/tSygfmob +0berBlFfJsvZsDz2x3AA/RyNLrcMV9rW2Hfg+7yTLrqETE+be26uYjPpCUiwC3jr +=mN7a +-----END PGP SIGNATURE----- diff --git a/xtables-addons.changes b/xtables-addons.changes index a506153..ae368fb 100644 --- a/xtables-addons.changes +++ b/xtables-addons.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Dec 27 07:08:36 UTC 2012 - jengelh@inai.de + +- Update to new upstream release 2.1 +* support for Linux 3.8 +- Remove 0001-xt_DNETMAP-fix-compile-error-with-Linux-3.7.patch + ------------------------------------------------------------------- Fri Dec 21 02:08:44 UTC 2012 - jengelh@inai.de diff --git a/xtables-addons.spec b/xtables-addons.spec index 874ed40..c403f33 100644 --- a/xtables-addons.spec +++ b/xtables-addons.spec @@ -21,7 +21,7 @@ Name: xtables-addons %define kernel37 1 %endif %if 0%{?kernel37} -Version: 2.0 +Version: 2.1 Release: 0 %else Version: 1.47.1 @@ -40,9 +40,8 @@ Source3: %name-preamble Source4: %name.keyring Source5: %name-1.47.1.tar.xz Source6: %name-1.47.1.tar.xz.asc -Source7: %name-2.0.tar.xz -Source8: %name-2.0.tar.xz.asc -Patch1: 0001-xt_DNETMAP-fix-compile-error-with-Linux-3.7.patch +Source7: %name-2.1.tar.xz +Source8: %name-2.1.tar.xz.asc BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} >= 1230 @@ -104,7 +103,6 @@ main kernel/iptables packages. echo "Version: %version. Repository: %_repository. SUSE_v: %{?suse_version}" %if 0%{?kernel37} %setup -Tqb7 -%patch -P 1 -p1 %else %setup -Tqb5 %endif