From 377611cf99599803279a7bbbc44086273cb752f256b5cac2cccacd3adb225cd8 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 9 Jan 2014 11:28:58 +0000 Subject: [PATCH 1/4] xtables-addons 2.4 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/xtables-addons?expand=0&rev=82 --- xtables-addons-2.3.tar.asc | 7 ------- xtables-addons-2.3.tar.xz | 3 --- xtables-addons-2.4.tar.asc | 7 +++++++ xtables-addons-2.4.tar.xz | 3 +++ xtables-addons.changes | 6 ++++++ xtables-addons.spec | 8 ++++---- 6 files changed, 20 insertions(+), 14 deletions(-) delete mode 100644 xtables-addons-2.3.tar.asc delete mode 100644 xtables-addons-2.3.tar.xz create mode 100644 xtables-addons-2.4.tar.asc create mode 100644 xtables-addons-2.4.tar.xz diff --git a/xtables-addons-2.3.tar.asc b/xtables-addons-2.3.tar.asc deleted file mode 100644 index 2424648..0000000 --- a/xtables-addons-2.3.tar.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iF4EABEIAAYFAlG/+jQACgkQkb3j62iiDkVOUgD/Tr4miYnFHRnoFb7/38Gu4S7i -4RkinKCaG0F5CbHhl94A/2DscvWjxY74TLm2sweUZh98zlsIuyNY8NBiYw6PGlhL -=ZfMl ------END PGP SIGNATURE----- diff --git a/xtables-addons-2.3.tar.xz b/xtables-addons-2.3.tar.xz deleted file mode 100644 index b82dd5b..0000000 --- a/xtables-addons-2.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ab43981d594131ec8d72d4604c92c25dcf67dd4cae6aabb71113238a27cdff9 -size 316452 diff --git a/xtables-addons-2.4.tar.asc b/xtables-addons-2.4.tar.asc new file mode 100644 index 0000000..02935c3 --- /dev/null +++ b/xtables-addons-2.4.tar.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iF4EABEIAAYFAlLOhtMACgkQkb3j62iiDkWt1wD+IfI5dWcLzUYWj5kvZSn6mM1O +X9CMGpP2LuikEkIYQ1kA/jZdrHHHpV0tWekqGmttDdrcr9HgE80f8lrikBeFHyCz +=Hdpm +-----END PGP SIGNATURE----- diff --git a/xtables-addons-2.4.tar.xz b/xtables-addons-2.4.tar.xz new file mode 100644 index 0000000..557d6bf --- /dev/null +++ b/xtables-addons-2.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c765a37ea9e8324832d68fd67fdfc2189db1cb9240f2b048aca6064ba9c13cdb +size 312564 diff --git a/xtables-addons.changes b/xtables-addons.changes index 8afcbcb..2a8812d 100644 --- a/xtables-addons.changes +++ b/xtables-addons.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 9 11:24:26 UTC 2014 - jengelh@inai.de + +- Update to new upstream release 2.4 +* Support for Linux 3.13 + ------------------------------------------------------------------- Tue Jun 18 05:45:03 UTC 2013 - jengelh@inai.de diff --git a/xtables-addons.spec b/xtables-addons.spec index c1475a6..531a6bc 100644 --- a/xtables-addons.spec +++ b/xtables-addons.spec @@ -1,7 +1,7 @@ # # spec file for package xtables-addons # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ Name: xtables-addons %define kernel37 1 %endif %if 0%{?kernel37} -Version: 2.3 +Version: 2.4 Release: 0 %else Version: 1.47.1 @@ -39,8 +39,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.3.tar.xz -Source8: %name-2.3.tar.asc +Source7: %name-2.4.tar.xz +Source8: %name-2.4.tar.asc BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} >= 1230 From 4ff8a07cf386785e7a4b5931b077256f4f6dd2472e298a5df2f4cfd1046aee16 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 9 Jan 2014 13:52:34 +0000 Subject: [PATCH 2/4] Strip 1.47 source OBS-URL: https://build.opensuse.org/package/show/security:netfilter/xtables-addons?expand=0&rev=83 --- xtables-addons-1.47.1.tar.xz | 3 --- xtables-addons-1.47.1.tar.xz.asc | 7 ------- xtables-addons.spec | 28 +--------------------------- 3 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 xtables-addons-1.47.1.tar.xz delete mode 100644 xtables-addons-1.47.1.tar.xz.asc diff --git a/xtables-addons-1.47.1.tar.xz b/xtables-addons-1.47.1.tar.xz deleted file mode 100644 index 5afc73b..0000000 --- a/xtables-addons-1.47.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:06535dbefaa7725870750048842b4b53f5a4f8d8b16d5ce61bb4cc28e0b99326 -size 323312 diff --git a/xtables-addons-1.47.1.tar.xz.asc b/xtables-addons-1.47.1.tar.xz.asc deleted file mode 100644 index a56ca08..0000000 --- a/xtables-addons-1.47.1.tar.xz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iF4EABEIAAYFAlB8ZD8ACgkQkb3j62iiDkUqkgD/e5Ui9G4PXF0nNsD515d1S9Fv -esK5kmFgmI/hu2EJQsgBAKkRnenUyxSVOUUhU6xS0p2x0GwSQIKkkQ+AM5dQS13M -=9dLT ------END PGP SIGNATURE----- diff --git a/xtables-addons.spec b/xtables-addons.spec index 531a6bc..1c73abc 100644 --- a/xtables-addons.spec +++ b/xtables-addons.spec @@ -17,16 +17,8 @@ Name: xtables-addons -%if 0%{?suse_version} >= 1230 || "%_repository" == "Kernel_HEAD" -%define kernel37 1 -%endif -%if 0%{?kernel37} Version: 2.4 Release: 0 -%else -Version: 1.47.1 -Release: 0 -%endif Summary: IP Packet Filter Administration Extensions License: GPL-2.0 and GPL-2.0+ Group: Productivity/Networking/Security @@ -37,8 +29,6 @@ Url: http://xtables-addons.sf.net/ #Git-Web: http://xtables-addons.git.sf.net/ Source3: %name-preamble Source4: %name.keyring -Source5: %name-1.47.1.tar.xz -Source6: %name-1.47.1.tar.xz.asc Source7: %name-2.4.tar.xz Source8: %name-2.4.tar.asc @@ -46,24 +36,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} >= 1230 BuildRequires: gpg-offline %endif +BuildRequires: %kernel_module_package_buildreqs BuildRequires: pkgconfig >= 0.21 BuildRequires: xz -%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} BuildRequires: pkgconfig(xtables) >= 1.4.5 -%endif -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -BuildRequires: libxtables-devel >= 1.4.5 -%endif -%if 0%{?redhat_version} || 0%{?centos_version} -BuildRequires: libxtables-devel >= 1.4.5 -%endif -%if 0%{?suse_version} -BuildRequires: %kernel_module_package_buildreqs Recommends: %name-kmp Recommends: xtables-geoip -%else -Requires: xtables-geoip -%endif %define xtlibdir %(pkg-config xtables --variable=xtlibdir) @@ -92,11 +70,7 @@ main kernel/iptables packages. %prep xz -dk "%_sourcedir/%name-%version.tar.xz" %{?gpg_verify: %gpg_verify %_sourcedir/%name-%version.tar.asc} -%if 0%{?kernel37} %setup -Tqb7 -%else -%setup -Tqb5 -%endif %build pushd ../; From da2bebac4370b2af5da3aebb56bcc23a730aeda09f4dc9365ecceb1a08ea30b3 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 9 Jan 2014 13:53:19 +0000 Subject: [PATCH 3/4] Ensure kernel 3.7 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/xtables-addons?expand=0&rev=84 --- xtables-addons.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xtables-addons.spec b/xtables-addons.spec index 1c73abc..71c0cb3 100644 --- a/xtables-addons.spec +++ b/xtables-addons.spec @@ -37,6 +37,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gpg-offline %endif BuildRequires: %kernel_module_package_buildreqs +BuildRequires: kernel-syms >= 3.7 BuildRequires: pkgconfig >= 0.21 BuildRequires: xz BuildRequires: pkgconfig(xtables) >= 1.4.5 From a73942f5036ee2f5a0b9e4d33354920a60e3d6fd63176084b00a17bd21c5a6d0 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 17 Jan 2014 09:26:35 +0000 Subject: [PATCH 4/4] Changelog update OBS-URL: https://build.opensuse.org/package/show/security:netfilter/xtables-addons?expand=0&rev=85 --- xtables-addons.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/xtables-addons.changes b/xtables-addons.changes index 2a8812d..1943c4f 100644 --- a/xtables-addons.changes +++ b/xtables-addons.changes @@ -3,6 +3,7 @@ Thu Jan 9 11:24:26 UTC 2014 - jengelh@inai.de - Update to new upstream release 2.4 * Support for Linux 3.13 +* Remove the unmaintained RAWSNAT/RAWDNAT modules ------------------------------------------------------------------- Tue Jun 18 05:45:03 UTC 2013 - jengelh@inai.de