From 0c80be6f74250dbc70d071a84bc3b7a7d15b80f2 Mon Sep 17 00:00:00 2001
From: Arturo Borrero Gonzalez <arturo@netfilter.org>
Date: Wed, 20 Jun 2018 15:43:39 +0200
Subject: [PATCH] arptables: legacy renaming
The original arptables tool is now the legacy version, let's rename it.
A more uptodate client of the arptables tool is provided in the iptables
tarball. The new tool was formerly known as arptables-compat.
The new -legacy binary should have no problem if called via a symlink.
Signed-off-by: Arturo Borrero Gonzalez <arturo@netfilter.org>
Signed-off-by: Florian Westphal <fw@strlen.de>
(cherry picked from commit 28b22d55615447c94c5058e0aacec612ebc27f2a)
Signed-off-by: Phil Sutter <psutter@redhat.com>
---
Makefile | 12 ++++++------
arptables.8 => arptables-legacy.8 | 16 ++++++++++++++--
arptables.c | 2 +-
3 files changed, 21 insertions(+), 9 deletions(-)
rename arptables.8 => arptables-legacy.8 (94%)
diff --git a/Makefile b/Makefile
index 139c9cae9ff6c..5f3f81290165c 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ man8dir=$(MANDIR)/man8
SYSCONFIGDIR:=/etc/sysconfig
DESTDIR:=
-MANS = arptables.8 arptables-save.8 arptables-restore.8
+MANS = arptables-legacy.8 arptables-save.8 arptables-restore.8
COPT_FLAGS:=-O2
CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" #-g -DDEBUG #-pg # -DARPTC_DEBUG
@@ -21,7 +21,7 @@ endif
include extensions/Makefile
-all: arptables libarptc/libarptc.a
+all: arptables-legacy libarptc/libarptc.a
arptables.o: arptables.c
$(CC) $(CFLAGS) -c -o $@ $<
@@ -35,10 +35,10 @@ libarptc/libarptc.o: libarptc/libarptc.c libarptc/libarptc_incl.c
libarptc/libarptc.a: libarptc/libarptc.o
$(AR) rcs $@ $<
-arptables: arptables-standalone.o arptables.o libarptc/libarptc.o $(EXT_OBJS)
+arptables-legacy: arptables-standalone.o arptables.o libarptc/libarptc.o $(EXT_OBJS)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
-$(DESTDIR)$(BINDIR)/arptables: arptables
+$(DESTDIR)$(BINDIR)/arptables-legacy: arptables-legacy
mkdir -p $(DESTDIR)$(BINDIR)
install -m 0755 $< $@
@@ -58,11 +58,11 @@ install-man: $(MANS)
install -m 0644 $^ $(DESTDIR)$(man8dir)/
.PHONY: install
-install: install-man $(DESTDIR)$(BINDIR)/arptables scripts
+install: install-man $(DESTDIR)$(BINDIR)/arptables-legacy scripts
.PHONY: clean
clean:
- rm -f arptables
+ rm -f arptables-legacy
rm -f *.o *~
rm -f extensions/*.o extensions/*~
rm -f libarptc/*.o libarptc/*~ libarptc/*.a
diff --git a/arptables.8 b/arptables-legacy.8
similarity index 94%
rename from arptables.8
rename to arptables-legacy.8
index 676b8840c60f2..3ce99e3757004 100644
--- a/arptables.8
+++ b/arptables-legacy.8
@@ -1,4 +1,4 @@
-.TH ARPTABLES 8 "November 2011"
+.TH ARPTABLES 8 "June 2018"
.\"
.\" Man page originally written by Jochen Friedrich <jochen@scram.de>,
.\" maintained by Bart De Schuymer.
@@ -22,7 +22,7 @@
.\"
.\"
.SH NAME
-arptables \- ARP table administration
+arptables \- ARP table administration (legacy)
.SH SYNOPSIS
.BR "arptables " [ "-t table" ] " -" [ AD ] " chain rule-specification " [ options ]
.br
@@ -37,6 +37,18 @@ arptables \- ARP table administration
.BR "arptables " [ "-t table" ] " -E old-chain-name new-chain-name"
.br
.BR "arptables " [ "-t table" ] " -P chain target " [ options ]
+
+.SH LEGACY
+This tool uses the old xtables/setsockopt framework, and is a legacy version
+of arptables. That means that a new, more modern tool exists with the same
+functionality using the nf_tables framework and you are encouraged to migrate now.
+The new binaries (formerly known as -compat) uses the same syntax and
+semantics than this legacy one.
+
+You can still use this legacy tool. You should probably get some specific
+information from your Linux distribution or vendor.
+More docs are available at https://wiki.nftables.org
+
.SH DESCRIPTION
.B arptables
is a user space tool, it is used to set up and maintain the
diff --git a/arptables.c b/arptables.c
index 4e9af67f92042..09c9ca25217d0 100644
--- a/arptables.c
+++ b/arptables.c
@@ -468,7 +468,7 @@ exit_printhelp(void)
struct arptables_target *t = NULL;
int i;
- printf("%s v%s\n\n"
+ printf("%s v%s (legacy)\n\n"
"Usage: %s -[AD] chain rule-specification [options]\n"
" %s -[RI] chain rulenum rule-specification [options]\n"
" %s -D chain rulenum [options]\n"
--
2.21.0