diff options
| author | Ralph Sennhauser <ralph.sennhauser@gmail.com> | 2016-11-13 16:09:54 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2016-11-14 13:14:30 +0100 |
| commit | 32cfd3bd50bda0a8cf5cc322e0a34cc172abda7c (patch) | |
| tree | b26b5f7b7910364e057e7774f626bcb08680acd0 | |
| parent | dc7c9f590a6295fad83b43e00f9b3301f5f06611 (diff) | |
| download | upstream-32cfd3bd50bda0a8cf5cc322e0a34cc172abda7c.tar.gz upstream-32cfd3bd50bda0a8cf5cc322e0a34cc172abda7c.tar.bz2 upstream-32cfd3bd50bda0a8cf5cc322e0a34cc172abda7c.zip | |
arptables: bump to 2015-05-20
This fixes building with musl and drops the dependency on the OpenWrt
kernel-header patches:
270-uapi-kernel.h-glibc-specific-inclusion-of-sysinfo.h.patch
271-uapi-libc-compat.h-do-not-rely-on-__GLIBC__.patch
272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch
Use the new upstream location at netfilter.org and use a define instead
of a patch to "optimize".
See also: https://git.netfilter.org/arptables/log/
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
[Jo-Philipp Wich: add mirror SHA256 sum]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
3 files changed, 13 insertions, 64 deletions
diff --git a/package/network/utils/arptables/Makefile b/package/network/utils/arptables/Makefile index 62681dcd59..1ed0287ca2 100644 --- a/package/network/utils/arptables/Makefile +++ b/package/network/utils/arptables/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2010 OpenWrt.org +# Copyright (C) 2006-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,15 +7,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=arptables -PKG_VERSION:=0.0.4 +PKG_VERSION:=2015-05-20 PKG_RELEASE:=1 +PKG_MIRROR_MD5SUM:=736c2a88f99936811d80dd75d3016c3829ebb9dac8b28ced020a0bee149c2a31 -PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@SF/ebtables -PKG_MD5SUM:=c2e99c3aa9d78c9dfa30710ca3168182 -PKG_LICENSE:=GPL-2.0 +PKG_SOURCE_URL:=git://git.netfilter.org/arptables +PKG_SOURCE_PROTO:=git +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=f4ab8f63f11a72f14687a6646d04ae1bae3fa45f +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION) +PKG_LICENSE:=GPL-2.0 include $(INCLUDE_DIR)/package.mk @@ -25,15 +27,12 @@ define Package/arptables SUBMENU:=Firewall TITLE:=ARP firewalling software DEPENDS:=+kmod-arptables - URL:=http://ebtables.sourceforge.net + URL:=https://git.netfilter.org/arptables/ endef -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - COPT_FLAGS="$(TARGET_CFLAGS)" \ - KERNEL_DIR="./include/linux" -endef +MAKE_FLAGS += \ + COPT_FLAGS="$(TARGET_CFLAGS) -D__OPTIMIZE__=1" \ + KERNEL_DIR="$(LINUX_DIR)" define Package/arptables/install $(INSTALL_DIR) $(1)/usr/sbin diff --git a/package/network/utils/arptables/patches/100-always_optimize.patch b/package/network/utils/arptables/patches/100-always_optimize.patch deleted file mode 100644 index b120eb783a..0000000000 --- a/package/network/utils/arptables/patches/100-always_optimize.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: arptables-v0.0.3-4/libarptc/libarptc_incl.c -=================================================================== ---- arptables-v0.0.3-4.orig/libarptc/libarptc_incl.c 2010-03-08 16:49:28.000000000 +0100 -+++ arptables-v0.0.3-4/libarptc/libarptc_incl.c 2012-08-14 12:10:29.527945144 +0200 -@@ -11,14 +11,6 @@ - /* (C)1999 Paul ``Rusty'' Russell - Placed under the GNU GPL (See - COPYING for details). */ - --#ifndef __OPTIMIZE__ --STRUCT_ENTRY_TARGET * --GET_TARGET(STRUCT_ENTRY *e) --{ -- return (void *)e + e->target_offset; --} --#endif -- - static int sockfd = -1; - static void *arptc_fn = NULL; - diff --git a/package/network/utils/arptables/patches/200-musl_fixes.patch b/package/network/utils/arptables/patches/200-musl_fixes.patch deleted file mode 100644 index 3a4ba3fb03..0000000000 --- a/package/network/utils/arptables/patches/200-musl_fixes.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/include/arptables.h -+++ b/include/arptables.h -@@ -1,6 +1,7 @@ - #ifndef _ARPTABLES_USER_H - #define _ARPTABLES_USER_H - -+#include <sys/types.h> - #include "arptables_common.h" - #include "libarptc/libarptc.h" - ---- a/arptables.c -+++ b/arptables.c -@@ -43,6 +43,7 @@ - #include <arptables.h> - #include <fcntl.h> - #include <sys/wait.h> -+#include <net/ethernet.h> - - #ifndef TRUE - #define TRUE 1 ---- a/include/libarptc/arpt_kernel_headers.h -+++ b/include/libarptc/arpt_kernel_headers.h -@@ -5,7 +5,7 @@ - - #include <limits.h> - --#if defined(__GLIBC__) && __GLIBC__ == 2 -+#if 1 - #include <netinet/ip.h> - #include <netinet/in.h> - #include <netinet/ip_icmp.h> |