[packages/iptables] Fix segfault in 'ebtables -X'

[jajcus]

commit a2f3cd63b67fb77cebb47b030005a85b4e476172
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date:   Mon Jul 3 12:07:17 2017 +0200

    Fix segfault in 'ebtables -X'
    
    Fixes:
    > /usr/sbin/ebtables -t nat -X something
    > Segmentation fault (core dumped)
    
    Makes '-X' argument mandatory, but the code is not ready for omitting it
    anyway.
    
    Release: 2

 ebtables-X.patch | 12 ++++++++++++
 iptables.spec    |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/iptables.spec b/iptables.spec
index d43f212..fe7de34 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -34,7 +34,7 @@ Summary(uk.UTF-8):	Утиліти для керування пакетними 
 Summary(zh_CN.UTF-8):	Linux内核包过滤管理工具
 Name:		iptables%{?with_vserver:-vserver}
 Version:	1.6.1
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Networking/Admin
 Source0:	ftp://ftp.netfilter.org/pub/iptables/%{orgname}-%{version}.tar.bz2
@@ -57,6 +57,7 @@ Patch1:		%{orgname}-batch.patch
 Patch2:		no-libiptc.patch
 Patch3:		%{orgname}-aligned_u64.patch
 Patch4:		%{orgname}-ebtables.patch
+Patch5:		ebtables-X.patch
 # --- ADDITIONAL/CHANGED EXTENSIONS:
 # just ipt_IPV4OPTSSTRIP now
 Patch10:	%{orgname}-20070806.patch
@@ -209,6 +210,7 @@ iptables(8).
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %{?with_ipt_IPV4OPTSSTRIP:%patch10 -p1}
 %{?with_xt_layer7:%patch11 -p1}
diff --git a/ebtables-X.patch b/ebtables-X.patch
new file mode 100644
index 0000000..bf65ef5
--- /dev/null
+++ b/ebtables-X.patch
@@ -0,0 +1,12 @@
+diff -dur iptables-1.6.1.orig/iptables/xtables-eb.c iptables-1.6.1/iptables/xtables-eb.c
+--- iptables-1.6.1.orig/iptables/xtables-eb.c	2017-01-26 17:11:58.000000000 +0100
++++ iptables-1.6.1/iptables/xtables-eb.c	2017-07-03 12:06:20.000000000 +0200
+@@ -776,7 +776,7 @@
+ 
+ 	/* Getopt saves the day */
+ 	while ((c = getopt_long(argc, argv,
+-	   "-A:D:C:I:N:E:X::L::Z::F::P:Vhi:o:j:c:p:s:d:t:M:", opts, NULL)) != -1) {
++	   "-A:D:C:I:N:E:X:L::Z::F::P:Vhi:o:j:c:p:s:d:t:M:", opts, NULL)) != -1) {
+ 		cs.c = c;
+ 		cs.invert = ebt_invert;
+ 		switch (c) {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/iptables.git/commitdiff/a2f3cd63b67fb77cebb47b030005a85b4e476172