diff --git a/SOURCES/arptables-0.0.4-man-install.patch b/SOURCES/arptables-0.0.4-man-install.patch index cd55148..8cdcb49 100644 --- a/SOURCES/arptables-0.0.4-man-install.patch +++ b/SOURCES/arptables-0.0.4-man-install.patch @@ -1,4 +1,4 @@ -commit 42notupstreamyet +commit 9ce0571805f97 + f43b499751a79 Author: Jesper Dangaard Brouer Date: Thu Nov 14 13:37:39 2013 +0100 diff --git a/SOURCES/arptables-0.0.4-set-counters-option.patch b/SOURCES/arptables-0.0.4-set-counters-option.patch new file mode 100644 index 0000000..a43cbbf --- /dev/null +++ b/SOURCES/arptables-0.0.4-set-counters-option.patch @@ -0,0 +1,55 @@ +commit ba6234638d04400cf94adf350ccfa7005d078b4a +Author: Jesper Dangaard Brouer +Date: Sun Mar 2 22:08:30 2014 +0100 + + arptables: add missing long option --set-counters and update documentation + + The long option "--set-counters" where missing in option parsing. + And the corresponding short option "-c" were not mentioned in + the help usage text. + + Also update the arptables man page with a description + of the parameter. + + Signed-off-by: Jesper Dangaard Brouer + +diff --git a/userspace/arptables/arptables.8 b/userspace/arptables/arptables.8 +index 0b6b62e1a7ef..78b2c60978c4 100644 +--- a/userspace/arptables/arptables.8 ++++ b/userspace/arptables/arptables.8 +@@ -215,6 +215,14 @@ The target of the rule. This is one of the following values: + a target extension (see + .BR "TARGET EXTENSIONS" ")" + or a user-defined chain name. ++.TP ++.BI "-c, --set-counters " "PKTS BYTES" ++This enables the administrator to initialize the packet and byte ++counters of a rule (during ++.B INSERT, ++.B APPEND, ++.B REPLACE ++operations). + + .SS RULE-SPECIFICATIONS + The following command line arguments make up a rule specification (as used +diff --git a/userspace/arptables/arptables.c b/userspace/arptables/arptables.c +index 4da6fea980bb..3fb8ed5c40e7 100644 +--- a/userspace/arptables/arptables.c ++++ b/userspace/arptables/arptables.c +@@ -152,6 +152,7 @@ static struct option original_opts[] = { + { "help", 2, 0, 'h' }, + { "line-numbers", 0, 0, '0' }, + { "modprobe", 1, 0, 'M' }, ++ { "set-counters", 1, 0, 'c' }, + { 0 } + }; + +@@ -529,7 +530,7 @@ exit_printhelp(void) + " --line-numbers print line numbers when listing\n" + " --exact -x expand numbers (display exact values)\n" + " --modprobe= try to insert modules using this command\n" +-" --set-counters PKTS BYTES set the counter during insert/append\n" ++" --set-counters -c PKTS BYTES set the counter during insert/append\n" + "[!] --version -V print package version.\n"); + printf(" opcode strings: \n"); + for (i = 0; i < NUMOPCODES; i++) diff --git a/SPECS/arptables.spec b/SPECS/arptables.spec index 2689112..af148d2 100644 --- a/SPECS/arptables.spec +++ b/SPECS/arptables.spec @@ -1,7 +1,7 @@ Summary: User space tool to set up tables of ARP rules in kernel Name: arptables Version: 0.0.4 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: System Environment/Base @@ -18,6 +18,7 @@ Source5: arptables-restore.8 Patch1: arptables-0.0.4-covscan_fix01_simple.patch Patch2: arptables-0.0.4-covscan_fix02_buf_overflow.patch Patch3: arptables-0.0.4-man-install.patch +Patch4: arptables-0.0.4-set-counters-option.patch BuildRequires: systemd Requires(post): systemd @@ -38,6 +39,7 @@ user space tool, but is less complicated. %patch1 -p3 -b .covscan_fix01_simple %patch2 -p3 -b .covscan_fix02_buf_overflow %patch3 -p3 -b .man-install +%patch4 -p3 -b .set-counters-option cp %{SOURCE3} COPYING cp %{SOURCE4} . @@ -79,6 +81,11 @@ echo '# Configure prior to use' > %{buildroot}%{_sysconfdir}/sysconfig/arptables %config(noreplace) %{_sysconfdir}/sysconfig/arptables %changelog +* Wed Jun 8 2016 Jesper Dangaard Brouer - 0.0.4-8 +- Add missing long option --set-counters and update documentation + Corrosponding short option -c was implemented, but undocumented. + Resolves: rhbz#1050854 + * Fri Jan 24 2014 Daniel Mach - 0.0.4-7 - Mass rebuild 2014-01-24