[arptables_jf] make option -x work together with -L (#963209)

[Jiří Popelka]

commit d52dfcc23b1027e15ea4bd283241f3ebb196e902
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Wed May 15 15:13:55 2013 +0200

    make option -x work together with -L (#963209)

 arptables_jf-0.0.8-dbl-opt.patch |   12 ------------
 arptables_jf-0.0.8-options.patch |   21 +++++++++++++++++++++
 arptables_jf.spec                |    9 ++++++---
 3 files changed, 27 insertions(+), 15 deletions(-)
---
diff --git a/arptables_jf-0.0.8-options.patch b/arptables_jf-0.0.8-options.patch
new file mode 100644
index 0000000..84fc0aa
--- /dev/null
+++ b/arptables_jf-0.0.8-options.patch
@@ -0,0 +1,21 @@
+diff -up arptables_jf-0.0.8/arptables.c.options arptables_jf-0.0.8/arptables.c
+--- arptables_jf-0.0.8/arptables.c.options	2013-05-15 15:09:45.328799344 +0200
++++ arptables_jf-0.0.8/arptables.c	2013-05-15 15:10:21.028301662 +0200
+@@ -192,7 +192,7 @@ static char commands_v_options[NUMBER_OF
+ /*DELETE_NUM*/{'x','x',' ','x',' ','x','x','x','x','x','x','x','x','x','x','x'},
+ /*REPLACE*/   {'x',' ',' ','x',' ','x',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '},
+ /*APPEND*/    {'x',' ',' ','x',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '},
+-/*LIST*/      {' ','x',' ',' ',' ','x','x','x','x','x','x','x','x','x','x','x'},
++/*LIST*/      {' ','x',' ',' ',' ',' ','x','x','x','x','x','x','x','x','x','x'},
+ /*FLUSH*/     {'x','x',' ','x',' ','x','x','x','x','x','x','x','x','x','x','x'},
+ /*ZERO*/      {'x','x',' ','x',' ','x','x','x','x','x','x','x','x','x','x','x'},
+ /*NEW_CHAIN*/ {'x','x',' ','x',' ','x','x','x','x','x','x','x','x','x','x','x'},
+@@ -413,8 +413,6 @@ exit_printhelp(void)
+ "				source specification\n"
+ "  --target     -d [!] address[/mask]\n"
+ "				destination specification\n"
+-"  --arhln      -a [!] length[/mask]\n"
+-"                               hardware address length\n"
+ "  --source-hw  -z [!] address[/mask]\n"
+ "                               source hardware address\n"
+ "  --target-hw  -y [!] address[/mask]\n"
diff --git a/arptables_jf.spec b/arptables_jf.spec
index d7870e6..92487f3 100644
--- a/arptables_jf.spec
+++ b/arptables_jf.spec
@@ -1,7 +1,7 @@
 Summary: User-space control program for the arptables network filter
 Name:    arptables_jf
 Version: 0.0.8
-Release: 33%{?dist}
+Release: 34%{?dist}
 License: GPLv2+
 Group:   System Environment/Base
 
@@ -16,7 +16,7 @@ Patch3: arptables_jf-0.0.8-warnings.patch
 Patch4: arptables_jf-0.0.8-header.patch
 Patch5: arptables_jf-0.0.8-mangle.patch
 Patch6: arptables_jf-0.0.8-byteorder.patch
-Patch7: arptables_jf-0.0.8-dbl-opt.patch
+Patch7: arptables_jf-0.0.8-options.patch
 
 Requires(post): systemd
 Requires(preun): systemd
@@ -40,7 +40,7 @@ written by Jay Fenlason.
 %patch4 -p1 -b .header
 %patch5 -p1 -b .mangle
 %patch6 -p1 -b .byteorder
-%patch7 -p1 -b .dbl-opt
+%patch7 -p1 -b .options
 
 %build
 make all 'COPT_FLAGS=%{optflags} -fno-strict-aliasing' %{_smp_mflags}
@@ -72,6 +72,9 @@ echo '#Configure prior to use' > %{buildroot}%{_sysconfdir}/sysconfig/arptables
 %config(noreplace) %{_sysconfdir}/sysconfig/arptables
 
 %changelog
+* Wed May 15 2013 Jiri Popelka <jpopelka at redhat.com> - 0.0.8-34
+- make option -x work together with -L (#963209)
+
 * Mon May 13 2013 Jiri Popelka <jpopelka at redhat.com> - 0.0.8-33
 - add to man page that --mangle-hw-s/--mangle-hw-d need also --arhln
 - removed triggerun scriptlet