package/arptables: bump to version 0.0.5
PATCH 1/1 package/arptables: bump to version 0.0.5
- Update site to retrieve latest version
- Remove first, second and third patches (already in version)
- Use the new COPYING file as the license file
- arptables binary is now named arptables-legacy since
http://git.netfilter.org/arptables/commit/?id=28b22d55615447c94c5058e0aacec612ebc27f2a
---
....patch => 0001-Fix-musl-build-issue.patch} | 0
...01-arptables-disable-dlfcn.h-include.patch | 32 -----
.../arptables/0002-src-Use-stdint-types.patch | 134 ------------------
.../0003-src-Remove-support-for-libc5.patch | 64 ---------
package/arptables/Config.in | 11 +-
package/arptables/arptables.hash | 7 +-
package/arptables/arptables.mk | 9 +-
7 files changed, 18 insertions(+), 239 deletions(-)
rename package/arptables/{0004-Fix-musl-build-issue.patch => 0001-Fix-musl-build-issue.patch} (100%)
delete mode 100644 package/arptables/0001-arptables-disable-dlfcn.h-include.patch
delete mode 100644 package/arptables/0002-src-Use-stdint-types.patch
delete mode 100644 package/arptables/0003-src-Remove-support-for-libc5.patchpackage/arptables/0001-Fix-musl-build-issue.patch renamed from package/arptables/0004-Fix-musl-build-issue.patch +0 -0
package/arptables/0001-arptables-disable-dlfcn.h-include.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From 948a96d710f377fb0ed8d78c7fb85b299c80ef13 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias <[email protected]> -Date: Sat, 8 Nov 2014 10:12:54 -0300 -Subject: [PATCH] arptables: disable dlfcn.h include - -The relevant code is disabled in libarptc_incl.c so it's not required -and breaks the ability to build it in a pure-static toolchain. - -Status: sent upstream. - -Signed-off-by: Gustavo Zacarias <[email protected]> ---- - arptables.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/arptables.c b/arptables.c -index 64ac3aa..fe270bc 100644 ---- a/arptables.c -+++ b/arptables.c -@@ -35,7 +35,9 @@ - #include <stdio.h> - #include <stdlib.h> - #include <inttypes.h> -+#if 0 - #include <dlfcn.h> -+#endif - #include <ctype.h> - #include <stdarg.h> - #include <limits.h> --- -2.0.4 -
package/arptables/0002-src-Use-stdint-types.patch deleted +0 -134
134 lines not on this page · raw message
package/arptables/0003-src-Remove-support-for-libc5.patch deleted +0 -64
64 lines not on this page · raw message
package/arptables/Config.in +8 -3
@@ -1,7 +1,12 @@ config BR2_PACKAGE_ARPTABLES - bool "arptables" + bool "arptables-legacy" depends on BR2_USE_MMU # needs fork() help - Tool to set up, maintain, and inspect the tables of ARP rules. + Legacy tool to set up, maintain, and inspect the tables of ARP + rules. - http://ebtables.sourceforge.net + A more uptodate client of the arptables tool is provided in + the iptables package. The new tool was formerly known as + arptables-compat. + + http://git.netfilter.org/arptables
package/arptables/arptables.hash +5 -2
@@ -1,2 +1,5 @@ -# Locally calculated -sha256 277985e29ecd93bd759a58242cad0e02ba9d4a6e1b7795235e3b507661bc0049 arptables-v0.0.4.tar.gz +# From http://ftp.netfilter.org/pub/arptables/arptables-0.0.5.tar.gz.sha256sum +sha256 4f9a0656ce5c90868f551cd4deeb2d04f33899667e1fb2818b64e432fe8f629c arptables-0.0.5.tar.gz + +# Hash for license file +sha256 ebdb8ae564c952792017ec680e2edd30443642216eb9f8a3d8fa166c0cb628c1 COPYING
package/arptables/arptables.mk +5 -4
@@ -4,10 +4,10 @@ # ################################################################################ -ARPTABLES_VERSION = 0.0.4 -ARPTABLES_SOURCE = arptables-v$(ARPTABLES_VERSION).tar.gz -ARPTABLES_SITE = http://downloads.sourceforge.net/project/ebtables/arptables/arptables-v$(ARPTABLES_VERSION) +ARPTABLES_VERSION = 0.0.5 +ARPTABLES_SITE = http://ftp.netfilter.org/pub/arptables ARPTABLES_LICENSE = GPL-2.0+ +ARPTABLES_LICENSE_FILES = COPYING define ARPTABLES_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
@@ -15,7 +15,8 @@ define ARPTABLES_BUILD_CMDS endef define ARPTABLES_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -D $(@D)/arptables $(TARGET_DIR)/usr/sbin/arptables + $(INSTALL) -m 755 -D $(@D)/arptables-legacy \ + $(TARGET_DIR)/usr/sbin/arptables-legacy endef $(eval $(generic-package))
Signature · 1 line
2.24.0
PATCH 1/1 package/arptables: bump to version 0.0.5
Hello,
+Yann, Arnout, Peter in Cc.
package/arptables/Config.in line 2
Quoted 8 lines · On Wed, 4 Dec 2019 20:11:44 +0100 Fabrice Fontaine…
package/arptables/Config.in +1
-1@@ -1,7 +1,12 @@ config BR2_PACKAGE_ARPTABLES - bool "arptables" + bool "arptables-legacy"
We normally want to have the package Config.in option name match the package name, which would no longer be the case here.
package/arptables/Config.in line 10
Quoted 10 lines
package/arptables/Config.in +5
-2depends on BR2_USE_MMU # needs fork() help - Tool to set up, maintain, and inspect the tables of ARP rules. + Legacy tool to set up, maintain, and inspect the tables of ARP + rules. - http://ebtables.sourceforge.net + A more uptodate client of the arptables tool is provided in + the iptables package. The new tool was formerly known as + arptables-compat.
Arnout, Peter, Yann, considering the change to the package, does it make sense to rename it entirely to arptables-legacy ? Or should we take Fabrice's approach, i.e keep the package name as-is, and just as an exception change the option prompt ?
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/arptables: bump to version 0.0.5
Quoted 25 lines · Thomas Petazzoni
Hello,
+Yann, Arnout, Peter in Cc.
package/arptables/Config.in line 2
Quoted 8 lines · On Wed, 4 Dec 2019 20:11:44 +0100 Fabrice Fontaine…
package/arptables/Config.in +1
-1@@ -1,7 +1,12 @@ config BR2_PACKAGE_ARPTABLES - bool "arptables" + bool "arptables-legacy"We normally want to have the package Config.in option name match the package name, which would no longer be the case here.
Quoted 6 lines
package/arptables/Config.in +2
-1depends on BR2_USE_MMU # needs fork() help - Tool to set up, maintain, and inspect the tables of ARP rules. + Legacy tool to set up, maintain, and inspect the tables of ARP + rules.
Quoted 9 lines
package/arptables/Config.in line 10
Quoted 4 lines
package/arptables/Config.in +3
-1- http://ebtables.sourceforge.net + A more uptodate client of the arptables tool is provided in + the iptables package. The new tool was formerly known as + arptables-compat.Arnout, Peter, Yann, considering the change to the package, does it make sense to rename it entirely to arptables-legacy ? Or should we take Fabrice's approach, i.e keep the package name as-is, and just as an exception change the option prompt ?
I think going to the whole rename and legacy dance is a but too much for a
simple change like this. So I'd apply Fabrice's patch as is.
Regards,
Arnout
Thomas Petazzoni
AppliedPATCH 1/1 package/arptables: bump to version 0.0.5
In reply to Fabrice FontaineQuoted 7 lines · On Wed, 4 Dec 2019 20:11:44 +0100 Fabrice Fontaine…
- Update site to retrieve latest version
- Remove first, second and third patches (already in version)
- Use the new COPYING file as the license file
- arptables binary is now named arptables-legacy since
http://git.netfilter.org/arptables/commit/?id=28b22d55615447c94c5058e0aacec612ebc27f2aSigned-off-by Fabrice Fontaine <[email protected]>
Quoted 13 lines
---
....patch => 0001-Fix-musl-build-issue.patch} | 0
...01-arptables-disable-dlfcn.h-include.patch | 32 -----
.../arptables/0002-src-Use-stdint-types.patch | 134 ------------------
.../0003-src-Remove-support-for-libc5.patch | 64 ---------
package/arptables/Config.in | 11 +-
package/arptables/arptables.hash | 7 +-
package/arptables/arptables.mk | 9 +-
7 files changed, 18 insertions(+), 239 deletions(-)
rename package/arptables/{0004-Fix-musl-build-issue.patch => 0001-Fix-musl-build-issue.patch} (100%)
delete mode 100644 package/arptables/0001-arptables-disable-dlfcn.h-include.patch
delete mode 100644 package/arptables/0002-src-Use-stdint-types.patch
delete mode 100644 package/arptables/0003-src-Remove-support-for-libc5.patchApplied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com